diff --git a/.editorconfig b/.editorconfig index 969e613536b4..7b40ff1ff568 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,3 +22,7 @@ indent_size = 2 [*.{sh,py,pl}] indent_style = space indent_size = 4 + +# Match diffs, avoid to trim trailing whitespace +[*.{diff,patch}] +trim_trailing_whitespace = false diff --git a/doc/functions.xml b/doc/functions.xml index 70326936a570..6374c15ddf2b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -17,66 +17,6 @@ derivations or even the whole package set. -
- pkgs.overridePackages - - - This function inside the nixpkgs expression (pkgs) - can be used to override the set of packages itself. - - - Warning: this function is expensive and must not be used from within - the nixpkgs repository. - - - Example usage: - - let - pkgs = import <nixpkgs> {}; - newpkgs = pkgs.overridePackages (self: super: { - foo = super.foo.override { ... }; - }; - in ... - - - - The resulting newpkgs will have the new foo - expression, and all other expressions depending on foo will also - use the new foo expression. - - - - The behavior of this function is similar to config.packageOverrides. - - - - The self parameter refers to the final package set with the - applied overrides. Using this parameter may lead to infinite recursion if not - used consciously. - - - - The super parameter refers to the old package set. - It's equivalent to pkgs in the above example. - - - - Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides, - along with that from previous calls if this function was called repeatedly. - Now those previous changes will be preserved so this function can be "chained" meaningfully. - To recover the old behavior, make sure config.packageOverrides is unset, - and call this only once off a "freshly" imported nixpkgs: - - let - pkgs = import <nixpkgs> { config: {}; }; - newpkgs = pkgs.overridePackages ...; - in ... - - -
-
<pkg>.override @@ -91,12 +31,12 @@ Example usages: pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - pkgs.overridePackages (self: super: { + import pkgs.path { overlays = [ (self: super: { foo = super.foo.override { barSupport = true ; }; - }) + })]}; mypkg = pkgs.callPackage ./mypkg.nix { mydep = pkgs.mydep.override { ... }; - }) + } diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 82aeb112c93e..3f5d500620bb 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -737,18 +737,18 @@ in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.bl ``` The requested package `blaze` depends on `pandas` which itself depends on `scipy`. -If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages` +If you want the whole of Nixpkgs to use your modifications, then you can use `overlays` as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. ``` let pkgs = import {}; - newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: { + newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { python27 = let packageOverrides = self: super: { numpy = super.numpy_1_10; }; in pkgssuper.python27.override {inherit packageOverrides;}; - } ); + } ) ]; }; in newpkgs.inkscape ``` @@ -804,6 +804,55 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. +### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ? + +This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment, +and install python modules through `pip` the traditional way. + +Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`. + +``` +with import {}; +with pkgs.python27Packages; + +stdenv.mkDerivation { + name = "impurePythonEnv"; + buildInputs = [ + # these packages are required for virtualenv and pip to work: + # + python27Full + python27Packages.virtualenv + python27Packages.pip + # the following packages are related to the dependencies of your python + # project. + # In this particular example the python modules listed in the + # requirements.tx require the following packages to be installed locally + # in order to compile any binary extensions they may require. + # + taglib + openssl + git + libxml2 + libxslt + libzip + stdenv + zlib ]; + src = null; + shellHook = '' + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt + ''; +} +``` + +Note that the `pip install` is an imperative action. So every time `nix-shell` +is executed it will attempt to download the python modules listed in +requirements.txt. However these will be cached locally within the `virtualenv` +folder and not downloaded again. + ## Contributing diff --git a/doc/manual.xml b/doc/manual.xml index 6ad66d486525..1c0dac6e4df7 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,6 +18,7 @@ + diff --git a/doc/overlays.xml b/doc/overlays.xml new file mode 100644 index 000000000000..cb54c33cf65f --- /dev/null +++ b/doc/overlays.xml @@ -0,0 +1,99 @@ + + +Overlays + +This chapter describes how to extend and change Nixpkgs packages using +overlays. Overlays are used to add layers in the fix-point used by Nixpkgs +to compose the set of all packages. + + + +
+Installing Overlays + +The set of overlays is looked for in the following places. The +first one present is considered, and all the rest are ignored: + + + + + + As an argument of the imported attribute set. When importing Nixpkgs, + the overlays attribute argument can be set to a list of + functions, which is described in . + + + + + + In the directory pointed by the environment variable + NIXPKGS_OVERLAYS. + + + + + In the directory ~/.nixpkgs/overlays/. + + + + + +For the second and third options, the directory should contain Nix expressions defining the +overlays. Each overlay can be a file, a directory containing a +default.nix, or a symlink to one of those. The expressions should follow +the syntax described in . + +The order of the overlay layers can influence the recipe of packages if multiple layers override +the same recipe. In the case where overlays are loaded from a directory, they are loaded in +alphabetical order. + +To install an overlay using the last option, you can clone the overlay's repository and add +a symbolic link to it in ~/.nixpkgs/overlays/ directory. + +
+ + + +
+Overlays Layout + +Overlays are expressed as Nix functions which accept 2 arguments and return a set of +packages. + + +self: super: + +{ + boost = super.boost.override { + python = self.python3; + }; + rr = super.callPackage ./pkgs/rr { + stdenv = self.stdenv_32bit; + }; +} + + +The first argument, usually named self, corresponds to the final package +set. You should use this set for the dependencies of all packages specified in your +overlay. For example, all the dependencies of rr in the example above come +from self, as well as the overriden dependencies used in the +boost override. + +The second argument, usually named super, +corresponds to the result of the evaluation of the previous stages of +Nixpkgs. It does not contain any of the packages added by the current +overlay nor any of the following overlays. This set should be used either +to refer to packages you wish to override, or to access functions defined +in Nixpkgs. For example, the original recipe of boost +in the above example, comes from super, as well as the +callPackage function. + +The value returned by this function should be a set similar to +pkgs/top-level/all-packages.nix, which contains +overridden and/or new packages. + +
+ +
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 95b836130af4..b7ca05af16a2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -221,6 +221,7 @@ joamaki = "Jussi Maki "; joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; + johbo = "Johannes Bornhold "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; @@ -247,6 +248,7 @@ ldesgoui = "Lucas Desgouilles "; league = "Christopher League "; lebastr = "Alexander Lebedev "; + leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index d8b0ae01e333..6be2cd3af7f8 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -11,7 +11,9 @@ has the following highlights:
- + Nixpkgs is now extensible through overlays. See the Nixpkgs + manual for more information. @@ -28,6 +30,14 @@ has the following highlights: following incompatible changes: + + + stdenv.overrides is now expected to take self + and super arguments. See lib.trivial.extends + for what those parameters represent. + + + gnome alias has been removed along with @@ -88,6 +98,32 @@ following incompatible changes: networking.timeServers. + + + + overridePackages function no longer exists. + It is replaced by + overlays. For example, the following code: + + + let + pkgs = import <nixpkgs> {}; + in + pkgs.overridePackages (self: super: ...) + + + should be replaced by: + + + let + pkgs = import <nixpkgs> {}; + in + import pkgs.path { overlays = [(self: super: ...)] } + + + + diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 0750a1b18c99..7cceac8cbf5a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -19,7 +19,7 @@ rm -f ec2-amis.nix types="hvm pv" stores="ebs s3" -regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 742167fbf69f..d5cb4fce0f9d 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -160,6 +160,13 @@ in { if activated. ''; }; + + config = mkOption { + type = types.attrsOf types.unspecified; + default = {}; + description = ''Config of the pulse daemon. See man pulse-daemon.conf.''; + example = literalExample ''{ flat-volumes = "no"; }''; + }; }; zeroconf = { @@ -204,10 +211,13 @@ in { (mkIf cfg.enable { environment.systemPackages = [ overriddenPackage ]; - environment.etc = singleton { - target = "asound.conf"; - source = alsaConf; - }; + environment.etc = [ + { target = "asound.conf"; + source = alsaConf; } + + { target = "pulse/daemon.conf"; + source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); } + ]; # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb.nix new file mode 100644 index 000000000000..8429572a8822 --- /dev/null +++ b/nixos/modules/hardware/ckb.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.ckb; + +in + { + options.hardware.ckb = { + enable = mkEnableOption "the Corsair keyboard/mouse driver"; + + package = mkOption { + type = types.package; + default = pkgs.ckb; + defaultText = "pkgs.ckb"; + description = '' + The package implementing the Corsair keyboard/mouse driver. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.ckb = { + description = "Corsair Keyboard Daemon"; + wantedBy = ["multi-user.target"]; + script = "${cfg.package}/bin/ckb-daemon"; + serviceConfig = { + Restart = "always"; + StandardOutput = "syslog"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ kierdavis ]; + }; + } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index ddc624a77de9..d73d67ef4728 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/m8z91vpfxyszhjpq4wl8m1zwlqik4fkn-nix-1.11.5"; - i686-linux = "/nix/store/vk71likl32igqg6apqsj52ln3vhkq1pa-nix-1.11.5"; - x86_64-darwin = "/nix/store/qfwm0b5qkr8v8gsv9dh2z3arky9p1myg-nix-1.11.5"; + x86_64-linux = "/nix/store/qdkzm17csr24snk247a1s0c47ikq5sl6-nix-1.11.6"; + i686-linux = "/nix/store/hiwp53747lxlniqy5wpbql5izjrs8z0z-nix-1.11.6"; + x86_64-darwin = "/nix/store/hca2hqcvwncf23hiqyqgwbsdy8vvl9xv-nix-1.11.6"; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 6ab4b24a3491..de69ada5bfe7 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -282,6 +282,7 @@ infinoted = 264; keystone = 265; glance = 266; + couchpotato = 267; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -534,6 +535,7 @@ infinoted = 264; keystone = 265; glance = 266; + couchpotato = 267; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7d50b8025bdd..7451888484f7 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -29,11 +29,19 @@ let }; configType = mkOptionType { - name = "nixpkgs config"; + name = "nixpkgs-config"; + description = "nixpkgs config"; check = traceValIfNot isConfig; merge = args: fold (def: mergeConfig def.value) {}; }; + overlayType = mkOptionType { + name = "nixpkgs-overlay"; + description = "nixpkgs overlay"; + check = builtins.isFunction; + merge = lib.mergeOneOption; + }; + in { @@ -43,23 +51,37 @@ in default = {}; example = literalExample '' - { firefox.enableGeckoMediaPlayer = true; - packageOverrides = pkgs: { - firefox60Pkgs = pkgs.firefox60Pkgs.override { - enableOfficialBranding = true; - }; - }; - } + { firefox.enableGeckoMediaPlayer = true; } ''; type = configType; description = '' The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set - package configuration options, and to override packages - globally through the packageOverrides - option. The latter is a function that takes as an argument - the original Nixpkgs, and must evaluate - to a set of new or overridden packages. + package configuration options. + ''; + }; + + nixpkgs.overlays = mkOption { + default = []; + example = literalExample + '' + [ (self: super: { + openssh = super.openssh.override { + hpnSupport = true; + withKerberos = true; + kerberos = self.libkrb5; + }; + }; + ) ] + ''; + type = types.listOf overlayType; + description = '' + List of overlays to use with the Nix Packages collection. + (For details, see the Nixpkgs documentation.) It allows + you to override packages globally. This is a function that + takes as an argument the original Nixpkgs. + The first argument should be used for finding dependencies, and + the second should be used for overriding recipes. ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 576244e76015..cd00ea10baa7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -26,6 +26,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix ./hardware/ksm.nix @@ -66,6 +67,7 @@ ./programs/bash/bash.nix ./programs/blcr.nix ./programs/cdemu.nix + ./programs/chromium.nix ./programs/command-not-found/command-not-found.nix ./programs/dconf.nix ./programs/environment.nix @@ -241,6 +243,7 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix + ./services/misc/couchpotato.nix ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/dysnomia.nix @@ -294,6 +297,7 @@ ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix + ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix new file mode 100644 index 000000000000..54739feab976 --- /dev/null +++ b/nixos/modules/programs/chromium.nix @@ -0,0 +1,85 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.programs.chromium; + + defaultProfile = filterAttrs (k: v: v != null) { + HomepageLocation = cfg.homepageLocation; + DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; + DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; + ExtensionInstallForcelist = map (extension: + "${extension};https://clients2.google.com/service/update2/crx" + ) cfg.extensions; + }; +in + +{ + ###### interface + + options = { + programs.chromium = { + enable = mkEnableOption "chromium policies"; + + extensions = mkOption { + type = types.listOf types.str; + description = '' + List of chromium extensions to install. + For list of plugins ids see id in url of extensions on + chrome web store + page. + ''; + default = []; + example = literalExample '' + [ + "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet + "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot + "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + ] + ''; + }; + + homepageLocation = mkOption { + type = types.nullOr types.str; + description = "Chromium default homepage"; + default = null; + example = "https://nixos.org"; + }; + + defaultSearchProviderSearchURL = mkOption { + type = types.nullOr types.str; + description = "Chromium default search provider url."; + default = null; + example = + "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google: + ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; + }; + + defaultSearchProviderSuggestURL = mkOption { + type = types.nullOr types.str; + description = "Chromium default search provider url for suggestions."; + default = null; + example = + "https://encrypted.google.com/complete/search?output=chrome&q={searchTerms}"; + }; + + extraOpts = mkOption { + type = types.attrs; + description = '' + Extra chromium policy options, see + https://www.chromium.org/administrators/policy-list-3 + for a list of avalible options + ''; + default = {}; + }; + }; + }; + + ###### implementation + + config = lib.mkIf cfg.enable { + environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + }; +} diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix index b8803eec7be1..27b6d446c75d 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.programs.nano; @@ -20,16 +20,22 @@ in example = '' set nowrap set tabstospaces - set tabsize 4 + set tabsize 2 ''; }; + syntaxHighlight = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to enable syntax highlight for various languages."; + }; }; }; ###### implementation config = lib.mkIf (cfg.nanorc != "") { - environment.etc."nanorc".text = cfg.nanorc; + environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc + (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ]; }; } diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 5b7d94157454..990e6648e82b 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -91,6 +91,13 @@ in ''; type = types.bool; }; + + enableAutosuggestions = mkOption { + default = false; + description = '' + Enable zsh-autosuggestions + ''; + }; }; @@ -116,11 +123,6 @@ in setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK - ${cfge.interactiveShellInit} - - ${cfg.promptInit} - ${zshAliases} - # Tell zsh how to find installed completions for p in ''${(z)NIX_PROFILES}; do fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions) @@ -132,6 +134,16 @@ in "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" } + ${optionalString (cfg.enableAutosuggestions) + "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" + } + + ${zshAliases} + ${cfg.promptInit} + + ${cfge.interactiveShellInit} + + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" ''; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 758f229d59d7..ad1ba86980d5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -164,6 +164,9 @@ with lib; else { addr = value inetAddr; port = value inetPort; } )) + # dhcpd + (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 202639f98701..d323a158a4df 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -18,22 +18,30 @@ in default = []; description = "List of files containing AppArmor profiles."; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "List of packages to be added to apparmor's include path"; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; - systemd.services.apparmor = { + systemd.services.apparmor = let + paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") + ([ pkgs.apparmor-profiles ] ++ cfg.packages); + in { wantedBy = [ "local-fs.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; - ExecStart = concatMapStrings (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ExecStart = map (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv ${paths} "${p}"'' ) cfg.profiles; - ExecStop = concatMapStrings (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ExecStop = map (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"'' ) cfg.profiles; }; }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index fbf7412a6cd9..029b11ad98b7 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -737,6 +737,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + RestartSec = "30s"; + Restart = "on-failure"; ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 14d65978c320..028907693a5a 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -143,7 +143,10 @@ let done echo "Generating hwdb database..." - ${udev}/bin/udevadm hwdb --update --root=$(pwd) + # hwdb --update doesn't return error code even on errors! + res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)" + echo "$res" + [ -z "$(echo "$res" | egrep '^Error')" ] mv etc/udev/hwdb.bin $out ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 4c9df935debe..f2097638c637 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -241,6 +241,9 @@ in RuntimeDirectory = [ "dovecot2" ]; }; + # When copying sieve scripts preserve the original time stamp + # (should be 0) so that the compiled sieve script is newer than + # the source file and Dovecot won't try to compile it. preStart = '' rm -rf ${stateDir}/sieve '' + optionalString (cfg.sieveScripts != {}) '' @@ -248,11 +251,11 @@ in ${concatStringsSep "\n" (mapAttrsToList (to: from: '' if [ -d '${from}' ]; then mkdir '${stateDir}/sieve/${to}' - cp "${from}/"*.sieve '${stateDir}/sieve/${to}' + cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}' else - cp '${from}' '${stateDir}/sieve/${to}' + cp -p '${from}' '${stateDir}/sieve/${to}' fi - ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' + ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' '') cfg.sieveScripts)} chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve' ''; diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix new file mode 100644 index 000000000000..496487622351 --- /dev/null +++ b/nixos/modules/services/misc/couchpotato.nix @@ -0,0 +1,50 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.couchpotato; + +in +{ + options = { + services.couchpotato = { + enable = mkEnableOption "CouchPotato Server"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.couchpotato = { + description = "CouchPotato Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p /var/lib/couchpotato + chown -R couchpotato:couchpotato /var/lib/couchpotato + ''; + + serviceConfig = { + Type = "simple"; + User = "couchpotato"; + Group = "couchpotato"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.couchpotato}/bin/couchpotato"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = singleton + { name = "couchpotato"; + group = "couchpotato"; + home = "/var/lib/couchpotato/"; + description = "CouchPotato daemon user"; + uid = config.ids.uids.couchpotato; + }; + + users.extraGroups = singleton + { name = "couchpotato"; + gid = config.ids.gids.couchpotato; + }; + }; +} diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix new file mode 100644 index 000000000000..27d59e367d5c --- /dev/null +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.arbtt; +in { + options = { + services.arbtt = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Enable the arbtt statistics capture service. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.haskellPackages.arbtt; + defaultText = "pkgs.haskellPackages.arbtt"; + example = literalExample "pkgs.haskellPackages.arbtt"; + description = '' + The package to use for the arbtt binaries. + ''; + }; + + logFile = mkOption { + type = types.str; + default = "%h/.arbtt/capture.log"; + example = "/home/username/.arbtt-capture.log"; + description = '' + The log file for captured samples. + ''; + }; + + sampleRate = mkOption { + type = types.int; + default = 60; + example = 120; + description = '' + The sampling interval in seconds. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.arbtt = { + description = "arbtt statistics capture service"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/arbtt-capture --logfile=${cfg.logFile} --sample-rate=${toString cfg.sampleRate}"; + Restart = "always"; + }; + }; + }; + + meta.maintainers = [ maintainers.michaelpj ]; +} diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index da2cd02eaa3b..cf761edad926 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.prometheus.alertmanager; mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration); + alertmanagerYml = + if cfg.configText != null then + pkgs.writeText "alertmanager.yml" cfg.configText + else mkConfigFile; in { options = { services.prometheus.alertmanager = { @@ -34,6 +38,17 @@ in { ''; }; + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Alertmanager configuration as YAML text. If non-null, this option + defines the text that is written to alertmanager.yml. If null, the + contents of alertmanager.yml is generated from the structured config + options. + ''; + }; + logFormat = mkOption { type = types.nullOr types.str; default = null; @@ -96,7 +111,7 @@ in { after = [ "network.target" ]; script = '' ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ - -config.file ${mkConfigFile} \ + -config.file ${alertmanagerYml} \ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ -log.level ${cfg.logLevel} \ ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 104b5b92620e..d43147a16f31 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -67,6 +67,14 @@ in ''; }; + emptyRepo = mkOption { + type = types.bool; + default = false; + description = '' + If set to true, the repo won't be initialized with help files + ''; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the IPFS daemon"; @@ -103,16 +111,17 @@ in after = [ "network.target" "local-fs.target" ]; path = [ pkgs.ipfs pkgs.su pkgs.bash ]; - preStart = - '' - install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} - if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then - cd ${cfg.dataDir} - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" - fi - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.API ${cfg.apiAddress}" - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.Gateway ${cfg.gatewayAddress}" - ''; + preStart = '' + install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then + cd ${cfg.dataDir} + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ + "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}" + fi + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ + "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \ + ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}" + ''; serviceConfig = { ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index d1900deceaf6..5928203368d2 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -132,7 +132,8 @@ in login=${config.services.ddclient.username} password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} - server=${config.services.ddclient.server} + ${let server = config.services.ddclient.server; in + lib.optionalString (server != "") "server=${server}"} ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES ${config.services.ddclient.domain} diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index d2cd00e74a1f..86bcaa96f345 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -4,11 +4,10 @@ with lib; let - cfg = config.services.dhcpd; + cfg4 = config.services.dhcpd4; + cfg6 = config.services.dhcpd6; - stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant. - - configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" + writeConfig = cfg: pkgs.writeText "dhcpd.conf" '' default-lease-time 600; max-lease-time 7200; @@ -29,6 +28,154 @@ let } ''; + dhcpdService = postfix: cfg: optionalAttrs cfg.enable { + "dhcpd${postfix}" = { + description = "DHCPv${postfix} server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -m 755 -p ${cfg.stateDir} + touch ${cfg.stateDir}/dhcpd.leases + ''; + + serviceConfig = + let + configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; + args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" + "-pf" "/run/dhcpd${postfix}/dhcpd.pid" + "-cf" "${configFile}" + "-lf" "${cfg.stateDir}/dhcpd.leases" + "-user" "dhcpd" "-group" "nogroup" + ] ++ cfg.extraFlags + ++ cfg.interfaces; + + in { + ExecStart = concatMapStringsSep " " escapeShellArg args; + Type = "forking"; + Restart = "always"; + RuntimeDirectory = [ "dhcpd${postfix}" ]; + PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + }; + }; + }; + + machineOpts = {...}: { + config = { + + hostName = mkOption { + type = types.str; + example = "foo"; + description = '' + Hostname which is assigned statically to the machine. + ''; + }; + + ethernetAddress = mkOption { + type = types.str; + example = "00:16:76:9a:32:1d"; + description = '' + MAC address of the machine. + ''; + }; + + ipAddress = mkOption { + type = types.str; + example = "192.168.1.10"; + description = '' + IP address of the machine. + ''; + }; + + }; + }; + + dhcpConfig = postfix: { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the DHCPv${postfix} server. + ''; + }; + + stateDir = mkOption { + type = types.path; + # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. + default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; + description = '' + State directory for the DHCP server. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + option subnet-mask 255.255.255.0; + option broadcast-address 192.168.1.255; + option routers 192.168.1.5; + option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1; + option domain-name "example.org"; + subnet 192.168.1.0 netmask 255.255.255.0 { + range 192.168.1.100 192.168.1.200; + } + ''; + description = '' + Extra text to be appended to the DHCP server configuration + file. Currently, you almost certainly need to specify something + there, such as the options specifying the subnet mask, DNS servers, + etc. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional command line flags to be passed to the dhcpd daemon. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The path of the DHCP server configuration file. If no file + is specified, a file is generated using the other options. + ''; + }; + + interfaces = mkOption { + type = types.listOf types.str; + default = ["eth0"]; + description = '' + The interfaces on which the DHCP server should listen. + ''; + }; + + machines = mkOption { + type = types.listOf (types.submodule machineOpts); + default = []; + example = [ + { hostName = "foo"; + ethernetAddress = "00:16:76:9a:32:1d"; + ipAddress = "192.168.1.10"; + } + { hostName = "bar"; + ethernetAddress = "00:19:d1:1d:c4:9a"; + ipAddress = "192.168.1.11"; + } + ]; + description = '' + A list mapping Ethernet addresses to IPv${postfix} addresses for the + DHCP server. + ''; + }; + + }; + in { @@ -37,85 +184,15 @@ in options = { - services.dhcpd = { - - enable = mkOption { - default = false; - description = " - Whether to enable the DHCP server. - "; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - option subnet-mask 255.255.255.0; - option broadcast-address 192.168.1.255; - option routers 192.168.1.5; - option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1; - option domain-name "example.org"; - subnet 192.168.1.0 netmask 255.255.255.0 { - range 192.168.1.100 192.168.1.200; - } - ''; - description = " - Extra text to be appended to the DHCP server configuration - file. Currently, you almost certainly need to specify - something here, such as the options specifying the subnet - mask, DNS servers, etc. - "; - }; - - extraFlags = mkOption { - default = ""; - example = "-6"; - description = " - Additional command line flags to be passed to the dhcpd daemon. - "; - }; - - configFile = mkOption { - default = null; - description = " - The path of the DHCP server configuration file. If no file - is specified, a file is generated using the other options. - "; - }; - - interfaces = mkOption { - default = ["eth0"]; - description = " - The interfaces on which the DHCP server should listen. - "; - }; - - machines = mkOption { - default = []; - example = [ - { hostName = "foo"; - ethernetAddress = "00:16:76:9a:32:1d"; - ipAddress = "192.168.1.10"; - } - { hostName = "bar"; - ethernetAddress = "00:19:d1:1d:c4:9a"; - ipAddress = "192.168.1.11"; - } - ]; - description = " - A list mapping ethernet addresses to IP addresses for the - DHCP server. - "; - }; - - }; + services.dhcpd4 = dhcpConfig "4"; + services.dhcpd6 = dhcpConfig "6"; }; ###### implementation - config = mkIf config.services.dhcpd.enable { + config = mkIf (cfg4.enable || cfg6.enable) { users = { extraUsers.dhcpd = { @@ -124,36 +201,7 @@ in }; }; - systemd.services.dhcpd = - { description = "DHCP server"; - - wantedBy = [ "multi-user.target" ]; - - after = [ "network.target" ]; - - path = [ pkgs.dhcp ]; - - preStart = - '' - mkdir -m 755 -p ${stateDir} - - touch ${stateDir}/dhcpd.leases - - mkdir -m 755 -p /run/dhcpd - chown dhcpd /run/dhcpd - ''; - - serviceConfig = - { ExecStart = "@${pkgs.dhcp}/sbin/dhcpd dhcpd" - + " -pf /run/dhcpd/dhcpd.pid -cf ${configFile}" - + " -lf ${stateDir}/dhcpd.leases -user dhcpd -group nogroup" - + " ${cfg.extraFlags}" - + " ${toString cfg.interfaces}"; - Restart = "always"; - Type = "forking"; - PIDFile = "/run/dhcpd/dhcpd.pid"; - }; - }; + systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 1c0ea5034df3..ea406864fd3f 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -172,13 +172,16 @@ let }-j nixos-fw-accept ''} - # Accept all ICMPv6 messages except redirects and node - # information queries (type 139). See RFC 4890, section - # 4.4. ${optionalString config.networking.enableIPv6 '' + # Accept all ICMPv6 messages except redirects and node + # information queries (type 139). See RFC 4890, section + # 4.4. ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept + + # Allow this host to act as a DHCPv6 client + ip6tables -A nixos-fw -d fe80::/64 -p udp --dport 546 -j nixos-fw-accept ''} ${cfg.extraCommands} diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix index 932d6cf29037..3d560338e2c5 100644 --- a/nixos/modules/services/networking/miredo.nix +++ b/nixos/modules/services/networking/miredo.nix @@ -82,7 +82,6 @@ in serviceConfig = { Restart = "always"; RestartSec = "5s"; - ExecStartPre = "${cfg.package}/bin/miredo-checkconf -f ${miredoConf}"; ExecStart = "${cfg.package}/bin/miredo -c ${miredoConf} -p ${pidFile} -f"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index b045e140546d..f71f30fee97a 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -81,6 +81,7 @@ in users.extraUsers = singleton { name = clamavUser; uid = config.ids.uids.clamav; + group = clamavGroup; description = "ClamAV daemon user"; home = stateDir; }; diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 0666dfddaffd..619e0f90b124 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -39,6 +39,13 @@ in type = types.path; description = "The data directory, for storing certificates."; }; + + package = mkOption { + default = pkgs.caddy; + defaultText = "pkgs.caddy"; + type = types.package; + description = "Caddy package to use."; + }; }; config = mkIf cfg.enable { @@ -47,7 +54,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.caddy.bin}/bin/caddy -conf=${configFile} \ + ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; Type = "simple"; diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 09d0ab077515..785394d9648c 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -41,7 +41,7 @@ with lib; { description = "Terminal Server"; path = - [ pkgs.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + [ pkgs.xorg.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]; diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 7a54bb03e297..f827e530f877 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -34,24 +34,20 @@ if [ -z "$container" ]; then fi -# Likewise, stage 1 mounts /proc, /dev, /sys and /run, so if we don't have a +# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a # stage 1, we need to do that here. -# We check for each mountpoint separately to avoid esoteric failure modes -# if only a subset was mounted by whatever called us. -specialMount() { - local device="$1" - local mountPoint="$2" - local options="$3" - local fsType="$4" +if [ ! -e /proc/1 ]; then + specialMount() { + local device="$1" + local mountPoint="$2" + local options="$3" + local fsType="$4" - if mountpoint -q "$mountpoint"; then - return 0 - fi - - mkdir -m 0755 -p "$mountPoint" - mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" -} -source @earlyMountScript@ + mkdir -m 0755 -p "$mountPoint" + mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" + } + source @earlyMountScript@ +fi echo "booting system configuration $systemConfig" > /dev/kmsg diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index ffd1cbec3ce3..0753e2ce9948 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -135,51 +135,59 @@ let self = { "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; "16.03".us-west-2.pv-s3 = "ami-734c8f13"; - # 16.09.666.3738950 - "16.09".ap-northeast-1.hvm-ebs = "ami-35578954"; - "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7"; - "16.09".ap-northeast-1.pv-ebs = "ami-07548a66"; - "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90"; - "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba"; - "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222"; - "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4"; - "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2"; - "16.09".ap-south-1.hvm-ebs = "ami-922450fd"; - "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02"; - "16.09".ap-south-1.pv-ebs = "ami-4d394d22"; - "16.09".ap-south-1.pv-s3 = "ami-17384c78"; - "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b"; - "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a"; - "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc"; - "16.09".ap-southeast-1.pv-s3 = "ami-5826823b"; - "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23"; - "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b"; - "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc"; - "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83"; - "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472"; - "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473"; - "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3"; - "16.09".eu-central-1.pv-s3 = "ami-3488775b"; - "16.09".eu-west-1.hvm-ebs = "ami-15662766"; - "16.09".eu-west-1.hvm-s3 = "ami-476b2a34"; - "16.09".eu-west-1.pv-ebs = "ami-876928f4"; - "16.09".eu-west-1.pv-s3 = "ami-70682903"; - "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b"; - "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88"; - "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21"; - "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b"; - "16.09".us-east-1.hvm-ebs = "ami-93347684"; - "16.09".us-east-1.hvm-s3 = "ami-5e347649"; - "16.09".us-east-1.pv-ebs = "ami-b0387aa7"; - "16.09".us-east-1.pv-s3 = "ami-51357746"; - "16.09".us-west-1.hvm-ebs = "ami-06337a66"; - "16.09".us-west-1.hvm-s3 = "ami-76307916"; - "16.09".us-west-1.pv-ebs = "ami-fd327b9d"; - "16.09".us-west-1.pv-s3 = "ami-cc347dac"; - "16.09".us-west-2.hvm-ebs = "ami-49fe2729"; - "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; - "16.09".us-west-2.pv-ebs = "ami-14fe2774"; - "16.09".us-west-2.pv-s3 = "ami-74f12814"; + # 16.09.1508.3909827 + "16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f"; + "16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e"; + "16.09".ap-northeast-1.pv-ebs = "ami-254a3442"; + "16.09".ap-northeast-1.pv-s3 = "ami-ef473988"; + "16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76"; + "16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0"; + "16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39"; + "16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32"; + "16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc"; + "16.09".ap-south-1.hvm-s3 = "ami-98e690f7"; + "16.09".ap-south-1.pv-ebs = "ami-aef98fc1"; + "16.09".ap-south-1.pv-s3 = "ami-caf88ea5"; + "16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3"; + "16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e"; + "16.09".ap-southeast-1.pv-ebs = "ami-37f05a54"; + "16.09".ap-southeast-1.pv-s3 = "ami-27f35944"; + "16.09".ap-southeast-2.hvm-ebs = "ami-57ece834"; + "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4"; + "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb"; + "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5"; + "16.09".eu-central-1.hvm-ebs = "ami-1b884774"; + "16.09".eu-central-1.hvm-s3 = "ami-b08c43df"; + "16.09".eu-central-1.pv-ebs = "ami-888946e7"; + "16.09".eu-central-1.pv-s3 = "ami-06874869"; + "16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d"; + "16.09".eu-west-1.hvm-s3 = "ami-73d1e500"; + "16.09".eu-west-1.pv-ebs = "ami-44c0f437"; + "16.09".eu-west-1.pv-s3 = "ami-f3d8ec80"; + "16.09".eu-west-2.hvm-ebs = "ami-2c9c9648"; + "16.09".eu-west-2.hvm-s3 = "ami-6b9e940f"; + "16.09".eu-west-2.pv-ebs = "ami-f1999395"; + "16.09".eu-west-2.pv-s3 = "ami-bb9f95df"; + "16.09".sa-east-1.hvm-ebs = "ami-a11882cd"; + "16.09".sa-east-1.hvm-s3 = "ami-7726bc1b"; + "16.09".sa-east-1.pv-ebs = "ami-9725bffb"; + "16.09".sa-east-1.pv-s3 = "ami-b027bddc"; + "16.09".us-east-1.hvm-ebs = "ami-854ca593"; + "16.09".us-east-1.hvm-s3 = "ami-2241a834"; + "16.09".us-east-1.pv-ebs = "ami-a441a8b2"; + "16.09".us-east-1.pv-s3 = "ami-e841a8fe"; + "16.09".us-east-2.hvm-ebs = "ami-3f41645a"; + "16.09".us-east-2.hvm-s3 = "ami-804065e5"; + "16.09".us-east-2.pv-ebs = "ami-f1466394"; + "16.09".us-east-2.pv-s3 = "ami-05426760"; + "16.09".us-west-1.hvm-ebs = "ami-c2efbca2"; + "16.09".us-west-1.hvm-s3 = "ami-d71042b7"; + "16.09".us-west-1.pv-ebs = "ami-04e8bb64"; + "16.09".us-west-1.pv-s3 = "ami-31e9ba51"; + "16.09".us-west-2.hvm-ebs = "ami-6449f504"; + "16.09".us-west-2.hvm-s3 = "ami-344af654"; + "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; + "16.09".us-west-2.pv-s3 = "ami-de48f4be"; latest = self."16.09"; }; in self diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 22da012e4141..6759ff0f2fe9 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -62,19 +62,17 @@ in . ''; }; - }; ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.lxc ]; - environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; environment.etc."lxc/default.conf".text = cfg.defaultConfig; + security.apparmor.packages = [ pkgs.lxc ]; + security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; }; - } diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 273bd3c80c19..dcd25e211971 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -59,6 +59,7 @@ in { virtualisation.diskSize = 2048; programs.bash.enableCompletion = true; + environment.systemPackages = with pkgs; [ netcat bind ]; services.kubernetes.roles = ["master" "node"]; virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0"; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 17d4a878d3a4..83103f35d482 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -10,29 +10,61 @@ let vlanIfs = range 1 (length config.virtualisation.vlans); in { virtualisation.vlans = [ 1 2 3 ]; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useDHCP = false; useNetworkd = networkd; firewall.allowPing = true; + firewall.checkReversePath = true; + firewall.allowedUDPPorts = [ 547 ]; interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: nameValuePair "eth${toString n}" { ipAddress = "192.168.${toString n}.1"; prefixLength = 24; + ipv6Address = "fd00:1234:5678:${toString n}::1"; + ipv6PrefixLength = 64; }))); }; - services.dhcpd = { + services.dhcpd4 = { enable = true; interfaces = map (n: "eth${toString n}") vlanIfs; extraConfig = '' - option subnet-mask 255.255.255.0; + authoritative; '' + flip concatMapStrings vlanIfs (n: '' subnet 192.168.${toString n}.0 netmask 255.255.255.0 { - option broadcast-address 192.168.${toString n}.255; option routers 192.168.${toString n}.1; + # XXX: technically it's _not guaranteed_ that IP addresses will be + # issued from the first item in range onwards! We assume that in + # our tests however. range 192.168.${toString n}.2 192.168.${toString n}.254; } ''); }; + services.radvd = { + enable = true; + config = flip concatMapStrings vlanIfs (n: '' + interface eth${toString n} { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + + prefix fd00:1234:5678:${toString n}::/64 { + AdvAutonomous off; + }; + }; + ''); + }; + services.dhcpd6 = { + enable = true; + interfaces = map (n: "eth${toString n}") vlanIfs; + extraConfig = '' + authoritative; + '' + flip concatMapStrings vlanIfs (n: '' + subnet6 fd00:1234:5678:${toString n}::/64 { + range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2; + } + ''); + }; }; testCases = { @@ -108,8 +140,14 @@ let useNetworkd = networkd; firewall.allowPing = true; useDHCP = true; - interfaces.eth1.ip4 = mkOverride 0 [ ]; - interfaces.eth2.ip4 = mkOverride 0 [ ]; + interfaces.eth1 = { + ip4 = mkOverride 0 [ ]; + ip6 = mkOverride 0 [ ]; + }; + interfaces.eth2 = { + ip4 = mkOverride 0 [ ]; + ip6 = mkOverride 0 [ ]; + }; }; }; testScript = { nodes, ... }: @@ -121,21 +159,31 @@ let # Wait until we have an ip address on each interface $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'"); + $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'"); + $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'"); # Test vlan 1 $client->waitUntilSucceeds("ping -c 1 192.168.1.1"); $client->waitUntilSucceeds("ping -c 1 192.168.1.2"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); $router->waitUntilSucceeds("ping -c 1 192.168.1.1"); $router->waitUntilSucceeds("ping -c 1 192.168.1.2"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); # Test vlan 2 $client->waitUntilSucceeds("ping -c 1 192.168.2.1"); $client->waitUntilSucceeds("ping -c 1 192.168.2.2"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); $router->waitUntilSucceeds("ping -c 1 192.168.2.1"); $router->waitUntilSucceeds("ping -c 1 192.168.2.2"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); ''; }; dhcpOneIf = { diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 8d365590147b..9942f0898a2f 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { store historical records of the ledger and participate in consensus. ''; homepage = https://www.stellar.org/; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ chris-martin ]; license = licenses.asl20; }; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 13fea9a99afe..0db951049703 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: let @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq"; }; - buildInputs = + buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK ]; patchPhase = '' diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix index b6123f40ee1d..e6a0ff66b3ca 100644 --- a/pkgs/applications/audio/ardour/ardour4.nix +++ b/pkgs/applications/audio/ardour/ardour4.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: let @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK ]; # ardour's wscript has a "tarball" target but that required the git revision diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index ab228766e136..5e9e71f42cb5 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper +, perl, pkgconfig, python2, rubberband, serd, sord, sratom , taglib, vampSDK, dbus, fftw, pango, suil, libarchive }: let @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK libarchive ]; diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 3599991551ce..babbcc51e402 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -2,7 +2,7 @@ utillinux, pythonPackages, libnotify }: stdenv.mkDerivation { - name = "clerk-unstable-2016-10-14"; + name = "clerk-2016-10-14"; src = fetchFromGitHub { owner = "carnager"; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 68990b11ef0f..7f4bc0b3e9ef 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv -, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv +, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig python raul serd sord sratom suil ]; configurePhase = '' sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript - python waf configure --prefix=$out + ${python.interpreter} waf configure --prefix=$out ''; propagatedBuildInputs = [ rdflib ]; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; installPhase = '' - python waf install + ${python.interpreter} waf install for program in ingenams ingenish do wrapProgram $out/bin/$program \ diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d7454741ed59..856da9f742e4 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp"; + sha256 = "0krq5fbscqxayyc4vxai7iwxm2kdbgs5jicrdb013v04phw2za06"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1f8924cd03ee..9e310d6e4e41 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.45.186.g3b5036d6-95"; + version = "1.0.47.13.gd8e05b1f-47"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0fpvz1mzyva1sypg4gjmrv0clckb0c3xwjfcxnb8gvkxx9vm56p1"; + sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2e14ae339cf7..28b6b2b85ad4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,7 +9,6 @@ , gnugrep , gnutar , gzip -, jdk , fontconfig , freetype , libpulseaudio @@ -29,6 +28,7 @@ , writeTextFile , xkeyboard_config , zlib +, fontsConf }: let @@ -44,50 +44,57 @@ let ]; installPhase = '' cp -r . $out - wrapProgram $out/bin/studio.sh --set PATH "${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/studio.sh \ + --set PATH "${stdenv.lib.makeBinPath [ - # Checked in studio.sh - coreutils - findutils - gnugrep - jdk - which + # Checked in studio.sh + coreutils + findutils + gnugrep + which - # For Android emulator - file - glxinfo - pciutils - setxkbmap + # For Android emulator + file + glxinfo + pciutils + setxkbmap - # Used during setup wizard - gnutar - gzip + # Used during setup wizard + gnutar + gzip - # Runtime stuff - git + # Runtime stuff + git - ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib - # mksdcard wants 32 bit libstdc++.so.6 - pkgsi686Linux.stdenv.cc.cc.lib + ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # aapt wants libz.so.1 - zlib - pkgsi686Linux.zlib - # Support multiple monitors - libXrandr + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst - # For Android emulator - libpulseaudio - libX11 - libXext - libXrender - libXtst - libXi - freetype - fontconfig - ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + # Gradle wants libstdc++.so.6 + stdenv.cc.cc.lib + # mksdcard wants 32 bit libstdc++.so.6 + pkgsi686Linux.stdenv.cc.cc.lib + + # aapt wants libz.so.1 + zlib + pkgsi686Linux.zlib + # Support multiple monitors + libXrandr + + # For Android emulator + libpulseaudio + libX11 + + ]}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 51d2f26eb0d5..8a0a5d0e0b2f 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.9"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1yp4wwv0vxsad7jqkn2rj4n7k2ccgqscs89p3j6z8vpm6as0i6sg"; + sha256 = "17k4v5hibaq4zi86y1sjx09hqng4sm3lr024v2mjnhj65m2nhjb8"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 25538df0384d..59e8076c787b 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 -, enchant, gucharmap, python +{ stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +, enchant, gucharmap, python, gnome3 }: stdenv.mkDerivation rec { - name = "bluefish-2.2.7"; + name = "bluefish-2.2.9"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3"; + sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav"; }; - buildInputs = [ intltool pkgconfig gtk libxml2 + nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + buildInputs = [ gnome3.defaultIconTheme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7c56b1ab6e56..9aa66d12fdcd 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.89.8"; + version = "11.90.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.89.8.tar"; - sha256 = "0rilldzb7sm7k22vfifdsnxz1an94jnn1bn8gfmqkac4g9cskl46"; + url = "https://elpa.gnu.org/packages/auctex-11.90.0.tar"; + sha256 = "04nsndwcf0dimgc2p1yzzrymc36amzdnjg0158nxplmjkzdp28gy"; }; packageRequires = []; meta = { @@ -295,10 +295,10 @@ }) {}; cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cl-lib"; - version = "0.5"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.5.el"; - sha256 = "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994"; + url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el"; + sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y"; }; packageRequires = []; meta = { @@ -306,6 +306,19 @@ license = lib.licenses.free; }; }) {}; + cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "cobol-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; + sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; version = "0.4.1.1"; @@ -809,10 +822,10 @@ gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: elpaBuild { pname = "gnugo"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.0.0.tar"; - sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x"; + url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar"; + sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -956,10 +969,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20160623.tar"; - sha256 = "057djy6amda8kyprkb3v733d21nlmq5fgfazi65fywlfwyq1adxs"; + url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar"; + sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2103,10 +2116,10 @@ ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "ztree"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar"; - sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph"; + url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar"; + sha256 = "14pbbsyav1dzz8m8waqdcmcx9bhw5g8m2kh1ahpxc3i2lfhdan1x"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index eebc140d2eb4..4920dfa3f534 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -376,12 +376,12 @@ ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emacs-eclim"; - version = "20160813.1754"; + version = "20170104.743"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b"; - sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -733,12 +733,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20161229.1930"; + version = "20170110.2036"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; - sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20161213.2320"; + version = "20170110.2036"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; - sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -772,22 +772,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "20160517.2220"; + version = "20170114.9"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "eef0de84bd61136d2ed46da08537c9a89da8bd57"; - sha256 = "0p0220axf7c0ga4bkd8d2lcwdgwz08xqglw56lnwzdlksgqhsgyf"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1303,8 +1303,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c"; - sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa"; + rev = "8324b88d54970059b0f8dd4695e38db6223d39f7"; + sha256 = "18jw8y2d9xjcacgv9k32579khjlg9mha23sia7m12paamjpjbm9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1423,12 +1423,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20161220.2300"; + version = "20170104.2226"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "d90689ad51188711640e6660f449c21232b6815c"; - sha256 = "0rsds06r53hrk1drq9sj5a2xkw3p2w986ziiqj143qrcp1yaig9z"; + rev = "b23c0c3578869b3b242a948e8a0d453fd6c437bf"; + sha256 = "02hakng87j9bcrvd310byrr8y01pa5yq5dgxjrwa9mlyb32l5rag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1448,8 +1448,8 @@ src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b"; - sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2"; + rev = "86729cd7cac5f86766ebdc76a43e35f261a9e078"; + sha256 = "0cyvq7asv08bp8kjr641m50dwi326kwb6p67vd4h302liac64br6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1465,12 +1465,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20161218.1121"; + version = "20170117.217"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "e01abf039a39de2fdc00a1b7f36842c5f68ff97d"; - sha256 = "1nbr25003b0jlchy26l4pm1r4gxa2zprnqr8k0qvkhyrszjy78qg"; + rev = "714516d3f3695d0673f07721d4cff0043a287495"; + sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1486,12 +1486,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20160824.821"; + version = "20170106.1020"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "2a81fc6642d23a4d825dae96aa2e23e865b0d56a"; - sha256 = "0blyj7m169imfifvhkwsim20163qwcqhv1f7rq9ms1awi5b33pq3"; + rev = "2c21ee4ebe3e0b60e5df5c8e54a7c2b10f110b85"; + sha256 = "119canyh19ck8fzashnwj9yfk0rm9qsg1yibyfjccd9inp8h7k6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1528,12 +1528,12 @@ all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-ext"; - version = "20161216.415"; + version = "20170114.1805"; src = fetchFromGitHub { owner = "rubikitch"; repo = "all-ext"; - rev = "456bcf277158fc71f66ec11bff4c826c9b0db778"; - sha256 = "091sf4m06s7c6wbckzcqfdz5g2lvh2q84hfny202kwq9j7fr7nlm"; + rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88"; + sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext"; @@ -1688,8 +1688,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "4f84759cab7746cf705f75719e701551d47de1e3"; - sha256 = "1sra3blrdkw4yd3ivsyg64vgd8207clfpqhjchja0x2n3z8792v5"; + rev = "fe7a4ece906c5aec242b94e95befa50080414d3c"; + sha256 = "0lisa1j4x13yk5cgdakdk2xly3ds3hw2s2vq0am375a57p65vpq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1955,12 +1955,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "20161115.1128"; + version = "20170111.1318"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; - sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; + rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; + sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -2452,10 +2452,10 @@ apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropos-fn-plus-var"; - version = "20151231.1205"; + version = "20170102.902"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; - sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k"; + sha256 = "0a9cfycj4y9z7sm7501bcyn6d66fq1jlna3zmr85m9fbkk42zlyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; @@ -2471,12 +2471,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20161207.1248"; + version = "20170106.1329"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1"; - sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn"; + rev = "c1088e51a0e678930bf147c46faa9c9ec59a6035"; + sha256 = "0l2wdvipwf4m1834zbsnlldjlign9m93hh9lkkkbg99jfkppnzkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2801,12 +2801,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20161101.1955"; + version = "20170113.743"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; - sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; + rev = "ab59b076afe892a0dafe56f943533dafb4594369"; + sha256 = "05k4x5gg0gga2nks0jnk0c4vwv383irm60q1b2z45yqykj9cn1f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2906,12 +2906,12 @@ aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "20161214.825"; + version = "20170114.137"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee"; - sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; @@ -3054,8 +3054,8 @@ src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae"; - sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn"; + rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09"; + sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3614,10 +3614,10 @@ autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: melpaBuild { pname = "autofit-frame"; - version = "20151231.1209"; + version = "20170102.903"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/autofit-frame.el"; - sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw"; + sha256 = "05pww6hqfknrkhn8iq53r8lzikggw6is6syrypxybkmxhfbx4d9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; @@ -3717,12 +3717,12 @@ autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autothemer"; - version = "20161221.1331"; + version = "20170112.1324"; src = fetchFromGitHub { owner = "sebastiansturm"; repo = "autothemer"; - rev = "add7d430e0be2f4cd7ccc622f8fbc8bc44be762f"; - sha256 = "0av6r2frjsbfxxl7lh9r7ccmsrc9yxmllqq8r1y52dzpc18iihpx"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; @@ -3780,12 +3780,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20161228.1236"; + version = "20170110.1046"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "a0ea17a380bebe28e00bb6855168a72aa28e8afc"; - sha256 = "1n8ms7mxc4gr3mb1x6rd1k8wzfk0y6ix9q11p01ahaa9zizbkyfp"; + rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7"; + sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; @@ -4889,8 +4889,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1"; - sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5134,12 +5134,12 @@ bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bln-mode"; - version = "20161210.610"; + version = "20170112.527"; src = fetchFromGitHub { owner = "mgrachten"; repo = "bln-mode"; - rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0"; - sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw"; + rev = "1de92cec97a4693b8b932713e333730118db9183"; + sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode"; @@ -5173,22 +5173,22 @@ license = lib.licenses.free; }; }) {}; - blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: + blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20161227.1810"; + version = "20170110.751"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "4a16df2a1e44f5486931af9c79f6ac55ce74b76f"; - sha256 = "0xn2njbd3jsv7na0z87rhyg115cp2cppkgslldzi6405xkmfc76y"; + rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9"; + sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk"; name = "blog-admin"; }; - packageRequires = [ ctable f names s ]; + packageRequires = [ cl-lib ctable f names s ]; meta = { homepage = "https://melpa.org/#/blog-admin"; license = lib.licenses.free; @@ -5197,12 +5197,12 @@ bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bm"; - version = "20161024.1006"; + version = "20170103.1424"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45"; - sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4"; + rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f"; + sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5322,10 +5322,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170102.909"; + version = "20170113.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; + sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5362,12 +5362,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161125.448"; + version = "20170109.1223"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "981d5becae30a31b6ef4f87680386148d0535455"; - sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda"; + rev = "c0a5a8763ea617de58e595ee30f8e20533e663c0"; + sha256 = "1mfxcdh6m1s0v43hbiprysflm3yb0b3j9b22vzxclf4sfz2yywz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5774,6 +5774,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "20170109.1220"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; + sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -5795,19 +5816,18 @@ license = lib.licenses.free; }; }) {}; - buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20160811.1911"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "buffer-sets"; - rev = "9f266fb9b6325286ea312c9997071b74b5bb45cc"; - sha256 = "0pxykjnq892k93i1yil1f51gv9286gpwlnddq82jhq20hzh79r9c"; + version = "20161231.1331"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; + rev = "f29c30f7cef4e29837c1e6e1282cf99a37c4210c"; + sha256 = "0kdi330p5xk67nzhj7mrz8arsblbx39lj1z4zy863294fn3ark7g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets"; - sha256 = "1011x76h8sqk4lp85gddwc9hagmcsykywn0h7qpv0z9bmwqj1s43"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets"; + sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl"; name = "buffer-sets"; }; packageRequires = [ cl-lib ]; @@ -5858,12 +5878,12 @@ bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bufshow"; - version = "20130711.1039"; + version = "20130726.1138"; src = fetchFromGitHub { owner = "pjones"; repo = "bufshow"; - rev = "afabb87e07da7f035ca0ca85ed95e3936ea64547"; - sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh"; + rev = "d60a554e7239e6f7520d9c3436d5ecdbc9cf6957"; + sha256 = "1rh848adjqdl42rw8yf1fqbr143m0pnbrlznx0d97v4vszvbby2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow"; @@ -5900,12 +5920,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161213.735"; + version = "20170113.124"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01"; - sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq"; + rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade"; + sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6465,12 +6485,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161227.1417"; + version = "20170107.651"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "156574632e47e49aeb7d17c1d2344e10c06c3acb"; - sha256 = "00cfddcy60ps7ljw5zx7j14ig62kgf4m9kc7997vdyrsw466r5rz"; + rev = "670b34d9bf4207680b0783c2a0ea8b1c8f914e58"; + sha256 = "1slj9gkxknm56k16x827021b1q6384px8pja5xia524b0809hyqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6866,8 +6886,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "df262b76a025d2a837ed0331c4affe1998959249"; - sha256 = "1lc6pfgn30fj4bcwzkxbpzvx17jdh99z2cp6yy53gmmgiimdm7bd"; + rev = "d31c2ffc3171030c04eddbf50bcac7be27db9c77"; + sha256 = "1skhqpyx3qgrlby92qb1p2qarzagj6hc91ph818wb8id2z26k71i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6906,7 +6926,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11929"; + rev = "11945"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6983,25 +7003,6 @@ license = lib.licenses.free; }; }) {}; - character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "character-fold-plus"; - version = "20170102.916"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/character-fold+.el"; - sha256 = "0z6fc46sqdhnkpfichq9cnnnjmlcni0rxaj30rabpzkzmpsza79h"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bb32513eaaafded547058e3de84fc87710d2cf0/recipes/character-fold+"; - sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3"; - name = "character-fold-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/character-fold+"; - license = lib.licenses.free; - }; - }) {}; charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "charmap"; @@ -7047,12 +7048,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20161106.1219"; + version = "20170114.2251"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "329ac84def1af01c19761bd745ee4f275003161f"; - sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; + rev = "00f8f3cdf6131d1eafe1107e5c82ef69661e1318"; + sha256 = "0ba2j3g12mf1rckbpfcpb0j0fv7wwxln8jcw7mn8a05c5pcikjp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -7093,8 +7094,8 @@ src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "48b1770e069a99eef10215f1ed268f852982fdd2"; - sha256 = "0r9wg77vag8m4k23whcss9p65v2jq9ypmjm74y6r2qpb9l68pnlg"; + rev = "aba1317a57cb673f61038d217aab88709aa254d5"; + sha256 = "04cpvwkbmcjf69m8xp6p4ldn0qc48saq87k6cpa9pgxhf8z84lxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7257,12 +7258,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161123.1614"; + version = "20170111.1209"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f"; - sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3"; + rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; + sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7506,12 +7507,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20161227.21"; + version = "20170112.26"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "0fcc4c98c91802417cadea90972a641a91baaf70"; - sha256 = "0np2hv3x620lvdm1lznc9mjhi0jh06agkb475cbqvj9jw922zrqf"; + rev = "460a1dc948ea8994eb8b379d132448d26cf7572c"; + sha256 = "0j9f6gi8zhws12vcwzng2a4bg4hdyvqsb08ha70as7xm9ym8vv6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7695,12 +7696,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161118.414"; + version = "20170107.632"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; - sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; + rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; + sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7782,8 +7783,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "290889"; - sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y"; + rev = "292208"; + sha256 = "0li360592lv9hw3a73lva1bjj5qx518ky0yy1sqsb0mw1y7l5rip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7883,12 +7884,12 @@ click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "click-mode"; - version = "20160331.1448"; + version = "20170105.20"; src = fetchFromGitHub { owner = "bmalehorn"; repo = "click-mode"; - rev = "10b129740907155fd8290f24efe0f374358a02f3"; - sha256 = "0hbdk1xdh753g59dgyqjj6wgjkf3crsd6pzaq7p5ifbfhrph0qjl"; + rev = "3c31e65b0b8476a15a3e2394fa05477ce42ea790"; + sha256 = "0117qn81gbjnx48wl53riqz65yxr8h691fa8j7bgrz32xnjpxz77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode"; @@ -7904,12 +7905,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160916.513"; + version = "20170116.1431"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7988,12 +7989,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20161223.1457"; + version = "20170114.1148"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "46a925305ad9cf3fce09921ce201e7f527d76e77"; - sha256 = "1dxy1y02x2447ig0cfvjfhkiv8sih5d75hbdy6s9qhy2ljbmnjw3"; + rev = "7941d906d603a650d836e3a2ba25554772adb236"; + sha256 = "0gjmhwx4ibyr7fm2lssah9xbqfwm0174w5zv2hm27v37a8ncvzhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8357,12 +8358,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160914.148"; + version = "20170112.614"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; - sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; + rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566"; + sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -8424,8 +8425,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "bd9b53ab33bb2185d526e8897cbd8f95c680b2c7"; - sha256 = "0r6dqiaz8mj5xzhgwzlbn8lqxkg9kv65qwd8x1c8rqnjs3r86c9x"; + rev = "020cba316bb3a4d33da5108ab10d2c06b4712427"; + sha256 = "1c2hsy6b6b7vwg7fdjliz3f0yy7j7f8cj3627w5alhp5k6r6mnv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8918,12 +8919,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160916.1758"; + version = "20170106.1620"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "81d8990085960824f700520d08027e6aca58feaa"; - sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; + rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd"; + sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -8981,12 +8982,12 @@ column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; - version = "20161020.434"; + version = "20170103.1231"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "column-enforce-mode"; - rev = "858a49daca67188cbcc151a7b531556552d48d00"; - sha256 = "1hb2lwnq7f81qnp3kymhld0y05kqd249nnpnbiby4pdfwwfc92fl"; + rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc"; + sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode"; @@ -9167,12 +9168,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20161231.837"; + version = "20170112.2005"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "906deabef91c217658635e55f726a7de379e9560"; - sha256 = "148q9wazdjzvd8lm810zknp12wfbqn3c4lbaf0v83kx0b4bkglyf"; + rev = "c494fc65d35f7f00c2da17206e6550385ae9b300"; + sha256 = "07ys3rbsdvhi60lan2gsk7rccikf9gsl2ddmm0sz2g8qal7d2a2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9396,8 +9397,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "d51b801fe319e7984cbc202c4745214d84039942"; - sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61"; + rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75"; + sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -9455,12 +9456,12 @@ company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emacs-eclim"; - version = "20170101.1312"; + version = "20170104.743"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b"; - sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9497,12 +9498,12 @@ company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: melpaBuild { pname = "company-erlang"; - version = "20161226.206"; + version = "20170107.115"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "company-erlang"; - rev = "a5e8fad1c21d0ee72f1e6287a95eb88953a356c7"; - sha256 = "0kdir2m2rdzwwiwpbgagiva4zsicnn5l55aaxdg5his0vc0fzxcl"; + rev = "70f65acb5912b27284ae2ff55d72e4687b862432"; + sha256 = "0dpkm6fh1qw8nz75n3na4hbvw9ggxn9dq9p9qmb7pdbcc78nsi44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; @@ -9564,8 +9565,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "company-ghc"; - rev = "976f10fca813e851d395b8c52ae6edf23d35ae63"; - sha256 = "1gmnll0m9lh4p9i44ddnxlnbg5lf20410imyfbk88jwhidx1pg7s"; + rev = "ff2205c0b309467eea763521d30220e7849c75b0"; + sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; @@ -9812,12 +9813,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160910.1747"; + version = "20170111.2112"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; - sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9965,12 +9966,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20160604.2331"; + version = "20170115.1551"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "0c3ccf910e108b4a69d10b56853959a6cc352018"; - sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -10095,8 +10096,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10447,12 +10448,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161219.731"; + version = "20170104.737"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8"; - sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10552,12 +10553,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20161212.146"; + version = "20170111.456"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "5728486a2852cda5b6b12890de917326ce3bd75c"; - sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5"; + rev = "6d126d599b36aeaf840ca5fc3cd595e8fad4697e"; + sha256 = "1lmmgwgggwh9h2rkfrwdy6bdi1j3z3498kbmzmlj72i3b1lx9w8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10741,12 +10742,12 @@ creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "20161231.2153"; + version = "20170105.2029"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "c1b2de723d1047ffa199a2cfb14131218962a07d"; - sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823"; + rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; + sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -10991,12 +10992,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20161105.512"; + version = "20170111.1133"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7"; - sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z"; + rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e"; + sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11132,38 +11133,19 @@ license = lib.licenses.free; }; }) {}; - ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ctags"; - version = "20110911.304"; - src = fetchhg { - url = "https://bitbucket.com/semente/ctags.el"; - rev = "afb16c5b2530"; - sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags"; - sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y"; - name = "ctags"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ctags"; - license = lib.licenses.free; - }; - }) {}; ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20150427.2014"; + version = "20170111.2150"; src = fetchFromGitHub { owner = "jixiuf"; - repo = "helm-etags-plus"; - rev = "eeed834b25a1c084b2c672bf15e4f96ee3df6a4e"; - sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2"; + repo = "ctags-update"; + rev = "b0b5f88bb8a617871692429cf099c4203eff610c"; + sha256 = "0wdxqkhflwnaic3ydr8an23z2cwsm1sj3di2qj5svs84y0nvyw7s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update"; - sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; + sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; name = "ctags-update"; }; packageRequires = []; @@ -11221,8 +11203,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "60779eea3601f62b0d59b0fcf28fd0cfb99383f6"; - sha256 = "0zwgs1hndx6mbay8mfarwkr524kbjfirkgjwxh9db600xrpiszqr"; + rev = "87c067150e955e3f2b0864e2ec9929fa3289ff28"; + sha256 = "13xrln4fqdq3siz8p2vilwwma1p0fnk7rxxd89v0pc7zw1nl8yrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11485,8 +11467,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "2031c5340eb9ce0e304b59f8dd89bc9049900d4e"; - sha256 = "19bvvk3nd6hhy4rzczs1jfiy3jvrsl28xsw84wn2sslm247svd7g"; + rev = "d02cc4c5d831da27cd871cbb3feaf8bea72ec0c0"; + sha256 = "055wjr2kgvqji9ifwjchi8m4f095sq8df3vfxcv2n6ifgdwlmzkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12424,12 +12406,12 @@ desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "desktop-plus"; - version = "20161216.19"; + version = "20170107.1332"; src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; - rev = "3bdce03d0499c5176fa9dd353f618727652a7130"; - sha256 = "0hgsfcp4b3prrjmz6997zh8bayk7kv6h95ll4qq0bnrd8p99i6f8"; + rev = "88055cee526a000056201898499cebbd35e3ea76"; + sha256 = "1nkljslx8cwmm4z18mhnwrc1lmd6lxdyhk8bwhzms7g1p6yi99d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; @@ -13130,10 +13112,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170101.840"; + version = "20170112.1427"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1vblbkflszci8x415am68fy9if02gnnphz2sz3h3c0368kixf6w7"; + sha256 = "136nacjnnfd8j771k90zszbjq96fsvm944l1zb06gqlm7x94psll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13601,12 +13583,12 @@ discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover-my-major"; - version = "20160108.1041"; + version = "20170113.2306"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "discover-my-major"; - rev = "af36998444ac6844ba85f72abbc8575040cb4cc2"; - sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9"; + rev = "ac83b24b5130eb0944f820736012df0924cce528"; + sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major"; @@ -13744,12 +13726,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20161114.142"; + version = "20170109.331"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; - sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13765,12 +13747,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "20160603.1517"; + version = "20170105.623"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; - sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -14059,12 +14041,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161221.49"; + version = "20170114.440"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "9da6013f24fb00ffc1f2f15c3aeb05181df5d36f"; - sha256 = "1im6aqc26vjw9sc4x2gj16jdz3hh0mz64p81d7gvmfhjysinyfhn"; + rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535"; + sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14211,22 +14193,22 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161223.1807"; + version = "20170111.2138"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "e4694fa64e6b27fef489eec2e60a78507ee0b3f2"; - sha256 = "0dlh6q9m7h9h4vaf82qw5pdkf64m1pp1kfk8jkilprc273qr4m2j"; + rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d"; + sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; name = "doom-themes"; }; - packageRequires = [ all-the-icons dash emacs font-lock-plus ]; + packageRequires = [ all-the-icons cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/doom-themes"; license = lib.licenses.free; @@ -14618,12 +14600,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20161215.414"; + version = "20170112.1136"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14"; - sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v"; + rev = "6f40ad04b760d2266b8c07283df266471d85a9b2"; + sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -14662,7 +14644,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1777121"; + rev = "1779173"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15266,12 +15248,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161209.1546"; + version = "20170112.443"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c"; - sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15347,12 +15329,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170101.1436"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b"; - sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15389,12 +15371,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20160913.5"; + version = "20170104.1041"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "dbaac412c465dcee0a637fbaf64d6fc954f6ae6c"; - sha256 = "14cv67nbn10j43h9s60a4h8wjg67m2xw4s19lrdhj3fbyp0g0zby"; + rev = "36db74ef44edfc654618d681f3452b9904740f9a"; + sha256 = "1hc1hb0lnkjanjddcwax783n2fcv5lvi1xl1kszbdzlck4sz1i1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -15725,12 +15707,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161212.1946"; + version = "20170103.2124"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "95594ff4a88d94f79b092b2eced1e87fa9ad5ee8"; - sha256 = "11d9d9qgfdid47pk9vi1ca3wjp02b3bylzbz23hpcrl7zjypr4ar"; + rev = "99011d5780dd726ec46b7936e2cbbade66b725db"; + sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15902,12 +15884,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20161219.528"; + version = "20170112.2043"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "334a1ea3869818ac40e84f9832b8996564286ca1"; - sha256 = "1fi71fkfl95alkamam1z51ksn2pqchcy2gvnkn0smfs9wcy038s1"; + rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b"; + sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15963,12 +15945,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161228.741"; + version = "20170111.542"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "481d8a879f821e8cbbf074175672295356f43ba5"; - sha256 = "0ip60d4k466y3gd16na58398ilzrzrk84dbl5lsh330khi65136a"; + rev = "e226b30139e283bf5c3bbf7419b9383c72237c88"; + sha256 = "04szmzri65qagy7af4rrq43idmy5qpl9lqvwq708rzsv8mkqpkqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16023,22 +16005,22 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20161216.118"; + version = "20170103.1427"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "6beb80f2f094cd4b4d8a5fdf56b61d9d04d73b39"; - sha256 = "1jk9vphm30523l8i1qf4iyaf6bds2m9mpz5ivrd62dxldzrs7q8z"; + rev = "dffc4f16a0bbaf2a767961297df4570423479117"; + sha256 = "198cii3nk0cmqciyhs0gjlhn6gnsslbry36hm9zp7r3kzk8hsc6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ auto-complete clomacs dash emacs spinner ]; + packageRequires = [ auto-complete cider clomacs dash emacs spinner ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -16068,12 +16050,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20161022.614"; + version = "20170112.2204"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "bcb05bc970e1dd19e8542b562bafb0ad68cef8cb"; - sha256 = "0d4sg57fn8xi2s9959lwkdv3k2naqnz2wkzr76ap1g5zllpykw8i"; + rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb"; + sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16131,12 +16113,12 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20160923.1157"; + version = "20170114.2257"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "e3cff9f127ab62dc177b043ce319c7866f6fe2f0"; - sha256 = "1qclqb5g50m208hwyalc6gc0y04lbai8fplxs0nadas3478x5344"; + rev = "5fb2867d2e0350dda047a903ce60d264f78ef424"; + sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; @@ -16353,6 +16335,27 @@ license = lib.licenses.free; }; }) {}; + eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eldoc-overlay-mode"; + version = "20170114.2125"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "eldoc-overlay-mode"; + rev = "794c2b959611d1352cdda9e930f2ddd866b4118a"; + sha256 = "04lndhm1jb0kvv0npr5wmgj8v18537fgp62c6m4gzgcjyfxihmr7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode"; + sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs"; + name = "eldoc-overlay-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-overlay-mode"; + license = lib.licenses.free; + }; + }) {}; electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-case"; @@ -16461,12 +16464,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161231.735"; + version = "20170116.1128"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4"; - sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16535,8 +16538,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4"; - sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17273,12 +17276,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20161102.1605"; + version = "20170110.1853"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -17298,8 +17301,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -17319,8 +17322,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -17340,8 +17343,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -17859,12 +17862,12 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20161207.1229"; + version = "20170109.1526"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "483877f912944ff0e4a51362548c3528c4df068c"; - sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj"; + rev = "c671b08facf37be6fc6783260cee686866cfed14"; + sha256 = "05v90g6ybdp2fmnnklnbdxygnw8xw0whmxbdw45qdww8idf2swfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -18278,12 +18281,12 @@ erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-colorize"; - version = "20160108.220"; + version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; repo = "erc-colorize"; - rev = "391391582b3c34750d56a3b3e819e03ad7c3bd42"; - sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r"; + rev = "d026a016dcb9d63d9ac66d30627a92a8f1681bbd"; + sha256 = "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69214e89ec0e00b36609fce3efe22b5c1add1f9/recipes/erc-colorize"; @@ -18634,12 +18637,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161206.1258"; + version = "20170112.1108"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c"; - sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs"; + rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6"; + sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18680,8 +18683,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "9cb4770469218f65dbaec6c71d12b4aa722ac791"; - sha256 = "1jnaabp5zrvm6qymy4fg3rxbd78xy44x1qnxcdvmqk0dliaqlzn3"; + rev = "eadc98327e3fb173d80a92e6ae2e7d7e85f92d67"; + sha256 = "1bn43p122ld3269klzcpfwacswnlpj2hdz9kx6n5691zv0w3qi5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19005,6 +19008,27 @@ license = lib.licenses.free; }; }) {}; + eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "eshell-fixed-prompt"; + version = "20170108.1301"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "eshell-fixed-prompt-mode"; + rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af"; + sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0bc9259d7ee9eaf015f6583f82f1313d69e6f29/recipes/eshell-fixed-prompt"; + sha256 = "0r0dbqmxzlh1sqadivwq762qw7p6hbrqprykd6b1m9m9gbb2qnkg"; + name = "eshell-fixed-prompt"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/eshell-fixed-prompt"; + license = lib.licenses.free; + }; + }) {}; eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-fringe-status"; @@ -19071,12 +19095,12 @@ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; - version = "20161120.1117"; + version = "20170108.749"; src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "e763b4c0bcd70252396d7825cb53bf00e60a547e"; - sha256 = "00ckk2x9k8ksjlw54sajcg13m6c9hp3m6n71awqbm9z17prnkzl1"; + rev = "e30081fdfb20e380bdcd00b04fcca41aa2bc57af"; + sha256 = "1xq1y6ddq9hxcc13wzj55snc7dg75y1z78f5bhnm9ps3ww7nmc9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; @@ -19092,12 +19116,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20161206.2249"; + version = "20170116.2038"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "033924f138f19f22a30c1845e728691e5615fa38"; - sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; + rev = "c9334cbc1552234df3437f35d98e32f4d18446b8"; + sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -19218,12 +19242,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20161223.108"; + version = "20170116.214"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "ce8b83a6ddd930c74d84b564d55bfcc22b455007"; - sha256 = "0fbd1l2vnrlx8zkyqwy2hkdp3h31qnxrc8djl2b3w11n6xkhgar9"; + rev = "8ba2d5c5a5d9abb5fa907e2e27e6ccb9a130158e"; + sha256 = "12kx8wbr4wzvrlcbk48qbpfp4pdfsxxgx19qvl127c91ajbxksxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19778,12 +19802,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20161231.1310"; + version = "20170110.2004"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "88c0bf01b9e7199c98a6054a425a226790ad96df"; - sha256 = "1akbg5qhq64nbb3iqhpi0ffyc8sffqszjgglvhclbdwkxcbq3f12"; + rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101"; + sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -19841,12 +19865,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20160607.1015"; + version = "20170115.1343"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "09e0622e167c89cd4dfa4e2037aaff0aceee52ad"; - sha256 = "0lk1wsv7k53774mn6ggrm28i9mxzg0xqv8hj372ka66v6ahlb34f"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -20135,12 +20159,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161229.1224"; + version = "20170113.19"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "c1b886acffa804c39b85909bbcb699fc1dbd03fe"; - sha256 = "0jj45m6s2hm36h5v2bwlxhnayrfwbs99zc1xvfd0kxkx9jz10fz6"; + rev = "d5b50be73b4288400d418abe86f92504081ea32d"; + sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20202,8 +20226,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f"; - sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1"; + rev = "e2df8629971df7c905256c504ff5f90b94eebdb8"; + sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -20450,12 +20474,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20161103.1020"; + version = "20170104.1209"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8"; - sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb"; + rev = "b1bcddda1e2fe7f239223fe0fe0994c1745657d1"; + sha256 = "0vpa0hbi1m3f2yxy56wyhm9fja35frnq6xs7bb93gmigbpa96f47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -20492,12 +20516,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20161029.606"; + version = "20170115.1604"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2"; - sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y"; + rev = "27dc66d5d8ee64917bf5077a4d408f41099622ed"; + sha256 = "1s0ffrk1avn008ns6qvj4mnjb476bvgsg74b22piq3s3fl8yycr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -21751,12 +21775,12 @@ find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-temp-file"; - version = "20160108.213"; + version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; repo = "find-temp-file"; - rev = "c6c44c69b3edf2a56cc56b1fc166dc8ce4144228"; - sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3"; + rev = "513005d19d72d71f34481ee00158dd57bd93206f"; + sha256 = "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c01efd0cb3e3bab4661a358c084b645dc7e31736/recipes/find-temp-file"; @@ -22417,12 +22441,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170101.1502"; + version = "20170112.1646"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "09c1e98fd020f9edee7c0c90e59b4da636f4af70"; - sha256 = "0w9ma5nzahjirhg3scb9j9kbgzr2fznp9sdjvrfgcaqak28hm40h"; + rev = "d0b058ecbfbf7f1d130aa46580cb77ac67a1fc9d"; + sha256 = "17x8na9wbclznr4rvvznpljizx6vaw4a8cvpk45c2mijwbh1bz2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22834,6 +22858,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-flawfinder"; + version = "20170115.1927"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-flawfinder"; + rev = "7d964d38023b088adf3ffc2fddeead81f4491a45"; + sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder"; + sha256 = "1nabj00f5p1klzh6509ywnazxx2m017isdjdzzixg94g5mp0kv5i"; + name = "flycheck-flawfinder"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-flawfinder"; + license = lib.licenses.free; + }; + }) {}; flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; @@ -23513,8 +23558,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -24328,12 +24373,12 @@ fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; - version = "20151203.603"; + version = "20170104.916"; src = fetchFromGitHub { owner = "kuanyui"; repo = "fm-bookmarks.el"; - rev = "e1440334a4fe161bd8872996b6862d079d8eb24e"; - sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3"; + rev = "11dacfd16a926bfecba96a94c6b13e162c7717f7"; + sha256 = "0is4617ivga8qrw19y7fy883fgczzdxvrl15ja1dydzj2cbn5d97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca020aff7f19cc150cd6968ae7c441372e240c2/recipes/fm-bookmarks"; @@ -24577,12 +24622,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20161219.141"; + version = "20170109.859"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf"; - sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c"; + rev = "1bae400e5154d7494fd989b1be47450565810e23"; + sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -24845,12 +24890,12 @@ frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; - version = "20151120.2318"; + version = "20170110.1606"; src = fetchFromGitHub { owner = "liangzan"; repo = "frame-tag.el"; - rev = "7018490dbc3c39f2c959e38c448001d1864bfa17"; - sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30"; + rev = "73d6163568c7d32952175e663318b872f995a4e5"; + sha256 = "1ks8qw1vq30mjp7bpgrk3f11jhm9viibiap6zjk8r5rykjzl1ifv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69899b53c158903b9b147754021acf1a6136eda/recipes/frame-tag"; @@ -25018,12 +25063,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20161211.2200"; + version = "20170112.1727"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "b633674651d324a2aa09a53134e5a617d7ee5f87"; - sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2"; + rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; + sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -25039,11 +25084,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20161123.2000"; + version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "350de8f1718144bd42f445e7fd460854f851470a"; - sha256 = "144nb62ha4m171k2vh061d24q05p435947zqnrx59xp3agj5ymvv"; + rev = "0701902122308f376dab4f2a4371600ddc05ae3e"; + sha256 = "0ahjhr7bmmpkvqxmr0m8c3agaiffqg8p6h5xnbjv93ar6ajk2pz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25305,12 +25350,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20161203.231"; + version = "20170108.35"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; - sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; + rev = "ce7014cb298f01ff96f52cba38fc7714daa7d5a6"; + sha256 = "1cz4sn325fy87xs6zs5xg6l9vsq06hsf4aksn87vg4mdnkj53xym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25450,12 +25495,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161202.1657"; + version = "20170116.1834"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "6893f692259c0241049bf614147160c44dd4ba3e"; - sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6"; + rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a"; + sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25643,8 +25688,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "b859ca7f40c1a6b0a4250497dca1f1c524e08f14"; - sha256 = "0lzighzxyz4m8zanhbiz4cis0r4v9j5f2s7h709kpmzzmxr8qd6r"; + rev = "e20bb704f61776926ce1d7d3852b54b76dd43644"; + sha256 = "085ym61ll1ixk7lp3kxcp7aryf6ih9nqkx1nbm93i5asb4h8v996"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25933,12 +25978,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161227.1257"; + version = "20170112.334"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d75529458b09998a68779d348527aa5a19045bed"; - sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25954,12 +25999,12 @@ git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20161206.1051"; + version = "20170109.734"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608"; - sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8"; + rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7"; + sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue"; @@ -26017,12 +26062,12 @@ git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe"; - version = "20161221.1712"; + version = "20170112.2133"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter-fringe"; - rev = "0b28a5f2a575cc710473884d6d2bbda5975c11e0"; - sha256 = "0474y0qxdq9srhc279dndx4338wrjxq4cq4ngx5ig7sj6v12dqn4"; + rev = "16226caab44174301f1659f7bf8cc67a76153445"; + sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; @@ -26371,6 +26416,27 @@ license = lib.licenses.free; }; }) {}; + github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }: + melpaBuild { + pname = "github-pullrequest"; + version = "20170115.2216"; + src = fetchFromGitHub { + owner = "jakoblind"; + repo = "github-pullrequest"; + rev = "9ccdeea36b2cb78f0bd2907cb45d1ab287a6af90"; + sha256 = "12j81h095rsfqbways4hm9wdr91wwc31b8hr1my55m91r204b9r4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest"; + sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34"; + name = "github-pullrequest"; + }; + packageRequires = [ dash emacs magit request ]; + meta = { + homepage = "https://melpa.org/#/github-pullrequest"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -26392,6 +26458,27 @@ license = lib.licenses.free; }; }) {}; + github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "github-theme"; + version = "20170112.2207"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "emacs-github-theme"; + rev = "cf9a167e8940ee8f678f2c72495f4ffff9e88509"; + sha256 = "01wxs4vywfnzb0j2inxmm37glqz004laay711scrizwvqs3bhjd6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; + sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif"; + name = "github-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/github-theme"; + license = lib.licenses.free; + }; + }) {}; gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; @@ -26647,12 +26734,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170102.1952"; + version = "20170111.804"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "c2ceb4c59c9ed5f17a9ed274007185ad62037134"; - sha256 = "0gn7wjq93fq824rs2r82mygy0b3ncn3wfki1xh12b5crvdibg3q7"; + rev = "40c591698f04a9f1563a6ff969d3ea3acea43abb"; + sha256 = "0ns8vp4vi225q9vd2alvw9yihdvbnmcm5rr5w31hi9d0b6figqfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26731,12 +26818,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20160210.247"; + version = "20170104.1240"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "c363af85f341cc878d6c0be53fd32efa8ca9423b"; - sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn"; + rev = "6eea368514eb38bc36aee0bc5d948a214784a90c"; + sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -27106,12 +27193,12 @@ go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }: melpaBuild { pname = "go-projectile"; - version = "20160825.1644"; + version = "20170104.1730"; src = fetchFromGitHub { owner = "dougm"; repo = "go-projectile"; - rev = "6b721aba171fd4aaef890369b11972eee1dfc8ce"; - sha256 = "0hkkl70ihmnc93wli2ryxr4il1fis85mjkvs520ac8w3g84g19rv"; + rev = "46e937a88cbfd9715706fbc319672bb3297cc579"; + sha256 = "17q23d29q0kw2vqcf8psjvhiqnk4ynpbbflcy35kihilwvrsx2l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile"; @@ -27404,8 +27491,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "159b4c81bbca97a9ca00f1195a37174388398a67"; - sha256 = "15vcdzkfnx36m3dw0744rsdqnridvzdiyly7n3hjck1l87gwvvia"; + rev = "b282a74fea1455f4648d7f3098c954cce46e3a8d"; + sha256 = "0q2vkzr2vvkvnb3zw3mzcggpa897adv1hq4sk1mcfav2s4zri9jk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -27421,12 +27508,12 @@ google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20160111.211"; + version = "20170112.1022"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; - rev = "bb1a149bbcc5627250be8267481e884795b448cb"; - sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb"; + rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135"; + sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; @@ -27649,12 +27736,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20161213.1524"; + version = "20170107.2101"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "5d78646f635f83ea5f77eee236fbbe4885aca063"; - sha256 = "105s3jn0yf0q0sv9w8ggqji6wdmkzz20psa89q7mf4gjlynas6q2"; + rev = "733acc9e4cb9ce9e867734f298fdfc89ab05f771"; + sha256 = "0jna5a3w8nr819q3rwcagbin75dk9drgyy04z5b3m8k2rpxyikwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28303,6 +28390,27 @@ license = lib.licenses.free; }; }) {}; + guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "guix"; + version = "20170114.133"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "guix.el"; + rev = "2794ab96de95fae8aad12c33ff1726d5348cae7b"; + sha256 = "0cj5mlshh76m3fmnzxjyrq8kw0y22qvcd9wjqwkg392jw9s5kaqc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; + sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; + name = "guix"; + }; + packageRequires = [ bui dash emacs geiser magit-popup ]; + meta = { + homepage = "https://melpa.org/#/guix"; + license = lib.licenses.free; + }; + }) {}; gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; @@ -28394,8 +28502,8 @@ src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "868893474ebe8bd58d799dd1d065230cf1ac1e8c"; - sha256 = "0msp9h8xzgpbdydihsgsbijxcw8gliqrlpnkvb3bd3ra9xp57wrm"; + rev = "e0fba32899da6bd0484b1b820578184d5764ec5b"; + sha256 = "1vch1m605m5nxga08i49fga6ik2xxf3n6pibhr6q9wj59zv515hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -28516,12 +28624,12 @@ haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; - version = "20150508.2011"; + version = "20170104.2224"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "7717db6fa4a90d618b4a5e3fef2ac1d24ce39be3"; - sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w"; + rev = "813530d171b233a42f52b97958f1245e1a09c16a"; + sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -28747,12 +28855,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170101.1257"; + version = "20170116.407"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "e5340a565fa379814472de10a330a85b08350e37"; - sha256 = "03wcglphbnm7brrx46xliq3h6jkz6kq29z2a2vl5223hz1gwlq1n"; + rev = "6f729159ea21997f629473652266dcd32dcba523"; + sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28809,12 +28917,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20170101.347"; + version = "20170110.631"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "cd655d0d25a5ed7e9da4ebb824fff04993ab8306"; - sha256 = "16rc5fmz4pgkd6phvzqji5lgwxzidhxkl1aa76w32lk7m8qm3yxh"; + rev = "c94662f0efdc9f350d8554e62955f0a7405ab545"; + sha256 = "0hlwv3m0mmwwvqa0nla9b8n7mi43zxmpg6fmmqi311ii75sqb2pa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -28955,12 +29063,12 @@ hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hcl-mode"; - version = "20170101.305"; + version = "20170107.27"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-hcl-mode"; - rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06"; - sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g"; + rev = "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e"; + sha256 = "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; @@ -29015,12 +29123,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170103.444"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29225,12 +29333,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161213.2242"; + version = "20170103.1125"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774"; - sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96"; + rev = "8735714d6be62187538ffd9187e8aee87b49b969"; + sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29414,12 +29522,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160912.1935"; + version = "20170115.1740"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9481f84bfbc6538e1cbe1a4cb01255088bfe1491"; - sha256 = "00zciia468svzhk4f7w9bwj20ixb280gwd7vfrxr1iw60p23x237"; + rev = "d678f1346331f12bdb6fe95536608fb3e94b2f70"; + sha256 = "0gmi23yx8l85923y0arm7v0v9zgspbp6gkb8a8jmnl5z2akqpzgh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29502,8 +29610,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-cmd-t"; - rev = "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb"; - sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs"; + rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80"; + sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t"; @@ -29582,12 +29690,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170103.444"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29754,8 +29862,8 @@ src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56"; - sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i"; + rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6"; + sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; @@ -29852,6 +29960,27 @@ license = lib.licenses.free; }; }) {}; + helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-etags-plus"; + version = "20170113.614"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "helm-etags-plus"; + rev = "704f0991ee4a2298b01c33aafc224eef322e15e3"; + sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; + sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; + name = "helm-etags-plus"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-etags-plus"; + license = lib.licenses.free; + }; + }) {}; helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }: melpaBuild { pname = "helm-filesets"; @@ -29880,8 +30009,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "294850c4ce16ae25f2214f863cee0118add60974"; - sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; + rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; + sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -29897,12 +30026,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20161229.1056"; + version = "20170110.957"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "7754ed3e0f7536487624dda2d4001f7eeb92d86d"; - sha256 = "1z0rbx5iix0mq2ai94ip8wnwgxh6sd6qsynaayrgj2hmzsbvv12d"; + rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75"; + sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -30275,12 +30404,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160917.2238"; + version = "20170115.2129"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "76c573d2c0bd277041d917c9968b180d48a0fdce"; - sha256 = "1dxm1r5qfriv33kaqf9gzwdrlmsww08lzvmxvfg9505qsjma4b5c"; + rev = "108e93d0d099ebb7b98847388f368311cf177033"; + sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -30988,12 +31117,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20161213.2311"; + version = "20170113.209"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "10531b2634559ea2179f2530423beaac815e9a38"; - sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c"; + rev = "6d750dee69befb97bda1e8b6045973e5a5eca233"; + sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -31051,12 +31180,12 @@ helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: melpaBuild { pname = "helm-purpose"; - version = "20160218.1009"; + version = "20170114.836"; src = fetchFromGitHub { owner = "bmag"; repo = "helm-purpose"; - rev = "de9e38c55b114cadeed60e70fc406f5181ff30d8"; - sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip"; + rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287"; + sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose"; @@ -31920,10 +32049,10 @@ }) {}; hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-comnt"; - version = "20170101.1008"; + version = "20170116.1012"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; - sha256 = "1gjca7796bg6skyqry90l5ywpw72zl6zkhzbq9fy8bi8q7a76g06"; + sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt"; @@ -32150,12 +32279,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20161230.1538"; + version = "20170106.1025"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "6fa450df12393fa659dfd5ec71fdda37fb7ee821"; - sha256 = "0m4h71fb95mcfpbf78r5ird6pabs0sikrkh8w0hy1rimiz9g2mm1"; + rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e"; + sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -32423,8 +32552,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "967c8a0017694c8057c90a3b22f9d2ef4f060617"; - sha256 = "15d5as40s073f5611xm08w5cy6h4bzcj31pbnr384acla0i81lh1"; + rev = "19e73ed76974f7c6a75c277e7e99e09f26d3ad66"; + sha256 = "0q22iay0n4asqm378s4fcb7vdsyfhddls1ij6v1m4mhsjq7a6inw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -33350,12 +33479,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20161204.505"; + version = "20170108.148"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2"; - sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl"; + rev = "36fb5e0149795404d0271419fd4354ba58f81dbc"; + sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -33389,6 +33518,25 @@ license = lib.licenses.free; }; }) {}; + i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "i3wm"; + version = "20170116.1825"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-i3.git"; + rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf"; + sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm"; + sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl"; + name = "i3wm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/i3wm"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -33517,7 +33665,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170101.1027"; + version = "20170115.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x"; @@ -33936,8 +34084,8 @@ src = fetchFromGitHub { owner = "pjones"; repo = "ido-select-window"; - rev = "946db3db7a3fec582cc1a0097877f1250303b53a"; - sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f"; + rev = "a64707d8d154664d50d12e26417d586e4c3dd78b"; + sha256 = "1iifpgdpa98si0g2ykr0xbxcbqrvzqfl6r1dv9zihmxhdr7hs9c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/775c8361322c2ba9026130dd60083e0255170b8f/recipes/ido-select-window"; @@ -33995,12 +34143,12 @@ ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-springboard"; - version = "20150505.1011"; + version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; - rev = "ffcfaade6f69328084a0613d43d323f790d23048"; - sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi"; + rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; + sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/409d847fb464a320e626fae56521a81a8e862a3e/recipes/ido-springboard"; @@ -34428,12 +34576,12 @@ imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; - version = "20160220.1332"; + version = "20170115.1226"; src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; - rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc"; - sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg"; + rev = "5449180574f52a3a9f8de7408594ccf45c92d5d5"; + sha256 = "1xd9ymqmxdfnw6l6bz2bvpn764h3y9abgymm3c66403cq3dx8rz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; @@ -34763,12 +34911,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20161218.1754"; + version = "20170115.1602"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "1dd007201a6f1465791edaea7e80e3adbeda5a45"; - sha256 = "07hgzwydvg56f9kpg7ch5g1i429s6c8fssn3zzk58rxnc620jv83"; + rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f"; + sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -34788,8 +34936,8 @@ src = fetchFromGitHub { owner = "hiddenlotus"; repo = "inferior-spim"; - rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c"; - sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg"; + rev = "fb9aa091f6058bf320793f1a608c1ed7322c1f47"; + sha256 = "0855w29rsgy04bc6m6bjggpzmlkv5z9zxx1p0qlhqr3msj1dqgfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim"; @@ -34823,12 +34971,33 @@ license = lib.licenses.free; }; }) {}; + info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-buffer"; + version = "20170112.622"; + src = fetchFromGitHub { + owner = "llvilanova"; + repo = "info-buffer"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; + sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; + name = "info-buffer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/info-buffer"; + license = lib.licenses.free; + }; + }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170101.1030"; + version = "20170109.1240"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "05s8wjv0nvdbdmc30kjbvipk2yvnvivhvjr0jrpkhq4s043135xq"; + sha256 = "087svwy5s8pkvfmg5s1qk4vfg315fsvhqkdjq0pa3zavly3vm1kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -35037,8 +35206,8 @@ src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "52928a0259cd5081e2b92cc2826cf1a79f231296"; - sha256 = "043kn7iwr1489rszicsg9c1lbr1my4r0aycnr3aspvsh8jv0280s"; + rev = "d5a827ce9ee1bdabb7561203a3e774ca599514c1"; + sha256 = "11dxkgn9d6slcwq1zpi13g2cy80ns97gprxakqjvy9gi2l5wl634"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -35137,12 +35306,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20161225.327"; + version = "20170110.234"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "0e23fad70451607243e6b8ece4df8bb268d42061"; - sha256 = "1pkxnip07kh21y99czcnvhbf4yihjipwq2qq5hfsqmniwws0bbqn"; + rev = "0993383bf4a36f8e4480e5ea50226e1f8fa549c8"; + sha256 = "1f4syyfga5f49nvlcw4ajxabxki9hglf89mslxkh15zib3mpakf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -35158,12 +35327,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170103.425"; + version = "20170110.430"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "cb18c88db105f0be39f201010833e248d073d76c"; - sha256 = "0y0598phgz4plwb72j5yic4kww4jjw1giv8pf4m3i6angvnv3zhz"; + rev = "5b727f41e70aaf1d9d4dad7d4e7c4bafe122bec1"; + sha256 = "1z712b1kgmkhwcchagb8sdlcxv3ji7f8jfkig09z49af7hvg4g7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35716,12 +35885,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161228.1838"; + version = "20170109.626"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8"; - sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35737,12 +35906,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170103.227"; + version = "20170103.1125"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774"; - sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96"; + rev = "8735714d6be62187538ffd9187e8aee87b49b969"; + sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35758,12 +35927,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20161018.1145"; + version = "20170113.247"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "ec8588b1be34b9508a5eaf893c9854e2938d02a2"; - sha256 = "1f03fyc3x34nzm1hk5snvbkqfcp829whjvs8i7y4byap7m0npaf9"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -35804,8 +35973,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8"; - sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35902,6 +36071,27 @@ license = lib.licenses.free; }; }) {}; + ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: + melpaBuild { + pname = "ivy-youtube"; + version = "20170109.338"; + src = fetchFromGitHub { + owner = "squiter"; + repo = "ivy-youtube"; + rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e"; + sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; + sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + name = "ivy-youtube"; + }; + packageRequires = [ cl-lib ivy request ]; + meta = { + homepage = "https://melpa.org/#/ivy-youtube"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -35968,11 +36158,11 @@ jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }: melpaBuild { pname = "jabber"; - version = "20160124.552"; + version = "20170106.1603"; src = fetchgit { url = "git://git.code.sf.net/p/emacs-jabber/git"; - rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510"; - sha256 = "0v1w7hk0s0a971248chi4nzsppjwrhxsfjbvi4yklnylm2hm2y3s"; + rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e"; + sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; @@ -36344,12 +36534,12 @@ jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jazz-theme"; - version = "20160715.829"; + version = "20170115.723"; src = fetchFromGitHub { owner = "donderom"; repo = "jazz-theme"; - rev = "17f6dd1625e32567ccde4848aa660501032963d6"; - sha256 = "1wpq3aclamk2rk8dh2l4yhafcghqrl5dwmz7gc83ag7zyb77np32"; + rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e"; + sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; @@ -36386,12 +36576,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170102.757"; + version = "20170109.1138"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "5e41bd8ad9b172cc980ae5a9c7b50bcfc18ebacb"; - sha256 = "1xp515kjc18ryd5imb3r64nkinzqx1wxkzalgw672i6p7ydw529s"; + rev = "5ac4f497f8226acc23dd9c266c958fb82f6816b4"; + sha256 = "17l07r0wf5gj77lln6bmi1c4fg4igf2qnrla2s9piyrqffa4jgrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36824,12 +37014,12 @@ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; - version = "20161027.2259"; + version = "20170115.853"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9"; - sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr"; + rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb"; + sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; @@ -36887,12 +37077,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161230.1612"; + version = "20170116.733"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "8569ba6734184b869b4ac42e79231d195ea4dba2"; - sha256 = "14j9qaqls403i5w5046w6qhw23gva7yfhmbw9mrdmwffl53nxfng"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37409,11 +37599,11 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20150930.917"; + version = "20170117.316"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; - rev = "54d855426372"; - sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w"; + rev = "713e6c7d8e07"; + sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban"; @@ -37934,8 +38124,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "082c4544415ab6bd976d9dda9c342bae109e7cbb"; - sha256 = "0b3dikix9mr5zch1m6dyf51y2fp48iqvpjwflqfn3x4j7k6pscgb"; + rev = "80f1f82759d5e4f2537da7620e2c0d3ea88aa7da"; + sha256 = "0bk7ixm4dvblmal8xi0n061xqb13ipdgxpl9gx7aihzi18429i8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37951,12 +38141,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20161230.2008"; + version = "20170116.503"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "d43238ffbbf9863c36a0064f3291dac2013a46c8"; - sha256 = "1mbw82w0l1lazm6k9hchvcdqrrs2q9zpj7fxb0kyvfd5nkk99p0m"; + rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8"; + sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -38245,12 +38435,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20161212.313"; + version = "20170104.211"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484"; - sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2"; + rev = "c77596042d4f96e1cfdc2e8a542dd30cd55227a6"; + sha256 = "0wrwx1lgy38hvp7axwkgm3a760nw8gwl1b61ll33vc4qajgp525g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -38365,27 +38555,6 @@ license = lib.licenses.free; }; }) {}; - latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "latest-clojure-libraries"; - version = "20140314.617"; - src = fetchFromGitHub { - owner = "AdamClements"; - repo = "latest-clojure-libraries"; - rev = "6db8709a746194800a3ffea3f906e3c9f5d4ca22"; - sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/35c24ed9ea2793ae3469a3927dc66716603cfa6b/recipes/latest-clojure-libraries"; - sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5"; - name = "latest-clojure-libraries"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/latest-clojure-libraries"; - license = lib.licenses.free; - }; - }) {}; latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; @@ -38511,6 +38680,27 @@ license = lib.licenses.free; }; }) {}; + launch-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "launch-mode"; + version = "20170105.2112"; + src = fetchFromGitHub { + owner = "iory"; + repo = "launch-mode"; + rev = "25ebd4ba77afcbe729901eb74923dbe9ae81c313"; + sha256 = "1pjb4gwzkk6djzyfqqxf6y5xvrsh4bi5ijg60zrdlnhivggnfbvn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/876755fff14914b10a26d15f0c7ff32be7c51aa3/recipes/launch-mode"; + sha256 = "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060"; + name = "launch-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/launch-mode"; + license = lib.licenses.free; + }; + }) {}; launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launchctl"; @@ -38808,12 +38998,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161211.1055"; + version = "20170114.617"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "10585a4333b409ee8b6e1a329de912464b69351d"; - sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1"; + rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba"; + sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38868,12 +39058,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20161204.908"; + version = "20170111.1330"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "aef45adb5178998e6e406c89bb058a92fd0f6863"; - sha256 = "16qs6wc0vh4k6hnr0jkjdgi3rq4a0v5w9yynpccw3c8ws24i7n6j"; + rev = "0d412fc713efb893c7f44f1bd8dd66eb01693f30"; + sha256 = "1hsr21fzd3kkavznjcgd9jv6galkx3aky73fs91plr5l7gdvqz38"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39166,10 +39356,10 @@ }) {}; lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lispxmp"; - version = "20130824.507"; + version = "20170110.1508"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lispxmp.el"; - sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf"; + sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp"; @@ -39185,12 +39375,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170102.254"; + version = "20170112.236"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "74e9f0c2e4f3b64e2553449cb7346996ffef96f0"; - sha256 = "1zhaqvzb78f775n3ba4a0qsjgszmayidsgkahqy2bv392ckq6mzl"; + rev = "f66433837a4ccabcfc7f05d74d7ee8217691d943"; + sha256 = "154kwk1h1grcjbimaglsir5i5j72bak1lxw69bjm5d5yf3qg60p5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39227,12 +39417,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20160816.1536"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "a5648a611c7d538176b86dd1b3dcb6477c136f12"; - sha256 = "1h9a8jx0jajpi1kfw9n10q9zq842psh89z60ka3pvma5kwn8njyd"; + rev = "c951f65a2300d884eff7afdd941fea275550c9fe"; + sha256 = "0hhllm6b0gkllpbfkc6ifcax1vmfplll9vbrfa8wqi0lghmy4npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -39498,12 +39688,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20161229.1546"; + version = "20170116.1607"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "e33dedc107e6a1d15fc40e78ebbebe3bc83571d0"; - sha256 = "1s53l83059skv15dc0bn1d9s572jnb26a2af5057p364l4qz5cng"; + rev = "f702dd8475b48526d1701b11776800388f6d8c70"; + sha256 = "0zdxz5zyy8xgrsbl3kpnzxifgbr670qnrq02sbc208al9jn8blk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39585,8 +39775,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "a3bfbbd5a2c5b7d9b2f4203369d05f4bda7df1a6"; - sha256 = "1dyr09dxz7sg9cb0hpa81nyviz7wyv16xs7wmipqqznl5f59kzzd"; + rev = "fca725c1928670ccc48510f431d96f19751dbc1b"; + sha256 = "1ag3h8jcrfdbhs1zil6xra5abngkl35yw6av769x0vp6wldxklrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39811,12 +40001,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20161108.1149"; + version = "20170114.1515"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -39917,8 +40107,8 @@ src = fetchFromGitHub { owner = "jschaf"; repo = "emacs-lorem-ipsum"; - rev = "893a27505734a1497b79bc26e0736a78221b35d9"; - sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx"; + rev = "4b39f6fed455d67f635b3837cf5668bf74d0f6cd"; + sha256 = "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c09f9b82430992d119d9148314c758f067832cd/recipes/lorem-ipsum"; @@ -39952,22 +40142,22 @@ license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20161231.108"; + version = "20170106.1709"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-lsp"; - rev = "ed97c84fb3e730eecc90451257a09b085dccab33"; - sha256 = "1h6d3l8id2zwikry4k9m2ybg6jxc9ww5wnn9rc9v16jbw08yi17l"; + rev = "d117f2d8d5b23688e0d32372a2c2d03e7bcd44c5"; + sha256 = "0g13hslwl9303k69mg4l5yrga4fsjbm0phvqr0kjycsq2zfipa2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1"; name = "lsp-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; @@ -40225,12 +40415,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161231.757"; + version = "20170114.1211"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d75529458b09998a68779d348527aa5a19045bed"; - sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40400,12 +40590,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161227.1257"; + version = "20170104.924"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d75529458b09998a68779d348527aa5a19045bed"; - sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40505,12 +40695,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161129.934"; + version = "20170115.1723"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb"; - sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j"; + rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213"; + sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40841,12 +41031,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161228.39"; + version = "20170115.2357"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "3880559c38060232e90a29adc11af41373ca7989"; - sha256 = "1m8m8ajcqyxb0rj4ink0vdxq23sl8q578hz4kj4ynsgiq70zwcab"; + rev = "c58481b5dacc62dcc53a9886e032ccaf4a41a627"; + sha256 = "023kpmj01ixpb2yfsfxym7zvbldhj8486ndanma0srzf1p9lmqq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41515,12 +41705,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20160902.827"; + version = "20170113.1308"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "7cc465af1d95a814387d241ff8a4c89d03b1e86e"; - sha256 = "1bhp0cx8kdr7mnmwg5q59qv019aalk4z7ic625qaa03gd6xr2ym4"; + rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9"; + sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -41536,12 +41726,12 @@ meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20161018.259"; + version = "20170104.2224"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ce923c93124c60c2eda1e3ffa2e03d2adc43bff0"; - sha256 = "043d6d1ajr19l78prg8c8gbg661p6c9d9l2xghj4zybwr0byv53f"; + rev = "fe384624b5e382b331ff80bc74a17becb5b01c7c"; + sha256 = "1l2wqjdmsh77vcxfmm8437z7rlx1avdk2bvq8w1wmps32gi52lhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -41683,12 +41873,12 @@ mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: melpaBuild { pname = "mentor"; - version = "20170102.28"; + version = "20170105.221"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "074bd57a1e19d7807d682552fee63f326d1ad05c"; - sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q"; + rev = "9a160d718b02a95b1bb24072cca87b4348e1e261"; + sha256 = "16n5dd00ajr2qqwm51v1whf2kmyr27mx30n3xlydf9np3f34hlax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -42307,8 +42497,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "00b9c0d92cca89a1313e203c33ec420a833c929b"; - sha256 = "1bza70z7kfbv0yi4f3zvr1qid9wypqypngw3kcx9majx7mim54gq"; + rev = "8857384be127b55bd7a20437e4592d8a0175ebc7"; + sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -42323,10 +42513,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20170101.1049"; + version = "20170113.904"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "191362k5mx0phzq4sc0x7n341dswgq9hkani6icwjhj5dsgvr6wy"; + sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42527,12 +42717,12 @@ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "mocha-snippets"; - version = "20160912.514"; + version = "20170103.2127"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71"; - sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw"; + rev = "e054137bd78f0d236e983874da1f345d30a71816"; + sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -42590,12 +42780,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20161125.2230"; + version = "20170116.1230"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8"; - sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20"; + rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7"; + sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42649,10 +42839,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170101.1055"; + version = "20170114.1554"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "0bzrcfhyp9gr850yr1db80zqqdxi688alhpix45xb6xg0kjndmck"; + sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -42710,12 +42900,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20161129.115"; + version = "20170111.1838"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3"; - sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr"; + rev = "70e71ef7404cc5c38254771695eee221090d5110"; + sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -42857,12 +43047,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20161025.621"; + version = "20170103.1555"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "fd742eee779c16f608d2369913ff067e1c47261f"; - sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li"; + rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7"; + sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -43376,12 +43566,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20161209.635"; + version = "20170110.519"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874"; - sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0"; + rev = "c8c22773d13450ed1a49ca05d02a285d479a9e45"; + sha256 = "1jc16dvvgg9x17gckljd013d8rjjbr5992mrrhcnpdn5qvj145i8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -44476,8 +44666,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "f3a11808a888e35d101fdd67b2474289bec4eeec"; - sha256 = "04k20s7pldngsr63azb0abgdm8qr7a4pm81c8v23n3hiwikx0zfg"; + rev = "95a09d97fdc86a570a9276a05fe42dc3c90dcbc5"; + sha256 = "1lydpljxf0air78qrc04x9g71ixmh5g5q6ln77acnivq9gn3xha5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44514,12 +44704,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161228.1739"; + version = "20170110.321"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "f4c13c3a8805d12f13f68ae4e651ff24f1ae9957"; - sha256 = "19gaddm5xh6mbl2zfmd5v9xgnyfg9pzxpah7x921r251pzlrwiip"; + rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; + sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44770,8 +44960,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57"; - sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs"; + rev = "9e71431e6f8323be8ced8997409cfe7a389c6583"; + sha256 = "0lnahkq47x9w8gi89bm91mjvap4dvwpn88pjysmp4ciw04v2h8s2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44812,8 +45002,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5d377ace2d74475ef696bce4ac0e61946d5b3769"; - sha256 = "1b0mzkiw66qz8c2mx8sify9gnq0hycl3qy0v640xbva0gkvxj1fz"; + rev = "c0d55f918379f46b87e43457745895439a85555c"; + sha256 = "05kmk92f7zzincs84z6zphmwsli6jhb81hha1ili9xibqpg5983w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45018,12 +45208,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20151229.603"; + version = "20170110.940"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "868339fffedc38f0fd0a3c21d167d8d48830ef84"; - sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym"; + rev = "53b7f09a9be6700934321297758e29180e7850d7"; + sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -45081,8 +45271,8 @@ version = "20161215.457"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "11064124732961f6fcfd78226ebaba0abed2c8fe"; - sha256 = "0gs26jlg32mb84k6y9hm420jlw73ibrq791jq9faa6n42ws9ifdd"; + rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5"; + sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -45535,12 +45725,12 @@ ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-dart"; - version = "20160707.2040"; + version = "20170106.824"; src = fetchFromGitHub { owner = "mzimmerm"; repo = "ob-dart"; - rev = "ded30450a1550af30edb422cfa8cb7b43995b684"; - sha256 = "0896mpjbl5j1b4d0h25k03xbi8dzb99gz1gvmwj5x1i7fcflhv6r"; + rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf"; + sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart"; @@ -45850,12 +46040,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160922.1638"; + version = "20170105.516"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "5715748b3448b1b1e4856387c5486c7b56c0699b"; - sha256 = "1jhzrlvwf02g0v4wybyry6n9dqcihv47n11m1rpmaxpg2z8551rb"; + rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea"; + sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -46165,12 +46355,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20160428.2334"; + version = "20170105.122"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "c0d5d453e192a5301e20042c6984823ec46b64d3"; - sha256 = "1wv24c6lybjkx63gl6lm2gvc2faw6nibdhi5w9yqgkaq6x6d7jvh"; + rev = "4bd1a2a4df1757dfc13e19b29b74e21a9b074f99"; + sha256 = "07ng57g25nik345p9cnjrxf7mpcfi3wqqbmk2i4yxyd4cai8hp1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -47156,12 +47346,12 @@ org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-context"; - version = "20160108.214"; + version = "20170107.537"; src = fetchFromGitHub { owner = "thisirs"; repo = "org-context"; - rev = "d09878d247cd4fc9702d6da1f79eca1b07942120"; - sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx"; + rev = "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21"; + sha256 = "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f33b6157eb172719a56c3e86233708b1e545e451/recipes/org-context"; @@ -47261,12 +47451,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20161228.633"; + version = "20170105.1740"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "f99f884c47586ac8689b11c20eb95b2976c74d7c"; - sha256 = "0w43bf9q6fhrakzlvncr8nwj6sar4cp022mfcim24jjhxk383vl3"; + rev = "bbfca2fe4149f21105c70d3df76bb789b3868643"; + sha256 = "19729mfbvsi2gpikv7c6c5a3ah7vrxkjc3s863783kginq28n8yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -47453,8 +47643,8 @@ src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "5d3cfb2cfe3a9cd8b504d4712a60840d4df17fe6"; - sha256 = "0hjiza2p7br5wkz1xas2chlzb2d15c3fvv30232z0q5ax9w428m0"; + rev = "d32031f7c488be0d9845c47cc1452d6d6489e561"; + sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; @@ -47575,12 +47765,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20161220.2046"; + version = "20170111.2044"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "6330511011b7fe8ee04300e82f090ce3efd3b100"; - sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47596,12 +47786,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20161024.46"; + version = "20170104.648"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "c5c8724ca987da77446161c0400d444ebd5bd983"; - sha256 = "17pjhs6x2qnqrag56f7rgnraydl6nbz6y21hj981zsjy3mv899hs"; + rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6"; + sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -47662,8 +47852,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83"; - sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47679,11 +47869,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20161126.239"; + version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83"; - sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47696,6 +47886,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "20170110.2011"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b"; + sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mobile-sync"; @@ -47816,8 +48027,8 @@ version = "20161226.1624"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "a187227f1c6760073a8a62328249d13c2c04f9e8"; - sha256 = "1n732cqxfddm1mx386920q14fl2y4801zy2a87mhq07qlrmshszc"; + rev = "b4c8de24950d9c13e90277359d078d2dc2b01063"; + sha256 = "0azk28ib6ch3anav7xlw41lqx5lfcqwg85sai4jk6gb9qgnibv5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -48028,12 +48239,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170101.904"; + version = "20170107.1308"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "7e69316cb029d46ffb505d78e8b7a5c0ee48d918"; - sha256 = "03n5c5921b142g9an0bfjlymq878mh2ahs0ygaslpsm4n450s4gs"; + rev = "31e2e9cd247a4613bcdf45703473a6345b281ee5"; + sha256 = "15lr7v5p1n46m3lfh84fwydkbxj9x11vd81x6i5adgj68msh0pcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49137,12 +49348,12 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20161106.823"; + version = "20170108.1348"; src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "9dcaf341ef574ecc09585a6eb1bf3846e6fb318b"; - sha256 = "0lznc82nrmx1s7k5xacd6vpx3zv6y11975mspi1adg995ww7b74s"; + rev = "0e9fa4ba5fc454e2312f8b3a6eb86cb63d3ff7ec"; + sha256 = "12qp9s9h56230882dfqz5006f5mjkxxvsp87y8n1jyx4vs10rk4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -49158,12 +49369,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20160906.1035"; + version = "20170104.249"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73"; - sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3"; + rev = "0741216c637946a243b6c3b97fe6906486c17068"; + sha256 = "1d1341k9kd44wm8wg2h20mgsn7n0bbsivamakn7daxsazym2h89f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -49242,12 +49453,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20161026.429"; + version = "20170112.1537"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61"; - sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28"; + rev = "3a2467d4050637a0551e1fac957f85644147d280"; + sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -50140,12 +50351,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161231.924"; + version = "20170113.956"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338"; - sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50242,6 +50453,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "20170113.837"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "076df7221f9450b96855c36684ae4a7481e0bb71"; + sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -50516,12 +50748,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "20160724.1929"; + version = "20170105.1414"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; - sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; + rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; + sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -50600,12 +50832,12 @@ pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-homebrew"; - version = "20161122.1843"; + version = "20170110.1609"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-homebrew"; - rev = "eaa725fd86a6ea641f78893021d23a426d62e715"; - sha256 = "0yhy6k71sd00kxadladnkpmragpn1l7j3xl6p6385x1whh58vqph"; + rev = "d001520fec4715c9a4c73f02fd948bac371cc50a"; + sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew"; @@ -50935,12 +51167,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20160404.915"; + version = "20170110.546"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "107cf4022bed13692e6ac6a544c06227f30e3535"; - sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2"; + rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; + sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -50998,12 +51230,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161226.518"; + version = "20170115.651"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "1116ead88123a11efef346db0045ee8389250bd2"; - sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; + rev = "06d56333d738c57fa543e47e7eb1c4962bd14344"; + sha256 = "0khzfh7qqfqpmjqb0kaz3s5kpf1a8inxln5awap5xh2z6fv6wysy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -51058,6 +51290,27 @@ license = lib.licenses.free; }; }) {}; + perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: + melpaBuild { + pname = "perspeen"; + version = "20170117.417"; + src = fetchFromGitHub { + owner = "seudut"; + repo = "perspeen"; + rev = "057f145f88fdfc021c574b7c263269e381494f4b"; + sha256 = "1a5cjvc21ga2j2y7rxcfxwkc0x9v5mrwla9prm021q4sg07gvld7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; + sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + name = "perspeen"; + }; + packageRequires = [ emacs powerline ]; + meta = { + homepage = "https://melpa.org/#/perspeen"; + license = lib.licenses.free; + }; + }) {}; pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pg"; @@ -51422,8 +51675,8 @@ src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "3287de50464e908d421e9ad191fe31b8fae89ed3"; - sha256 = "0m3z96n0nnsjisb1cpxcx17z2q1994qvrisnd47fv7sjj3r9g5vi"; + rev = "a6c998937341f49138f07c15050efe7e5809be23"; + sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51859,12 +52112,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20160903.1029"; + version = "20170114.1146"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -52129,8 +52382,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "1afbcb06fded2a427b761dd1615b1e48e1e853cc"; - sha256 = "14f150w0zyzfpi7cidrf251q6c5fp3kwxv0hd54bvpmh99f829zc"; + rev = "b631191323cd789137c14a3e00ea2d355c2fbbdc"; + sha256 = "1qgsdawr0b05h8xdc8mw2rkzs6y66rl2cqmva9k82f7776d3x02w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -53181,12 +53434,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161229.44"; + version = "20170106.606"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "72a8be50b9e6d4c23a178f777043e67794fc9728"; - sha256 = "06rbl0vjsk98xqknrckh695qq1yrdi13ms8gwbk1l34j6qhcnwl1"; + rev = "cdf9c228ccdcb57b73184f10ea3f1e2e4e03d320"; + sha256 = "02md2hmf21w03xc8imqmcbhildnkj9s69pig1zd9nbs1svgqbycp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -53286,12 +53539,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161130.1025"; + version = "20170115.731"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -53311,8 +53564,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -53563,8 +53816,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "4cb113a91b180559f0eedbca0244ef1181a7204c"; - sha256 = "1xhlc285ydjs1l4ans485ij09f3v54i2mllcik8l255gmm65aqh6"; + rev = "c9cd6acd71e928164db10602b9d0837216ee367e"; + sha256 = "0rm2476gvsqsyhblw0bwa4qacpdckp6r44d2qrznysdq9086lyjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53622,12 +53875,12 @@ psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20161119.2248"; + version = "20170110.228"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "33f9020e87732e14473c5fc4d986e572fd95c5f3"; - sha256 = "0ag57g4w44w90gh09w774jmwplpqn7h1lni1kwldwi7b7n3mhli7"; + rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; + sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -53892,19 +54145,18 @@ license = lib.licenses.free; }; }) {}; - pushover = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pushover"; version = "20160718.857"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "pushover.el"; - rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; - sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; + rev = "0d821fc23818918bf136e47449bce53d4e51e404"; + sha256 = "0v0dkhymh81z1wcd3nm5vrs5scz9466brr8xng0254bi3yn0yi57"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f2e3a155266e7534b4e77138fdfba4fafe9bac/recipes/pushover"; - sha256 = "1ja3xp8nxzyhzg85791s4rb9rm938fyvgkdjxhyyy36wmda1djwr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover"; + sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl"; name = "pushover"; }; packageRequires = [ cl-lib ]; @@ -54251,12 +54503,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; - version = "20161219.302"; + version = "20170117.402"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "2e8657e8ca2c049cef331e8fdc13c43541044f5c"; - sha256 = "09ly4gi4yd7nl7x4lzgjacfvjbc4mfsw2yfmmxiymj70xa7ffik3"; + rev = "e2f6d2cf5a6772a8de698e67768ae2f82a43419e"; + sha256 = "0lkkycflmkzziwr90njx8d68903m1bpb71awlb23dslw92qvl3fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -54297,8 +54549,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "4bb474dfad2d2dd8ea357f6b8e6a1c708246ac4a"; - sha256 = "0xhgq2ylkkrj0pf9gj7niahwy243s9714x720w88mbz6v04bcj3p"; + rev = "da1da56853380a5a387ad287f4398402b14ef123"; + sha256 = "1rvflbiz6ick1v2v6fw3f227rgs5fvhxaxyhvri0lv5n6ixljk8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54440,12 +54692,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170102.523"; + version = "20170117.130"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "695fe533a9a59e43f75d69cf005b69526bafc99d"; - sha256 = "1bh907dmnrcc31n7zjb3lnr98mck1vjzsyr6vzy5lqygymgxjdri"; + rev = "d20b482c2c10f086174c6bf7d5aa86867d9a9b8a"; + sha256 = "01jhzrm4w4lpslivkc1d9f00qmnnrfai5agl7pv6fjfhd7njwzg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -54752,22 +55004,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20160808.1753"; + version = "20170114.645"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "487a74c7db513ceba86e849c8f42f834234c1f7b"; - sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -54818,12 +55070,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161230.1422"; + version = "20170106.1524"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "a3c106e12c538cb6900e0940848557400bfa8313"; - sha256 = "13b0dpmc2ckp158rvnbc7alf4kswvl5wvddmr1vm76ahr0i5xwv1"; + rev = "d83091ff6b55b4663fed49de63ec2c751cdb2603"; + sha256 = "1fj2zq9cjlnf45z1xqcfir3y739jpiv08sqlgv807i6dgbr0vxls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -54839,12 +55091,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161101.1859"; + version = "20170104.754"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "ab625571837c96446e3704febea48b453787c5ce"; - sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq"; + rev = "351aa58d75491c789280a3703786f35c8be28bec"; + sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -55364,12 +55616,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20160813.829"; + version = "20161221.1216"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4"; - sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv"; + rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c"; + sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -55511,12 +55763,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20161227.1536"; + version = "20170117.415"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "4a5fe992f2b4a68f7b3840bbb24b496738760573"; - sha256 = "0448qvl33rvnwlwmsmm297w6ghb0gk0s1bkny3q3wagrwsi9zf2f"; + rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125"; + sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -55851,8 +56103,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "466794c0128cd1aaaf60d441f02e9f33afdd4542"; - sha256 = "1a2aaqgzscyb6y793gc6699g73vw64szn9d6k0qkb4q5j6k1r6mr"; + rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; + sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55972,12 +56224,12 @@ regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-tool"; - version = "20160907.2129"; + version = "20170104.1118"; src = fetchFromGitHub { owner = "jwiegley"; repo = "regex-tool"; - rev = "0de0716dc26b1182f7f986d8442345aad135019e"; - sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9"; + rev = "0b4a0111143c88ef94bec56624cb2e00c1a054e6"; + sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool"; @@ -56346,12 +56598,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20161221.1711"; + version = "20170113.423"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "8c90b24905a66a915790a9b723f28808a40eecf4"; - sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -56371,8 +56623,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "8c90b24905a66a915790a9b723f28808a40eecf4"; - sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -56616,12 +56868,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20160825.1846"; + version = "20170105.2156"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "d84a1a017b4c2871a9a39734be08fb8285f0b6a3"; - sha256 = "0b6vhl9cy9p51pa6gk6p3x2bmwsd03c7abkbw8j5gd8r3iyam4ng"; + rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e"; + sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -56694,6 +56946,27 @@ license = lib.licenses.free; }; }) {}; + rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rg"; + version = "20170115.45"; + src = fetchFromGitHub { + owner = "dajva"; + repo = "rg.el"; + rev = "96114ceeea83db703f41bed18f03d87e217c1c67"; + sha256 = "00k9lyzy11igk0j1raq3qgymfc872rf85fj42244lpmbnij4hgjd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; + sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; + name = "rg"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/rg"; + license = lib.licenses.free; + }; + }) {}; rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rhtml-mode"; @@ -56802,12 +57075,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20161116.211"; + version = "20170116.47"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -57075,12 +57348,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161227.1124"; + version = "20170111.2258"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "9234dc6c884d208bf878825dcfc49397df175b1f"; - sha256 = "1451rf6i5wafyrnax0ql4z450ax6i9r03hwzhh5xkxiijxwlw7rx"; + rev = "6e60bce8ae998e61c9cea6ceff3564a73a9efe73"; + sha256 = "1y9m1dh946qzpad2fp2dlyjsaj9hqhwf8gvg8zffxvchd5clhnls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -57141,7 +57414,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57259"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57221,7 +57494,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57259"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57445,15 +57718,36 @@ license = lib.licenses.free; }; }) {}; + russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "russian-holidays"; + version = "20170109.1340"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "russian-holidays"; + rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; + sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; + sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; + name = "russian-holidays"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/russian-holidays"; + license = lib.licenses.free; + }; + }) {}; rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20161031.2109"; + version = "20170107.451"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; - sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + rev = "c091852fbda25c62095513753b44d3fcaf8eb340"; + sha256 = "09m20csdn5f33cixq1wzi0682d85ld9rvi408s64h4bzkrgfn6h8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -57469,12 +57763,12 @@ rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "rust-playground"; - version = "20161227.1107"; + version = "20170106.1734"; src = fetchFromGitHub { owner = "grafov"; repo = "rust-playground"; - rev = "122db4a5a85565bc5939c90e19ae232eae729d3a"; - sha256 = "0ki1iwzmm9ir7f6l591dn1a8byyr9xg7gapa7d3fagsm3mnx0ak1"; + rev = "29075a3753cc0b48b4fcc0a99340306a856a8bc1"; + sha256 = "1g0b0jg45pf7xivk8xjsm77vd8fvpp2vwdwvgzr810hj8npnqhs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; @@ -57616,12 +57910,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20161228.2248"; + version = "20170113.631"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "5c1651b3b754e645d64ac5cc6831b0f12cab52e9"; - sha256 = "00ygigs78md650yap4gz5y5n0v2n08771df4kqnpklycc3csrlbh"; + rev = "80f2f7b06e48c2a771411c39f7d0067c9d145050"; + sha256 = "0ljd2v60f9i5pkqw2j8yylv1ya994hymrblx8dks38mx9br8m7b0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -57830,8 +58124,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "1fd9f05b441e85d5f827ce96154ce79ca334ce32"; - sha256 = "1rs5j08nbk90rsvrjk074avz1jp3zqqfgbi57ark8bb5hlvzl2rm"; + rev = "acb5331a94091b13ee9f9caec926d57386eded65"; + sha256 = "1jbcxd5ws9prlzglpxdfv3f22ncmb2b596l3zxym5z645521bcar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -58119,12 +58413,12 @@ scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-message"; - version = "20160825.644"; + version = "20170107.536"; src = fetchFromGitHub { owner = "thisirs"; repo = "scratch-message"; - rev = "8f9957a83788f391bf513e35bc877366b399dcae"; - sha256 = "0x2961bqby1ciqaz2r55bmyhddxjr2slffgkqb8fd788d5l5m927"; + rev = "3ecc7f5e3b8a597ebd1492fd426d3720a7f34302"; + sha256 = "1kb664r3gbhv2ja8jyyzfw22db99ini8qbgzcy9xsl56lha4x4xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message"; @@ -58469,12 +58763,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20150708.459"; + version = "20170115.237"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8"; - sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -59732,12 +60026,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20161212.642"; + version = "20170106.2358"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "d005d6567cc484b61f2d233f4bf828a2365223c2"; - sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1"; + rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc"; + sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -59900,12 +60194,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161212.300"; + version = "20170111.732"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0"; - sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly"; + rev = "1b5c7e82e3ee9c1cd4b23498d7516503cdb7d18a"; + sha256 = "0x7lc5l2mmr3c8jj37hb9gyyd0r682fx8rmyqi73yaq01bpqswnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59918,27 +60212,6 @@ license = lib.licenses.free; }; }) {}; - slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slamhound"; - version = "20140506.1618"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = "slamhound"; - rev = "0c9de69557cea66e056c7c3e0ffd5a4e82c82145"; - sha256 = "04vrhv2dp1rq475ka43bhdh7c5gb5cyflf4w0ykxb9rbkahwm8fj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound"; - sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x"; - name = "slamhound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slamhound"; - license = lib.licenses.free; - }; - }) {}; slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slideview"; @@ -60173,12 +60446,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20161217.1623"; + version = "20170110.629"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "87de8e96da7bce0120b4afb037af902c353269e0"; - sha256 = "1dm1q7sx6hcary1g729231z0g9m1mybidiibzp5zk2pkrdfx6wl5"; + rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d"; + sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -60278,12 +60551,12 @@ sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-quicklisp"; - version = "20160204.815"; + version = "20170112.135"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-quicklisp"; - rev = "fccc00b2e9c123c4fb88131ce471191c3ad289ea"; - sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y"; + rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477"; + sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp"; @@ -60652,12 +60925,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170101.605"; + version = "20170104.410"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "f661b7ffe5addfbf80355230d1c9a837d3a19ecb"; - sha256 = "11yfp91pi1gpphgbcy6h5xkyapy7j6p11xab4rjc9gbckl3al9kf"; + rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151"; + sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -61397,8 +61670,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "0c3ccf910e108b4a69d10b56853959a6cc352018"; - sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -61519,12 +61792,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161217.515"; + version = "20170106.539"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "3818119a87edb8bb458295a45dc65b41414a77a2"; - sha256 = "17p3l1qxgz2plr3z99mvbda0bx8qs564r1jhj3arqmz5zc447zvw"; + rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e"; + sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -61914,12 +62187,12 @@ springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "springboard"; - version = "20160329.1109"; + version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; - rev = "ffcfaade6f69328084a0613d43d323f790d23048"; - sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi"; + rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; + sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/138b8a589725ead2fc1de9ea76c55e3eb2473872/recipes/springboard"; @@ -62040,12 +62313,12 @@ sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-indent"; - version = "20150424.1716"; + version = "20170112.1507"; src = fetchFromGitHub { owner = "bsvingen"; repo = "sql-indent"; - rev = "f85bc91535b64b5d538e5aec2ce4c5e2312ec862"; - sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy"; + rev = "761a5724d181b75f30e64040408b8836d41f9db9"; + sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent"; @@ -62223,12 +62496,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20160326.552"; + version = "20170110.1756"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "da93f32cfe7d8a43b093b7a2c0b4845afb7a96a7"; - sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q"; + rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d"; + sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode"; @@ -62244,12 +62517,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20161220.2247"; + version = "20170109.2256"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "f36ffce4a2222c8a2b00881da3bdd114a2f7c628"; - sha256 = "1lb24avcysc2s4iwd1ivrfsmi0pqya648zb9znlnm01k71ifp26c"; + rev = "1c1e379b153bc6206985c765969fd6a9f56aec25"; + sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62412,12 +62685,12 @@ state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "state"; - version = "20161008.535"; + version = "20170107.535"; src = fetchFromGitHub { owner = "thisirs"; repo = "state"; - rev = "ff38227310347ed088fe34ff781037774cc7456b"; - sha256 = "0hanisrni8i0bbq7f2flvfla990nyv8238nb9dfjpvimkw7rjbsg"; + rev = "ea6e2cf6f592cbcfc5800b68f0fc2462555cacce"; + sha256 = "1bb2rrmvkxymqdyv3w4kr36qzszwgmadqck5h87j8pi82nh9j973"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state"; @@ -62493,6 +62766,27 @@ license = lib.licenses.free; }; }) {}; + stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stem-english"; + version = "20170113.24"; + src = fetchFromGitHub { + owner = "kawabata"; + repo = "stem-english"; + rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; + sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; + sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x"; + name = "stem-english"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/stem-english"; + license = lib.licenses.free; + }; + }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; version = "20140213.348"; @@ -63359,12 +63653,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20161016.709"; + version = "20170114.521"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5"; - sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -63405,8 +63699,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8"; - sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63775,12 +64069,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20161124.910"; + version = "20170107.1517"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "b2582df8f6c1125636f113100a77edcde0879c22"; - sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm"; + rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2"; + sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -64131,12 +64425,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20161228.743"; + version = "20170116.2155"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "c3ae08db2984c68a73468bc66c6517d286c74b48"; - sha256 = "1r868ywxl62pih1pwjh6rzq2cwlic6358j8ji56p6hx08pbx932m"; + rev = "69b816277c334c8f4ec7da8f283d52df951d5584"; + sha256 = "0fz59291wwrm5jdrq3qzkbihh2wvypp23hxcy24d0pp3nmav5g0a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64576,8 +64870,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285"; - sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64597,8 +64891,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285"; - sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64656,12 +64950,12 @@ terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "20170101.456"; + version = "20170111.2117"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "51ecf5858b910ddd373de4c6fbc0c12c202e8613"; - sha256 = "0dfjdwpyy1kp6j7flkxnfng74vkx93glq3idhzc6hq8a4wh2j64n"; + rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1"; + sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; @@ -64719,12 +65013,12 @@ test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-simple"; - version = "20160303.36"; + version = "20170117.411"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-test-simple"; - rev = "e199434a2ba2e19f9854504bfb0cee22fcd03975"; - sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814"; + rev = "604942d36021a8b14877a0a640234a09c79e0927"; + sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; @@ -65048,8 +65342,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "d8bb0e3b9ff7e6cecfc85c01a81280dc3d046430"; - sha256 = "0n2dy6l9wv08z5f67qlayw1ik3mfcblaflh0dl3ji1f6ygfm6y8h"; + rev = "5f723cd53980f395a92c438790a127cbd5699d90"; + sha256 = "1zf3ddyz8579kcwrbhb09nn5r0wxjwmafmrnrwljlch0kxwp79nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65105,12 +65399,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161217.2302"; + version = "20170107.1619"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "ab0e9fca712c6e890c213198fe9ab20284778f79"; - sha256 = "1msndmywrj0fny4fys5qj9nh1p01p2vsyn3wfrhj5asshgvp6g48"; + rev = "026af0842856bcc6dba26272feb1c9bec557de9d"; + sha256 = "0315lr5xs2ncw6k8d24ms0jk4k83x9jrzvn7534ciny7jjkll6fq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -65837,8 +66131,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; - sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; + rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; + sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -66245,12 +66539,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20161229.438"; + version = "20170109.1459"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "d4c82791b2a4e2c38c09a5afc61dab958b107428"; - sha256 = "13f4rj45m6qb1m21x9qnyb1xhfpb4pi8aifya0lb8xplav131bsk"; + rev = "5d53d1cc0478356602dc3d8a838445de9aa2a84a"; + sha256 = "0qj4racbh4fwsbgm08phbgcam2m348rcli950nd27sn7vza8vcy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -66701,12 +66995,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20161222.534"; + version = "20170116.1121"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "b62d64b8221c4209fb2d25bd49c85e3bfea19a90"; - sha256 = "1qzpv3lh51q8f4bvyr0wykvsm1jyf78wf8xvawjspp8vz76r8h7l"; + rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734"; + sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -67188,6 +67482,27 @@ license = lib.licenses.free; }; }) {}; + untitled-new-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magic-filetype, melpaBuild }: + melpaBuild { + pname = "untitled-new-buffer"; + version = "20161212.708"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "untitled-new-buffer.el"; + rev = "4eabc6937b0e83062ffce9de0d42110224063a6c"; + sha256 = "139gysva6hpsk006bcbm1689pzaj18smxs2ar5pv0yvkh60wjvlr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de62e48115e1e5f9506e6d47a3b23c0420c1205b/recipes/untitled-new-buffer"; + sha256 = "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf"; + name = "untitled-new-buffer"; + }; + packageRequires = [ emacs magic-filetype ]; + meta = { + homepage = "https://melpa.org/#/untitled-new-buffer"; + license = lib.licenses.free; + }; + }) {}; url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; @@ -67251,12 +67566,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20161222.903"; + version = "20170116.1309"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1"; - sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -67503,12 +67818,12 @@ vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-auto-commit"; - version = "20160108.215"; + version = "20170107.533"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-auto-commit"; - rev = "9e60dd775df9771185c8ff79fa0ce7f7cfb90c17"; - sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk"; + rev = "446f664f4ec835532f4f18ba18b5fb731f6030aa"; + sha256 = "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770ab1e99fe63789726fc6c8c5d7e9a0287bc5fa/recipes/vc-auto-commit"; @@ -67524,12 +67839,12 @@ vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-check-status"; - version = "20160108.216"; + version = "20170107.534"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-check-status"; - rev = "7c2e8a4e26d16c50343677fd769fc9d9d9778920"; - sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1"; + rev = "37734beb16bfd8633ea328059bf9a47eed826d5c"; + sha256 = "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0387e08dd7ed69b291e896d85bd975c4f5dcbd09/recipes/vc-check-status"; @@ -67650,12 +67965,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20161221.450"; + version = "20170116.1154"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "cfad650c53b4fcaad8f24bbb7d44623678d2edff"; - sha256 = "06ajkby1762i3pnsq0k9048qvxldk0ajrqvq4wwcqgc1xpbcdq7l"; + rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa"; + sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -67839,12 +68154,12 @@ viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "viewer"; - version = "20141021.1136"; + version = "20170106.1802"; src = fetchFromGitHub { owner = "rubikitch"; repo = "viewer"; - rev = "4cc7bba34fbf6ff65e26c1f0c3b16af7adf0a190"; - sha256 = "1ch8lr514f9lp3wdhy1z4dqcbnqkbqkgflnchwd82r5ylzbdxy2a"; + rev = "6c8db025bf4021428f7f2c3ef9d74fb13f5d267a"; + sha256 = "1sj4a9zwfv94m0ac503gan6hf9sl2658khab1fnj8szcq7hrdvq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/viewer"; @@ -68281,8 +68596,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "addc8637f9ab645b758b48b785a5a4c74c8ccc71"; - sha256 = "0pkjvil3wdcpwm7gq998lqr5dwp8qdzc025qjq0f3pqv9sq4yqq3"; + rev = "1561da428a1a30170b71cab71c576a508e4f4367"; + sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -68395,22 +68710,22 @@ license = lib.licenses.free; }; }) {}; - wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20141104.1645"; + version = "20170116.223"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "da6284ab75c3afa1275420faa9934037052e2967"; - sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri"; + rev = "08c9511cd0f07ba65ef5a07ad93851549391333f"; + sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l"; name = "wand"; }; - packageRequires = [ dash ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/wand"; license = lib.licenses.free; @@ -68671,12 +68986,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161230.1026"; + version = "20170114.906"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "abd9c738feb0d6069cf8de07fa7d109441a5ca54"; - sha256 = "049q9n3881f27lpsmjsxdfw6zkizqhrh3wwyxfibnzsq9c1631hi"; + rev = "3e74b741abf8d3113a67ab6b48fba7fdd404e712"; + sha256 = "0lagq9gzm8wrypks2zc5qjz1pqjhhlg4dxji9c1zdji5kq3bhqz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -69562,12 +69877,12 @@ winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "20161226.1051"; + version = "20170111.29"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "430d24dd29cf5a96eb31ea4bc6af150e4d530331"; - sha256 = "0ayj466md5xz6gflwl5sa81grpiydy5i2lkdpz7m8wlc81q3ng9j"; + rev = "25fbb9524ac7cde601b07cecd81fd1446e571282"; + sha256 = "1aibzgb9np9ik27jzaxg1gl1n15q1chxr5lhjvvpp05rr70ykll0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; @@ -69586,8 +69901,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "ab6afca9ee2e"; - sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69922,8 +70237,8 @@ src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "253710702282c2a789b9a6cd64d53a5fcfe08638"; - sha256 = "1kppxgq2hcra1a978r5m589y7cya07hpqlhg19qa3i6m92wz6jcj"; + rev = "a99896531a260db11acb931b68dbdc45030832d7"; + sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -69960,12 +70275,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "20160913.1902"; + version = "20170111.1534"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; - sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; + rev = "80dabd5d158929e8433e46207bb521282b21e4f3"; + sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -70128,12 +70443,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161218.2250"; + version = "20170116.919"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "80f46b8699aff1ee83ba43d636d765a852df0b4a"; - sha256 = "1zhzh1vih468zlycr3pmnjk1f2jr8qqg61n1jbjw58daxh4jj6jd"; + rev = "ed4539971dd9c32752c7ff5a1d280150446bc769"; + sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -70149,12 +70464,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170102.722"; + version = "20170116.1037"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "0f4d6f3239ced83d4f71660feca896ebe594e749"; - sha256 = "19ps3b60pzr8p8yii49kcsnvy0l0mpsfh231bfjsynrdzaz3zbd6"; + rev = "d49a743fede497d102d4dc2b739dbe35b41163ca"; + sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -70191,12 +70506,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170103.616"; + version = "20170116.2003"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "05d97718a519edae9acb4f729cc7b997d3016e21"; - sha256 = "0b83rn7b5ssqhwj1lgz8na1dlaj8k0900rci1ggyylrdxzbbssnz"; + rev = "9c8d51eb4441351c71854612eb990246ff23b8b5"; + sha256 = "11l2jhn82r6aavc4wkcn0w5f2g2hilaz3a3v2fv70gd1x7spw0w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -70275,12 +70590,12 @@ xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-reformat-code"; - version = "20161222.525"; + version = "20170111.812"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-reformat-code"; - rev = "a5034360857b8d795a8b9a9be72d53737c9e5c66"; - sha256 = "0sdxh9m3h9ain9ginarwia28qx19bia6f89788d6nvh1swlwxfi9"; + rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd"; + sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; @@ -70296,12 +70611,12 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20161218.2147"; + version = "20170111.652"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "a4e278440afc237907fd3d8c7ada45d2c9ff0141"; - sha256 = "0jz59iprd8s0ijay4l6mk7j47vd61v28y7l6xhgz9008gn9qbbzi"; + rev = "fb1b37f482ae2082d0a26214b2160760324d3fce"; + sha256 = "1am9zyszav8mr1g60g7jdmxd1hnvm2p7zpdrzv3awmr92y3psn1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -70485,12 +70800,12 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20160810.331"; + version = "20170116.833"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "fa99dbc8fa233100242a234e915fe658154d2a34"; - sha256 = "0j2yp6fy3gvgvpjdlrrxxwyax24ngv7jhxfj4rmf8wghf7i2flvg"; + rev = "331dbe01037873c209fbca2aeeaf42da446f1d79"; + sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; @@ -70947,12 +71262,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160903.1935"; + version = "20170116.1451"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "76ecf21a8b59f35087716ac713eb072fd3d98f00"; - sha256 = "1h0gnnsqfb6q88002pjzmhmq9is1f3knwh24nw2rbsg3mpfg378x"; + rev = "ff1064bbc4189f93433c3eebb9d0dde72a27e6c6"; + sha256 = "1spriw8c4qv7c349p8m29j5x6b72ysbpffcc444rdd9s1yypizzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -71132,11 +71447,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20161214.2131"; + version = "20170105.615"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5428250c886a"; - sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; + rev = "59459111e042"; + sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -71194,12 +71509,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161222.1039"; + version = "20170114.445"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -71222,6 +71537,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "20170113.121"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; @@ -71371,12 +71707,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20170102.1359"; + version = "20170103.2328"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "0d3a01b564cf0c64a83c3bf0652aff47f13dfaf0"; - sha256 = "0qazdp1x3mwpi20ilraqsb350rgp9vsk4qhby4qgrxqq1iv3n1nb"; + rev = "554778b48ffa35b0ebfbed31a6dc249afa16ba24"; + sha256 = "19zh9ifaqgf8d9lkxsgznd935p4yfhxcrdi583gp8m2vwa22kgrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -71437,8 +71773,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678"; - sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc"; + rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed"; + sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -71680,12 +72016,12 @@ zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20161123.405"; + version = "20170115.120"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "759517e1116c9162181db3aa74438d448b5e1233"; - sha256 = "04m9mhsmmi40n8qx1axfvg490j4afkj694jjq6r954dz2f4h2h98"; + rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6"; + sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; @@ -71764,12 +72100,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20170102.1009"; + version = "20170109.2040"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "ac3946f45c6e9f61fdd23c517d78b1844b231c90"; - sha256 = "02kr2qladcm82dsq2fii1k6ks21ywk216v2rhffqkxyq6xpanvpj"; + rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; + sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -71806,12 +72142,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20161227.426"; + version = "20170105.208"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "2751b96aca36cc5c31dc105ec985c269126420a0"; - sha256 = "099w5z28aznzc8ri26lz8fkql4lvv23j0cqijif7bfmiz6zq5l1h"; + rev = "3a4df17edddef84160194802acc034cfa2dbd678"; + sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -71824,6 +72160,27 @@ license = lib.licenses.free; }; }) {}; + zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zweilight-theme"; + version = "20170112.2205"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "emacs-zweilight-theme"; + rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e"; + sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme"; + sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf"; + name = "zweilight-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/zweilight-theme"; + license = lib.licenses.free; + }; + }) {}; zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zygospore"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index dc15c9e056ac..9d945859ffea 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -230,6 +230,27 @@ license = lib.licenses.free; }; }) {}; + ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ac-emacs-eclim"; + version = "0.4"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; + sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; + name = "ac-emacs-eclim"; + }; + packageRequires = [ auto-complete eclim ]; + meta = { + homepage = "https://melpa.org/#/ac-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emoji"; @@ -524,22 +545,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0"; - sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1292,12 +1313,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; - sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; + rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; + sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -1687,22 +1708,22 @@ license = lib.licenses.free; }; }) {}; - aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c"; - sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl"; name = "aurel"; }; - packageRequires = [ emacs ]; + packageRequires = [ bui dash emacs ]; meta = { homepage = "https://melpa.org/#/aurel"; license = lib.licenses.free; @@ -2065,6 +2086,27 @@ license = lib.licenses.free; }; }) {}; + autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "autothemer"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "sebastiansturm"; + repo = "autothemer"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; + sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; + name = "autothemer"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/autothemer"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -2743,6 +2785,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; + sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -2830,12 +2893,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "70ea295ec04cb34e383dc7d62927452410876999"; - sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky"; + rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d"; + sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -3733,12 +3796,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -4038,12 +4101,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4"; - sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0"; + rev = "35413bf2c1b33980afd418030af27f184872af6b"; + sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4434,22 +4497,22 @@ license = lib.licenses.free; }; }) {}; - company-emacs-eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emacs-eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; name = "company-emacs-eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib company eclim ]; meta = { homepage = "https://melpa.org/#/company-emacs-eclim"; license = lib.licenses.free; @@ -4476,6 +4539,27 @@ license = lib.licenses.free; }; }) {}; + company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: + melpaBuild { + pname = "company-erlang"; + version = "0.1"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "company-erlang"; + rev = "3296baf45e354171acfddf33071b0f5af64371b5"; + sha256 = "00r0rr2c11b8mpis7a64dj6bzpm2jm17lpqmrhjjnc66zpq1vq8y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; + sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7"; + name = "company-erlang"; + }; + packageRequires = [ company emacs ivy-erlang-complete ]; + meta = { + homepage = "https://melpa.org/#/company-erlang"; + license = lib.licenses.free; + }; + }) {}; company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; @@ -4860,22 +4944,22 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: + concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; name = "concurrent"; }; - packageRequires = [ deferred ]; + packageRequires = [ deferred emacs ]; meta = { homepage = "https://melpa.org/#/concurrent"; license = lib.licenses.free; @@ -5199,12 +5283,12 @@ creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "c1b2de723d1047ffa199a2cfb14131218962a07d"; - sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823"; + rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; + sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -5385,38 +5469,19 @@ license = lib.licenses.free; }; }) {}; - ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ctags"; - version = "1.1.1"; - src = fetchhg { - url = "https://bitbucket.com/semente/ctags.el"; - rev = "afb16c5b2530"; - sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags"; - sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y"; - name = "ctags"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ctags"; - license = lib.licenses.free; - }; - }) {}; ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "jixiuf"; - repo = "helm-etags-plus"; - rev = "d3f3162d5a3291d84b15fd325859c87e1a374923"; - sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7"; + repo = "ctags-update"; + rev = "ff4f211e42df94fdeba376e62b65dc67f0388589"; + sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update"; - sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; + sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; name = "ctags-update"; }; packageRequires = []; @@ -5824,22 +5889,22 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; name = "deferred"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/deferred"; license = lib.licenses.free; @@ -6496,12 +6561,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; - sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6517,12 +6582,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; - sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6627,22 +6692,22 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "dbe6ed4b4cf27ab676843505cb7c5edba50b455b"; - sha256 = "0npzshc9mv1zy8dmghz34nwdjlpgxxd4iiv2zp3l6qa0m78j52ri"; + rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426"; + sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; name = "doom-themes"; }; - packageRequires = [ all-the-icons dash emacs ]; + packageRequires = [ all-the-icons dash emacs font-lock-plus ]; meta = { homepage = "https://melpa.org/#/doom-themes"; license = lib.licenses.free; @@ -7130,43 +7195,43 @@ license = lib.licenses.free; }; }) {}; - ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: + ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.8.1"; + version = "2.10"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "219665ba1c9aad885cee6e9914448139be7f7299"; - sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid"; name = "ebib"; }; - packageRequires = [ dash emacs parsebib ]; + packageRequires = [ dash emacs parsebib seq ]; meta = { homepage = "https://melpa.org/#/ebib"; license = lib.licenses.free; }; }) {}; - eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; name = "eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib dash json popup s yasnippet ]; meta = { homepage = "https://melpa.org/#/eclim"; license = lib.licenses.free; @@ -8916,12 +8981,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2"; + version = "19.2.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f"; - sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; + rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950"; + sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9167,12 +9232,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "033924f138f19f22a30c1845e728691e5615fa38"; - sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; + rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5"; + sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -9523,12 +9588,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "3.12"; + version = "3.14"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "befb07d03c0c06ff5c40eb9cdd436c97fc49f394"; - sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -11861,12 +11926,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf"; - sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c"; + rev = "1bae400e5154d7494fd989b1be47450565810e23"; + sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -12602,12 +12667,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -14078,6 +14143,27 @@ license = lib.licenses.free; }; }) {}; + guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "guix"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "guix.el"; + rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c"; + sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; + sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; + name = "guix"; + }; + packageRequires = [ bui dash emacs geiser magit-popup ]; + meta = { + homepage = "https://melpa.org/#/guix"; + license = lib.licenses.free; + }; + }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -14458,12 +14544,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14710,12 +14796,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14812,6 +14898,27 @@ license = lib.licenses.free; }; }) {}; + helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-etags-plus"; + version = "1.1"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "helm-etags-plus"; + rev = "99512856918e485862ceb21460476adb0349f525"; + sha256 = "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; + sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; + name = "helm-etags-plus"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-etags-plus"; + license = lib.licenses.free; + }; + }) {}; helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; @@ -15970,12 +16077,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "5de979e1e001608c9fe73d552c4e29110957bbb8"; - sha256 = "1qaklfhf92zibj2wrpiyjqrzba7j00iqzb46nd7p64wyqqhh7ncp"; + rev = "d67cee32231aee30984b9c5d0250d21b5377b620"; + sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -17059,22 +17166,22 @@ license = lib.licenses.free; }; }) {}; - import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; - sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; + rev = "15d395126f57408d770a72db2e5f43271f90fa52"; + sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; name = "import-js"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs grizzl ]; meta = { homepage = "https://melpa.org/#/import-js"; license = lib.licenses.free; @@ -17185,6 +17292,27 @@ license = lib.licenses.free; }; }) {}; + info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-buffer"; + version = "0.2"; + src = fetchFromGitHub { + owner = "llvilanova"; + repo = "info-buffer"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; + sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; + name = "info-buffer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/info-buffer"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -17541,6 +17669,27 @@ license = lib.licenses.free; }; }) {}; + ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-erlang-complete"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "ivy-erlang-complete"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; + sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a"; + name = "ivy-erlang-complete"; + }; + packageRequires = [ async counsel emacs erlang ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-erlang-complete"; + license = lib.licenses.free; + }; + }) {}; ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; @@ -17625,6 +17774,27 @@ license = lib.licenses.free; }; }) {}; + ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: + melpaBuild { + pname = "ivy-youtube"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "squiter"; + repo = "ivy-youtube"; + rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e"; + sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; + sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + name = "ivy-youtube"; + }; + packageRequires = [ cl-lib ivy request ]; + meta = { + homepage = "https://melpa.org/#/ivy-youtube"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -17983,12 +18153,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "0cda39255827f283e7578cd469ae42daad9556a2"; - sha256 = "1k91nckxg6d9q9pmn2ikcw85yrmj4yrw20i8v0pq8499wz8i15gs"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -19292,12 +19462,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -19460,12 +19630,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19614,12 +19784,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -20265,12 +20435,12 @@ mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: melpaBuild { pname = "mentor"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "074bd57a1e19d7807d682552fee63f326d1ad05c"; - sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q"; + rev = "2b6aea26fd998d6e6fdac5e6b768f9a1751e268a"; + sha256 = "1j6wf2z4816qj17bm45frhmxk1snsad3jvkjpasyg8pscf4kqi07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -21227,6 +21397,27 @@ license = lib.licenses.free; }; }) {}; + mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "mysql-to-org"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "mysql-to-org-mode"; + rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc"; + sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; + sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9"; + name = "mysql-to-org"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/mysql-to-org"; + license = lib.licenses.free; + }; + }) {}; name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; @@ -21482,12 +21673,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4"; - sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js"; + rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; + sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -21587,12 +21778,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "d39f51fa3472ccc30f1b2896f5538d0b2dbce916"; - sha256 = "0ms42pmnmzhn0b74s3b441m0nqbckgm64bc00qdlvb1s644j32i6"; + rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d"; + sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -21671,12 +21862,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "a7fd82b2fafe086da442f0f2f62b4dd7c8107ab9"; - sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym"; + rev = "d821ef49a8eae0e405fd2a000246f0475542a575"; + sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -21710,11 +21901,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.4"; + version = "0.23.5"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4dde1e677473faa6588909396820f9948e28923f"; - sha256 = "14675mrlqbp2s5wdj8rs96kz7vdzv3j80d259cybp1ijvncgh1ds"; + rev = "cff1e0673a7ca91d9b9907072c501a8bdcf0e3f8"; + sha256 = "1vxxksq4w6gl3wnh77jcpmjyph0x9r3ibqp9dvgmzxlwig495vfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -22684,12 +22875,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "6330511011b7fe8ee04300e82f090ce3efd3b100"; - sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -22785,6 +22976,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956"; + sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; @@ -24083,12 +24295,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338"; - sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -24164,6 +24376,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d"; + sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -24292,12 +24525,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; - sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; + rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; + sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -24438,12 +24671,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "0.2.5"; + version = "0.3"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "107cf4022bed13692e6ac6a544c06227f30e3535"; - sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2"; + rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; + sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -24480,12 +24713,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; - sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; + rev = "1116ead88123a11efef346db0045ee8389250bd2"; + sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -24540,6 +24773,27 @@ license = lib.licenses.free; }; }) {}; + perspeen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "perspeen"; + version = "0.1"; + src = fetchFromGitHub { + owner = "seudut"; + repo = "perspeen"; + rev = "30ee14339cf8fe2e59e5384085afee3f8eb58dda"; + sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; + sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + name = "perspeen"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/perspeen"; + license = lib.licenses.free; + }; + }) {}; ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; @@ -24837,12 +25091,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -25464,12 +25718,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26133,22 +26387,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "fe23f324b0198f8827cc0768e8507a02194eec68"; - sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -26595,6 +26849,27 @@ license = lib.licenses.free; }; }) {}; + redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "redprl"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "sml-redprl"; + rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; + sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; + sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; + name = "redprl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/redprl"; + license = lib.licenses.free; + }; + }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -27372,6 +27647,27 @@ license = lib.licenses.free; }; }) {}; + russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "russian-holidays"; + version = "0.4"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "russian-holidays"; + rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; + sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; + sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; + name = "russian-holidays"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/russian-holidays"; + license = lib.licenses.free; + }; + }) {}; rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; @@ -27709,12 +28005,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "2b0facc87e743e21534672aadac6db3164e38daf"; - sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -28378,27 +28674,6 @@ license = lib.licenses.free; }; }) {}; - slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slamhound"; - version = "1.5.5"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = "slamhound"; - rev = "7e38841ecdda7b3b569cca0b96c155ae2d3d433d"; - sha256 = "1kiczjqa1jhs24lgvizcs355rivx59psxw0fixc9yj8fgld7r4xs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound"; - sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x"; - name = "slamhound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slamhound"; - license = lib.licenses.free; - }; - }) {}; slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slideview"; @@ -29848,12 +30123,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "a07be7a34d4f677a28878f4b72a2095addc628fd"; - sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -30708,12 +30983,12 @@ thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "53dd39833a08ce33582e5ff31fa18bb4735d6731"; - sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii"; + rev = "b2a4d4ae21c789b689dd162deb819665567f481c"; + sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -32516,14 +32791,35 @@ license = lib.licenses.free; }; }) {}; + winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "winum"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "deb0ch"; + repo = "emacs-winum"; + rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518"; + sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; + sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; + name = "winum"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/winum"; + license = lib.licenses.free; + }; + }) {}; wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "ab6afca9ee2e"; - sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -32728,12 +33024,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; - sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; + rev = "323b651dd70ee40a25accc940b8f80c3a3185205"; + sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -33150,8 +33446,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5428250c886a"; - sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; + rev = "c2c547e147c7"; + sha256 = "1khsvzg7ma98ijpj21xmdlnp18wwxf2n9jr2y1xia4a6qgkmlchb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -33216,6 +33512,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e9f887fe6214..204fd60d2bc3 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -172,12 +172,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3"; + sha256 = "0ngign34gq7i121ss2s9wfziy3vkv1jb79pw8nf1qp7rb15xn4vc"; }; wmClass = "jetbrains-idea-ce"; }; @@ -340,12 +340,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il"; + sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; }; wmClass = "jetbrains-datagrip"; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 0b45f9502fad..9814e697d22b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null @@ -10,7 +10,14 @@ assert enableNls -> (gettext != null); with stdenv.lib; -stdenv.mkDerivation rec { +let + nixSyntaxHighlight = fetchFromGitHub { + owner = "seitz"; + repo = "nanonix"; + rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; + sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + }; +in stdenv.mkDerivation rec { name = "nano-${version}"; version = "2.7.3"; src = fetchurl { @@ -30,6 +37,10 @@ stdenv.mkDerivation rec { substituteInPlace src/text.c --replace "__time_t" "time_t" ''; + postInstall = '' + cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ + ''; + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 89762d5bc333..82c89ebdca6e 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i build/configure \ -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \ - -e s@/var/tmp@@ + -e s@/var/tmp@@ \ + -e s@-lcurses@-lncurses@ ''; configurePhase = '' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 689a1537b691..97fc30c237c7 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,22 +2,23 @@ makeWrapper, libXScrnSaver }: let - version = "1.8.0"; - rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d"; + version = "1.8.1"; + rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281"; + channel = "stable"; - sha256 = if stdenv.system == "i686-linux" then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq" - else if stdenv.system == "x86_64-linux" then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76" - else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk" + sha256 = if stdenv.system == "i686-linux" then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f" + else if stdenv.system == "x86_64-linux" then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760" + else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1" else throw "Unsupported system: ${stdenv.system}"; - urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then - urlBase + "VSCode-darwin-stable.zip" + urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -33,10 +34,7 @@ in name = "code"; exec = "code"; icon = "code"; - comment = '' - Code editor redefined and optimized for building and debugging modern - web and cloud applications - ''; + comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications"; desktopName = "Visual Studio Code"; genericName = "Text Editor"; categories = "GNOME;GTK;Utility;TextEditor;Development;"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 7d2828115f77..790997e328b4 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} + --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib ''; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3a0771a73ef7..f5c475ef93a9 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices }: let @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") [ openexr librsvg openjpeg ] - ; + ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e7f0a6b11d99..3364a661e0c5 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices }: let @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") [ openexr librsvg openjpeg ] - ; + ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index b123dcade1d7..4cb67cde7518 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libart_lgpl, libexif, gettext, xorg }: +, python2Packages, libart_lgpl, libexif, gettext, xorg +, AppKit, Cocoa, gtk-mac-integration }: let inherit (python2Packages) pygtk wrapPython python; @@ -26,7 +27,8 @@ in stdenv.mkDerivation rec { libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext xorg.libXpm wrapPython - ]; + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; pythonPath = [ pygtk ]; @@ -51,6 +53,6 @@ in stdenv.mkDerivation rec { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 8fef29fa1073..1bb57538cd5f 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -16,7 +16,6 @@ let version = "1.0"; - pkgversion = "1"; arch = if stdenv.system == "x86_64-linux" then "x64" @@ -26,8 +25,8 @@ let abort "Unsupported platform"; in - stdenv.mkDerivation { - name = "unigine-valley-${version}-${pkgversion}"; + stdenv.mkDerivation rec { + name = "unigine-valley-${version}"; src = fetchurl { url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; @@ -35,6 +34,7 @@ in }; sourceRoot = "Unigine_Valley-${version}"; + instPath = "lib/unigine/valley"; buildInputs = [file makeWrapper]; @@ -56,22 +56,16 @@ in ./extractor.run --target $sourceRoot ''; - # The executable loads libGPUMonitor_${arch}.so "manually" (i.e. not through the ELF interpreter). - # However, it still uses the RPATH to look for it. patchPhase = '' # Patch ELF files. elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) for elf in $elfs; do - echo "Patching $elf" patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true done ''; - configurePhase = ""; - buildPhase = ""; - installPhase = '' - instdir=$out/opt/unigine/valley + instdir=$out/${instPath} # Install executables and libraries mkdir -p $instdir/bin @@ -94,10 +88,12 @@ in --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath ''; + stripDebugList = ["${instPath}/bin"]; + meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "http://unigine.com/products/benchmarks/valley/"; - license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/opt/unigine/valley/documentation/License.pdf + license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix new file mode 100644 index 000000000000..4b1040ce7657 --- /dev/null +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libX11, libXft}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xfractint"; + version = "20.04p14"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; + sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f"; + }; + + buildInputs = [libX11 libXft]; + + configurePhase = '' + sed -e 's@/usr/bin/@@' -i Makefile + ''; + + makeFlags = ["PREFIX=$(out)"]; + + meta = { + inherit version; + description = ""; + # Code cannot be used in commercial programs + # Looks like the definition hinges on the price, not license + license = stdenv.lib.licenses.unfree; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.fractint.net/"; + }; +} diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 97b418f08c10..38573989266d 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -3,6 +3,11 @@ , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: + +let + isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); +in + stdenv.mkDerivation rec { version = "0.4.8"; name = "xournal-" + version; @@ -21,7 +26,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lX11" "-lz" ]; + patches = stdenv.lib.optionals isGdkQuartzBackend [ + ./gdk-quartz-backend.patch + ]; + + NIX_LDFLAGS = [ "-lz" ] + ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch new file mode 100644 index 000000000000..d1a42443a88b --- /dev/null +++ b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch @@ -0,0 +1,90 @@ +diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am +--- xournal-0.4.8-orig/src/Makefile.am 2012-07-04 23:12:47.000000000 +0200 ++++ xournal-0.4.8/src/Makefile.am 2016-12-25 03:04:00.000000000 +0100 +@@ -31,6 +31,5 @@ if WIN32 + xournal_LDFLAGS = -mwindows + xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz + else +- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm ++ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm + endif +- +diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c +--- xournal-0.4.8-orig/src/xo-file.c 2014-06-28 21:52:25.000000000 +0200 ++++ xournal-0.4.8/src/xo-file.c 2016-12-25 03:07:19.000000000 +0100 +@@ -31,11 +31,6 @@ + #include + #include + +-#ifndef WIN32 +- #include +- #include +-#endif +- + #include "xournal.h" + #include "xo-interface.h" + #include "xo-support.h" +@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename + + struct Background *attempt_screenshot_bg(void) + { +-#ifndef WIN32 +- struct Background *bg; +- GdkPixbuf *pix; +- XEvent x_event; +- GdkWindow *window; +- GdkColormap *cmap; +- int x,y,w,h; +- Window x_root, x_win; +- +- x_root = gdk_x11_get_default_root_xwindow(); +- +- if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root, +- False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None)) +- return NULL; +- +- XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event); +- XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root); +- +- x_win = x_event.xbutton.subwindow; +- if (x_win == None) x_win = x_root; +- +- window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win); +- +- gdk_window_get_geometry(window, &x, &y, &w, &h, NULL); +- cmap = gdk_drawable_get_colormap(window); +- if (cmap == NULL) cmap = gdk_colormap_get_system(); +- +- pix = gdk_pixbuf_get_from_drawable(NULL, window, +- cmap, 0, 0, 0, 0, w, h); +- +- if (pix == NULL) return NULL; +- +- bg = g_new(struct Background, 1); +- bg->type = BG_PIXMAP; +- bg->canvas_item = NULL; +- bg->pixbuf = pix; +- bg->pixbuf_scale = DEFAULT_ZOOM; +- bg->filename = new_refstring(NULL); +- bg->file_domain = DOMAIN_ATTACH; +- return bg; +-#else + // not implemented under WIN32 + return FALSE; +-#endif + } + + /************** pdf annotation ***************/ +diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c +--- xournal-0.4.8-orig/src/xo-misc.c 2014-06-28 15:17:44.000000000 +0200 ++++ xournal-0.4.8/src/xo-misc.c 2016-12-25 03:05:50.000000000 +0100 +@@ -2288,9 +2288,7 @@ void hide_unimplemented(void) + } + + /* screenshot feature doesn't work yet in Win32 */ +-#ifdef WIN32 + gtk_widget_hide(GET_COMPONENT("journalScreenshot")); +-#endif + } + + // toggle fullscreen mode diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 38cd9dbcc37a..e76f95b6a50d 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.8"; + name = "ding-1.8.1"; src = fetchurl { url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; - sha256 = "00z97ndwmzsgig9q6y98y8nbxy76pyi9qyj5qfpbbck24gakpz5l"; + sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq"; }; buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop - cp ding $out/bin/ - cp de-en.txt $out/share/dict/ - cp ding.1 $out/share/man/man1/ - cp ding.png $out/share/pixmaps/ - cp ding.desktop $out/share/applications/ + cp -v ding $out/bin/ + cp -v de-en.txt $out/share/dict/ + cp -v ding.1 $out/share/man/man1/ + cp -v ding.png $out/share/pixmaps/ + cp -v ding.desktop $out/share/applications/ wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 7f4311c2f490..a8bde39a2783 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }: let - version = "0.9.4"; + version = "0.10.1"; in stdenv.mkDerivation { name = "monero-${version}"; src = fetchFromGitHub { owner = "monero-project"; - repo = "bitmonero"; + repo = "monero"; rev = "v${version}"; - sha256 = "1qzpy1mxz0ky6hfk1gf67ybbr9xy6p6irh6zwri35h1gb97sbc3c"; + sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -27,19 +27,17 @@ stdenv.mkDerivation { installPhase = '' install -Dt "$out/bin/" \ - bin/bitmonerod \ - bin/blockchain_converter \ - bin/blockchain_dump \ - bin/blockchain_export \ - bin/blockchain_import \ - bin/cn_deserialize \ - bin/simpleminer \ - bin/simplewallet + bin/monerod \ + bin/monero-blockchain-export \ + bin/monero-blockchain-import \ + bin/monero-utils-deserialize \ + bin/monero-wallet-cli \ + bin/monero-wallet-rpc ''; meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = http://monero.cc/; + homepage = https://getmonero.org/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index c7da77a3a030..3c4cf27308bb 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; name = "rofi-${version}"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; - sha256 = "1a65ai93ygras5bi7wc0s5i3zqslzqlnw3klq3sdnp2p0d6hjjqn"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; + sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs"; }; preConfigure = '' diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 15e8453de515..23761feb0ec2 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs"; + sha256 = "0v36i40cwrajsd02xjfdldih5g493m28lhzgjg1gd3pwk2yd6rm1"; }; setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; @@ -26,20 +26,27 @@ stdenv.mkDerivation rec { multimarkdown ]; + outputs = [ "out" "lib" ]; + installPhase = '' mkdir $out install -D -m 777 styx.sh $out/bin/styx mkdir -p $out/share/styx - cp -r lib $out/share/styx cp -r scaffold $out/share/styx cp builder.nix $out/share/styx mkdir -p $out/share/doc/styx - asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html + asciidoctor doc/index.adoc -o $out/share/doc/styx/index.html + asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html + cp -r doc/imgs $out/share/doc/styx/ substituteAllInPlace $out/bin/styx substituteAllInPlace $out/share/doc/styx/index.html + substituteAllInPlace $out/share/doc/styx/styx-themes.html + + mkdir $lib + cp -r lib/* $lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix index 2b3570608afb..671372f62508 100644 --- a/pkgs/applications/misc/styx/themes.nix +++ b/pkgs/applications/misc/styx/themes.nix @@ -7,7 +7,7 @@ let src = fetchFromGitHub ({ owner = "styx-static"; - repo = "styx-theme-${args.themeName}"; + repo = "styx-theme-${args.themeName}"; } // args.src); installPhase = '' @@ -28,10 +28,10 @@ in { agency = mkThemeDrv { themeName = "agency"; - version = "2016-12-03"; + version = "20167-01-17"; src = { - rev = "3604239cc5d940eee9c14ad2540d68a53cfebd7e"; - sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61"; + rev = "3201f65841c9e7f97cc0ab0264cafb01b1620ed7"; + sha256 = "1b3547lzmhs1lmr9gln1yvh5xrsg92m8ngrjwf0ny91y81x04da6"; }; meta = { license = stdenv.lib.licenses.asl20; @@ -44,28 +44,40 @@ in }; }; + generic-templates = mkThemeDrv { + themeName = "generic-templates"; + version = "2017-01-18"; + src = { + rev = "af7cd527584322d8731a306a137a1794b18ad71a"; + sha256 = "18zk4qihi8iw5dxkm9sf6cjai1mf22l6q1ykkrgaxjd5709is0li"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + hyde = mkThemeDrv { themeName = "hyde"; - version = "2016-12-03"; + version = "2017-01-17"; src = { - rev = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28"; - sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6"; + rev = "22caf4edc738f399bb1013d8e968d111c7fa2a59"; + sha256 = "1a2j3m941vc2pyb1dz341ww5l3xblg527szfrfqh588lmsrkdqb6"; }; meta = { license = stdenv.lib.licenses.mit; longDescription = '' - Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar - with uncomplicated content. + Port of the Jekyll Hyde theme to styx; Hyde is a brazen two-column + Styx theme that pairs a prominent sidebar with uncomplicated content. ''; }; }; orbit = mkThemeDrv { themeName = "orbit"; - version = "2016-12-03"; + version = "2017-01-17"; src = { - rev = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4"; - sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64"; + rev = "b5896e25561f05e026b34d04ad95a647ddfc3d03"; + sha256 = "11p11f2d0swgjil5hfx153yw13p7pcp6fwx1bnvxrlfmmx9x2yj5"; }; meta = { license = stdenv.lib.licenses.cc-by-30; @@ -77,10 +89,10 @@ in showcase = mkThemeDrv { themeName = "showcase"; - version = "2016-12-04"; + version = "2017-01-17"; src = { - rev = "33feb0a09183e88d3580e9444ea36a255dffef60"; - sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf"; + rev = "1b4b9d4af29c05aaadfd58233f0e3f61fac726af"; + sha256 = "0mwd1ycwvlv15y431336wwlv8mdv0ikz1aymh3yxhjyxqllc2snk"; }; meta = { license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c1c18828fb42..cb0309bac89d 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "24.0.0.186"; + version = "24.0.0.194"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1pwayhnfjvb6gal5msw0k8rv4h6jvl0mpfsi0jqlka00cnyfjqpd"; + sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 3e89fb731d32..461db272b12e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -51,18 +51,18 @@ stdenv.mkDerivation rec { # You can get the upstream version and SHA-1 hash from the following URLs: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1' # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1' - version = "5.41.0.0"; + version = "5.41.3.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha1 = "1c3cc0411444587b56178de4868eb5d0ff742ec0"; + sha1 = "0bbc3d6997ba22ce712d93e5bc336c894b54fc81"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha1 = "0d31d726c5e9a49917e2749e73386b1c0fdcb376"; + sha1 = "6eae0544858f85c68b0cc46d7786e990bd94f139"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a258a8024770..f54964571575 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "1797ab74720f122432eace591fb415e5e5f5db97f4b6608ca8dbe59bae988374" - else "2b522dcfe27e987138f7826c79fb26a187075dd9be5c5a4c76fd6846bf109014"; + then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1" + else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098"; in stdenv.mkDerivation rec { pname = "helm"; - version = "2.1.2"; + version = "2.1.3"; name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index da5d426a0c5d..2b2cca6a6095 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.4.6"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3"; + sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin" + # hack/update-munge-docs.sh only performs some tests on the documentation. + # They broke building k8s; disabled for now. + echo "true" > "hack/update-munge-docs.sh" patchShebangs ./hack ''; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 2fe9db267655..cd1ace993d6b 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j" - else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p"; + then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3" + else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc"; in stdenv.mkDerivation rec { pname = "minikube"; - version = "0.13.1"; + version = "0.15.0"; name = "${pname}-${version}"; src = fetchurl { @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/bin/${pname} chmod +x $out/bin/${pname} - - mkdir -p $out/share/bash-completion/completions/ - HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d436aa99d4b2..ffbdec6e117a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.8.2"; + version = "0.8.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1645la750lqx2m57sbl6xg1cnqgwrfk5dhcw08wm4z7zxdnqys7b"; + sha256 = "0wjz7plzi7bgrbw22kgqpbai1j3rmqayrmjcp9dq6a361l9a0msw"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e4a267ec1b5f..4362d7cff90d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.8.0"; - rev = "v${version}"; + version = "0.9.1"; goPackagePath = "github.com/gruntwork-io/terragrunt"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "1d035p2r6d8c1crxvpi5ayb9jx6f2pdgzw2197zhllavyi8n8dw1"; + sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3"; }; goDeps = ./deps.nix; @@ -20,7 +19,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/terragrunt \ - --suffix PATH : ${lib.makeBinPath [ terraform ]} + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index ba1ac2b6a1ef..d903863118cc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "8649d278323ebf6bd20c9cd56ecb152b1c617375"; - sha256 = "0m2nxdlvi90vw68ds9qby291skc5d0dgqi3pkalr8ma3kd9r9khv"; + rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8"; + sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "0b24567ec079616e9897f635f542e3bf56abb3d0"; - sha256 = "0380dqsy0qdjranl5qfmmcr6a4g7sw4z26g1bld9y1s66madl03l"; + rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528"; + sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x"; }; } { diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e78230a74b4d..2ea1de961096 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "16.4.30"; + version = "17.4.33"; sha256 = { - "x86_64-linux" = "0inwc12d14i6gyfllxbhizb434a7vy0l5nvc07kz0bca7c4665wb"; - "i686-linux" = "0pdn8558ll317k3jrrjir90pn6abwbm99y9wzdq39wxj4dmrlh6w"; + "x86_64-linux" = "0q3afwzd48mdv4mj4zbm6bvafj4hv18ianzhwjxz5dj6njv7s47y"; + "i686-linux" = "0wgq94if8wx08kqzsj6n20aia29h1qfn448ww63yn8dvkp6nlpya"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 89ee38a7380f..8b0dda1694da 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,15 +2,16 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.4.2"; + name = "bitlbee-3.5"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"; + sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al"; }; - buildInputs = [ gnutls glib pkgconfig libotr python ] - ++ optional doCheck check; + nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + + buildInputs = [ gnutls glib libotr python ]; configureFlags = [ "--gcov=1" diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 11e2b13653d8..3041d6e045ef 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,7 +7,7 @@ , enableRST ? true , enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false -, enableOmemoPluginDependencies ? false +, enableOmemoPluginDependencies ? true , extraPythonPackages ? pkgs: [] }: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c07258a78371..16956782a240 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -3,7 +3,7 @@ , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 , libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland -, xcbutilrenderutil, icu, libSM, libICE, libproxy +, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau , libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon , libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 @@ -19,20 +19,20 @@ let in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "0.10.19"; + version = "1.0.0"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3"; + sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3"; - sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82"; + rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69"; + sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8"; }; buildInputs = [ @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp wayland + inputproto sqlite dbus libwebp wayland libvdpau ]; nativeBuildInputs = [ pkgconfig gyp cmake ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index b85970df4b4a..12692b9566f9 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 +, enableSystemd ? stdenv.isLinux +, enableDaemon ? true +, enableCli ? true }: let @@ -17,18 +20,24 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ] + buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] - ++ optional stdenv.isLinux systemd; + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ]; postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ - --replace "/usr/bin/file" "${file}/bin/file" + --replace "/usr/bin/file" "${file}/bin/file" \ + --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false" ''; - configureFlags = [ "--with-systemd-daemon" ] - ++ [ "--enable-cli" ] + configureFlags = [ + ("--enable-cli=" + (if enableCli then "yes" else "no")) + ("--enable-daemon=" + (if enableDaemon then "yes" else "no")) + "--disable-mac" # requires xcodebuild + ] + ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' @@ -37,6 +46,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; + meta = with stdenv.lib; { description = "A fast, easy and free BitTorrent client"; longDescription = '' @@ -53,7 +64,7 @@ stdenv.mkDerivation rec { homepage = http://www.transmissionbt.com/; license = licenses.gpl2; # parts are under MIT maintainers = with maintainers; [ astsmtl vcunat wizeman ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8e568798df81..16e3c61bcc1f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,20 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: +let + removeExpr = ref: '' + sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ + ''; + +in stdenv.mkDerivation rec { - version = "0.14.18"; + version = "0.14.19"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "099r1n9awznv17ac1fm4ff6az40bvk6xxwaw8x8fx7ikqi1wv8vp"; + sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg"; }; buildInputs = [ go ]; @@ -42,6 +48,10 @@ stdenv.mkDerivation rec { --replace /usr/bin/syncthing $out/bin/syncthing ''; + preFixup = '' + find $out/bin -type f -exec ${removeExpr go} '{}' '+' + ''; + meta = with stdenv.lib; { homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix new file mode 100644 index 000000000000..31774b6b55c1 --- /dev/null +++ b/pkgs/applications/office/tryton/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, python2Packages, librsvg }: + +with stdenv.lib; + +python2Packages.buildPythonApplication rec { + name = "tryton-${version}"; + version = "4.2.1"; + src = fetchurl { + url = "mirror://pypi/t/tryton/${name}.tar.gz"; + sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + }; + propagatedBuildInputs = with python2Packages; [ + chardet + dateutil + pygtk + librsvg + ]; + makeWrapperArgs = [ + ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"'' + ]; + meta = { + description = "The client of the Tryton application platform"; + longDescription = '' + The client for Tryton, a three-tier high-level general purpose + application platform under the license GPL-3 written in Python and using + PostgreSQL as database engine. + + It is the core base of a complete business solution providing + modularity, scalability and security. + ''; + homepage = http://www.tryton.org/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.johbo ]; + }; +} diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 7f128340bf37..2409936ab694 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, perl, nettools, java, polyml }: +{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }: # nettools needed for hostname let - dirname = "Isabelle2016"; - theories = ["HOL" "FOL" "ZF"]; + dirname = "Isabelle2016-1"; in stdenv.mkDerivation { - name = "isabelle-2016"; - inherit dirname theories; + name = "isabelle-2016-1"; + inherit dirname; src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw"; + sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr"; } else fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4"; + sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r"; }; - buildInputs = [ perl polyml ] + buildInputs = [ perl polyml z3 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -42,7 +41,14 @@ stdenv.mkDerivation { --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \ --replace '$ML_HOME/poly' ${polyml}/bin/poly - ''; + substituteInPlace contrib/z3*/etc/settings \ + --replace '$Z3_HOME/z3' '${z3}/bin/z3' + '' + (if ! stdenv.isLinux then "" else '' + arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} + for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" + done + ''); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ece867de2a0a..52cdca0b1699 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "2017-01-06"; + version = "2017-01-14"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6"; - sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg"; + rev = "6e9a6d15dbfba3e8a1560d2cfcdbc7d81314d7bb"; + sha256 = "0wi1jssj1bi45rji4prlnvzs8nr48mqnj9yg5vnhah4rsjwl20km"; }; buildInputs = [ gmp mpfr cmake gperftools ]; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix new file mode 100644 index 000000000000..fd999dc17d4d --- /dev/null +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "git-crecord-${version}"; + version = "20161216.0"; + + src = fetchFromGitHub { + owner = "andrewshadura"; + repo = "git-crecord"; + rev = version; + sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i"; + }; + + propagatedBuildInputs = with pythonPackages; [ docutils ]; + + meta = { + homepage = https://github.com/andrewshadura/git-crecord; + description = "Git subcommand to interactively select changes to commit or stage"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 3bcf8cd4e1b2..a67ca4acfb67 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.6.6"; + version = "4.1.1"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif"; + sha256 = "1i7dqs0csqcjwkvg8csz5f1zxy1inrzxzz3g9j618aldqxzjfgnr"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 54be33beff5a..4cbec62b2f9b 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "1.2.1"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr"; + sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index ef131cb719aa..8edb08638dda 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -22,17 +22,17 @@ gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' -gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' -gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-gitlab', '~> 1.0.2' gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-saml', '~> 1.7.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth-authentiq', '~> 0.2.0' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt' @@ -67,8 +67,8 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.15.0' -gem 'grape-entity', '~> 0.4.2' +gem 'grape', '~> 0.18.0' +gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination @@ -85,13 +85,15 @@ gem 'dropzonejs-rails', '~> 0.7.1' # for backups gem 'fog-aws', '~> 0.9' -gem 'fog-azure', '~> 0.0' gem 'fog-core', '~> 1.40' +gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' -gem 'fog-google', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' +# for Google storage +gem 'google-api-client', '~> 0.8.6' + # for aws storage gem 'unf', '~> 0.1.4' @@ -100,11 +102,11 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' -gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.0' +gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5.1' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -117,7 +119,7 @@ gem 'truncato', '~> 0.7.8' gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8' # Diffs -gem 'diffy', '~> 3.0.3' +gem 'diffy', '~> 3.1.0' # Application server group :unicorn do @@ -134,9 +136,10 @@ gem 'after_commit_queue', '~> 1.3.0' gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sidekiq', '~> 4.2' -gem 'sidekiq-cron', '~> 0.4.0' +gem 'sidekiq', '~> 4.2.7' +gem 'sidekiq-cron', '~> 0.4.4' gem 'redis-namespace', '~> 1.5.2' +gem 'sidekiq-limit_fetch', '~> 3.4' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -152,7 +155,7 @@ gem 'settingslogic', '~> 2.0.9' gem 'version_sorter', '~> 2.1.0' # Cache -gem 'redis-rails', '~> 4.0.0' +gem 'redis-rails', '~> 5.0.1' # Redis gem 'redis', '~> 3.2' @@ -161,6 +164,9 @@ gem 'connection_pool', '~> 2.0' # HipChat integration gem 'hipchat', '~> 1.5.0' +# JIRA integration +gem 'jira-ruby', '~> 1.1.2' + # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' @@ -168,7 +174,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.1' gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration -gem 'slack-notifier', '~> 1.2.0' +gem 'slack-notifier', '~> 1.5.1' # Asana integration gem 'asana', '~> 0.4.0' @@ -176,6 +182,9 @@ gem 'asana', '~> 0.4.0' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' +# Kubernetes integration +gem 'kubeclient', '~> 2.2.0' + # d3 gem 'd3_rails', '~> 3.5.0' @@ -193,7 +202,7 @@ gem 'loofah', '~> 2.0.3' gem 'licensee', '~> 8.0.0' # Protect against bruteforcing -gem 'rack-attack', '~> 4.3.1' +gem 'rack-attack', '~> 4.4.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' @@ -214,8 +223,7 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' -gem 'turbolinks', '~> 2.5.0' -gem 'jquery-turbolinks', '~> 2.1.0' +gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' @@ -257,22 +265,19 @@ group :development do gem 'better_errors', '~> 1.0.1' gem 'binding_of_caller', '~> 0.7.2' - # Docs generator - gem 'sdoc', '~> 0.3.20' - # thin instead webrick gem 'thin', '~> 1.7.0' end group :development, :test do - gem 'byebug', '~> 8.2.1', platform: :mri + gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', '~> 1.2.0', require: false gem 'fuubar', '~> 2.0.0' gem 'database_cleaner', '~> 1.5.0' - gem 'factory_girl_rails', '~> 4.6.0' + gem 'factory_girl_rails', '~> 4.7.0' gem 'rspec-rails', '~> 3.5.0' gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' @@ -310,6 +315,8 @@ group :development, :test do gem 'knapsack', '~> 1.11.0' gem 'activerecord_sane_schema_dumper', '0.2' + + gem 'stackprof', '~> 0.2.10' end group :test do @@ -326,21 +333,18 @@ gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' -gem 'mail_room', '~> 0.8.1' +gem 'mail_room', '~> 0.9.0' gem 'email_reply_parser', '~> 0.5.8' +gem 'html2text' gem 'ruby-prof', '~> 0.16.2' -## CI -gem 'activerecord-session_store', '~> 1.0.0' -gem 'nested_form', '~> 0.3.2' - # OAuth gem 'oauth2', '~> 1.2.0' # Soft deletion -gem 'paranoia', '~> 2.0' +gem 'paranoia', '~> 2.2' # Health check gem 'health_check', '~> 2.2.0' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index b9501e68aae8..211bdd20fd10 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -34,12 +34,6 @@ GEM arel (~> 6.0) activerecord-nulldb-adapter (0.3.3) activerecord (>= 2.0.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) activesupport (4.2.7.1) @@ -66,6 +60,10 @@ GEM attr_encrypted (3.0.3) encryptor (~> 3.0.0) attr_required (1.0.0) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) autoprefixer-rails (6.2.3) execjs json @@ -74,21 +72,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -114,7 +97,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.6) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -149,7 +132,7 @@ GEM coffee-script-source (1.10.0) colorize (0.7.7) concurrent-ruby (1.0.2) - connection_pool (2.2.0) + connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) @@ -161,7 +144,7 @@ GEM database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) - deckar01-task_list (1.0.5) + deckar01-task_list (1.0.6) activesupport (~> 4.0) html-pipeline rack (~> 1.0) @@ -182,8 +165,10 @@ GEM railties rotp (~> 2.0) diff-lcs (1.2.5) - diffy (3.0.7) + diffy (3.1.0) docile (1.1.5) + domain_name (0.5.20161021) + unf (>= 0.0.5, < 1.0.0) doorkeeper (4.2.0) railties (>= 4.2) dropzonejs-rails (0.7.2) @@ -200,10 +185,11 @@ GEM excon (0.52.0) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.5.0) + extlib (0.9.16) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -225,16 +211,11 @@ GEM fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) - fog-google (0.3.2) + fog-google (0.5.0) fog-core fog-json fog-xml @@ -284,7 +265,9 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.0) + gitlab-markup (1.5.1) + gitlab-turbolinks-classic (2.5.6) + coffee-rails gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -314,17 +297,36 @@ GEM json multi_json request_store (>= 1.0) - grape (0.15.0) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) + addressable (~> 2.3) + autoparse (~> 0.3) + extlib (~> 0.9) + faraday (~> 0.9) + googleauth (~> 0.3) + launchy (~> 2.4) + multi_json (~> 1.10) + retriable (~> 1.4) + signet (~> 0.6) + googleauth (0.5.1) + faraday (~> 0.9) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + grape (0.18.0) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) + mustermann-grape (~> 0.4.0) rack (>= 1.3.0) rack-accept - rack-mount virtus (>= 1.0.0) - grape-entity (0.4.8) + grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) haml (4.0.7) @@ -347,7 +349,18 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) + html2text (0.2.0) + nokogiri (~> 1.6) htmlentities (4.3.4) + http (0.9.8) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (1.0.1) + http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) @@ -358,14 +371,14 @@ GEM cause json ipaddress (0.8.3) + jira-ruby (1.1.2) + activesupport + oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) @@ -379,6 +392,10 @@ GEM knapsack (1.11.0) rake timecop (>= 0.1.0) + kubeclient (2.2.0) + http (= 0.9.8) + recursive-open-struct (= 1.0.0) + rest-client launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -398,13 +415,16 @@ GEM listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) + little-plugger (1.1.4) + logging (2.1.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.8.1) + mail_room (0.9.0) + memoist (0.15.0) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) @@ -414,16 +434,20 @@ GEM multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) + mustermann (0.4.0) + tool (~> 0.2) + mustermann-grape (0.4.0) + mustermann (= 0.4.0) mysql2 (0.3.20) - nested_form (0.3.2) net-ldap (0.12.1) net-ssh (3.0.1) + netrc (0.11.0) newrelic_rpm (3.16.0.318) nokogiri (1.6.7.2) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -438,14 +462,12 @@ GEM rack (>= 1.0, < 3) omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) + omniauth-authentiq (0.2.2) + omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) omniauth-cas3 (1.1.3) addressable (~> 2.3) nokogiri (~> 1.6.6) @@ -455,7 +477,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.4.1) @@ -490,8 +512,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) - activerecord (~> 4.0) + os (0.9.6) + paranoia (2.2.0) + activerecord (>= 4.0, < 5.1) parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) @@ -513,17 +536,18 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + pry-byebug (3.4.1) + byebug (~> 9.0) + pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) + rack (1.6.5) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.3.1) + rack-attack (4.4.1) rack rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -566,38 +590,44 @@ GEM ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) + rdoc (4.2.2) json (~> 1.4) recaptcha (3.0.0) json + recursive-open-struct (1.0.0) redcarpet (3.3.3) redis (3.2.2) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) + redis-actionpack (5.0.1) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 1.4.0) + redis-activesupport (5.0.1) + activesupport (>= 3, < 6) + redis-store (~> 1.2.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) + redis-rack (1.6.0) rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) + redis-store (~> 1.2.0) + redis-rails (5.0.1) + redis-actionpack (~> 5.0.0) + redis-activesupport (~> 5.0.0) + redis-store (~> 1.2.0) + redis-store (1.2.0) redis (>= 2.2) request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) responders (2.3.0) railties (>= 4.2.0, < 5.1) + rest-client (2.0.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.0.6) + rouge (2.0.7) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -662,9 +692,6 @@ GEM scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) @@ -678,21 +705,28 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.1) + sidekiq (4.2.7) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - rack-protection (~> 1.5) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) + sidekiq (>= 4.2.1) + sidekiq-limit_fetch (3.4.0) + sidekiq (>= 4) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - slack-notifier (1.2.1) + slack-notifier (1.5.1) slop (3.6.0) spinach (0.8.10) colorize @@ -722,6 +756,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) activemodel (>= 4.1, < 5.1) @@ -733,7 +768,6 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - systemu (2.6.5) teaspoon (1.1.5) railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) @@ -750,11 +784,10 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) - turbolinks (2.5.3) - coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) u2f (0.2.1) @@ -773,8 +806,6 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) version_sorter (2.1.0) virtus (1.0.5) axiom-types (~> 0.1) @@ -810,7 +841,6 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord-nulldb-adapter - activerecord-session_store (~> 1.0.0) activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) @@ -831,7 +861,6 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.2.0) bundler-audit (~> 0.5.0) - byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) @@ -843,22 +872,21 @@ DEPENDENCIES creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) - deckar01-task_list (= 1.0.5) + deckar01-task_list (= 1.0.6) default_value_for (~> 3.0.0) devise (~> 4.2) devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) + diffy (~> 3.1.0) doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) + factory_girl_rails (~> 4.7.0) ffaker (~> 2.0.0) flay (~> 2.6.1) fog-aws (~> 0.9) - fog-azure (~> 0.0) fog-core (~> 1.40) - fog-google (~> 0.3) + fog-google (~> 0.5) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) @@ -869,39 +897,42 @@ DEPENDENCIES gemojione (~> 3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.0) + gitlab-markup (~> 1.5.1) + gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) - grape (~> 0.15.0) - grape-entity (~> 0.4.2) + google-api-client (~> 0.8.6) + grape (~> 0.18.0) + grape-entity (~> 0.6.0) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) health_check (~> 2.2.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) + html2text httparty (~> 0.13.3) influxdb (~> 0.2) + jira-ruby (~> 1.1.2) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) jwt kaminari (~> 0.17.0) knapsack (~> 1.11.0) + kubeclient (~> 2.2.0) letter_opener_web (~> 1.3.0) license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.8.1) + mail_room (~> 0.9.0) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) net-ssh (~> 3.0.1) newrelic_rpm (~> 3.16) nokogiri (~> 1.6.7, >= 1.6.7.2) @@ -910,12 +941,12 @@ DEPENDENCIES oj (~> 2.17.4) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) + omniauth-authentiq (~> 0.2.0) omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) + omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.7.0) @@ -923,24 +954,25 @@ DEPENDENCIES omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) - paranoia (~> 2.0) + paranoia (~> 2.2) pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) + pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) - rack-attack (~> 4.3.1) + rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rails (= 4.2.7.1) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) rblineprof (~> 0.3.6) - rdoc (~> 3.6) + rdoc (~> 4.2) recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) redis-namespace (~> 1.5.2) - redis-rails (~> 4.0.0) + redis-rails (~> 5.0.1) request_store (~> 1.3) rerun (~> 0.11.0) responders (~> 2.0) @@ -955,17 +987,17 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) sentry-raven (~> 2.0.0) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.2) - sidekiq-cron (~> 0.4.0) + sidekiq (~> 4.2.7) + sidekiq-cron (~> 0.4.4) + sidekiq-limit_fetch (~> 3.4) simplecov (= 0.12.0) - slack-notifier (~> 1.2.0) + slack-notifier (~> 1.5.1) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) spring (~> 1.7.0) @@ -974,6 +1006,7 @@ DEPENDENCIES spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) sprockets-es6 (~> 0.9.2) + stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) teaspoon (~> 1.1.0) @@ -982,7 +1015,6 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) - turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) @@ -997,4 +1029,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.5 + 1.13.7 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 9e03135e89cb..6c2b42ddbc51 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.13.5"; + version = "8.15.4"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3"; + sha256 = "1cd6dl8niy1xxifxdrm1kwm8qhy4x4zyvwdsb722kr136rwnxm84"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index fc36db0d6038..64ebf34e477d 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -63,14 +63,6 @@ }; version = "0.3.3"; }; - activerecord-session_store = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b8q5p7wl0xpmlcjig2im1yryzj4aipvw7zq3z1ig8fdg4m2m943"; - type = "gem"; - }; - version = "1.0.0"; - }; activerecord_sane_schema_dumper = { source = { remotes = ["https://rubygems.org"]; @@ -175,6 +167,14 @@ }; version = "1.0.0"; }; + autoparse = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6"; + type = "gem"; + }; + version = "0.3.3"; + }; autoprefixer-rails = { source = { remotes = ["https://rubygems.org"]; @@ -199,22 +199,6 @@ }; version = "0.1.1"; }; - azure = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vfnx47ihizg1d6szdyf48xfdghjfk66k4r39z6b0gl5i40vcm8v"; - type = "gem"; - }; - version = "0.7.5"; - }; - azure-core = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "016krlc7wfg27zgg5i6j0pys32ra8jszgls8wz4dz64h2zf1kd7a"; - type = "gem"; - }; - version = "0.1.2"; - }; babel-source = { source = { remotes = ["https://rubygems.org"]; @@ -330,10 +314,10 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc"; + sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; type = "gem"; }; - version = "8.2.1"; + version = "9.0.6"; }; capybara = { source = { @@ -466,10 +450,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy"; + sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; crack = { source = { @@ -538,10 +522,10 @@ deckar01-task_list = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91"; + sha256 = "0nfbja4br77ad79snq2a7wg38vvvf5brchv12vfk9vpbzzyfdnrq"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; default_value_for = { source = { @@ -586,10 +570,10 @@ diffy = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0"; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; type = "gem"; }; - version = "3.0.7"; + version = "3.1.0"; }; docile = { source = { @@ -599,6 +583,14 @@ }; version = "1.1.5"; }; + domain_name = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl"; + type = "gem"; + }; + version = "0.5.20161021"; + }; doorkeeper = { source = { remotes = ["https://rubygems.org"]; @@ -695,21 +687,29 @@ }; version = "0.9.0"; }; + extlib = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh"; + type = "gem"; + }; + version = "0.9.16"; + }; factory_girl = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn34ba1midnzms1854yzx0g16sgy7bd9wcsvs66rxd65idsay20"; + sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; type = "gem"; }; - version = "4.5.0"; + version = "4.7.0"; }; factory_girl_rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "00vngc59bww75hqkr1hbnvnqm5763w0jlv3lsq3js1r1wxdzix2r"; + sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; faraday = { source = { @@ -775,14 +775,6 @@ }; version = "0.11.0"; }; - fog-azure = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bdgzn1a1z79drfvashs6gzpg98dijvxm168cq0czzkx3wvbrfcl"; - type = "gem"; - }; - version = "0.0.2"; - }; fog-core = { source = { remotes = ["https://rubygems.org"]; @@ -794,10 +786,10 @@ fog-google = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzwid3s4c39fqixg1zb0dr5g3q6lafm9pan6bk3csys62v6fnm9"; + sha256 = "06irf9gcg5v8iwaa5qilhwir6gl82rrp7jyyw87ad15v8p3xa59f"; type = "gem"; }; - version = "0.3.2"; + version = "0.5.0"; }; fog-json = { source = { @@ -939,10 +931,18 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a"; + sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; + }; + gitlab-turbolinks-classic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra"; + type = "gem"; + }; + version = "2.5.6"; }; gitlab_git = { source = { @@ -1000,21 +1000,37 @@ }; version = "6.1.0"; }; + google-api-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d"; + type = "gem"; + }; + version = "0.8.7"; + }; + googleauth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m"; + type = "gem"; + }; + version = "0.5.1"; + }; grape = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13rbm0whhirpzn2n58kjyvqn9989vvipynlxsj1ihmwp8xsmcj1i"; + sha256 = "17spanyj7kpvqm4ap82vq4s1hlrad5mcv8rj4q1mva40zg1f8cgj"; type = "gem"; }; - version = "0.15.0"; + version = "0.18.0"; }; grape-entity = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8"; + sha256 = "18jhjn1164z68xrjz23wf3qha3x9az086dr7p6405jv6rszyxihq"; type = "gem"; }; - version = "0.4.8"; + version = "0.6.0"; }; haml = { source = { @@ -1072,6 +1088,14 @@ }; version = "1.11.0"; }; + html2text = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; + type = "gem"; + }; + version = "0.2.0"; + }; htmlentities = { source = { remotes = ["https://rubygems.org"]; @@ -1080,6 +1104,38 @@ }; version = "4.3.4"; }; + http = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi"; + type = "gem"; + }; + version = "0.9.8"; + }; + http-cookie = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + http-form_data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9"; + type = "gem"; + }; + version = "1.0.1"; + }; + "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; httparty = { source = { remotes = ["https://rubygems.org"]; @@ -1128,6 +1184,14 @@ }; version = "0.8.3"; }; + jira-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf"; + type = "gem"; + }; + version = "1.1.2"; + }; jquery-atwho-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1144,14 +1208,6 @@ }; version = "4.1.1"; }; - jquery-turbolinks = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc"; - type = "gem"; - }; - version = "2.1.0"; - }; jquery-ui-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1208,6 +1264,14 @@ }; version = "1.11.0"; }; + kubeclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi"; + type = "gem"; + }; + version = "2.2.0"; + }; launchy = { source = { remotes = ["https://rubygems.org"]; @@ -1256,6 +1320,22 @@ }; version = "3.0.5"; }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1agk0dv5lxn0qpnxadi6dvg36pc0x5fsrmzhw4sc91x52mjc381l"; + type = "gem"; + }; + version = "2.1.0"; + }; loofah = { source = { remotes = ["https://rubygems.org"]; @@ -1264,14 +1344,6 @@ }; version = "2.0.3"; }; - macaddr = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b"; - type = "gem"; - }; - version = "1.7.1"; - }; mail = { source = { remotes = ["https://rubygems.org"]; @@ -1283,10 +1355,18 @@ mail_room = { source = { remotes = ["https://rubygems.org"]; - sha256 = "15zjqscdzm4rv8qpz8y8334nc5kvlqp0xk4wiics98hbjs8cd59i"; + sha256 = "17q8km4n9jzjb5vj3hhyv4bwr1gxdh84yghvcdrmq88jh5ki8p8k"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + type = "gem"; + }; + version = "0.15.0"; }; method_source = { source = { @@ -1360,6 +1440,22 @@ }; version = "2.0.0"; }; + mustermann = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0km27zp3mnlmh157nmj3pyd2g7n2da4dh4mr0psq53a9r0d4gli8"; + type = "gem"; + }; + version = "0.4.0"; + }; + mustermann-grape = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g6kf753v0kf8zfz0z46kyb7cbpinpc3qqh02qm4s9n49s1v2fva"; + type = "gem"; + }; + version = "0.4.0"; + }; mysql2 = { source = { remotes = ["https://rubygems.org"]; @@ -1368,14 +1464,6 @@ }; version = "0.3.20"; }; - nested_form = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i"; - type = "gem"; - }; - version = "0.3.2"; - }; net-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -1392,6 +1480,14 @@ }; version = "3.0.1"; }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; newrelic_rpm = { source = { remotes = ["https://rubygems.org"]; @@ -1419,10 +1515,10 @@ oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; + sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; type = "gem"; }; - version = "0.4.7"; + version = "0.5.1"; }; oauth2 = { source = { @@ -1464,6 +1560,14 @@ }; version = "1.4.1"; }; + omniauth-authentiq = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01br0snvbxbx1zgs857alfs0ay3xhgdjgk4hc2vjzf3jn6bwizvk"; + type = "gem"; + }; + version = "0.2.2"; + }; omniauth-azure-oauth2 = { source = { remotes = ["https://rubygems.org"]; @@ -1472,14 +1576,6 @@ }; version = "0.0.6"; }; - omniauth-bitbucket = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845"; - type = "gem"; - }; - version = "0.0.2"; - }; omniauth-cas3 = { source = { remotes = ["https://rubygems.org"]; @@ -1507,10 +1603,10 @@ omniauth-gitlab = { source = { remotes = ["https://rubygems.org"]; - sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz"; + sha256 = "0hv672p372jq7p9p6dw8i7qyisbny3lq0si077yys1fy4bjw127x"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; omniauth-google-oauth2 = { source = { @@ -1600,13 +1696,21 @@ }; version = "0.5.0"; }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; paranoia = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0"; + sha256 = "1kfznq6lba1xb3nskvn8kdb08ljh4a0lvbm3lv91xvj6n9hm15k0"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.0"; }; parser = { source = { @@ -1680,6 +1784,14 @@ }; version = "0.10.3"; }; + pry-byebug = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "147kiwnggdzz7jvlplfi0baffng808rb5lk263qxp648k8x03vgc"; + type = "gem"; + }; + version = "3.4.1"; + }; pry-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1699,10 +1811,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "1374xyh8nnqb8sy6g9gcvchw8gifckn5v3bhl6dzbwwsx34qz7gz"; type = "gem"; }; - version = "1.6.4"; + version = "1.6.5"; }; rack-accept = { source = { @@ -1715,10 +1827,10 @@ rack-attack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls"; + sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; type = "gem"; }; - version = "4.3.1"; + version = "4.4.1"; }; rack-cors = { source = { @@ -1728,14 +1840,6 @@ }; version = "0.4.0"; }; - rack-mount = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2"; - type = "gem"; - }; - version = "0.8.3"; - }; rack-oauth2 = { source = { remotes = ["https://rubygems.org"]; @@ -1851,10 +1955,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8"; + sha256 = "027dvwz1g1h4bm40v3kxqbim4p7ww4fcmxa2l1mvwiqm5cjiqd7k"; type = "gem"; }; - version = "3.12.2"; + version = "4.2.2"; }; recaptcha = { source = { @@ -1864,6 +1968,14 @@ }; version = "3.0.0"; }; + recursive-open-struct = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw"; + type = "gem"; + }; + version = "1.0.0"; + }; redcarpet = { source = { remotes = ["https://rubygems.org"]; @@ -1891,18 +2003,18 @@ redis-actionpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw"; + sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr"; type = "gem"; }; - version = "4.0.1"; + version = "5.0.1"; }; redis-activesupport = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg"; + sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd"; type = "gem"; }; - version = "4.1.5"; + version = "5.0.1"; }; redis-namespace = { source = { @@ -1915,26 +2027,26 @@ redis-rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8"; + sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; redis-rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7"; + sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.1"; }; redis-store = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m"; + sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq"; type = "gem"; }; - version = "1.1.7"; + version = "1.2.0"; }; request_store = { source = { @@ -1960,6 +2072,22 @@ }; version = "2.3.0"; }; + rest-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7"; + type = "gem"; + }; + version = "2.0.0"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj"; + type = "gem"; + }; + version = "1.4.1"; + }; rinku = { source = { remotes = ["https://rubygems.org"]; @@ -1979,10 +2107,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "182hp2fh6gd3p5c862i36k6jxkc02mhi08qd94gsyfj3v34ngza0"; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rqrcode = { source = { @@ -2200,14 +2328,6 @@ }; version = "0.47.1"; }; - sdoc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2"; - type = "gem"; - }; - version = "0.3.20"; - }; seed-fu = { source = { remotes = ["https://rubygems.org"]; @@ -2267,18 +2387,34 @@ sidekiq = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l"; + sha256 = "0d711y4s5clh5xx9k12c8c3x84xxqk61qwykya2xw39fqcxgzx04"; type = "gem"; }; - version = "4.2.1"; + version = "4.2.7"; }; sidekiq-cron = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy"; + sha256 = "1bsi80hyfh0lgpcdphxn2aw7av3d8xd87bmx6jz6lj7lw49gzkda"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.4"; + }; + sidekiq-limit_fetch = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; + type = "gem"; + }; + version = "3.4.0"; + }; + signet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + type = "gem"; + }; + version = "0.7.3"; }; simplecov = { source = { @@ -2299,10 +2435,10 @@ slack-notifier = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz"; + sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; type = "gem"; }; - version = "1.2.1"; + version = "1.5.1"; }; slop = { source = { @@ -2392,6 +2528,14 @@ }; version = "3.1.1"; }; + stackprof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; + type = "gem"; + }; + version = "0.2.10"; + }; state_machines = { source = { remotes = ["https://rubygems.org"]; @@ -2440,14 +2584,6 @@ }; version = "1.2.0"; }; - systemu = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; - type = "gem"; - }; - version = "2.6.5"; - }; teaspoon = { source = { remotes = ["https://rubygems.org"]; @@ -2528,6 +2664,14 @@ }; version = "0.8.3"; }; + tool = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iymkxi4lv2b2k905s9pl4d9k9k4455ksk3a98ssfn7y94h34np0"; + type = "gem"; + }; + version = "0.2.3"; + }; truncato = { source = { remotes = ["https://rubygems.org"]; @@ -2536,14 +2680,6 @@ }; version = "0.7.8"; }; - turbolinks = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn"; - type = "gem"; - }; - version = "2.5.3"; - }; tzinfo = { source = { remotes = ["https://rubygems.org"]; @@ -2624,14 +2760,6 @@ }; version = "1.10.0"; }; - uuid = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v"; - type = "gem"; - }; - version = "2.3.8"; - }; version_sorter = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 2ee416dbb8e5..1bb2718acebd 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -27,9 +27,9 @@ index 5511d71..38d357e 100644 arel (~> 6.0) + activerecord-nulldb-adapter (0.3.3) + activerecord (>= 2.0.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) + activerecord_sane_schema_dumper (0.2) + rails (>= 4, < 5) + activesupport (4.2.7.1) @@ -396,7 +398,7 @@ GEM method_source (0.8.2) mime-types (2.99.2) @@ -55,6 +55,6 @@ index 5511d71..38d357e 100644 RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) + activerecord-nulldb-adapter - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) + activerecord_sane_schema_dumper (= 0.2) + acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 44b9dca90b6f..79e3cfbde1bd 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -14,11 +14,11 @@ }: let - version = "2.6.16"; + version = "2.6.18"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "0jipvpvw871qhhkyykrrrqc9vfbw24v243vzmm8lqifj73h6qvgc"; + sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l"; }; common = { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 6a13bcc015a9..c156c5d607ff 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.10"; + ver = "1.10.4"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1i5nqk5gyin6rgvc0fy96pdzq0wsmfvsm6w9mfsibj0yrfqnhi6r"; + sha256 = "bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "1ypc2hisx71kpmjwxnlq6zh4q6r2i1p32gapb0ampjflcjyvx5dk"; + sha256 = "bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dd9c67b952f5..960dabd75695 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg +, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2 , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -79,13 +79,13 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6"; + sha256 = "02k8p4z1mwxxlg9spwwrlcciia80kyrpp09hpl60g22h85jj1ng9"; }; patchPhase = '' @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs + ffmpeg_3_2 freetype libass libpthreadstubs lua lua5_sockets libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 40011e11b2d4..8bfe3c0b91fa 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { - name = "qarte-3.2.0"; + name = "qarte-3.2.0+158"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; - rev = "146"; - sha256 = "0dvl38dknmnj2p4yr25p88kw3mh502c6qdp2bd43bhd2sqc3b0v0"; + rev = "158"; + sha256 = "0nj9yxylz1nz0hdjm0jzrq2l3dgfdqkafwxnzydp6qv6261w564n"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch deleted file mode 100644 index 05664ee96e62..000000000000 --- a/pkgs/applications/video/smplayer/basegui.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/basegui.cpp 2014-08-20 01:04:51.000000000 +0100 -+++ b/src/basegui.cpp 2014-10-11 10:25:57.561983556 +0100 -@@ -5235,7 +5235,7 @@ - #ifdef YOUTUBE_SUPPORT - void BaseGui::showTubeBrowser() { - qDebug("BaseGui::showTubeBrowser"); -- QString exec = Paths::appPath() + "/smtube"; -+ QString exec = "smtube"; - qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData()); - if (!QProcess::startDetached(exec, QStringList())) { - QMessageBox::warning(this, "SMPlayer", diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 15b178fc8e6e..118d416df054 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-16.1.0"; + name = "smplayer-16.11.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1jfqpmbbjrs9lna44dp10zblj7b0cras9sb0nczycpkcsdi9np6j"; + sha256 = "0nhbr33p21qb7n6wry0nkavl5nfjzl5yylrhnxz0pyv69n5msfp5"; }; - patches = [ ./basegui.cpp.patch ]; - - buildInputs = [ qmakeHook qtscript ]; + buildInputs = [ qtscript ]; + nativeBuildInputs = [ qmakeHook ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 729c90d052c6..5026e6c48313 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "16.1.0"; + version = "16.7.2"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1yjn7gj5pfw8835gfazk29mhcvfh1dhfjqmbqln1ajxr89imjj4r"; + sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm"; }; makeFlags = [ diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6de68ee32f3a..c428c56b313b 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "docker"; repo = "containerd"; rev = "v${version}"; - sha256 = "0hlvbd5n4v337ywkc8mnbhp9m8lg8612krv45262n87c2ijyx09s"; + sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 088dddb3de7e..ba21a23f8ad8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,13 +11,13 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.12.5"; + version = "1.12.6"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "1hnxmh2j1vm8714f7jwjrslkqkd1ry25g5wq76aqlpsz5fh2kqb0"; + sha256 = "10jhjas07xxlxjsxby8865rr0d0zsc5azy16rsz1idmy7f7lk6jh"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix new file mode 100644 index 000000000000..b1b3c3aebeef --- /dev/null +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: + +stdenv.mkDerivation rec { + name = "lkl-${stdenv.lib.substring 0 7 rev}"; + rev = "d74707304d4e4614081ae2a612a833aeb46622b5"; + + buildInputs = [ bc python fuse libarchive ]; + + src = fetchFromGitHub { + inherit rev; + owner = "lkl"; + repo = "linux"; + sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp"; + }; + + installPhase = '' + mkdir -p $out/{bin,lib} + + # This tool assumes a different directory structure so let's point it at the right location + cp tools/lkl/bin/lkl-hijack.sh $out/bin + substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib' + + cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin + cp -r tools/lkl/include $out + cp tools/lkl/liblkl*.{a,so} $out/lib + ''; + + # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): + # fs/xfs/xfs_log_recover.c:2575:3: error: format not a string literal and no format arguments [-Werror=format-security] + # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." + hardeningDisable = [ "format" "fortify" ]; + + makeFlags = "-C tools/lkl"; + + enableParallelBuilds = true; + + meta = with stdenv.lib; { + description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; + platforms = platforms.linux; # Darwin probably works too but I haven't tested it + license = licenses.gpl2; + maintainers = with maintainers; [ copumpkin ]; + }; +} diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index f3f5a88c0af1..c0bd9d8ed13d 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.21.0"; + version = "1.22.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0zd7f3yrnzik96a634m2qyrz25f5mi28caadghqdl9q2apxfb896"; + sha256 = "14rp3652awvx2iw1l6mia5flfib9jfkiaic16afchrlp17sdq2ji"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index d66865573648..7f19121b7f5b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,19 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, go-md2man +{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; stdenv.mkDerivation rec { name = "runc-${version}"; - version = "2016-06-15"; + version = "1.0.0-rc2"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; - rev = "cc29e3dded8e27ba8f65738f40d251c885030a28"; - sha256 = "18fwb3kq10zhhx184yn3j396gpbppy3y4ypb8m2b2pdms39s6pyx"; + rev = "v${version}"; + sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk"; }; + patches = [ + # Two patches to fix CVE-2016-9962 + # From https://bugzilla.suse.com/show_bug.cgi?id=1012568 + (fetchpatch { + name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch"; + url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw"; + sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck"; + }) + (fetchpatch { + name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch"; + url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw"; + sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl"; + }) + ]; + outputs = [ "out" "man" ]; hardeningDisable = ["fortify"]; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index c3880b92bdf8..00de6b874534 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; }; - makeFlags = "all"; + buildFlags = "SYSCONFDIR=/etc all"; installFlags = "PREFIX=\${out} VERSION=${version}"; meta = with stdenv.lib; { @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/vivien/i3blocks; license = licenses.gpl3; maintainers = [ "MindTooth" ]; - platforms = platforms.all; + platforms = with platforms; freebsd ++ linux; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index ac577385ad47..6d5e53b70880 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -11,6 +11,12 @@ let }); versionSpec = { "latest" = { + name = "1.0.0"; + rev = "refs/tags/1.0.0"; + sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; + patches = []; + }; + "0.9.9" = { name = "0.9.9"; rev = "refs/tags/0.9.9"; sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; @@ -19,8 +25,8 @@ let "git" = { name = "git-20160617"; rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; - sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; - patches = []; + sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + patches = []; }; }.${version}; in diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/pkgs/build-support/fetchurl/write-mirror-list.sh index 55508742dd36..2dabd2e722be 100644 --- a/pkgs/build-support/fetchurl/write-mirror-list.sh +++ b/pkgs/build-support/fetchurl/write-mirror-list.sh @@ -1,4 +1,4 @@ source $stdenv/setup # !!! this is kinda hacky. -set | grep '^[a-zA-Z]\+=.*://' > $out +set | grep -E '^[a-zA-Z]+=.*://' > $out diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d03265c089a7..36cb068d93d6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1886,22 +1886,22 @@ rec { }; debian8i386 = { - name = "debian-8.6-jessie-i386"; - fullName = "Debian 8.6 Jessie (i386)"; + name = "debian-8.7-jessie-i386"; + fullName = "Debian 8.7 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "b915c936233609af3ecf9272cd53fbdb2144d463e8472a30507aa112ef5e6a6b"; + sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.6-jessie-amd64"; - fullName = "Debian 8.6 Jessie (amd64)"; + name = "debian-8.7-jessie-amd64"; + fullName = "Debian 8.7 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "8b80b6608a8fc72509b949efe1730077f0e8383b29c6aed5f86d9f9b51a631d8"; + sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f739479ac0a9..52227e9b2ba5 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.08"; + version = "4.09"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1d32ki8nkwd2xiln619jihqn7s15ydrg7386n4hxq530sys7svic"; + sha256 = "1740gq9sq28dp5a5sjn1ya7cvrv8mbky6knb7734v8k29a7a0x55"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 812362d6b30c..952961086181 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec"; - sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm"; + rev = "5c5b04af472eb6c2854b21cb52ee6324252280de"; + sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb"; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix index 9eb7e78d8d45..e0622b176218 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix @@ -8,11 +8,11 @@ let majorVersion = "0.11"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.2"; + name = "geary-${majorVersion}.3"; src = fetchurl { url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "0ca6kdprhm8w990n6wgpvn0vzsdrnv9vjdm448pa8winspn217jw"; + sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index eb1b1654bb87..1ef623fe5133 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/applications/16.12.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index ae0140328511..10bb6936bca7 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2227 +3,2227 @@ { akonadi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-16.12.0.tar.xz"; - sha256 = "1gqjaxq8b3mcwjm28aqc9kss4p46hga252j27vsg85pzvw58q718"; - name = "akonadi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-16.12.1.tar.xz"; + sha256 = "1snf6jdr7yz1ng5whqkjsc89h82a97zj6vw8ijwiqqyas1cifdm3"; + name = "akonadi-16.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-16.12.0.tar.xz"; - sha256 = "1y6yg4f9ayl0il074fln2496pfh6jdsr489yh25jjcs8wf52669h"; - name = "akonadi-calendar-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-16.12.1.tar.xz"; + sha256 = "0q2gpk8ci5snlz1v4rwwnrl74damjlz7fvdys875jykdnnb7jsfi"; + name = "akonadi-calendar-16.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-tools-16.12.0.tar.xz"; - sha256 = "0wwchjf2pisbj5hp9hfs8m2bhxgzkxf6c0rj8zv5p66lcl964iad"; - name = "akonadi-calendar-tools-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-tools-16.12.1.tar.xz"; + sha256 = "1v9nj1nv4sxvqvd397vr38vscda0r3z80hll7jr8psyx7lyn91jx"; + name = "akonadi-calendar-tools-16.12.1.tar.xz"; }; }; akonadiconsole = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadiconsole-16.12.0.tar.xz"; - sha256 = "033rx5nqkwyrshacm3bykd8w2c2dffx6wfhm26l7siicaa6kani6"; - name = "akonadiconsole-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadiconsole-16.12.1.tar.xz"; + sha256 = "11rqyp7grjijhbl1apjjhc3d9qcxf0mz31l9mgd223vaxkv5lbjs"; + name = "akonadiconsole-16.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-contacts-16.12.0.tar.xz"; - sha256 = "1imiv3w78gsk33yiwpkrfzgdlcyqwrzmjid6wwbxjh52rawjvvzc"; - name = "akonadi-contacts-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-contacts-16.12.1.tar.xz"; + sha256 = "042m4mnvs8a6jgrlyybysm0jax07r1756fixn4kglb0ki3lp57kr"; + name = "akonadi-contacts-16.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-import-wizard-16.12.0.tar.xz"; - sha256 = "1nz7ca3457cmlrvmk33hphlm3q2fq3qcq36rmandsv5n1jplfcf5"; - name = "akonadi-import-wizard-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-import-wizard-16.12.1.tar.xz"; + sha256 = "1ns7y1wqd4zvbgpzlczyailmvf6raqwqrpxxhshdskdd672n849p"; + name = "akonadi-import-wizard-16.12.1.tar.xz"; }; }; akonadi-mime = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-mime-16.12.0.tar.xz"; - sha256 = "06547ixg4054lm8clyfsmkmwc8zai3w9swyw7hyjz257fd0147dr"; - name = "akonadi-mime-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-mime-16.12.1.tar.xz"; + sha256 = "01bzh2hb73q25jnw9wkragvglr9j89rh079p6k4f898cpjqfvdin"; + name = "akonadi-mime-16.12.1.tar.xz"; }; }; akonadi-notes = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-notes-16.12.0.tar.xz"; - sha256 = "03cadn97fa1jkbpljk0764w8dwv5k1brm1iv554gmag0xky2a6in"; - name = "akonadi-notes-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-notes-16.12.1.tar.xz"; + sha256 = "1brc53mc1zggqgx6gy9f3vysis3cqyrsn7h02zc49mljycmkri7n"; + name = "akonadi-notes-16.12.1.tar.xz"; }; }; akonadi-search = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akonadi-search-16.12.0.tar.xz"; - sha256 = "08y7rk9i30d3kg61xfzck0a78dyrgb6jzs3w4i7rxq28z374mi2m"; - name = "akonadi-search-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akonadi-search-16.12.1.tar.xz"; + sha256 = "05xdznd4g3jm74n3yjg0w9vh435l0ix4sssmh2z3i2apxak3rxdy"; + name = "akonadi-search-16.12.1.tar.xz"; }; }; akregator = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/akregator-16.12.0.tar.xz"; - sha256 = "0ibls40w0wad1gkdj3djmmvdd89pia3fbykqfjwrvnxslr7zfvnl"; - name = "akregator-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/akregator-16.12.1.tar.xz"; + sha256 = "1f1hf3r124icy59k829f6yfrk6zy512f3zy9rm5zv33vl5fmc437"; + name = "akregator-16.12.1.tar.xz"; }; }; analitza = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/analitza-16.12.0.tar.xz"; - sha256 = "1ws1whss7p5ijyaw7vs5lfvrisljk2b4m6iqbnr1v4n45cr27vrq"; - name = "analitza-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/analitza-16.12.1.tar.xz"; + sha256 = "1b07hl516sd7qvrkhv0ihsc83jycyp2dqckziw8g0cm2sj81ymcz"; + name = "analitza-16.12.1.tar.xz"; }; }; ark = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ark-16.12.0.tar.xz"; - sha256 = "0gg84p1qaamklgvyqw5pjcdm2934srkvclrvn07jdpcf8xirn51a"; - name = "ark-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ark-16.12.1.tar.xz"; + sha256 = "1l78pshhkpyc9fybpypi3kdp7jism1c6lljflncpvxxvk1q16k5m"; + name = "ark-16.12.1.tar.xz"; }; }; artikulate = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/artikulate-16.12.0.tar.xz"; - sha256 = "1ahz3kypszfc5smzdblbr47yb320p4sc28frl7b5vvbx2mj77iyi"; - name = "artikulate-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/artikulate-16.12.1.tar.xz"; + sha256 = "1v8p494x9dgm6yqw6mfhzkg6hkbb1rnk8x4jfjdsncknfk27ni5b"; + name = "artikulate-16.12.1.tar.xz"; }; }; audiocd-kio = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/audiocd-kio-16.12.0.tar.xz"; - sha256 = "0hl5qiafp6yqi87qncp1kgd6178jn7bh2paz4fxyc4v92w2mzlcy"; - name = "audiocd-kio-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/audiocd-kio-16.12.1.tar.xz"; + sha256 = "1s06lnmzllb4nd24x7bri1g4g77865k1w5gdn46ryfmlhwg4bccm"; + name = "audiocd-kio-16.12.1.tar.xz"; }; }; baloo-widgets = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/baloo-widgets-16.12.0.tar.xz"; - sha256 = "06w0f54m9bw7640049gl10v6krdm5c0xlb6bjf61ay99mbyv7cgq"; - name = "baloo-widgets-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/baloo-widgets-16.12.1.tar.xz"; + sha256 = "0z1109wi0gdz9c8qr278ca1r0ff1p89966245fgg6rcxpm52zzsb"; + name = "baloo-widgets-16.12.1.tar.xz"; }; }; blinken = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/blinken-16.12.0.tar.xz"; - sha256 = "0l3l3fjhsxm13m99mvcqgnyw0vmnjvx5akaa3nyx0mfzm1y1iw4v"; - name = "blinken-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/blinken-16.12.1.tar.xz"; + sha256 = "0jijzz31iv9v1yv898j6q25y5fmrk8vqsvx7xwcj84ca8qmp9scf"; + name = "blinken-16.12.1.tar.xz"; }; }; blogilo = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/blogilo-16.12.0.tar.xz"; - sha256 = "0582dfznwvwc28zqzmbayypgy6kn2gq87q7j1y6q8m0lm017xgqy"; - name = "blogilo-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/blogilo-16.12.1.tar.xz"; + sha256 = "11dq36vis770hgmyq119aw2bl99855j5r38f7kr81ad2fjmla54z"; + name = "blogilo-16.12.1.tar.xz"; }; }; bomber = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/bomber-16.12.0.tar.xz"; - sha256 = "0qxs0slw4q75bhakmp7di2izi3sz9niq7v0kjincis9vc2l13dd9"; - name = "bomber-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/bomber-16.12.1.tar.xz"; + sha256 = "081109mf1lqcc03ba852h021s2i3kwy6nnl3jc4zyn5igkm08cad"; + name = "bomber-16.12.1.tar.xz"; }; }; bovo = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/bovo-16.12.0.tar.xz"; - sha256 = "0cmxf4i5zpzc1lc9ggbvbd74i4ks29q915mygdam99b2bzfbq9qv"; - name = "bovo-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/bovo-16.12.1.tar.xz"; + sha256 = "1dk0hrpn22v5ia8qnlan0i4wrxbccwl88k9bapxydnrgwyw4vfkx"; + name = "bovo-16.12.1.tar.xz"; }; }; calendarsupport = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/calendarsupport-16.12.0.tar.xz"; - sha256 = "11jz7vl8ay4fkxifpyg4vpdw7cl9m8dj6bgbmfw8nhdf8v8m9i6v"; - name = "calendarsupport-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/calendarsupport-16.12.1.tar.xz"; + sha256 = "0d74sghas76ry9vyd19fr9hgirvhycljdrvdmrxsh1sxjd04q96g"; + name = "calendarsupport-16.12.1.tar.xz"; }; }; cantor = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/cantor-16.12.0.tar.xz"; - sha256 = "0k1ps1dxilikm1qnfpd0fmbxsrqi5mrf2wyl07b67a3sfl7bzw98"; - name = "cantor-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/cantor-16.12.1.tar.xz"; + sha256 = "1m7n7n03p7060w7rw3mgzpkv841azv42flrzq4h9589akl91k0js"; + name = "cantor-16.12.1.tar.xz"; }; }; cervisia = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/cervisia-16.12.0.tar.xz"; - sha256 = "0c8g3l0q0inyggikqlz7spb32v26lz63ghs1m2cfjagvzisiylbg"; - name = "cervisia-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/cervisia-16.12.1.tar.xz"; + sha256 = "1lsg8hb2kgsbygi63hdfbfng2lk7kl8mdksfhkwfa2g4l7sjlcy8"; + name = "cervisia-16.12.1.tar.xz"; }; }; dolphin = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/dolphin-16.12.0.tar.xz"; - sha256 = "0dyzlpd7pj21jl4k5j6x6fbxzj7vlp7ww4z82rkld3x7kmmi4b4v"; - name = "dolphin-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/dolphin-16.12.1.tar.xz"; + sha256 = "0vpsj1s2hijksay7wblzgk97md4hbrpzzdnrdxmfz3izdnzbyaxh"; + name = "dolphin-16.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/dolphin-plugins-16.12.0.tar.xz"; - sha256 = "0ab62pbvb6n47b86j1bdicahwqvcnv401872f5q08na1zybxklx3"; - name = "dolphin-plugins-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/dolphin-plugins-16.12.1.tar.xz"; + sha256 = "1g9sdfmq04incgxj428y5r3k7wgjl77bv95cp3svwd5kxz6syipz"; + name = "dolphin-plugins-16.12.1.tar.xz"; }; }; dragon = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/dragon-16.12.0.tar.xz"; - sha256 = "08sasdzd22l8mdzlb0jf780qcy374qg5ngispq78vn2x8zkyk3q2"; - name = "dragon-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/dragon-16.12.1.tar.xz"; + sha256 = "14k0q96k1h6b21c5wpwr3bxjngkm1qz3pisv0cvx7dcahy4z20ik"; + name = "dragon-16.12.1.tar.xz"; }; }; eventviews = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/eventviews-16.12.0.tar.xz"; - sha256 = "048sgmr3ws48xmfp1h6zyrizyigp2qqhiz3lrwla39iblxi0l4sf"; - name = "eventviews-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/eventviews-16.12.1.tar.xz"; + sha256 = "1ghpd7rsfkh2xvy2p8pfxgrabhkq4hbq05n1sqa95zb3ax2q4qwd"; + name = "eventviews-16.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ffmpegthumbs-16.12.0.tar.xz"; - sha256 = "036py6cgkb7zismbffavk3jzjz2lzrh4jbknqrdrwli4fxsxbpi6"; - name = "ffmpegthumbs-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ffmpegthumbs-16.12.1.tar.xz"; + sha256 = "19rnqkwbv5dflhhkrczr5hd8qnscvbdfr8kfb3phcai2shgn0pps"; + name = "ffmpegthumbs-16.12.1.tar.xz"; }; }; filelight = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/filelight-16.12.0.tar.xz"; - sha256 = "05v0db9n6s3fxn31450biij0w0vf7s4bsvfbyiy3cnf33habgz4d"; - name = "filelight-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/filelight-16.12.1.tar.xz"; + sha256 = "0zax3vmynh2aajq24znbdqnxslgkyqmy6n0d9xasi10zq0hli97q"; + name = "filelight-16.12.1.tar.xz"; }; }; granatier = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/granatier-16.12.0.tar.xz"; - sha256 = "1hzqqsdq7xj7ackc11yn966cnns82200ff7yc1wiazgivg39l8wj"; - name = "granatier-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/granatier-16.12.1.tar.xz"; + sha256 = "1v85cw83gfzd3vwnbmmpbvsz85n6vh7478r572pikq1scgvxpn62"; + name = "granatier-16.12.1.tar.xz"; }; }; grantlee-editor = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/grantlee-editor-16.12.0.tar.xz"; - sha256 = "049fvgyri9bqm792gyyz6qx7mrriqb3gmdbd2i8zs0x1i1lxfbn7"; - name = "grantlee-editor-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/grantlee-editor-16.12.1.tar.xz"; + sha256 = "08jkdcj3nka8r31h76vl9nf2wlmr92ndab8pj42wx7kf7nldbzh1"; + name = "grantlee-editor-16.12.1.tar.xz"; }; }; grantleetheme = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/grantleetheme-16.12.0.tar.xz"; - sha256 = "07i2vidzvh9z05iz8xs08w918x7917mckfm1w5agpi4ma8iz8g4b"; - name = "grantleetheme-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/grantleetheme-16.12.1.tar.xz"; + sha256 = "1b199870pkg1lkqbyf27b2rn4xqpbkm5hkwr08x65y67cfy1jm8v"; + name = "grantleetheme-16.12.1.tar.xz"; }; }; gwenview = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/gwenview-16.12.0.tar.xz"; - sha256 = "0pqzqfb604qfcck2jml65aya6gyjqvx8gnl047mr04yd4x65mjnn"; - name = "gwenview-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/gwenview-16.12.1.tar.xz"; + sha256 = "0r1cg3zw98wmbvdfb1cjlqpca30067zzc3w8flrql9rldfbgcp95"; + name = "gwenview-16.12.1.tar.xz"; }; }; incidenceeditor = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/incidenceeditor-16.12.0.tar.xz"; - sha256 = "1ylkxx7j2dsipcxrdj3cs142hjnz25c76q6jlpwj6p4vv7vzhvq9"; - name = "incidenceeditor-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/incidenceeditor-16.12.1.tar.xz"; + sha256 = "0n4fq7pbmnkn9zx96svd6azs89arhpzlnrbjp60vbrpix8r6m0q5"; + name = "incidenceeditor-16.12.1.tar.xz"; }; }; jovie = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/jovie-16.12.0.tar.xz"; - sha256 = "0qm853z8g620klmcay955yfc76mb8ggfdx65zrhiiq5nkfaybwkr"; - name = "jovie-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/jovie-16.12.1.tar.xz"; + sha256 = "0c5sz80yzkmp18r1c9wcf6n9cg9rj12sax5yx3j3x7gz5p9r5jj0"; + name = "jovie-16.12.1.tar.xz"; }; }; juk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/juk-16.12.0.tar.xz"; - sha256 = "05jk2gp9mcsjjdppahg3r70vjr203wf63mb5kqmdr98gfm9wfm74"; - name = "juk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/juk-16.12.1.tar.xz"; + sha256 = "0v647vlfvq7lm33295v2c8w5qjm8ww9mxmxvvqd4rj35vg419zsb"; + name = "juk-16.12.1.tar.xz"; }; }; kaccessible = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kaccessible-16.12.0.tar.xz"; - sha256 = "1mh3610my9l21cq1zyjfk991q1gi6mii0z83zwq83wyi146b42mx"; - name = "kaccessible-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kaccessible-16.12.1.tar.xz"; + sha256 = "04j74411rsjyvv7ann1hgb6wmqxk2ym7g6h2y07ld1vdl9kcj1vl"; + name = "kaccessible-16.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kaccounts-integration-16.12.0.tar.xz"; - sha256 = "14v3pifz0diz3dscbyl49bp4fm2ivwdwm6hhxycv69fd221wkx5x"; - name = "kaccounts-integration-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kaccounts-integration-16.12.1.tar.xz"; + sha256 = "0d4z9b8w76njnjqsr5w555p3016d0aa5hlsxplac9h82gysdj6q7"; + name = "kaccounts-integration-16.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kaccounts-providers-16.12.0.tar.xz"; - sha256 = "0fiq8zkaz3jyxnphi7z2r6q8xjsqlkzzjcs51akal5dm2cp1i6px"; - name = "kaccounts-providers-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kaccounts-providers-16.12.1.tar.xz"; + sha256 = "1aphsn0xwlrsw2snwhzbj4kpwpw09nwsv61lpmp97byl3sq814fw"; + name = "kaccounts-providers-16.12.1.tar.xz"; }; }; kaddressbook = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kaddressbook-16.12.0.tar.xz"; - sha256 = "11hnrf1cwjnjysx8wgwnkfj0vkfv7vgv4wdrllnxj5mpx8mcw3k7"; - name = "kaddressbook-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kaddressbook-16.12.1.tar.xz"; + sha256 = "14sdkfzmfhfyvy8cky6015gnsz199ngj4ffg9r4qrkkdqcvw5rar"; + name = "kaddressbook-16.12.1.tar.xz"; }; }; kajongg = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kajongg-16.12.0.tar.xz"; - sha256 = "1aymlzrw331z8ch46cwpv8x1v4j8ilhz42hzji1x06rh4s0xn5k6"; - name = "kajongg-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kajongg-16.12.1.tar.xz"; + sha256 = "0g6amf644q2540y5iyqcv5d25g32hfi13qm3hcc1rmqghz7dn4k4"; + name = "kajongg-16.12.1.tar.xz"; }; }; kalarm = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kalarm-16.12.0.tar.xz"; - sha256 = "1kbrq5d854szx6nknyx2jbzmr47xajicaqgjfg59jwbb453mdbkm"; - name = "kalarm-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kalarm-16.12.1.tar.xz"; + sha256 = "015hylcqn4z57a9ibhvi5wrngjks8qkp7wg5faiwhx6cvw77jhw7"; + name = "kalarm-16.12.1.tar.xz"; }; }; kalarmcal = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kalarmcal-16.12.0.tar.xz"; - sha256 = "16qqk1wqyjxfjnz9jaihcj7mdn8iixvmcm1i0cjfpck0bja9sj0p"; - name = "kalarmcal-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kalarmcal-16.12.1.tar.xz"; + sha256 = "061wzn0y5cslgarz8lv73waipp0cahm5am27hc1a9j7y14cbqm16"; + name = "kalarmcal-16.12.1.tar.xz"; }; }; kalgebra = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kalgebra-16.12.0.tar.xz"; - sha256 = "0av4k54cil7jl545q5m7klwvw586hcdfpnvq95bcng8is0bnfrgs"; - name = "kalgebra-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kalgebra-16.12.1.tar.xz"; + sha256 = "0fyfpsh8pgdnspyaxrnmr93rh2shxrhn0nl0772a5bssw35xgb3x"; + name = "kalgebra-16.12.1.tar.xz"; }; }; kalzium = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kalzium-16.12.0.tar.xz"; - sha256 = "03l8dbhhcqaz009g1lxqkq9mci3v0kqx03mxgfdsjq0pzf2hq1ah"; - name = "kalzium-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kalzium-16.12.1.tar.xz"; + sha256 = "1ipscw8721sl9kkb4lxpz3bg9pgf0fp3jx1y4643pk6qrrci1mcm"; + name = "kalzium-16.12.1.tar.xz"; }; }; kamera = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kamera-16.12.0.tar.xz"; - sha256 = "02q8kbkwg7w2iqn76dchyqhwmx6k2a2q3dz3pn1ah0b0ildqr93n"; - name = "kamera-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kamera-16.12.1.tar.xz"; + sha256 = "1rwd88qnbp7ha5rlndbillwhshs6fnv0ppr2gva4m8w9s4sj008q"; + name = "kamera-16.12.1.tar.xz"; }; }; kanagram = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kanagram-16.12.0.tar.xz"; - sha256 = "1xsph7983qnpg0zisbrw9r18i98zdy9xrpsdhq89wz895iqrfxqn"; - name = "kanagram-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kanagram-16.12.1.tar.xz"; + sha256 = "0rrdav0rigbvi1ya8iwv9h2jjkf4vqcywsb7wxdrksrng35hc57h"; + name = "kanagram-16.12.1.tar.xz"; }; }; kapman = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kapman-16.12.0.tar.xz"; - sha256 = "1p8h6xr7na9ihgcvc63c537kd9d4zhhvhim559dbf371cpkfm40l"; - name = "kapman-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kapman-16.12.1.tar.xz"; + sha256 = "1wxxk7airpfq43rmwskjkv8r9zyrlb7vzd9ihbsxgacb8i0dvb86"; + name = "kapman-16.12.1.tar.xz"; }; }; kapptemplate = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kapptemplate-16.12.0.tar.xz"; - sha256 = "07sd32hkmw07afw65hi4rbzwvxasan01clag4z4smqscibz4dfr1"; - name = "kapptemplate-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kapptemplate-16.12.1.tar.xz"; + sha256 = "0k7gvjqfp8iq9z9mc6jvp7f90kysgmqla83qfxqmpin1k5l24p8z"; + name = "kapptemplate-16.12.1.tar.xz"; }; }; kate = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kate-16.12.0.tar.xz"; - sha256 = "0n769wn2ja81mzhynqab034a7644nd0dcz3digqcf7hxplcjwcrz"; - name = "kate-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kate-16.12.1.tar.xz"; + sha256 = "1p0jf0fwsq28jk3rmck4sv0pnipp4sv1amsjn3m57dcpb0084jlq"; + name = "kate-16.12.1.tar.xz"; }; }; katomic = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/katomic-16.12.0.tar.xz"; - sha256 = "1kk7h293qcxmq8wn597xc8awnfr5pbz8gf3h6zicvcmmcl6a2v6r"; - name = "katomic-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/katomic-16.12.1.tar.xz"; + sha256 = "1galbrlpj331mxi9a1zivx78v1qjvb1mdbf7nzgsqg9qqdszrx2p"; + name = "katomic-16.12.1.tar.xz"; }; }; kblackbox = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kblackbox-16.12.0.tar.xz"; - sha256 = "146x0rj6408d96aw426qcs5h43xw9dash51spys0frsrgnblm7ji"; - name = "kblackbox-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kblackbox-16.12.1.tar.xz"; + sha256 = "0782v6dqc8jvzvmsirfjg9ddngx3m9wxjwbj3mahxdn0hjzghxhj"; + name = "kblackbox-16.12.1.tar.xz"; }; }; kblocks = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kblocks-16.12.0.tar.xz"; - sha256 = "0h60w4x003ypip5svbda88sxbyxxpjf6kxxfyxniv81hq5vag49d"; - name = "kblocks-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kblocks-16.12.1.tar.xz"; + sha256 = "16i9c7w81y70r834g3chv479pv28xvkb8p2b8kapqdl1qci17niw"; + name = "kblocks-16.12.1.tar.xz"; }; }; kblog = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kblog-16.12.0.tar.xz"; - sha256 = "1ph86xkjc42m3mysg68xwfy0d364vjqlm4wsn8yx0ag0ndr34vw2"; - name = "kblog-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kblog-16.12.1.tar.xz"; + sha256 = "1azg2yp0nbvknkff4d8g2i28l48gvgny1j12aqs540wag9jv8j68"; + name = "kblog-16.12.1.tar.xz"; }; }; kbounce = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kbounce-16.12.0.tar.xz"; - sha256 = "0jr0pgdp9nmiikbrnx82ydjkh4mgv0wcqjp7fdfyh1rmcz8r02v1"; - name = "kbounce-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kbounce-16.12.1.tar.xz"; + sha256 = "109lik70lqvfpk4b2k5pkcbb9dfn2b9cfl6s3vdybvd8j79w3kcf"; + name = "kbounce-16.12.1.tar.xz"; }; }; kbreakout = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kbreakout-16.12.0.tar.xz"; - sha256 = "0pk2hn2bzx3cdxmilsd3rbrvajv2ysipybmd5ca3q65rf8d0l727"; - name = "kbreakout-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kbreakout-16.12.1.tar.xz"; + sha256 = "0wfdskc3bqb8cffqc6abgdziqg47k9w06s0w58khzvh6skjafxn5"; + name = "kbreakout-16.12.1.tar.xz"; }; }; kbruch = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kbruch-16.12.0.tar.xz"; - sha256 = "1q7zbixix29qcakixra11ffb6x2l64cxigxc9jw40hpggh9rki16"; - name = "kbruch-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kbruch-16.12.1.tar.xz"; + sha256 = "058lidgj8b03lkksy0jjrkh4jk7fmajc7sx994bxccb907r9jbav"; + name = "kbruch-16.12.1.tar.xz"; }; }; kcachegrind = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcachegrind-16.12.0.tar.xz"; - sha256 = "0660b13vsky54lfw42nzk136a5pdhdszqr53ahfa2966ij5dswwz"; - name = "kcachegrind-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcachegrind-16.12.1.tar.xz"; + sha256 = "1qr5fgxkzk4ql8ib2bb3m85bx033gxg468860aqkz0im0lf216s4"; + name = "kcachegrind-16.12.1.tar.xz"; }; }; kcalc = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcalc-16.12.0.tar.xz"; - sha256 = "0vx71zv2fs0di28h1g0cvnmawjyadd7jc6z9ahf4w55ycmamxj71"; - name = "kcalc-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcalc-16.12.1.tar.xz"; + sha256 = "0ncq609jil3ssqj8rslxz9pn4cdlbik0y93rc6mvw4hgk0p0yfgv"; + name = "kcalc-16.12.1.tar.xz"; }; }; kcalcore = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcalcore-16.12.0.tar.xz"; - sha256 = "0f86yz4jrrfvf869kppmms4l3w8xwaygjqa1wqxrrmm7wsvrysd7"; - name = "kcalcore-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcalcore-16.12.1.tar.xz"; + sha256 = "167c8rl5zqfbnk5ricy0lrw8jjyqm5j5d39d2xgf6p5hd3lqw22f"; + name = "kcalcore-16.12.1.tar.xz"; }; }; kcalutils = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcalutils-16.12.0.tar.xz"; - sha256 = "088lbl9zgjbrhy0ahjmjn8qx8gd10171jprab7d083ny7crx27ik"; - name = "kcalutils-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcalutils-16.12.1.tar.xz"; + sha256 = "1p36vhk3ylvw1zn82pahg3grwl6ag4rdwn8lzgf9day3bdr9fr8h"; + name = "kcalutils-16.12.1.tar.xz"; }; }; kcharselect = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcharselect-16.12.0.tar.xz"; - sha256 = "1pcphx845r0kjah94n1b2j7fmrrqy4kvrhiyc40wmqp12fp0km8b"; - name = "kcharselect-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcharselect-16.12.1.tar.xz"; + sha256 = "0fv989ff94bhlhapk1irwkdghx8vq19n5b208qkrbfna5jzs0nfz"; + name = "kcharselect-16.12.1.tar.xz"; }; }; kcolorchooser = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcolorchooser-16.12.0.tar.xz"; - sha256 = "0zdkpn0i53wv49ynwmkz0pd0yvh1f2fjkdgqrs8i4bslipp0411z"; - name = "kcolorchooser-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcolorchooser-16.12.1.tar.xz"; + sha256 = "1vq72gm73vpmjb635cmjx25cfx5rgvpmapjkw6yhdpp9bdv3xs3z"; + name = "kcolorchooser-16.12.1.tar.xz"; }; }; kcontacts = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcontacts-16.12.0.tar.xz"; - sha256 = "1qxxh7bqadrbq28b9fmjj748az9ir6rznn179pvlr2v32ch25vrw"; - name = "kcontacts-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcontacts-16.12.1.tar.xz"; + sha256 = "10g2r62db7mbfrkr8qjf7m4kl7c9ybv5l3ci37mabkvnnnacqqni"; + name = "kcontacts-16.12.1.tar.xz"; }; }; kcron = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kcron-16.12.0.tar.xz"; - sha256 = "1cqx4k384kk3g48qp9vdxd46cijzdskay3a67k7jwszinjnhqgbx"; - name = "kcron-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kcron-16.12.1.tar.xz"; + sha256 = "00ipxmfm5wvj3szjlw550xsm3cpcm27wnvwbffxjpikzipzrhsr9"; + name = "kcron-16.12.1.tar.xz"; }; }; kdebugsettings = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdebugsettings-16.12.0.tar.xz"; - sha256 = "1nkqqcrbkwfcvnqylniqlwlay4x2ma2i7jdp0msm2yr2q743k01l"; - name = "kdebugsettings-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdebugsettings-16.12.1.tar.xz"; + sha256 = "0valppahimpdj00gbvhasqq12d2rvl4i16cqc7g9q5mbmr51fs3y"; + name = "kdebugsettings-16.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-dev-scripts-16.12.0.tar.xz"; - sha256 = "1qadnwi4ph4hdjzfrjfqr4idw8ky4j14mc37w7r7025mdlfbj06n"; - name = "kde-dev-scripts-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-dev-scripts-16.12.1.tar.xz"; + sha256 = "11b4mbxs22x78qzz4dnq15cgvjsb3z8w23xz4x6af8vd6dizy8xc"; + name = "kde-dev-scripts-16.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-dev-utils-16.12.0.tar.xz"; - sha256 = "039i3by9hl3h6yc1bbkf4y1bx3gxclncx69mh0z4fh5h58z5vz1r"; - name = "kde-dev-utils-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-dev-utils-16.12.1.tar.xz"; + sha256 = "1acadqsi5sv3dbdxrlil8a5yrhgqvvibi05sdvvqzmz0c1fw6w0k"; + name = "kde-dev-utils-16.12.1.tar.xz"; }; }; kdeedu-data = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdeedu-data-16.12.0.tar.xz"; - sha256 = "144px97jyfc258cwaqp8jw8jfnw22bnpa4p48mzxdl70p0q6maal"; - name = "kdeedu-data-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdeedu-data-16.12.1.tar.xz"; + sha256 = "1axg6k0jwnpsfbk5mis17fnsacdlf9p8pfqy8qp83l0n8pink1nb"; + name = "kdeedu-data-16.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-mobipocket-16.12.0.tar.xz"; - sha256 = "1wpnijyvacajz96zaqa0185qwbg1ma5c1lvkzd1ww6h04dychfvi"; - name = "kdegraphics-mobipocket-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-mobipocket-16.12.1.tar.xz"; + sha256 = "0a59irbkwcvf81jj0rqf9fb1ks6crk4xrrqzp0l0h0hjza7qmk6n"; + name = "kdegraphics-mobipocket-16.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-thumbnailers-16.12.0.tar.xz"; - sha256 = "1r8f1167sqnd4qd9ibgknp1w9jfbw4yr2rcyp62xi3xlp04mn9fm"; - name = "kdegraphics-thumbnailers-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-thumbnailers-16.12.1.tar.xz"; + sha256 = "08qj67xkij6g8hzs5wj4c53pwnm711y54qdcrnrl4cpbcfvcynzd"; + name = "kdegraphics-thumbnailers-16.12.1.tar.xz"; }; }; kde-l10n-ar = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ar-16.12.0.tar.xz"; - sha256 = "1hz9bi8z3z2vgxbmsqv8vp4pi03gg6vjnxcf1jngc7jix91iqaf4"; - name = "kde-l10n-ar-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ar-16.12.1.tar.xz"; + sha256 = "0s4a05zl66xks3kixf07z1s05y932qb5ssz1njwas6j8sx7dxvl5"; + name = "kde-l10n-ar-16.12.1.tar.xz"; }; }; kde-l10n-ast = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ast-16.12.0.tar.xz"; - sha256 = "1kj0l96wz5j1s8kr5za9az62v7qgw1z9ig4m38hxb9635m2zrp59"; - name = "kde-l10n-ast-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ast-16.12.1.tar.xz"; + sha256 = "0dk2wcb3yd9lgc5j0imkfsclir54za83g5kqkyf7a81fwy799ndm"; + name = "kde-l10n-ast-16.12.1.tar.xz"; }; }; kde-l10n-bg = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bg-16.12.0.tar.xz"; - sha256 = "0xy5icllcq56lmqrpnmyja8kycnr3njzg1adrr2dnvdhwgjm8knj"; - name = "kde-l10n-bg-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bg-16.12.1.tar.xz"; + sha256 = "15qz82sbmyxi1gj62d36a6hdx1q9fmg8b9wchxkbls84429ancgz"; + name = "kde-l10n-bg-16.12.1.tar.xz"; }; }; kde-l10n-bs = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bs-16.12.0.tar.xz"; - sha256 = "1wrdqcargx9qfmkmk0scwvrb1x5dqcxfba1mj44biijzxmaxy6v7"; - name = "kde-l10n-bs-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bs-16.12.1.tar.xz"; + sha256 = "1jqcib98rs2albx9vxcn2cnk23rx05pk2fhd4mgbcdcx7vmj2ws3"; + name = "kde-l10n-bs-16.12.1.tar.xz"; }; }; kde-l10n-ca = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca-16.12.0.tar.xz"; - sha256 = "0w8k81jar52hy60cwdn5l6n3d535cyvf72rdsshs148s4hpx1naz"; - name = "kde-l10n-ca-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca-16.12.1.tar.xz"; + sha256 = "0vnvpnrxfasfmkahmvs28x2kbq7rb725nspgp9y96m58brwis4h9"; + name = "kde-l10n-ca-16.12.1.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.12.0"; + version = "ca_valencia-16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca@valencia-16.12.0.tar.xz"; - sha256 = "1raj2w8ixaxi43nh44z19xd9m2iqg5b2wrqccd8pjyip73c1la3q"; - name = "kde-l10n-ca_valencia-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca@valencia-16.12.1.tar.xz"; + sha256 = "0mhiwqih6z4cj9hwksnkiad29l4bn9bvbnngnh5dgz8m566471sq"; + name = "kde-l10n-ca_valencia-16.12.1.tar.xz"; }; }; kde-l10n-cs = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-cs-16.12.0.tar.xz"; - sha256 = "143h9gkb2l5h3fm6phv07x0az5i7fzs9m53xck71wpahz1z244km"; - name = "kde-l10n-cs-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-cs-16.12.1.tar.xz"; + sha256 = "033yzzvs8cb747fnjjy982y6sadprmwbjhpxy2icgkhppimyi90y"; + name = "kde-l10n-cs-16.12.1.tar.xz"; }; }; kde-l10n-da = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-da-16.12.0.tar.xz"; - sha256 = "03p1npjikfmb3a1hgmcd14lx3x9vfvf1x3mzz25493wlwzkb5lbm"; - name = "kde-l10n-da-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-da-16.12.1.tar.xz"; + sha256 = "01kwa0swc2jg870v60hp01hkksw4h85644qf0capq84diqy370j9"; + name = "kde-l10n-da-16.12.1.tar.xz"; }; }; kde-l10n-de = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-de-16.12.0.tar.xz"; - sha256 = "146zb25f54ig4zkmys4wq5j057k9ajfp9jyyfqmmpch33567llb6"; - name = "kde-l10n-de-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-de-16.12.1.tar.xz"; + sha256 = "0rlv3mqd1m7vk29ywlhs11zspgzzlhvai25w1j3cj89mbsyryqja"; + name = "kde-l10n-de-16.12.1.tar.xz"; }; }; kde-l10n-el = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-el-16.12.0.tar.xz"; - sha256 = "0vcf8wi1wd358hs1ynyil2ahb26w9dp8snlszyhr63zbg9qwwic4"; - name = "kde-l10n-el-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-el-16.12.1.tar.xz"; + sha256 = "087nj0w3r9vs9ph8459jy26bmyj9dq1q8hwww40dsvi6lg4pm09m"; + name = "kde-l10n-el-16.12.1.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.12.0"; + version = "en_GB-16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-en_GB-16.12.0.tar.xz"; - sha256 = "1bvcgasl672xawfd8alwcindyj16j5p3cplqndw4z1pybnsmzgmk"; - name = "kde-l10n-en_GB-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-en_GB-16.12.1.tar.xz"; + sha256 = "0wf6kwb2i5lp5j2mhh4sdj14w6gzgmpz4avjvxsydal13mcvb8q0"; + name = "kde-l10n-en_GB-16.12.1.tar.xz"; }; }; kde-l10n-eo = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eo-16.12.0.tar.xz"; - sha256 = "1sln4krw8l8zm3q4h7q7rhd5lf7s7rfb6n73wybxmwypawyz0qqn"; - name = "kde-l10n-eo-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eo-16.12.1.tar.xz"; + sha256 = "1qbb3pcvyszfmjzl1jcwhj3fybfza181wnm28jzw2c68s7n7f18s"; + name = "kde-l10n-eo-16.12.1.tar.xz"; }; }; kde-l10n-es = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-es-16.12.0.tar.xz"; - sha256 = "1kp1ihmlkkg053bplsjbbiixp0yzidd4gidpcj9axsa74f04084w"; - name = "kde-l10n-es-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-es-16.12.1.tar.xz"; + sha256 = "1whwbaxklr972w0s6ck277ql5vhh2v15dnw3gfasp5k5rx1g1rcb"; + name = "kde-l10n-es-16.12.1.tar.xz"; }; }; kde-l10n-et = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-et-16.12.0.tar.xz"; - sha256 = "0w48lirqnsgk78hkiam8cc7r7h5h4mrd7b8wssvxwbknyz33jfkz"; - name = "kde-l10n-et-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-et-16.12.1.tar.xz"; + sha256 = "0jlx8rf4y7mdwcmc9ypyi2rm09mddmpz2l2p0k1p2fb3596n6yg8"; + name = "kde-l10n-et-16.12.1.tar.xz"; }; }; kde-l10n-eu = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eu-16.12.0.tar.xz"; - sha256 = "0mpjr6yklvvfjhrssvn1m27gqs7r9jvdr0prp6yss8v00ij9i3ig"; - name = "kde-l10n-eu-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eu-16.12.1.tar.xz"; + sha256 = "0x8pmxdnzzxbki9r66y5ha44q6j7sihjkn6y5psqrqghrgxmg11b"; + name = "kde-l10n-eu-16.12.1.tar.xz"; }; }; kde-l10n-fa = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fa-16.12.0.tar.xz"; - sha256 = "167lq8fnlfhrmvivzpznmv7x82izs9jdl6w4p8dg2i3801jwi9ff"; - name = "kde-l10n-fa-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fa-16.12.1.tar.xz"; + sha256 = "0m886zx1kp6aykwcmrhc6w2g20va3sskwjg5l03lb0dq2g4b8nlv"; + name = "kde-l10n-fa-16.12.1.tar.xz"; }; }; kde-l10n-fi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fi-16.12.0.tar.xz"; - sha256 = "19y8jrxfl0nh4dcrl7sdz8r9cyka3cjg0dp8cs84v5c10fab4w8l"; - name = "kde-l10n-fi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fi-16.12.1.tar.xz"; + sha256 = "0mcz0cc1wzrfhbacgxas9wlk9jczbnbbdb96q0dypj7vbwdw15j2"; + name = "kde-l10n-fi-16.12.1.tar.xz"; }; }; kde-l10n-fr = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fr-16.12.0.tar.xz"; - sha256 = "1p487x8jsihxn7lrjmssi6i3is01498szblqn84yc8bgc7pgfdly"; - name = "kde-l10n-fr-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fr-16.12.1.tar.xz"; + sha256 = "07ax7ldfjzvrlkwh1bl4y1j8ngq5rgnikykjqc0iy5g8vv71pb24"; + name = "kde-l10n-fr-16.12.1.tar.xz"; }; }; kde-l10n-ga = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ga-16.12.0.tar.xz"; - sha256 = "0avpkwmdac9c8n8l0ddssgmn2pk9lkn7zhs532ird8axv4i9ynk4"; - name = "kde-l10n-ga-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ga-16.12.1.tar.xz"; + sha256 = "19gqdnih89cbqjxdxxj6mv1528z0kqhh020pf6cnb638k6fw2jpf"; + name = "kde-l10n-ga-16.12.1.tar.xz"; }; }; kde-l10n-gl = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-gl-16.12.0.tar.xz"; - sha256 = "1qdwfxgaqbymgqwmpki3zk3d5h18fmb7n62basn2yqhbj7cdpkil"; - name = "kde-l10n-gl-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-gl-16.12.1.tar.xz"; + sha256 = "03bwvly40j9ynh6gqxjxq3p9rqdiwclm3iyn6iwa0ri1y8jix0dy"; + name = "kde-l10n-gl-16.12.1.tar.xz"; }; }; kde-l10n-he = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-he-16.12.0.tar.xz"; - sha256 = "19nkvhs7gjrcxsynraqmgvif1n5m1zmjm6j7h1zviqmwcn9zncj4"; - name = "kde-l10n-he-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-he-16.12.1.tar.xz"; + sha256 = "0zj9ppvj6k2wxsp0f8drrrwhb93xlgggskhyp93dcb7d6dpl561x"; + name = "kde-l10n-he-16.12.1.tar.xz"; }; }; kde-l10n-hi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hi-16.12.0.tar.xz"; - sha256 = "1m5qlc3mf9ns7ka8kmj5c2iqaqkb68hcab13hp5y5j4i7miqpp6d"; - name = "kde-l10n-hi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hi-16.12.1.tar.xz"; + sha256 = "0l8aa97mkl0csz3yrq8ib1ypdwiir47nhnll8zgw8gxh97rzkr4w"; + name = "kde-l10n-hi-16.12.1.tar.xz"; }; }; kde-l10n-hr = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hr-16.12.0.tar.xz"; - sha256 = "1lbf25apks10c1byy0z8zjsfqd7f07xzhpdrinxbpdsa69ln28k2"; - name = "kde-l10n-hr-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hr-16.12.1.tar.xz"; + sha256 = "1azp8rpai0v7wyqm8a8cfw8dnx9053nmb9cjps4jxvzfcxggbb1x"; + name = "kde-l10n-hr-16.12.1.tar.xz"; }; }; kde-l10n-hu = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hu-16.12.0.tar.xz"; - sha256 = "0m2pv1zddfflpgmvab84j19b0nb7fymslqy2pzcdx6ga9f0k37gl"; - name = "kde-l10n-hu-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hu-16.12.1.tar.xz"; + sha256 = "111g42krxx41zph5h02mrxd8zj31gfpji9ai7hw88h089gxy1c0z"; + name = "kde-l10n-hu-16.12.1.tar.xz"; }; }; kde-l10n-ia = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ia-16.12.0.tar.xz"; - sha256 = "0x6h4k29s6pqd0k6c7lv15pa6837a59g5dskfph38kjdiv8lfwvq"; - name = "kde-l10n-ia-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ia-16.12.1.tar.xz"; + sha256 = "0bncwdnwa7bzm5n5gac3f44qai9z6ymwgn72g3fr9g8lw0a48h2m"; + name = "kde-l10n-ia-16.12.1.tar.xz"; }; }; kde-l10n-id = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-id-16.12.0.tar.xz"; - sha256 = "12ysf2q9cjfmsc00p6rdwhykbwvhzq6n5j0i296506hhmvbz2n15"; - name = "kde-l10n-id-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-id-16.12.1.tar.xz"; + sha256 = "0nqnl8aisvvmx4rrycyixarjrkq8cil6wq9xyxd1gv6r3wyxi25i"; + name = "kde-l10n-id-16.12.1.tar.xz"; }; }; kde-l10n-is = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-is-16.12.0.tar.xz"; - sha256 = "1042skag9p1d1x1yg0jr8a3k1qsbr65nrswvmi2bqxmv59ls60zz"; - name = "kde-l10n-is-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-is-16.12.1.tar.xz"; + sha256 = "0afkgwz3rqsl5fmvi7lij4krwkal9qcfgafpqfsgxh053ip4h97r"; + name = "kde-l10n-is-16.12.1.tar.xz"; }; }; kde-l10n-it = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-it-16.12.0.tar.xz"; - sha256 = "0q44bcan48rjngc892prgqd0nyagh0wsha47hhxb9lm5cnf8kzis"; - name = "kde-l10n-it-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-it-16.12.1.tar.xz"; + sha256 = "0bjbq21w7pm88ij5p69rjg5a5plbk5kblf760zyxw19dhmj1rx98"; + name = "kde-l10n-it-16.12.1.tar.xz"; }; }; kde-l10n-ja = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ja-16.12.0.tar.xz"; - sha256 = "100wlprb149vpccypw5i0f6jj3f9yb77rkifn65h8brfmiiynisa"; - name = "kde-l10n-ja-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ja-16.12.1.tar.xz"; + sha256 = "0y05zaw7a6xyvzkc0zy5snlxzpdmh796h1nm6hqjr3l1w65anj0x"; + name = "kde-l10n-ja-16.12.1.tar.xz"; }; }; kde-l10n-kk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-kk-16.12.0.tar.xz"; - sha256 = "045sni4cb70r94zb3vgprplr2nnpixbdx80c7cc99m2z4dd9bk01"; - name = "kde-l10n-kk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-kk-16.12.1.tar.xz"; + sha256 = "16ca99aaqmg4n9lp0h554s399kxmk42i6qlkaw3slzr9s2ljbb70"; + name = "kde-l10n-kk-16.12.1.tar.xz"; }; }; kde-l10n-km = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-km-16.12.0.tar.xz"; - sha256 = "025cp9xpqa1hiax5lwpbqabdcdjpkm3szcbhwf607gz51ck6l4q3"; - name = "kde-l10n-km-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-km-16.12.1.tar.xz"; + sha256 = "0sm0v7y9lpzzdagvbjybj8ym0ihr26j4slmga4izr9i035rid24m"; + name = "kde-l10n-km-16.12.1.tar.xz"; }; }; kde-l10n-ko = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ko-16.12.0.tar.xz"; - sha256 = "1aga8cmf2mv5746b5ix6j2ims2xp7s1mmn8dksipj0inrg9bim3b"; - name = "kde-l10n-ko-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ko-16.12.1.tar.xz"; + sha256 = "0g54fz1z611i6r49ahr54mz40950w8yv8ii4w6gx66yh7m805czw"; + name = "kde-l10n-ko-16.12.1.tar.xz"; }; }; kde-l10n-lt = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lt-16.12.0.tar.xz"; - sha256 = "1rf1rwq4gzpcifpki1dx8iw7yv9fdyqrkbg96pnp47lynbdkp63s"; - name = "kde-l10n-lt-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lt-16.12.1.tar.xz"; + sha256 = "19z5fwsv67pm5fj62g5vsjy56614kwv198sh9wr06b0c1122a33s"; + name = "kde-l10n-lt-16.12.1.tar.xz"; }; }; kde-l10n-lv = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lv-16.12.0.tar.xz"; - sha256 = "0hn4c453fj3r7bscl5zr4n42cpxxxs738fc24cz34yjcxq19fgc3"; - name = "kde-l10n-lv-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lv-16.12.1.tar.xz"; + sha256 = "0q8ni73yyfkqzc4kdh9cm7518pvczjbf7z27fy662vpx6bdw8dab"; + name = "kde-l10n-lv-16.12.1.tar.xz"; }; }; kde-l10n-mr = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-mr-16.12.0.tar.xz"; - sha256 = "04jljwj8kk2h5bqxfcpwnmig457w8141q1ckk91nfv4927gq3im3"; - name = "kde-l10n-mr-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-mr-16.12.1.tar.xz"; + sha256 = "143s0ldvz1lkq1mc3cv4xifhrmiqbqavval40dn5w78f3qsb2h6q"; + name = "kde-l10n-mr-16.12.1.tar.xz"; }; }; kde-l10n-nb = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nb-16.12.0.tar.xz"; - sha256 = "16msjakcjlg6q9lk1bslayy1gsa2s3gf0b9gy1nkw3v09df93hv6"; - name = "kde-l10n-nb-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nb-16.12.1.tar.xz"; + sha256 = "100ykwdw4nhwahijn9mqp1y9cyllw8i7dy9lyhvhw4zw1r89nbyj"; + name = "kde-l10n-nb-16.12.1.tar.xz"; }; }; kde-l10n-nds = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nds-16.12.0.tar.xz"; - sha256 = "1jfswrb3z3q39pfgv7m1jzb1nigchfdnjg26zc1wmw8n6b544yhs"; - name = "kde-l10n-nds-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nds-16.12.1.tar.xz"; + sha256 = "0gn35547hjya99bxzf47frh3y2jm6vgmwfc822s7hr7a629bdvmv"; + name = "kde-l10n-nds-16.12.1.tar.xz"; }; }; kde-l10n-nl = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nl-16.12.0.tar.xz"; - sha256 = "1i9z5bp76gz8w58qzmgi5b90xbfar0ypjyhmnfksdzvpgd571lmq"; - name = "kde-l10n-nl-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nl-16.12.1.tar.xz"; + sha256 = "0a11cqn7brvxfbh497qmqivdki0hwbgjnmlp1y438xgnmmny8kr8"; + name = "kde-l10n-nl-16.12.1.tar.xz"; }; }; kde-l10n-nn = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nn-16.12.0.tar.xz"; - sha256 = "1fvva9p572fi05z2542pfyx3wjycld1ap1zqgzlmk6j28a3ifzcb"; - name = "kde-l10n-nn-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nn-16.12.1.tar.xz"; + sha256 = "1s43fh3kc0w9cd0fnwhb04hm8q2la5s5qkx9dadc0v8mwxnr56k9"; + name = "kde-l10n-nn-16.12.1.tar.xz"; }; }; kde-l10n-pa = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pa-16.12.0.tar.xz"; - sha256 = "0dqn7bijj6k8hp20nvh79jwzz1dnkx0py125b0isvjpakslqwf3p"; - name = "kde-l10n-pa-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pa-16.12.1.tar.xz"; + sha256 = "1zzv3bjn159a4lapfiqcvhdlvvac29q5h42jc7w1kfbv15byykz8"; + name = "kde-l10n-pa-16.12.1.tar.xz"; }; }; kde-l10n-pl = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pl-16.12.0.tar.xz"; - sha256 = "1l3ja8j4pw75qzaswli8a7c0qd1ac272dblx597njcs8iqgs6y3l"; - name = "kde-l10n-pl-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pl-16.12.1.tar.xz"; + sha256 = "07l5vfchiwwszxfw3fpidh869049wg9fkjkjzpf0hvqgknlii2va"; + name = "kde-l10n-pl-16.12.1.tar.xz"; }; }; kde-l10n-pt = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt-16.12.0.tar.xz"; - sha256 = "0riyk5sz63sv8cfx8s25hw5l9g0052fbbq7m8srmc79hhw4w3p5h"; - name = "kde-l10n-pt-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt-16.12.1.tar.xz"; + sha256 = "14cp6mm740v8fwc2p8c1w164yl925wk5ysz19527g6nmydfww3f0"; + name = "kde-l10n-pt-16.12.1.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.12.0"; + version = "pt_BR-16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt_BR-16.12.0.tar.xz"; - sha256 = "0a3nhv7m5jkzsw158i5fbhlxz0p1pgn6rnzdja25v8hs3jqnzcq4"; - name = "kde-l10n-pt_BR-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt_BR-16.12.1.tar.xz"; + sha256 = "173yjk28hbvgjcr07p99svw2z5g3bb58ln2cv50lckj0lmr4j379"; + name = "kde-l10n-pt_BR-16.12.1.tar.xz"; }; }; kde-l10n-ro = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ro-16.12.0.tar.xz"; - sha256 = "0qs8dlcvh2366g0ifcwd7s5kg3q28bagpp8sm5zliyd79fh60mhh"; - name = "kde-l10n-ro-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ro-16.12.1.tar.xz"; + sha256 = "1jakhzs21417rd6cafq6p1qda3w3w0vq8v4lp45nas45iij2f9vr"; + name = "kde-l10n-ro-16.12.1.tar.xz"; }; }; kde-l10n-ru = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ru-16.12.0.tar.xz"; - sha256 = "0mk6h5fyna5qbq97mxwfihcjfg8lv7w5r1kis505ds6icym2pkzz"; - name = "kde-l10n-ru-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ru-16.12.1.tar.xz"; + sha256 = "05hxgd4dpqdvyhbn1vj64x7h00iylwl2cih4myb77pcjw0hdpgi4"; + name = "kde-l10n-ru-16.12.1.tar.xz"; }; }; kde-l10n-sk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sk-16.12.0.tar.xz"; - sha256 = "0qvgsjc9dbqfydg5zpygncpapw3df68yd1ham5d36v0c3k5161wi"; - name = "kde-l10n-sk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sk-16.12.1.tar.xz"; + sha256 = "0rhjqsa15xp99k67yy88qp2v7pi1i29v7kr1jvvwrfn4byrgjr5f"; + name = "kde-l10n-sk-16.12.1.tar.xz"; }; }; kde-l10n-sl = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sl-16.12.0.tar.xz"; - sha256 = "15lia25c9nasp6w6y1xvnnhkxb3977rdbl4zcanla7da6ma7h8yd"; - name = "kde-l10n-sl-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sl-16.12.1.tar.xz"; + sha256 = "00p4j40f5sbsfnbmnfj6hciq2817m41ii81m6g3ckg3fyv184vbh"; + name = "kde-l10n-sl-16.12.1.tar.xz"; }; }; kde-l10n-sr = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sr-16.12.0.tar.xz"; - sha256 = "1irjpki6pnnkxdp49vw61caixfhkjgahdgx14cayb4zi16qsmn7p"; - name = "kde-l10n-sr-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sr-16.12.1.tar.xz"; + sha256 = "18k4nhbiriq0wng0jr51wbkgi6hzwn7g3r2aqh57gsf50z5rjj6k"; + name = "kde-l10n-sr-16.12.1.tar.xz"; }; }; kde-l10n-sv = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sv-16.12.0.tar.xz"; - sha256 = "0a9jh60bz6xjq1ckyw2v67w9sdsjdlajlcbkb3jl021l8f5hywpx"; - name = "kde-l10n-sv-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sv-16.12.1.tar.xz"; + sha256 = "0ca6gyxfvss3sxl3lxb9jf6ac2fb1lnz5bs4imrgxly1wphzd66p"; + name = "kde-l10n-sv-16.12.1.tar.xz"; }; }; kde-l10n-tr = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-tr-16.12.0.tar.xz"; - sha256 = "0i3sigwhrj36dmv2li9qqdshd3zh4p8sa9zgngfvz1942x32yi8x"; - name = "kde-l10n-tr-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-tr-16.12.1.tar.xz"; + sha256 = "10j649xb1zvn9zp9i0zmsmc6bwx08wgm0a3y66213w2framsx9fn"; + name = "kde-l10n-tr-16.12.1.tar.xz"; }; }; kde-l10n-ug = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ug-16.12.0.tar.xz"; - sha256 = "04mw7h9pyrbfvhx3mbp16czzawbqi9kn83nakysgkyy7dri1rl4g"; - name = "kde-l10n-ug-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ug-16.12.1.tar.xz"; + sha256 = "0dr23z6f9azvxnagdsyzgbwqr0xknricxwm6lykqdaa1r4s3mnzs"; + name = "kde-l10n-ug-16.12.1.tar.xz"; }; }; kde-l10n-uk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-uk-16.12.0.tar.xz"; - sha256 = "0iwzqvr677sqmgl4jdpawfnrf63k0x4xm3p29lbb2hpqnc0xmmpy"; - name = "kde-l10n-uk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-uk-16.12.1.tar.xz"; + sha256 = "0cxjz1d07429z0fasppjl8p0gr9a4ylz8ymcx3pqmaa872sgg7h6"; + name = "kde-l10n-uk-16.12.1.tar.xz"; }; }; kde-l10n-wa = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-wa-16.12.0.tar.xz"; - sha256 = "057kpzn50rs625ri737kjgn9zy8vxdaxmjlhk777piq5pq6id9s1"; - name = "kde-l10n-wa-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-wa-16.12.1.tar.xz"; + sha256 = "1pdzr1hs0zr31qv11n029chjgbwi7si8nas26y8wz5xxbfrjrb07"; + name = "kde-l10n-wa-16.12.1.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.12.0"; + version = "zh_CN-16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_CN-16.12.0.tar.xz"; - sha256 = "0313ph852wygmws225534nv2ldmd5kvky3vl5nmcwg5fryc0dq7i"; - name = "kde-l10n-zh_CN-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_CN-16.12.1.tar.xz"; + sha256 = "04bxkjdpld13i609dircbdh8zknlsn9jcwy4nvcwa1p2xf04dr5z"; + name = "kde-l10n-zh_CN-16.12.1.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.12.0"; + version = "zh_TW-16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_TW-16.12.0.tar.xz"; - sha256 = "0vfj5zdwrqzd34nxja8lwk93m9hiw3dzmbkaf9k5a7cpkqwnhf5s"; - name = "kde-l10n-zh_TW-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_TW-16.12.1.tar.xz"; + sha256 = "0wmcf8v3c68a4mfqzfy1dxdyb1bx29ak1zy8skmrvshn1arfhyab"; + name = "kde-l10n-zh_TW-16.12.1.tar.xz"; }; }; kdelibs = { - version = "4.14.27"; + version = "4.14.28"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdelibs-4.14.27.tar.xz"; - sha256 = "1cngdvkpwdwbl5b40q00h9ivnpqbnjbd7kkfvsma7rlgg7wfg7xp"; - name = "kdelibs-4.14.27.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdelibs-4.14.28.tar.xz"; + sha256 = "1r2dyr723w75yh65zgpzg9irm0jx3nsywa9zxw1xgls4p8xksyy0"; + name = "kdelibs-4.14.28.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdenetwork-filesharing-16.12.0.tar.xz"; - sha256 = "1icsranvsyvxrnlg9lm034i6xf247sqxdgcvrfqjw35rf047yp0d"; - name = "kdenetwork-filesharing-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdenetwork-filesharing-16.12.1.tar.xz"; + sha256 = "100pagqj2y2jdzn5b37zyiab382dmx7j4kdwyrrnz6rzsr0lm9pr"; + name = "kdenetwork-filesharing-16.12.1.tar.xz"; }; }; kdenlive = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdenlive-16.12.0.tar.xz"; - sha256 = "1qsnjya1sppn5dfx8lanxqpgakd5jgi7677wq7vvyz3v9i47zvmc"; - name = "kdenlive-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdenlive-16.12.1.tar.xz"; + sha256 = "13bn0i7qyw4cil5cp0s1ynx80y2xp9wzbycmw9mcvbi66clyk9dw"; + name = "kdenlive-16.12.1.tar.xz"; }; }; kdepim-addons = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdepim-addons-16.12.0.tar.xz"; - sha256 = "1a063qxmal8n5rd2a6v05zml61l52sm33574vqxybh1bnx2dpq58"; - name = "kdepim-addons-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdepim-addons-16.12.1.tar.xz"; + sha256 = "1yaymzyh6rg1b17d556v5prbd4y46kph33r55riq5mbzfwfwx85j"; + name = "kdepim-addons-16.12.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdepim-apps-libs-16.12.0.tar.xz"; - sha256 = "1zm2mnwsxk4c58dbx3ln26mz89f1d20vywiljczfzpn99rg4cvvi"; - name = "kdepim-apps-libs-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdepim-apps-libs-16.12.1.tar.xz"; + sha256 = "14sx43g7fi62g278m95mjpfixwcyrj2qrz0hlp3zzlcjpq0ra9zv"; + name = "kdepim-apps-libs-16.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdepim-runtime-16.12.0.tar.xz"; - sha256 = "0vkmjh0l5yzpd9rmnyc2cchwpk9ccyk79g2ii5qg6xxr46r1vmfs"; - name = "kdepim-runtime-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdepim-runtime-16.12.1.tar.xz"; + sha256 = "0l8ypmynwmiyh2v9kwr3b5wdydwzmm9q02qij1vff01frq7hnh8s"; + name = "kdepim-runtime-16.12.1.tar.xz"; }; }; kde-runtime = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kde-runtime-16.12.0.tar.xz"; - sha256 = "1vs5q063li8jj56vwyy3wh6hfabf0xhmp6ag9mc2ns8kwcia1m6x"; - name = "kde-runtime-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kde-runtime-16.12.1.tar.xz"; + sha256 = "1inz7dlbw9ngjizc7nrnr6y93b34zmkjp89v58xqzmyajk1hbqp1"; + name = "kde-runtime-16.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdesdk-kioslaves-16.12.0.tar.xz"; - sha256 = "19jbw3w8mg20m3f96s9bnw0wg28zxq2kgq0fs9c5rbjr8alxlyz2"; - name = "kdesdk-kioslaves-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdesdk-kioslaves-16.12.1.tar.xz"; + sha256 = "0qi9pkbg63kc8b27my05z9ih8z48mffc54m05gdcapgqx1qxigis"; + name = "kdesdk-kioslaves-16.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdesdk-thumbnailers-16.12.0.tar.xz"; - sha256 = "1syzfdffggs3hidykmg9y6l4nzh7wbqs4ah9vih8cgs0qr2hml9s"; - name = "kdesdk-thumbnailers-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdesdk-thumbnailers-16.12.1.tar.xz"; + sha256 = "07fbm60x6rqf39w13980dmg4qcm9i6y004hzydfgjd7gyfmh2jrx"; + name = "kdesdk-thumbnailers-16.12.1.tar.xz"; }; }; kdf = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdf-16.12.0.tar.xz"; - sha256 = "0shwr55nrjgzm6cb2cdglvkkmknppd4yl0arn38w5a56sacsczcc"; - name = "kdf-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdf-16.12.1.tar.xz"; + sha256 = "1nhb718fmqqk22vrb5brykymsjfvh6w57v83lnyvp7w9ryks52fv"; + name = "kdf-16.12.1.tar.xz"; }; }; kdialog = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdialog-16.12.0.tar.xz"; - sha256 = "0p6bf557k5ycmfaz7jrc65fp4j104c2cbv0ibamkyfrlpp1d0i1c"; - name = "kdialog-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdialog-16.12.1.tar.xz"; + sha256 = "1qg1fcjyh8fybl2vg9dp1v9bwb3xx2mrlcx4zdr3fhpaq13pqs3f"; + name = "kdialog-16.12.1.tar.xz"; }; }; kdiamond = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kdiamond-16.12.0.tar.xz"; - sha256 = "1v0k23m74hiwr3a679h4wpc1w3m6y5mnjqc66pd9m94rshz8i8k6"; - name = "kdiamond-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kdiamond-16.12.1.tar.xz"; + sha256 = "16vssx8zklsia84zdp5yb5y9did92dqfly95a8w82zabdm47rx3b"; + name = "kdiamond-16.12.1.tar.xz"; }; }; keditbookmarks = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/keditbookmarks-16.12.0.tar.xz"; - sha256 = "1pw2snbdrndx42vxw51vss7mf52v6ys9jmkg7j6bkwp90dnlly1v"; - name = "keditbookmarks-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/keditbookmarks-16.12.1.tar.xz"; + sha256 = "0jnldxlx9kdqrl3i8b4xa1p2dbna80ffxw83cbv53125fqg5ii71"; + name = "keditbookmarks-16.12.1.tar.xz"; }; }; kfilereplace = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kfilereplace-16.12.0.tar.xz"; - sha256 = "0bcn07p1iq44pry0q771vadpi9gm9p2icbn8q5fympxf2y9smmqx"; - name = "kfilereplace-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kfilereplace-16.12.1.tar.xz"; + sha256 = "1pzf2gz89slv7fhp9d7n32p7vjpdr594qqmc4qi4i51gv0cksj2m"; + name = "kfilereplace-16.12.1.tar.xz"; }; }; kfind = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz"; - sha256 = "0i2sjcw3ah35x3w7cvhrpzrv5khwax6nazbqbwzgvfa0gwc9y8ki"; - name = "kfind-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kfind-16.12.1.tar.xz"; + sha256 = "0bddyxjzha9flbj3b8ry805w5xns7al7hmx7hmpik7w1ph3ch0fx"; + name = "kfind-16.12.1.tar.xz"; }; }; kfloppy = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kfloppy-16.12.0.tar.xz"; - sha256 = "0awcayd1hffdv7dybbrv2m38q33yl26g4bs9z1yib7h4iilky3lz"; - name = "kfloppy-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kfloppy-16.12.1.tar.xz"; + sha256 = "0g9v6rgvjfwmikyd7c7w6xpbdymvqm8p4gs0mlbb7d1ianylfgv1"; + name = "kfloppy-16.12.1.tar.xz"; }; }; kfourinline = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kfourinline-16.12.0.tar.xz"; - sha256 = "18l218fww9y3msmx28j42xyvgyvngj2bhdx05ji8q9x40phq8dby"; - name = "kfourinline-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kfourinline-16.12.1.tar.xz"; + sha256 = "1zna1l1pll6hvjh1cbrh2kji17d67axwc955mx8xpjjm2fhw3np3"; + name = "kfourinline-16.12.1.tar.xz"; }; }; kgeography = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kgeography-16.12.0.tar.xz"; - sha256 = "1zcw344y2xrz2h9f37kvk0fl4c9rm5xcahqc3hranm922ki0c8v4"; - name = "kgeography-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kgeography-16.12.1.tar.xz"; + sha256 = "1irs63lb8gaghb2qxqbih4bi7w3fyjbkl379jzlxacz963a35hk8"; + name = "kgeography-16.12.1.tar.xz"; }; }; kget = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kget-16.12.0.tar.xz"; - sha256 = "125b4knvng34cj99g45590d9ci5s0f1y3m223rxvzmn5sds2vp1k"; - name = "kget-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kget-16.12.1.tar.xz"; + sha256 = "0n670vxkqa9w51rdmp07g8ihh80v60m076f4rcrlliavw3wg2s76"; + name = "kget-16.12.1.tar.xz"; }; }; kgoldrunner = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kgoldrunner-16.12.0.tar.xz"; - sha256 = "155smz222s38ib0rrfcsfg0vi4l0iksawagwmxvnr1h51s80l5pz"; - name = "kgoldrunner-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kgoldrunner-16.12.1.tar.xz"; + sha256 = "17gi794m6s0v7c1xgxwmy5sldicds3yiyyf5520s56q3vx8sav93"; + name = "kgoldrunner-16.12.1.tar.xz"; }; }; kgpg = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kgpg-16.12.0.tar.xz"; - sha256 = "1jn51r4f2ixwp4qfx635jy017gls0aaz0638kfz8404zj4l523qs"; - name = "kgpg-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kgpg-16.12.1.tar.xz"; + sha256 = "08f8jq9inic05639xx0jh31d8mky4v3w7ig6d7b4k47nm06zzkpi"; + name = "kgpg-16.12.1.tar.xz"; }; }; khangman = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/khangman-16.12.0.tar.xz"; - sha256 = "0827754548bxbhqgfykb7n97hxjszf8azrz2vi6l0vsd080q0kvf"; - name = "khangman-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/khangman-16.12.1.tar.xz"; + sha256 = "1lcwkfppkkiq3fswhydgkxcqgcaq65x0ijdymrnp4g0bsk4y6w2l"; + name = "khangman-16.12.1.tar.xz"; }; }; khelpcenter = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/khelpcenter-16.12.0.tar.xz"; - sha256 = "015s3yj0ppba8b90h0fwwra3xqz2b21n701zd4q40rqfjhkh9p0j"; - name = "khelpcenter-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/khelpcenter-16.12.1.tar.xz"; + sha256 = "1psjs1p3va6f3prymr9pzk0bn41zk6g69y0v1dpxf5ylgpn45234"; + name = "khelpcenter-16.12.1.tar.xz"; }; }; kholidays = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kholidays-16.12.0.tar.xz"; - sha256 = "0rimmd74ls77zzmk00dxs17b9h4vj3382hiz2cl5pgf834s0ljgn"; - name = "kholidays-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kholidays-16.12.1.tar.xz"; + sha256 = "137rkfngcfjb5piva7iihyb3fib3qg84b9xk7f801pwy61pq30rk"; + name = "kholidays-16.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kidentitymanagement-16.12.0.tar.xz"; - sha256 = "0z559af17qjcr7s2nsr0v4yvqn69svkzcqis99x329kbhza1208k"; - name = "kidentitymanagement-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kidentitymanagement-16.12.1.tar.xz"; + sha256 = "0m0x42jd2nlr3xj15zp8iv527driihxqsi64km20577jniw0jz6i"; + name = "kidentitymanagement-16.12.1.tar.xz"; }; }; kig = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kig-16.12.0.tar.xz"; - sha256 = "10svcqid4rzhq8vb4bbxhnp1dlyl4fd8w18blxvqan0qiv43332x"; - name = "kig-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kig-16.12.1.tar.xz"; + sha256 = "148mnp03j9kx3n2xlswc6jpamazljrh3j1r3xi3fkwqhdmqx7ybf"; + name = "kig-16.12.1.tar.xz"; }; }; kigo = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kigo-16.12.0.tar.xz"; - sha256 = "033jbyck21qzm9r9j7q012rbkr0bk0n2prjb70lk38wsb2ghvziw"; - name = "kigo-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kigo-16.12.1.tar.xz"; + sha256 = "09srhp1p14yxnk31fps6cpm4cbpaqghlijf62mjg9414hpm13wyf"; + name = "kigo-16.12.1.tar.xz"; }; }; killbots = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/killbots-16.12.0.tar.xz"; - sha256 = "0079fsh5yld69a3lq4ibbyhlr6kk7j2x0wylnk00jq0m886jqi4j"; - name = "killbots-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/killbots-16.12.1.tar.xz"; + sha256 = "0dabz54bdncvbhldgwdwp7yb5p0fzxjd7rhgciqs387isnrf9l3k"; + name = "killbots-16.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kimagemapeditor-16.12.0.tar.xz"; - sha256 = "1p7r9k7xrvnab83sljlgjlncdpv3z1fxskyzsihdzb3qw1da5sg9"; - name = "kimagemapeditor-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kimagemapeditor-16.12.1.tar.xz"; + sha256 = "1ljkbljxz4656pn6yhsni5jxdw3zpkik7d3b86ns1gaicq2ghw3r"; + name = "kimagemapeditor-16.12.1.tar.xz"; }; }; kimap = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kimap-16.12.0.tar.xz"; - sha256 = "1sm3ifnl80wmzbxz9ybsj4xl224mg5sn43ja29sf7m0syyypfc9n"; - name = "kimap-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kimap-16.12.1.tar.xz"; + sha256 = "0c58jf16i8mwk20446sy7wf72a519nj7aa3g7iw79shjxzljx4zb"; + name = "kimap-16.12.1.tar.xz"; }; }; kio-extras = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kio-extras-16.12.0.tar.xz"; - sha256 = "0g4xxzqbv5bi1msqp1vhkq04815dz4zflnlsgyimihi74mdawd3x"; - name = "kio-extras-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kio-extras-16.12.1.tar.xz"; + sha256 = "14vhh16xbrb1ywmclc2sbr1dm3lvjjcbv2riz5kyx548cnkmid9c"; + name = "kio-extras-16.12.1.tar.xz"; }; }; kiriki = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kiriki-16.12.0.tar.xz"; - sha256 = "034fgl0qvslzyk04gnr68gcvlvynfim8bn0plgz5vd0k5w9n67kc"; - name = "kiriki-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kiriki-16.12.1.tar.xz"; + sha256 = "0rvj9f3kpdc0p6bpjgfjm3j4gxfhmqswag866s9zkm4zmr9l05y9"; + name = "kiriki-16.12.1.tar.xz"; }; }; kiten = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kiten-16.12.0.tar.xz"; - sha256 = "1s6qpzficpfm0zxs8g80xyly7wflxfxwjpr0avsn6ydzz0yj4vc7"; - name = "kiten-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kiten-16.12.1.tar.xz"; + sha256 = "1kzw3867jvmc7yj3897hn2lgh59s571g6629ih7ncwsqbilbagz3"; + name = "kiten-16.12.1.tar.xz"; }; }; kjumpingcube = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kjumpingcube-16.12.0.tar.xz"; - sha256 = "0japldhq8a7rfmzhlyk057iab9xnzwy1ahsp8fbdqh5xgp7yc0sq"; - name = "kjumpingcube-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kjumpingcube-16.12.1.tar.xz"; + sha256 = "0mfllbzhlvhr3h8crzg89zarxzsn9lgridyc6q9ljxzv6hf6w9rp"; + name = "kjumpingcube-16.12.1.tar.xz"; }; }; kldap = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kldap-16.12.0.tar.xz"; - sha256 = "1xz46h39clz5pqlhqfmvdiw67i7dknng5jk9907vjzp84rck8qmr"; - name = "kldap-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kldap-16.12.1.tar.xz"; + sha256 = "070vk1ig1qp8aqv457bwxg8z9gszj90g9ff5n5wyjcgl721n23nz"; + name = "kldap-16.12.1.tar.xz"; }; }; kleopatra = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kleopatra-16.12.0.tar.xz"; - sha256 = "0g5crp2vwvl0bfb95ym3wj3z39vy1bzcdcqw77pw4l1k9jd334sk"; - name = "kleopatra-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kleopatra-16.12.1.tar.xz"; + sha256 = "14d71qym527akx90krzk863f45rmbyj632bvhl2zfwx6ra5wpayx"; + name = "kleopatra-16.12.1.tar.xz"; }; }; klettres = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/klettres-16.12.0.tar.xz"; - sha256 = "1gggmllh4j5178gasc9qzbk7l453nsgmnp3gq18iymcrvjbm5r1k"; - name = "klettres-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/klettres-16.12.1.tar.xz"; + sha256 = "0d9z4g6hkryky8gs5x2agrql4lyw0n64miwk88b5gb7yg3723mp5"; + name = "klettres-16.12.1.tar.xz"; }; }; klickety = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/klickety-16.12.0.tar.xz"; - sha256 = "0xznghprfy7fl2b84dhf7yrcqwj7aa6dxyzani7q0vms6680vjrd"; - name = "klickety-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/klickety-16.12.1.tar.xz"; + sha256 = "1gg91l2fy5iwkmd8z990b561nhgqwvy4rb5i0cv67sikd1mafx0m"; + name = "klickety-16.12.1.tar.xz"; }; }; klines = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/klines-16.12.0.tar.xz"; - sha256 = "086d9cak6vx7paygl2b2vim22gnpcq290agx62z98gy4a4r0aq3x"; - name = "klines-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/klines-16.12.1.tar.xz"; + sha256 = "04mrgv7xbqn4cjwiwr9cydpnkw50zkiv1a0nf2syppcayib3jgyz"; + name = "klines-16.12.1.tar.xz"; }; }; klinkstatus = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/klinkstatus-16.12.0.tar.xz"; - sha256 = "1xr5mzhrs3jsp13587n0r3mr9z5j2fc7qr4z7c9c4za2v0qp83h7"; - name = "klinkstatus-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/klinkstatus-16.12.1.tar.xz"; + sha256 = "1g13npcqdslg6ggk5bjr61q06skkb92w9z8gd0nbkkq8ca6438kd"; + name = "klinkstatus-16.12.1.tar.xz"; }; }; kmag = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmag-16.12.0.tar.xz"; - sha256 = "1aihng2ippkavrlsrf9l3klpwkyql3lyy44x81ibmaw6xaa9zgjs"; - name = "kmag-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmag-16.12.1.tar.xz"; + sha256 = "0398jb6fj1vw2lrby3smns59fiv3s109bd1nnzv69jba11gnr47f"; + name = "kmag-16.12.1.tar.xz"; }; }; kmahjongg = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmahjongg-16.12.0.tar.xz"; - sha256 = "1lv95cjsc0ahnxij1y7b2pdihvkcnmbq6385rlxwqmqjp2mprga7"; - name = "kmahjongg-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmahjongg-16.12.1.tar.xz"; + sha256 = "1qpvykd7adf3fx3sl6rd4d64d6y1ffmx9b048bm3vhlx32g6ksim"; + name = "kmahjongg-16.12.1.tar.xz"; }; }; kmail = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmail-16.12.0.tar.xz"; - sha256 = "0nydggfk2jndj6f7vn9far29z9n5zrmdfcfmfh7pbq5qhgdaxrzf"; - name = "kmail-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmail-16.12.1.tar.xz"; + sha256 = "0vx7ydm9rzw71b46va89k83l1ck364nczla3jia5wcqmli13wswl"; + name = "kmail-16.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmail-account-wizard-16.12.0.tar.xz"; - sha256 = "151ixamq9910pw8q8phn3crhc250khagrimfhsg721kcl0k0ajzs"; - name = "kmail-account-wizard-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmail-account-wizard-16.12.1.tar.xz"; + sha256 = "0166vfycgcvxfj2zlizcmzqdsv6s41djb14x8sff6hxhhxni4hyd"; + name = "kmail-account-wizard-16.12.1.tar.xz"; }; }; kmailtransport = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmailtransport-16.12.0.tar.xz"; - sha256 = "0hm797zk8lcq3icyddh46snx0f1n35j9vx7qg7zy77lfs9xrhh6n"; - name = "kmailtransport-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmailtransport-16.12.1.tar.xz"; + sha256 = "1jwdpw7b1yji2zj70d4bn8z5cjrc51ar00qd0chzi2ykjb4fwvla"; + name = "kmailtransport-16.12.1.tar.xz"; }; }; kmbox = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmbox-16.12.0.tar.xz"; - sha256 = "0xmib0fpardw9f5f61mhmj04qlhh0nkq9cdp0z374r6mar29q2dj"; - name = "kmbox-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmbox-16.12.1.tar.xz"; + sha256 = "0s1qimkiglhsb889sxvsg7w4w9k0l703f8r0092bv0zpz54rzx7l"; + name = "kmbox-16.12.1.tar.xz"; }; }; kmime = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmime-16.12.0.tar.xz"; - sha256 = "0rk6ggpa1iqc6vvkx1w7v68pngxfa0xailgd0rfkb7rxvbv9zvhs"; - name = "kmime-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmime-16.12.1.tar.xz"; + sha256 = "1g792vqm8lb60psccwjg8kdcawdfrbnsflpg1kqif8a2327p0df4"; + name = "kmime-16.12.1.tar.xz"; }; }; kmines = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmines-16.12.0.tar.xz"; - sha256 = "0j15c9valn6zi0siig132ck0jl3ccq8mwi87jmv01lk3wk8wf70n"; - name = "kmines-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmines-16.12.1.tar.xz"; + sha256 = "1vq836nj46r3rn2hddg2vs3541p7q4s4sh6l554pjpdd8dbs8kjv"; + name = "kmines-16.12.1.tar.xz"; }; }; kmix = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmix-16.12.0.tar.xz"; - sha256 = "0q0x0azd6qaa9fqcf4bl9q05fggb1amqdn3y4fj6y4fmybzwy2lk"; - name = "kmix-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmix-16.12.1.tar.xz"; + sha256 = "1acc77v9arr7593qzw0vwhdpxdxd00gmvymkyyn2qlzwy4ihci8g"; + name = "kmix-16.12.1.tar.xz"; }; }; kmousetool = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmousetool-16.12.0.tar.xz"; - sha256 = "08h0jpwf16xxrxijlg1lhlsixmfm8k6kby6z8m47ixd1pfj0dkxa"; - name = "kmousetool-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmousetool-16.12.1.tar.xz"; + sha256 = "02qm8x9jfs86d1hv3g130q0kqiqxm7i9ab11f5n93xb9migi7q68"; + name = "kmousetool-16.12.1.tar.xz"; }; }; kmouth = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmouth-16.12.0.tar.xz"; - sha256 = "1nvxd3kykb0a1kr3pk8rs4imrnv2x2cqvyg4rdj2vzrxszckcirp"; - name = "kmouth-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmouth-16.12.1.tar.xz"; + sha256 = "1l7r63f93q46p1kgjyyvg49mfdfr3n1bbzy6081wlb18igjgwkmq"; + name = "kmouth-16.12.1.tar.xz"; }; }; kmplot = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kmplot-16.12.0.tar.xz"; - sha256 = "1wdx63cv0qyccfgr7zbp1myfyfd2prk8jfq60n240rv0ji1r7ah8"; - name = "kmplot-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kmplot-16.12.1.tar.xz"; + sha256 = "0djrxsh8zm5dncmiy8xn1x54k3g1hscds0f7vaa1lv97prcclqcz"; + name = "kmplot-16.12.1.tar.xz"; }; }; knavalbattle = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/knavalbattle-16.12.0.tar.xz"; - sha256 = "0wyxxhgrmn7fyh3mmanpi7ki59zlrvhwyqpjya6dxysa8v7f6bda"; - name = "knavalbattle-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/knavalbattle-16.12.1.tar.xz"; + sha256 = "1h98fvi31l20b2mx812z1wy0njp22jwc546h6wp50q4l1m7shxg1"; + name = "knavalbattle-16.12.1.tar.xz"; }; }; knetwalk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/knetwalk-16.12.0.tar.xz"; - sha256 = "1xbrzp8qhvnnx85zx5gkbkv5babkgm1zzlrrjbpbgghvqz71g36h"; - name = "knetwalk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/knetwalk-16.12.1.tar.xz"; + sha256 = "1129v31xabk27wqfq3nvyhd8gx3yipcl15zcn2vg89qbj5j71pc9"; + name = "knetwalk-16.12.1.tar.xz"; }; }; knotes = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/knotes-16.12.0.tar.xz"; - sha256 = "0rsl0d25i771r96lmp1bpq7g46jdk1jkfml0f10s3h940y73fyax"; - name = "knotes-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/knotes-16.12.1.tar.xz"; + sha256 = "0i8s8rfqilc8r4x26bisshhp2x3hss748kz1rs9wv2lb6s60r2n8"; + name = "knotes-16.12.1.tar.xz"; }; }; kolf = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kolf-16.12.0.tar.xz"; - sha256 = "12dyfv9zsh3vacakh1yh037ma4n43lqhhqcqns4cimxwqzhdmwz5"; - name = "kolf-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kolf-16.12.1.tar.xz"; + sha256 = "0rjzk40szpfkfc32qyhc41kpnpd96avwl6l4ahgdghx86bdn233k"; + name = "kolf-16.12.1.tar.xz"; }; }; kollision = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kollision-16.12.0.tar.xz"; - sha256 = "0rb83c0ab6hf6y41ll5wp41gkv05jzk4gjjb9z0iy8vbl0zgfy8b"; - name = "kollision-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kollision-16.12.1.tar.xz"; + sha256 = "0yml0a5c2iypj4gzdvak2jjm09gjslbzcyqv0cwaygydzclkn896"; + name = "kollision-16.12.1.tar.xz"; }; }; kolourpaint = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kolourpaint-16.12.0.tar.xz"; - sha256 = "0xapdx2h1ki3lmw6413d4zi6d23ag4cqbhnf8ndk49rk3nal8mlf"; - name = "kolourpaint-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kolourpaint-16.12.1.tar.xz"; + sha256 = "06fg433dqnm1x4v7ixiix5vq33kr865jhw2bnbrpfhyq8qhvcqk1"; + name = "kolourpaint-16.12.1.tar.xz"; }; }; kommander = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kommander-16.12.0.tar.xz"; - sha256 = "03qx7s45dmbbz4yp3d5d0l70ihr5kw08xywirpgdn78gbrzgz5rm"; - name = "kommander-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kommander-16.12.1.tar.xz"; + sha256 = "12d7j6nifblg24zn9bgghil0qcc9sljy4h09sh6qxchnagdx8bb3"; + name = "kommander-16.12.1.tar.xz"; }; }; kompare = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kompare-16.12.0.tar.xz"; - sha256 = "0yxnc7w7zzbra9n7hwv3mccxivivj9dzv8d2va110cm1h7gx5v06"; - name = "kompare-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kompare-16.12.1.tar.xz"; + sha256 = "0kjk6bad6321mgfxfvh9hjj823cilpjrihlrspwr4jh7w8gkb730"; + name = "kompare-16.12.1.tar.xz"; }; }; konqueror = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz"; - sha256 = "18xc0d8hryi6c80ka93n83wlyb208mk8yxvxcx5b0b76yhz642d2"; - name = "konqueror-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/konqueror-16.12.1.tar.xz"; + sha256 = "1rrv20mi5czcpdq0h294s9gr9970f88yhv8hvc10i3h3gpjcv5vg"; + name = "konqueror-16.12.1.tar.xz"; }; }; konquest = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/konquest-16.12.0.tar.xz"; - sha256 = "0811a1649hqavgix8y7b3ngcngpxnz1gf6nf5ljydf5nlja612ai"; - name = "konquest-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/konquest-16.12.1.tar.xz"; + sha256 = "1fib398af900c99x1k263dwqhwp2d6wfp8qn04ry6siyfwlpxkrj"; + name = "konquest-16.12.1.tar.xz"; }; }; konsole = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/konsole-16.12.0.tar.xz"; - sha256 = "125arsfrzh9103gpw67pb4h63zjmn4653rnqm17hvcdpibs5x7lk"; - name = "konsole-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/konsole-16.12.1.tar.xz"; + sha256 = "0nik8xvfppr30942pjcz2h70xdj0p35mxvq2cirh4h1wwb4458nm"; + name = "konsole-16.12.1.tar.xz"; }; }; kontact = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kontact-16.12.0.tar.xz"; - sha256 = "1ym07xfmyy60h2hf575gllhhprgx3n9q5mqqj3z444ipd5z73jhx"; - name = "kontact-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kontact-16.12.1.tar.xz"; + sha256 = "1ynk2cv9ik6zahb92cq4miw05qrw0ffipcq9j71n6m79f319hmkc"; + name = "kontact-16.12.1.tar.xz"; }; }; kontactinterface = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kontactinterface-16.12.0.tar.xz"; - sha256 = "16gw9sq1s9szw9zh1dp025qqj2al6yqf5c1yqkvp94y6kgw901gi"; - name = "kontactinterface-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kontactinterface-16.12.1.tar.xz"; + sha256 = "1qdii6y05ya8jjjfimr61r6d6x31bqgrdb89gms9qpf5rpr3ql2l"; + name = "kontactinterface-16.12.1.tar.xz"; }; }; kopete = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz"; - sha256 = "1297ixqq2g5kqvyap2md5y0nm11027sjffq47m99yrxvsb3z5v60"; - name = "kopete-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kopete-16.12.1.tar.xz"; + sha256 = "0pi3i02myj8bgkqif94n434l13k2ydslrn2nvy47rwsiyr77wrn2"; + name = "kopete-16.12.1.tar.xz"; }; }; korganizer = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/korganizer-16.12.0.tar.xz"; - sha256 = "1xfgklw266zv83d57g1q9yqkzwlr06bf5gg76ac9qfn6fczc5qs7"; - name = "korganizer-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/korganizer-16.12.1.tar.xz"; + sha256 = "1v85bfyq0iyd9qc3lcqi7k65w8hpaq9yx093g4l6yh561xkw8yac"; + name = "korganizer-16.12.1.tar.xz"; }; }; kpat = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kpat-16.12.0.tar.xz"; - sha256 = "00kwpv1zhrj428qbi38fcd87bzkdvq79jcj2z2wlxf496kdr73z3"; - name = "kpat-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kpat-16.12.1.tar.xz"; + sha256 = "1zgwg6pvpq6adlzcm12mqq73w9rpixh7cx892c687930d17r5l8i"; + name = "kpat-16.12.1.tar.xz"; }; }; kpimtextedit = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kpimtextedit-16.12.0.tar.xz"; - sha256 = "1yj3ihl3r04av6bcw6g574ix5xq3vy7xn1bxf5lldxcs0d56485h"; - name = "kpimtextedit-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kpimtextedit-16.12.1.tar.xz"; + sha256 = "1x1q26qwby3d3krx9nimwnx72zp3yns5inc88xkb0r74sn9743la"; + name = "kpimtextedit-16.12.1.tar.xz"; }; }; kppp = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kppp-16.12.0.tar.xz"; - sha256 = "1s760apss671855cc35r52vyrh1n65miibsr9x66fssy2dixbm8a"; - name = "kppp-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kppp-16.12.1.tar.xz"; + sha256 = "01alps13995d1b3974c8ihi7i1pjm5xf5iskrp9bsc2ad8hka7xb"; + name = "kppp-16.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kqtquickcharts-16.12.0.tar.xz"; - sha256 = "170490rl9j73zw4679p5l08rxg4x9agc2xvig029maarkbymy46i"; - name = "kqtquickcharts-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kqtquickcharts-16.12.1.tar.xz"; + sha256 = "0pff2jm814x9f1zyxb8c718f43x34g9diggd15hbzshl0mhdx9h8"; + name = "kqtquickcharts-16.12.1.tar.xz"; }; }; krdc = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/krdc-16.12.0.tar.xz"; - sha256 = "1n0wwb16kfhzsqxj0d1y5ms6k7i568aggrip27l8hgj3bnp1lfv9"; - name = "krdc-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/krdc-16.12.1.tar.xz"; + sha256 = "1v1p6ghvv72swqpv43f6k6wn5jwvk5b21aarm2as6c4x4nzkhffx"; + name = "krdc-16.12.1.tar.xz"; }; }; kremotecontrol = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kremotecontrol-16.12.0.tar.xz"; - sha256 = "1h2znx0vqa9i4qg4b6mdlg4i5pzif266f81wa3kkh2zqw6qiyd77"; - name = "kremotecontrol-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kremotecontrol-16.12.1.tar.xz"; + sha256 = "0l4i47wlzpsm02r5fvkzfqjx9jixkc5c9j69s3ms4h4wwysi7r2z"; + name = "kremotecontrol-16.12.1.tar.xz"; }; }; kreversi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kreversi-16.12.0.tar.xz"; - sha256 = "01z4nwnpcbgd7y1xilwbjc803hqgzp3x89sif6zhkmcrvh17wzsd"; - name = "kreversi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kreversi-16.12.1.tar.xz"; + sha256 = "1mhdz7wqi8ij2rdbsa30wsmz33z04dbxbczymi0wcbnvm2hai34a"; + name = "kreversi-16.12.1.tar.xz"; }; }; krfb = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/krfb-16.12.0.tar.xz"; - sha256 = "0mdi6v4ijibr4cm0gsr5jid4qd1wi5i6bccqn1ii4v2v59pnrzyw"; - name = "krfb-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/krfb-16.12.1.tar.xz"; + sha256 = "0ggpzycqd2jdi0k3knbc0hyfa1vl8mim9v5s4nbclg99y2yyybvl"; + name = "krfb-16.12.1.tar.xz"; }; }; kross-interpreters = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kross-interpreters-16.12.0.tar.xz"; - sha256 = "1dsw0wzwnqz2hgw3s6gjs7bpvkxyqgc0nad7pj7gnhd4j68fr0h1"; - name = "kross-interpreters-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kross-interpreters-16.12.1.tar.xz"; + sha256 = "1m7xpjsggsrig1wqar8m7hjnhr561h20wqkyz66xf11fvwrc7zks"; + name = "kross-interpreters-16.12.1.tar.xz"; }; }; kruler = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kruler-16.12.0.tar.xz"; - sha256 = "0k30cw24ygcc1rbqx5hsy46w4laha733kkcvi0axzhgfkk19wbvq"; - name = "kruler-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kruler-16.12.1.tar.xz"; + sha256 = "1j4xl3s2yw44qb1p287zc8af1nsjrc8dxvsn4xhc5cl0c5hcwi0s"; + name = "kruler-16.12.1.tar.xz"; }; }; ksaneplugin = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksaneplugin-16.12.0.tar.xz"; - sha256 = "17im3pjwchlqsgf8f6ml0i23s6y8x2p5pjfwrc4giwd1v83hh02s"; - name = "ksaneplugin-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksaneplugin-16.12.1.tar.xz"; + sha256 = "05s38s1j1nf9flhaf089bjd10s8mi97ngw0ckr2xjjjkfj4p6abq"; + name = "ksaneplugin-16.12.1.tar.xz"; }; }; kscd = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kscd-16.12.0.tar.xz"; - sha256 = "0g8307qby224zhravfm350mkknhj44rjxcs04pgws3y3ra0bqzcz"; - name = "kscd-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kscd-16.12.1.tar.xz"; + sha256 = "1njzzvkhxqfw889rxw4vd6jyqsmqsrrcjgb5fmrjvwhg94h4i745"; + name = "kscd-16.12.1.tar.xz"; }; }; kshisen = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kshisen-16.12.0.tar.xz"; - sha256 = "1i2mbh1nwwpvns9nkzr7bl5gxk5v58psbw2fad0gxddbcng2sbnh"; - name = "kshisen-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kshisen-16.12.1.tar.xz"; + sha256 = "118fad0k4cv7klkv20x7rvwabnn6fcymypmraamprc76ygvyvk02"; + name = "kshisen-16.12.1.tar.xz"; }; }; ksirk = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksirk-16.12.0.tar.xz"; - sha256 = "1rzp5b35x7yiz1cyfbw80b1wzf68bd3k5ax4pl12q15h1wpcr582"; - name = "ksirk-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksirk-16.12.1.tar.xz"; + sha256 = "0w05nxqw5a18h0ylwx5lmw10wcmjrv293npfz1fl7nkhkxry0wy5"; + name = "ksirk-16.12.1.tar.xz"; }; }; ksnakeduel = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksnakeduel-16.12.0.tar.xz"; - sha256 = "12ybsl1awsz1pygpgfbzfyyql24znafmll6qcydcg07rjxld9ywq"; - name = "ksnakeduel-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksnakeduel-16.12.1.tar.xz"; + sha256 = "1zrh34kb66sg1crhbndxhqychz359d1779ykw25q577panagwhgd"; + name = "ksnakeduel-16.12.1.tar.xz"; }; }; kspaceduel = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kspaceduel-16.12.0.tar.xz"; - sha256 = "1rpacxbzg8rdl1hmm6nvksjj8z4cwqyh0v8javazf8ngas29bijj"; - name = "kspaceduel-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kspaceduel-16.12.1.tar.xz"; + sha256 = "1g0ghr8lwvhlxq9b27864hfbsirb3y3zn0ipcw5cc0qdfcs9cqq2"; + name = "kspaceduel-16.12.1.tar.xz"; }; }; ksquares = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksquares-16.12.0.tar.xz"; - sha256 = "16gd9l9bm96dv6srl11blxh15n3invh7znzxikxspjzckm3jqc5q"; - name = "ksquares-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksquares-16.12.1.tar.xz"; + sha256 = "1bb7saml0l76cpkngpvdfn9yv7kg3fzj152dgav6cgvfzaj6xdz5"; + name = "ksquares-16.12.1.tar.xz"; }; }; kstars = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kstars-16.12.0.tar.xz"; - sha256 = "0j6g58xlasxa23vqc12kzl4ijaw34wncdvrsfgdzi3b9bvqy3njm"; - name = "kstars-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kstars-16.12.1.tar.xz"; + sha256 = "0pfmg3669nigdl0zhab45jh7h6gh5jmxvca1vxavwp8jmn96ghkl"; + name = "kstars-16.12.1.tar.xz"; }; }; ksudoku = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksudoku-16.12.0.tar.xz"; - sha256 = "05jak7hg3yn9dwbinhny0av5rhj1r9zzp7l79nrg8nbm52jnyy4m"; - name = "ksudoku-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksudoku-16.12.1.tar.xz"; + sha256 = "07h550yvv48xk8s8ppnhxr6lfv69qsfxghadybf4g777hyxl06dy"; + name = "ksudoku-16.12.1.tar.xz"; }; }; ksystemlog = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ksystemlog-16.12.0.tar.xz"; - sha256 = "0q3ca4c98a0j8d0370gaczqqs32446hyyf70kf7rxmr6f35d7y4q"; - name = "ksystemlog-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ksystemlog-16.12.1.tar.xz"; + sha256 = "0mjwqczvmncrf7hr19vdyyswnnfnvzqx18i7fqj7f15cg29yzh86"; + name = "ksystemlog-16.12.1.tar.xz"; }; }; kteatime = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kteatime-16.12.0.tar.xz"; - sha256 = "1b05ahhdmjlp3fknmbp5c050sgx8iih3j3xxp0bj998xbh975s88"; - name = "kteatime-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kteatime-16.12.1.tar.xz"; + sha256 = "0dx74zz4mk3ckg51hyckwk5ff96jd95pdcpmywkyjzxqlqkyg5j0"; + name = "kteatime-16.12.1.tar.xz"; }; }; ktimer = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktimer-16.12.0.tar.xz"; - sha256 = "11lb7isyr2qc2fh0ypqrs0xzfiwby94hgr4ilv0sd052kvzxwmry"; - name = "ktimer-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktimer-16.12.1.tar.xz"; + sha256 = "18va6sb4qcb54rgrxaa0s87bxh15ynvvz8vispb054h8mj5k469j"; + name = "ktimer-16.12.1.tar.xz"; }; }; ktnef = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktnef-16.12.0.tar.xz"; - sha256 = "0f4nkmy3rdy6kk3l83r7j404vpdgmxy3hls18j8bm5jkhv6n08rh"; - name = "ktnef-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktnef-16.12.1.tar.xz"; + sha256 = "18k9a36qn0fbfx797cb7ngg9xss7h4svl491inwg6l0s2ydwxf74"; + name = "ktnef-16.12.1.tar.xz"; }; }; ktouch = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktouch-16.12.0.tar.xz"; - sha256 = "05yhrjb536v98sh8l979psd824ilj4cj3wcbbfbqkpnv0i4agxf2"; - name = "ktouch-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktouch-16.12.1.tar.xz"; + sha256 = "03q9l2s09gm1fgqkr4c71zyyrsrymikfh69z4yyba3azr15ayzy3"; + name = "ktouch-16.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-accounts-kcm-16.12.0.tar.xz"; - sha256 = "1lwkajaj9zjk1hksx7b5x73a09kri69bq6bxsr1fwi9m47608bhm"; - name = "ktp-accounts-kcm-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-accounts-kcm-16.12.1.tar.xz"; + sha256 = "1lmmy4pmr44x7kgwc72xn8sijbqgblqkxcr08qj8hrmpvzrc8nh0"; + name = "ktp-accounts-kcm-16.12.1.tar.xz"; }; }; ktp-approver = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-approver-16.12.0.tar.xz"; - sha256 = "124448c05cr1y6032fkqdb46n3ynyh2njxmn52zn814i797pwz6b"; - name = "ktp-approver-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-approver-16.12.1.tar.xz"; + sha256 = "0nzpmylm58yx28lz1wx1c0ib19v980h6r0dylp2lx9h738jh0wq4"; + name = "ktp-approver-16.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-auth-handler-16.12.0.tar.xz"; - sha256 = "0ya8q9qvq72vfp5yhb3jd2am83i42cap2yl1xykfwib0r8lmfakb"; - name = "ktp-auth-handler-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-auth-handler-16.12.1.tar.xz"; + sha256 = "14b31mqy4n5ymm0adxlsi2aqlgdhzhhg5yq3smg13361dj0jxf70"; + name = "ktp-auth-handler-16.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-call-ui-16.12.0.tar.xz"; - sha256 = "1qyiipyffhav5wxi7cjbshi9x9fam0snbdl4sqca3nly1cn1k21k"; - name = "ktp-call-ui-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-call-ui-16.12.1.tar.xz"; + sha256 = "00s81rh7zffry754yzqvxz6q9wcn0nb7v2z9xq4iav6spl7b35c3"; + name = "ktp-call-ui-16.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-common-internals-16.12.0.tar.xz"; - sha256 = "1xlfgs2gc15443vb3pyly0zbrmaliq3nvs7w25ldks8z72m6gqf6"; - name = "ktp-common-internals-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-common-internals-16.12.1.tar.xz"; + sha256 = "083hbvdd8xzlvdgldvxc45a8jq78k4dsz2idz9ljj7x5naizmkjx"; + name = "ktp-common-internals-16.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-list-16.12.0.tar.xz"; - sha256 = "1dkndda4xhb7x76m43gbz67jc4bd50bj8mzyyvblijq6rn2a4wsr"; - name = "ktp-contact-list-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-list-16.12.1.tar.xz"; + sha256 = "0qddi195ayq63nji7cppqxxq2jifflfxr8zskd6shr720invkdm3"; + name = "ktp-contact-list-16.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-runner-16.12.0.tar.xz"; - sha256 = "0754q5mxghba6imh20qk1qaxbq2c9z6qls5pybjzm71bzbwaf2wg"; - name = "ktp-contact-runner-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-runner-16.12.1.tar.xz"; + sha256 = "10f2cygyjchydd35rx1daimlfkab4wijahp0vznjc46k332znl37"; + name = "ktp-contact-runner-16.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-desktop-applets-16.12.0.tar.xz"; - sha256 = "0jq0j9i2r9nq3i7g7qg6vnca2vyb5fhx8jcd45yml4clxg6xggjy"; - name = "ktp-desktop-applets-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-desktop-applets-16.12.1.tar.xz"; + sha256 = "109aq8dgf9gig4dvb5n2khcslnyhfcfrl95b3h0dkbfiz6xlxhby"; + name = "ktp-desktop-applets-16.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-filetransfer-handler-16.12.0.tar.xz"; - sha256 = "1mfmx4jxzpz81df53b2gy8l2rrfqszqjcmjp5s30k0cyrrqiq1v1"; - name = "ktp-filetransfer-handler-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-filetransfer-handler-16.12.1.tar.xz"; + sha256 = "1qwhqyn2v0axn7rdlm5ckkjybfhmysz8612akd499yp8jyvgm046"; + name = "ktp-filetransfer-handler-16.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-kded-module-16.12.0.tar.xz"; - sha256 = "192aynmagrmxyil9sc19r37kj28fgcyyivija8q22jwfhh7ds5w6"; - name = "ktp-kded-module-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-kded-module-16.12.1.tar.xz"; + sha256 = "173a3pdrlsl7vv8xxxckfn7y0vi2ndbds2vzm2ir4crxcl5mm3cm"; + name = "ktp-kded-module-16.12.1.tar.xz"; }; }; ktp-send-file = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-send-file-16.12.0.tar.xz"; - sha256 = "0g808dndrr2cb0xcjl643r23zxnaqnycvkinbd9783nkw9i5ak87"; - name = "ktp-send-file-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-send-file-16.12.1.tar.xz"; + sha256 = "0makfaalzidnqm4gk3kd2qnchjy15xcqprbjs9908jvixk3nfj1c"; + name = "ktp-send-file-16.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktp-text-ui-16.12.0.tar.xz"; - sha256 = "1fhlgfs6ynkmqyjypr0922y2p32jqk3j7v08x6wxacp5aifx5i22"; - name = "ktp-text-ui-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktp-text-ui-16.12.1.tar.xz"; + sha256 = "16lwsy4fjxc77pg2gsjsmj7fhbrsjcgpiv0yx6a6nh2mz69zw3ml"; + name = "ktp-text-ui-16.12.1.tar.xz"; }; }; ktuberling = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/ktuberling-16.12.0.tar.xz"; - sha256 = "1z0hhidjandl2bd9d9pihk16yqqyn75z6hn5sxdx5z1icpxdkara"; - name = "ktuberling-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/ktuberling-16.12.1.tar.xz"; + sha256 = "1g1sbvnizs5cp80jyn1liizd8lj3jl38nysgii8fzdfpqmspwx35"; + name = "ktuberling-16.12.1.tar.xz"; }; }; kturtle = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kturtle-16.12.0.tar.xz"; - sha256 = "1nxijmai4b2ddg6km2krxzrz46djazcqn4xqi6sdr2yv4rsw4467"; - name = "kturtle-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kturtle-16.12.1.tar.xz"; + sha256 = "0q1qq2a9308y85b9lk44k109gfi9cmzrkaqd8darp3alwaqbaphr"; + name = "kturtle-16.12.1.tar.xz"; }; }; kubrick = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kubrick-16.12.0.tar.xz"; - sha256 = "0xrfdmxr7p7m11rgpa0ag247pkr88k1l4br59k6gr92vpxghd1l0"; - name = "kubrick-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kubrick-16.12.1.tar.xz"; + sha256 = "01q3rswfn5r32r2ssq6xmhym158x4pwb7l76xw0h096s4swwri2k"; + name = "kubrick-16.12.1.tar.xz"; }; }; kwalletmanager = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kwalletmanager-16.12.0.tar.xz"; - sha256 = "01w97cax7smayp536d4javjksg0l2yz1c9i39rh195gaz8wnglxy"; - name = "kwalletmanager-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kwalletmanager-16.12.1.tar.xz"; + sha256 = "16kjgqrv9w9il9kla5swywqbc3qrijiz1ii49bjhn1vsa4g1f9n1"; + name = "kwalletmanager-16.12.1.tar.xz"; }; }; kwave = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kwave-16.12.0.tar.xz"; - sha256 = "07wx614nq5dhym5dlpfvyxbh9asadxbpx6niyl5g7z4xvq2kms8f"; - name = "kwave-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kwave-16.12.1.tar.xz"; + sha256 = "1sr19gjr7m3f140vl2lqp6ms8j6vz1djdnkh1ggs7chr2aws52p2"; + name = "kwave-16.12.1.tar.xz"; }; }; kwordquiz = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/kwordquiz-16.12.0.tar.xz"; - sha256 = "0md3a3q16xghv94hqik0jzvg1nwihagdapdn3pz0k4p8nypykz8k"; - name = "kwordquiz-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/kwordquiz-16.12.1.tar.xz"; + sha256 = "14sa1gjswp9y9kzxk5qfg3df8n9527zkspdz2v9phf9n0jdl9wqw"; + name = "kwordquiz-16.12.1.tar.xz"; }; }; libgravatar = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libgravatar-16.12.0.tar.xz"; - sha256 = "0nwz8a2kv66b57f3032xl05mxxasvg4k7ap30smlfxlzfm1p48sc"; - name = "libgravatar-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libgravatar-16.12.1.tar.xz"; + sha256 = "1j53kqa9ypv3igcllr1a9z7pvg1ax3lk957l2i7bb0kwjqhvlqkb"; + name = "libgravatar-16.12.1.tar.xz"; }; }; libkcddb = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkcddb-16.12.0.tar.xz"; - sha256 = "0f9b2gddjia47mi8rm6vb2h3nycwyiyj6fz3w7kwwv32mnbwmqsg"; - name = "libkcddb-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkcddb-16.12.1.tar.xz"; + sha256 = "16429hxxq1kw9gv61sljy96y4zxyq5qgs3hvq1n73rq7vwl4bgl3"; + name = "libkcddb-16.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkcompactdisc-16.12.0.tar.xz"; - sha256 = "0lh6gna28kxja9v5cmz4qnzdlzz3bnxs1x24v2nzvq4lds73rwrp"; - name = "libkcompactdisc-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkcompactdisc-16.12.1.tar.xz"; + sha256 = "0s4107aa4qrzrh4xi3p4j40alx9nynckawjhyh42c0yz2cgzdvbg"; + name = "libkcompactdisc-16.12.1.tar.xz"; }; }; libkdcraw = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkdcraw-16.12.0.tar.xz"; - sha256 = "0pz1jll1amc42gjzdf7ic43ncd73mrp4cjhwgwmqh7aik2sjmr5m"; - name = "libkdcraw-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkdcraw-16.12.1.tar.xz"; + sha256 = "09vrj7ds257f699782vgp4pvanirkbacar5w2aiy89s5c88wcf3p"; + name = "libkdcraw-16.12.1.tar.xz"; }; }; libkdegames = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkdegames-16.12.0.tar.xz"; - sha256 = "0ql18w1gliz2k9g460fgh7pwy9r0p0narzc7bzdzv2pc4r2v7w0f"; - name = "libkdegames-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkdegames-16.12.1.tar.xz"; + sha256 = "0a511clm36dvlvqzarf2sppp5mmr3jqzbvq3873fwyyjhk17n9si"; + name = "libkdegames-16.12.1.tar.xz"; }; }; libkdepim = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkdepim-16.12.0.tar.xz"; - sha256 = "09q2z688kkbwiysqzxq2id77fv7sxq3vbs1q88saw8qvhhb4vs5q"; - name = "libkdepim-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkdepim-16.12.1.tar.xz"; + sha256 = "04l073xl6wdzslvnlpg4jxg74bc5jnqij4gk9cw6zm93fxcs61kh"; + name = "libkdepim-16.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkeduvocdocument-16.12.0.tar.xz"; - sha256 = "1kd795z0lkh1b3hgdca36l0wgac1m4g38q5igs40fjz6nakwqczk"; - name = "libkeduvocdocument-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkeduvocdocument-16.12.1.tar.xz"; + sha256 = "1s3qbv67vzqvwaym9ac1izpfffp1gvc9crydg1hwgpfxccgnk0sf"; + name = "libkeduvocdocument-16.12.1.tar.xz"; }; }; libkexiv2 = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkexiv2-16.12.0.tar.xz"; - sha256 = "019lnz2d5m47xx6h48ykhd1ln9bq0wch676ddpywp4kfnlyqs2vc"; - name = "libkexiv2-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkexiv2-16.12.1.tar.xz"; + sha256 = "0mnw9ck144x1b2bhjs0llx4kx95z2y1qrblzrvjaydg7f4q5h3qd"; + name = "libkexiv2-16.12.1.tar.xz"; }; }; libkface = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkface-16.12.0.tar.xz"; - sha256 = "02i0qk5q0sbb2m34qg9zrm6whxm9qasi4h5k3fr110k8dwc393v7"; - name = "libkface-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkface-16.12.1.tar.xz"; + sha256 = "0pmwxrd1afgmj2bhqnk903kq20mzfji3wnzrlv5xyc8jd7w5f7s8"; + name = "libkface-16.12.1.tar.xz"; }; }; libkgeomap = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkgeomap-16.12.0.tar.xz"; - sha256 = "0n17db1jb1xbjfdmrgi57ndhp4bgwwsk26026zxh1ipqavdrpjg8"; - name = "libkgeomap-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkgeomap-16.12.1.tar.xz"; + sha256 = "0phqx125n1nklk9v3bnhnfr13b7qylga0zwvb9hajq6g67frsh95"; + name = "libkgeomap-16.12.1.tar.xz"; }; }; libkipi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkipi-16.12.0.tar.xz"; - sha256 = "1pj3cpz7q1jiz2yhvk2g6fz2pwblblxj6qzlsyqs156j98ayjk6g"; - name = "libkipi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkipi-16.12.1.tar.xz"; + sha256 = "137r2kympkqf06a9w1a174krinra63yknnphprygaxxr6dbrh3a4"; + name = "libkipi-16.12.1.tar.xz"; }; }; libkleo = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkleo-16.12.0.tar.xz"; - sha256 = "0g394bykb9f93f3i4r9y666n72wsbk2njc4b86n5hkw94pcgavlq"; - name = "libkleo-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkleo-16.12.1.tar.xz"; + sha256 = "0cziv4pwippcikj4nlsdgz5nkrb7kimap0nyldvq8rzhi6s7dy4r"; + name = "libkleo-16.12.1.tar.xz"; }; }; libkmahjongg = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkmahjongg-16.12.0.tar.xz"; - sha256 = "1jh3qh3833faa66jvxy28j24zr9wg1chg0rx95zpjpqg9xllqzir"; - name = "libkmahjongg-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkmahjongg-16.12.1.tar.xz"; + sha256 = "0crbkxaym2z9p76v3bya414xcpn6h52nbp5902fa4l67a3z1k736"; + name = "libkmahjongg-16.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libkomparediff2-16.12.0.tar.xz"; - sha256 = "1yxgy4hpd8am6501aqz3018d4v36ipp4g393xc0mq7ygbsmb9sj3"; - name = "libkomparediff2-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libkomparediff2-16.12.1.tar.xz"; + sha256 = "1garymnwcnwrlcpxz9dyh9spqgx91z8cznrxirw22cgz5n6mn1ld"; + name = "libkomparediff2-16.12.1.tar.xz"; }; }; libksane = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libksane-16.12.0.tar.xz"; - sha256 = "05m9fl22hfcd41jn2hxj9yms027rjs2gfrhsksvl80m18j6ix51b"; - name = "libksane-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libksane-16.12.1.tar.xz"; + sha256 = "0p133qfrd5pmsifmq8064wrw49vrrn27d6543nrg88x9l2d7hi53"; + name = "libksane-16.12.1.tar.xz"; }; }; libksieve = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/libksieve-16.12.0.tar.xz"; - sha256 = "1fcxs8bwb32pbprb8x4ld3s1m2mv44awlb9014nqb9gw8xikrci1"; - name = "libksieve-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/libksieve-16.12.1.tar.xz"; + sha256 = "1qbnd2pwbb39nkdc6v4mrmyiva333b0l2h0x57cxsjw5zbcpx467"; + name = "libksieve-16.12.1.tar.xz"; }; }; lokalize = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/lokalize-16.12.0.tar.xz"; - sha256 = "06k5wkx8wmhrl0ff0rix9fr2hhbxh0cm0mskajwavg9hcd3aga36"; - name = "lokalize-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/lokalize-16.12.1.tar.xz"; + sha256 = "1cf3zs81p6fqi6dgn12bskldydwm0yqbfvkjqh5h41qzlfky1j7s"; + name = "lokalize-16.12.1.tar.xz"; }; }; lskat = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/lskat-16.12.0.tar.xz"; - sha256 = "1mlvg3iwz0klsnd258dgqs1zz7sz25l3bbwyvfz5r8j3k1gllw5q"; - name = "lskat-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/lskat-16.12.1.tar.xz"; + sha256 = "0ldyw445cqgb2bf6ymcpwcrizypldghh611ihr6sa1l1x16238v2"; + name = "lskat-16.12.1.tar.xz"; }; }; mailcommon = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/mailcommon-16.12.0.tar.xz"; - sha256 = "1a25b8akcf1k957jbbcr21ksw3kl0vbs2xn28hzqzlbg5hsnw9yy"; - name = "mailcommon-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/mailcommon-16.12.1.tar.xz"; + sha256 = "18mm2fmyvqs6rlxdgi2fh1vj4b3jjs6vf2jsy4dimw4ghgbag0m2"; + name = "mailcommon-16.12.1.tar.xz"; }; }; mailimporter = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/mailimporter-16.12.0.tar.xz"; - sha256 = "1z1lml4hlzzk7kj6ln3p0gz5pganwrjl57zvn0mpbwxsbpdkf8gk"; - name = "mailimporter-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/mailimporter-16.12.1.tar.xz"; + sha256 = "0ivgyl3bz2vcn6vwshcbxlydlxcsxqhkxzfy9rc690asvn9152cg"; + name = "mailimporter-16.12.1.tar.xz"; }; }; marble = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/marble-16.12.0.tar.xz"; - sha256 = "06hpwwqa62z63fsiw5qa50pbkjkyy93h14l9xphnwmcr8cjnfh8x"; - name = "marble-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/marble-16.12.1.tar.xz"; + sha256 = "1hv2qpikskx7n4myfvfh403cjcsrxdd24955743mlnsikbq3rj0s"; + name = "marble-16.12.1.tar.xz"; }; }; mbox-importer = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/mbox-importer-16.12.0.tar.xz"; - sha256 = "0pk751sjniz8kalydg2gl48w2v9jqcsp6qclgccxrm7rj7nsmyr2"; - name = "mbox-importer-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/mbox-importer-16.12.1.tar.xz"; + sha256 = "0jpxrwl3v8fkpx5blbagm1ls9h1j9bd7ac7pm78ihavvm4n4piw6"; + name = "mbox-importer-16.12.1.tar.xz"; }; }; messagelib = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz"; - sha256 = "0n65xk2prhwjn172b47qjvml20hmff9qspk6dczx3b8knamzsyj4"; - name = "messagelib-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/messagelib-16.12.1.tar.xz"; + sha256 = "054hjrm3z8mslkl5j05ik30bwbn95rrbbrnc5b6jmi937ks57z56"; + name = "messagelib-16.12.1.tar.xz"; }; }; minuet = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/minuet-16.12.0.tar.xz"; - sha256 = "17yjs7hwr71f78zx89g83md5mad5g3rgxfxhnmc1hvwclcri12nv"; - name = "minuet-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/minuet-16.12.1.tar.xz"; + sha256 = "07jl0n0w34wbnzxwjj6zainkw3gyzkk99p7c21hqkhmiivbk3rab"; + name = "minuet-16.12.1.tar.xz"; }; }; okteta = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/okteta-16.12.0.tar.xz"; - sha256 = "0n334ksh2c7s5bavhgks1a11mr1w6pf6lvfb51735r379xxh6yqh"; - name = "okteta-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/okteta-16.12.1.tar.xz"; + sha256 = "08zygqhrz7i1dvb2i6dqpn9zmyr43y2rkdjl43rwlgcj59hd0xvc"; + name = "okteta-16.12.1.tar.xz"; }; }; okular = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/okular-16.12.0.tar.xz"; - sha256 = "0a8g2845c0f6z2k6d4f8fccfa9zhqls2yaj1pkasrg8xmanmpmbd"; - name = "okular-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/okular-16.12.1.tar.xz"; + sha256 = "134afacy3d9hjq2avzp8d0fp3vwlaaxcvf4b65wvkds2zhggi8w3"; + name = "okular-16.12.1.tar.xz"; }; }; palapeli = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/palapeli-16.12.0.tar.xz"; - sha256 = "1ix8xhsif0pa1zsgwn33sqf1kclkpz8mhbviqjzh5ds80dyychdn"; - name = "palapeli-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/palapeli-16.12.1.tar.xz"; + sha256 = "1kpca4l45c9ydhls1sqqlhca7wv2d0xf33wxa5dmgriivn0s0qym"; + name = "palapeli-16.12.1.tar.xz"; }; }; parley = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/parley-16.12.0.tar.xz"; - sha256 = "1lvimp0fjy12973rjqa9y0680x19hqln2dmywqmg7fxyhk3ilwv3"; - name = "parley-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/parley-16.12.1.tar.xz"; + sha256 = "0jxzz9dg3bb1pk8rrfqvjf5aww361wkaiz4xvsfc6vj4333kgzid"; + name = "parley-16.12.1.tar.xz"; }; }; picmi = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/picmi-16.12.0.tar.xz"; - sha256 = "03i8g7c84cyg1bn1d70cf34pw2bgfsnhvvjfavzzmmb0kmkj5nhw"; - name = "picmi-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/picmi-16.12.1.tar.xz"; + sha256 = "0l9y4h9q032vqham0nlci9kcp143rdaaz9rhwwh0i7mw5p98xg5r"; + name = "picmi-16.12.1.tar.xz"; }; }; pimcommon = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/pimcommon-16.12.0.tar.xz"; - sha256 = "1crz2g2wcgq22vxxywvislw0n7rc21z08rsgcyq6m0dqcv96063l"; - name = "pimcommon-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/pimcommon-16.12.1.tar.xz"; + sha256 = "0hk0p5x78mcxv07x4jpx2d6dh2wxxiqp79vma37g90zlh8p28323"; + name = "pimcommon-16.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/pim-data-exporter-16.12.0.tar.xz"; - sha256 = "0x2nrspv4bc91ir361y6sp80a9c4nm8fwjzy76q3j23kvyk838m9"; - name = "pim-data-exporter-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/pim-data-exporter-16.12.1.tar.xz"; + sha256 = "0qx156jg03xpl62rxsm5lma0z7pr6nrsq5912d6kx1w7zxwizjln"; + name = "pim-data-exporter-16.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/pim-sieve-editor-16.12.0.tar.xz"; - sha256 = "0da0fav852yazrlpinnsr97jm1vc5335wc3wb1rbcamcrvkkpz5r"; - name = "pim-sieve-editor-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/pim-sieve-editor-16.12.1.tar.xz"; + sha256 = "02km83p4h39bl8zm5lf7qypqq6qs1cl0b9ncr0c68b0kd05pfms3"; + name = "pim-sieve-editor-16.12.1.tar.xz"; }; }; pim-storage-service-manager = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/pim-storage-service-manager-16.12.0.tar.xz"; - sha256 = "1b3z8z921nfmqs2gn653jdsqma4xn3lf1imz942xbgc1w3000p64"; - name = "pim-storage-service-manager-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/pim-storage-service-manager-16.12.1.tar.xz"; + sha256 = "19mfxxpvx5lz0067ssdmw0xdmznl7jak4rapkawvfwkbk0vsfpd3"; + name = "pim-storage-service-manager-16.12.1.tar.xz"; }; }; poxml = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/poxml-16.12.0.tar.xz"; - sha256 = "18q5lmwx5vdmj2kdi45rhi6cqnk9wrd1v7xc0xn842gjd7y42zh0"; - name = "poxml-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/poxml-16.12.1.tar.xz"; + sha256 = "19g964bb96z86ynx7zi3chg1pksvcyrv41qz5qnhlj258a3b9g4m"; + name = "poxml-16.12.1.tar.xz"; }; }; print-manager = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/print-manager-16.12.0.tar.xz"; - sha256 = "1na2kw6cdq2qkbjyaxi21cy4lkyalfyw50d6cvgpl4jgrmvdqc8h"; - name = "print-manager-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/print-manager-16.12.1.tar.xz"; + sha256 = "1vwsd71y3r6w9gix6d5n06j0yv4rw9qgzz1d4nb8axlnmwdnkzy6"; + name = "print-manager-16.12.1.tar.xz"; }; }; rocs = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/rocs-16.12.0.tar.xz"; - sha256 = "0lw5mrxjhxwwh7ms5jn576y303jzk54h79vf2qmf6hkmhmwwggam"; - name = "rocs-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/rocs-16.12.1.tar.xz"; + sha256 = "0xkkd3hwrnv52074q53wx5agdc75arm2pg80k2ck7vnxl3mpp997"; + name = "rocs-16.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/signon-kwallet-extension-16.12.0.tar.xz"; - sha256 = "0shgg850cgnr3iihdhf4v04fmp1lc3hblgfwsrcyys23zh2xfqr5"; - name = "signon-kwallet-extension-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/signon-kwallet-extension-16.12.1.tar.xz"; + sha256 = "1xfmwz3h7acdkj61zq9rwz654lf8z9wfhzlmr1ss530c94isfpjb"; + name = "signon-kwallet-extension-16.12.1.tar.xz"; }; }; spectacle = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/spectacle-16.12.0.tar.xz"; - sha256 = "1cri1yklzkdfhynfvlqrz21bmr58rcrlcg4g5n5wd71wl46v1m1i"; - name = "spectacle-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/spectacle-16.12.1.tar.xz"; + sha256 = "1pmpmfzch9d8iapjpgyzy77d9a8zjhafkw52x9mqj0r8ym0kgq2p"; + name = "spectacle-16.12.1.tar.xz"; }; }; step = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/step-16.12.0.tar.xz"; - sha256 = "0ilnbk8ax18vk0sbziydm2mzlhp3kl3jymg7cllpb8kknsmjiky4"; - name = "step-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/step-16.12.1.tar.xz"; + sha256 = "0ks8mzw9wmp57pkz3mbpnlpa2vsvdhngvj0i2pyvhwzmclifgm03"; + name = "step-16.12.1.tar.xz"; }; }; svgpart = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/svgpart-16.12.0.tar.xz"; - sha256 = "0cqlzxcnqsxyq60dlglpzz3081slr0fwf9bq1pv4d80fs84yj1nw"; - name = "svgpart-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/svgpart-16.12.1.tar.xz"; + sha256 = "0m84z6jm52mvsbb6khajxp8cp52bhyix8s2ssc3j86dhi0n7imbi"; + name = "svgpart-16.12.1.tar.xz"; }; }; sweeper = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/sweeper-16.12.0.tar.xz"; - sha256 = "0lha6m8aa8jwlkcyzwc11l48197m90apwv5fbbiy67h2gj105izr"; - name = "sweeper-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/sweeper-16.12.1.tar.xz"; + sha256 = "0ds7w70zhnqmyq0b5703sjw3airmfby21vfjl69nqqmsncf8snb4"; + name = "sweeper-16.12.1.tar.xz"; }; }; syndication = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/syndication-16.12.0.tar.xz"; - sha256 = "1z0mfklr3f7081smxihvcck5arzvzqy3bnyf2wdj92wlj4k974km"; - name = "syndication-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/syndication-16.12.1.tar.xz"; + sha256 = "1l1klni18xlgfjlhwc3gdzpkj5gfcmwzwv6f6q731xkjay7rdlqh"; + name = "syndication-16.12.1.tar.xz"; }; }; umbrello = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/umbrello-16.12.0.tar.xz"; - sha256 = "01zkrlg1iz0qampzxp77kralz4s9kw02lz5x2114mfjh8l3h65f6"; - name = "umbrello-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/umbrello-16.12.1.tar.xz"; + sha256 = "1f8bsf60y5s5ms9ypgd0865is5xf8fjhsfrp7dg8hi15nmd69k9c"; + name = "umbrello-16.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.12.0"; + version = "16.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.0/src/zeroconf-ioslave-16.12.0.tar.xz"; - sha256 = "0alfyp22w72yf7gaxgiqini6nv0qkjjnkgicph9z2yiysywq57a2"; - name = "zeroconf-ioslave-16.12.0.tar.xz"; + url = "${mirror}/stable/applications/16.12.1/src/zeroconf-ioslave-16.12.1.tar.xz"; + sha256 = "1r6ls8hsahgbqvailwaz2qwk3m3z3mfwav8g2rwdqk7s3p2fp1cx"; + name = "zeroconf-ioslave-16.12.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 63c62f12321e..a403e8e05e6e 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -6,6 +6,8 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@" export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" +kbuildsycoca5 + # Set the default GTK 2 theme if ! [ -e $HOME/.gtkrc-2.0 ] \ && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index eed702f85128..0cebd40afdba 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, gcc }: +{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }: stdenv.mkDerivation rec { name = "nim-${version}"; @@ -9,24 +9,52 @@ stdenv.mkDerivation rec { sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy"; }; - buildInputs = [ makeWrapper ]; + doCheck = true; - buildPhase = "sh build.sh"; + enableParallelBuilding = true; - installPhase = - '' - install -Dt "$out/bin" bin/nim - substituteInPlace install.sh --replace '$1/nim' "$out" - sh install.sh $out - wrapProgram $out/bin/nim \ - --suffix PATH : ${lib.makeBinPath [ gcc ]} - ''; + NIX_LDFLAGS = [ + "-lcrypto" + "-lpcre" + "-lreadline" + "-lsqlite3" + ]; - meta = with stdenv.lib; - { description = "Statically typed, imperative programming language"; - homepage = http://nim-lang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ehmry peterhoeg ]; - platforms = platforms.linux ++ platforms.darwin; # arbitrary - }; + # 1. nodejs is only needed for tests + # 2. we could create a separate derivation for the "written in c" version of nim + # used for bootstrapping, but koch insists on moving the nim compiler around + # as part of building it, so it cannot be read-only + + buildInputs = [ + makeWrapper nodejs + openssl pcre readline sqlite + ]; + + buildPhase = '' + sh build.sh + ./bin/nim c koch + ./koch boot -d:release \ + -d:useGnuReadline \ + ${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"} + ./koch tools -d:release + ''; + + installPhase = '' + install -Dt $out/bin bin/* koch + ./koch install $out + mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin + mv $out/nim/* $out/ && rmdir $out/nim + wrapProgram $out/bin/nim \ + --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]} + ''; + + checkPhase = "./koch tests"; + + meta = with stdenv.lib; { + description = "Statically typed, imperative programming language"; + homepage = http://nim-lang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ehmry peterhoeg ]; + platforms = with platforms; linux ++ darwin; # arbitrary + }; } diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index e8d737e0082a..2f16acb51d9a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "111"; + patchVersion = "121"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "07wyyds52c3fp4ha1fnzp6mbxwq0rs3vx59167b57gkggg7qz3ls"; - sha256_x86_64 = "0x4937c3307v78wx1jf227b89cf5lsd5yarmbjrxs4pq6lidlzhq"; + sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp"; + sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index fc2e6448fc3f..2f16acb51d9a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "112"; + patchVersion = "121"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "19b9vwb7bd17s9p04y47zzjkccazzmpy4dqx4rgxd79k1fw2yz0y"; - sha256_x86_64 = "19blsx81x5p2f6d9vig89z7cc8778cp6qdjy9ylsa2444vaxfyvp"; + sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp"; + sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index a4e55f970eba..5205c8fc93f2 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -1,27 +1,56 @@ -{ stdenv, callPackage, rustPlatform, +{ stdenv, callPackage, rustPlatform, cacert, gdb, targets ? [], targetToolchains ? [], targetPatches ? [] }: rec { - rustc = callPackage ./rustc.nix { - shortVersion = "beta-2016-11-16"; - forceBundledLLVM = false; + rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { + shortVersion = "beta-2017-01-07"; + forceBundledLLVM = true; # TODO: figure out why linking fails without this configureFlags = [ "--release-channel=beta" ]; - srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d"; - srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa"; + srcRev = "a035041ba450ce3061d78a2bdb9c446eb5321d0d"; + srcSha = "12xsm0yp1y39fvf9j218gxv73j8hhahc53jyv3q58kiriyqvfc1s"; patches = [ - ./patches/disable-lockfile-check-beta.patch + ./patches/disable-lockfile-check-nightly.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; inherit targetToolchains; inherit rustPlatform; - }; + }) (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; + postUnpack = '' + export CARGO_HOME="$(realpath deps)" + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + postPatch = '' + ${oldAttrs.postPatch} + + # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 + rm -vr src/test/debuginfo/borrowed-enum.rs || true + rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true + rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true + rm -vr src/test/debuginfo/packed-struct.rs || true + rm -vr src/test/debuginfo/recursive-struct.rs || true + rm -vr src/test/debuginfo/struct-in-enum.rs || true + rm -vr src/test/debuginfo/struct-style-enum.rs || true + rm -vr src/test/debuginfo/tuple-style-enum.rs || true + rm -vr src/test/debuginfo/union-smoke.rs || true + rm -vr src/test/debuginfo/unique-enum.rs || true + + # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed + sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py + substituteInPlace \ + src/bootstrap/config.rs \ + --replace \ + 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ + ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' + ''; + }); cargo = callPackage ./cargo.nix rec { - version = "0.14.0"; - srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; - srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; - depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; + version = "beta-2017-01-10"; + srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; + srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; + depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2b544d754d79..f0d7e0dabc27 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -23,17 +23,6 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; - configurePhase = '' - ./configure --enable-optimize --prefix=$out - ''; - - buildPhase = "make"; - - installPhase = '' - make install - ${postInstall} - ''; - postInstall = '' rm "$out/lib/rustlib/components" \ "$out/lib/rustlib/install.log" \ diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix index 81741105e261..d9ae8c140abe 100644 --- a/pkgs/development/compilers/rust/nightly.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, rustPlatform, +{ stdenv, callPackage, rustPlatform, cacert, gdb, targets ? [], targetToolchains ? [], targetPatches ? [] }: rec { - rustc = callPackage ./rustc.nix { - shortVersion = "nightly-2016-11-23"; - forceBundledLLVM = false; + rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { + shortVersion = "nightly-2017-01-10"; + forceBundledLLVM = true; # TODO: figure out why linking fails without this configureFlags = [ "--release-channel=nightly" ]; - srcRev = "d5814b03e652043be607f96e24709e06c2b55429"; - srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr"; + srcRev = "7bffede97cf58f7159e261eac592f9cf88ce209d"; + srcSha = "1784jvsf9g03cglwask1zhjmba4ghycbin3rw0hmhb41cz2y4q8v"; patches = [ ./patches/disable-lockfile-check-nightly.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; @@ -15,13 +15,42 @@ rec { inherit targetPatches; inherit targetToolchains; inherit rustPlatform; - }; + }) (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; + postUnpack = '' + export CARGO_HOME="$(realpath deps)" + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + postPatch = '' + ${oldAttrs.postPatch} + + # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 + rm -vr src/test/debuginfo/borrowed-enum.rs || true + rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true + rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true + rm -vr src/test/debuginfo/packed-struct.rs || true + rm -vr src/test/debuginfo/recursive-struct.rs || true + rm -vr src/test/debuginfo/struct-in-enum.rs || true + rm -vr src/test/debuginfo/struct-style-enum.rs || true + rm -vr src/test/debuginfo/tuple-style-enum.rs || true + rm -vr src/test/debuginfo/union-smoke.rs || true + rm -vr src/test/debuginfo/unique-enum.rs || true + + # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed + sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py + substituteInPlace \ + src/bootstrap/config.rs \ + --replace \ + 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ + ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' + ''; + }); cargo = callPackage ./cargo.nix rec { - version = "nightly-2016-07-25"; - srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; - srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; + version = "nightly-2017-01-10"; + srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; + srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; + depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch index 5c51886b4d83..da550f0327d3 100644 --- a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch +++ b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch @@ -1,29 +1,37 @@ -From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001 +From 1d8a91d5b09cb762fe890d04bfb61b9eefd0624a Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 8 Jan 2017 10:28:17 +0100 Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin --- - src/libstd/net/tcp.rs | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + src/libstd/net/tcp.rs | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 0e7c5b0671..189c31b958 100644 +index 0e7c5b0671..d42fd26267 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs -@@ -1022,7 +1022,10 @@ mod tests { +@@ -551,6 +551,7 @@ mod tests { + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn write_close() { + each_ip(&mut |addr| { +@@ -1022,7 +1023,10 @@ mod tests { // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // no longer has rounding errors. - #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] -+ #[cfg_attr(any(target_os = "bitrig", -+ target_os = "netbsd", -+ target_os = "openbsd", -+ target_os = "macos"), ignore)] ++ #[cfg_attr(any(target_os = "bitrig", ++ target_os = "netbsd", ++ target_os = "openbsd", ++ target_os = "macos"), ignore)] #[test] fn timeouts() { let addr = next_test_ip4(); -@@ -1101,6 +1104,7 @@ mod tests { +@@ -1101,6 +1105,7 @@ mod tests { assert_eq!(false, t!(stream.nodelay())); } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 04543f17ec98..056177fd265f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -20,27 +20,17 @@ let else "${shortVersion}-g${builtins.substring 0 7 srcRev}"; - name = "rustc-${version}"; - procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; - license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux ++ platforms.darwin; - }; in stdenv.mkDerivation { - inherit name; + name = "rustc-${version}"; inherit version; - inherit meta; __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; @@ -52,6 +42,9 @@ stdenv.mkDerivation { # versions. RUSTC_BOOTSTRAP = "1"; + # Increase codegen units to introduce parallelism within the compiler. + RUSTFLAGS = "-Ccodegen-units=10"; + src = fetchgit { url = https://github.com/rust-lang/rust; rev = srcRev; @@ -130,13 +123,12 @@ stdenv.mkDerivation { buildInputs = [ ncurses ] ++ targetToolchains ++ optional (!forceBundledLLVM) llvmShared; - # https://github.com/rust-lang/rust/issues/30181 - # enableParallelBuilding = false; # missing files during linking, occasionally - outputs = [ "out" "doc" ]; setOutputFlags = false; + # Disable codegen units for the tests. preCheck = '' + export RUSTFLAGS= export TZDIR=${tzdata}/share/zoneinfo '' + # Ensure TMPDIR is set, and disable a test that removing the HOME @@ -147,7 +139,18 @@ stdenv.mkDerivation { sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; - # Disable doCheck on Darwin to work around upstream issue doCheck = true; dontSetConfigureCross = true; + + # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 + # https://github.com/rust-lang/rust/issues/30181 + # enableParallelBuilding = false; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; + license = [ licenses.mit licenses.asl20 ]; + platforms = platforms.linux ++ platforms.darwin; + }; } diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 26fd3850190b..946a9bedbf51 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.10.5"; + name = "scala-2.10.6"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci"; + sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal"; }; propagatedBuildInputs = [ jre ] ; @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { mv * $out for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} done ''; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix new file mode 100644 index 000000000000..394b2f9da094 --- /dev/null +++ b/pkgs/development/compilers/scala/2.11.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: + +stdenv.mkDerivation rec { + name = "scala-2.11.8"; + + src = fetchurl { + url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; + }; + + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; + + installPhase = '' + mkdir -p $out + rm "bin/"*.bat + mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} + done + ''; + + meta = { + description = "General purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = http://www.scala-lang.org/; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + branch = "2.11"; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bc7da3581deb..8e1f8dd47220 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { name = "scala-2.12.1"; @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { mv * $out for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} done ''; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0935891dcbd5..354c8f4e5f57 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, boost, cmake, jsoncpp }: stdenv.mkDerivation rec { - version = "0.4.6"; + version = "0.4.8"; name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; - rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8"; - sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g"; + rev = "60cc1668517f56ce6ca8225555472e7a27eab8b0"; + sha256 = "09mwah7c5ca1bgnqp5qgghsi6mbsi7p16z8yxm0aylsn2cjk23na"; }; patchPhase = '' diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index d35c062d6e4e..ed9312b5c57e 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -3,7 +3,8 @@ let param = { "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; }; - "8.5" = { version = "0.9.3"; sha256 = "05zff5mrkxpvcsw4gi8whjj5w0mdbqzjmb247lq5b7mry0bypwc5"; }; + "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; + "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; }."${coq.coq-version}"; in diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 0dec05ebd3f5..9dbc3a3f2991 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,15 +1,27 @@ -{ stdenv, fetchFromGitHub, coq, ocamlPackages }: +{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: + +let param = { + "8.6" = { + version = "0.6.1"; + rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; + sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; + }; + "8.5" = { + version = "0.6"; + rev = "v0.6"; + sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; + }; +}."${coq.coq-version}"; in stdenv.mkDerivation { - name = "coq${coq.coq-version}-dpdgraph-0.5"; + name = "coq${coq.coq-version}-dpdgraph-${param.version}"; src = fetchFromGitHub { owner = "Karmaki"; repo = "coq-dpdgraph"; - rev = "227a6a28bf11cf1ea56f359160558965154dd176"; - sha256 = "1vxf7qq37mnmlclkr394147xvrky3p98ar08c4wndwrp41gfbxhq"; + inherit (param) rev sha256; }; - buildInputs = [ coq ] + buildInputs = [ autoreconfHook coq ] ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]); preInstall = '' diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 09af50db971d..30ec69ba6537 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - name = "coq-flocq-${coq.coq-version}-${version}"; - version = "2.5.1"; + name = "coq${coq.coq-version}-flocq-${version}"; + version = "2.5.2"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35430/flocq-2.5.1.tar.gz; - sha256 = "1a0gznvg32ckxgs3jzznc1368p8x2ny4vfwrnavb3h0ljcl1mlzy"; + url = https://gforge.inria.fr/frs/download.php/file/36199/flocq-2.5.2.tar.gz; + sha256 = "0h5mlasirfzc0wwn2isg4kahk384n73145akkpinrxq5jsn5d22h"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3c48be531412..9a66b07d4fd7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -60,8 +60,6 @@ self: super: { })).overrideScope (self: super: { # https://github.com/bitemyapp/esqueleto/issues/8 esqueleto = self.esqueleto_2_4_3; - # https://github.com/yesodweb/yesod/issues/1324 - yesod-persistent = self.yesod-persistent_1_4_1_1; # https://github.com/prowdsponsor/esqueleto/issues/137 persistent = self.persistent_2_2_4_1; persistent-template = self.persistent-template_2_1_8_1; @@ -616,6 +614,11 @@ self: super: { # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; + # Requires bower-json >= 1.0.0.1 && < 1.1 + purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: { + bower-json = self.bower-json_1_0_0_1; + }); + # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; @@ -1003,11 +1006,12 @@ self: super: { # The most current version needs some packages to build that are not in LTS 7.x. stack = super.stack.overrideScope (self: super: { http-client = self.http-client_0_5_5; - http-client-tls = self.http-client-tls_0_3_3; + http-client-tls = self.http-client-tls_0_3_3_1; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; criterion = super.criterion.override { inherit (super) optparse-applicative; }; aeson = self.aeson_1_0_2_1; + hpack = self.hpack_0_15_0; }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. @@ -1042,7 +1046,10 @@ self: super: { # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the # RPATH also needs to be propagated when using static linking. GHC automatically handles this for # us when we patch the cabal file (Link options will be recored in the ghc package registry). - GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; + # + # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, + # so disable this on Darwin only + ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. @@ -1069,7 +1076,7 @@ self: super: { # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3; + http-api-data_0_3_4 = dontCheck super.http-api-data_0_3_4; # Fix build for latest versions of servant and servant-client. servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { @@ -1081,6 +1088,38 @@ self: super: { servant = self.servant_0_9_1_1; }); + # build servant docs from the repository + servant = + let + ver = super.servant.version; + docs = pkgs.stdenv.mkDerivation { + name = "servant-sphinx-documentation-${ver}"; + src = "${pkgs.fetchFromGitHub { + owner = "haskell-servant"; + repo = "servant"; + rev = "v${ver}"; + sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q"; + }}/doc"; + buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; + makeFlags = "html"; + installPhase = '' + mv _build/html $out + ''; + }; + in overrideCabal super.servant (old: { + postInstall = old.postInstall or "" + '' + ln -s ${docs} $out/share/doc/servant + ''; + }); + + + # https://github.com/plow-technologies/servant-auth/issues/20 + servant-auth = dontCheck super.servant-auth; + + servant-auth-server = super.servant-auth-server.overrideScope (self: super: { + jose = super.jose_0_5_0_2; + }); + # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; @@ -1100,7 +1139,7 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/19612 wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: { http-client = self.http-client_0_5_5; - http-client-tls = self.http-client-tls_0_3_3; + http-client-tls = self.http-client-tls_0_3_3_1; http-conduit = self.http-conduit_2_2_3; }); @@ -1143,7 +1182,14 @@ self: super: { # https://github.com/krisajenkins/elm-export/pull/22 elm-export = doJailbreak super.elm-export; - turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: { + turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_13_0_0; }); + + lentil = super.lentil.overrideScope (self: super: { + pipes = self.pipes_4_3_2; + optparse-applicative = self.optparse-applicative_0_13_0_0; + # https://github.com/roelvandijk/terminal-progress-bar/issues/14 + terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1; + }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 564ce3c04ecb..6263d38a2bbf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -103,8 +103,6 @@ self: super: { license = pkgs.stdenv.lib.licenses.bsd3; }) {}; - mono-traversable = addBuildDepend super.mono-traversable self.semigroups; - # diagrams/monoid-extras#19 monoid-extras = overrideCabal super.monoid-extras (drv: { prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; @@ -185,6 +183,8 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + distributive = addBuildDepend super.distributive self.semigroups; + mono-traversable = addBuildDepend super.mono-traversable self.semigroups; attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); Glob = addBuildDepends super.Glob (with self; [semigroups]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); @@ -208,6 +208,4 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; - - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 1c579b9d6e2c..ffd6845b1d05 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -99,6 +99,7 @@ self: super: { # Needs additional inputs on pre 7.10.x compilers. semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + distributive = addBuildDepend super.distributive self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index f74106898668..4b18332648db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -142,6 +142,7 @@ self: super: { # Needs additional inputs on pre 7.10.x compilers. semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + distributive = addBuildDepend super.distributive self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 276048977011..095b6ee4f1b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -66,4 +66,9 @@ self: super: { # https://github.com/Deewiant/glob/issues/8 Glob = doJailbreak super.Glob; + ## GHC 8.0.2 + + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 + vector-algorithms = dontCheck super.vector-algorithms; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index c6fcf0bff07a..f093c0e427e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -35,7 +35,7 @@ self: super: { xhtml = null; # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; # haddock: No input file(s). nats = dontHaddock super.nats; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d07a9be0c4e9..99d211bf67fd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 7.14 + # LTS Haskell 7.15 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -143,10 +143,10 @@ default-package-overrides: - ansi-wl-pprint ==0.6.7.3 - ansigraph ==0.2.0.0 - api-field-json-th ==0.1.0.1 - - app-settings ==0.2.0.9 + - app-settings ==0.2.0.10 - appar ==0.1.4 - apply-refact ==0.3.0.0 - - arbtt ==0.9.0.11 + - arbtt ==0.9.0.12 - arithmoi ==0.4.3.0 - array-memoize ==0.6.0 - arrow-list ==0.7 @@ -168,7 +168,7 @@ default-package-overrides: - authenticate-oauth ==1.5.1.2 - auto ==0.4.3.0 - auto-update ==0.1.4 - - autoexporter ==0.2.2 + - autoexporter ==0.2.3 - aws ==0.14.1 - b9 ==0.5.30 - bake ==0.4 @@ -194,7 +194,7 @@ default-package-overrides: - binary-bits ==0.5 - binary-conduit ==1.2.4.1 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.5.1 + - binary-orphans ==0.1.5.2 - binary-parser ==0.5.2 - binary-search ==1.0.0.3 - binary-tagged ==0.1.4.2 @@ -318,10 +318,10 @@ default-package-overrides: - classy-prelude-yesod ==1.0.2 - clay ==0.11 - clckwrks ==0.23.19.2 - - clckwrks-cli ==0.2.16 - - clckwrks-plugin-media ==0.6.16 + - clckwrks-cli ==0.2.17.1 + - clckwrks-plugin-media ==0.6.16.1 - clckwrks-plugin-page ==0.4.3.5 - - clckwrks-theme-bootstrap ==0.4.2 + - clckwrks-theme-bootstrap ==0.4.2.1 - cli ==0.1.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.0.2 @@ -347,7 +347,7 @@ default-package-overrides: - concatenative ==1.0.1 - concurrency ==1.0.0.0 - concurrent-extra ==0.7.0.10 - - concurrent-output ==1.7.7 + - concurrent-output ==1.7.8 - concurrent-supply ==0.1.8 - conduit ==1.2.8 - conduit-combinators ==1.0.8.3 @@ -431,7 +431,7 @@ default-package-overrides: - declarative ==0.2.3 - deepseq-generics ==0.2.0.0 - dejafu ==0.4.0.0 - - dependent-map ==0.2.3.0 + - dependent-map ==0.2.4.0 - dependent-sum ==0.3.2.2 - dependent-sum-template ==0.0.0.5 - derive ==2.5.26 @@ -462,7 +462,7 @@ default-package-overrides: - distributed-closure ==0.3.3.0 - distributed-static ==0.3.5.0 - distribution-nixpkgs ==1.0.0.1 - - distributive ==0.5.0.2 + - distributive ==0.5.1 - diversity ==0.8.0.1 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 @@ -500,9 +500,9 @@ default-package-overrides: - effect-handlers ==0.1.0.8 - either ==4.4.1.1 - either-unwrap ==1.1 - - ekg ==0.4.0.11 + - ekg ==0.4.0.12 - ekg-core ==0.1.1.1 - - ekg-json ==0.1.0.3 + - ekg-json ==0.1.0.4 - elerea ==2.9.0 - elm-bridge ==0.3.0.2 - elm-core-sources ==1.0.0 @@ -529,7 +529,7 @@ default-package-overrides: - exception-transformers ==0.4.0.5 - exceptional ==0.3.0.0 - exceptions ==0.8.3 - - executable-hash ==0.2.0.2 + - executable-hash ==0.2.0.4 - executable-path ==0.0.3 - exp-pairs ==0.1.5.1 - expiring-cache-map ==0.0.6.1 @@ -555,7 +555,7 @@ default-package-overrides: - fb ==1.0.13 - fclabels ==2.0.3.2 - feature-flags ==0.1.0.1 - - feed ==0.3.11.1 + - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.4 - fgl ==5.5.3.0 @@ -581,7 +581,7 @@ default-package-overrides: - focus ==0.1.5 - fold-debounce ==0.2.0.4 - fold-debounce-conduit ==0.1.0.4 - - foldl ==1.2.1 + - foldl ==1.2.2 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 @@ -641,7 +641,7 @@ default-package-overrides: - gi-soup ==2.4.3 - gi-webkit ==3.0.3 - gio ==0.13.3.1 - - gipeda ==0.3.2.2 + - gipeda ==0.3.3.0 - giphy-api ==0.4.0.0 - git-fmt ==0.4.1.0 - github-types ==0.2.1 @@ -655,10 +655,10 @@ default-package-overrides: - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - - Glob ==0.7.13 - - gloss ==1.10.2.3 + - Glob ==0.7.14 + - gloss ==1.10.2.5 - gloss-rendering ==1.10.3.5 - - GLURaw ==2.0.0.2 + - GLURaw ==2.0.0.3 - GLUT ==2.7.0.10 - gogol ==0.1.0 - gogol-adexchange-buyer ==0.1.0 @@ -758,7 +758,7 @@ default-package-overrides: - gogol-youtube-analytics ==0.1.0 - gogol-youtube-reporting ==0.1.0 - google-cloud ==0.0.4 - - google-oauth2-jwt ==0.1.2.1 + - google-oauth2-jwt ==0.1.3 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -821,7 +821,7 @@ default-package-overrides: - hasql ==0.19.15.2 - hastache ==0.6.1 - hasty-hamiltonian ==1.1.5 - - HaTeX ==3.17.0.2 + - HaTeX ==3.17.1.0 - hatex-guide ==1.3.1.5 - hbayes ==0.5.2 - hbeanstalk ==0.2.4 @@ -830,7 +830,7 @@ default-package-overrides: - hdaemonize ==0.5.2 - HDBC ==2.4.0.1 - HDBC-session ==0.1.1.0 - - hdevtools ==0.1.4.1 + - hdevtools ==0.1.5.0 - heap ==1.0.3 - heaps ==0.3.3 - hebrew-time ==0.1.1 @@ -862,7 +862,7 @@ default-package-overrides: - hmatrix-gsl ==0.17.0.0 - hmatrix-gsl-stats ==0.4.1.4 - hmatrix-special ==0.4.0.1 - - hmpfr ==0.4.2 + - hmpfr ==0.4.2.1 - hmt ==0.15 - hoauth2 ==0.5.4.0 - hocilib ==0.1.0 @@ -932,7 +932,7 @@ default-package-overrides: - html ==1.0.1.2 - html-conduit ==1.2.1.1 - htoml ==1.0.0.3 - - HTTP ==4000.3.3 + - HTTP ==4000.3.4 - http-api-data ==0.2.4 - http-client ==0.4.31.2 - http-client-openssl ==0.2.0.4 @@ -1008,12 +1008,12 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.3.5.0 - io-streams-haproxy ==1.0.0.1 - - ip6addr ==0.5.1.4 + - ip6addr ==0.5.2 - iproute ==1.7.1 - - IPv6Addr ==0.6.2.0 + - IPv6Addr ==0.6.3 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - - irc-conduit ==0.2.1.1 + - irc-conduit ==0.2.2.0 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.0 - islink ==0.1.0.0 @@ -1024,12 +1024,12 @@ default-package-overrides: - ix-shapable ==0.1.0 - ixset ==1.0.7 - ixset-typed ==0.3.1 - - jailbreak-cabal ==1.3.1 + - jailbreak-cabal ==1.3.2 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jose ==0.4.0.3 - - jose-jwt ==0.7.3 + - jose-jwt ==0.7.4 - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 @@ -1117,7 +1117,7 @@ default-package-overrides: - mainland-pretty ==0.4.1.4 - makefile ==0.1.0.5 - managed ==1.0.5 - - mandrill ==0.5.2.3 + - mandrill ==0.5.3.1 - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 @@ -1138,12 +1138,12 @@ default-package-overrides: - MFlow ==0.4.6.0 - microformats2-parser ==1.0.1.6 - microlens ==0.4.7.0 - - microlens-aeson ==2.1.1.1 + - microlens-aeson ==2.1.1.2 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.7.0 - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.0 - - microlens-th ==0.4.1.0 + - microlens-th ==0.4.1.1 - mighty-metropolis ==1.0.4 - mime-mail ==0.4.12 - mime-mail-ses ==0.3.2.3 @@ -1230,7 +1230,7 @@ default-package-overrides: - network-simple ==0.4.0.5 - network-transport ==0.4.4.0 - network-transport-composed ==0.2.0.1 - - network-transport-inmemory ==0.5.1 + - network-transport-inmemory ==0.5.2 - network-transport-tcp ==0.5.1 - network-transport-tests ==0.2.3.0 - network-uri ==2.6.1.0 @@ -1296,7 +1296,7 @@ default-package-overrides: - partial-handler ==1.0.2 - path ==0.5.11 - path-extra ==0.0.3 - - path-io ==1.2.0 + - path-io ==1.2.2 - path-pieces ==0.2.1 - pathwalk ==0.3.1.2 - patience ==0.1.1 @@ -1338,7 +1338,7 @@ default-package-overrides: - pipes-extras ==1.0.8 - pipes-fastx ==0.3.0.0 - pipes-group ==1.0.6 - - pipes-http ==1.0.4 + - pipes-http ==1.0.5 - pipes-illumina ==0.1.0.0 - pipes-mongodb ==0.1.0.0 - pipes-network ==0.6.4.1 @@ -1405,7 +1405,7 @@ default-package-overrides: - pure-io ==0.2.1 - pureMD5 ==2.1.3 - purescript ==0.9.3 - - purescript-bridge ==0.8.0.0 + - purescript-bridge ==0.8.0.1 - pwstore-fast ==2.4.4 - pwstore-purehaskell ==2.1.4 - quantum-random ==0.6.3 @@ -1434,7 +1434,7 @@ default-package-overrides: - rank1dynamic ==0.3.3.0 - Rasterific ==0.6.1.1 - rasterific-svg ==0.3.1.2 - - ratel ==0.3.1 + - ratel ==0.3.2 - ratel-wai ==0.2.0 - raw-strings-qq ==1.1 - read-editor ==0.1.0.2 @@ -1476,9 +1476,9 @@ default-package-overrides: - repa-io ==3.4.1.1 - RepLib ==0.5.4 - reroute ==0.4.0.1 - - resolve-trivial-conflicts ==0.3.2.3 + - resolve-trivial-conflicts ==0.3.2.4 - resource-pool ==0.2.3.2 - - resourcet ==1.1.8.1 + - resourcet ==1.1.9 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.19.0.3 @@ -1545,7 +1545,7 @@ default-package-overrides: - servant-server ==0.8.1 - servant-subscriber ==0.5.0.3 - servant-swagger ==1.1.2 - - servant-swagger-ui ==0.2.0.2.1.5 + - servant-swagger-ui ==0.2.1.2.2.8 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-backend-acid-state ==1.0.3 @@ -1559,7 +1559,7 @@ default-package-overrides: - SHA ==1.6.4.2 - shake ==0.15.10 - shake-language-c ==0.10.0 - - shakespeare ==2.0.11.2 + - shakespeare ==2.0.12.1 - shell-conduit ==4.5.2 - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 @@ -1581,10 +1581,10 @@ default-package-overrides: - skein ==1.0.9.4 - skeletons ==0.4.0 - slave-thread ==1.0.2 - - slug ==0.1.5 + - slug ==0.1.6 - smallcaps ==0.6.0.3 - smallcheck ==1.1.1 - - smoothie ==0.4.2.3 + - smoothie ==0.4.2.4 - smsaero ==0.6.2 - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 @@ -1616,7 +1616,7 @@ default-package-overrides: - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.12.0 + - sqlite-simple ==0.4.12.1 - srcloc ==0.5.1.0 - stache ==0.1.8 - stack-run-auto ==0.1.1.4 @@ -1645,7 +1645,7 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.0.9 - stratosphere ==0.1.6 - streaming ==0.1.4.3 - - streaming-bytestring ==0.1.4.4 + - streaming-bytestring ==0.1.4.5 - streaming-commons ==0.1.16 - streamproc ==1.6.2 - streams ==3.3 @@ -1654,13 +1654,13 @@ default-package-overrides: - string-class ==0.1.6.5 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - - string-conversions ==0.4 + - string-conversions ==0.4.0.1 - string-qq ==0.0.2 - stringable ==0.1.3 - stringbuilder ==0.5.0 - stringsearch ==0.3.6.6 - stripe-core ==2.1.0 - - strive ==3.0.1 + - strive ==3.0.2 - stylish-haskell ==0.6.1.0 - success ==0.2.6 - sundown ==0.6 @@ -1689,7 +1689,7 @@ default-package-overrides: - tar ==0.5.0.3 - tardis ==0.4.1.0 - tasty ==0.11.0.4 - - tasty-ant-xml ==1.0.3 + - tasty-ant-xml ==1.0.4 - tasty-dejafu ==0.3.0.2 - tasty-expected-failure ==0.11.0.4 - tasty-golden ==2.3.1.1 @@ -1729,7 +1729,7 @@ default-package-overrides: - text-ldap ==0.1.1.8 - text-manipulate ==0.2.0.1 - text-metrics ==0.1.0 - - text-postgresql ==0.0.2.1 + - text-postgresql ==0.0.2.2 - text-region ==0.1.0.1 - text-show ==3.4 - text-show-instances ==3.4 @@ -1828,7 +1828,7 @@ default-package-overrides: - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - Unixutils ==1.54.1 - - unordered-containers ==0.2.7.1 + - unordered-containers ==0.2.7.2 - uri-bytestring ==0.2.2.1 - uri-encode ==1.5.0.5 - url ==2.1.3 @@ -1860,7 +1860,7 @@ default-package-overrides: - vector-instances ==3.3.1 - vector-space ==0.10.4 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.2.0 + - vectortiles ==1.2.0.1 - versions ==3.0.0 - vhd ==0.2.2 - ViennaRNAParser ==1.2.9 @@ -1887,7 +1887,7 @@ default-package-overrides: - wai-middleware-throttle ==0.2.1.0 - wai-middleware-verbs ==0.3.2 - wai-predicates ==0.9.0 - - wai-request-spec ==0.10.2.1 + - wai-request-spec ==0.10.2.4 - wai-session ==0.3.2 - wai-session-postgresql ==0.2.1.0 - wai-transformers ==0.0.7 @@ -1965,7 +1965,7 @@ default-package-overrides: - YampaSynth ==0.2 - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - - yesod ==1.4.3.1 + - yesod ==1.4.4 - yesod-auth ==1.4.15 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 @@ -1982,7 +1982,7 @@ default-package-overrides: - yesod-gitrev ==0.1.0.0 - yesod-job-queue ==0.3.0.1 - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.1.0 + - yesod-persistent ==1.4.1.1 - yesod-sitemap ==1.4.0.1 - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 @@ -1996,7 +1996,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.4 + - zip ==0.1.5 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 @@ -2018,6 +2018,7 @@ extra-packages: - esqueleto < 2.5 # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x + - hpack == 0.15.* # needed for stack-1.3.2 - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x @@ -2219,6 +2220,7 @@ dont-distribute-packages: aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] + affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2425,11 +2427,13 @@ dont-distribute-packages: aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + babl: [ i686-linux, x86_64-linux, x86_64-darwin ] babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2548,6 +2552,7 @@ dont-distribute-packages: BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] + BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2624,6 +2629,7 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2812,6 +2818,7 @@ dont-distribute-packages: CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2987,6 +2994,9 @@ dont-distribute-packages: convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-theorem: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] copr: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3433,6 +3443,7 @@ dont-distribute-packages: engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3482,6 +3493,7 @@ dont-distribute-packages: event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventsource-geteventstore-store: [ i686-linux, x86_64-linux, x86_64-darwin ] eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3600,6 +3612,8 @@ dont-distribute-packages: fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] + flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] + flac: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3732,6 +3746,7 @@ dont-distribute-packages: GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] + gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3775,6 +3790,7 @@ dont-distribute-packages: getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3798,6 +3814,7 @@ dont-distribute-packages: ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3887,6 +3904,7 @@ dont-distribute-packages: goal-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] + goat: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3953,6 +3971,7 @@ dont-distribute-packages: graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] + graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4075,6 +4094,7 @@ dont-distribute-packages: halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] + halive: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4201,6 +4221,7 @@ dont-distribute-packages: haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4268,6 +4289,7 @@ dont-distribute-packages: hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4720,6 +4742,7 @@ dont-distribute-packages: hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4939,6 +4962,7 @@ dont-distribute-packages: instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] int-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] + integer-logarithms: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4948,6 +4972,8 @@ dont-distribute-packages: interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] + intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + intro: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5081,6 +5107,7 @@ dont-distribute-packages: JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5236,6 +5263,8 @@ dont-distribute-packages: lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + LDAP: [ i686-linux, x86_64-linux, x86_64-darwin ] + ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5515,6 +5544,7 @@ dont-distribute-packages: mcpi: [ i686-linux, x86_64-linux, x86_64-darwin ] mdapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] + mDNSResponder-client: [ i686-linux, x86_64-linux, x86_64-darwin ] mdp: [ i686-linux, x86_64-linux, x86_64-darwin ] mealstrom: [ i686-linux, x86_64-linux, x86_64-darwin ] MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5778,6 +5808,7 @@ dont-distribute-packages: NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5818,6 +5849,8 @@ dont-distribute-packages: network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] + neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] neural: [ i686-linux, x86_64-linux, x86_64-darwin ] newports: [ i686-linux, x86_64-linux, x86_64-darwin ] newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5874,6 +5907,7 @@ dont-distribute-packages: Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6196,6 +6230,7 @@ dont-distribute-packages: pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] + preamble: [ i686-linux, x86_64-linux, x86_64-darwin ] precis: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6299,6 +6334,7 @@ dont-distribute-packages: qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] + qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] qt: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6326,6 +6362,7 @@ dont-distribute-packages: quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6333,6 +6370,7 @@ dont-distribute-packages: quickterm: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6366,6 +6404,12 @@ dont-distribute-packages: Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-slate: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-views: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasa-ext-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6432,6 +6476,7 @@ dont-distribute-packages: reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + refty: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6467,6 +6512,8 @@ dont-distribute-packages: relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] + remark: [ i686-linux, x86_64-linux, x86_64-darwin ] + remarks: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-json-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6622,6 +6669,7 @@ dont-distribute-packages: SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp2udp: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6687,12 +6735,14 @@ dont-distribute-packages: sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] + separated: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqalign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6759,6 +6809,7 @@ dont-distribute-packages: shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] + shakers: [ i686-linux, x86_64-linux, x86_64-darwin ] shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6825,6 +6876,7 @@ dont-distribute-packages: skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skell: [ i686-linux, x86_64-linux, x86_64-darwin ] skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] + skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack-api: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6845,6 +6897,8 @@ dont-distribute-packages: Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6915,6 +6969,7 @@ dont-distribute-packages: snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6982,6 +7037,7 @@ dont-distribute-packages: sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7025,6 +7081,7 @@ dont-distribute-packages: stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] + StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7147,6 +7204,7 @@ dont-distribute-packages: tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] + tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7219,6 +7277,7 @@ dont-distribute-packages: texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7262,6 +7321,7 @@ dont-distribute-packages: thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7390,6 +7450,7 @@ dont-distribute-packages: twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] twentyseven: [ i686-linux, x86_64-linux, x86_64-darwin ] + twfy-api-client: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7627,6 +7688,7 @@ dont-distribute-packages: web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-regular: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7669,6 +7731,7 @@ dont-distribute-packages: winio: [ i686-linux, x86_64-linux, x86_64-darwin ] wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + wiringPi: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7690,6 +7753,7 @@ dont-distribute-packages: wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] + writer-cps-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7805,6 +7869,7 @@ dont-distribute-packages: yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 673099e0dc49..ef73e47f537e 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -14,7 +14,10 @@ let mkDerivation = pkgs.callPackage ./generic-builder.nix { inherit stdenv; inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; - inherit (self) ghc jailbreak-cabal; + jailbreak-cabal = if (self.ghc.cross or null) != null + then self.ghc.bootPkgs.jailbreak-cabal + else self.jailbreak-cabal; + inherit (self) ghc; hscolour = overrideCabal self.hscolour (drv: { isLibrary = false; doHaddock = false; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 092d4ae45242..a7696dfc2e31 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -94,6 +94,7 @@ let "--with-gcc=${ghc.cc}" "--with-ld=${ghc.ld}" "--hsc2hs-options=--cross-compile" + "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" ]; crossCabalFlagsString = diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 453ce86a060e..b1f8ac909d6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1401,6 +1401,7 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -2769,6 +2770,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Clipboard_2_3_1_0" = callPackage + ({ mkDerivation, base, directory, unix, utf8-string, X11 }: + mkDerivation { + pname = "Clipboard"; + version = "2.3.1.0"; + sha256 = "ddbb85e3e3fa01edc9c98b0798d0db8cec803a8f85a3c6b56684a604dff053e3"; + libraryHaskellDepends = [ base directory unix utf8-string X11 ]; + homepage = "http://haskell.org/haskellwiki/Clipboard"; + description = "System clipboard interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ClustalParser" = callPackage ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec , vector @@ -2786,6 +2800,24 @@ self: { license = "GPL"; }) {}; + "ClustalParser_1_2_0" = callPackage + ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text + , vector + }: + mkDerivation { + pname = "ClustalParser"; + version = "1.2.0"; + sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text vector ]; + executableHaskellDepends = [ base cmdargs either-unwrap ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Libary for parsing Clustal tools output"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Coadjute" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-csv , containers, directory, fgl, filepath, mtl, old-time, pretty @@ -5259,6 +5291,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "FloatingHex" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "FloatingHex"; + version = "0.4"; + sha256 = "b277054db48d2dec62e3831586f218cbe0a056dec44dbc032e9a73087425a24c"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Read and write hexadecimal floating point numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Focus" = callPackage ({ mkDerivation, base, MissingH, split }: mkDerivation { @@ -5703,19 +5746,6 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: - mkDerivation { - pname = "GLURaw"; - version = "2.0.0.2"; - sha256 = "884b3dbefbaabdc66cf8e240d33adb0d491bcf9119e53a7d42b8cf0972df15de"; - libraryHaskellDepends = [ base OpenGLRaw transformers ]; - librarySystemDepends = [ freeglut mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; - - "GLURaw_2_0_0_3" = callPackage ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; @@ -5726,7 +5756,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT" = callPackage @@ -6177,29 +6206,6 @@ self: { }) {}; "Glob" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.13"; - sha256 = "fe99d9434a2dbbac5385cb6690cbb6e2f2eb25df6ab5ce99c8121fc3fdddbd4c"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_7_14" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6220,7 +6226,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -8127,29 +8132,6 @@ self: { }) {}; "HTTP" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive, conduit - , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl - , network, network-uri, parsec, pureMD5, split, test-framework - , test-framework-hunit, time, wai, warp - }: - mkDerivation { - pname = "HTTP"; - version = "4000.3.3"; - sha256 = "bbada3c2088dc1384234cdbc1bb6089ea588da068a6a38878ea259dd19de9bf2"; - libraryHaskellDepends = [ - array base bytestring mtl network network-uri parsec time - ]; - testHaskellDepends = [ - base bytestring case-insensitive conduit conduit-extra deepseq - http-types httpd-shed HUnit mtl network network-uri pureMD5 split - test-framework test-framework-hunit wai warp - ]; - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HTTP_4000_3_4" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl , network, network-uri, parsec, pureMD5, split, test-framework @@ -8170,7 +8152,6 @@ self: { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTTP-Simple" = callPackage @@ -8444,27 +8425,6 @@ self: { }) {}; "HaTeX" = callPackage - ({ mkDerivation, base, bytestring, containers, matrix, parsec - , QuickCheck, tasty, tasty-quickcheck, text, transformers - , wl-pprint-extras - }: - mkDerivation { - pname = "HaTeX"; - version = "3.17.0.2"; - sha256 = "3f5aced48ee59425e3ccaa2b6c4490f43b395fe9331b3be4a277261ac45e80fe"; - libraryHaskellDepends = [ - base bytestring containers matrix parsec QuickCheck text - transformers wl-pprint-extras - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck text - ]; - homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; - description = "The Haskell LaTeX library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HaTeX_3_17_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, matrix, parsec , QuickCheck, tasty, tasty-quickcheck, text, transformers , wl-pprint-extras @@ -8483,7 +8443,6 @@ self: { homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -9737,27 +9696,6 @@ self: { }) {}; "IPv6Addr" = callPackage - ({ mkDerivation, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; - version = "0.6.2.0"; - sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926"; - revision = "1"; - editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e"; - libraryHaskellDepends = [ - attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_0_6_3" = callPackage ({ mkDerivation, attoparsec, base, HUnit, iproute, network , network-info, random, test-framework, test-framework-hunit, text }: @@ -9776,7 +9714,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IcoGrid" = callPackage @@ -9984,6 +9921,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "JSONParser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "JSONParser"; + version = "0.1.0.2"; + sha256 = "724a71c2d97a470744949d37683565ee77890d144d5ded63098e557ad538deba"; + libraryHaskellDepends = [ base parsec ]; + description = "Parse JSON"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "JSONb" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-nums , bytestring-trie, containers, utf8-string @@ -10488,16 +10436,19 @@ self: { }) {inherit (pkgs) openblasCompat;}; "LDAP" = callPackage - ({ mkDerivation, base, lber, openldap }: + ({ mkDerivation, base, HUnit, lber, openldap }: mkDerivation { pname = "LDAP"; - version = "0.6.10"; - sha256 = "4050875df6157fd71ce14bb0025499a1e9ccbb4d7a03686d68d3521dd2539f82"; + version = "0.6.11"; + sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lber openldap ]; + testHaskellDepends = [ base HUnit ]; + testSystemDepends = [ lber openldap ]; homepage = "https://github.com/ezyang/ldap-haskell"; description = "Haskell binding for C LDAP API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {lber = null; inherit (pkgs) openldap;}; "LRU" = callPackage @@ -10803,25 +10754,26 @@ self: { }) {}; "LibClang" = callPackage - ({ mkDerivation, base, bytestring, c2hs, filepath, hashable, mtl - , ncurses, resourcet, text, time, transformers, transformers-base - , vector + ({ mkDerivation, base, bytestring, c2hs, clang, filepath, hashable + , mtl, ncurses, resourcet, text, time, transformers + , transformers-base, vector }: mkDerivation { pname = "LibClang"; - version = "3.4.0"; - sha256 = "b4bdd8fb7fa103b7045534ae43f00bb3d4ad53e909a49feff081f06751e4a44d"; + version = "3.8.0"; + sha256 = "945c53f04eba97e85aee1a434a79f09956b74a5c6c71d1e73faeb9574c0db9dc"; libraryHaskellDepends = [ base bytestring filepath hashable mtl resourcet text time transformers transformers-base vector ]; - librarySystemDepends = [ ncurses ]; + librarySystemDepends = [ clang ]; + libraryPkgconfigDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; - homepage = "https://github.com/chetant/LibClang/issues"; + homepage = "https://github.com/chetant/LibClang"; description = "Haskell bindings for libclang (a C++ parsing library)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ncurses;}; + }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;}; "LibZip" = callPackage ({ mkDerivation, base, bindings-libzip, bytestring, directory @@ -14346,12 +14298,13 @@ self: { , directory, edit-distance, either-unwrap, EntrezHTTP, filepath , hierarchical-clustering, HTTP, http-conduit, http-types, hxt , matrix, network, parsec, process, pureMD5, random, split - , Taxonomy, text, time, transformers, vector, ViennaRNAParser + , Taxonomy, text, text-metrics, time, transformers, vector + , ViennaRNAParser }: mkDerivation { pname = "RNAlien"; - version = "1.2.8"; - sha256 = "f4d754abee29eebb424ffb6d498de24544de1895a5ace4e47863870f62d2b94a"; + version = "1.2.9"; + sha256 = "0de399df27f15301d7074ec5b1b4dcf6712bb7878573183edc300c19ee172f25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14359,7 +14312,8 @@ self: { ClustalParser cmdargs containers directory edit-distance either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP http-conduit http-types hxt matrix network parsec process pureMD5 - random Taxonomy text transformers vector ViennaRNAParser + random Taxonomy text text-metrics transformers vector + ViennaRNAParser ]; executableHaskellDepends = [ base biocore biofasta bytestring cassava cmdargs containers @@ -16181,6 +16135,7 @@ self: { ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -16242,6 +16197,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Strafunski-StrategyLib_5_0_0_10" = callPackage + ({ mkDerivation, base, directory, mtl, syb, transformers }: + mkDerivation { + pname = "Strafunski-StrategyLib"; + version = "5.0.0.10"; + sha256 = "308a1a051df6bb617c9d37bda297fdbedfb8b4c7f6ea5864443cfb9f15e80cc2"; + libraryHaskellDepends = [ base directory mtl syb transformers ]; + description = "Library for strategic programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "StrappedTemplates" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , filemanip, filepath, hspec, mtl, parsec, text, transformers @@ -17211,8 +17178,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.6"; - sha256 = "4fd37ceafe74b95af73f01ccc64a5c1e3282e6b74ab2dd193507aac289ae2480"; + version = "0.4.6.1"; + sha256 = "8b9648383b28087fedf16b7bcb7c6c2137873a59af2d1ef8460fba1c902a84f9"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -17922,6 +17889,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Win32-shortcut" = callPackage + ({ mkDerivation, base, libossp_uuid, mtl, ole32, th-utilities + , Win32 + }: + mkDerivation { + pname = "Win32-shortcut"; + version = "0.0.1"; + sha256 = "5c2d67d8ca20d1a7452f3a0c3258e9d8b6540b40401a81dd199e56809144ffb7"; + libraryHaskellDepends = [ base mtl th-utilities Win32 ]; + librarySystemDepends = [ libossp_uuid ole32 ]; + homepage = "https://github.com/opasly-wieprz/Win32-shortcut"; + description = "Support for manipulating shortcuts (.lnk files) on Windows"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libossp_uuid; ole32 = null;}; + "Wired" = callPackage ({ mkDerivation, base, chalmers-lava2000, containers, mtl , QuickCheck @@ -18200,8 +18183,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.4"; - sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94"; + version = "0.1.0.6"; + sha256 = "d2cc3144a74de8aaa20e9467e25d981b63598736b603921b10d9ddb47be36d79"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -20302,8 +20285,8 @@ self: { pname = "aeson-compat"; version = "0.3.6"; sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142"; - revision = "2"; - editedCabalFile = "1000ae33d38d919e685b31f6f4de79bab9298318ced3ded0ff7e4a24c10258c3"; + revision = "4"; + editedCabalFile = "534f6f1d1b09f88910407d670dfc9283ceaf824bf929373e0be1566f206011a3"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions hashable nats scientific semigroups tagged text time @@ -20360,8 +20343,8 @@ self: { pname = "aeson-extra"; version = "0.4.0.0"; sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594"; - revision = "1"; - editedCabalFile = "2a114863b515ec4b326bd31e4493ce2bcf7598b03361f76b44637e62d334b621"; + revision = "2"; + editedCabalFile = "205ca010ed9726b27ebe1f63fe6260dc26b327e2998cc4bc744a30bd3b708c3b"; libraryHaskellDepends = [ aeson aeson-compat attoparsec base base-compat bytestring containers exceptions hashable parsec recursion-schemes scientific @@ -20779,6 +20762,7 @@ self: { homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affine-invariant-ensemble-mcmc" = callPackage @@ -21350,8 +21334,8 @@ self: { }: mkDerivation { pname = "alex-meta"; - version = "0.3.0.8"; - sha256 = "2ed9c0e13ad7f73d732d7bf87d187628009fe1ef19b6848f3490d0e89bf045c9"; + version = "0.3.0.9"; + sha256 = "d933ff9ee92f2372bebef64c1780e20e8ff8bbbde6d53749c2b0892364ba0221"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -25121,6 +25105,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_14_1" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.14.1"; + sha256 = "500465d278790117e08b7c5aa2c9f917a93cf3a87e81c079d509cd5fd52d300b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + homepage = "https://github.com/hreinhardt/amqp"; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -26317,25 +26330,6 @@ self: { }) {}; "app-settings" = callPackage - ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl - , parsec, text - }: - mkDerivation { - pname = "app-settings"; - version = "0.2.0.9"; - sha256 = "ee844c5ed2847539c84d13d81e827fd2a4f0f9b0b53308f65d24244a027e9024"; - libraryHaskellDepends = [ - base containers directory mtl parsec text - ]; - testHaskellDepends = [ - base containers directory hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/emmanueltouzery/app-settings"; - description = "A library to manage application settings (INI file-like)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "app-settings_0_2_0_10" = callPackage ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl , parsec, text }: @@ -26352,7 +26346,6 @@ self: { homepage = "https://github.com/emmanueltouzery/app-settings"; description = "A library to manage application settings (INI file-like)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appar" = callPackage @@ -26688,36 +26681,6 @@ self: { }) {arbb_dev = null;}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.11"; - sha256 = "9133fb9cc88568c3baec403e674e95cfe0ebedc1ff974499d97e93d916bdefef"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - - "arbtt_0_9_0_12" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -27061,11 +27024,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "arithmatic"; - version = "0.1.0.1"; - sha256 = "487edb83b111065637d8ad313788aa43df14654cf098f5de682cd06322f641e1"; + version = "0.1.0.2"; + sha256 = "1de210330bfde4124c1fc898b71bfc423926c6dc91fbc78b01ad927af3b02939"; libraryHaskellDepends = [ base ]; - description = "Basic arithmatic in haskell"; - license = stdenv.lib.licenses.gpl3; + doHaddock = false; + description = "do things with numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "arithmetic" = callPackage @@ -27814,6 +27778,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-extra" = callPackage + ({ mkDerivation, async, base, containers, deepseq }: + mkDerivation { + pname = "async-extra"; + version = "0.1.0.0"; + sha256 = "47cf509bc09d106cd229c4568e4c02ce085b2541e856b3be0c75cf62217dc02a"; + libraryHaskellDepends = [ async base containers deepseq ]; + homepage = "https://github.com/agrafix/async-extra#readme"; + description = "Useful concurrent combinators"; + license = stdenv.lib.licenses.mit; + }) {}; + "async-extras" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base , monad-control, SafeSemaphore, stm, transformers-base @@ -28719,6 +28695,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "auto_0_4_3_1" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cereal, containers + , deepseq, MonadRandom, profunctors, random, semigroups + , transformers + }: + mkDerivation { + pname = "auto"; + version = "0.4.3.1"; + sha256 = "c6e26d1cbb17e3645e55bc8e9432b124520fbcba5ff32445acd4260c25cd3b41"; + libraryHaskellDepends = [ + base base-orphans bytestring cereal containers deepseq MonadRandom + profunctors random semigroups transformers + ]; + homepage = "https://github.com/mstksg/auto"; + description = "Denotative, locally stateful programming DSL & platform"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28735,8 +28730,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "0.2.2"; - sha256 = "2ad4c6d948984c0a5542f5ce87d806b3597088083bc179217d36d08380880d03"; + version = "0.2.3"; + sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -29604,19 +29599,20 @@ self: { "aws-simple" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet - , text + , text, unordered-containers }: mkDerivation { pname = "aws-simple"; - version = "0.1.0.0"; - sha256 = "70091063d883e2320a622a2909abc093e11a47d0a18c64b6557679e401ba918f"; + version = "0.3.0.0"; + sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder - bytestring conduit lens mtl resourcet text + bytestring conduit lens mtl resourcet text unordered-containers ]; homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sns" = callPackage @@ -29805,6 +29801,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "b9_0_5_31" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hashable, hspec, hspec-expectations, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, semigroups, syb, template, text + , time, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "b9"; + version = "0.5.31"; + sha256 = "8dcc9b68a88f6f73a0c1af060bbc7607e8894e741665fdecd40dfa842c187c95"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free hashable mtl + parallel parsec pretty pretty-show process QuickCheck random + semigroups syb template text time transformers unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + base bytestring directory optparse-applicative + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck + semigroups text unordered-containers vector yaml + ]; + homepage = "https://github.com/sheyll/b9-vm-image-builder"; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "babl" = callPackage ({ mkDerivation, babl, base }: mkDerivation { @@ -29817,6 +29847,7 @@ self: { homepage = "http://github.com/nek0/babl#readme"; description = "Haskell bindings to BABL library"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -30281,20 +30312,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_9_0_0" = callPackage - ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: + "base_4_9_1_0" = callPackage + ({ mkDerivation, ghc-prim, integer-gmp, rts }: mkDerivation { pname = "base"; - version = "4.9.0.0"; - sha256 = "de577e8bd48de97be954c32951b9544ecdbbede721042c71f7f611af4ba8be2d"; - libraryHaskellDepends = [ - ghc-prim invalid-cabal-flag-settings rts - ]; + version = "4.9.1.0"; + sha256 = "7a5b85805f06f869ca86f99e12cb098c611ab623dd70305ca2b389823d71fb7e"; + libraryHaskellDepends = [ ghc-prim integer-gmp rts ]; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {invalid-cabal-flag-settings = null;}; + }) {}; "base-compat" = callPackage ({ mkDerivation, base, hspec, QuickCheck, unix }: @@ -30347,6 +30375,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base-noprelude_4_9_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.9.1.0"; + sha256 = "11611df31326a31694f13393d1ee1d3c684c2688eeaca8d8627f40ac9435f895"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + homepage = "https://github.com/hvr/base-noprelude"; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { @@ -30977,8 +31019,8 @@ self: { ({ mkDerivation, base, process, random, time }: mkDerivation { pname = "benchmark-function"; - version = "0.1.0.0"; - sha256 = "abb023c298bb0ad58e376f668e7b11ce3f89be786fb8e6eeeae9d4008053abb1"; + version = "0.1.0.1"; + sha256 = "6ce46b2f88b444b14594d4b6f3b2b491005b211f2daa95f16aac9be3680193ff"; libraryHaskellDepends = [ base process random time ]; homepage = "xy30.com"; description = "Test the time it takes to run a haskell function"; @@ -31757,33 +31799,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , QuickCheck, quickcheck-instances, scientific, tagged, tasty - , tasty-quickcheck, text, text-binary, time, unordered-containers - , vector, vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.5.1"; - sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; - revision = "4"; - editedCabalFile = "842aed0eac15d13b8178dd9ded2b2e296eabc950bd607593bb22c307d77c551e"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time unordered-containers vector - ]; - homepage = "https://github.com/phadej/binary-orphans#readme"; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-orphans_0_1_5_2" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty , tasty-quickcheck, text, text-binary, time, unordered-containers @@ -31793,6 +31808,8 @@ self: { pname = "binary-orphans"; version = "0.1.5.2"; sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d"; + revision = "1"; + editedCabalFile = "cb0932145cefc3ae3be46ef890b0db68864ddb96b0ed69371cbc878f385b6252"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -31806,7 +31823,6 @@ self: { homepage = "https://github.com/phadej/binary-orphans#readme"; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -31981,8 +31997,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.2"; sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784"; - revision = "1"; - editedCabalFile = "51f87f18bfe7ba8a3edc318cfb95f4aae9c2bb3feb54277553ac895b09ce0cf1"; + revision = "2"; + editedCabalFile = "7abacbe953b33132ec4cd7f4765e58918404e22c8b05eb6411f6bd62b05a828c"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -34252,8 +34268,8 @@ self: { }: mkDerivation { pname = "blazeT"; - version = "0.0.4"; - sha256 = "8ff74e6a75f4c77b13d122e57b9ef61e7365a7df0ca5efa7f1aba3a42a39c204"; + version = "0.0.5"; + sha256 = "81d25882110a62ba8ef99f76f35a98c58ec034f283244d5af6506832991e7091"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring mtl text @@ -34264,6 +34280,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ble" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, d-bus + , data-default-class, hslogger, hspec, microlens, microlens-ghc + , microlens-th, mtl, QuickCheck, quickcheck-instances, random, stm + , text, transformers, uuid + }: + mkDerivation { + pname = "ble"; + version = "0.1.0.0"; + sha256 = "718781b4acc79797450e46340060088ce5d1a110e3cb8d525b0b0ee5a675fd12"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal containers d-bus data-default-class + microlens microlens-ghc microlens-th mtl random text transformers + uuid + ]; + executableHaskellDepends = [ + base bytestring cereal containers d-bus data-default-class + microlens microlens-ghc microlens-th mtl random stm text + transformers uuid + ]; + testHaskellDepends = [ + base bytestring cereal containers d-bus data-default-class hslogger + hspec microlens microlens-ghc microlens-th mtl QuickCheck + quickcheck-instances random text transformers uuid + ]; + homepage = "http://github.com/plow-technologies/ble#readme"; + description = "Bluetooth Low Energy (BLE) peripherals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blink1" = callPackage ({ mkDerivation, base, bytestring, text, unix, usb, vector }: mkDerivation { @@ -34401,7 +34449,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bloodhound_0_12_0_0" = callPackage + "bloodhound_0_12_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, directory, doctest, errors, exceptions , filepath, generics-sop, hashable, hspec, http-client, http-types @@ -34411,8 +34459,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.12.0.0"; - sha256 = "b3673675c75ee393281502ce45d0d9768c6a9165df9cebc23beb25539d7acbdc"; + version = "0.12.1.0"; + sha256 = "da3ed23c1cc9cfc1d1b44c1255522f6c164b8ed53d2e008c92789e72a232e46c"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -34738,8 +34786,8 @@ self: { }: mkDerivation { pname = "bolt"; - version = "0.2.2.0"; - sha256 = "07d04b418f1106f4fb4e11f8466d18121f7d63d162e86389a69a58f23270339b"; + version = "0.3.0.1"; + sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network network-uri scientific text transformers unordered-containers @@ -34905,8 +34953,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "boolean-list"; - version = "0.1.0.0"; - sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b"; + version = "0.1.0.1"; + sha256 = "ac02910213e71b1e8f4d0de1227e7463836ee1e1985626effe1bf41af5b8e077"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -35294,6 +35342,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brain-bleep" = callPackage + ({ mkDerivation, array, base, containers, parsec }: + mkDerivation { + pname = "brain-bleep"; + version = "0.1.0.1"; + sha256 = "043d66bf97458ccf83129c29574e44b0704b04602f5450562f72fa9bb2b3a9a1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base containers parsec ]; + description = "primitive imperative language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brainfuck" = callPackage ({ mkDerivation, array, base, mtl, unix }: mkDerivation { @@ -35364,19 +35425,19 @@ self: { "breve" = callPackage ({ mkDerivation, aeson, base, binary, blaze-html, bytestring , configurator, cryptohash, directory, hashtables, http-types, mtl - , random, Spock, text, tls, transformers, wai, wai-extra - , wai-middleware-static, warp, warp-tls, xdg-basedir + , random, Spock, Spock-core, text, tls, transformers, wai + , wai-extra, wai-middleware-static, warp, warp-tls, xdg-basedir }: mkDerivation { pname = "breve"; - version = "0.4.3.0"; - sha256 = "e4740b0cc882ada54bb7e89957349639ef2a3f171598818b7e678b9880d1f939"; + version = "0.4.3.1"; + sha256 = "2c1a7d1cb1653a4bf66d5cb53e064b498d8165aa67d7380580a0b69d0f5f2581"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base binary blaze-html bytestring configurator cryptohash - directory hashtables http-types mtl random Spock text tls - transformers wai wai-extra wai-middleware-static warp warp-tls + directory hashtables http-types mtl random Spock Spock-core text + tls transformers wai wai-extra wai-middleware-static warp warp-tls xdg-basedir ]; homepage = "https://github.com/rnhmjoj/breve"; @@ -35656,10 +35717,19 @@ self: { }: mkDerivation { pname = "buchhaltung"; - version = "0.0.3"; - sha256 = "6ba38b02094431f1f24e698eed4b4dc3c0169f2154d2b66a584c16162c4cf276"; - isLibrary = false; + version = "0.0.5"; + sha256 = "38a63a043e6360c393400c90b59102f5295e9603379c8d5838bf2cf0e2527569"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint array async base boxes bytestring cassava + containers data-default Decimal deepseq directory edit-distance + file-embed filepath formatting hashable haskeline hint hledger + hledger-lib lens lifted-base ListLike megaparsec MissingH + monad-control mtl optparse-applicative parsec process regex-compat + regex-tdfa regex-tdfa-text safe semigroups split strict temporary + text time transformers unordered-containers vector yaml + ]; executableHaskellDepends = [ aeson ansi-wl-pprint array async base boxes bytestring cassava containers data-default Decimal deepseq directory edit-distance @@ -35672,6 +35742,7 @@ self: { homepage = "http://johannesgerer.com/buchhaltung"; description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer-builder" = callPackage @@ -36959,6 +37030,8 @@ self: { pname = "cabal-helper"; version = "0.7.2.0"; sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362"; + revision = "1"; + editedCabalFile = "ebe355cd7cc1f6b1fc06054fb645010ab63c7de7dcba0f12e3c58a197bcc8173"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36978,6 +37051,41 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-helper_0_7_3_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers + , directory, extra, filepath, ghc-prim, mtl, process + , template-haskell, temporary, transformers, unix, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.7.3.0"; + sha256 = "794055f5205dd029aceb2fe9aac183880d2b4ef005d1096ee3052710d01192a4"; + revision = "1"; + editedCabalFile = "1ec0e453ac2b600db0767b99546f963f50436186f55f7794cef81f803a2c1b4a"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process transformers + ]; + executableHaskellDepends = [ + base bytestring Cabal directory filepath ghc-prim mtl process + template-haskell temporary transformers utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory extra filepath ghc-prim mtl process + template-haskell temporary transformers unix utf8-string + ]; + testToolDepends = [ cabal-install ]; + doCheck = false; + description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-info" = callPackage ({ mkDerivation, base, Cabal, directory, filepath , optparse-applicative @@ -37122,8 +37230,8 @@ self: { }: mkDerivation { pname = "cabal-macosx"; - version = "0.2.3.4"; - sha256 = "4c3ae50fdafa3283055624156016834f077bdf5b8237441497e7ccea69308570"; + version = "0.2.3.5"; + sha256 = "6f5604cd4d1e7e67736c408babda35fdf1b1ff7348254d1f308ccea953615633"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38228,14 +38336,15 @@ self: { "canteven-http" = callPackage ({ mkDerivation, base, bytestring, canteven-log, exceptions , http-types, monad-logger, text, time, transformers, uuid, wai + , wai-extra }: mkDerivation { pname = "canteven-http"; - version = "0.1.1.2"; - sha256 = "378a453137fa9d1d1ad8f4771c02bb74b5a634624d437fbec00356a153f4b874"; + version = "0.1.2.0"; + sha256 = "194fbbb36eaa70c4ed2dbf8cdc9e5831761bbefba2cccd473f1068bf33ac0977"; libraryHaskellDepends = [ base bytestring canteven-log exceptions http-types monad-logger - text time transformers uuid wai + text time transformers uuid wai wai-extra ]; homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; @@ -38687,12 +38796,16 @@ self: { }) {}; "case-conversion" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, HUnit }: mkDerivation { pname = "case-conversion"; - version = "0.1"; - sha256 = "24061f58765007efdff7024b2c9986c311734281f8acb941ee1fb020f18256da"; + version = "0.2"; + sha256 = "d8ac5def42d113050ccfc8724ea7408d4f748e2daa942a23b053d5b5602bb9cd"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; homepage = "www.xy30.com"; description = "Convert between different cases"; license = stdenv.lib.licenses.bsd3; @@ -39328,17 +39441,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cayley-client_0_3_1" = callPackage + "cayley-client_0_3_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.3.1"; - sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7"; - revision = "1"; - editedCabalFile = "2f59497bc4c4e60596223f1f64ccb621a5f7906c06fac51780875c9c8923bdde"; + version = "0.3.2"; + sha256 = "f6e8b5cd6909554b8a75dedd303df0948fd3d27826b053ab2fc5779e7a7e5bc7"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -41283,23 +41394,25 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra - , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, unix - , unordered-containers + , containers, deepseq, directory, filepath, ghc, ghc-boot + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl + , process, text, time, transformers, unbound-generics, uniplate + , unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.6.24"; - sha256 = "03fddd334133dafc57110657542b1024749fd06d66cecad62853aad4d402acf8"; + version = "0.7.0.1"; + sha256 = "74ccedf030ca1ee3c09c51b6e9fbb7caef4693f1ae0610694d03b9398d9ced56"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bifunctors bytestring clash-lib clash-prelude clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise - hashable haskeline lens mtl process text time transformers - unbound-generics unix unordered-containers + directory filepath ghc ghc-boot ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline lens mtl process text time transformers unbound-generics + uniplate unix unordered-containers ]; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; @@ -41333,6 +41446,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-lib_0_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, data-binary-ieee754, deepseq + , directory, errors, fgl, filepath, ghc, hashable, integer-gmp + , lens, mtl, pretty, process, template-haskell, text, time + , transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.7"; + sha256 = "867a976ec5a436e953cd342ee3cff0fbeb54d32fb412ae5cade43bcb80aaab96"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers data-binary-ieee754 deepseq directory errors fgl + filepath ghc hashable integer-gmp lens mtl pretty process + template-haskell text time transformers unbound-generics + unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-multisignal" = callPackage + ({ mkDerivation, base, clash-prelude, QuickCheck }: + mkDerivation { + pname = "clash-multisignal"; + version = "0.1.0.0"; + sha256 = "84da3f9ea59db5e2594d6c207aa8be6219331c7cfa08415e791af1f65ebf6941"; + libraryHaskellDepends = [ base clash-prelude QuickCheck ]; + homepage = "https://github.com/ra1u/clash-multisignal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude" = callPackage ({ mkDerivation, array, base, data-default, deepseq, doctest , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise @@ -41357,6 +41507,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-prelude_0_11" = callPackage + ({ mkDerivation, array, base, constraints, data-binary-ieee754 + , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp + , lens, QuickCheck, reflection, singletons, template-haskell + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.11"; + sha256 = "e73490ee73228af3b2a7dca432a226a45bf5d8a52791134a99d4eeb32ac8043a"; + libraryHaskellDepends = [ + array base constraints data-binary-ieee754 data-default deepseq + ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -41387,6 +41560,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-systemverilog_0_7" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable + , lens, mtl, text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.7"; + sha256 = "1189f40348bb48d002614c3d9fbed3c228e71ab5a9a33c056256e1e763bf47bb"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl hashable lens mtl text + unordered-containers wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-verilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -41405,6 +41596,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-verilog_0_7" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable + , lens, mtl, text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.7"; + sha256 = "4a10084bd2333333af2c1616a030c57fb959f73639647ae2b6788d1d5f79e4ef"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl hashable lens mtl text + unordered-containers wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -41425,6 +41634,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-vhdl_0_7" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable + , lens, mtl, text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.7"; + sha256 = "6fb6c1dfa951021307bf121cb9ed622c3b726c20d2f0b873751fbd9329458af1"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl hashable lens mtl text + unordered-containers wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classify" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -41618,7 +41845,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; - "clckwrks_0_24_0" = callPackage + "clckwrks_0_24_0_1" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath , happstack-authenticate, happstack-hsp, happstack-jmacro @@ -41632,8 +41859,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0"; - sha256 = "aae3a0d63da228eb0876505ec574f90955d5f2c3512003b57371d988b94a2e5c"; + version = "0.24.0.1"; + sha256 = "94e21d56e4a1e7efcc3f8f39252ff1ee6b74b3dd3408fd265dddbdf1606cdede"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -41653,25 +41880,6 @@ self: { }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage - ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl - , network, parsec - }: - mkDerivation { - pname = "clckwrks-cli"; - version = "0.2.16"; - sha256 = "424fcaa1f1b6b39be1d727073b9b9ab37c9a201f6c2eca5a8c30d469919c12e7"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - acid-state base clckwrks haskeline mtl network parsec - ]; - homepage = "http://www.clckwrks.com/"; - description = "a command-line interface for adminstrating some aspects of clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clckwrks-cli_0_2_17_1" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl , network, parsec }: @@ -41764,30 +41972,6 @@ self: { }) {}; "clckwrks-plugin-media" = callPackage - ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal - , clckwrks, containers, directory, filepath, gd, happstack-server - , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack - , reform-hsp, safecopy, text, web-plugins, web-routes - , web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-media"; - version = "0.6.16"; - sha256 = "7e4dbb81a28a3e4bf81c5d1ef5d0820a858877c00d1f2c98488d391a4a478598"; - libraryHaskellDepends = [ - acid-state attoparsec base blaze-html cereal clckwrks containers - directory filepath gd happstack-server hsp ixset magic mtl reform - reform-happstack reform-hsp safecopy text web-plugins web-routes - web-routes-th - ]; - libraryToolDepends = [ hsx2hs ]; - homepage = "http://clckwrks.com/"; - description = "media plugin for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clckwrks-plugin-media_0_6_16_1" = callPackage ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal , clckwrks, containers, directory, filepath, gd, happstack-server , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack @@ -41837,7 +42021,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clckwrks-plugin-page_0_4_3_7" = callPackage + "clckwrks-plugin-page_0_4_3_8" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server , hsp, hsx2hs, ixset, mtl, old-locale, random, reform @@ -41847,8 +42031,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.7"; - sha256 = "4f621eea6793307fb025ac9738f273c61c0e643f604bd2489b2bdf6fc06639d7"; + version = "0.4.3.8"; + sha256 = "57be510f5d829eb54a37e2777748250923283f8d9eb1690abb069368c36c00e6"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -41864,24 +42048,6 @@ self: { }) {}; "clckwrks-theme-bootstrap" = callPackage - ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp - , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins - }: - mkDerivation { - pname = "clckwrks-theme-bootstrap"; - version = "0.4.2"; - sha256 = "6b613719a51e4df718559b3517d9e6322ced8e75a874e69fcfc38d1648f22348"; - libraryHaskellDepends = [ - base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro - mtl text web-plugins - ]; - homepage = "http://www.clckwrks.com/"; - description = "simple bootstrap based template for clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clckwrks-theme-bootstrap_0_4_2_1" = callPackage ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins }: @@ -43557,6 +43723,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "comma" = callPackage + ({ mkDerivation, attoparsec, base, QuickCheck, text }: + mkDerivation { + pname = "comma"; + version = "1.0.1"; + sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ base QuickCheck text ]; + homepage = "https://github.com/lovasko/comma"; + description = "CSV Parser & Producer"; + license = "unknown"; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -44478,22 +44657,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.7.7"; - sha256 = "d3f7330fa5f194ba759af30f4be0b8aaa509dc84ed24e8340a8cdbe470c6dfd1"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_7_8" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -44507,7 +44670,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -46196,17 +46358,17 @@ self: { "convert-annotation" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers , deepseq, HTTP, inline-r, lens, lens-aeson, optparse-generic - , pipes, pipes-bytestring, pipes-csv, safe, text, vector, wreq + , pipes, pipes-bytestring, pipes-csv, req, safe, text, vector }: mkDerivation { pname = "convert-annotation"; - version = "0.5.0.0"; - sha256 = "946e3b0961a64fe7c3a8ffe28c8f87675a4f37000f3a4a7431f9b9c1af7dca67"; + version = "0.5.0.1"; + sha256 = "11a2eb8d8f02fd28bb1772aa42fea95dcc9ef8e4c8843f44e401c8a0749c1fa5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq HTTP inline-r lens - lens-aeson safe text wreq + lens-aeson req safe text ]; executableHaskellDepends = [ base bytestring cassava inline-r lens optparse-generic pipes @@ -46417,6 +46579,7 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-libraries" = callPackage @@ -46433,6 +46596,7 @@ self: { homepage = "https://github.com/leepike/copilot-libraries"; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-sbv" = callPackage @@ -46465,6 +46629,7 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copr" = callPackage @@ -47285,6 +47450,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crackNum_1_8" = callPackage + ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "1.8"; + sha256 = "26a592d71d6290c1acda8a8acc72f1e5e2be0461236ac9369ab4bc25647b3dc4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-binary-ieee754 FloatingHex ieee754 + ]; + executableHaskellDepends = [ + base data-binary-ieee754 FloatingHex ieee754 + ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -48985,8 +49169,8 @@ self: { ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { pname = "cudd"; - version = "0.1.0.3.1"; - sha256 = "95c05f80bb0caad6bc372ab511a7a74c6cf1c025c54d15105a573b3fec64d730"; + version = "0.1.0.4"; + sha256 = "d15b95b34d8d29d201cab78baf79c8e18636429ca5516d84dc03a26486b1d7a0"; libraryHaskellDepends = [ array base mtl transformers ]; librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; @@ -49547,6 +49731,51 @@ self: { license = "GPL"; }) {inherit (pkgs) curl;}; + "darcs_2_12_5" = callPackage + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring + , binary, bytestring, cmdargs, containers, cryptohash, curl + , data-ordlist, directory, fgl, filepath, FindBin, graphviz + , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network + , network-uri, old-time, parsec, process, QuickCheck, random + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar + , terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, unix, unix-compat, utf8-string, vector + , zip-archive, zlib + }: + mkDerivation { + pname = "darcs"; + version = "2.12.5"; + sha256 = "355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553"; + configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async attoparsec base base16-bytestring binary bytestring + containers cryptohash data-ordlist directory fgl filepath graphviz + hashable haskeline html HTTP mmap mtl network network-uri old-time + parsec process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix + unix-compat utf8-string vector zip-archive zlib + ]; + librarySystemDepends = [ curl ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base bytestring cmdargs containers directory filepath FindBin + HUnit mtl QuickCheck shelly split test-framework + test-framework-hunit test-framework-quickcheck2 text zip-archive + ]; + doCheck = false; + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + ''; + homepage = "http://darcs.net/"; + description = "a distributed, interactive, smart revision control system"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) curl;}; + "darcs-benchmark" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, datetime , directory, filepath, hs-gchart, html, HTTP, json, mtl, network @@ -50108,8 +50337,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.0.0"; - sha256 = "f22ba783032ad904fc797ee3ff9d015a43cf26b7670addf4d3b74f5d6f359f45"; + version = "0.1.1.0"; + sha256 = "ba0abd2e139d7ac6548cedd785edb3e4e809c1c116c3059d72590b0635166db6"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -51689,6 +51918,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dawg-ord_0_5_1_0" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers + , vector + }: + mkDerivation { + pname = "dawg-ord"; + version = "0.5.1.0"; + sha256 = "d9129acfb71ce41b6994d2c72a040319fc85af408226122d3958d5617e8922e9"; + libraryHaskellDepends = [ + base containers mtl transformers vector + ]; + testHaskellDepends = [ + base containers HUnit mtl smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/kawu/dawg-ord"; + description = "Directed acyclic word graphs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbcleaner" = callPackage ({ mkDerivation, base, hspec, postgresql-simple, text }: mkDerivation { @@ -51987,8 +52238,8 @@ self: { }: mkDerivation { pname = "dcpu16"; - version = "0.1.0.0"; - sha256 = "d3838fcd4838a668319791c4996a2af7e11f6a0496485c61389f40e376f335bc"; + version = "0.1.0.2"; + sha256 = "92de2844f087051e94be731f127b06c1cdb4ed3747b82c8ab33fc4feedcdc7fc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51996,8 +52247,8 @@ self: { ]; executableHaskellDepends = [ base filepath optparse-applicative ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/githubuser/dcpu16#readme"; - description = "Initial project template from stack"; + homepage = "https://github.com/anatolat/dcpu16#readme"; + description = "DCPU-16 Emulator & Assembler"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53109,18 +53360,6 @@ self: { }) {}; "dependent-map" = callPackage - ({ mkDerivation, base, containers, dependent-sum }: - mkDerivation { - pname = "dependent-map"; - version = "0.2.3.0"; - sha256 = "4a0b9c615dab33e9ef3b628ed88664e9d24e33fdb29b3aa5c66cb4b3fc1b2a20"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - }) {}; - - "dependent-map_0_2_4_0" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { pname = "dependent-map"; @@ -53130,7 +53369,6 @@ self: { homepage = "https://github.com/mokus0/dependent-map"; description = "Dependent finite maps (partial dependent products)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dependent-state" = callPackage @@ -54153,6 +54391,8 @@ self: { pname = "diagrams-lib"; version = "1.4.0.1"; sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6"; + revision = "1"; + editedCabalFile = "b099abcd3adb35dae8f260909ac343a82a1bf728f9d4529cac15fdae5dce5e8a"; libraryHaskellDepends = [ active adjunctions array base cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -54529,6 +54769,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dice2tex" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dice2tex"; + version = "0.1.0.1"; + sha256 = "a985961404bd7ceac10a1ea5ef0751643aecd506874c581a76a69e398479a841"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "dicom" = callPackage ({ mkDerivation, base, binary, bytestring, pretty, safe, time }: mkDerivation { @@ -54819,8 +55072,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.1.1"; - sha256 = "3c42b7b8b89369d305621a7753c245a6250deb58bc848dd3d757e06d69f842a8"; + version = "0.8.2.0"; + sha256 = "af26f266d440812d0471c67ab63f14a164517c5685e9d6808501d8cb21b26d4a"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -54894,14 +55147,15 @@ self: { "digestive-functors-heist" = callPackage ({ mkDerivation, base, blaze-builder, digestive-functors, heist - , mtl, text, xmlhtml + , map-syntax, mtl, text, xmlhtml }: mkDerivation { pname = "digestive-functors-heist"; - version = "0.8.6.2"; - sha256 = "29009a85d77d904115a3ef64659b0e56b8402c8140fd228b5194edcfb3874d5a"; + version = "0.8.7.0"; + sha256 = "e6d1cc5ee7ec7c266b00fc42eba7a0f546e6166198758368042ab05cd19fa78e"; libraryHaskellDepends = [ - base blaze-builder digestive-functors heist mtl text xmlhtml + base blaze-builder digestive-functors heist map-syntax mtl text + xmlhtml ]; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; @@ -55625,6 +55879,8 @@ self: { pname = "distributed-process-async"; version = "0.2.3"; sha256 = "d3031457c36bb3c35496031c185354417b54ce253e1878f35072d04e8161ad95"; + revision = "1"; + editedCabalFile = "56ae624c478fa2a42dd48850189ffdd1540416e820a83bbe00c54569b76af288"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-extras fingertree hashable mtl stm time @@ -56034,8 +56290,8 @@ self: { }: mkDerivation { pname = "distributed-process-zookeeper"; - version = "0.2.1.0"; - sha256 = "98e74ca698daf1434fda5ac2cb277e8849080ef897e907716a196c1348c84bcd"; + version = "0.2.2.0"; + sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928"; libraryHaskellDepends = [ base binary bytestring containers deepseq distributed-process hzk mtl network network-transport network-transport-tcp transformers @@ -56123,23 +56379,6 @@ self: { }) {}; "distributive" = callPackage - ({ mkDerivation, base, base-orphans, directory, doctest, filepath - , tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "distributive"; - version = "0.5.0.2"; - sha256 = "f884996f491fe5b275b7dda2cebdadfecea0d7788a142546e0271e9575cc1609"; - libraryHaskellDepends = [ - base base-orphans tagged transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "http://github.com/ekmett/distributive/"; - description = "Distributive functors -- Dual to Traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributive_0_5_1" = callPackage ({ mkDerivation, base, base-orphans, directory, doctest, filepath , tagged, transformers, transformers-compat }: @@ -56154,7 +56393,6 @@ self: { homepage = "http://github.com/ekmett/distributive/"; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diversity" = callPackage @@ -57063,6 +57301,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "double-extra" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, deepseq + , double-conversion, rawstring-qm, text + }: + mkDerivation { + pname = "double-extra"; + version = "0.1.0.4"; + sha256 = "f7df3804982a8acb19b774080922b7625209abf14a328b2efaa39df4f6d7b6a0"; + libraryHaskellDepends = [ + aeson base bytestring cassava deepseq double-conversion + rawstring-qm text + ]; + homepage = "https://github.com/tolysz/double-extra#readme"; + description = "Missing presentations for Double numbers (fixed, scientific etc.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "double-metaphone" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -57826,6 +58081,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dump-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, monadLib, text + }: + mkDerivation { + pname = "dump-core"; + version = "0.1.3"; + sha256 = "003fde9e29824a4dfc2523c29fefd873d4eae0c1e9a17547021aab5e738bd6c6"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc monadLib + text + ]; + description = "A plug-in for rendering GHC core"; + license = stdenv.lib.licenses.isc; + }) {}; + "dunai" = callPackage ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { @@ -58540,8 +58811,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1.1"; - sha256 = "e1fc1756f255e47db28c6c0520c43fe45ac0c1093009f378683273ebe02851c6"; + version = "0.1.2"; + sha256 = "819afc6655c4973f5ff3e65bb604cc871d2a1b17faf2a9840224e27b51a9f030"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; @@ -59165,25 +59436,6 @@ self: { }) {}; "ekg" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json - , filepath, network, snap-core, snap-server, text, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "ekg"; - version = "0.4.0.11"; - sha256 = "8cd041f6b7da4f57df1795d619f9140a071ed2adb6ed5ade1c3e899957edb603"; - libraryHaskellDepends = [ - aeson base bytestring ekg-core ekg-json filepath network snap-core - snap-server text time transformers unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg"; - description = "Remote monitoring of processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ekg_0_4_0_12" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, network, snap-core, snap-server, text, time , transformers, unordered-containers @@ -59293,21 +59545,6 @@ self: { }) {}; "ekg-json" = callPackage - ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers - }: - mkDerivation { - pname = "ekg-json"; - version = "0.1.0.3"; - sha256 = "3c97d423ac85903d0fed400845c29ccd39f1ca80666b09659a0238983b743317"; - libraryHaskellDepends = [ - aeson base ekg-core text unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg-json"; - description = "JSON encoding of ekg metrics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg-json_0_1_0_4" = callPackage ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers }: mkDerivation { @@ -59320,7 +59557,6 @@ self: { homepage = "https://github.com/tibbe/ekg-json"; description = "JSON encoding of ekg metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-log" = callPackage @@ -59615,19 +59851,20 @@ self: { }) {}; "elm-export" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , formatting, hspec, hspec-core, mtl, QuickCheck - , quickcheck-instances, text, time + ({ mkDerivation, base, bytestring, containers, Diff, directory + , formatting, hspec, hspec-core, HUnit, mtl, QuickCheck + , quickcheck-instances, text, time, wl-pprint-text }: mkDerivation { pname = "elm-export"; - version = "0.5.0.2"; - sha256 = "13d1542351031f716508fdbe51876aa1cd10791b8b901cb8abdafb23981c14c4"; + version = "0.6.0.0"; + sha256 = "ad6342e25a5f71b7eb8abbfb894802d3d72f75b05d588c76eee780d0528dc00f"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time + wl-pprint-text ]; testHaskellDepends = [ - base bytestring containers hspec hspec-core QuickCheck + base bytestring containers Diff hspec hspec-core HUnit QuickCheck quickcheck-instances text time ]; homepage = "http://github.com/krisajenkins/elm-export"; @@ -60366,6 +60603,7 @@ self: { executableHaskellDepends = [ base matrix quipper-core ]; description = "An application (and library) to convert quipper circuits into Qpmc models"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "entropy" = callPackage @@ -61710,6 +61948,7 @@ self: { homepage = "https://github.com/YoEight/eventsource-api#readme"; description = "GetEventStore store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eventsource-store-specs" = callPackage @@ -61902,8 +62141,8 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.12.1"; - sha256 = "935f55ec8ae751e67a8e25b19f70e78c613728500e998a2912e1590efe29d7f0"; + version = "0.12.2"; + sha256 = "b9ee21fee70de5b0daa317ed5e2f7f12bdc1240f6206f351fdfd60b344530a66"; libraryHaskellDepends = [ base integer-gmp memoize random ]; testHaskellDepends = [ base checkers directory doctest filepath groups QuickCheck random @@ -62057,27 +62296,6 @@ self: { }) {}; "executable-hash" = callPackage - ({ mkDerivation, base, bytestring, cryptohash, directory - , executable-path, file-embed, template-haskell - }: - mkDerivation { - pname = "executable-hash"; - version = "0.2.0.2"; - sha256 = "7285dc07aef00b71d76ef3fa9403c88e976a0517fcc3aec6e7e1ac5512007a80"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cryptohash directory executable-path file-embed - template-haskell - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/fpco/executable-hash"; - description = "Provides the SHA1 hash of the program executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "executable-hash_0_2_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, cryptohash, directory , executable-path, file-embed, filepath, template-haskell }: @@ -62100,7 +62318,6 @@ self: { homepage = "http://github.com/fpco/executable-hash"; description = "Provides the SHA1 hash of the program executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "executable-path" = callPackage @@ -63416,8 +63633,8 @@ self: { pname = "fay-builder"; version = "0.2.0.5"; sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2"; - revision = "3"; - editedCabalFile = "7e6aeeae40ee69594e435dd7e6d133fbaea764b3b06271b607cc0ae185178e89"; + revision = "4"; + editedCabalFile = "75a6193b829d2d606a20782ca37f4ee8f02baa91d8f49f989e820e51710e3d26"; libraryHaskellDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -63775,28 +63992,6 @@ self: { }) {}; "feed" = callPackage - ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework - , test-framework-hunit, time, time-locale-compat, utf8-string, xml - }: - mkDerivation { - pname = "feed"; - version = "0.3.11.1"; - sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983"; - revision = "4"; - editedCabalFile = "ecce0a16a0d695b1c8ed80af4ea59e33c767ad9c6bdac5898e7cae20bd5da8c6"; - libraryHaskellDepends = [ - base old-locale old-time time time-locale-compat utf8-string xml - ]; - testHaskellDepends = [ - base HUnit old-locale old-time test-framework test-framework-hunit - time time-locale-compat utf8-string xml - ]; - homepage = "https://github.com/bergmark/feed"; - description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "feed_0_3_12_0" = callPackage ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework , test-framework-hunit, time, time-locale-compat, utf8-string, xml }: @@ -63814,7 +64009,6 @@ self: { homepage = "https://github.com/bergmark/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -64162,8 +64356,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.11.1"; - sha256 = "4783a481db0e880ddcc7f5551e31ab0ef890b0b067017ecb1255cd198b89d6cc"; + version = "0.11.3"; + sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb"; libraryHaskellDepends = [ base either exceptions JuicyPixels mtl transformers vector ]; @@ -65342,8 +65536,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fizz-buzz"; - version = "0.1.0.1"; - sha256 = "97bca955036b0ae3d33757fdcbb44421f9cd5a49ee0ed0b6ade07f168f543d99"; + version = "0.1.0.2"; + sha256 = "b7845c186b3471b9db735e98361540890eb7c94fe8c9c4d97991a339e01d7426"; libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; @@ -65370,8 +65564,8 @@ self: { pname = "flac"; version = "0.1.1"; sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e"; - revision = "1"; - editedCabalFile = "482d7352bb284c86021b513c37837746fe8a293146c3cf0d91b91dbc4a34ae34"; + revision = "2"; + editedCabalFile = "2aa55d857d01dde6f3ae1ae7664a7f5ed94f4eb0ddeb9fd9b8a5e3c866a315d0"; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions filepath mtl text transformers vector wave @@ -65384,6 +65578,7 @@ self: { homepage = "https://github.com/mrkkrp/flac"; description = "Complete high-level binding to libFLAC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {FLAC = null;}; "flac-picture" = callPackage @@ -65394,6 +65589,8 @@ self: { pname = "flac-picture"; version = "0.1.0"; sha256 = "3c36dff9cebb44502a69e300f233e792900d051bd7eadc2c7390feb53efb3293"; + revision = "1"; + editedCabalFile = "aafff32fbe612805b32e0497ec2132c5b0e329a8a5b13ce23df865ce6954cd00"; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ base bytestring data-default-class directory flac hspec JuicyPixels @@ -65402,6 +65599,7 @@ self: { homepage = "https://github.com/mrkkrp/flac-picture"; description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flaccuraterip" = callPackage @@ -66175,8 +66373,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.2.1"; - sha256 = "86afa8df81991d9901e717107fa12fc6f3577e8fd40ef9e57d388435b6e68073"; + version = "1.2.2"; + sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb"; libraryHaskellDepends = [ base bytestring comonad containers contravariant mwc-random primitive profunctors text transformers vector @@ -66873,6 +67071,8 @@ self: { pname = "foundation"; version = "0.0.3"; sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa"; + revision = "1"; + editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -67945,6 +68145,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ftp-client" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, connection, network + , transformers + }: + mkDerivation { + pname = "ftp-client"; + version = "0.3.0.0"; + sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da"; + libraryHaskellDepends = [ + attoparsec base bytestring connection network transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mr/ftp-client"; + description = "Transfer files with FTP and FTPS"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + + "ftp-client-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, ftp-client + , ftp-clientconduit, resourcet + }: + mkDerivation { + pname = "ftp-client-conduit"; + version = "0.3.0.0"; + sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52"; + libraryHaskellDepends = [ + base bytestring conduit connection ftp-client resourcet + ]; + testHaskellDepends = [ base ftp-clientconduit ]; + homepage = "https://github.com/mr/ftp-client"; + description = "Transfer file with FTP and FTPS with Conduit"; + license = stdenv.lib.licenses.publicDomain; + broken = true; + }) {ftp-clientconduit = null;}; + "ftp-conduit" = callPackage ({ mkDerivation, base, byteorder, bytestring, conduit, MissingH , network, transformers, utf8-string @@ -68979,6 +69214,7 @@ self: { homepage = "https://github.com/nek0/gegl#readme"; description = "Haskell bindings to GEGL library"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gegl;}; "gelatin" = callPackage @@ -70012,14 +70248,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-boot_8_0_1" = callPackage + "ghc-boot_8_0_2" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.0.1"; - sha256 = "ba9bfbe6d18c0cf445f2b38ab42b649286f8b61d727dec2ba37fea648ebb28da"; + version = "8.0.2"; + sha256 = "f703203a2460f31f05af3aa82d23f314a5d7a077db0b324da238a3f1d9328460"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -70028,12 +70264,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_0_1" = callPackage + "ghc-boot-th_8_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.0.1"; - sha256 = "c2eb6746801ca289d940099b3c68113963f9eddec90b454258a1442cd993e385"; + version = "8.0.2"; + sha256 = "5d00e271f2dd83ff2c69df4d3c17ced26eaffd5a65898b2a04b0dc75f99bf8f0"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -70096,6 +70332,8 @@ self: { pname = "ghc-dump-tree"; version = "0.2.0.2"; sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3"; + revision = "2"; + editedCabalFile = "9a950ee81c799050c982191431e3df03a178288c03faa077f21bc5b136ee002e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70109,6 +70347,7 @@ self: { homepage = "https://github.com/edsko/ghc-dump-tree"; description = "Dump GHC's parsed, renamed, and type checked ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-dup" = callPackage @@ -70336,8 +70575,8 @@ self: { pname = "ghc-mod"; version = "5.6.0.0"; sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; - revision = "3"; - editedCabalFile = "d21d034e1e1df7a5b478e2fd8dad0e11e01e46ce095ea39a90acacfdd34661ea"; + revision = "4"; + editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -70674,6 +70913,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_2_2" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp + , singletons, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.2.2"; + sha256 = "2e20c00c0aec2e865d270d39921b66f94cb85610e944a6da068dda5868ef86a2"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-knownnat + ghc-typelits-natnormalise integer-gmp singletons transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit template-haskell + ]; + homepage = "http://www.clash-lang.org/"; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit @@ -70695,6 +70957,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_2_3" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.2.3"; + sha256 = "bd7828cf6c3062a785ad5c35a82d2229341acca4c2fd605c4718f6f595316133"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise singletons tasty tasty-hunit + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell @@ -70712,6 +70996,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_5_2" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5.2"; + sha256 = "b12e66e076e6f43eb1a8465e11b406518f86b955de3399ee8822880d4b794383"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc , ghc-tcplugins-extra, presburger, reflection @@ -70748,14 +71050,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_0_1" = callPackage + "ghci_8_0_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.0.1"; - sha256 = "6becea2e7f687eefda4acc9ddf90dbd90d82fd497d0d9f72f47d8f1e9614988e"; + version = "8.0.2"; + sha256 = "986d4d8e2ae1077c9b41f441bb6c509cb5d932fc13d3996a1f00481c36dde135"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot template-haskell transformers unix @@ -71067,6 +71369,7 @@ self: { homepage = "https://github.com/tdammers/ghcjs-xhr"; description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghclive" = callPackage @@ -72121,8 +72424,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.3.2.2"; - sha256 = "ce8bea4e3c75cde5296f834bb8e91300b4d3bdad95df4819d9e43b4c414f61c7"; + version = "0.3.3.0"; + sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72489,10 +72792,8 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0.1"; - sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57"; - revision = "1"; - editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d"; + version = "1.0.2"; + sha256 = "1b0811b1d26a11f564b6136fed1fc440711f9554433d25475e03d3e5dd28306c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72699,8 +73000,8 @@ self: { pname = "github"; version = "0.15.0"; sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609"; - revision = "1"; - editedCabalFile = "d56da89ceea0c330c54b4820d397e3cea2bba43978ca4dfa42bb153459d29f7d"; + revision = "2"; + editedCabalFile = "dfa08cdd826d10c2b751d80356cb956f38dddd4b7247fdb0beeefb6f98e94373"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -73233,15 +73534,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glabrous_0_2_3" = callPackage + "glabrous_0_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers }: mkDerivation { pname = "glabrous"; - version = "0.2.3"; - sha256 = "f9e1c11f1702a1710cd172c972d618dcecc62197b7b37f66aa31a2aad45e4bad"; + version = "0.3.0"; + sha256 = "3e1547d3e2ec7098e52262961bb710683ff83422793ce68b59cc9a0918831490"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -73439,8 +73740,8 @@ self: { pname = "glirc"; version = "2.20.2"; sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00"; - revision = "1"; - editedCabalFile = "4eb4ef433d48ddf947ede4423212b39ea82b665e50b17d2a0cf6ac3154cc33dd"; + revision = "2"; + editedCabalFile = "78d1b995b9b7bcb4dc012341c65b8e4d6c4893c8db7c6b66146cfe0726ca1be3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -73603,22 +73904,6 @@ self: { }) {}; "gloss" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; - version = "1.10.2.3"; - sha256 = "33d457f0b01c844abf50687a8c0d060df5c6b1177da6236ae39561491f7a7210"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - homepage = "http://gloss.ouroborus.net"; - description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss_1_10_2_5" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -73632,7 +73917,6 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -74214,6 +74498,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "goat" = callPackage + ({ mkDerivation, base, bytestring, cereal, floating-bits + , QuickCheck, safe, split + }: + mkDerivation { + pname = "goat"; + version = "1.0.0"; + sha256 = "4f1329355c52d45ccc915001dae10e563402188cb3c486491cbd8c0c73046cef"; + libraryHaskellDepends = [ + base bytestring cereal floating-bits safe split + ]; + testHaskellDepends = [ base bytestring cereal QuickCheck safe ]; + homepage = "https://github.com/lovasko/goat"; + description = "Time Series Compression"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "goatee" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, parsec , template-haskell @@ -76965,23 +77267,6 @@ self: { }) {}; "google-oauth2-jwt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; - version = "0.1.2.1"; - sha256 = "1a727b31280b53cb9db6531b8580dba8843a4beba0e866f34ff0231e7590b72b"; - libraryHaskellDepends = [ - base base64-bytestring bytestring HsOpenSSL RSA text unix-time - ]; - homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; - description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "google-oauth2-jwt_0_1_3" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time }: @@ -78036,6 +78321,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graql" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit + , process, regex-posix, scientific, text + }: + mkDerivation { + pname = "graql"; + version = "0.1.1"; + sha256 = "2173fcd327ea273c8ef30077c3e875242a6fe3b9ae19af07accc78671ec75800"; + libraryHaskellDepends = [ + aeson base containers process regex-posix scientific text + ]; + testHaskellDepends = [ base hspec markdown-unlit text ]; + homepage = "https://github.com/graknlabs/graql-haskell"; + description = "Execute Graql queries on a Grakn graph"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grasp" = callPackage ({ mkDerivation, base, clock, directory, extra, filepath, hashable , lens, megaparsec, MonadRandom, mtl, pcre-heavy, primitive @@ -78308,6 +78611,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "gross" = callPackage + ({ mkDerivation, base, lens, mtl, ncurses }: + mkDerivation { + pname = "gross"; + version = "0.1.0.0"; + sha256 = "76468df752590a960a9132da267d42d040d5fff58530ac7783642c818d95783c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ncurses ]; + executableHaskellDepends = [ base lens mtl ncurses ]; + description = "A spoof on gloss for terminal animation"; + license = stdenv.lib.licenses.mit; + }) {}; + "groundhog" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-builder, bytestring, containers, monad-control @@ -78904,6 +79221,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "gtk2hs-buildtools_0_13_2_2" = callPackage + ({ mkDerivation, alex, array, base, Cabal, containers, directory + , filepath, happy, hashtables, pretty, process, random + }: + mkDerivation { + pname = "gtk2hs-buildtools"; + version = "0.13.2.2"; + sha256 = "c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base Cabal containers directory filepath hashtables pretty + process random + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gtk2hs-cast-glade" = callPackage ({ mkDerivation, base, glade, gtk, gtk2hs-cast-glib, hint , template-haskell @@ -81626,6 +81965,7 @@ self: { homepage = "https://github.com/lukexi/halive"; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halma" = callPackage @@ -82246,6 +82586,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-authenticate_2_3_4_7" = callPackage + ({ mkDerivation, acid-state, aeson, authenticate, base + , base64-bytestring, boomerang, bytestring, containers + , data-default, email-validate, filepath, happstack-hsp + , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs + , http-conduit, http-types, ixset-typed, jmacro, jwt, lens + , mime-mail, mtl, pwstore-purehaskell, random, safecopy + , shakespeare, text, time, unordered-containers, userid, web-routes + , web-routes-boomerang, web-routes-happstack, web-routes-hsp + , web-routes-th + }: + mkDerivation { + pname = "happstack-authenticate"; + version = "2.3.4.7"; + sha256 = "6c2d83aa09fe2fb630a1aaca8b25e7e09b0a91b475f24e5dfb0c307c8f34b607"; + libraryHaskellDepends = [ + acid-state aeson authenticate base base64-bytestring boomerang + bytestring containers data-default email-validate filepath + happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro + hsx2hs http-conduit http-types ixset-typed jmacro jwt lens + mime-mail mtl pwstore-purehaskell random safecopy shakespeare text + time unordered-containers userid web-routes web-routes-boomerang + web-routes-happstack web-routes-hsp web-routes-th + ]; + homepage = "http://www.happstack.com/"; + description = "Happstack Authentication Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-clientsession" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession , happstack-server, monad-control, mtl, safecopy, transformers-base @@ -82757,8 +83127,8 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.8"; - sha256 = "4fad1eabd825ffbd1aa858a3e056f991a1f53c403e15064ef51b5fbdd300d242"; + version = "0.2.0.9"; + sha256 = "6fa5083d41a9e0b6e6d0150a9b2f6e2292af005fd9fd8efd24e1a4a72daf6bf0"; libraryHaskellDepends = [ array base containers haskell-src-meta mtl template-haskell ]; @@ -83075,8 +83445,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.0.4"; - sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4"; + version = "0.1.0.5"; + sha256 = "f0ec1be21cb5560fa575c414c691bcf48f14e6dfb8f53ae5feae013a105639fa"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -83142,10 +83512,8 @@ self: { }: mkDerivation { pname = "hascas"; - version = "1.0.0"; - sha256 = "004dba51e8cfa2b2e41fd9b51d8bdfb877a4ce19c46b412862327d567c64ccea"; - revision = "1"; - editedCabalFile = "dd3a3609ef9afd3507fc7c0a425683e2900da0b70512a5ef4342f39548c8d1a2"; + version = "1.2.0"; + sha256 = "99c670290558ffc2686040e36c8411be63e6210065621a8be6c427406731b1ff"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 mtl network safe-exceptions stm template-haskell uuid @@ -83455,6 +83823,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hashtable-benchmark" = callPackage + ({ mkDerivation, base, containers, criterion, hashtables + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "hashtable-benchmark"; + version = "0.1.1"; + sha256 = "73f338327ec8f5a30e29c5f43848617b837381c182d892a7a40a33ecd835b57f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers criterion hashtables QuickCheck + unordered-containers + ]; + homepage = "https://github.com/hongchangwu/hashtable-benchmark#readme"; + description = "Benchmark of hash table implementations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hashtables" = callPackage ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { @@ -83706,20 +84093,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_2_3" = callPackage + "haskeline_0_7_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.2.3"; - sha256 = "6d3ef986ffea93c999a7be1f8c19037351eec763c1c376e6edbd18fbba368d27"; + version = "0.7.3.0"; + sha256 = "566f625ef50877631d72ab2a8335c92c2b03a8c84a1473d915b40e69c9bb4d8a"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath terminfo transformers unix ]; - homepage = "https://github.com/judah/haskeline"; + homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -83875,24 +84262,24 @@ self: { }) {}; "haskell-compression" = callPackage - ({ mkDerivation, base, bimap, boolean-list, bytestring, containers + ({ mkDerivation, base, bimap, booleanlist, bytestring, containers }: mkDerivation { pname = "haskell-compression"; - version = "0.1.1"; - sha256 = "3504d935a6ab3f881a888da0d71a8f139769411ade8e0134a0ba296ae8741934"; + version = "0.2"; + sha256 = "4b8dea429507697df12dfeeae6e0963e1db11f7c1d153cb8d0198353cb87127c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap boolean-list bytestring containers + base bimap booleanlist bytestring containers ]; - executableHaskellDepends = [ - base bimap boolean-list bytestring containers - ]; - homepage = "codekinder.com"; - license = stdenv.lib.licenses.bsd3; + executableHaskellDepends = [ base bimap bytestring containers ]; + homepage = "http://xy30.com"; + description = "compress files"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {booleanlist = null;}; "haskell-course-preludes" = callPackage ({ mkDerivation, base, deepseq }: @@ -84747,14 +85134,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-meta_0_7_0" = callPackage + "haskell-src-meta_0_7_0_1" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans }: mkDerivation { pname = "haskell-src-meta"; - version = "0.7.0"; - sha256 = "2a6735cc3379171a722f2a1df15dc67f216a404db4396b05f5e06ac82ab89856"; + version = "0.7.0.1"; + sha256 = "428e5a1c90c645d4c9cb54f984721b1b21e494677d1d7d8e7206f6c0e9286a3a"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -84811,8 +85198,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.4.1.1"; - sha256 = "857c0f5b57d129aa49fd8b5375703638c4cd1e5cd4c85d5160d7ad13d308f88e"; + version = "0.4.1.3"; + sha256 = "f456e74ada1c5ce4386a2b0e6a844c893b75dcdaaccac4dabc49977da8ae3405"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -84883,8 +85270,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.4.1.1"; - sha256 = "d01fe6e236fb57e7d79b35ada30e8aa0ff56f626444f25bd907bb8e785de3006"; + version = "0.4.1.3"; + sha256 = "590147059de94fc0224e86fd1cba144b32737dd9e9e3efa91d6389e99265642e"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -84903,8 +85290,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.4.1.1"; - sha256 = "7c843bcd923987679d17359b2881173af72b5beea8b66db241058c69d2a1530f"; + version = "0.4.1.3"; + sha256 = "e37721ca8bcbdc0e5eb2977a956b1e97c858a13f7d8c236c3a04e948e4ebe699"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84926,23 +85313,23 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl - , network, references, split, tasty, tasty-hunit + , network, process, references, split, tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.4.1.1"; - sha256 = "c1334b480b4c7ed5fb918ad887ee50a4eaa610b8c626ae00154eecdf2bb11dc1"; + version = "0.4.1.3"; + sha256 = "0a10d80c3ed2bdc65010ef73b7d090544a086e4eba09b613f3045b23a141814a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor - mtl network references split + mtl network process references split ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network tasty - tasty-hunit + aeson base bytestring directory filepath HUnit network process + tasty tasty-hunit ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Background process for Haskell-tools refactor that editors can connect to"; @@ -84957,15 +85344,19 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.4.1.1"; - sha256 = "092da28a3924ec7855f910123cc6d3adaf02c8aea28c09d370ca40e4b66df02c"; + version = "0.4.1.3"; + sha256 = "2e89fee8acdd91b92b6ce9f079e1f3c445c19f37ac0092310ed20ba51a8a677e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor references ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-demo" = callPackage @@ -84978,8 +85369,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.4.1.1"; - sha256 = "97e23bce841240eb60f9d959922e5e262dd2d5351954ac1b183aa96910fe0b2b"; + version = "0.4.1.3"; + sha256 = "d8ab6534f3f04cd2bfb3c636d88f008501b23cee15171a435f8aea464398ed20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85005,8 +85396,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.4.1.1"; - sha256 = "2d0b5df63f5709359ad5bbc7c67475bf511cc732f1ad682c71506b196519eae8"; + version = "0.4.1.3"; + sha256 = "77fc5cab4b93e3e58022a23282776a667d0e90f357341f41ff72771919530490"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -85020,14 +85411,13 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, mtl, old-time, polyparse, references - , split, tasty, tasty-hunit, template-haskell, time, transformers - , uniplate + , haskell-tools-rewrite, mtl, references, split, tasty, tasty-hunit + , template-haskell, time, transformers, uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.4.1.1"; - sha256 = "a6f1cf8f908f10424919ded1077abe4f15c423548830c4c1a0c117f8a8d8e894"; + version = "0.4.1.3"; + sha256 = "d732fb853cf0e066cec00f126030edd2e43abbde423affc3c8f2ceacab18cb82"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -85037,9 +85427,8 @@ self: { testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl old-time - polyparse references split tasty tasty-hunit template-haskell time - transformers uniplate + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split tasty tasty-hunit template-haskell time transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -85054,8 +85443,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.4.1.1"; - sha256 = "17b2523cbf0b13fc83a28e3b2a55dc7a9118c26ee87c180ec3db46f6571668c8"; + version = "0.4.1.3"; + sha256 = "a92dafd6fd3511517edfc6517ba040130caaf0d24608270af69ae75bd84ff59b"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -85775,15 +86164,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskintex_0_7_0_0" = callPackage + "haskintex_0_7_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text , transformers }: mkDerivation { pname = "haskintex"; - version = "0.7.0.0"; - sha256 = "99523779fa18e2a6565b9603ae5c8c6a079dbaa2c315188a5ac05ebbd384a591"; + version = "0.7.0.1"; + sha256 = "7647f19964cce0be886ff01a4c53f902b4dd995d005090724a57bd4cc6dae31b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86410,8 +86799,8 @@ self: { }: mkDerivation { pname = "hasql-migration"; - version = "0.1.1"; - sha256 = "0cb83fffe9ebda4632fd426a97506c9c5f803c42a01d0987e7752240aceff595"; + version = "0.1.3"; + sha256 = "2d49e3b7a5ed775150abf2164795b10d087d2e1c714b0a8320f0c0094df068b3"; libraryHaskellDepends = [ base base64-bytestring bytestring contravariant cryptohash data-default-class directory hasql hasql-transaction text time @@ -86422,6 +86811,7 @@ self: { homepage = "https://github.com/tvh/hasql-migration"; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-optparse-applicative" = callPackage @@ -86520,8 +86910,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.4.5.1"; - sha256 = "79b096fa3425ff53bcb5417fd67cdcf4316c00a23c092b02cec173e5a8c99879"; + version = "0.5"; + sha256 = "1cd433ed77a59beac628d7ebba945aafc62c55e2f092f682f60ca89a33e0b341"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -86765,6 +87155,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hatex-guide_1_3_1_6" = callPackage + ({ mkDerivation, base, blaze-html, directory, filepath, HaTeX + , parsec, text, time, transformers + }: + mkDerivation { + pname = "hatex-guide"; + version = "1.3.1.6"; + sha256 = "7ad7cf5f94d5e684891cdbd6f74d1bb8843564390929d0802fd359a05f5da56d"; + libraryHaskellDepends = [ + base blaze-html directory filepath HaTeX parsec text time + transformers + ]; + description = "HaTeX User's Guide"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hath" = callPackage ({ mkDerivation, base, cmdargs, MissingH, process, split, tasty , tasty-hunit, tasty-quickcheck @@ -86888,20 +87295,20 @@ self: { "haxl" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-prim, hashable - , HUnit, pretty, test-framework, test-framework-hunit, text, time - , transformers, unordered-containers, vector + , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty + , test-framework, test-framework-hunit, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "haxl"; - version = "0.4.0.2"; - sha256 = "272b50d432da234803d7a590530ae87266de1f3f75b6d98bdbc53262183fd634"; + version = "0.5.0.0"; + sha256 = "dcc94089593a159b20e6f29eeeb7dd8caec0e0e8abcee8533321f2e9a96dd1e8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring containers deepseq directory - exceptions filepath ghc-prim hashable HUnit pretty text time - transformers unordered-containers vector + aeson base binary bytestring containers deepseq exceptions filepath + ghc-prim hashable HUnit pretty text time transformers + unordered-containers vector ]; executableHaskellDepends = [ base hashable time ]; testHaskellDepends = [ @@ -86920,10 +87327,8 @@ self: { }: mkDerivation { pname = "haxl-amazonka"; - version = "0.1.0.0"; - sha256 = "7ca933cec8cf15d41384a8f5135713e69da7cd41c9421638afa0980b1c2768ec"; - revision = "1"; - editedCabalFile = "360466927f82110c63cbd3f98da74cfb2e7222ba2828040e4daabcdc8ffee7df"; + version = "0.1.1"; + sha256 = "3cdf3ee6bd46ee461e4ae640d300533229c1d4f9ab0489f613a1ec387fa270c6"; libraryHaskellDepends = [ amazonka amazonka-core async base conduit hashable haxl transformers @@ -87681,26 +88086,6 @@ self: { }) {}; "hdevtools" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc - , ghc-boot, ghc-paths, network, process, syb, time, transformers - , unix - }: - mkDerivation { - pname = "hdevtools"; - version = "0.1.4.1"; - sha256 = "3e95943fbd6986800e00c1e49ef97deb83b56a37cc8ffafc00f6192510f8596a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths - network process syb time transformers unix - ]; - homepage = "https://github.com/hdevtools/hdevtools/"; - description = "Persistent GHC powered background server for FAST haskell development tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hdevtools_0_1_5_0" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc , ghc-boot, ghc-paths, network, process, syb, time, transformers , unix @@ -87718,7 +88103,6 @@ self: { homepage = "https://github.com/hdevtools/hdevtools/"; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdf" = callPackage @@ -89611,24 +89995,25 @@ self: { "hgeometry" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, containers - , data-clist, directory, doctest, fixed-vector, Frames, hexpat - , hspec, lens, linear, mtl, optparse-applicative, parsec, random - , semigroupoids, semigroups, singletons, template-haskell, text - , time, vector, vinyl + , contravariant, data-clist, deepseq, directory, doctest + , fixed-vector, Frames, hexpat, hspec, lens, linear, mtl + , optparse-applicative, parsec, QuickCheck, random, semigroupoids + , semigroups, singletons, template-haskell, text, time, vector + , vinyl }: mkDerivation { pname = "hgeometry"; - version = "0.5.0.0"; - sha256 = "ff38930b3416a9c3edf4576c653b734786a3998c52201d22035e1210eb9164e6"; + version = "0.6.0.0"; + sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de"; libraryHaskellDepends = [ - base bifunctors bytestring containers data-clist directory - fixed-vector Frames hexpat lens linear mtl optparse-applicative - parsec random semigroupoids semigroups singletons template-haskell - text time vector vinyl + base bifunctors bytestring containers contravariant data-clist + deepseq directory fixed-vector Frames hexpat lens linear mtl + optparse-applicative parsec random semigroupoids semigroups + singletons template-haskell text time vector vinyl ]; testHaskellDepends = [ array base bytestring containers data-clist doctest Frames hspec - lens linear random semigroups vector vinyl + lens linear QuickCheck random semigroups vector vinyl ]; homepage = "https://fstaals.net/software/hgeometry"; description = "Geometric Algorithms, Data structures, and Data types"; @@ -90545,15 +90930,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hip_1_3_0_0" = callPackage + "hip_1_4_0_1" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour , deepseq, directory, filepath, hspec, JuicyPixels, netpbm , primitive, process, QuickCheck, repa, temporary, vector }: mkDerivation { pname = "hip"; - version = "1.3.0.0"; - sha256 = "ee4e288bcb2ab1937d3eaa5bcf8017bff07debc8aeda3e768fe542923696b9bf"; + version = "1.4.0.1"; + sha256 = "960a4f964e5a7e82e5948b05da5a0b17122b50afabea86f451475b0c58a9a4c0"; libraryHaskellDepends = [ base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process repa temporary vector @@ -91024,14 +91409,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonpointer_1_1_0_0" = callPackage + "hjsonpointer_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: mkDerivation { pname = "hjsonpointer"; - version = "1.1.0.0"; - sha256 = "af2ea643f97d8ed1aca85651b8b65dbabc4967753f0024255baa36d410177dfa"; + version = "1.1.0.1"; + sha256 = "ebdd6c5528da76fd59871ca14903576e2b5ca8a1327ec952ae0957ed6b37c2ed"; libraryHaskellDepends = [ aeson base hashable QuickCheck semigroups text unordered-containers vector @@ -91073,7 +91458,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonschema_1_3_0_0" = callPackage + "hjsonschema_1_5_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -91082,8 +91467,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.3.0.0"; - sha256 = "ad54c4ee176376ef2fb7a92b5d6f35e70900fbc032000438fc37d3bdd7df819b"; + version = "1.5.0.0"; + sha256 = "a8295fff702386bc03777c0a01455e4f13539795153a60b5b3f5bb24d188ff95"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -91306,8 +91691,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.1.2"; - sha256 = "2a224047975e11f7c443c21a8f67bd0b58a058de370a9103ae020d3968450e17"; + version = "1.1.3"; + sha256 = "ee0a1d448a761f471a777f7e7b66af11bd5955df3e5823970db5bf4602a8b350"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91322,7 +91707,7 @@ self: { ]; testHaskellDepends = [ base free hledger-lib hspec megaparsec QuickCheck text text-format - time transformers vector + text-zipper time transformers vector ]; homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; description = "A terminal UI as drop-in replacement for hledger add"; @@ -92145,19 +92530,6 @@ self: { }) {inherit (pkgs) ncurses;}; "hmpfr" = callPackage - ({ mkDerivation, base, integer-gmp, mpfr }: - mkDerivation { - pname = "hmpfr"; - version = "0.4.2"; - sha256 = "7b01d747db796fc0ae908872bf9105b773ea8b1d2a5957ea353e22e003b03961"; - libraryHaskellDepends = [ base integer-gmp ]; - librarySystemDepends = [ mpfr ]; - homepage = "https://github.com/michalkonecny/hmpfr"; - description = "Haskell binding to the MPFR library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mpfr;}; - - "hmpfr_0_4_2_1" = callPackage ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; @@ -92168,7 +92540,6 @@ self: { homepage = "https://github.com/michalkonecny/hmpfr"; description = "Haskell binding to the MPFR library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mpfr;}; "hmt" = callPackage @@ -93085,8 +93456,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.8"; - sha256 = "a5096f5a5786a654a7fd7eb8b019899056c70f51c3fe207df67ecd1c83400dd5"; + version = "5.0.9"; + sha256 = "93f584c5f7fc6a57ee50803ae8df5e6c41051a3177044b273cb7fbcd39d11874"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93802,7 +94173,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack" = callPackage + "hpack_0_15_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers , deepseq, directory, filepath, Glob, hspec, interpolate, mockery , QuickCheck, temporary, text, unordered-containers, yaml @@ -93829,6 +94200,37 @@ self: { homepage = "https://github.com/sol/hpack#readme"; description = "An alternative format for Haskell packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hpack" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , containers, deepseq, directory, filepath, Glob, hspec + , interpolate, mockery, QuickCheck, temporary, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.16.0"; + sha256 = "2ec0d00aaaddfc18bc3c55b6455f7697524578dd9d0e3ea32849067293f167b9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers deepseq + directory filepath Glob hspec interpolate mockery QuickCheck + temporary text unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; }) {}; "hpack-convert" = callPackage @@ -94050,15 +94452,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc-coveralls_1_0_7" = callPackage + "hpc-coveralls_1_0_8" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process , pureMD5, regex-posix, retry, safe, split, transformers }: mkDerivation { pname = "hpc-coveralls"; - version = "1.0.7"; - sha256 = "1e3ca630dd142ffa474268e8e7cc95c4d15ad7521affaec0ac28e3cd53452584"; + version = "1.0.8"; + sha256 = "431db6ee058bf459c3e433c2d9ad89f1fcb344590745c3f62d0b744fc7d288b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94156,6 +94558,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpio_0_8_0_5" = callPackage + ({ mkDerivation, async, base, base-compat, bytestring, containers + , directory, doctest, exceptions, filepath, hlint, hspec, mtl + , mtl-compat, optparse-applicative, QuickCheck, text, transformers + , transformers-compat, unix, unix-bytestring + }: + mkDerivation { + pname = "hpio"; + version = "0.8.0.5"; + sha256 = "7493096673b13301ebdcdbc8b5076b1af0422b6650418b9510d3536a72edcf0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat bytestring containers directory exceptions + filepath mtl mtl-compat QuickCheck text transformers + transformers-compat unix unix-bytestring + ]; + executableHaskellDepends = [ + async base base-compat exceptions mtl mtl-compat + optparse-applicative transformers transformers-compat + ]; + testHaskellDepends = [ + async base base-compat bytestring containers directory doctest + exceptions filepath hlint hspec mtl mtl-compat QuickCheck text + transformers transformers-compat unix unix-bytestring + ]; + homepage = "https://github.com/dhess/hpio"; + description = "Monads for GPIO in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hplayground" = callPackage ({ mkDerivation, base, containers, data-default, haste-compiler , haste-perch, monads-tf, transformers @@ -94450,6 +94884,8 @@ self: { pname = "hquantlib"; version = "0.0.3.3"; sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28"; + revision = "1"; + editedCabalFile = "64f94ba75cb01860e3a31eb2ff872e79ec18dc773545ac487c9404f37b500878"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95325,12 +95761,12 @@ self: { ({ mkDerivation, attoparsec, base, text, vector }: mkDerivation { pname = "hsbc"; - version = "0.1.0.3"; - sha256 = "20795b5c41fee21afa91c9d5ae4675a8954898f54e7e3a23222d3ebddbe1369a"; + version = "0.1.1.0"; + sha256 = "812c30f8901fb82b50b6e17a5d219687fecb00bb65938b2af0610965c28dc4b1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base text vector ]; - description = "Command Line Calculator"; + description = "A command line calculator"; license = stdenv.lib.licenses.mit; }) {}; @@ -97672,6 +98108,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hspkcs11" = callPackage + ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes + , crypto-api, RSA, testpack, unix, utf8-string + }: + mkDerivation { + pname = "hspkcs11"; + version = "0.2"; + sha256 = "c66b9527f152d5ed29d5de18883905863a3b87fa177514ad0728cb56ae172f98"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring crypto-api RSA unix utf8-string + ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix + utf8-string + ]; + homepage = "https://github.com/denisenkom/hspkcs11"; + description = "Wrapper for PKCS #11 interface"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspr-sh" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -98462,6 +98922,8 @@ self: { pname = "htaglib"; version = "1.0.4"; sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; + revision = "1"; + editedCabalFile = "beb694fc3cccb59cf1f9e3a8568325673cc9d7733c2118681eeb9c9a2bfc127c"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; @@ -98913,18 +99375,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, doctest - , filepath, hashable, hspec, HUnit, QuickCheck + "http-api-data_0_3_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , doctest, filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat , unordered-containers, uri-bytestring, uuid, uuid-types }: mkDerivation { pname = "http-api-data"; - version = "0.3.3"; - sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449"; - revision = "1"; - editedCabalFile = "1b9b0887231d162187782afe3fa8e5483b896fafd8772bc22203027ae87bc48c"; + version = "0.3.4"; + sha256 = "aaf5faa89d51e93e4d238fd43c5ad12bf798b948bd13b9304d7104ff05166bc3"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat unordered-containers uri-bytestring uuid-types @@ -99165,15 +99626,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_3" = callPackage + "http-client-tls_0_3_3_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , cryptonite, data-default-class, exceptions, hspec, http-client , http-types, memory, network, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.3"; - sha256 = "ec1c676989aa7a53aa414d4bf2613573a8766dcf81db826365bdf20ce981a064"; + version = "0.3.3.1"; + sha256 = "56317378785688a129fdc7abdf5d721fe15e46178f89f457878aa3acd1ac7d12"; libraryHaskellDepends = [ base bytestring case-insensitive connection cryptonite data-default-class exceptions http-client http-types memory network @@ -104358,6 +104819,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; + "inline-r_0_9_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, c2hs, containers + , data-default-class, deepseq, directory, exceptions, filepath + , ieee754, mtl, pretty, primitive, process, quickcheck-assertions + , R, reflection, setenv, silently, singletons, strict, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, th-lift + , th-orphans, transformers, unix, vector + }: + mkDerivation { + pname = "inline-r"; + version = "0.9.0.1"; + sha256 = "e95ba2d92f514a102675365e74c87442a2620fad54d3e1ecd15cf1a7253ec2af"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default-class deepseq + exceptions mtl pretty primitive process reflection setenv + singletons template-haskell text th-lift th-orphans transformers + unix vector + ]; + libraryPkgconfigDepends = [ R ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring directory filepath ieee754 mtl process + quickcheck-assertions silently singletons strict tasty + tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck + template-haskell temporary text unix vector + ]; + homepage = "https://tweag.github.io/HaskellR"; + description = "Seamlessly call R from Haskell and vice versa. No FFI required."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) R;}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -104595,8 +105089,8 @@ self: { ({ mkDerivation, array, base, containers, music-diatonic }: mkDerivation { pname = "instrument-chord"; - version = "0.1.0.9"; - sha256 = "cb0a629a88db8f0baaad638d2a9c61cb4e00d112f93a866adf7e5d5c434c073f"; + version = "0.1.0.10"; + sha256 = "d6094aaef5498a377ef3efa8b4d5acf3c3457d9d7ddad161fe86288f729777ad"; libraryHaskellDepends = [ array base containers music-diatonic ]; homepage = "https://github.com/xpika/chord"; description = "Render Instrument Chords"; @@ -104654,6 +105148,7 @@ self: { homepage = "https://github.com/phadej/integer-logarithms"; description = "Integer logarithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -105030,21 +105525,28 @@ self: { "intro" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, mtl, safe, string-conversions - , tagged, text, transformers, unordered-containers, writer-cps-mtl + , deepseq, dlist, extra, hashable, lens, mtl, safe + , string-conversions, tagged, text, transformers + , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.0.2.2"; - sha256 = "9dc34d967b510b6022f55a4a653a13fcf36513ba753d5b3f8a156d88060e5611"; + version = "0.1.0.3"; + sha256 = "ad0f8df58a00d0e4c905e73e5c7f97efc9efa495bd8ebc77ecd3d104653e183d"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra hashable mtl safe string-conversions tagged text transformers unordered-containers writer-cps-mtl ]; + testHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable lens mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; homepage = "https://github.com/minad/intro#readme"; - description = "Total Prelude with Text and Monad transformers"; + description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -105053,12 +105555,15 @@ self: { pname = "intro-prelude"; version = "0.1.0.0"; sha256 = "602df3463f556cfff5b3784b7b49f0548768f11e7651175fae1028f4565faaba"; + revision = "1"; + editedCabalFile = "a6ffadd4b02b26ea9170eae2f37ee3f5af32cb128a3c1d1099b34b86daec5de6"; libraryHaskellDepends = [ intro ]; testHaskellDepends = [ intro ]; doHaddock = false; homepage = "https://github.com/minad/intro-prelude#readme"; description = "Intro reexported as Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "introduction" = callPackage @@ -105313,6 +105818,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams_1_3_6_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.3.6.0"; + sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -105486,20 +106018,6 @@ self: { }) {}; "ip6addr" = callPackage - ({ mkDerivation, base, cmdargs, IPv6Addr, text }: - mkDerivation { - pname = "ip6addr"; - version = "0.5.1.4"; - sha256 = "fe5f93753026cc82123cbf626473d9353c94d8f681e90771b63dfebdd2f1f2f8"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base cmdargs IPv6Addr text ]; - homepage = "https://github.com/MichelBoucey/ip6addr"; - description = "Commandline tool to generate IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ip6addr_0_5_2" = callPackage ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; @@ -105513,7 +106031,6 @@ self: { homepage = "https://github.com/MichelBoucey/ip6addr"; description = "Commandline tool to generate IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ipatch" = callPackage @@ -105741,24 +106258,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.1.1"; - sha256 = "ae575fcb8f8b2e1450387cad47fbae00d4f48f16238e656867678fd344ead51b"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_2_0" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -105775,7 +106274,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -105786,6 +106284,8 @@ self: { pname = "irc-core"; version = "2.2.0.1"; sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a"; + revision = "1"; + editedCabalFile = "fd862f303735a1a3c2f7913d5f6834a2711c20aacdabb98515504b8a4de986a6"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -106891,23 +107391,6 @@ self: { }) {}; "jailbreak-cabal" = callPackage - ({ mkDerivation, base, Cabal }: - mkDerivation { - pname = "jailbreak-cabal"; - version = "1.3.1"; - sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235"; - revision = "1"; - editedCabalFile = "ad923093f40ae8a7b7faa64a4e65a8545057987e5efe8baafec455fbcc85a52c"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base Cabal ]; - homepage = "http://github.com/peti/jailbreak-cabal"; - description = "Strip version restrictions from build dependencies in Cabal files"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "jailbreak-cabal_1_3_2" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; @@ -106919,7 +107402,6 @@ self: { homepage = "https://github.com/peti/jailbreak-cabal#readme"; description = "Strip version restrictions from build dependencies in Cabal files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -107489,28 +107971,6 @@ self: { }) {}; "jose-jwt" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , cryptonite, doctest, either, hspec, HUnit, memory, mtl - , QuickCheck, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "jose-jwt"; - version = "0.7.3"; - sha256 = "b405c3c35936fe5a44e44416e4689207d94eff808b10b9bae60840c1ff11b9f4"; - libraryHaskellDepends = [ - aeson base bytestring cereal containers cryptonite either memory - mtl text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector - ]; - homepage = "http://github.com/tekul/jose-jwt"; - description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jose-jwt_0_7_4" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, doctest, either, hspec, HUnit, memory, mtl , QuickCheck, text, time, unordered-containers, vector @@ -107530,7 +107990,6 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -107665,8 +108124,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.8.2.1"; - sha256 = "01cf836ba8aa03d4d2cba539156ac0051c651fc7ec77b53eb20a41b3b445a606"; + version = "0.8.2.2"; + sha256 = "d9444c5ec1ef4abe74410beddf8a892f97d98d836501dd05169c962a3e108353"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix @@ -107684,8 +108143,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkitgtk"; - version = "0.8.2.1"; - sha256 = "e4cfcdf07d34f5b8fb00c747097830c9338e9f0c43c9a69bad10511e72ff2132"; + version = "0.8.2.2"; + sha256 = "ef64f87f898566ff786ef6632800f0c0700b78137e65250e313c67683bb3d457"; libraryHaskellDepends = [ aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore gi-webkit haskell-gi-base jsaddle text unix @@ -108163,8 +108622,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.2.4.0"; - sha256 = "9f65be9991b073441332023cdfdf232e8455a530fb2fe922af2932e39436cee7"; + version = "0.2.5.0"; + sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c"; libraryHaskellDepends = [ aeson base bytestring json-rpc-server mtl text unordered-containers vector vector-algorithms @@ -108207,8 +108666,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.2.5.0"; - sha256 = "049c5248847b0b4da9b1cf34c36dbbf9f69fb4190228820cebf642f58204f850"; + version = "0.2.6.0"; + sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5"; libraryHaskellDepends = [ aeson base bytestring deepseq mtl text unordered-containers vector ]; @@ -108715,6 +109174,7 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jwt" = callPackage @@ -109135,8 +109595,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.3.1.3"; - sha256 = "8a733a9888157781c60ec3b223bf0256839fb923e41473f3118289ab175413fa"; + version = "0.3.1.4"; + sha256 = "04778447b9446aaad4206f4acc1c7d19322f13f467418461ad4a5fec981b8493"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale @@ -109164,8 +109624,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.1"; - sha256 = "92ad73f911363b879e7d8ba4b4249469ca7b6807f0469ca5648e64e38d5720d6"; + version = "0.3.0.2"; + sha256 = "bc23e4565f2bd6627b456c210e2b74e333e743da46354be90062d1c9ed0039ed"; libraryHaskellDepends = [ aeson async base bloodhound enclosed-exceptions exceptions http-client http-types katip retry scientific stm stm-chans text @@ -109316,6 +109776,26 @@ self: { license = "GPL"; }) {}; + "kcd" = callPackage + ({ mkDerivation, base, conduit, conduit-parse, exceptions + , kcd-parser, lens, resourcet, tasty, tasty-hunit, text + , xml-conduit, xml-types + }: + mkDerivation { + pname = "kcd"; + version = "0.2.0.0"; + sha256 = "5d69a5acf138e90f2993fdb5c5b1e3802d7d153b82a2b51b5df16f8ba48835a3"; + libraryHaskellDepends = [ + base conduit conduit-parse exceptions lens resourcet text + xml-conduit xml-types + ]; + testHaskellDepends = [ base kcd-parser tasty tasty-hunit ]; + homepage = "https://github.com/marcelbuesing/kcd"; + description = "Kayak .kcd parsing library."; + license = stdenv.lib.licenses.mit; + broken = true; + }) {kcd-parser = null;}; + "kd-tree" = callPackage ({ mkDerivation, base, lens, linear, vector, vector-algorithms }: mkDerivation { @@ -110338,8 +110818,8 @@ self: { }: mkDerivation { pname = "krapsh"; - version = "0.1.6.2"; - sha256 = "081bebfed17c6bd548c0a3ef69523bad78eb0aa11e17d5ceb0de7baebc24cc9b"; + version = "0.1.9.0"; + sha256 = "fc8466f7c7e1b06d5873f476d2542f1a6449f943c801fb64b78b8c67edb6aaf0"; libraryHaskellDepends = [ aeson aeson-pretty base base16-bytestring binary bytestring containers cryptohash-sha256 deepseq exceptions formatting hashable @@ -112061,7 +112541,7 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_4" = callPackage + "language-puppet_1_3_4_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -112075,8 +112555,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.4"; - sha256 = "6944b5f03001c07d3b8208db6125594af6ebd101f7025ef45bb01cee071018bc"; + version = "1.3.4.1"; + sha256 = "41cfb18f96af7d30f4477c78b559d78b3bfa3fa385c1a06dd9177f221f0cce71"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112827,8 +113307,8 @@ self: { }: mkDerivation { pname = "ldapply"; - version = "0.1.0"; - sha256 = "5c99e6f200c58aeb897a3a8f2e283ad2caba73c6f7eba919102912715891d04b"; + version = "0.2.0"; + sha256 = "485058de9f3b22897325a71fad13613db3829c84ceffe625872dcf348558f761"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112837,6 +113317,7 @@ self: { ]; description = "LDIF idempotent apply tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ldif" = callPackage @@ -114473,6 +114954,8 @@ self: { pname = "libsystemd-journal"; version = "1.4.1"; sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b"; + revision = "1"; + editedCabalFile = "5c775e26f3173d812a4080ea94b13d7cc25a350f59a800e3d403a05c04a9933c"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe text transformers uniplate unix-bytestring unordered-containers uuid vector @@ -114688,6 +115171,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_9_1" = callPackage + ({ mkDerivation, async, base, constraints, HUnit, lifted-base + , monad-control, mtl, tasty, tasty-hunit, tasty-th + , transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.9.1"; + sha256 = "0f483e83079226f404d13c445a94c01dbfb5250159328016f023c900e9f3930d"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty tasty-hunit + tasty-th + ]; + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, HUnit, monad-control, test-framework , test-framework-hunit, transformers, transformers-base @@ -114945,7 +115450,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "line_2_1_0_2" = callPackage + "line_2_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -114953,8 +115458,8 @@ self: { }: mkDerivation { pname = "line"; - version = "2.1.0.2"; - sha256 = "456d5ffaec68338fc5892371445e0ff8fa768a68008107f0de22aa0fb962a813"; + version = "2.2.0"; + sha256 = "ab22bb9cccc8aafaa61a1a42e8c9b65bcd3995e269949a5e2df8ebd0677697a8"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 http-conduit http-types scotty text time transformers wai @@ -114974,8 +115479,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "line-break"; - version = "0.1.0.0"; - sha256 = "2430db2915ce1f910a3053a2c342d5f15d3862262ca3c54cb49b048bca5c8507"; + version = "0.1.0.1"; + sha256 = "16a447a8f57319ff868d5c37c83150d38af607f2c085674a717d954cf77ecf5d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -115705,6 +116210,8 @@ self: { pname = "liquidhaskell"; version = "0.6.0.0"; sha256 = "4b5d6fc321c7b92b80b84bda67fc34e3f37f44d23dd60828ba9d9e3d7d645696"; + revision = "1"; + editedCabalFile = "3de51855d7c0c9dd89e345a9a27ff151baec1140b9e464ae91604cb5a885f4c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116968,6 +117475,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-warper" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring + , data-default, directory, dlist, errors, exceptions, extra + , filepath, formatting, hashable, hslogger, lens, monad-control + , mtl, safecopy, text, text-format, time, transformers + , transformers-base, unordered-containers, yaml + }: + mkDerivation { + pname = "log-warper"; + version = "0.2.3"; + sha256 = "217976f8e82b2efae445ad8316a654b250f8e4750a1e0b9a31b4e8d46b22aa84"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring data-default directory dlist + errors exceptions extra filepath formatting hashable hslogger lens + monad-control mtl safecopy text text-format time transformers + transformers-base unordered-containers yaml + ]; + executableHaskellDepends = [ base exceptions hslogger text ]; + homepage = "https://github.com/serokell/log-warper"; + description = "Flexible, configurable, monadic and pretty logging"; + license = stdenv.lib.licenses.mit; + }) {}; + "log2json" = callPackage ({ mkDerivation, base, containers, json, parsec }: mkDerivation { @@ -118401,8 +118933,8 @@ self: { }: mkDerivation { pname = "mDNSResponder-client"; - version = "1.0.1"; - sha256 = "205820b45d91f0459fa3a810bfdb5691249d3275e95abf9d75aec69e2285e1c8"; + version = "1.0.3"; + sha256 = "e222726559744e95809a307605c1a4af0b096adc36f4cdb6eb88f995189b264f"; libraryHaskellDepends = [ base bytestring ctrie data-endian network network-msg transformers ]; @@ -118410,6 +118942,7 @@ self: { homepage = "https://github.com/obsidiansystems/mDNSResponder-client"; description = "Library for talking to the mDNSResponder daemon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maam" = callPackage @@ -119378,30 +119911,6 @@ self: { }) {}; "mandrill" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers - }: - mkDerivation { - pname = "mandrill"; - version = "0.5.2.3"; - sha256 = "fe53d80b0c082119e58ff78a8b89084b182e7a82f685d6dfc57d6154b1420a27"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mandrill_0_5_3_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck @@ -119423,7 +119932,6 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mandulia" = callPackage @@ -119887,22 +120395,26 @@ self: { "marvin" = callPackage ({ mkDerivation, aeson, async, base, bytestring, configurator - , directory, filepath, hashable, lens, lifted-async, lifted-base - , marvin-interpolate, monad-logger, mono-traversable, mtl, mustache - , network-uri, optparse-applicative, random, stm, text, text-icu - , unordered-containers, vector, websockets, wreq, wuss + , directory, filepath, hashable, haskeline, lens, lifted-async + , lifted-base, marvin-interpolate, monad-control, monad-logger + , monad-loops, mono-traversable, mtl, mustache, network-uri + , optparse-applicative, random, stm, text, text-icu, time + , transformers-base, unordered-containers, vector, wai, warp + , websockets, wreq, wuss }: mkDerivation { pname = "marvin"; - version = "0.0.5"; - sha256 = "bb2de5f531e8f670476af97795f4e13dd06335fedf212e196787e635c97a217d"; + version = "0.0.9"; + sha256 = "10c98f4282208ec6c99ac4530dd8e4127b5e6635b1d6df9d250432e0eff01dfa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring configurator hashable lens lifted-async - lifted-base marvin-interpolate monad-logger mono-traversable mtl - network-uri optparse-applicative random stm text text-icu - unordered-containers vector websockets wreq wuss + aeson async base bytestring configurator hashable haskeline lens + lifted-async lifted-base marvin-interpolate monad-control + monad-logger monad-loops mono-traversable mtl network-uri + optparse-applicative random stm text text-icu time + transformers-base unordered-containers vector wai warp websockets + wreq wuss ]; executableHaskellDepends = [ aeson base bytestring configurator directory filepath @@ -121061,17 +121573,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14" = callPackage - ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim - , tasty, tasty-hunit, tasty-quickcheck + "memory_0_14_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14"; - sha256 = "ca0248c9a889906a5a8fc95ce3c549b27abc3edb4d85d03893aef56934148e1d"; - libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim - ]; + version = "0.14.1"; + sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; @@ -121541,8 +122051,8 @@ self: { }: mkDerivation { pname = "microlens-aeson"; - version = "2.1.1.1"; - sha256 = "301011a83092af23039a953730551af799af30e81fec9c0c31885fc40cd0ca98"; + version = "2.1.1.2"; + sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79"; libraryHaskellDepends = [ aeson attoparsec base bytestring microlens scientific text unordered-containers vector @@ -121654,21 +122164,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell }: + "microlens-platform_0_3_7_1" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: mkDerivation { - pname = "microlens-th"; - version = "0.4.1.0"; - sha256 = "c62afe3fbac955771f4b000181e0c237ab61105a26a76e45c4958b37b7155baa"; + pname = "microlens-platform"; + version = "0.3.7.1"; + sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493"; libraryHaskellDepends = [ - base containers microlens template-haskell + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector ]; homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for microlens"; + description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-th_0_4_1_1" = callPackage + "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; @@ -121680,7 +122194,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -123155,8 +123668,8 @@ self: { }: mkDerivation { pname = "monad-classes"; - version = "0.3.1.1"; - sha256 = "0c906dc616414c84250c79dba279fd29a963de56aeb98e55d4096e80e9f119d8"; + version = "0.3.2.0"; + sha256 = "99bb3597d72d792e1d18f9b26490b43979ea038cf66b5f03ade0a0d60f75dc64"; libraryHaskellDepends = [ base ghc-prim mmorph monad-control peano reflection transformers transformers-base transformers-compat @@ -124415,6 +124928,8 @@ self: { pname = "mono-traversable"; version = "1.0.1"; sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268"; + revision = "1"; + editedCabalFile = "023e5f7596dbfe73456063ed6aa336d2262da4717c267225c9a50c6e6045dc41"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -124755,8 +125270,8 @@ self: { }: mkDerivation { pname = "morfette"; - version = "0.4.3"; - sha256 = "5e6dab28515a626a7d3a785ae3384fa5aabd3146065dbae31740695b34b83291"; + version = "0.4.4"; + sha256 = "9ed165f672c26d24600e189e77898098bb40ca84f5da7e168232670f667b9c18"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125085,6 +125600,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mrifk" = callPackage + ({ mkDerivation, array, base, containers, mtl }: + mkDerivation { + pname = "mrifk"; + version = "4.3"; + sha256 = "bd1699b75fbac5ef25477ca6a9f23869f46f0e3943247c6f24612671e995a95d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base containers mtl ]; + description = "Decompiles Glulx files"; + license = "GPL"; + }) {}; + "mrm" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -125658,8 +126186,8 @@ self: { }: mkDerivation { pname = "multifile"; - version = "0.1.0.4"; - sha256 = "0c6224001af91ba477e08c774212ae48fd94cdc86666b2a686fe414ee8ac4973"; + version = "0.1.0.6"; + sha256 = "594d45265060a8347f9653e4bdacb9e8362cce7d2a06322369e13d4b1e829614"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126059,8 +126587,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "music-diatonic"; - version = "0.1.1"; - sha256 = "7af1534a0647af75d4440ed61aebc89cde76057b4c792e316554e3b280a44ea7"; + version = "0.1.2"; + sha256 = "64183c5980878264d2f847d6eeceb91bb887ada3d30912b2b96e5bb061519064"; libraryHaskellDepends = [ base ]; description = "Implementation of basic western musical theory objects"; license = stdenv.lib.licenses.bsd3; @@ -127480,6 +128008,8 @@ self: { pname = "ncurses"; version = "0.2.16"; sha256 = "e50fb7b1f700d6fa60b4040623b7e0249ae6af2ef2729801fb2917e8b1f25e3f"; + revision = "1"; + editedCabalFile = "8ad9fe6562a80d28166d76adbac1eb4d40c6511fe4e9272ed6e1166dc2f1cdf1"; libraryHaskellDepends = [ base containers text transformers ]; librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; @@ -127889,6 +128419,7 @@ self: { homepage = "http://github.com/foreverbell/netease-fm#readme"; description = "NetEase Cloud Music FM client in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlines" = callPackage @@ -128380,6 +128911,8 @@ self: { pname = "network-carbon"; version = "1.0.7"; sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0"; + revision = "1"; + editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -128925,25 +129458,6 @@ self: { }) {}; "network-transport-inmemory" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor - , network-transport, network-transport-tests, stm - }: - mkDerivation { - pname = "network-transport-inmemory"; - version = "0.5.1"; - sha256 = "e34ae4169e91739851b31eda9750d3df711389279961290fd006a79b51a70bdd"; - libraryHaskellDepends = [ - base bytestring containers data-accessor network-transport stm - ]; - testHaskellDepends = [ - base network-transport network-transport-tests - ]; - homepage = "http://haskell-distributed.github.com"; - description = "In-memory instantiation of Network.Transport"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-inmemory_0_5_2" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network-transport, network-transport-tests, stm }: @@ -128960,7 +129474,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "In-memory instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-tcp" = callPackage @@ -129173,6 +129686,7 @@ self: { homepage = "https://github.com/pierric/neural-network"; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural-network-hmatrix" = callPackage @@ -129190,6 +129704,7 @@ self: { librarySystemDepends = [ blas ]; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas;}; "newports" = callPackage @@ -130670,6 +131185,7 @@ self: { homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvvm" = callPackage @@ -133196,15 +133712,15 @@ self: { }) {}; "overload" = callPackage - ({ mkDerivation, base, containers, simple-effects, template-haskell + ({ mkDerivation, base, simple-effects, template-haskell , th-expand-syns }: mkDerivation { pname = "overload"; - version = "0.1.0.1"; - sha256 = "6583c3c90021bc42bf93d8a287fd81970270f05f423b961a35ac06e11f35af6e"; + version = "0.1.0.2"; + sha256 = "9880a0c4d5ffbfb6b681a785b581d1bac0fadcb677d0dc5edf6ea75bf01fa598"; libraryHaskellDepends = [ - base containers simple-effects template-haskell th-expand-syns + base simple-effects template-haskell th-expand-syns ]; homepage = "https://gitlab.com/LukaHorvat/overload"; description = "Finite overloading"; @@ -133705,8 +134221,8 @@ self: { pname = "pandoc"; version = "1.19.1"; sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a"; - revision = "2"; - editedCabalFile = "6282ee80ee941d2c5582eb81a0c269df6e0d9267912fc85f00b40b5ec35a472c"; + revision = "3"; + editedCabalFile = "fd4285e9e69d662c7dce04f9153d8b4c571cd0dbd8d7ea2708c2fc50a0ee2abc"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -133966,22 +134482,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_17_0_4" = callPackage + "pandoc-types_1_17_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "pandoc-types"; - version = "1.17.0.4"; - sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74"; - revision = "1"; - editedCabalFile = "9ede2044ebbf4fbb7e8244d7f458988178d7bad81e566e8c8a2bc1793ee3d27d"; + version = "1.17.0.5"; + sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb ]; testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq + aeson base bytestring containers HUnit QuickCheck string-qq syb test-framework test-framework-hunit test-framework-quickcheck2 ]; homepage = "http://johnmacfarlane.net/pandoc"; @@ -134044,14 +134558,22 @@ self: { "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base - , papa-include, papa-prelude, QuickCheck, template-haskell + , papa-base-export, papa-base-implement, papa-bifunctors + , papa-bifunctors-export, papa-bifunctors-implement, papa-export + , papa-implement, papa-lens, papa-lens-export, papa-lens-implement + , papa-semigroupoids, papa-semigroupoids-export + , papa-semigroupoids-implement, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.1.0"; - sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730"; + version = "0.2.1"; + sha256 = "1be9afdf1804971617cdca5a94347853a0a5dad33bfa8270394dbf9e00a75386"; libraryHaskellDepends = [ - base papa-base papa-include papa-prelude + base papa-base papa-base-export papa-base-implement papa-bifunctors + papa-bifunctors-export papa-bifunctors-implement papa-export + papa-implement papa-lens papa-lens-export papa-lens-implement + papa-semigroupoids papa-semigroupoids-export + papa-semigroupoids-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134063,14 +134585,17 @@ self: { }) {}; "papa-base" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + ({ mkDerivation, base, directory, doctest, filepath + , papa-base-export, papa-base-implement, QuickCheck , template-haskell }: mkDerivation { pname = "papa-base"; - version = "0.1.0"; - sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf"; - libraryHaskellDepends = [ base ]; + version = "0.2.0"; + sha256 = "8b11f0b11d2fc6517967794320e453e40927f2d7e197c9ea68a306c8a59473c3"; + libraryHaskellDepends = [ + base papa-base-export papa-base-implement + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -134079,6 +134604,141 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "papa-base-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base-export"; + version = "0.2.0"; + sha256 = "1fec80f4bc71eb761c1085816f1d86c485df34d42d0223a052378da15d45a94a"; + revision = "1"; + editedCabalFile = "16ab8a0d0b30fc32c0aea4f2229a02d9203a8ac4747370d000d0ac8293cb28f8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base-export"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-base-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base-implement"; + version = "0.2.0"; + sha256 = "64a0e4ca45f479ad81397cd6f132c5cb40ad76629b7f18b92549a97432e1071d"; + revision = "1"; + editedCabalFile = "e0bce83e04d2258364585033821dea273ea72e873cd362107444bdec505d66e5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base-implement"; + description = "Useful base functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-bifunctors" = callPackage + ({ mkDerivation, base, directory, doctest, filepath + , papa-bifunctors-export, papa-bifunctors-implement, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-bifunctors"; + version = "0.2.0"; + sha256 = "ea55cc34900fe9acde2e4dae35dfc4b68f8ee21cf58d9bdc0202bf4082c3983f"; + libraryHaskellDepends = [ + base papa-bifunctors-export papa-bifunctors-implement + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-bifunctors"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-bifunctors-export" = callPackage + ({ mkDerivation, base, bifunctors, directory, doctest, filepath + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-bifunctors-export"; + version = "0.2.0"; + sha256 = "c3845130eb7ba2524573c0b266546d5efcb62c2fdaef3a06360cdf90b5e93760"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-bifunctors-export"; + description = "export useful functions from `bifunctors`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-bifunctors-implement" = callPackage + ({ mkDerivation, base, bifunctors, directory, doctest, filepath + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-bifunctors-implement"; + version = "0.2.0"; + sha256 = "2cba24228b508080945bc81699801690ba868e49cb623a94cf3529a6d36c1613"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-bifunctors-implement"; + description = "useful `bifunctors` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath + , papa-base-export, papa-bifunctors-export, papa-lens-export + , papa-semigroupoids-export, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-export"; + version = "0.2.1"; + sha256 = "31d1b3b4e0f12310739e31aa3b5d4adb12376a1acceb603ee161fd9efadb5d0a"; + libraryHaskellDepends = [ + base papa-base-export papa-bifunctors-export papa-lens-export + papa-semigroupoids-export + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-export"; + description = "Reasonable default import"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , papa-base-implement, papa-bifunctors-implement + , papa-lens-implement, papa-semigroupoids-implement, QuickCheck + , semigroupoids, template-haskell + }: + mkDerivation { + pname = "papa-implement"; + version = "0.2.2"; + sha256 = "7bd73663de95b0784d217374b37b8e2c301c1be0c0d52789f7e37af21376d3f8"; + libraryHaskellDepends = [ + base lens papa-base-implement papa-bifunctors-implement + papa-lens-implement papa-semigroupoids-implement semigroupoids + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa"; + description = "Reasonable default import"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-include" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, semigroupoids, semigroups, template-haskell @@ -134097,14 +134757,17 @@ self: { }) {}; "papa-lens" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath + , papa-lens-export, papa-lens-implement, QuickCheck + , template-haskell }: mkDerivation { pname = "papa-lens"; - version = "0.0.1"; - sha256 = "b28ec4395f517a599b8632ec6430ef9e566fd5a591041816e3bbbf01bd98a10b"; - libraryHaskellDepends = [ base lens ]; + version = "0.2.0"; + sha256 = "eb938277cc49d3a4fa6e95501f577bdc7d1ba1ca3c3444b1273c20e29aa22cd5"; + libraryHaskellDepends = [ + base papa-lens-export papa-lens-implement + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -134113,6 +134776,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "papa-lens-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-lens-export"; + version = "0.2.0"; + sha256 = "a3ea619b9447497cf2578d979c7b95978df1803523396192c13fc5475cf30eb1"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-lens-export"; + description = "export useful functions from `lens`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-lens-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-lens-implement"; + version = "0.2.1"; + sha256 = "a9b98e295fffd12b6aa21073bfa4c77ba8d237c8a926f9c63d25a982adae9c2f"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-lens-implement"; + description = "useful `lens` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-prelude" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck , template-haskell @@ -134201,6 +134898,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "papa-semigroupoids" = callPackage + ({ mkDerivation, base, directory, doctest, filepath + , papa-semigroupoids-export, papa-semigroupoids-implement + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-semigroupoids"; + version = "0.2.0"; + sha256 = "3e8749a7a4fa7117de60d3cbde328045f7a5e7a469754afa5dca40c0cc9d89be"; + libraryHaskellDepends = [ + base papa-semigroupoids-export papa-semigroupoids-implement + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-semigroupoids"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-semigroupoids-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , semigroupoids, template-haskell + }: + mkDerivation { + pname = "papa-semigroupoids-export"; + version = "0.2.0"; + sha256 = "1be94a9a3f95c618b48c5597ba7c9e38426dc237ee1dd1aadbb3eed59ebf6519"; + libraryHaskellDepends = [ base semigroupoids ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-semigroupoids-export"; + description = "export useful functions from `semigroupoids`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-semigroupoids-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , semigroupoids, template-haskell + }: + mkDerivation { + pname = "papa-semigroupoids-implement"; + version = "0.2.1"; + sha256 = "3007b2b844c671e0b28dcb246b9a2ec6afa4a532948e4379e534cebb47df287f"; + libraryHaskellDepends = [ base semigroupoids ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa"; + description = "useful `bifunctors` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "paphragen" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -135240,26 +135991,6 @@ self: { }) {}; "path-io" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.2.0"; - sha256 = "cb8bfb9fca81eb0f0f9b81761cc5a6edc61204e2c630f7277173147cf149336f"; - revision = "1"; - editedCabalFile = "bf7a036207155e1b752828736f43541ad0c20a5e780cd17fdec823a5be07da83"; - libraryHaskellDepends = [ - base containers directory exceptions filepath path temporary time - transformers unix-compat - ]; - testHaskellDepends = [ base exceptions hspec path unix-compat ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_2_2" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat }: @@ -135275,7 +136006,6 @@ self: { homepage = "https://github.com/mrkkrp/path-io"; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -135705,8 +136435,8 @@ self: { }: mkDerivation { pname = "pdf-slave"; - version = "1.3.0.0"; - sha256 = "0020adc44e21938637c5fe7f69bf7ff714b5773654a74ff2c0ff544bf934f5b9"; + version = "1.3.1.0"; + sha256 = "0417ecfaf51fee975f6387403d1b9eb2af71d625af28adef9cc53f3c9c640509"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137059,8 +137789,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.5"; - sha256 = "cd4a959d4648589e14b71aa0940141c7881166f8ad0257eb427c3acf71942c7b"; + version = "10.6"; + sha256 = "f3b2c7b1871a0a906db45d963233e2cd124ac206526a37421552e6456d57d249"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137512,8 +138242,8 @@ self: { ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }: mkDerivation { pname = "picedit"; - version = "0.1.1.1"; - sha256 = "29cb93ae27ac980884f4a8db3896ae8e7d2b2bcf1b77d368a9ff9a3fb9a7bfcd"; + version = "0.1.1.2"; + sha256 = "e56601b9a206f1d51de3d16abb20fe94a3fc1e5a775662108dd2d0d0d09dab58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; @@ -137653,7 +138383,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_12_2" = callPackage + "pinboard_0_9_12_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -137662,8 +138392,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.2"; - sha256 = "f9c5dbf3206d0c0075704feb4582c58a5eb3ef4704ca7a2000c5c8d49dbeeec9"; + version = "0.9.12.3"; + sha256 = "b38931a4cd32bc6a43862c38116779af76c0b5b5eb6f117ba6b60ef3f717324b"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -137702,6 +138432,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pinch_0_3_0_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text + , unordered-containers, vector + }: + mkDerivation { + pname = "pinch"; + version = "0.3.0.2"; + sha256 = "f511ab7e13de146ed075eb52ee7954b1b4c2deaf5bb54e83375dc159e5803e4a"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim hashable text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-discover QuickCheck text + unordered-containers vector + ]; + homepage = "https://github.com/abhinav/pinch#readme"; + description = "An alternative implementation of Thrift for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pinchot" = callPackage ({ mkDerivation, base, containers, Earley, lens, ListLike , non-empty-sequence, pretty-show, semigroups, template-haskell @@ -138235,21 +138988,6 @@ self: { }) {}; "pipes-http" = callPackage - ({ mkDerivation, base, bytestring, http-client, http-client-tls - , pipes - }: - mkDerivation { - pname = "pipes-http"; - version = "1.0.4"; - sha256 = "f5cff84b9f415f1a65dbe04837884793fa10b1b52e96b29d52987b820c5a0216"; - libraryHaskellDepends = [ - base bytestring http-client http-client-tls pipes - ]; - description = "HTTP client with pipes interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-http_1_0_5" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes }: @@ -138262,7 +139000,6 @@ self: { ]; description = "HTTP client with pipes interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-illumina" = callPackage @@ -140610,6 +141347,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_9_3_0" = callPackage + ({ mkDerivation, base, bytestring, postgresql }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.3.0"; + sha256 = "510df3e08753e011c108c4d4c6d048a4b67545419eb9eedc3ef23e7758fedb05"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ postgresql ]; + homepage = "http://github.com/lpsmith/postgresql-libpq"; + description = "low-level binding to libpq"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-orm" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , bytestring-builder, directory, filepath, ghc-prim, mtl @@ -141053,15 +141804,18 @@ self: { }) {}; "powermate" = callPackage - ({ mkDerivation, base, directory, network, unix }: + ({ mkDerivation, base, directory, unix }: mkDerivation { pname = "powermate"; - version = "0.1"; - sha256 = "40671ae08feb11a63d5f77dee6d3fc99101b577e09bfa1ef53bc894d1e891aa7"; - libraryHaskellDepends = [ base directory network unix ]; - homepage = "http://neugierig.org/software/darcs/powermate/"; - description = "PowerMate bindings"; - license = stdenv.lib.licenses.bsd3; + version = "1.0"; + sha256 = "cf3f0a3e1754489569c3b2a6c8ea1b856919de782c72b86884e31a70fc585b98"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory unix ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ppelleti/powermate"; + description = "bindings for Griffin PowerMate USB"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141200,8 +141954,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.14"; - sha256 = "6b01da606303e72bad6055d436e1c199ad58bb6c93efd89b8d4c43ad5aa6ff21"; + version = "0.0.16"; + sha256 = "fdcb911e5f035d4b6ee6040e7f043daa9b0c10d964ef607fef2538b1874c9d90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141213,6 +141967,7 @@ self: { homepage = "https://github.com/swift-nav/preamble"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "precis" = callPackage @@ -141770,20 +142525,21 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, doctest, Glob, lens - , mono-traversable, mtl, parsec, semigroups, transformers + ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob + , lens, mono-traversable, mtl, parsec, semigroups, text + , transformers }: mkDerivation { pname = "pretty-simple"; - version = "0.3.0.0"; - sha256 = "b34af2742904717e1a46c6aa9816eeffedc4aea67452f61dd98fb06aae1d4f0d"; + version = "1.0.0.6"; + sha256 = "a5f816efd624ca511909674a65481c9e938d1357130b4e88040665890dcf459c"; libraryHaskellDepends = [ - ansi-terminal base lens mono-traversable mtl parsec semigroups - transformers + ansi-terminal base containers lens mono-traversable mtl parsec + semigroups text transformers ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/pretty-simple"; - description = "Simple pretty printer for any datatype with a 'Show' instance"; + description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -143561,12 +144317,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161206" = callPackage + "publicsuffix_0_20170109" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161206"; - sha256 = "0f6ef27c6e71f62c7f994dff75f53ba46a469da00a688c6428932426e80b2959"; + version = "0.20170109"; + sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -144102,8 +144858,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.8.0.0"; - sha256 = "5c52581099c42d3fe337a8b9d3b141dc5fb2a591c0bfbb7e898a701ad99b1e4f"; + version = "0.8.0.1"; + sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -144116,15 +144872,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "purescript-bridge_0_8_0_1" = callPackage + "purescript-bridge_0_9_0_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers }: mkDerivation { pname = "purescript-bridge"; - version = "0.8.0.1"; - sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329"; + version = "0.9.0.0"; + sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -144547,18 +145303,23 @@ self: { "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs - , containers, mtl + , containers, directory, HUnit, mtl, process, test-framework + , test-framework-hunit }: mkDerivation { pname = "python-pickle"; - version = "0.2.0"; - sha256 = "e5406a2e8fa753e61656e4ecc27291919a2ec404d280400c31dbc9a431aff75c"; + version = "0.2.3"; + sha256 = "77df7f0892f543ee9969ea00493a979f74f99a4d7f7ff79350ce20aa7d366885"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring cereal containers mtl ]; executableHaskellDepends = [ base bytestring cmdargs ]; + testHaskellDepends = [ + base bytestring containers directory HUnit process test-framework + test-framework-hunit + ]; description = "Serialization/deserialization using Python Pickle format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144658,6 +145419,7 @@ self: { homepage = "https://github.com/vmchale/QRImager#readme"; description = "Library to generate QR codes from bytestrings and objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qr-repa" = callPackage @@ -144731,8 +145493,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.2.0"; - sha256 = "a2f8e4b352742f97beae28eae0a5d8adbb939b51654274a7e26e3769b2f5f835"; + version = "0.2.1"; + sha256 = "a9713bf999eaf60b08f6c9770860bea35c3b4f823850c36b799485d8f7593c8f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144917,6 +145679,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quantum-random_0_6_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring + , directory, haskeline, hspec, http-conduit, mtl, QuickCheck + , terminal-size, text + }: + mkDerivation { + pname = "quantum-random"; + version = "0.6.4"; + sha256 = "7e1461974f2ea9bc5018b3a88f6fbf7ad39cb40a81f70f588597b8274d25139b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal ansigraph base bytestring directory + http-conduit terminal-size text + ]; + executableHaskellDepends = [ base haskeline mtl ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/BlackBrane/quantum-random/"; + description = "Retrieve, store and manage real quantum random data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qudb" = callPackage ({ mkDerivation, alex, array, base, bytestring, directory, happy , mtl, snappy @@ -145117,6 +145902,20 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "quickcheck-assertions_0_3_0" = callPackage + ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: + mkDerivation { + pname = "quickcheck-assertions"; + version = "0.3.0"; + sha256 = "9b0328a788dcac0824a7d7496ab403eef04170551255c9e58fb6e2e319a9cacf"; + libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ]; + testHaskellDepends = [ base hspec ieee754 QuickCheck ]; + homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; + description = "HUnit like assertions for QuickCheck"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -145370,6 +146169,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-with-counterexamples" = callPackage + ({ mkDerivation, base, QuickCheck, template-haskell }: + mkDerivation { + pname = "quickcheck-with-counterexamples"; + version = "1.0"; + sha256 = "0775755444042169f949474f8931bbf2a88b5cba475d190aacad9af0213fde5e"; + revision = "3"; + editedCabalFile = "e86f17bffaf0d7909be7b79aed021931e806738d44c76e883f27f5fe2e8fe773"; + libraryHaskellDepends = [ base QuickCheck template-haskell ]; + homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples"; + description = "Get counterexamples from QuickCheck as Haskell values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quicklz" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2 @@ -145417,6 +146231,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, text }: + mkDerivation { + pname = "quickson"; + version = "0.3"; + sha256 = "8a0435bd78381c0abe931fbcd7eae135df56cbab784340da0c49d1429e3545a9"; + libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; + homepage = "https://github.com/libscott/quickson"; + description = "Quick JSON extractions with Aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickspec" = callPackage ({ mkDerivation, array, base, containers, ghc-prim, QuickCheck , random, spoon, transformers @@ -145434,12 +146260,19 @@ self: { }) {}; "quickterm" = callPackage - ({ mkDerivation, base, edit-distance, hashmap }: + ({ mkDerivation, base, edit-distance, hashmap, regex-base + , regex-tdfa, uu-parsinglib + }: mkDerivation { pname = "quickterm"; - version = "0.1.0.0"; - sha256 = "389310e766ef5169819a296719827b0c4aa50c5c6a9eef2a58c3500e6bc147f9"; - libraryHaskellDepends = [ base edit-distance hashmap ]; + version = "0.2.4.0"; + sha256 = "cba5a2de043dee23e88781eeee1afe43a11c78411ffb8fbf0b9cc08f21be6f52"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base edit-distance hashmap regex-base regex-tdfa uu-parsinglib + ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/SamuelSchlesinger/Quickterm"; description = "An interface for describing and executing terminal applications"; license = stdenv.lib.licenses.gpl3; @@ -145532,6 +146365,7 @@ self: { homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver" = callPackage @@ -145765,14 +146599,18 @@ self: { }) {}; "rabocsv2qif" = callPackage - ({ mkDerivation, base, old-locale, split, time }: + ({ mkDerivation, base, bytestring, bytestring-conversion, split + , time + }: mkDerivation { pname = "rabocsv2qif"; - version = "1.1.5"; - sha256 = "6f8c2b10adb695147979f027f0a5f88f4e13cb77ff4aa172e8cbc359adc869ed"; + version = "2.0.0"; + sha256 = "c6a362bb9f3f48be7e577498f8fdb26175cabab62534860cc1eec8f4d145ebdc"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base old-locale split time ]; + libraryHaskellDepends = [ + base bytestring bytestring-conversion split time + ]; executableHaskellDepends = [ base ]; description = "A library and program to create QIF files from Rabobank CSV exports"; license = "GPL"; @@ -146513,10 +147351,8 @@ self: { }: mkDerivation { pname = "rasa"; - version = "0.1.3"; - sha256 = "2247542b18000d21309747e55b65ccb6207dace606ad7e84166c46b7966caed1"; - revision = "1"; - editedCabalFile = "3677de9868bb117c8aa7845db9cbe0c614a8ec41e0f24efc50ccaff3963422db"; + version = "0.1.7"; + sha256 = "e5d1ecdbcd350a2686ebcf45f2a7aa1922aa6909fe6bb79040a81963c8ddbbe3"; libraryHaskellDepends = [ async base containers data-default lens mtl text text-lens transformers yi-rope @@ -146529,21 +147365,39 @@ self: { "rasa-example-config" = callPackage ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors , rasa-ext-files, rasa-ext-logger, rasa-ext-slate - , rasa-ext-status-bar, rasa-ext-style, rasa-ext-vim + , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views, rasa-ext-vim }: mkDerivation { pname = "rasa-example-config"; - version = "0.1.0.0"; - sha256 = "5d3cbf04bb2b7a18bfc0ecc03d3c6ed72a23c45827291537d34938fdde21821a"; + version = "0.1.2"; + sha256 = "e6d4eac030ba165eb446dacb7eef1fcd19673cd45d4656b5f9ff0f5c924f8db7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger - rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-vim + rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-views + rasa-ext-vim ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Example user config for Rasa"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rasa-ext-bufs" = callPackage + ({ mkDerivation, base, containers, data-default, lens, rasa, text + }: + mkDerivation { + pname = "rasa-ext-bufs"; + version = "0.1.1"; + sha256 = "c7b935f44138f2fba37882504574986a8e88886d14d300f16ad6de1719e2c412"; + libraryHaskellDepends = [ + base containers data-default lens rasa text + ]; + homepage = "https://github.com/ChrisPenner/rasa/"; + description = "Rasa Ext for useful buffer utilities"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-cmd" = callPackage @@ -146551,8 +147405,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cmd"; - version = "0.1.0.0"; - sha256 = "91efb87afe1a4c9d610c450742f623ff1170957327856ef4265754e1ed4d8123"; + version = "0.1.1"; + sha256 = "8ba6c787802bf3f1a665d973052bfcfc1ee6ce4c883a867a900c41e0f5eab378"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; @@ -146567,8 +147421,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.0.0"; - sha256 = "3d53163dcf3b5d1f897f0c006f83a1ea71306dad3ed2fefc4f7af21a2ff7fda6"; + version = "0.1.4"; + sha256 = "549776d01b0e363780b3301bc6320bcad74ddcd47278b2cdfda07ab9291e022b"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-style text text-lens yi-rope @@ -146580,26 +147434,28 @@ self: { "rasa-ext-files" = callPackage ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd - , rasa-ext-status-bar, text + , rasa-ext-status-bar, rasa-ext-views, text, yi-rope }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.0.0"; - sha256 = "9bfc3d47df893b23e4259887f95078b81fc9bfb489d9ce96d232f4ecdb39c3a4"; + version = "0.1.2"; + sha256 = "a70077f9237d274b24a2d83bf87aaa12565cb33bcb9e94fce22e0377067e0016"; libraryHaskellDepends = [ - base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar text + base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar + rasa-ext-views text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for filesystem actions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-logger" = callPackage ({ mkDerivation, base, lens, mtl, rasa }: mkDerivation { pname = "rasa-ext-logger"; - version = "0.1.0.0"; - sha256 = "4d951f1c54328715c3e923c1f89c833f687bb291e4d7af1ac563c77d8606e3e0"; + version = "0.1.2"; + sha256 = "3f60b4a22f053f6fe33fbe6849146fc73c16695951008c3ed086b2c79a32f854"; libraryHaskellDepends = [ base lens mtl rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; @@ -146607,29 +147463,31 @@ self: { }) {}; "rasa-ext-slate" = callPackage - ({ mkDerivation, base, lens, rasa, rasa-ext-logger - , rasa-ext-status-bar, rasa-ext-style, text, vty, yi-rope + ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-logger + , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views + , recursion-schemes, text, vty, yi-rope }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.0.0"; - sha256 = "75d5c973d41acc016e4f3aa87f0babfb2cfd0d979a848da6a6fb8c9d3c6e4eb9"; + version = "0.1.4"; + sha256 = "4c6bbfd12b4aa8bb69076925bf6d4143ea692e8b458ad6e22128d6dc9c351aaf"; libraryHaskellDepends = [ - base lens rasa rasa-ext-logger rasa-ext-status-bar rasa-ext-style - text vty yi-rope + base lens mtl rasa rasa-ext-logger rasa-ext-status-bar + rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa extension for rendering to terminal with vty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa-ext-status-bar" = callPackage - ({ mkDerivation, base, data-default, lens, rasa, text }: + ({ mkDerivation, base, data-default, lens, rasa, yi-rope }: mkDerivation { pname = "rasa-ext-status-bar"; - version = "0.1.0.0"; - sha256 = "20791e8facaf3e452c1bdc60e8d519169f50a34213a8cdbd6503cb838c550c71"; - libraryHaskellDepends = [ base data-default lens rasa text ]; + version = "0.1.2"; + sha256 = "07c98db2eeb0f511b6d8104e706541817fc69405392c0576eac42cf48e8455f3"; + libraryHaskellDepends = [ base data-default lens rasa yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for populating status-bar"; license = stdenv.lib.licenses.mit; @@ -146639,30 +147497,48 @@ self: { ({ mkDerivation, base, data-default, lens, rasa }: mkDerivation { pname = "rasa-ext-style"; - version = "0.1.0.0"; - sha256 = "496afd72cdbfca75bf530c022e5ad7bbcfd7878e1373ec497ec864a3e7beaee0"; + version = "0.1.3"; + sha256 = "4cf78443b2a2d4b41400d15d614c2767a9f0a94042df09fcb2209accc3c77327"; libraryHaskellDepends = [ base data-default lens rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering styles"; license = stdenv.lib.licenses.mit; }) {}; + "rasa-ext-views" = callPackage + ({ mkDerivation, base, bifunctors, data-default, lens, mtl, rasa + , recursion-schemes + }: + mkDerivation { + pname = "rasa-ext-views"; + version = "0.1.1"; + sha256 = "d7b234282b2d9f0127550645932b3df065f75ad4365662a8aa80b82472ff4580"; + libraryHaskellDepends = [ + base bifunctors data-default lens mtl rasa recursion-schemes + ]; + homepage = "https://github.com/ChrisPenner/rasa/"; + description = "Rasa Ext managing rendering views"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rasa-ext-vim" = callPackage ({ mkDerivation, base, data-default, lens, mtl, rasa - , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar, text - , text-lens, yi-rope + , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar + , rasa-ext-views, text, text-lens, yi-rope }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.0.0"; - sha256 = "3e936fe4fca11737f9983db671d2c94f240aa95d81d934b93e4d211575d8d045"; + version = "0.1.3"; + sha256 = "9282689ed13d9dbd67c46a4c2071e5a57f7ac3723bff0477dd40d54fea7ad3cf"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files - rasa-ext-status-bar text text-lens yi-rope + rasa-ext-status-bar rasa-ext-views text text-lens yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for vim bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rascal" = callPackage @@ -146761,25 +147637,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-client-tls, http-types, tasty - , tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "0.3.1"; - sha256 = "20178614b08e446c50717ba4988440ad342adc70dfa3ab51a1357057223f31fe"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_0_3_2" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-client, http-client-tls, http-types, tasty , tasty-hspec, text, uuid @@ -146796,7 +147653,6 @@ self: { homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -147935,6 +148791,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursors" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: + mkDerivation { + pname = "recursors"; + version = "0.1.0.0"; + sha256 = "0b18df01b9cb06ba1ef5c25b74f46dda87ae254c66a1b29b06017a2217e443cc"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + homepage = "https://www.github.com/jwiegley/recursors"; + description = "Auto-generate final encodings and their isomorphisms using Template Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "redHandlers" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , haskell98, MaybeT, mtl, network, old-time, parsec, stm, unix @@ -148145,8 +149014,8 @@ self: { }: mkDerivation { pname = "reedsolomon"; - version = "0.0.4.2"; - sha256 = "1f2e6d4d781692ed5cbb6f655486fa7d9a8a2872feb6a4a0626e3e778e067d9f"; + version = "0.0.4.3"; + sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b"; libraryHaskellDepends = [ base bytestring exceptions gitrev loop mtl primitive profunctors vector @@ -148669,8 +149538,8 @@ self: { ({ mkDerivation, base, data-default, exceptions, lens, mtl }: mkDerivation { pname = "refresht"; - version = "0.1.0.1"; - sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e"; + version = "0.1.1.0"; + sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f"; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; @@ -148681,13 +149550,14 @@ self: { ({ mkDerivation, aeson, base, containers, text }: mkDerivation { pname = "refty"; - version = "0.1.0.1"; - sha256 = "621883d618e539b9938327e2faf09d36628a81db9ab051c7a4c07b644b7f5d28"; + version = "0.2.0.0"; + sha256 = "d8dbabf5ae6f076d640a801aa19da10e3e4e5ae373b0e7bb96a512739b9ae2c9"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/oreshinya/refty"; description = "Formatted JSON generator for API server inspired by normalizr"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -149643,6 +150513,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "remark" = callPackage + ({ mkDerivation, base, GenericPretty, tasty, tasty-golden + , tasty-hunit + }: + mkDerivation { + pname = "remark"; + version = "0.0.0.0"; + sha256 = "889e58c559ede3b9402cff8b32428f7968d408f2138daaff64d5e5bf6b684511"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base GenericPretty ]; + executableHaskellDepends = [ base GenericPretty ]; + testHaskellDepends = [ + base GenericPretty tasty tasty-golden tasty-hunit + ]; + homepage = "https://github.com/oleks/remark#readme"; + description = "A DSL for marking student work"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "remarks" = callPackage + ({ mkDerivation, base, directory, filepath, GenericPretty, pretty + , tasty, tasty-golden, tasty-hunit + }: + mkDerivation { + pname = "remarks"; + version = "0.1.6"; + sha256 = "e70849c614981dac9ed036ab389d484b683ad9af5af89a32b171510d7c84f70a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base GenericPretty pretty ]; + executableHaskellDepends = [ + base directory filepath GenericPretty + ]; + testHaskellDepends = [ + base GenericPretty tasty tasty-golden tasty-hunit + ]; + homepage = "https://github.com/oleks/remarks#readme"; + description = "A DSL for marking student work"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rematch" = callPackage ({ mkDerivation, base, hspec, HUnit }: mkDerivation { @@ -150367,8 +151281,8 @@ self: { pname = "req-conduit"; version = "0.1.0"; sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; - revision = "1"; - editedCabalFile = "2f7008556081fcfb641b008c499f0c12958f7ccdfbc62b8aa2c1459c7efb3e81"; + revision = "2"; + editedCabalFile = "dc6ccfa651214632bd0c4517f0c5e86d228cf93b792a6a44ef7330c85041a67b"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -150504,25 +151418,6 @@ self: { }) {}; "resolve-trivial-conflicts" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory - , filepath, mtl, optparse-applicative, process, unix - }: - mkDerivation { - pname = "resolve-trivial-conflicts"; - version = "0.3.2.3"; - sha256 = "12459698d44496475f48a5f62a8fba5cd746b0aa7552fa577304ee875f85c596"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-terminal base base-compat Diff directory filepath mtl - optparse-applicative process unix - ]; - homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; - description = "Remove trivial conflict markers in a git repository"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "resolve-trivial-conflicts_0_3_2_4" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory , filepath, mtl, optparse-applicative, process, unix }: @@ -150539,7 +151434,6 @@ self: { homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-effect" = callPackage @@ -150646,25 +151540,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.8.1"; - sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_1_9" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -150681,7 +151556,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -150828,8 +151702,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "4"; - editedCabalFile = "df0abba48ce1b506060711b616a027680314c92960bdefca0f548eecc058e062"; + revision = "5"; + editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -151024,6 +151898,8 @@ self: { pname = "rethinkdb"; version = "2.2.0.7"; sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873"; + revision = "1"; + editedCabalFile = "87cbc3bf8f5d02043e4b7a93a85cc7cb5c0994bd17cee8e65210715e1272b705"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers data-default mtl network scientific text time unordered-containers @@ -151035,6 +151911,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "rethinkdb_2_2_0_8" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, data-default, doctest, mtl, network, scientific, text + , time, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "rethinkdb"; + version = "2.2.0.8"; + sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring containers + data-default mtl network scientific text time unordered-containers + utf8-string vector + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/atnnn/haskell-rethinkdb"; + description = "A driver for RethinkDB 2.2"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale @@ -152933,6 +153830,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "runmany" = callPackage + ({ mkDerivation, async, base, bytestring, optparse-applicative + , process, stm + }: + mkDerivation { + pname = "runmany"; + version = "0.1.2"; + sha256 = "378255e7a54189a204e53197e472076093b34e4c55dae5463e6df0577b15c7b0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring optparse-applicative process stm + ]; + homepage = "https://github.com/jwiegley/runmany"; + description = "Run multiple commands, interleaving output and errors"; + license = stdenv.lib.licenses.mit; + }) {}; + "runmemo" = callPackage ({ mkDerivation, base, data-memocombinators, time }: mkDerivation { @@ -153974,15 +154889,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_13" = callPackage + "sbv_5_14" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.13"; - sha256 = "65d1bb21c19ddad03a9dcf19f18d6221c8633428adeda7de11214468c984afbe"; + version = "5.14"; + sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154009,8 +154924,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.7"; - sha256 = "87af8c5e6d590f6cfcef96ad0c110aadc8c90fe07a72f65af77feac31717baf8"; + version = "0.8"; + sha256 = "71ec51df5c185b8380d5275935170fa52f3002c192b65dddf93312a512e8ed9f"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -154020,6 +154935,7 @@ self: { homepage = "http://github.com/LeventErkok/sbvPlugin"; description = "Formally prove properties of Haskell programs using SBV/SMT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc3-rdu" = callPackage @@ -155236,15 +156152,21 @@ self: { }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage - ({ mkDerivation, base, SDL2, sdl2, SDL2_image }: + ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_image + , template-haskell, text, transformers + }: mkDerivation { pname = "sdl2-image"; - version = "0.1.3.2"; - sha256 = "527b2e7683aee11cf3a054359ad2c253515c612549efc60aa4f54be27d42fa3e"; - libraryHaskellDepends = [ base sdl2 ]; - librarySystemDepends = [ SDL2 ]; + version = "2.0.0"; + sha256 = "399742b2b7e64fe4e58c9d8a44ad29b2c355589233535238f8c9b371de6c26df"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring sdl2 template-haskell text transformers + ]; libraryPkgconfigDepends = [ SDL2 SDL2_image ]; - description = "Haskell binding to sdl2-image"; + executableHaskellDepends = [ base sdl2 text ]; + description = "Bindings to SDL2_image"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; @@ -155565,6 +156487,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "secureUDP" = callPackage + ({ mkDerivation, base, bytestring, containers, network }: + mkDerivation { + pname = "secureUDP"; + version = "0.1.1.3"; + sha256 = "2c59bceee71903722ddecd4d4b31306ef21037048b1ded5a4c049d238334c129"; + libraryHaskellDepends = [ base bytestring containers network ]; + description = "Setups secure (unsorted) UDP packet transfer"; + license = stdenv.lib.licenses.mit; + }) {}; + "securemem" = callPackage ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { @@ -156040,6 +156973,7 @@ self: { homepage = "https://github.com/data61/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqaid" = callPackage @@ -156329,22 +157263,22 @@ self: { , base16-bytestring, base64-bytestring, binary, binary-orphans , bytestring, cereal, cereal-vector, clock, containers , data-msgpack, deepseq, directory, either, exceptions, extra - , filepath, formatting, hashable, hspec, lens, monad-control, mtl - , optparse-applicative, parsec, QuickCheck, quickcheck-instances - , safecopy, scientific, semigroups, stm, template-haskell, text - , text-format, time-units, transformers, unordered-containers - , vector, yaml + , filepath, formatting, hashable, hspec, lens, log-warper + , monad-control, mtl, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, safecopy, scientific, semigroups, stm + , template-haskell, text, text-format, time-units, transformers + , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.1.3.1"; - sha256 = "5765de74022ed024a407a3869892294d50e3027f7cf79ef9b63fca0b61c8b306"; + version = "0.1.3.2"; + sha256 = "0fc433fd42e2281fc9cb3e76a55cd0d6806b611c25fdba516734350507682a77"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal cereal-vector clock containers data-msgpack deepseq directory either exceptions extra filepath formatting hashable lens - monad-control mtl optparse-applicative parsec QuickCheck + log-warper monad-control mtl optparse-applicative parsec QuickCheck quickcheck-instances safecopy scientific semigroups stm template-haskell text text-format time-units transformers unordered-containers vector yaml @@ -156357,6 +157291,7 @@ self: { homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serpentine" = callPackage @@ -156592,7 +157527,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_4_2" = callPackage + "servant-auth-cookie_0_4_2_1" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring , blaze-builder, blaze-html, blaze-markup, bytestring, cereal , cookie, cryptonite, data-default, deepseq, exceptions, hspec @@ -156602,8 +157537,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.2"; - sha256 = "e1199517da33d5f0b3735567d2391dcf36ca8ca61edea703b674103192a1ed79"; + version = "0.4.2.1"; + sha256 = "830df7c6d14345b6ff8e869354388f6242b75abe371265e5f1e414427a88fed3"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory @@ -157621,37 +158556,6 @@ self: { }) {}; "servant-swagger-ui" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring - , directory, file-embed, filepath, http-media, lens, servant - , servant-blaze, servant-server, servant-swagger, swagger2 - , template-haskell, text, transformers, transformers-compat, wai - , wai-app-static, warp - }: - mkDerivation { - pname = "servant-swagger-ui"; - version = "0.2.0.2.1.5"; - sha256 = "57fa0b9d8a46482051f3e2bcab7c513adec07450b3fb6bb00281758f99922d57"; - revision = "2"; - editedCabalFile = "cd0f97ba669671dd13af499483c4e0262e7fd032a50e97396dc56bec8256c869"; - libraryHaskellDepends = [ - base blaze-markup bytestring directory file-embed filepath - http-media servant servant-blaze servant-server servant-swagger - swagger2 template-haskell text transformers transformers-compat - wai-app-static - ]; - testHaskellDepends = [ - aeson base base-compat blaze-markup bytestring directory file-embed - filepath http-media lens servant servant-blaze servant-server - servant-swagger swagger2 template-haskell text transformers - transformers-compat wai wai-app-static warp - ]; - homepage = "https://github.com/phadej/servant-swagger-ui#readme"; - description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-swagger-ui_0_2_1_2_2_8" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant , servant-blaze, servant-server, servant-swagger, swagger2 @@ -158581,8 +159485,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.8"; - sha256 = "13495dad7f64f7f6fd79d86c138ceb517659e28fd138169d1df957892036ab51"; + version = "0.0.13"; + sha256 = "dbb3062ff1e3d416e3bc83efaf3da7771161cdadc9583a8eeab9c5328716919d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -158590,35 +159494,10 @@ self: { homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.11.2"; - sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_12_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -158641,7 +159520,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -160900,6 +161778,7 @@ self: { homepage = "https://github.com/jgm/skylighting"; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skype4hs" = callPackage @@ -161028,8 +161907,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "sleep"; - version = "0.1.0.0"; - sha256 = "ce74c6970b5d83bb92ddf75783fce4ce6d3976cf69c31d18385171787cf80895"; + version = "0.1.0.1"; + sha256 = "af74975f289f74330a890d897db4708db4d31122321325c97ead929daf0d7eec"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base time ]; @@ -161162,28 +162041,6 @@ self: { }) {}; "slug" = callPackage - ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent - , QuickCheck, test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "slug"; - version = "0.1.5"; - sha256 = "6bc271612759fd9a415ee382b620b0f5b1154c762eb3469a409dafd5f35282fc"; - revision = "1"; - editedCabalFile = "1cbade6e74ca1f38368323dc0e124d4b8f0abc661a53e8738f3700cbf553b218"; - libraryHaskellDepends = [ - aeson base exceptions path-pieces persistent text - ]; - testHaskellDepends = [ - base exceptions path-pieces QuickCheck test-framework - test-framework-quickcheck2 text - ]; - homepage = "https://github.com/mrkkrp/slug"; - description = "Type-safe slugs for Yesod ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "slug_0_1_6" = callPackage ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data , path-pieces, persistent, QuickCheck, text }: @@ -161201,7 +162058,6 @@ self: { homepage = "https://github.com/mrkkrp/slug"; description = "Type-safe slugs for Yesod ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallarray" = callPackage @@ -161239,6 +162095,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcaps_0_6_0_4" = callPackage + ({ mkDerivation, attoparsec, base, containers, data-default + , directory, filepath, parsec, text, transformers + }: + mkDerivation { + pname = "smallcaps"; + version = "0.6.0.4"; + sha256 = "c5224d8f48f86b6d8e788194cbe1e4f13015ba3eb90794ea5d99ff78ddff85d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers data-default directory filepath parsec + text transformers + ]; + executableHaskellDepends = [ base containers data-default text ]; + testHaskellDepends = [ + attoparsec base containers data-default parsec text + ]; + description = "Flatten camel case text in LaTeX files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smallcheck" = callPackage ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { @@ -161451,20 +162330,20 @@ self: { ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.2.3"; - sha256 = "ae9f1fd411fc6c57ce4f3d51f23f96ef6cc8362a3df3f932e0fcfa988029e84d"; + version = "0.4.2.4"; + sha256 = "962e8c5927e24ebc56fa419bca2fc43db2a187c26410acd316d9914f8391d96c"; libraryHaskellDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; }) {}; - "smoothie_0_4_2_4" = callPackage + "smoothie_0_4_2_6" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.2.4"; - sha256 = "962e8c5927e24ebc56fa419bca2fc43db2a187c26410acd316d9914f8391d96c"; + version = "0.4.2.6"; + sha256 = "9225877499dd0b4504d91e26403b23f6d8517c097073abf07982fc5041836174"; libraryHaskellDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; @@ -161562,6 +162441,7 @@ self: { ]; description = "Dump the communication with an SMT solver for debugging purposes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtlib2-pipe" = callPackage @@ -161583,6 +162463,7 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtlib2-quickcheck" = callPackage @@ -162295,6 +163176,8 @@ self: { pname = "snaplet-fay"; version = "0.3.3.14"; sha256 = "97a9a3ec90e03be064df0a6e3dcf5834de063fb43a24d1014eb3d0ba8bac4207"; + revision = "1"; + editedCabalFile = "58f323693af14f209668396e60d99aaf46c3adc1415f8e2df951a54494be8619"; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -163178,6 +164061,7 @@ self: { homepage = "https://github.com/jiakai0419/snowflake#readme"; description = "twitter's snowflake"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snowflake-server" = callPackage @@ -164946,27 +165830,6 @@ self: { }) {inherit (pkgs) sqlite;}; "sqlite-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text - , time, transformers - }: - mkDerivation { - pname = "sqlite-simple"; - version = "0.4.12.0"; - sha256 = "eb5732bea0fff46a1761c5aa635533c7200c748624825440276774ce4bf56093"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite text time transformers - ]; - testHaskellDepends = [ - base base16-bytestring bytestring direct-sqlite HUnit text time - ]; - homepage = "http://github.com/nurpax/sqlite-simple"; - description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sqlite-simple_0_4_12_1" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text , time, transformers @@ -164985,7 +165848,6 @@ self: { homepage = "http://github.com/nurpax/sqlite-simple"; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-errors" = callPackage @@ -165031,6 +165893,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sqsd-local" = callPackage + ({ mkDerivation, amazonka, amazonka-sqs, base, bytestring + , case-insensitive, exceptions, http-client, lens, lifted-base + , resourcet, text, unordered-containers, wreq + }: + mkDerivation { + pname = "sqsd-local"; + version = "0.2.0"; + sha256 = "909037383cb8948b4a1451414db65046a8cb967e17580282948ba4fae94aba76"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amazonka amazonka-sqs base bytestring case-insensitive exceptions + http-client lens lifted-base resourcet text unordered-containers + wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/owickstrom/sqsd-local#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "squeeze" = callPackage ({ mkDerivation, base, Cabal, data-default, directory, factory , filepath, mtl, QuickCheck, random, toolshed @@ -165580,6 +166465,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack-type" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "stack-type"; + version = "0.1.0.0"; + sha256 = "f310965736f096cdf099e0a61c5fad39b066692d72643da989b64e61ae196c8e"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/aiya000/hs-stack-type"; + description = "The basic stack type"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage" = callPackage ({ mkDerivation, base, stackage-build-plan, stackage-cabal , stackage-cli, stackage-install, stackage-sandbox, stackage-setup @@ -167491,24 +168388,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl - , resourcet, streaming, transformers, transformers-base + "streaming_0_1_4_5" = callPackage + ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph + , monad-control, mtl, resourcet, time, transformers + , transformers-base }: mkDerivation { - pname = "streaming-bytestring"; - version = "0.1.4.4"; - sha256 = "0a8b6623cff9fa1310c835a3c3f374cbf1c14ca385dd401db9c13b503e347662"; + pname = "streaming"; + version = "0.1.4.5"; + sha256 = "d6a920e2c08cea30480fc5823ef83bcd312f2e052ae3b54a2ed16ba0a5da6843"; libraryHaskellDepends = [ - base bytestring deepseq exceptions mmorph mtl resourcet streaming - transformers transformers-base + base containers exceptions ghc-prim mmorph monad-control mtl + resourcet time transformers transformers-base ]; - homepage = "https://github.com/michaelt/streaming-bytestring"; - description = "effectful byte steams, or: bytestring io done right"; + homepage = "https://github.com/michaelt/streaming"; + description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-bytestring_0_1_4_5" = callPackage + "streaming-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck , transformers, transformers-base @@ -167528,6 +168427,28 @@ self: { homepage = "https://github.com/michaelt/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "streaming-bytestring_0_1_4_6" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, smallcheck, streaming, tasty, tasty-smallcheck + , transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.4.6"; + sha256 = "89d597dd78ebcf292347441ccca226fb6b67e125205db74f7aadab5592ce6a02"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring smallcheck streaming tasty tasty-smallcheck + transformers + ]; + homepage = "https://github.com/michaelt/streaming-bytestring"; + description = "effectful byte steams, or: bytestring io done right"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -167611,19 +168532,20 @@ self: { "streaming-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client , http-client-tls, json-stream, mtl, network, network-simple, pipes - , resourcet, streaming, streaming-bytestring, transformers + , resourcet, streaming, streaming-bytestring, streaming-commons + , transformers }: mkDerivation { pname = "streaming-utils"; - version = "0.1.4.3"; - sha256 = "9c17f8c1574aec072a2004259bf881e46832b91b82d2c1167115af57339a9f34"; + version = "0.1.4.6"; + sha256 = "fe061b466b47b227b871c40bbb55a90a9425341de32690328ce04adeb2067e51"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming - streaming-bytestring transformers + streaming-bytestring streaming-commons transformers ]; homepage = "https://github.com/michaelt/streaming-utils"; - description = "http, attoparsec, pipes and conduit utilities for the streaming libraries"; + description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -167897,17 +168819,6 @@ self: { }) {}; "string-conversions" = callPackage - ({ mkDerivation, base, bytestring, text, utf8-string }: - mkDerivation { - pname = "string-conversions"; - version = "0.4"; - sha256 = "1a64a6db3c7fe37c798aaa433ee4c951c0727fd46a9c096c002b6bf0adac24ae"; - libraryHaskellDepends = [ base bytestring text utf8-string ]; - description = "Simplifies dealing with different types for strings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "string-conversions_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck , quickcheck-instances, text, utf8-string }: @@ -167923,7 +168834,6 @@ self: { homepage = "https://github.com/soenkehahn/string-conversions#readme"; description = "Simplifies dealing with different types for strings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-convert" = callPackage @@ -168212,25 +169122,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; - version = "3.0.1"; - sha256 = "3a03d0b5c1ac8121be624dedd995c17c99543428225789483693ca7a69654a69"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_3_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers @@ -168247,7 +169138,6 @@ self: { homepage = "https://github.com/tfausak/strive#readme"; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strptime" = callPackage @@ -168662,6 +169552,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "suffix-array" = callPackage + ({ mkDerivation, array, base, containers, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "suffix-array"; + version = "0.3.0.0"; + sha256 = "4109af4d3ae346c3984acf704ac3c3fb463cdca0a37ee35e7b698ef236e64794"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base containers tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/kadoban/suffix-array#readme"; + description = "Simple and moderately efficient suffix array implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "suffixarray" = callPackage ({ mkDerivation, base, HUnit, vector }: mkDerivation { @@ -169974,14 +170884,18 @@ self: { }: mkDerivation { pname = "synthesizer-midi"; - version = "0.6.0.3"; - sha256 = "e1b1597c54265661893b258ea2dccdb6e5776560fb78f47faa7704333af09434"; + version = "0.6.0.4"; + sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5"; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers deepseq event-list midi non-negative numeric-prelude sox storable-record storablevector synthesizer-core synthesizer-dimensional transformers utility-ht ]; + testHaskellDepends = [ + base event-list midi numeric-prelude storablevector + synthesizer-core transformers + ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; @@ -170298,12 +171212,12 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.0.5"; - sha256 = "6eda0e556aa555f031d82a075baed227c389a9f40df13c5a5632b94c6c5b4906"; + version = "1.1.2"; + sha256 = "59461920b66b4b63b055b08af464a6fd9ff529f64527dfb573f9396dadd39287"; libraryHaskellDepends = [ base bytestring network transformers unix ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base network unix ]; homepage = "https://github.com/erebe/systemd"; description = "Systemd facilities (Socket activation, Notify)"; license = stdenv.lib.licenses.bsd3; @@ -171022,6 +171936,28 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tailfile-hinotify" = callPackage + ({ mkDerivation, async, base, bytestring, conceit, directory, foldl + , hinotify, pipes, process-streaming, streaming, streaming-eversion + , tasty, tasty-hunit + }: + mkDerivation { + pname = "tailfile-hinotify"; + version = "1.0.0.2"; + sha256 = "e63dab76d95842cef9b3b47c48cb0c2ee1fe0e5bb7bd73ff349a9c49a03aa43f"; + libraryHaskellDepends = [ + async base bytestring foldl hinotify pipes streaming + streaming-eversion + ]; + testHaskellDepends = [ + async base bytestring conceit directory foldl hinotify pipes + process-streaming streaming streaming-eversion tasty tasty-hunit + ]; + description = "Tail files in Unix, using hinotify"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tak" = callPackage ({ mkDerivation, base, bytestring, hashable, hslogger, HUnit , matrix, network, parsec, random-shuffle, safe @@ -171393,24 +172329,6 @@ self: { }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.0.3"; - sha256 = "34a55d29a962a24aa1d5150795a0cae7a4769950c7ecb7cc1facf3bb0b067562"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_0_4" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -171426,7 +172344,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-dejafu" = callPackage @@ -171767,8 +172684,8 @@ self: { }: mkDerivation { pname = "tasty-tap"; - version = "0.0.3"; - sha256 = "b65cde7c662dd1d204a4e8efb84c1210c1ed0571def12ccf3c59f3036f0bc0fc"; + version = "0.0.4"; + sha256 = "c85ee6356f7bcdf3756add5baca06d942656400c3e9765e5087229b53d2eff75"; libraryHaskellDepends = [ base containers stm tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit @@ -172185,12 +173102,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "template-haskell_2_11_0_0" = callPackage + "template-haskell_2_11_1_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.11.0.0"; - sha256 = "e7bddc18f980f6b8a589a2c4d5e6dd3e1d76e533321cb7ad22afb7242269f6d4"; + version = "2.11.1.0"; + sha256 = "5fb340b665fad764238a67b6dd04870a8c4b15e891a8d2d2cd37c5915a7b369c"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -172262,8 +173179,8 @@ self: { ({ mkDerivation, base, mtl, tagsoup, uniplate }: mkDerivation { pname = "templateify"; - version = "0.1.0.0"; - sha256 = "ccbb2c48f9d7a6f1f3df3d00e807416bb8b7fe62fb298fb6cb9d0bb5a043d269"; + version = "0.1.0.1"; + sha256 = "0dc8b3a5bf54dbcba6740f9338c49c8c211b13cee16ef7cd1803edb2f4220321"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl tagsoup uniplate ]; @@ -173476,6 +174393,7 @@ self: { homepage = "https://github.com/joe9/GenericPretty"; description = "A generic, derivable, haskell pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-icu" = callPackage @@ -173742,21 +174660,6 @@ self: { }) {}; "text-postgresql" = callPackage - ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple - , transformers - }: - mkDerivation { - pname = "text-postgresql"; - version = "0.0.2.1"; - sha256 = "10f83683108faa8a704f649bb10ab1962f926b0ac4e481922764cc87bb92f2f6"; - libraryHaskellDepends = [ base dlist transformers ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Parser and Printer of PostgreSQL extended types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-postgresql_0_0_2_2" = callPackage ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple , transformers, transformers-compat }: @@ -173771,7 +174674,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Parser and Printer of PostgreSQL extended types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-printer" = callPackage @@ -174403,6 +175305,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_2_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.2.0"; + sha256 = "66fed79828e9a13375f0f801f5ecc3763186667228ad91e19919219ff1654db9"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/DanielSchuessler/th-expand-syns"; + description = "Expands type synonyms in Template Haskell ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -174810,8 +175726,8 @@ self: { pname = "these"; version = "0.7.3"; sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b"; - revision = "1"; - editedCabalFile = "d351c189525daded1e727f4a705f568d019238c9a4dd60e0277be462f49bede2"; + revision = "2"; + editedCabalFile = "12ec949fc6530adb5b534e773a786d467f59e8087480d5b50a298894aec96e2b"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -175237,6 +176153,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; + "tibetan-utils" = callPackage + ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec + , megaparsec, text, text-show + }: + mkDerivation { + pname = "tibetan-utils"; + version = "0.1.0.2"; + sha256 = "6afa74aaef0d2fa8ae42f840ab19100f747abc8ddef5e1ffd1186f0a0035182c"; + libraryHaskellDepends = [ + base composition either megaparsec text text-show + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec text + ]; + homepage = "https://github.com/vmchale/tibetan-utils#readme"; + description = "Parse and display tibetan numerals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: mkDerivation { @@ -175667,8 +176603,8 @@ self: { ({ mkDerivation, base, intervals, time }: mkDerivation { pname = "time-patterns"; - version = "0.1.4.1"; - sha256 = "5114525b97e376303540feea7b7d780d6c13d558d130a8d95d8577db5e004f41"; + version = "0.1.4.2"; + sha256 = "542b04487ef986e921888b3f6df73f154ed501c00cd7c12e0b623693e90505f6"; libraryHaskellDepends = [ base intervals time ]; homepage = "https://github.com/j-mueller/time-patterns"; description = "Patterns for recurring events"; @@ -175810,8 +176746,7 @@ self: { description = "Distributed systems execution emulation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {log-warper = null;}; + }) {}; "timecalc" = callPackage ({ mkDerivation, base, haskeline, uu-parsinglib }: @@ -175831,8 +176766,8 @@ self: { ({ mkDerivation, base, process, time }: mkDerivation { pname = "timeconsole"; - version = "0.1.0.1"; - sha256 = "519f2c90f2ee0b8d58f26fa67fecb83dc77002ed1ea94007b5c256155e9ff022"; + version = "0.1.0.3"; + sha256 = "472e1640c0ee395e3a5d3fed81ddb54ede94123ee38d8330fdb6387768c20ac0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; @@ -176255,6 +177190,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tinyXml" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hexml, mtl, optparse-generic, primitive, process, vector + }: + mkDerivation { + pname = "tinyXml"; + version = "0.1.0.2"; + sha256 = "a80c87a31010902e209d8738584bf1261ceda26f45dec5f42b239c599dcf9336"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers mtl primitive vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath mtl optparse-generic + ]; + testHaskellDepends = [ + base bytestring containers filepath hexml mtl primitive process + vector + ]; + description = "A fast DOM parser for a subset of XML"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tinylog" = callPackage ({ mkDerivation, base, bytestring, containers, double-conversion , fast-logger, text, transformers, unix-time @@ -178462,7 +179421,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_3_0" = callPackage + "turtle_1_3_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , directory, doctest, foldl, hostname, managed, optional-args , optparse-applicative, process, stm, system-fileio @@ -178471,8 +179430,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.3.0"; - sha256 = "6004c179342c8b341f804046584d1ff6630483af5053d74603877df8d1699a47"; + version = "1.3.1"; + sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock directory foldl hostname managed optional-args optparse-applicative process stm @@ -178716,6 +179675,7 @@ self: { homepage = "https://github.com/wiggly/twfy-api-client#readme"; description = "They Work For You API Client Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -180073,6 +181033,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ua-parser_0_7_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, file-embed + , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck + , text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.3"; + sha256 = "bdb23301552c6e429765ea503d1ec598eec3cdfd15732b34745b08e7bcce7a10"; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -180862,6 +181843,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unidecode" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "unidecode"; + version = "0.1.0.4"; + sha256 = "3fcb3da74a14a2718be8144068feaec0a426bdf7296e91935fce48d8ee0e12e9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/mwotton/unidecode#readme"; + description = "Haskell binding of Unidecode"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unification-fd" = callPackage ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { @@ -181272,6 +182266,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "universum" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , exceptions, ghc-prim, hashable, mtl, safe, stm, text, text-format + , transformers, unordered-containers, utf8-string + }: + mkDerivation { + pname = "universum"; + version = "0.1.12"; + sha256 = "7826471999166223a737b5b265c489e35c208a6bb48cc8be6edf3543c147f021"; + libraryHaskellDepends = [ + async base bytestring containers deepseq exceptions ghc-prim + hashable mtl safe stm text text-format transformers + unordered-containers utf8-string + ]; + homepage = "https://github.com/serokell/universum"; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + }) {}; + "unix_2_7_2_1" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -181305,6 +182318,8 @@ self: { pname = "unix-compat"; version = "0.4.3.1"; sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27"; + revision = "1"; + editedCabalFile = "6c1914a5322b96837ac47296bf0ce287ce9c89cc131f844483f5d9784e36910a"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -181484,25 +182499,6 @@ self: { }) {}; "unordered-containers" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.7.1"; - sha256 = "2f9277f1d61c409775835f094c031fbb5462dd564d639f4f1357ee086fc4d702"; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unordered-containers_0_2_7_2" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, deepseq , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -181519,7 +182515,6 @@ self: { homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unordered-containers-rematch" = callPackage @@ -181660,8 +182655,8 @@ self: { }: mkDerivation { pname = "unsequential"; - version = "0.5.1"; - sha256 = "4dd469dc657d82ec8d8ef89cb86822c6f99669f0f781698c75e9e72384718669"; + version = "0.5.2"; + sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a"; libraryHaskellDepends = [ base base-prelude dlist transformers ]; testHaskellDepends = [ attoparsec interspersed QuickCheck quickcheck-instances rebase @@ -181695,8 +182690,8 @@ self: { }: mkDerivation { pname = "unused"; - version = "0.6.1.1"; - sha256 = "4a88183dd96bd9e4285e93e0592608666e15b537403799cecd7f963d54623f60"; + version = "0.7.0.0"; + sha256 = "4eee152fd54f52f1c1ff7b12ff8fa78b0d2c84def118f7be2fa51a0c3d70c68b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181767,6 +182762,27 @@ self: { license = "unknown"; }) {}; + "update-nix-fetchgit" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring + , data-fix, errors, hnix, process, text, time, transformers + , trifecta, uniplate, utf8-string + }: + mkDerivation { + pname = "update-nix-fetchgit"; + version = "0.1.0.0"; + sha256 = "a2782a528180831e4245997d47a561c008887672c7dc299ac73135b9890a14b2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring data-fix errors hnix + process text time transformers trifecta uniplate utf8-string + ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/expipiplus1/update-nix-fetchgit#readme"; + description = "A program to update fetchgit values in Nix expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uploadcare" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash , hex, http-conduit, http-types, old-locale, time @@ -182235,6 +183251,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "userid_0_1_2_8" = callPackage + ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes + , web-routes-th + }: + mkDerivation { + pname = "userid"; + version = "0.1.2.8"; + sha256 = "b0b2718880dacfefbd7ded80e4fcd1d016a51e5ec638200b6cd5552f4f102124"; + libraryHaskellDepends = [ + aeson base boomerang safecopy web-routes web-routes-th + ]; + homepage = "http://www.github.com/Happstack/userid"; + description = "The UserId type and useful instances for web development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "users" = callPackage ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }: mkDerivation { @@ -182883,6 +183916,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vado_0_0_8" = callPackage + ({ mkDerivation, attoparsec, base, directory, filepath, process + , QuickCheck, text + }: + mkDerivation { + pname = "vado"; + version = "0.0.8"; + sha256 = "bb085062b807c08adc3bed2c0e736d4f888bd15a85e1d3d2babf4e6e25acc256"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base directory filepath process text + ]; + executableHaskellDepends = [ + attoparsec base directory filepath process text + ]; + testHaskellDepends = [ + attoparsec base directory filepath process QuickCheck text + ]; + homepage = "https://github.com/hamishmack/vado"; + description = "Runs commands on remote machines using ssh"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -183334,8 +184392,8 @@ self: { }: mkDerivation { pname = "vcsgui"; - version = "0.2.1.0"; - sha256 = "ef43f033ca5ad099a48890bc0b29a881b846e94e0fad833d65091027243836b8"; + version = "0.2.1.1"; + sha256 = "76fa0af1c68195097059ea05e3bf7337dd94590d5f6d10109b33a2def474176b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183375,6 +184433,30 @@ self: { license = "GPL"; }) {}; + "vcswrapper_0_1_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hxt, mtl + , parsec, process, split, text + }: + mkDerivation { + pname = "vcswrapper"; + version = "0.1.5"; + sha256 = "56584523ecd4c40a58345e0fcfc66a8aba4cfcdf49c8b1269d767f3b82b1f17b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath hxt mtl parsec process split + text + ]; + executableHaskellDepends = [ + base containers directory filepath hxt mtl parsec process split + text + ]; + homepage = "https://github.com/forste/haskellVCSWrapper"; + description = "Wrapper for source code management systems"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -183490,6 +184572,8 @@ self: { pname = "vector-algorithms"; version = "0.7.0.1"; sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070"; + revision = "1"; + editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -183891,8 +184975,8 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.2.0"; - sha256 = "c8876068442349178a8626608b777f707cbe9dc7dc465b250b6e303de4c654ae"; + version = "1.2.0.1"; + sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d"; libraryHaskellDepends = [ base bytestring cereal containers deepseq protobuf text th-printf transformers vector @@ -183905,17 +184989,16 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "vectortiles_1_2_0_1" = callPackage + "vectortiles_1_2_0_2" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex - , protobuf, tasty, tasty-hunit, text, th-printf, transformers - , vector + , protobuf, tasty, tasty-hunit, text, transformers, vector }: mkDerivation { pname = "vectortiles"; - version = "1.2.0.1"; - sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d"; + version = "1.2.0.2"; + sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886"; libraryHaskellDepends = [ - base bytestring cereal containers deepseq protobuf text th-printf + base bytestring cereal containers deepseq protobuf text transformers vector ]; testHaskellDepends = [ @@ -184020,24 +185103,28 @@ self: { }) {}; "vgrep" = callPackage - ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers - , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl - , pipes, pipes-concurrency, process, QuickCheck, stm, tasty - , tasty-quickcheck, text, transformers, unix, vty + ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th + , containers, directory, doctest, fingertree, generic-deriving + , lens, lifted-base, mmorph, mtl, pipes, pipes-concurrency, process + , QuickCheck, stm, tasty, tasty-quickcheck, template-haskell, text + , transformers, unix, vty, yaml }: mkDerivation { pname = "vgrep"; - version = "0.1.4.1"; - sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9"; + version = "0.2.0.0"; + sha256 = "2b53c200e872d253c1195e93ed8362111461d621759a15562f9fd06d333c2d33"; + revision = "1"; + editedCabalFile = "939169b5cb33e4f625431bffe87d0285f12b458005dbe10f17fbddd66c819262"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base containers fingertree lens lifted-base mmorph - mtl pipes pipes-concurrency process stm text transformers unix vty + aeson async attoparsec base containers directory fingertree + generic-deriving lens lifted-base mmorph mtl pipes + pipes-concurrency process stm text transformers unix vty yaml ]; executableHaskellDepends = [ async base cabal-file-th containers directory lens mtl pipes - pipes-concurrency process text unix vty + pipes-concurrency process template-haskell text vty ]; testHaskellDepends = [ base containers doctest lens QuickCheck tasty tasty-quickcheck text @@ -185076,6 +186163,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_19_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.19.1"; + sha256 = "f7e7ca4432fd868bb549f16ff2671534cab4e0bcfff194b9de55aa561b21a7f6"; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -185853,22 +186970,6 @@ self: { }) {}; "wai-request-spec" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-types, text, wai - }: - mkDerivation { - pname = "wai-request-spec"; - version = "0.10.2.1"; - sha256 = "48b04912b04bb045c6e103adea8f20c50af7705e802e706b9c67249ee6a5f57b"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-types text wai - ]; - homepage = "https://gitlab.com/cpp.cabrera/wai-request-spec"; - description = "Declarative request parsing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-request-spec_0_10_2_4" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-types, text, wai }: @@ -185882,7 +186983,6 @@ self: { homepage = "https://gitlab.com/queertypes/wai-request-spec"; description = "Declarative request parsing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-responsible" = callPackage @@ -186755,6 +187855,7 @@ self: { homepage = "https://github.com/sarthakbagaria/web-push#readme"; description = "Helper functions to send messages using Web Push protocol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes" = callPackage @@ -186922,8 +188023,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.5.1.0"; - sha256 = "57eb367f392f1c7ed230cb151b6a7ac8fda44e11075bbd39407e9c34125947ee"; + version = "0.5.2.0"; + sha256 = "cabc70b3db50df42644d0806def72838b5d7f20bcc6ddefec48e42acda417c4e"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -187952,6 +189053,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wiringPi" = callPackage + ({ mkDerivation, base, wiringPi }: + mkDerivation { + pname = "wiringPi"; + version = "0.1.0.0"; + sha256 = "b38a690d3c0e05c892a04f212dcf729f784fb6f05e4ecff2933cd969da04b23f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ wiringPi ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ppelleti/hs-wiringPi"; + description = "Access GPIO pins on Raspberry Pi via wiringPi library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {wiringPi = null;}; + "with-location" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -188272,8 +189390,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.6"; - sha256 = "0be99a2ae98daaf9f2d499dd3f360a79e258c97874d81a3f32d97da17dce64fa"; + version = "0.3.7"; + sha256 = "6ecd4a1430d63568683fd3d9282cf778e94b27f2d076de67f5853aa5eacb007e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188698,6 +189816,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq-stringless" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: + mkDerivation { + pname = "wreq-stringless"; + version = "0.4.1.0"; + sha256 = "f2d80a50007a7f9666d67a3cfe15b8b459c53945c6b1add310d0733246fe41e2"; + libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; + homepage = "https://github.com/j-keck/wreq-stringless#readme"; + description = "Simple wrapper to use wreq without Strings"; + license = stdenv.lib.licenses.mit; + }) {}; + "wright" = callPackage ({ mkDerivation, assertions, base, bed-and-breakfast, containers , filepath, lens @@ -188721,14 +189851,15 @@ self: { }: mkDerivation { pname = "writer-cps-monads-tf"; - version = "0.1.0.0"; - sha256 = "39717b684cc70e75e8fdacc3641dd615672ea77174ee3ef26bf6929ebf4ac28b"; + version = "0.1.0.1"; + sha256 = "d844c0a995898968ae9ed7f53d3ac8eabd6f9623b70c22214f956ea3692b9583"; libraryHaskellDepends = [ base monads-tf transformers writer-cps-transformers ]; homepage = "https://github.com/minad/writer-cps-monads-tf#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-mtl" = callPackage @@ -188746,6 +189877,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-mtl_0_1_1_2" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.1.2"; + sha256 = "55d14bfe21dad79b4254c188b5b3f30144d741a821bfb024e38c798dbf7c5f61"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -188758,6 +189905,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-transformers_0_1_1_2" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "writer-cps-transformers"; + version = "0.1.1.2"; + sha256 = "3c82d9a2157da42229b9f7eaa476d26ce9ce2f3910efe8afc603e07fa4da348a"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/minad/writer-cps-transformers#readme"; + description = "WriteT and RWST monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wsdl" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types @@ -189822,20 +190982,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xlsx-tabular_0_2_0" = callPackage + "xlsx-tabular_0_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx }: mkDerivation { pname = "xlsx-tabular"; - version = "0.2.0"; - sha256 = "95ee0e839d58131a296580fdb73884a208ed017c9b1bfbda1ad05227ec54db77"; + version = "0.2.2"; + sha256 = "d4d95c3f6ead3af2185f22d7bd1ab0f0fb972864553f1edde6eb2fbb4ef75556"; libraryHaskellDepends = [ aeson base bytestring containers data-default lens text xlsx ]; testHaskellDepends = [ base ]; - homepage = "http://github.com/kkazuo/xlsx-tabular#readme"; - description = "Xlsx table decode utility"; + homepage = "https://github.com/kkazuo/xlsx-tabular"; + description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -190089,6 +191249,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-hamlet_0_4_1" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, parsec + , shakespeare, template-haskell, text, xml-conduit + }: + mkDerivation { + pname = "xml-hamlet"; + version = "0.4.1"; + sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb"; + libraryHaskellDepends = [ + base containers parsec shakespeare template-haskell text + xml-conduit + ]; + testHaskellDepends = [ + base containers hspec HUnit parsec shakespeare template-haskell + text xml-conduit + ]; + homepage = "http://www.yesodweb.com/"; + description = "Hamlet-style quasiquoter for XML content"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-helpers" = callPackage ({ mkDerivation, base, xml }: mkDerivation { @@ -190107,10 +191289,8 @@ self: { }: mkDerivation { pname = "xml-html-conduit-lens"; - version = "0.3.2.1"; - sha256 = "22dcbfe4e70a87dcc6d477c9e1c3c51cb1317b4799e42efc6c3d9a55b045c547"; - revision = "2"; - editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132"; + version = "0.3.2.2"; + sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac"; libraryHaskellDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; @@ -191043,10 +192223,8 @@ self: { }: mkDerivation { pname = "xxhash"; - version = "0.0.1"; - sha256 = "b645bff86157f46c8a1194c59bcaa6c182ded708c66a290d50041831f7dc3533"; - revision = "1"; - editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274"; + version = "0.0.2"; + sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27"; libraryHaskellDepends = [ base bytestring crypto-api tagged ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "A Haskell implementation of the xxHash algorithm"; @@ -191725,32 +192903,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit, conduit-extra, data-default, directory, fast-logger - , monad-control, monad-logger, resourcet, safe, semigroups - , shakespeare, streaming-commons, template-haskell, text - , transformers, unix, unordered-containers, wai, wai-extra - , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.3.1"; - sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit conduit-extra - data-default directory fast-logger monad-control monad-logger - resourcet safe semigroups shakespeare streaming-commons - template-haskell text transformers unix unordered-containers wai - wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form - yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_4" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default-class, directory , fast-logger, monad-control, monad-logger, resourcet, semigroups @@ -191772,7 +192924,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-angular" = callPackage @@ -192068,6 +193219,7 @@ self: { ]; description = "Very simlple LDAP auth for yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-ldap-native" = callPackage @@ -192379,6 +193531,8 @@ self: { pname = "yesod-core"; version = "1.4.30"; sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654"; + revision = "1"; + editedCabalFile = "34f11a73eab3b105720ffa017f48217bc3dc383347e36b7584e137e0462bd181"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -192905,16 +194059,19 @@ self: { }) {}; "yesod-paginator" = callPackage - ({ mkDerivation, base, persistent, resourcet, text, transformers - , yesod + ({ mkDerivation, base, data-default, hspec, persistent, resourcet + , text, transformers, wai-extra, yesod, yesod-core, yesod-test }: mkDerivation { pname = "yesod-paginator"; - version = "0.10.0"; - sha256 = "d5316cc72b8c59fc5cac5b4b31deb4597d3ea9c86a5e58b914d38e07ca34af65"; + version = "0.10.1"; + sha256 = "06dd2e4ffb031176e3e9538f5ed5051e4e188ad803b8071bbc69a95e59d576c3"; libraryHaskellDepends = [ base persistent resourcet text transformers yesod ]; + testHaskellDepends = [ + base data-default hspec wai-extra yesod-core yesod-test + ]; homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; @@ -192935,28 +194092,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.1.0"; - sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_4_1_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -192976,7 +194111,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -194838,30 +195972,6 @@ self: { }) {}; "zip" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; - version = "0.1.4"; - sha256 = "073c9f8320ed16048d099fbec10c42a76ae0bcbd13e344fd0ca99f3a6716db78"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_0_1_5" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, exceptions , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck @@ -194883,7 +195993,6 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7929d99de153..c49b81762e71 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -32,8 +32,10 @@ let isGhcjs = ghc.isGhcjs or false; ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand = if isGhcjs then "ghcjs" else "ghc"; - ghcCommandCaps= lib.toUpper ghcCommand; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommandCaps= lib.toUpper ghcCommand'; libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; @@ -52,10 +54,12 @@ buildEnv { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + extraOutputsToInstall = [ "out" "doc" ]; inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook + # Work around buildEnv sometimes deciding to make bin a symlink if test -L "$out/bin"; then binTarget="$(readlink -f "$out/bin")" rm "$out/bin" @@ -63,6 +67,8 @@ buildEnv { chmod u+w "$out/bin" fi + # wrap compiler executables with correct env variables + for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do if [[ -x "${ghc}/bin/$prg" ]]; then rm -f $out/bin/$prg diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 6999ee07e3d0..2d27185a9fca 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2"; + sha256 = "1q05f1s581nk475a8d9hakh2irgvsg50x3084yjzhrcmmykwnysi"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 824c68688803..d08c4e517cb7 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -21,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1.6"; + version = "19.2"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; + sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; }; buildInputs = @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { debugInfo = enableDebugInfo; + prePatch = '' + substituteInPlace configure.in \ + --replace '`sw_vers -productVersion`' '10.10' + ''; + preConfigure = '' ./otp_build autoconf ''; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 9f3307742ec4..101322f3f531 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.20.0"; + version = "0.24.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2"; + sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s"; }; buildInputs = [ lv2 pkgconfig python serd sord sratom ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { homepage = http://drobilla.net/software/lilv; diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix deleted file mode 100644 index 0b02774bc172..000000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-svn.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord-svn, sratom }: - -stdenv.mkDerivation rec { - name = "lilv-svn-${rev}"; - rev = "5675"; - - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/lilv"; - rev = rev; - sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq"; - }; - - buildInputs = [ lv2 pkgconfig python serd sord-svn sratom ]; - - configurePhase = "python waf configure --prefix=$out"; - - buildPhase = "python waf"; - - installPhase = "python waf install"; - - meta = with stdenv.lib; { - homepage = http://drobilla.net/software/lilv; - description = "A C library to make the use of LV2 plugins"; - license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index fad8dc86bd14..dafd39efee98 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "lv2-${version}"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { url = "http://lv2plug.in/spec/${name}.tar.bz2"; - sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks"; + sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq"; }; buildInputs = [ gtk2 libsndfile pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { homepage = http://lv2plug.in; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 97d7dd831551..94102c385497 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchsvn, boost, gtk2, pkgconfig, python }: +{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "raul-svn-${rev}"; - rev = "5675"; + name = "raul-unstable-${rev}"; + rev = "2016-09-20"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/raul"; - rev = rev; - sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/raul.git"; + rev = "f8bf77d3c3b77830aedafb9ebb5cdadfea7ed07a"; + sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; }; buildInputs = [ boost gtk2 pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index a4ba4c16c872..816baa5221e6 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "sratom-${version}"; - version = "0.4.6"; + version = "0.6.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4"; + sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; buildInputs = [ lv2 pkgconfig python serd sord ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sratom; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 97a975232602..64e3690eb3e6 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, bash, pkgconfig }: stdenv.mkDerivation rec { name = "capstone-${version}"; @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs make.sh ''; buildPhase = '' ./make.sh ''; installPhase = '' env PREFIX=$out ./make.sh install ''; + + nativeBuildInputs = [ + pkgconfig + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix new file mode 100644 index 000000000000..7587ca7c3cac --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/3.2.nix @@ -0,0 +1,13 @@ +{ stdenv, callPackage +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.2"; + branch = "3.2"; + sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb"; + darwinFrameworks = [ Cocoa CoreMedia ]; + patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; +}) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index e3dfc9fe0a90..5dbf22df552d 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "getdata-0.8.9"; + name = "getdata-${version}"; + version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/getdata/${name}.tar.bz2"; - sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51"; + url = "mirror://sourceforge/getdata/${name}.tar.xz"; + sha256 = "0kikla8sxv6f1rlh77m86dajcsa7b1029zb8iigrmksic27mj9ja"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix deleted file mode 100644 index 4ea430865485..000000000000 --- a/pkgs/development/libraries/git2/0.21.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: - -stdenv.mkDerivation rec { - version = "0.21.2"; - name = "libgit2-${version}"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y"; - }; - - cmakeFlags = "-DTHREADSAFE=ON"; - - nativeBuildInputs = [ cmake python ]; - buildInputs = [ zlib libssh2 openssl http-parser ]; - - meta = { - description = "The Git linkable library"; - homepage = http://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 2bd500b9efbc..51e366ba29cd 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.3"; + version = "0.24.6"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh"; + sha256 = "070jrv690bd5dq991lc32qfnai9ywvrjzsfgi3rcw6kw4l2ynxjr"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 0e1e3c4897eb..5b2ba728f3a8 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty +, ApplicationServices , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). minimalDeps ? false @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ libintlOrEmpty; + ++ libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index bcbbecd242dc..306e2db29ce9 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ] - ++ optionals (gdktarget == "quartz") [ AppKit Cocoa ]; + ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; configureFlags = [ "--with-gdktarget=${gdktarget}" diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index cf5c264fc8d8..36b2c469eaf4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-2.0.6"; + name = "jasper-2.0.10"; src = fetchurl { # You can find this code on Github at https://github.com/mdadams/jasper # however note at https://www.ece.uvic.ca/~frodo/jasper/#download # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk"; + sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l"; }; # newer reconf to recognize a multiout flag diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 5ca0631730bc..9c8d06b14c68 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.30/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 161ce52d4f28..029a661601df 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,6 +1,8 @@ -{ kdeFramework, lib, ecm, kbookmarks, kcompletion -, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage -, kwidgetsaddons, libXcursor, qtx11extras +{ + kdeFramework, lib, + ecm, + kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, + knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras }: kdeFramework { @@ -9,6 +11,6 @@ kdeFramework { nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes - knotifications kpackage kwidgetsaddons libXcursor qtx11extras + knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index a1f289f5f2ba..f5add12e8eca 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation { makeWrapper "$drv/$t" "$out/$t" \ --argv0 '"$0"' \ --suffix PATH : "$env/bin" \ - --prefix XDG_CONFIG_DIRS : "$env/share" \ - --prefix XDG_DATA_DIRS : "$env/etc/xdg" \ + --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ + --prefix XDG_DATA_DIRS : "$env/share" \ --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" @@ -62,8 +62,6 @@ stdenv.mkDerivation { done mkdir -p "$out/nix-support" - for drv in $unwrapped; do - echo "$drv" >> "$out/nix-support/propagated-user-env-packages" - done + echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages" ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch index e9d744448148..5fa1c3fe79b2 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch @@ -1,8 +1,8 @@ -Index: kpackage-5.18.0/src/kpackage/package.cpp +Index: kpackage-5.30.0/src/kpackage/package.cpp =================================================================== ---- kpackage-5.18.0.orig/src/kpackage/package.cpp -+++ kpackage-5.18.0/src/kpackage/package.cpp -@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() +--- kpackage-5.30.0.orig/src/kpackage/package.cpp ++++ kpackage-5.30.0/src/kpackage/package.cpp +@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() : QSharedData(), fallbackPackage(0), metadata(0), diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch index ddbf17d00064..cab334838ee7 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch @@ -1,21 +1,21 @@ -Index: kpackage-5.18.0/src/kpackage/packageloader.cpp +Index: kpackage-5.30.0/src/kpackage/packageloader.cpp =================================================================== ---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp -+++ kpackage-5.18.0/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList PackageLoader::li +--- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp ++++ kpackage-5.30.0/src/kpackage/packageloader.cpp +@@ -238,7 +238,7 @@ QList PackageLoader::li } else { //qDebug() << "Not cached"; // If there's no cache file, fall back to listing the directory - const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; + const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json"); + const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") }; QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp =================================================================== ---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp -+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp -@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, +--- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp +@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir, QJsonArray plugins; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 7bc0f55dc8b5..0783c3bd9ed4 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,595 @@ { attica = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/attica-5.29.0.tar.xz"; - sha256 = "1xiaqqq77w0hxr79rpixvy5kak2xgxwi5860qf3bbpz89bpyi5d1"; - name = "attica-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/attica-5.30.0.tar.xz"; + sha256 = "1v8y6dx5qcqrs1dlybmc3lx05qsra0111qf7kzlq8azljdy20i2v"; + name = "attica-5.30.0.tar.xz"; }; }; baloo = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/baloo-5.29.0.tar.xz"; - sha256 = "06zq0nnqm8qs4dx548l952i5hi6yazi4c3kb75d0k6jvjsfhgh3n"; - name = "baloo-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/baloo-5.30.0.tar.xz"; + sha256 = "022frn2f5mw71496r2i70q3z9diq6d5386nh8aymvii0l84c0mm9"; + name = "baloo-5.30.0.tar.xz"; }; }; bluez-qt = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/bluez-qt-5.29.0.tar.xz"; - sha256 = "15rnh8vnmxrq6phvk3g7x69pvsblhrr91z4ldd8x4q895dpwk3vg"; - name = "bluez-qt-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/bluez-qt-5.30.0.tar.xz"; + sha256 = "1asf2hcljzhca9pmh42fz25nnp05xxf4yab4r13wwwdzk4ms0x6f"; + name = "bluez-qt-5.30.0.tar.xz"; }; }; breeze-icons = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/breeze-icons-5.29.0.tar.xz"; - sha256 = "1bpvpza0hm3krr4b6pp9aakmjs4vnmk2bbl9zirzsj7rg2nnrb8b"; - name = "breeze-icons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/breeze-icons-5.30.0.tar.xz"; + sha256 = "0n8705sly52sp4lsikr8xs671ch23ykk8xg3ksb9na700v837rak"; + name = "breeze-icons-5.30.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz"; - sha256 = "1n4q1s9q3gnxp050s0kddabbhgl0rfxrpsmfci5vsd92dri6xxs8"; - name = "extra-cmake-modules-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/extra-cmake-modules-5.30.0.tar.xz"; + sha256 = "0v59f76ghqckg857559sb4vla1d6pza4hj5bai8dnd712isn9abx"; + name = "extra-cmake-modules-5.30.0.tar.xz"; }; }; frameworkintegration = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/frameworkintegration-5.29.0.tar.xz"; - sha256 = "0ljsrz1yyj09k00q0xx0zps3wi6wrmkqvxrc81kw0qv14d5rxf7b"; - name = "frameworkintegration-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/frameworkintegration-5.30.0.tar.xz"; + sha256 = "1a9zqd96jn9p8niqz0jwclfl1np1ryszdz8q02s9cwy35zia1dfk"; + name = "frameworkintegration-5.30.0.tar.xz"; }; }; kactivities = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kactivities-5.29.0.tar.xz"; - sha256 = "1mnpqwz6rfv07fmpdccp2fxxf0pdjp2b8jamjfn51zk4krz0vjrr"; - name = "kactivities-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kactivities-5.30.0.tar.xz"; + sha256 = "0njq8jc9vqag3h6ryjiraib44sgrd66fswnldl0w0n2kvgf948qv"; + name = "kactivities-5.30.0.tar.xz"; }; }; kactivities-stats = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kactivities-stats-5.29.0.tar.xz"; - sha256 = "16cxmp9pzmcap722fclx8xjap56ldslghcn8qj0n8ds5crcd6h80"; - name = "kactivities-stats-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kactivities-stats-5.30.0.tar.xz"; + sha256 = "116mcnadlqidx90hllpwkxrmhwapnvmak5rzmqngnzkdvrpicl6r"; + name = "kactivities-stats-5.30.0.tar.xz"; }; }; kapidox = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kapidox-5.29.0.tar.xz"; - sha256 = "184jjm3kyb1m1mdqac8h37g4cibni86zan4d52ac00mz7lmibmhp"; - name = "kapidox-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kapidox-5.30.0.tar.xz"; + sha256 = "08qpbmgw8cb4ygs4m3y9529dwsyn7nrln5rkfmbfkvfjlfry7njf"; + name = "kapidox-5.30.0.tar.xz"; }; }; karchive = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/karchive-5.29.0.tar.xz"; - sha256 = "11i9kj890n2y4mgs3vykfg0r5iva4g3ydk3ywbkcmvryd2hvp4ch"; - name = "karchive-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/karchive-5.30.0.tar.xz"; + sha256 = "0f0zax2hihiq504nr3m5vap0ssmx5hvnc3rxk006zgvwgr1mvcqq"; + name = "karchive-5.30.0.tar.xz"; }; }; kauth = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kauth-5.29.0.tar.xz"; - sha256 = "0789q90sk4203x94y508sd03zzd7pll9yg480kbfavqr8bxivigj"; - name = "kauth-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kauth-5.30.0.tar.xz"; + sha256 = "0qf0wkkiaykcl79q0rsfmg7h7v342ycz9s6xr841qqs9w17dns3c"; + name = "kauth-5.30.0.tar.xz"; }; }; kbookmarks = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kbookmarks-5.29.0.tar.xz"; - sha256 = "1ipziszcf7hddzi0kd41ddz56m79dy6jz325k37byzmc4xj15abi"; - name = "kbookmarks-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kbookmarks-5.30.0.tar.xz"; + sha256 = "0cibgw032n9n92fp78w04qw851lp3bfkd1rnyqvz7biypx4cz82z"; + name = "kbookmarks-5.30.0.tar.xz"; }; }; kcmutils = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kcmutils-5.29.0.tar.xz"; - sha256 = "1winmnr1pdspj3i3qwlblqsppb641yj3bcvl50xy8gh47w1n39q2"; - name = "kcmutils-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kcmutils-5.30.0.tar.xz"; + sha256 = "12x32jwf8gb77l5brj169ahrgdlsmn0zrzmjfp7f4dfykfnbfws9"; + name = "kcmutils-5.30.0.tar.xz"; }; }; kcodecs = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kcodecs-5.29.0.tar.xz"; - sha256 = "0ki9aws9kfhcchp8qwl696qwcgz4a2z4w1f9rarl7hblhlly0mx7"; - name = "kcodecs-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kcodecs-5.30.0.tar.xz"; + sha256 = "1via1xv4qswlyasyppi3q3a76bl5hk5ji34k63bp06p029ar7dkf"; + name = "kcodecs-5.30.0.tar.xz"; }; }; kcompletion = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kcompletion-5.29.0.tar.xz"; - sha256 = "1h2yd5gsb24h7k41fcmmbg96i4k3rmqc5pgp6vnb7m767mlcy6kb"; - name = "kcompletion-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kcompletion-5.30.0.tar.xz"; + sha256 = "1205xq2r550lb4v39h3g1sr8cgsysfkkxkk5scp4d92vawlbsrx6"; + name = "kcompletion-5.30.0.tar.xz"; }; }; kconfig = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kconfig-5.29.0.tar.xz"; - sha256 = "0izss1hz41pbmfsxa8xlj5f6hx4r5jjpapp1km9926yy104jxhfn"; - name = "kconfig-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kconfig-5.30.0.tar.xz"; + sha256 = "1p23q7ykkrsj847m244v1wjcg7b85rh7shc8lkn290cydk5kr6m2"; + name = "kconfig-5.30.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz"; - sha256 = "0xay4kfz3cfhs82h0qp707qflb4vxrar7sh7b7wwkp4s0yhq15fa"; - name = "kconfigwidgets-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kconfigwidgets-5.30.0.tar.xz"; + sha256 = "15ir4qr4hzr8ia9g8c13fnn2szhs07wys54nialbj0dggx9qa782"; + name = "kconfigwidgets-5.30.0.tar.xz"; }; }; kcoreaddons = { - version = "5.29.0"; + version = "5.30.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kcoreaddons-5.29.0.tar.xz"; - sha256 = "1xmk9hqrzfn7bix9ch5v7nrl7ff16z1pmz3rghyb06cvvbx3k2z2"; - name = "kcoreaddons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.1.tar.xz"; + sha256 = "0w1yqcvd97jhm3w2x7mmayrifb1swda8lmzzmlz41crsq909ilnd"; + name = "kcoreaddons-5.30.1.tar.xz"; }; }; kcrash = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kcrash-5.29.0.tar.xz"; - sha256 = "097294n52ac2mh55i8cwvx75rfgr12kvpf5zszha97whn0hm9nrv"; - name = "kcrash-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kcrash-5.30.0.tar.xz"; + sha256 = "0hmcg81iahd2bvcm57yk7mdy6lnrsrzl7z6cv8lxpj9xw0ajd8h4"; + name = "kcrash-5.30.0.tar.xz"; }; }; kdbusaddons = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdbusaddons-5.29.0.tar.xz"; - sha256 = "15is9d0kmcwd7qy8annf2y1bqwq3vwcrlqym1pjsifyc5n226b0j"; - name = "kdbusaddons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdbusaddons-5.30.0.tar.xz"; + sha256 = "1ql5xjxfq8y0bmagq2zw44rilyrm1cmkjsfcfrjy0d2adhl23w7p"; + name = "kdbusaddons-5.30.0.tar.xz"; }; }; kdeclarative = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdeclarative-5.29.0.tar.xz"; - sha256 = "0ki58bd97a7vw90989msxy9npgha6652qhydn8ks0x8gxd9zwcq3"; - name = "kdeclarative-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdeclarative-5.30.0.tar.xz"; + sha256 = "0898mxh7izxn9d4iyv8gsxrjl2wms4m6mr69qd4bfygd8z8hqp46"; + name = "kdeclarative-5.30.0.tar.xz"; }; }; kded = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kded-5.29.0.tar.xz"; - sha256 = "092j7a7jm0h4lc0yphy5z6mg3r29fxjvghajcdla5vfqha33j8pb"; - name = "kded-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kded-5.30.0.tar.xz"; + sha256 = "1sqmnxii0i3m65cacjxasm99pq2cvfymbalak8r0mip8g8fdarrd"; + name = "kded-5.30.0.tar.xz"; }; }; kdelibs4support = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz"; - sha256 = "1wiilwgyk3rdxha076mz2wpwmpgaprv7j0c8bzk2qqmxph5n9hz1"; - name = "kdelibs4support-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/kdelibs4support-5.30.0.tar.xz"; + sha256 = "0fkg5bk1p91iq1na67h02wdqnq71ln8g22r6sc7rva54w5ilnwxm"; + name = "kdelibs4support-5.30.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz"; - sha256 = "01x8i7rm0c71cql57s7ikwdb03n1i0hkhgf88w24dzwnv7b6l2yg"; - name = "kdesignerplugin-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdesignerplugin-5.30.0.tar.xz"; + sha256 = "0hf7209zd398v4m3aa99yva1bbphzlyn0x9i5ydalwvwykmvjvdz"; + name = "kdesignerplugin-5.30.0.tar.xz"; }; }; kdesu = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdesu-5.29.0.tar.xz"; - sha256 = "1lkxfss8i641k09h4b5qcf7xiybskfrp8z1zzllcmjfaqfcwwk45"; - name = "kdesu-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdesu-5.30.0.tar.xz"; + sha256 = "1cnl6pap4399s7l9ggi23f5b6mscfddsgwra4d2qy1093y0nb8mk"; + name = "kdesu-5.30.0.tar.xz"; }; }; kdewebkit = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdewebkit-5.29.0.tar.xz"; - sha256 = "0xg41ij5in3n08np65wgf5h4qwy4p7y8nlrcn4qakiincif7xqs0"; - name = "kdewebkit-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdewebkit-5.30.0.tar.xz"; + sha256 = "1rq3ypsw2svvzfxjd6gj231phhnw19fwyr5qkcsik4076h6ycwvk"; + name = "kdewebkit-5.30.0.tar.xz"; }; }; kdnssd = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdnssd-5.29.0.tar.xz"; - sha256 = "1bg3z5ng43iy2v081n5ma8lk9qnhks2m95hmfn82wc19jb5lgvja"; - name = "kdnssd-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdnssd-5.30.0.tar.xz"; + sha256 = "1if1gaykgad5vg32p0impx4vwjaxd77r34gajg1kiywan6jpq6d8"; + name = "kdnssd-5.30.0.tar.xz"; }; }; kdoctools = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kdoctools-5.29.0.tar.xz"; - sha256 = "0zd3zc42avw4ml0i4ayvzif1s0lrg5770q8hvi7m2ycxip2xrfk0"; - name = "kdoctools-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kdoctools-5.30.0.tar.xz"; + sha256 = "14i7ffmlwqhbq7gp5k8wajvg7x65nwxr5p1qqgxhmpmranyickvy"; + name = "kdoctools-5.30.0.tar.xz"; }; }; kemoticons = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kemoticons-5.29.0.tar.xz"; - sha256 = "0xxm4haxkyqb3sbifbp9k58vb9n79y8h3c5xfxwc3y7xiwbswaba"; - name = "kemoticons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kemoticons-5.30.0.tar.xz"; + sha256 = "0h3a9xs110l1d2wyp8dfkaf3fnpc0wvfdacpgbnihk1xvccmq4nl"; + name = "kemoticons-5.30.0.tar.xz"; }; }; kfilemetadata = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kfilemetadata-5.29.0.tar.xz"; - sha256 = "1hliggn5h3mi81hz6d4flrv5d25bqbih6xq6miysrr7ws5vg07c2"; - name = "kfilemetadata-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kfilemetadata-5.30.0.tar.xz"; + sha256 = "1m07hj5nnb81wraylhh36f2k82zqxz5g766wwcn12pd8v0r99ilh"; + name = "kfilemetadata-5.30.0.tar.xz"; }; }; kglobalaccel = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kglobalaccel-5.29.0.tar.xz"; - sha256 = "0wsmnwxnmcgi7rnkvh4vfcvv9pwq1kcd98j5l6h9xwbirz247caz"; - name = "kglobalaccel-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kglobalaccel-5.30.0.tar.xz"; + sha256 = "123c7sqwj4davrwrgwy16qag8ss205pk9af4jc9sky74h531fdm1"; + name = "kglobalaccel-5.30.0.tar.xz"; }; }; kguiaddons = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kguiaddons-5.29.0.tar.xz"; - sha256 = "1cgq04k66xzmawqrgh2xhyl1dmylkcfsf1mgbilanq46niv6v47k"; - name = "kguiaddons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kguiaddons-5.30.0.tar.xz"; + sha256 = "0kn0ia6ciafng227lrrdslmxhh30426wywarxvihlcqfzrgmnpzm"; + name = "kguiaddons-5.30.0.tar.xz"; }; }; khtml = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz"; - sha256 = "1rrhpx5ny868nhd2z52zf4n2kybxv8lciyi3wla0k87gwcdm3ryv"; - name = "khtml-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/khtml-5.30.0.tar.xz"; + sha256 = "1z4pj3cr8bzbl80bi1z87lsg1adr9hbm60wf3811wdma2d4w4bbh"; + name = "khtml-5.30.0.tar.xz"; }; }; ki18n = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/ki18n-5.29.0.tar.xz"; - sha256 = "0w4nqyqi9p92vfi5b07s9k8hjmkj2qdclnyclsdy7lshkxsqfbm7"; - name = "ki18n-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/ki18n-5.30.0.tar.xz"; + sha256 = "1wvjrmpsypfhivk3hfpb9lm09d0w2c9lc4mxvbyfkibhan1x1lid"; + name = "ki18n-5.30.0.tar.xz"; }; }; kiconthemes = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kiconthemes-5.29.0.tar.xz"; - sha256 = "09dj6v7mvmhbkax35884g729ikfdvazvnhz327vgsb3ybbmx475h"; - name = "kiconthemes-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kiconthemes-5.30.0.tar.xz"; + sha256 = "0sixqg2fvm9m14xbn3dmsk564i9ig3zn6zf5ww10hnqd1wcd4sg9"; + name = "kiconthemes-5.30.0.tar.xz"; }; }; kidletime = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kidletime-5.29.0.tar.xz"; - sha256 = "0nnrgi38jn5r2gvmsg3425y1k53g5n5bzbhcf71d484d00740rix"; - name = "kidletime-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kidletime-5.30.0.tar.xz"; + sha256 = "1vbjvwy5ihz5id2484d2hn5a81p85vz3mvwpcjbypkd3y5mqcrq6"; + name = "kidletime-5.30.0.tar.xz"; }; }; kimageformats = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kimageformats-5.29.0.tar.xz"; - sha256 = "0385al48zdnpv2d2g59ls8y8fljlfyflpvrladxcqr75ywsap7xa"; - name = "kimageformats-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kimageformats-5.30.0.tar.xz"; + sha256 = "057a9gallq1j3a51ijyp47x82hmn8vssxb74jchlf90jjnyq4g2i"; + name = "kimageformats-5.30.0.tar.xz"; }; }; kinit = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kinit-5.29.0.tar.xz"; - sha256 = "0cqh8dljgr72zny4hhypc4j7mc6lrplbdvw262vszq5hqn25dn6n"; - name = "kinit-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kinit-5.30.0.tar.xz"; + sha256 = "047vxnq4ypl70vspq800k00cj2cjqd6hx46yp11m33np03106rj2"; + name = "kinit-5.30.0.tar.xz"; }; }; kio = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kio-5.29.0.tar.xz"; - sha256 = "0sswjmbjnfi7sh6j3qzc98jkpp3bwgmfmvg61r484sj65900xkjj"; - name = "kio-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kio-5.30.0.tar.xz"; + sha256 = "0finbv7kcaz81bsj6yv6pxwxcjrwkj5mmkxhg0pa5j77jn1nhnm1"; + name = "kio-5.30.0.tar.xz"; }; }; kitemmodels = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kitemmodels-5.29.0.tar.xz"; - sha256 = "1ss291hkvyhkzm5v1klrbhkkvw0f35acdf7q2x04ggs06cvryxw3"; - name = "kitemmodels-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kitemmodels-5.30.0.tar.xz"; + sha256 = "1yf2bfzxqgw75p5bi7byg9rbbiclhqayybiyd8cq3d8b8ws4bfdf"; + name = "kitemmodels-5.30.0.tar.xz"; }; }; kitemviews = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kitemviews-5.29.0.tar.xz"; - sha256 = "1872rynqi9pgc0670vhxa5n7r63arh4q1g62sw76xp5s0kzgxpvh"; - name = "kitemviews-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kitemviews-5.30.0.tar.xz"; + sha256 = "0fx4sdrflp2h0y6ixdnbaxd8l5cham4lx0f36y7dfz6jlk56d12y"; + name = "kitemviews-5.30.0.tar.xz"; }; }; kjobwidgets = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kjobwidgets-5.29.0.tar.xz"; - sha256 = "0sim3sxz02sg9y1vlp9d5xxby9anx2s10z80iys2mbhw1hw1ivn8"; - name = "kjobwidgets-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kjobwidgets-5.30.0.tar.xz"; + sha256 = "0ilzl1sm9fx7cx03nh5y2y656jfssp7b46xiawgnasvc94ysl9hf"; + name = "kjobwidgets-5.30.0.tar.xz"; }; }; kjs = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz"; - sha256 = "196lnlynnc4kf7hy2zw2dyba5h1mn6l5d1000h50g62fbg8xwh7k"; - name = "kjs-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/kjs-5.30.0.tar.xz"; + sha256 = "0yh7n0q1vbx8nd6j25jys6hd24m3knn44n6xc09pwnr3mn0shvih"; + name = "kjs-5.30.0.tar.xz"; }; }; kjsembed = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz"; - sha256 = "1g5ppari446fa4ybjgj5j63fz4grj341019w2s4dqyp05l5sf197"; - name = "kjsembed-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/kjsembed-5.30.0.tar.xz"; + sha256 = "0ixd56krz66psxk9h8dzd5jr693kh9xx4303zicws85014ba33q5"; + name = "kjsembed-5.30.0.tar.xz"; }; }; kmediaplayer = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz"; - sha256 = "0hs6vy28c0f41c8s0ip5ggy96rhrf3p3kb1d69v8z9yi1jd9jhaw"; - name = "kmediaplayer-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/kmediaplayer-5.30.0.tar.xz"; + sha256 = "0bir4g7bfhjdrs2skhr7jclc3f7frmfm6p8n2q10ag9in8h5hwd8"; + name = "kmediaplayer-5.30.0.tar.xz"; }; }; knewstuff = { - version = "5.29.0"; + version = "5.30.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/knewstuff-5.29.0.tar.xz"; - sha256 = "1cfkppd1p40lbadrj34lh7msix0bpqmnnc1xwh2wx35va58phrc1"; - name = "knewstuff-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.1.tar.xz"; + sha256 = "1vsaprynq6dazg64zmj6j1wd8g4aw6pzz3208nqgjjwk5kw8zh0h"; + name = "knewstuff-5.30.1.tar.xz"; }; }; knotifications = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/knotifications-5.29.0.tar.xz"; - sha256 = "0bb6s72p78wiq172fx5f07c55zvd3rackgh1fcgkzg84lnvzx938"; - name = "knotifications-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/knotifications-5.30.0.tar.xz"; + sha256 = "199jh1gizdwc1xz97khac9m6bdg38n5hr5c96pq7sk7b2rdr49ks"; + name = "knotifications-5.30.0.tar.xz"; }; }; knotifyconfig = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/knotifyconfig-5.29.0.tar.xz"; - sha256 = "1kab22gfb12bc2dl87m13crcrwhf8djdr8cmwrykjdm1ln2a1d4w"; - name = "knotifyconfig-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/knotifyconfig-5.30.0.tar.xz"; + sha256 = "04l5hjdd0376y9ygmrz8a49w8hxnb01y0fi13spvkmx8dhal0fmq"; + name = "knotifyconfig-5.30.0.tar.xz"; }; }; kpackage = { - version = "5.29.1"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz"; - sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali"; - name = "kpackage-5.29.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kpackage-5.30.0.tar.xz"; + sha256 = "1j1vwna5w67wqsdfl5s83gx7vizj5qnsl6nck7ny055yzzwb2gna"; + name = "kpackage-5.30.0.tar.xz"; }; }; kparts = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kparts-5.29.0.tar.xz"; - sha256 = "0arpaz5qdswyj47z9craijsf4zafh50bw8vvklg1jc385bbgxhv1"; - name = "kparts-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kparts-5.30.0.tar.xz"; + sha256 = "1sgqylynq35d6xir99kgqial3p0pf0lcaqagl2vh1qandipmcp8g"; + name = "kparts-5.30.0.tar.xz"; }; }; kpeople = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kpeople-5.29.0.tar.xz"; - sha256 = "19sb0j5qbi299f752z589cbbh3rjxkzm074v3rj9sqgah1hdssg8"; - name = "kpeople-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kpeople-5.30.0.tar.xz"; + sha256 = "1h72fwr6121w0cfhaci32s4510kwinjah9ynfhjl998mg00k42hj"; + name = "kpeople-5.30.0.tar.xz"; }; }; kplotting = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kplotting-5.29.0.tar.xz"; - sha256 = "07yz1f5ifjvxsaphbyvbvqzvmc1w6rkb9fh8xglf8z9p9drz23qb"; - name = "kplotting-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kplotting-5.30.0.tar.xz"; + sha256 = "00wrz16m4blh130713fk0q3gzpsx33zs6wnd4ghwhaakmqydn2gh"; + name = "kplotting-5.30.0.tar.xz"; }; }; kpty = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kpty-5.29.0.tar.xz"; - sha256 = "08b8qg35g9g4rkfn6zwv2kggh6y5wlg33zbj28n1idszq6qpgh7i"; - name = "kpty-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kpty-5.30.0.tar.xz"; + sha256 = "0dna8a0n7lg22522khxq0vxn76g484198p80hzvysnkl218fav60"; + name = "kpty-5.30.0.tar.xz"; }; }; kross = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/portingAids/kross-5.29.0.tar.xz"; - sha256 = "1q6pm6iv3896y1sj7b8p7agjlzfi9f5qmpbadk499d0rn9c6520v"; - name = "kross-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/portingAids/kross-5.30.0.tar.xz"; + sha256 = "1bqfznfrr87c88ffs7hj0iqcv8vgzrz57l31zpij3cgiy09q7axz"; + name = "kross-5.30.0.tar.xz"; }; }; krunner = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/krunner-5.29.0.tar.xz"; - sha256 = "1kjzl239a136p6zpkgj570s5i649hzwrgylq213jh31h251a93qx"; - name = "krunner-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/krunner-5.30.0.tar.xz"; + sha256 = "1smkanc14nlsdrg31skzb9y7f0fahyf09iq1h2xfla4kvgk811qz"; + name = "krunner-5.30.0.tar.xz"; }; }; kservice = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kservice-5.29.0.tar.xz"; - sha256 = "0440hgcwm8p421y8xrlill9n2bzfrr0v8ln7pcm45b09bwsgz5l7"; - name = "kservice-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kservice-5.30.0.tar.xz"; + sha256 = "1jcb938m3kllmrzmwz21zjlhrx0r6dmyrglsf0zbjs2cg9hwww0l"; + name = "kservice-5.30.0.tar.xz"; }; }; ktexteditor = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/ktexteditor-5.29.0.tar.xz"; - sha256 = "19krz968bxyv9r43gw1nh7fkkfsgsidhg2k9z0p7cplm6asqvdas"; - name = "ktexteditor-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/ktexteditor-5.30.0.tar.xz"; + sha256 = "0bhbcqfkmpy95p3w66xxnhi4h7h3k3k362fhsrl38rc83r9agnns"; + name = "ktexteditor-5.30.0.tar.xz"; }; }; ktextwidgets = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/ktextwidgets-5.29.0.tar.xz"; - sha256 = "11iwcak2r12wxbkj8i7pg3g1cnymmgh8lvkpbsszkmyisqbyrz27"; - name = "ktextwidgets-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/ktextwidgets-5.30.0.tar.xz"; + sha256 = "1fpqjig6wzb1gycvak9h4p48c623fkzj2lxvf0p3vmb6b0yxr1jw"; + name = "ktextwidgets-5.30.0.tar.xz"; }; }; kunitconversion = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kunitconversion-5.29.0.tar.xz"; - sha256 = "1vzmx3wiphi88xc5dh69vj5jdmz0pxzbiiqiqyi38a1nkq7a9pv7"; - name = "kunitconversion-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kunitconversion-5.30.0.tar.xz"; + sha256 = "0fjkl355dwcgd4a39212qwmmbj37nfhmw3ik2bxg3gxg07a4yra5"; + name = "kunitconversion-5.30.0.tar.xz"; }; }; kwallet = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kwallet-5.29.0.tar.xz"; - sha256 = "15jcn8zg7bz2vn6kwxvj0b6k9kpnx48zrcfa2ibb1rjp71cxgwc1"; - name = "kwallet-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kwallet-5.30.0.tar.xz"; + sha256 = "1nnc0gcn7w5jmmzs4zr4qlrhn3ns9x42f2dfcwc5vi281gghl54k"; + name = "kwallet-5.30.0.tar.xz"; }; }; kwayland = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kwayland-5.29.0.tar.xz"; - sha256 = "0mz9v7g91im2xwdh5f4ym8z52ylva7kyr0hxl5p88b7y6azxqmz9"; - name = "kwayland-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kwayland-5.30.0.tar.xz"; + sha256 = "0sc2mdiazql2012qadbqjm4wxmhhanbba9r9qjxqx2li14ax6yci"; + name = "kwayland-5.30.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz"; - sha256 = "19hvs3jqmj0jwsjszq6fn7m6d5d80bsd5wz4x8m39w1nmsgj032d"; - name = "kwidgetsaddons-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kwidgetsaddons-5.30.0.tar.xz"; + sha256 = "0jn2iw46cwfqh550rrb37yfznr4lrlsj8bh8v21xhgm3afm25hrl"; + name = "kwidgetsaddons-5.30.0.tar.xz"; }; }; kwindowsystem = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kwindowsystem-5.29.0.tar.xz"; - sha256 = "19bzirhkjqn41f9n540wnhrc0y5qvxcbgi87np9ijc3mpkzfn7in"; - name = "kwindowsystem-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kwindowsystem-5.30.0.tar.xz"; + sha256 = "0sz1wyawah03ygx3kh1x6wy1y1gp9f5h6296yy1mxy4qz4jp1b10"; + name = "kwindowsystem-5.30.0.tar.xz"; }; }; kxmlgui = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kxmlgui-5.29.0.tar.xz"; - sha256 = "1h85hiy58jl25r7d9z43kkybfvd2hjk5l4nmcy9jw5lrmmgnrgq0"; - name = "kxmlgui-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kxmlgui-5.30.0.tar.xz"; + sha256 = "005cn74h0rjvjsmfzrn3pai0jrgczj3y6h50g07rgmynmrcnygys"; + name = "kxmlgui-5.30.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz"; - sha256 = "09rw4id0lg5j4ql46vj2pvwnjcn5nk40s0bl03z8jkqygg8w57b2"; - name = "kxmlrpcclient-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/kxmlrpcclient-5.30.0.tar.xz"; + sha256 = "18azc85vfng9gnjf09yhvg5g4432dy5ia9hk54jk9ibmy7kaqlqq"; + name = "kxmlrpcclient-5.30.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz"; - sha256 = "08imlqr8xxah58gcyqv968gbmamf2xkjg31cs32h79yqcddjpvrd"; - name = "modemmanager-qt-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/modemmanager-qt-5.30.0.tar.xz"; + sha256 = "1qh39nd3lwdb8z58brqf0k48k5n3xx9wdi4kak2wg7vwmqwwammf"; + name = "modemmanager-qt-5.30.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz"; - sha256 = "0km2yv0gpl584n6vh27d0q0lrrmc79hpcfxwihwk6g5rrlv5qnba"; - name = "networkmanager-qt-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/networkmanager-qt-5.30.0.tar.xz"; + sha256 = "1scxcqrwxjwdzg2j3r6wz3bk23h7v9dil8n892ykfrpxa4cidgzi"; + name = "networkmanager-qt-5.30.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz"; - sha256 = "1j9jxlfzndzimvk0zvk5nqqnic5bj04yg4a0v9kqlmr8l1mj4g4k"; - name = "oxygen-icons5-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/oxygen-icons5-5.30.0.tar.xz"; + sha256 = "1b1kfgk2vgr85kbgvx8fwpyib5yvdkz07vi6p1s8a61cabcymkhl"; + name = "oxygen-icons5-5.30.0.tar.xz"; }; }; plasma-framework = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/plasma-framework-5.29.0.tar.xz"; - sha256 = "1c341i5gvm65mk8dhwn61fmw0hc1npvj3mcwz0gy1ynkgch6afrh"; - name = "plasma-framework-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/plasma-framework-5.30.0.tar.xz"; + sha256 = "1qdyc0li07sns71gdyw31jhzhnghcvzc0r0y4y8f157nyz23pw70"; + name = "plasma-framework-5.30.0.tar.xz"; }; }; prison = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/prison-5.29.0.tar.xz"; - sha256 = "0hc7gk1xxhk5s6fk6rm822kpbr2k0kc40xpjg07gpglbvnxdbr7l"; - name = "prison-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/prison-5.30.0.tar.xz"; + sha256 = "15vlz67qv1pm87hlnyak2jbdw87xw3jx3vaqwjfn07hbzlh8dmpc"; + name = "prison-5.30.0.tar.xz"; }; }; solid = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/solid-5.29.0.tar.xz"; - sha256 = "01y9fqar113bjh5l8mh03xwgv1j88ivnb1rxjcpgilv63qx2cw9k"; - name = "solid-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/solid-5.30.0.tar.xz"; + sha256 = "10rfsp39s8d8zgz02f4biyh9n7hbwxkib5r6g3cldbbf0ch3inmh"; + name = "solid-5.30.0.tar.xz"; }; }; sonnet = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/sonnet-5.29.0.tar.xz"; - sha256 = "0rb9fslf6y694cwbng198r21nrid07gzirn3c11g91skskh8sd90"; - name = "sonnet-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/sonnet-5.30.0.tar.xz"; + sha256 = "1i4i59vjq16mmqjfyr5hc7afnc5w2h54iz4rmqi0wdfk37cl5zcr"; + name = "sonnet-5.30.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz"; - sha256 = "0fbqkj3qsai3m322d2qmvh93h35sx7wdc28jxp8v8yddl59a1k6b"; - name = "syntax-highlighting-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/syntax-highlighting-5.30.0.tar.xz"; + sha256 = "0iipg1khc27a3cgysk6qpj5lf846z3n29gj2yas36lgr8n6ddm53"; + name = "syntax-highlighting-5.30.0.tar.xz"; }; }; threadweaver = { - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/threadweaver-5.29.0.tar.xz"; - sha256 = "0sl9r6dz4l63f40a15kzsgqrsvdaxnm1rqkj61za8cbdbk2q42g6"; - name = "threadweaver-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.30/threadweaver-5.30.0.tar.xz"; + sha256 = "12zirga9qyjrizwxja2n5mh7kxgdb7xyl2d3makdjpnjk5kry8by"; + name = "threadweaver-5.30.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 60535edfea63..7bf969b78da9 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,9 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; }; let result = { - libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8"; libav_11 = libavFun "11.8" "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh"; + libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 5aedc0df2b92..0f8207e83c82 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; + outputs = [ "out" "dev" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 34727c1e5f64..150e7455c032 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -11,23 +11,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; + # Warning causes build to fail on darwin since 4.9, + # check if this can be removed in the next release. + CFLAGS = "-Wno-sign-compare"; + buildInputs = [ perl texinfo ]; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/libtasn1/; description = "An ASN.1 library"; - - longDescription = - '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some - other packages. The goal of this implementation is to be highly - portable, and only require an ANSI C89 platform. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ wkennington ]; - platforms = stdenv.lib.platforms.all; + longDescription = '' + Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some + other packages. The goal of this implementation is to be highly + portable, and only require an ANSI C89 platform. + ''; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 93f62376ac63..f7e477ff34a1 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, - libXrandr, randrproto, libXtst, zlib, libgcrypt + libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook + , systemd, pkgconfig, libpng }: assert stdenv.isLinux; @@ -10,16 +11,16 @@ let s = # Generated upstream information rec { baseName="libvncserver"; - version="0.9.9"; + version="0.9.11"; name="${baseName}-${version}"; - hash="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; - url="mirror://sourceforge/project/libvncserver/libvncserver/0.9.9/LibVNCServer-0.9.9.tar.gz"; - sha256="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; + url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; + sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; }; buildInputs = [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama - libXrandr randrproto libXtst zlib libgcrypt + libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd + pkgconfig libpng ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/libvncserver/default.upstream b/pkgs/development/libraries/libvncserver/default.upstream deleted file mode 100644 index eae481974398..000000000000 --- a/pkgs/development/libraries/libvncserver/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://sourceforge.net/projects/libvncserver/files/libvncserver/ -SF_version_dir -version_link '[.]tar[.][bgx]z[0-9]*/download$' -SF_redirect diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index da4b8a8570b9..b33950d35e04 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.2"; + name = "matio-1.5.9"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0i8xj4g1gv50y6lj3s8hasjqspaawqbrnc06lrkdghvk6gxx00nv"; + sha256 = "0p60c3wdj4w7v7hzdc0iivciq4hwxzhhx0zq8gpv9i8yhdjzkdxy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b99498f2013e..b5ec5198975e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm +, ApplicationServices }: let ver_maj = "2.40"; @@ -14,7 +15,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [ + ApplicationServices + ]; propagatedBuildInputs = [ pango glibmm cairomm ]; doCheck = true; diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix new file mode 100644 index 000000000000..5c78c1a288f6 --- /dev/null +++ b/pkgs/development/libraries/psol/default.nix @@ -0,0 +1,5 @@ +{ callPackage }: +callPackage ./generic.nix {} { + version = "1.11.33.4"; + sha256 = "1jq2llp0i4666rwqnx1hs4pjlpblxivvs1jkkjzlmdbsv28jzjq8"; +} diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix new file mode 100644 index 000000000000..3e82bb4975dc --- /dev/null +++ b/pkgs/development/libraries/psol/generic.nix @@ -0,0 +1,16 @@ +{ fetchzip, stdenv }: +{ version, sha256 }: +{ inherit version; } // fetchzip { + inherit sha256; + name = "psol-${version}"; + url = "https://dl.google.com/dl/page-speed/psol/${version}.tar.gz"; + + meta = { + description = "PageSpeed Optimization Libraries"; + homepage = "https://developers.google.com/speed/pagespeed/psol"; + license = stdenv.lib.licenses.asl20; + # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. + # TODO: Build PSOL from source to support more platforms. + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 6ff7e387ec1f..e5870ce9c9b1 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index c0935bd33fd0..d68503298fc0 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.20.0"; + version = "0.24.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1gxbzqsm212wmn8qkdd3lbl6wbv7fwmaf9qh2nxa4yxjbr7mylb4"; + sha256 = "0v3a9xss5ailrnb3flfjyl6l9pmp51dc02p0lr6phvwsipg8mywc"; }; buildInputs = [ pcre pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { homepage = http://drobilla.net/software/serd; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 96a19bf37cc9..01ea4c4a1626 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { name = "sord-${version}"; - version = "0.12.2"; + version = "0.16.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx"; + sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; buildInputs = [ pkgconfig python serd ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sord; diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix deleted file mode 100644 index 290e85d81c7e..000000000000 --- a/pkgs/development/libraries/sord/sord-svn.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchsvn, pkgconfig, python, serd }: - -stdenv.mkDerivation rec { - name = "sord-svn-${rev}"; - rev = "327"; - - src = fetchsvn { - url = "http://svn.drobilla.net/sord/trunk"; - rev = rev; - sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4"; - }; - - buildInputs = [ pkgconfig python serd ]; - - configurePhase = "python waf configure --prefix=$out"; - - buildPhase = "python waf"; - - installPhase = "python waf install"; - - meta = with stdenv.lib; { - homepage = http://drobilla.net/software/sord; - description = "A lightweight C library for storing RDF data in memory"; - license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/udunits/configure.patch b/pkgs/development/libraries/udunits/configure.patch deleted file mode 100644 index 36a0efb8590e..000000000000 --- a/pkgs/development/libraries/udunits/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' udunits-2.1.24_orig/configure udunits-2.1.24/configure ---- udunits-2.1.24_orig/configure 2011-09-13 05:58:39.000000000 +0900 -+++ udunits-2.1.24/configure 2014-11-21 21:59:30.308180814 +0900 -@@ -7033,7 +7033,7 @@ - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- case `/usr/bin/file conftest.o` in -+ case `$MAGIC_CMD conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index a48f4487dd5d..74b89fbe48c1 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,13 +3,14 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.20"; + name = "udunits-2.2.21"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "15fiv66ni6fmyz96k138vrjd7cx6ndxrj6c71pah18n69c0h42pi"; + sha256 = "0z8sglqc3d409cylqln53jrv97rw7npyh929y2xdvbc40kzzaxcv"; }; - buildInputs = [ bison flex expat file ]; + nativeBuildInputs = [ bison flex file ]; + buildInputs = [ expat ]; meta = with stdenv.lib; { homepage = http://www.unidata.ucar.edu/software/udunits/; diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix new file mode 100644 index 000000000000..41d68cdc4c42 --- /dev/null +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-omd-1.3.0"; + src = fetchurl { + url = http://pw374.github.io/distrib/omd/omd-1.3.0.tar.gz; + sha256 = "0d0r6c4s3hq11d0qjc0bc1s84hz7k8nfg5q6g239as8myam4a80w"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + meta = { + description = "Extensible Markdown library and tool in OCaml"; + homepage = https://github.com/ocaml/omd; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix new file mode 100644 index 000000000000..7ac6af3edd93 --- /dev/null +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-owee-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "let-def"; + repo = "owee"; + rev = "v${version}"; + sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "An experimental OCaml library to work with DWARF format"; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix new file mode 100644 index 000000000000..7fb7b7f5e685 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -0,0 +1,21 @@ +{stdenv, buildPythonPackage, fetchurl}: + +buildPythonPackage rec { + name = "pyroute2-0.4.12"; + + src = fetchurl { + url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; + sha256 = "0csp6y38pgswhn46rivdgrlqw99dpjzwa0g32h6iiaj12n2f9qlq"; + }; + + # requires root priviledges + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Netlink library"; + homepage = https://github.com/svinota/pyroute2; + license = licenses.asl20; + maintainers = [maintainers.mic92]; + platform = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix new file mode 100644 index 000000000000..7f9f3b6467af --- /dev/null +++ b/pkgs/development/python-modules/yenc/default.nix @@ -0,0 +1,32 @@ +{ fetchurl +, lib +, buildPythonPackage +, python +, isPyPy +, isPy3k +}: + +let + pname = "yenc"; + version = "0.4.0"; +in buildPythonPackage { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/dual75/yenc/get/${version}.tar.gz"; + sha256 = "0zkyzxgq30mbrzpnqam4md0cb09d5falh06m0npc81nnlhcghkp7"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s test + ''; + + disabled = isPy3k || isPyPy; + + meta = { + description = "Encoding and decoding yEnc"; + license = lib.licenses.lgpl21; + homepage = https://bitbucket.org/dual75/yenc; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 7606705edd85..11ba86724e6b 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.4.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "0hl59g6252zi1j9zng5x5gqlmdwa4gz7mbvz8h3b7z4gnn2q5l6c"; + sha256 = "1ijzs5lwscg0k5ch1bljiqqh35rzai75xcgghgkjbz86ynmf62rd"; }; postPatch = '' @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb ]; + buildInputs = [ + cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb + ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix new file mode 100644 index 000000000000..35328fdf66cf --- /dev/null +++ b/pkgs/development/tools/gdm/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gdm-${version}"; + version = "1.4"; + + goPackagePath = "github.com/sparrc/gdm"; + + src = fetchFromGitHub { + owner = "sparrc"; + repo = "gdm"; + rev = version; + sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Minimalist dependency manager for Go written in Go."; + homepage = https://github.com/sparrc/gdm; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/tools/gdm/deps.nix b/pkgs/development/tools/gdm/deps.nix new file mode 100644 index 000000000000..62a3df65e3aa --- /dev/null +++ b/pkgs/development/tools/gdm/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "0d047c8d5a8c3a1c89d9d78511f4ed7aef49ea0c"; + sha256 = "0ahyxvqy25zpyppmrb7vsad332gmq2cdi7hb0si6ni0cmrlqcfwr"; + }; + } +] diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix new file mode 100644 index 000000000000..6a16a0372c1e --- /dev/null +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gtk-mac-bundler-${version}"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "gtk-mac-bundler"; + rev = "bundler-${version}"; + sha256 = "1kyyq2hc217i5vhbfff0ldgv0r3aziwryd1xlck5cw3s6hgskbza"; + }; + + installPhase = '' + mkdir -p $out/bin + substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ + --subst-var-by PATH $out/share + chmod a+x $out/bin/gtk-mac-bundler + + mkdir -p $out/share + cp -r bundler $out/share + ''; + + meta = with lib; { + description = "a helper script that creates application bundles form GTK+ executables for Mac OS X"; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.darwin; + homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix new file mode 100644 index 000000000000..c4df52da1701 --- /dev/null +++ b/pkgs/development/tools/manul/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "manul-unstable-2016-09-30"; + + goPackagePath = "github.com/kovetskiy/manul"; + excludedPackages = "tests"; + + src = fetchFromGitHub { + owner = "kovetskiy"; + repo = "manul"; + rev = "7bddb5404b9ecc66fd28075bb899c2d6dc7a1c51"; + sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "The madness vendoring utility for Golang programs"; + homepage = https://github.com/kovetskiy/manul; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/tools/manul/deps.nix b/pkgs/development/tools/manul/deps.nix new file mode 100644 index 000000000000..e99a597b0783 --- /dev/null +++ b/pkgs/development/tools/manul/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "3cb3b8656883c2cc3deb9c643d93ea6e5157e425"; + sha256 = "0qhyssjwv98jncsiph95iz77sygkismvpprsalqi3xm3k50xi6r7"; + }; + } + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "349dd0209470eabd9514242c688c403c0926d266"; + sha256 = "12ikz849vkdb3dsdn6mdpkihvm0hbmkplyi0qdcm7s4ib4n003b1"; + }; + } + { + goPackagePath = "github.com/kovetskiy/godocs"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/godocs"; + rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24"; + sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j"; + }; + } + { + goPackagePath = "github.com/reconquest/executil-go"; + fetch = { + type = "git"; + url = "https://github.com/reconquest/executil-go"; + rev = "e72bce509b1a5e89ab21f29c92830d4304620765"; + sha256 = "06z05hl4bym5agv0h1vgksj0mx0l4987ganwqcfb153w7pclvan3"; + }; + } + { + goPackagePath = "github.com/reconquest/hierr-go"; + fetch = { + type = "git"; + url = "https://github.com/reconquest/hierr-go"; + rev = "bbf802f3f943e7b6a364a485ccf90807f3bfcc0e"; + sha256 = "1v3fssw881vcawc2abvp8abwb7705yzxrb0khbzmn8qvdpqwh7hl"; + }; + } + { + goPackagePath = "github.com/reconquest/ser-go"; + fetch = { + type = "git"; + url = "https://github.com/reconquest/ser-go"; + rev = "47f084a1e4a5433ac3d6ab6cfe8c1e30028a4d76"; + sha256 = "1hgafiqc3mlazs2zg4rqjm4sasy2gjrjl64cy8mmlg5cayvbj4hq"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; + sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + }; + } +] diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix deleted file mode 100644 index d3248d6219e8..000000000000 --- a/pkgs/development/tools/nimble/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, nim, openssl }: - -stdenv.mkDerivation rec { - name = "nimble-${version}"; - - version = "0.7.10"; - - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "nimble"; - rev = "v${version}"; - sha256 = "1bcv8chir73nn6x7q8n3sw2scf3m0x2w9gkkzx162ryivza1nm1r"; - }; - - buildInputs = [ nim openssl ]; - - patchPhase = '' - substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share" - echo "--clib:crypto" >> src/nimble.nim.cfg - ''; - - buildPhase = '' - cd src && nim c -d:release nimble - ''; - - installPhase = '' - mkdir -p $out/bin - cp nimble $out/bin - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Package manager for the Nim programming language"; - homepage = https://github.com/nim-lang/nimble; - license = licenses.bsd2; - maintainers = with maintainers; [ kamilchm ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/rubocop/Gemfile b/pkgs/development/tools/rubocop/Gemfile new file mode 100644 index 000000000000..f6ab81c81123 --- /dev/null +++ b/pkgs/development/tools/rubocop/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' +gem 'rake' +gem 'rubocop' diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock new file mode 100644 index 000000000000..abc782465ccc --- /dev/null +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.3.0) + parser (2.3.3.1) + ast (~> 2.2) + powerpack (0.1.1) + rainbow (2.2.1) + rake (12.0.0) + rubocop (0.47.0) + parser (>= 2.3.3.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.8.1) + unicode-display_width (1.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + rake + rubocop + +BUNDLED WITH + 1.13.7 diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix new file mode 100644 index 000000000000..850fb5ad7f58 --- /dev/null +++ b/pkgs/development/tools/rubocop/default.nix @@ -0,0 +1,17 @@ +{ stdenv, lib, bundlerEnv, ruby, makeWrapper }: + +bundlerEnv rec { + pname = "rubocop"; + + inherit ruby; + + gemdir = ./.; + + meta = with lib; { + description = "Automatic Ruby code style checking tool"; + homepage = http://rubocop.readthedocs.io/en/latest/; + license = licenses.mit; + maintainers = with maintainers; [ leemachin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix new file mode 100644 index 000000000000..908b5b76dd38 --- /dev/null +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -0,0 +1,69 @@ +{ + ast = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + type = "gem"; + }; + version = "2.3.0"; + }; + parser = { + dependencies = ["ast"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq"; + type = "gem"; + }; + version = "2.3.3.1"; + }; + powerpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + type = "gem"; + }; + version = "0.1.1"; + }; + rainbow = { + dependencies = ["rake"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri"; + type = "gem"; + }; + version = "2.2.1"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + type = "gem"; + }; + version = "12.0.0"; + }; + rubocop = { + dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lsv3zbjl14nqyqqvcwciz15nq76l7vg97nydrdsrxs2bc5jrlsm"; + type = "gem"; + }; + version = "0.47.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + type = "gem"; + }; + version = "1.8.1"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx"; + type = "gem"; + }; + version = "1.1.3"; + }; +} diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix new file mode 100644 index 000000000000..2fc38db1bb0c --- /dev/null +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "htmlunit-driver-standalone-${version}"; + version = "2.21"; + + src = fetchurl { + url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-standalone-${version}.jar"; + sha256 = "1wrbam0hb036717z3y73lsw4pwp5sdiw2i1818kg9pvc7i3fb3yn"; + }; + + unpackPhase = "true"; + + installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; + + meta = { + homepage = https://github.com/SeleniumHQ/htmlunit-driver; + description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; + maintainers = with maintainers; [ coconnor offline ]; + platforms = platforms.all; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index fe8bf2b13b59..ca225adab6d2 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg -, chromedriver, chromeSupport ? true }: +, htmlunit-driver, chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -25,8 +25,9 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/lib/${name} cp $src $out/share/lib/${name}/${name}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-jar $out/share/lib/${name}/${name}.jar" \ - --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} + --add-flags "-cp ${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar:$out/share/lib/${name}/${name}.jar" \ + --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ + --add-flags "org.openqa.grid.selenium.GridLauncher" ''; meta = { diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix new file mode 100644 index 000000000000..7cc77bd1bb39 --- /dev/null +++ b/pkgs/development/tools/vndr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "vndr-${version}"; + version = "20161110-${lib.strings.substring 0 7 rev}"; + rev = "cf8678fba5591fbacc4dafab1a22d64f6c603c20"; + + goPackagePath = "github.com/LK4D4/vndr"; + + src = fetchFromGitHub { + inherit rev; + owner = "LK4D4"; + repo = "vndr"; + sha256 = "1fbrpdpfir05hqj1dr8rxw8hnjkhl0xbzncxkva56508vyyzbxcs"; + }; + + meta = { + description = "Stupid golang vendoring tool, inspired by docker vendor script"; + homepage = "https://github.com/LK4D4/vndr"; + maintainers = with lib.maintainers; [ vdemeester ]; + licence = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix new file mode 100644 index 000000000000..7d93ea1fcab4 --- /dev/null +++ b/pkgs/development/tools/yarn/default.nix @@ -0,0 +1,26 @@ +{ stdenv, nodejs, fetchzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "yarn-${version}"; + version = "0.19.1"; + + src = fetchzip { + url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; + sha256 = "1006ijhig9pcmrlsqfwxhn4i78bcji2grvkl4hz64fmqv6rh783s"; + }; + + buildInputs = [makeWrapper nodejs]; + + installPhase = '' + mkdir -p $out/{bin,libexec/yarn/} + cp -R . $out/libexec/yarn + makeWrapper $out/libexec/yarn/bin/yarn.js $out/bin/yarn + ''; + + meta = with stdenv.lib; { + homepage = https://yarnpkg.com/; + description = "Fast, reliable, and secure dependency management for javascript"; + license = licenses.bsd2; + maintainers = [ maintainers.offline ]; + }; +} diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 1a5485af541d..da9b9df3cd4e 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { name = "yuicompressor"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; + buildInputs = [makeWrapper jre]; + meta = { description = "A JavaScript and CSS minifier"; maintainers = [ stdenv.lib.maintainers.jwiegley ]; @@ -17,7 +19,9 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p $out/lib + mkdir -p $out/{bin,lib} ln -s $src $out/lib/yuicompressor.jar + makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \ + "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; } diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index c0445811f391..34b31cdf7ec8 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { version = "4.0.5"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses5 ]; installFlags = "bindir=$(out)/bin"; meta = with stdenv.lib; { homepage = http://rephial.org/; description = "A single-player roguelike dungeon exploration game"; - maintainers = [ maintainers.chattered ]; + maintainers = [ maintainers.chattered ]; license = licenses.gpl2; }; } diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 781dc5e31d83..fd944bb7611d 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "161cwwcv73zisac1biz9arrby8y8n0j4bn9hz9rvy8dszlrbq0l0"; + sha256 = "12nqcj6skwjfcywm3ah4jb1qn4r558ng9cchdc3hbz99nhv7vi6y"; }; preferLocalBuild = true; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix new file mode 100644 index 000000000000..57c2ca2dfd86 --- /dev/null +++ b/pkgs/games/xsok/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext +, withNethackLevels ? true +}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xsok"; + version = "1.02"; + + src = fetchurl { + url = "http://http.debian.net/debian/pool/main/x/xsok/xsok_1.02.orig.tar.gz"; + sha256 = "0f4z53xsy4w8x8zp5jya689xp3rcfpi5wri2ip0qa8nk3sw7zj73"; + }; + + nethackLevels = fetchurl { + url = "https://www.electricmonk.nl/data/nethack/nethack.def"; + sha256 = "057ircp13hfpy513c7wpyp986hsvhqs7km98w4k39f5wkvp3dj02"; + }; + + buildInputs = [libX11 libXt libXaw libXpm libXext]; + nativeBuildInputs = [imake]; + + NIX_CFLAGS_COMPILE=" -isystem ${libXpm.dev}/include/X11 "; + + preConfigure = '' + sed -e "s@/usr/@$out/share/@g" -i src/Imakefile + sed -e "s@/var/games/xsok@./.xsok/@g" -i src/Imakefile + sed -e '/chown /d' -i src/Imakefile + sed -e '/chmod /d' -i src/Imakefile + sed -e '/InstallAppDefaults/d' -i src/Imakefile + ''; + + makeFlags = ["BINDIR=$(out)/bin"]; + + postInstall = stdenv.lib.optionalString withNethackLevels '' + gzip < ${nethackLevels} > "$out/share/games/lib/xsok/Nethack.def.gz" + echo Nethack > "$out/share/games/lib/xsok/gametypes" + ''; + + meta = { + inherit version; + description = "A generic Sokoban game for X11"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://tracker.debian.org/pkg/xsok"; + }; +} diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index 1e4827942b95..ba1b63855e34 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -9,7 +9,7 @@ composableDerivation.composableDerivation {} { inherit name; src = fetchurl { - url = "http://gavare.se/gxemul/src/${name}.tar.gz"; + url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; }; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2f792767ccbd..cc7be1142245 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -329,6 +329,17 @@ rec { }; + delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "delimitMate-2016-07-19"; + src = fetchgit { + url = "git://github.com/Raimondi/delimitMate"; + rev = "b5719054beebe0135c94f4711a06dc7588041f09"; + sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3"; + }; + dependencies = []; + + }; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-09-22"; src = fetchgit { @@ -739,6 +750,17 @@ rec { }; + typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "typescript-vim-2016-08-10"; + src = fetchgit { + url = "git://github.com/leafgarland/typescript-vim"; + rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a"; + sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk"; + }; + dependencies = []; + + }; + vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ipython-2015-06-23"; src = fetchgit { @@ -1311,6 +1333,17 @@ rec { }; + vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-speeddating-2015-01-24"; + src = fetchgit { + url = "git://github.com/tpope/vim-speeddating"; + rev = "426c792e479f6e1650a6996c683943a09344c21e"; + sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { @@ -1741,6 +1774,17 @@ rec { }; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2017-01-02"; + src = fetchgit { + url = "git://github.com/Quramy/tsuquyomi"; + rev = "473aa2703950816748329acca56c069df7339c96"; + sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59"; + }; + dependencies = []; + + }; + undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "undotree-2016-07-19"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3809ea8fc017..ed14d8d25591 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ "github:907th/vim-auto-save" "github:Chiel92/vim-autoformat" "github:LnL7/vim-nix" +"github:Quramy/tsuquyomi" "github:Shougo/deoplete.nvim" "github:ajh17/Spacegray.vim" "github:alvan/vim-closetag" @@ -66,6 +67,7 @@ "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" "github:latex-box-team/latex-box" +"github:leafgarland/typescript-vim" "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lokaltog/vim-easymotion" @@ -100,6 +102,7 @@ "github:tomasr/molokai" "github:tpope/vim-eunuch" "github:tpope/vim-repeat" +"github:tpope/vim-speeddating" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix new file mode 100644 index 000000000000..174f9478633c --- /dev/null +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "DarwinTools-1"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz"; + sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace gcc cc + ''; + + configurePhase = '' + export SRCROOT=. + export SYMROOT=. + export DSTROOT=$out + ''; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + meta = { + maintainers = [ stdenv.lib.maintainers.matthewbauer ]; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 0d5e21485b9a..e2776475432f 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "reattach-to-user-namespace-2.4"; + name = "reattach-to-user-namespace-2.5"; src = fetchgit { url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; - sha256 = "0hrh95di5dvpynq2yfcrgn93l077h28i6msham00byw68cx0dd3z"; - rev = "2765aeab8f337c29e260a912bf4267a2732d8640"; + sha256 = "0kv11vi54g6waf9941hy1pwmwyab0y7hbmbkcgwhzb5ja21ysc2a"; + rev = "3689998acce9990726c8a68a85298ab693a62458"; }; buildFlags = "ARCHES=x86_64"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b3502d269b09..4956f13950dd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.26.1"; + name = "busybox-1.26.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg"; + sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index bd99a7979eeb..44e4ebe17485 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -142,6 +142,7 @@ with stdenv.lib; L2TP_IP m L2TP_ETH m BRIDGE_VLAN_FILTERING y + BONDING m # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -186,6 +187,10 @@ with stdenv.lib; ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) '' DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support ''} + ${optionalString (versionAtLeast version "4.9") '' + DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets + DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets + ''} # Sound. SND_DYNAMIC_MINORS y @@ -213,6 +218,7 @@ with stdenv.lib; # ACLs for all filesystems that support them. FANOTIFY y TMPFS y + TMPFS_POSIX_ACL y FS_ENCRYPTION? m EXT2_FS_XATTR y EXT2_FS_POSIX_ACL y diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index f3eceb5fe266..2d2f4d924db4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.41"; + version = "4.4.43"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z26frg7sx5n9bvkpg9pfspwhxxvlnnfnrnjr7aqhcgsbxzq8vca"; + sha256 = "1yzphiznkwambniq21fiw0vw1fgql4cwcxjlp290y8cf3b3704qb"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix deleted file mode 100644 index a5ce23ee3e47..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.8.17"; - extraMeta.branch = "4.8"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zk0q6bvqgz2pk1axd5z0cx71vqk96314f1zn8apwa4raylf9fpa"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 29f0eba71755..948f700b4845 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.2"; + version = "4.9.4"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f2p12pkzgrh9k5c7g2wwjnv6gzqha8bgd7b0qgbzq3ss7nrmnld"; + sha256 = "1160rs35w58cwynq2pcdjxvxgc5lkhy4ydh00hylsnmi9jvazpcv"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index b547240eaf2a..8f18febdf0df 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10-rc2"; - modDirVersion = "4.10.0-rc2"; + version = "4.10-rc4"; + modDirVersion = "4.10.0-rc4"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1r3w6mqvmjnsmqrk73xsrqybdvs1czjw5xl1x2wsi2w9nifb47zq"; + sha256 = "0rsi9iw8ag3lcy4yjrr6ipf7zpm3f206anv5xzkn2mi1r4vfndvp"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 63da39e0c231..a6728f40cdac 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.131"; in +let versionNumber = "304.134"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1a1d0fsahgijcvs2p59vwhs0dpp7pp2wmvgcs1i7fzl6yyv4nmfj"; + sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0gpqzb5gvhrcgrp3kph1p0yjkndx9wfzgh5j88ysrlflkv3q4vig"; + sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index e34aaf3c908e..5707fc4a1eb4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.96"; + versionNumber = "340.101"; /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, will be included in 340.* legacy releases through the end of 2019. @@ -29,12 +29,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4"; + sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8"; + sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 281ee101eac3..abe1388e9a54 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: +{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}: let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; @@ -18,6 +18,15 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; + patches = [ + # patch for linux >= 4.9.1 + # is included in the next release + (fetchpatch { + url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch"; + sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k"; + }) + ]; + postPatch = '' sed '1i#include ' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp ''; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 489d6ac8bc61..12c5eedcb96a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170105"; + version = "0.0.20170115"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v"; + sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 5a1c473a43d0..579cd9f4a0eb 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.0.1"; + version = "6.0.3"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4"; + sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d2b3cc1c4191..d0a278d2ef05 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.2.4"; + version = "7.3.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa"; + sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix new file mode 100644 index 000000000000..a996cec0d5b5 --- /dev/null +++ b/pkgs/servers/couchpotato/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, pythonPackages, lib }: + +with pythonPackages; + +buildPythonApplication rec { + name = "couchpotato-${version}"; + version = "3.0.1"; + disabled = isPy3k; + + src = fetchurl { + url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz"; + sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh"; + }; + + format = "other"; + + postPatch = '' + substituteInPlace CouchPotato.py --replace "dirname(os.path.abspath(__file__))" "os.path.join(dirname(os.path.abspath(__file__)), '../${python.sitePackages}')" + ''; + + installPhase = '' + mkdir -p $out/bin/ + mkdir -p $out/${python.sitePackages}/ + + cp -r libs/* $out/${python.sitePackages}/ + cp -r couchpotato $out/${python.sitePackages}/ + + cp CouchPotato.py $out/bin/couchpotato + chmod +x $out/bin/* + ''; + + fixupPhase = '' + wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ + --set PATH ${python}/bin + ''; + + meta = { + description = "Automatic movie downloading via NZBs and torrents"; + license = lib.licenses.gpl3; + homepage = https://couchpota.to/; + maintainers = with lib.maintainers; [ fadenb ]; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index d3daad1e0cbc..fb8c9da5f8e7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P4"; in +let version = "9.10.4-P5"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; + sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 6eec9c3b3050..b1e4ec6e368e 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi"; + sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh"; }; buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix new file mode 100644 index 000000000000..a5dbf74947e2 --- /dev/null +++ b/pkgs/servers/h2/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchzip, jre, makeWrapper, unzip }: +stdenv.mkDerivation rec { + name = "h2-${version}"; + + version = "1.4.193"; + + src = fetchzip { + url = "http://www.h2database.com/h2-2016-10-31.zip"; + sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = + let + h2ToolScript = '' + #!/usr/bin/env bash + dir=$(dirname "$0") + + if [ -n "$1" ]; then + ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}" + else + echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'" + fi + ''; + in '' + mkdir -p $out + cp -R * $out + + echo '${h2ToolScript}' > $out/bin/h2tool.sh + + substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java" + + chmod +x $out/bin/*.sh + ''; + + meta = with stdenv.lib; { + description = "The Java SQL database"; + homepage = http://www.h2database.com/html/main.html; + license = licenses.mpl20; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ mahe ]; + }; +} diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index c6f88c24509c..87efc41b1d68 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.44"; + name = "lighttpd-1.4.45"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd"; + sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index d19c147ce932..20ea55f82a10 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -146,4 +146,33 @@ sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; }; }; + + pagespeed = + let + version = pkgs.psol.version; + + moduleSrc = fetchFromGitHub { + owner = "pagespeed"; + repo = "ngx_pagespeed"; + rev = "v${version}-beta"; + sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9"; + }; + + ngx_pagespeed = pkgs.runCommand + "ngx_pagespeed" + { + meta = { + description = "PageSpeed module for Nginx"; + homepage = "https://developers.google.com/speed/pagespeed/module/"; + license = pkgs.stdenv.lib.licenses.asl20; + }; + } + '' + cp -r "${moduleSrc}" "$out" + chmod -R +w "$out" + ln -s "${pkgs.psol}" "$out/psol" + ''; + in { + src = ngx_pagespeed; + }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index fef4d55b36c1..e7b6fff1b664 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20160821"; - longVersion = "2016-08-21T02:44:47Z"; + shortVersion = "20161213"; + longVersion = "2016-12-13T17:19:42Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "159196bnb4b7f00jh9gll9kqqxq1ifxv1kg5bd6yjpqf5qca4pkn"; + sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index e3da9dfa75f2..25ff8ed25fc7 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.25"; + version = "2.0.29"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra"; + sha256 = "1zpv0p10iyx49z1hsqvlkk6hh46hp9dhbrdyx103hgx7p3xnxfnv"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 00292afb8ce9..1eaef1010d35 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.3.0"; + version = "0.4.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m"; + sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix deleted file mode 100644 index 39bd3f12e957..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "prometheus_cli-${version}"; - version = "0.3.0"; - rev = version; - - goPackagePath = "github.com/prometheus/prometheus_cli"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "prometheus_cli"; - sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; - }; - - goDeps = ./cli_deps.nix; - - meta = with stdenv.lib; { - description = "Command line tool for querying the Prometheus HTTP API"; - homepage = https://github.com/prometheus/prometheus_cli; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix deleted file mode 100644 index 192b6917bf0f..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } -] diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index d41e1bce7f58..616d898b33f0 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: let - pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah]); + pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah yenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { version = "1.1.0"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8d6817441315..5a57609146a5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -456,15 +456,14 @@ in "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" + "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" "--enable-glamor" ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - wrapProgram $out/bin/Xephyr \ - --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" wrapProgram $out/bin/Xvfb \ - --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ - --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do @@ -592,4 +591,9 @@ in preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; }; + xrandr = attrs: attrs // { + postInstall = '' + rm $out/bin/xkeystone + ''; + }; } diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 2fc012dc6c9d..0357c8c17f1d 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel +, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary , shell ? "${bashInteractive}/bin/bash" }: @@ -126,7 +126,6 @@ in stdenv.mkDerivation { --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ --replace "@XINIT@" "$out/bin/xinit" \ --replace "@XINITRC@" "$out/etc/X11/xinit/xinitrc" \ - --replace "@XKEYBOARD_CONFIG@" "${xkeyboard_config}/etc/X11/xkb" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" wrapProgram $out/bin/Xquartz \ diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx index 131fbc43b8b6..e908e1042d78 100755 --- a/pkgs/servers/x11/xquartz/startx +++ b/pkgs/servers/x11/xquartz/startx @@ -217,7 +217,7 @@ EOF done fi -eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs "-xkbdir" "@XKEYBOARD_CONFIG@" +eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs retval=$? if [ x"$enable_xauth" = x1 ] ; then diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 8ae11e7e75c8..732f831889e6 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -1,20 +1,20 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git - - { stdenv, fetchgit }: stdenv.mkDerivation rec { + version = "2017-01-15"; name = "oh-my-zsh-${version}"; - version = "2016-12-14"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "67dad45b38b7f0bafcaf7679da6eb4596301843b"; - sha256 = "1adgj0p4c8aq9rpkv33k8ra69922vfkjw63b666i66v6zr0s8znp"; + rev = "d2725d44fce59ea7060b4d712c5739512a56882d"; + sha256 = "064q10yc0n71nqh621nk88ch4wjwwq68wlaaacl5q3llcb4b5pff"; }; + pathsToLink = [ "/share/oh-my-zsh" ]; + phases = "installPhase"; installPhase = '' diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix new file mode 100644 index 000000000000..4071d7bd0f21 --- /dev/null +++ b/pkgs/shells/zsh-autosuggestions/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, zsh }: + +# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option + +stdenv.mkDerivation rec { + name = "zsh-autosuggestions-${version}"; + version = "0.3.3"; + + src = fetchFromGitHub { + repo = "zsh-autosuggestions"; + owner = "zsh-users"; + rev = "v${version}"; + sha256 = "0mnwyz4byvckrslzqfng5c0cx8ka0y12zcy52kb7amg3l07jrls4"; + }; + + buildInputs = [ zsh ]; + + buildPhases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -D zsh-autosuggestions.zsh \ + $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh + ''; + + meta = with stdenv.lib; { + description = "Fish shell autosuggestions for Zsh"; + homepage = "https://github.com/zsh-users/zsh-autosuggestions"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.loskutov ]; + }; +} diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix new file mode 100644 index 000000000000..11ca8e1440e1 --- /dev/null +++ b/pkgs/stdenv/booter.nix @@ -0,0 +1,68 @@ +# This file defines a single function for booting a package set from a list of +# stages. The exact mechanics of that function are defined below; here I +# (@Ericson2314) wish to describe the purpose of the abstraction. +# +# The first goal is consistency across stdenvs. Regardless of what this function +# does, by making every stdenv use it for bootstrapping we ensure that they all +# work in a similar way. [Before this abstraction, each stdenv was its own +# special snowflake due to different authors writing in different times.] +# +# The second goal is consistency across each stdenv's stage functions. By +# writing each stage it terms of the previous stage, commonalities between them +# are more easily observable. [Before, there usually was a big attribute set +# with each stage, and stages would access the previous stage by name.] +# +# The third goal is composition. Because each stage is written in terms of the +# previous, the list can be reordered or, more practically, extended with new +# stages. The latter is used for cross compiling and custom +# stdenvs. Additionally, certain options should by default apply only to the +# last stage, whatever it may be. By delaying the creation of stage package sets +# until the final fold, we prevent these options from inhibiting composition. +# +# The fourth and final goal is debugging. Normal packages should only source +# their dependencies from the current stage. But for the sake of debugging, it +# is nice that all packages still remain accessible. We make sure previous +# stages are kept around with a `stdenv.__bootPackges` attribute referring the +# previous stage. It is idiomatic that attributes prefixed with `__` come with +# special restrictions and should not be used under normal circumstances. +{ lib, allPackages }: + +# Type: +# [ pkgset -> (args to stage/default.nix) or ({ __raw = true; } // pkgs) ] +# -> pkgset +# +# In english: This takes a list of function from the previous stage pkgset and +# returns the final pkgset. Each of those functions returns, if `__raw` is +# undefined or false, args for this stage's pkgset (the most complex and +# important arg is the stdenv), or, if `__raw = true`, simply this stage's +# pkgset itself. +# +# The list takes stages in order, so the final stage is last in the list. In +# other words, this does a foldr not foldl. +stageFuns: let + + # Take the list and disallow custom overrides in all but the final stage, + # and allow it in the final flag. Only defaults this boolean field if it + # isn't already set. + withAllowCustomOverrides = lib.lists.imap + (index: stageFun: prevStage: + # So true by default for only the first element because one + # 1-indexing. Since we reverse the list, this means this is true + # for the final stage. + { allowCustomOverrides = index == 1; } + // (stageFun prevStage)) + (lib.lists.reverseList stageFuns); + + # Adds the stdenv to the arguments, and sticks in it the previous stage for + # debugging purposes. + folder = stageFun: finalSoFar: let + args = stageFun finalSoFar; + stdenv = args.stdenv // { + # For debugging + __bootPackages = finalSoFar; + }; + args' = args // { inherit stdenv; }; + in + (if args.__raw or false then lib.id else allPackages) args'; + +in lib.lists.fold folder {} withAllowCustomOverrides diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 10e2a7663563..16f41671b768 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,35 +1,49 @@ -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays }: -rec { - vanillaStdenv = (import ../. { - inherit lib allPackages system platform; +let + bootStages = import ../. { + inherit lib system platform overlays; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; - }) // { - # Needed elsewhere as a hacky way to pass the target - cross = crossSystem; }; - # For now, this is just used to build the native stdenv. Eventually, it should - # be used to build compilers and other such tools targeting the cross +in bootStages ++ [ + + # Build Packages. + # + # For now, this is just used to build the native stdenv. Eventually, it + # should be used to build compilers and other such tools targeting the cross # platform. Then, `forceNativeDrv` can be removed. - buildPackages = allPackages { - inherit system platform crossSystem config; + (vanillaPackages: { + inherit system platform crossSystem config overlays; # It's OK to change the built-time dependencies allowCustomOverrides = true; - stdenv = vanillaStdenv; - }; + stdenv = vanillaPackages.stdenv // { + # Needed elsewhere as a hacky way to pass the target + cross = crossSystem; + overrides = _: _: {}; + }; + }) - stdenvCross = buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - buildPackages.binutilsCross buildPackages.gccCrossStageFinal; + # Run packages + (buildPackages: { + inherit system platform crossSystem config overlays; + stdenv = if crossSystem.useiOSCross or false + then let + inherit (buildPackages.darwin.ios-cross { + prefix = crossSystem.config; + inherit (crossSystem) arch; + simulator = crossSystem.isiPhoneSimulator or false; }) + cc binutils; + in buildPackages.makeStdenvCross + buildPackages.stdenv crossSystem + binutils cc + else buildPackages.makeStdenvCross + buildPackages.stdenv crossSystem + buildPackages.binutilsCross buildPackages.gccCrossStageFinal; + }) - stdenvCrossiOS = let - inherit (buildPackages.darwin.ios-cross { prefix = crossSystem.config; inherit (crossSystem) arch; simulator = crossSystem.isiPhoneSimulator or false; }) cc binutils; - in buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - binutils cc; -} +] diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 188d00277731..d7e9bf53bed1 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,22 +1,22 @@ -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; -rec { - vanillaStdenv = import ../. { - inherit lib allPackages system platform crossSystem; +let + bootStages = import ../. { + inherit lib system platform crossSystem overlays; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; }; - buildPackages = allPackages { - inherit system platform crossSystem config; - # It's OK to change the built-time dependencies - allowCustomOverrides = true; - stdenv = vanillaStdenv; - }; +in bootStages ++ [ - stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; -} + # Additional stage, built using custom stdenv + (vanillaPackages: { + inherit system platform crossSystem config overlays; + stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; + }) + +] diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b9044f25cd7a..e3a87ea078fc 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,5 +1,5 @@ -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -22,8 +22,6 @@ let (import "${./standard-sandbox.sb}") ''; in rec { - inherit allPackages; - commonPreHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" @@ -54,7 +52,7 @@ in rec { }; stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh", - overrides ? (pkgs: {}), + overrides ? (self: super: {}), extraPreHook ? "", extraBuildInputs, allowedRequisites ? null}: @@ -96,19 +94,17 @@ in rec { extraSandboxProfile = binShClosure + libSystemProfile; extraAttrs = { inherit platform; parent = last; }; - overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; + overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; - thisPkgs = allPackages { - inherit system platform crossSystem config; - allowCustomOverrides = false; - stdenv = thisStdenv; - }; - in { stdenv = thisStdenv; pkgs = thisPkgs; }; + in { + inherit system platform crossSystem config overlays; + stdenv = thisStdenv; + }; stage0 = stageFun 0 null { - overrides = orig: with stage0; rec { - darwin = orig.darwin // { + overrides = self: super: with stage0; rec { + darwin = super.darwin // { Libsystem = stdenv.mkDerivation { name = "bootstrap-Libsystem"; buildCommand = '' @@ -145,32 +141,32 @@ in rec { extraBuildInputs = []; }; - persistent0 = _: {}; + persistent0 = _: _: _: {}; - stage1 = with stage0; stageFun 1 stage0 { + stage1 = prevStage: with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraBuildInputs = [ pkgs.libcxx ]; allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ]; - overrides = persistent0; + overrides = persistent0 prevStage; }; - persistent1 = orig: with stage1.pkgs; { + persistent1 = prevStage: self: super: with prevStage; { inherit zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; - darwin = orig.darwin // { + darwin = super.darwin // { inherit (darwin) dyld Libsystem xnu configd libdispatch libclosure launchd; }; }; - stage2 = with stage1; stageFun 2 stage1 { + stage2 = prevStage: with prevStage; stageFun 2 prevStage { extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -182,10 +178,10 @@ in rec { (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ (with pkgs.darwin; [ dyld Libsystem CF locale ]); - overrides = persistent1; + overrides = persistent1 prevStage; }; - persistent2 = orig: with stage2.pkgs; { + persistent2 = prevStage: self: super: with prevStage; { inherit patchutils m4 scons flex perl bison unifdef unzip openssl python gettext sharutils libarchive pkg-config groff bash subversion @@ -193,13 +189,13 @@ in rec { findfreetype libssh curl cmake autoconf automake libtool cpio libcxx libcxxabi; - darwin = orig.darwin // { + darwin = super.darwin // { inherit (darwin) dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; }; }; - stage3 = with stage2; stageFun 3 stage2 { + stage3 = prevStage: with prevStage; stageFun 3 prevStage { shell = "${pkgs.bash}/bin/bash"; # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun @@ -218,53 +214,53 @@ in rec { (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ (with pkgs.darwin; [ dyld Libsystem locale ]); - overrides = persistent2; + overrides = persistent2 prevStage; }; - persistent3 = orig: with stage3.pkgs; { + persistent3 = prevStage: self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; - in orig.llvmPackages // { + in super.llvmPackages // { llvm = llvmOverride; clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; }; - darwin = orig.darwin // { + darwin = super.darwin // { inherit (darwin) dyld Libsystem libiconv locale; }; }; - stage4 = with stage3; stageFun 4 stage3 { + stage4 = prevStage: with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ]; extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - overrides = persistent3; + overrides = persistent3 prevStage; }; - persistent4 = orig: with stage4.pkgs; { + persistent4 = prevStage: self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep coreutils findutils diffutils patchutils binutils binutils-raw; - llvmPackages = orig.llvmPackages // { + llvmPackages = super.llvmPackages // { inherit (llvmPackages) llvm clang-unwrapped; }; - darwin = orig.darwin // { + darwin = super.darwin // { inherit (darwin) dyld Libsystem cctools libiconv; }; }; - stage5 = with stage4; import ../generic rec { + stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec { inherit system config; - inherit (stdenv) fetchurlBoot; + inherit (pkgs.stdenv) fetchurlBoot; name = "stdenv-darwin"; @@ -279,7 +275,8 @@ in rec { shell = "${pkgs.bash}/bin/bash"; cc = import ../../build-support/cc-wrapper { - inherit stdenv shell; + inherit (pkgs) stdenv; + inherit shell; nativeTools = false; nativeLibc = false; inherit (pkgs) coreutils binutils gnugrep; @@ -294,7 +291,6 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - parent = stage4; }; allowedRequisites = (with pkgs; [ @@ -307,11 +303,21 @@ in rec { dyld Libsystem CF cctools libiconv locale ]); - overrides = orig: persistent4 orig // { + overrides = self: super: persistent4 prevStage self super // { clang = cc; inherit cc; }; }; - stdenvDarwin = stage5; + stagesDarwin = [ + ({}: stage0) + stage1 + stage2 + stage3 + stage4 + (prevStage: { + inherit system crossSystem platform config overlays; + stdenv = stdenvDarwin prevStage; + }) + ]; } diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index c862eb141a8c..85e4dabbbded 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -334,8 +334,8 @@ in rec { # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it test-pkgs = import test-pkgspath { inherit system; - stdenvFunc = args: let + stdenvStages = args: let args' = args // { inherit bootstrapFiles; }; - in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin; + in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin; }; } diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 3b49d0de8306..f60ffec4b564 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -1,14 +1,13 @@ -# This file defines the various standard build environments. +# This file chooses a sane default stdenv given the system, platform, etc. # -# On Linux systems, the standard build environment consists of -# Nix-built instances glibc and the `standard' Unix tools, i.e., the -# Posix utilities, the GNU C compiler, and so on. On other systems, -# we use the native C library. +# Rather than returning a stdenv, this returns a list of functions---one per +# each bootstrapping stage. See `./booter.nix` for exactly what this list should +# contain. { # Args just for stdenvs' usage - lib, allPackages - # Args to pass on to `allPacakges` too -, system, platform, crossSystem, config + lib + # Args to pass on to the pkgset builder, too +, system, platform, crossSystem, config, overlays } @ args: let @@ -17,50 +16,39 @@ let # i.e., the stuff in /bin, /usr/bin, etc. This environment should # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). - inherit (import ./native args) stdenvNative; - - stdenvNativePkgs = allPackages { - inherit system platform crossSystem config; - allowCustomOverrides = false; - stdenv = stdenvNative; - noSysDirs = false; - }; - + stagesNative = import ./native args; # The Nix build environment. - stdenvNix = assert crossSystem == null; import ./nix { - inherit config lib; - stdenv = stdenvNative; - pkgs = stdenvNativePkgs; - }; + stagesNix = import ./nix (args // { bootStages = stagesNative; }); - inherit (import ./freebsd args) stdenvFreeBSD; + stagesFreeBSD = import ./freebsd args; - # Linux standard environment. - inherit (import ./linux args) stdenvLinux; + # On Linux systems, the standard build environment consists of Nix-built + # instances glibc and the `standard' Unix tools, i.e., the Posix utilities, + # the GNU C compiler, and so on. + stagesLinux = import ./linux args; - inherit (import ./darwin args) stdenvDarwin; + inherit (import ./darwin args) stagesDarwin; - inherit (import ./cross args) stdenvCross stdenvCrossiOS; + stagesCross = import ./cross args; - inherit (import ./custom args) stdenvCustom; + stagesCustom = import ./custom args; - # Select the appropriate stdenv for the platform `system'. + # Select the appropriate stages for the platform `system'. in - if crossSystem != null then - if crossSystem.useiOSCross or false then stdenvCrossiOS - else stdenvCross else - if config ? replaceStdenv then stdenvCustom else - if system == "i686-linux" then stdenvLinux else - if system == "x86_64-linux" then stdenvLinux else - if system == "armv5tel-linux" then stdenvLinux else - if system == "armv6l-linux" then stdenvLinux else - if system == "armv7l-linux" then stdenvLinux else - if system == "mips64el-linux" then stdenvLinux else - if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if system == "x86_64-darwin" then stdenvDarwin else - if system == "x86_64-solaris" then stdenvNix else - if system == "i686-cygwin" then stdenvNative else - if system == "x86_64-cygwin" then stdenvNative else - if system == "x86_64-freebsd" then stdenvFreeBSD else - stdenvNative + if crossSystem != null then stagesCross + else if config ? replaceStdenv then stagesCustom + else { # switch + "i686-linux" = stagesLinux; + "x86_64-linux" = stagesLinux; + "armv5tel-linux" = stagesLinux; + "armv6l-linux" = stagesLinux; + "armv7l-linux" = stagesLinux; + "mips64el-linux" = stagesLinux; + "powerpc-linux" = /* stagesLinux */ stagesNative; + "x86_64-darwin" = stagesDarwin; + "x86_64-solaris" = stagesNix; + "i686-cygwin" = stagesNative; + "x86_64-cygwin" = stagesNative; + "x86_64-freebsd" = stagesFreeBSD; + }.${system} or stagesNative diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index ea2ebcc7917a..2cb059deb34b 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,65 +1,86 @@ -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; -rec { - inherit allPackages; - bootstrapTools = derivation { - inherit system; +[ - name = "trivial-bootstrap-tools"; - builder = "/usr/local/bin/bash"; - args = [ ./trivial-bootstrap.sh ]; + ({}: { + __raw = true; - mkdir = "/bin/mkdir"; - ln = "/bin/ln"; - }; + bootstrapTools = derivation { + inherit system; + + name = "trivial-bootstrap-tools"; + builder = "/usr/local/bin/bash"; + args = [ ./trivial-bootstrap.sh ]; + + mkdir = "/bin/mkdir"; + ln = "/bin/ln"; + }; + }) + + ({ bootstrapTools, ... }: rec { + __raw = true; + + inherit bootstrapTools; + + fetchurl = import ../../build-support/fetchurl { + inherit stdenv; + curl = bootstrapTools; + }; - fetchurl = import ../../build-support/fetchurl { stdenv = import ../generic { name = "stdenv-freebsd-boot-1"; inherit system config; - - initialPath = [ "/" "/usr" ]; - shell = "${bootstrapTools}/bin/bash"; + initialPath = [ "/" "/usr" ]; + shell = "${bootstrapTools}/bin/bash"; fetchurlBoot = null; cc = null; - }; - curl = bootstrapTools; - }; - - stdenvFreeBSD = import ../generic { - name = "stdenv-freebsd-boot-3"; - - inherit system config; - - initialPath = [ bootstrapTools ]; - shell = "${bootstrapTools}/bin/bash"; - fetchurlBoot = fetchurl; - - cc = import ../../build-support/cc-wrapper { - nativeTools = true; - nativePrefix = "/usr"; - nativeLibc = true; - stdenv = import ../generic { - inherit system config; - name = "stdenv-freebsd-boot-0"; - initialPath = [ bootstrapTools ]; - shell = stdenvFreeBSD.shell; - fetchurlBoot = fetchurl; - cc = null; + overrides = self: super: { }; - cc = { - name = "clang-9.9.9"; - cc = "/usr"; - outPath = "/usr"; - }; - isClang = true; }; + }) - preHook = ''export NIX_NO_SELF_RPATH=1''; - }; -} + (prevStage: { + __raw = true; + + stdenv = import ../generic { + name = "stdenv-freebsd-boot-0"; + inherit system config; + initialPath = [ prevStage.bootstrapTools ]; + inherit (prevStage.stdenv) shell; + fetchurlBoot = prevStage.fetchurl; + cc = null; + }; + }) + + (prevStage: { + inherit system crossSystem platform config overlays; + stdenv = import ../generic { + name = "stdenv-freebsd-boot-3"; + inherit system config; + + inherit (prevStage.stdenv) + initialPath shell fetchurlBoot; + + cc = import ../../build-support/cc-wrapper { + nativeTools = true; + nativePrefix = "/usr"; + nativeLibc = true; + inherit (prevStage) stdenv; + cc = { + name = "clang-9.9.9"; + cc = "/usr"; + outPath = "/usr"; + }; + isClang = true; + }; + + preHook = ''export NIX_NO_SELF_RPATH=1''; + }; + }) + +] diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index bd35970e0d12..32e0d8948188 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,7 +1,7 @@ let lib = import ../../../lib; in lib.makeOverridable ( { system, name ? "stdenv", preHook ? "", initialPath, cc, shell -, allowedRequisites ? null, extraAttrs ? {}, overrides ? (pkgs: {}), config +, allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9900fc6dd3d5..12da007f2a76 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -3,8 +3,8 @@ # external (non-Nix) tools, such as /usr/bin/gcc, and it contains a C # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays , bootstrapFiles ? if system == "i686-linux" then import ./bootstrap-files/i686.nix @@ -18,7 +18,7 @@ assert crossSystem == null; -rec { +let commonPreHook = '' @@ -43,8 +43,8 @@ rec { # This function builds the various standard environments used during # the bootstrap. In all stages, we build an stdenv and the package # set that can be built with that stdenv. - stageFun = - {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}: + stageFun = prevStage: + { name, overrides ? (self: super: {}), extraBuildInputs ? [] }: let @@ -65,17 +65,17 @@ rec { inherit system; }; - cc = if isNull gccPlain + cc = if isNull prevStage.gcc-unwrapped then null else lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; - cc = gccPlain; + cc = prevStage.gcc-unwrapped; isGNU = true; - libc = glibc; - inherit binutils coreutils gnugrep; + libc = prevStage.glibc; + inherit (prevStage) binutils coreutils gnugrep; name = name; - stdenv = stage0.stdenv; + stdenv = prevStage.ccWrapperStdenv; }; extraAttrs = { @@ -85,37 +85,47 @@ rec { # stdenv.glibc is used by GCC build to figure out the system-level # /usr/include directory. - inherit glibc; + inherit (prevStage) glibc; }; - overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; + overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; - thisPkgs = allPackages { - inherit system platform crossSystem config; - allowCustomOverrides = false; - stdenv = thisStdenv; - }; + in { + inherit system platform crossSystem config overlays; + stdenv = thisStdenv; + }; - in { stdenv = thisStdenv; pkgs = thisPkgs; }; +in +[ - # Build a dummy stdenv with no GCC or working fetchurl. This is - # because we need a stdenv to build the GCC wrapper and fetchurl. - stage0 = stageFun { - gccPlain = null; + ({}: { + __raw = true; + + gcc-unwrapped = null; glibc = null; binutils = null; coreutils = null; gnugrep = null; + }) + + # Build a dummy stdenv with no GCC or working fetchurl. This is + # because we need a stdenv to build the GCC wrapper and fetchurl. + (prevStage: stageFun prevStage { name = null; - overrides = pkgs: { + overrides = self: super: { + # We thread stage0's stdenv through under this name so downstream stages + # can use it for wrapping gcc too. This way, downstream stages don't need + # to refer to this stage directly, which violates the principle that each + # stage should only access the stage that came before it. + ccWrapperStdenv = self.stdenv; # The Glibc include directory cannot have the same prefix as the # GCC include directory, since GCC gets confused otherwise (it # will search the Glibc headers before the GCC headers). So # create a dummy Glibc here, which will be used in the stdenv of # stage1. - glibc = stage0.stdenv.mkDerivation { + glibc = self.stdenv.mkDerivation { name = "bootstrap-glibc"; buildCommand = '' mkdir -p $out @@ -123,8 +133,12 @@ rec { ln -s ${bootstrapTools}/include-glibc $out/include ''; }; + gcc-unwrapped = bootstrapTools; + binutils = bootstrapTools; + coreutils = bootstrapTools; + gnugrep = bootstrapTools; }; - }; + }) # Create the first "real" standard environment. This one consists @@ -137,103 +151,92 @@ rec { # If we ever need to use a package from more than one stage back, we # simply re-export those packages in the middle stage(s) using the # overrides attribute and the inherit syntax. - stage1 = stageFun { - gccPlain = bootstrapTools; - inherit (stage0.pkgs) glibc; - binutils = bootstrapTools; - coreutils = bootstrapTools; - gnugrep = bootstrapTools; + (prevStage: stageFun prevStage { name = "bootstrap-gcc-wrapper"; # Rebuild binutils to use from stage2 onwards. - overrides = pkgs: { - binutils = pkgs.binutils.override { gold = false; }; - inherit (stage0.pkgs) glibc; + overrides = self: super: { + binutils = super.binutils.override { gold = false; }; + inherit (prevStage) + ccWrapperStdenv + glibc gcc-unwrapped coreutils gnugrep; # A threaded perl build needs glibc/libpthread_nonshared.a, # which is not included in bootstrapTools, so disable threading. # This is not an issue for the final stdenv, because this perl # won't be included in the final stdenv and won't be exported to # top-level pkgs as an override either. - perl = pkgs.perl.override { enableThreading = false; }; + perl = super.perl.override { enableThreading = false; }; }; - }; + }) # 2nd stdenv that contains our own rebuilt binutils and is used for # compiling our own Glibc. - stage2 = stageFun { - gccPlain = bootstrapTools; - inherit (stage1.pkgs) glibc; - binutils = stage1.pkgs.binutils; - coreutils = bootstrapTools; - gnugrep = bootstrapTools; + (prevStage: stageFun prevStage { name = "bootstrap-gcc-wrapper"; - overrides = pkgs: { - inherit (stage1.pkgs) perl binutils paxctl gnum4 bison; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + binutils gcc-unwrapped coreutils gnugrep + perl paxctl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. }; - }; + }) # Construct a third stdenv identical to the 2nd, except that this # one uses the rebuilt Glibc from stage2. It still uses the recent # binutils and rest of the bootstrap tools, including GCC. - stage3 = stageFun { - gccPlain = bootstrapTools; - inherit (stage2.pkgs) glibc binutils; - coreutils = bootstrapTools; - gnugrep = bootstrapTools; + (prevStage: stageFun prevStage { name = "bootstrap-gcc-wrapper"; - overrides = pkgs: rec { - inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders gnum4 bison; + overrides = self: super: rec { + inherit (prevStage) + ccWrapperStdenv + binutils glibc coreutils gnugrep + perl patchelf linuxHeaders gnum4 bison; # Link GCC statically against GMP etc. This makes sense because # these builds of the libraries are only used by GCC, so it # reduces the size of the stdenv closure. - gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - gccPlain = pkgs.gcc.cc.override { + gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; }; + mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; }; + libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; }; + isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; }; + gcc-unwrapped = super.gcc-unwrapped.override { isl = isl_0_14; }; }; - extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; - }; + extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ]; + }) # Construct a fourth stdenv that uses the new GCC. But coreutils is # still from the bootstrap tools. - stage4 = stageFun { - inherit (stage3.pkgs) gccPlain glibc binutils; - gnugrep = bootstrapTools; - coreutils = bootstrapTools; + (prevStage: stageFun prevStage { name = ""; - overrides = pkgs: { + overrides = self: super: { # Zlib has to be inherited and not rebuilt in this stage, # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (stage3.pkgs) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; + inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; isGNU = true; - cc = stage4.stdenv.cc.cc; - libc = stage4.pkgs.glibc; - inherit (stage4.pkgs) binutils coreutils gnugrep; + cc = prevStage.gcc-unwrapped; + libc = self.glibc; + inherit (self) stdenv binutils coreutils gnugrep; name = ""; - stdenv = stage4.stdenv; - shell = stage4.pkgs.bash + "/bin/bash"; + shell = self.bash + "/bin/bash"; }; }; - extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ]; - }; - + extraBuildInputs = [ prevStage.patchelf prevStage.xz ]; + }) # Construct the final stdenv. It uses the Glibc and GCC, and adds # in a new binutils that doesn't depend on bootstrap-tools, as well @@ -242,50 +245,52 @@ rec { # When updating stdenvLinux, make sure that the result has no # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. - stdenvLinux = import ../generic rec { - inherit system config; + (prevStage: { + inherit system crossSystem platform config overlays; + stdenv = import ../generic rec { + inherit system config; - preHook = - '' + preHook = '' # Make "strip" produce deterministic output, by setting # timestamps etc. to a fixed value. commonStripFlags="--enable-deterministic-archives" ${commonPreHook} ''; - initialPath = - ((import ../common-path.nix) {pkgs = stage4.pkgs;}); + initialPath = + ((import ../common-path.nix) {pkgs = prevStage;}); - extraBuildInputs = [ stage4.pkgs.patchelf stage4.pkgs.paxctl ]; + extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ]; - cc = stage4.pkgs.gcc; + cc = prevStage.gcc; - shell = cc.shell; + shell = cc.shell; - inherit (stage4.stdenv) fetchurlBoot; + inherit (prevStage.stdenv) fetchurlBoot; - extraAttrs = { - inherit (stage4.pkgs) glibc; - inherit platform bootstrapTools; - shellPackage = stage4.pkgs.bash; + extraAttrs = { + inherit (prevStage) glibc; + inherit platform bootstrapTools; + shellPackage = prevStage.bash; + }; + + /* outputs TODO + allowedRequisites = with prevStage; + [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk + glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl + paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv + ]; + */ + + overrides = self: super: { + gcc = cc; + + inherit (prevStage) + gzip bzip2 xz bash binutils coreutils diffutils findutils gawk + glibc gnumake gnused gnutar gnugrep gnupatch patchelf + attr acl paxctl zlib pcre; + }; }; + }) - /* outputs TODO - allowedRequisites = with stage4.pkgs; - [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk - glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl - paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv - ]; - */ - - overrides = pkgs: { - gcc = cc; - - inherit (stage4.pkgs) - gzip bzip2 xz bash binutils coreutils diffutils findutils gawk - glibc gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre; - }; - }; - -} +] diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 8396bd0cb017..4028638009e1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,10 +1,10 @@ -{ lib, allPackages -, system, platform, crossSystem, config +{ lib +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; -rec { +let shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" @@ -77,7 +77,7 @@ rec { # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - { cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: + { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: import ../generic { preHook = @@ -101,50 +101,54 @@ rec { inherit system shell cc overrides config; }; +in - stdenvBoot0 = makeStdenv { - cc = null; - fetchurl = null; - }; +[ + ({}: rec { + __raw = true; - cc = import ../../build-support/cc-wrapper { - name = "cc-native"; - nativeTools = true; - nativeLibc = true; - nativePrefix = if system == "i686-solaris" then "/usr/gnu" else if system == "x86_64-solaris" then "/opt/local/gcc47" else "/usr"; - stdenv = stdenvBoot0; - }; + stdenv = makeStdenv { + cc = null; + fetchurl = null; + }; + cc = import ../../build-support/cc-wrapper { + name = "cc-native"; + nativeTools = true; + nativeLibc = true; + nativePrefix = { # switch + "i686-solaris" = "/usr/gnu"; + "x86_64-solaris" = "/opt/local/gcc47"; + }.${system} or "/usr"; + inherit stdenv; + }; - fetchurl = import ../../build-support/fetchurl { - stdenv = stdenvBoot0; - # Curl should be in /usr/bin or so. - curl = null; - }; + fetchurl = import ../../build-support/fetchurl { + inherit stdenv; + # Curl should be in /usr/bin or so. + curl = null; + }; + }) # First build a stdenv based only on tools outside the store. - stdenvBoot1 = makeStdenv { - inherit cc fetchurl; - } // {inherit fetchurl;}; + (prevStage: { + inherit system crossSystem platform config overlays; + stdenv = makeStdenv { + inherit (prevStage) cc fetchurl; + } // { inherit (prevStage) fetchurl; }; + }) - stdenvBoot1Pkgs = allPackages { - inherit system platform crossSystem config; - allowCustomOverrides = false; - stdenv = stdenvBoot1; - }; + # Using that, build a stdenv that adds the ‘xz’ command (which most systems + # don't have, so we mustn't rely on the native environment providing it). + (prevStage: { + inherit system crossSystem platform config overlays; + stdenv = makeStdenv { + inherit (prevStage.stdenv) cc fetchurl; + extraPath = [ prevStage.xz ]; + overrides = self: super: { inherit (prevStage) xz; }; + }; + }) - - # Using that, build a stdenv that adds the ‘xz’ command (which most - # systems don't have, so we mustn't rely on the native environment - # providing it). - stdenvBoot2 = makeStdenv { - inherit cc fetchurl; - extraPath = [ stdenvBoot1Pkgs.xz ]; - overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; }; - }; - - - stdenvNative = stdenvBoot2; -} +] diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index e58972e5c8a6..a5f0a18464c1 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,39 +1,53 @@ -{ stdenv, pkgs, config, lib }: +{ lib +, crossSystem, config +, bootStages +, ... +}: -import ../generic rec { - inherit config; +assert crossSystem == null; - preHook = - '' - export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" - export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" - export NIX_IGNORE_LD_THROUGH_GCC=1 - ''; +bootStages ++ [ + (prevStage: let + inherit (prevStage) stdenv; + inherit (stdenv) system platform; + in { + inherit system platform crossSystem config; - initialPath = (import ../common-path.nix) {pkgs = pkgs;}; + stdenv = import ../generic rec { + inherit config; - system = stdenv.system; + preHook = '' + export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" + export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" + export NIX_IGNORE_LD_THROUGH_GCC=1 + ''; - cc = import ../../build-support/cc-wrapper { - nativeTools = false; - nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; - nativeLibc = true; - inherit stdenv; - inherit (pkgs) binutils coreutils gnugrep; - cc = pkgs.gcc.cc; - isGNU = true; - shell = pkgs.bash + "/bin/sh"; - }; + initialPath = (import ../common-path.nix) { pkgs = prevStage; }; - shell = pkgs.bash + "/bin/sh"; + system = stdenv.system; - fetchurlBoot = stdenv.fetchurlBoot; + cc = import ../../build-support/cc-wrapper { + nativeTools = false; + nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; + nativeLibc = true; + inherit stdenv; + inherit (prevStage) binutils coreutils gnugrep; + cc = prevStage.gcc.cc; + isGNU = true; + shell = prevStage.bash + "/bin/sh"; + }; - overrides = pkgs_: { - inherit cc; - inherit (cc) binutils; - inherit (pkgs) - gzip bzip2 xz bash coreutils diffutils findutils gawk - gnumake gnused gnutar gnugrep gnupatch perl; - }; -} + shell = prevStage.bash + "/bin/sh"; + + fetchurlBoot = stdenv.fetchurlBoot; + + overrides = self: super: { + inherit cc; + inherit (cc) binutils; + inherit (prevStage) + gzip bzip2 xz bash coreutils diffutils findutils gawk + gnumake gnused gnutar gnugrep gnupatch perl; + }; + }; + }) +] diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 0429faab2ef8..eac44efdf273 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,7 +18,7 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau +, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau , nvidia_x11, virtualgl, primusLib , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 @@ -125,7 +125,6 @@ in stdenv.mkDerivation rec { CFLAGS = [ "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" - "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; postInstall = '' diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch index 00fb8ad7a535..cf6ee5add98f 100644 --- a/pkgs/tools/X11/bumblebee/nixos.patch +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -49,12 +49,11 @@ index 71a6b73..a682d8a 100644 char *x_argv[] = { XORG_BINARY, bb_config.x_display, -@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { +@@ -153,24 +170,24 @@ bool start_secondary(bool need_secondary) { "-sharevts", "-nolisten", "tcp", "-noreset", + "-logfile", "/var/log/X.bumblebee.log", -+ "-xkbdir", X_XKB_DIR, "-verbose", "3", "-isolateDevice", pci_id, - "-modulepath", bb_config.mod_path, // keep last diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 4ae367abf612..eadae7ad3c45 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection }: diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a9ba93507364..f66b7389f315 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 31a67b1baf94..5a27d336c291 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ xz.bin ]; + nativeBuildInputs = [ xz.bin ]; preConfigure = if stdenv.isCygwin then '' sed -i lib/fpending.h -e 's,include ,,' diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index a09d60f788c7..c4a0981dbb3c 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo +, ApplicationServices }: stdenv.mkDerivation rec { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] - ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ]; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index e815cded09a1..b0ccc5428bb8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex +, ApplicationServices }: stdenv.mkDerivation rec { @@ -20,9 +21,9 @@ stdenv.mkDerivation rec { [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango ] ++ stdenv.lib.optionals (xorg != null) (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) - ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + ++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; - CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") + CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 300e05023b1b..70f9e29d0f5d 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.31.0"; + name = "icoutils-0.31.1"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8"; + sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6"; }; buildInputs = [ makeWrapper libpng perl ]; diff --git a/pkgs/tools/misc/ckb/ckb-animations-location.patch b/pkgs/tools/misc/ckb/ckb-animations-location.patch new file mode 100644 index 000000000000..07dcfab86be8 --- /dev/null +++ b/pkgs/tools/misc/ckb/ckb-animations-location.patch @@ -0,0 +1,12 @@ +diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp +index d0b7f46..d7a3459 100644 +--- a/src/ckb/animscript.cpp ++++ b/src/ckb/animscript.cpp +@@ -30,7 +30,7 @@ QString AnimScript::path(){ + #ifdef __APPLE__ + return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations"); + #else +- return QDir(QApplication::applicationDirPath()).absoluteFilePath("ckb-animations"); ++ return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations"); + #endif + } diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix new file mode 100644 index 000000000000..f2dc5150bbd7 --- /dev/null +++ b/pkgs/tools/misc/ckb/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }: + +stdenv.mkDerivation rec { + version = "0.2.6"; + name = "ckb-${version}"; + + src = fetchFromGitHub { + owner = "ccMSC"; + repo = "ckb"; + rev = "v${version}"; + sha256 = "04h50qdzsbi77mj62jghr52i35vxvmhnvsb7pdfdq95ryry8bnwm"; + }; + + buildInputs = [ + libudev + qtbase + zlib + ]; + + nativeBuildInputs = [ + pkgconfig + qmakeHook + ]; + + patches = [ + ./ckb-animations-location.patch + ]; + + doCheck = false; + + installPhase = '' + install -D --mode 0755 --target-directory $out/bin bin/ckb-daemon bin/ckb + install -D --mode 0755 --target-directory $out/libexec/ckb-animations bin/ckb-animations/* + ''; + + meta = with stdenv.lib; { + description = "Driver and configuration tool for Corsair keyboards and mice"; + homepage = https://github.com/ccMSC/ckb; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ kierdavis ]; + }; +} diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 711e601234de..445b486c8510 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,21 +1,22 @@ -{fetchFromGitHub , stdenv, makeWrapper, python, gtk3, libwnck3 }: +{fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }: stdenv.mkDerivation rec { name = "clipster-unstable-${version}"; - version = "2016-12-08"; + version = "2017-01-12"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b"; - sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1"; + rev = "d66fbb098149bef687f062bfa111a21c9121851f"; + sha256 = "0yncjfl0822v2b7f9g7a6ihb99g5hd1s8bfpr2r9nqga6m11k90q"; }; - pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]); + pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; installPhase = '' + sed -i 's/python/python3/g' clipster mkdir -p $out/bin/ cp clipster $out/bin/ wrapProgram "$out/bin/clipster" \ diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index b58ae6505dc9..fb1c79d250a0 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.70"; + version = "1.72"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "1abkfkjn4fxplq33cwqjmgxabk2x6ij2klqn0w4a0lj82a7xx10x"; + sha256 = "192z3fzib71y3sjic03ll67xv51igdlpvfhx12yv9wnzkir7lx02"; }; sourceRoot = "cloc-v${version}-src/Unix"; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix new file mode 100644 index 000000000000..d3a1a7124669 --- /dev/null +++ b/pkgs/tools/misc/fsmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "fsmon-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "nowsecure"; + repo = "fsmon"; + rev = "${version}"; + sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "FileSystem Monitor utility"; + homepage = https://github.com/nowsecure/fsmon; + license = licenses.mit; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index c33f09529a56..8bcbf4951d12 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { @@ -12,7 +12,6 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run - sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run chmod a+x $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8e1519ec1898..ef2164b5a142 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.01.08"; + version = "2017.01.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6"; + sha256 = "76c8bd77db6c820bfa72f1e2a873101ca736fd1d9954ccebf349fa7caef99cca"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 83899c2380c3..11e019dfec3b 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.13"; + name = "fping-3.15"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb"; + sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n"; }; + configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; + meta = { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index a11b34ef9914..bed9bba16b06 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { - version = "7.0.9"; + version = "7.0.12"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac"; + sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x"; }; doCheck = false; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 1c8ef67a7830..6c74b52b45f5 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.13"; + name = "radvd-${version}"; + version = "2.15"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1lzgg6zpizcldb78n5gkykjnpr7sqm4r1xy9bm4ig0chbrink4ka"; + sha256 = "09spyj4f05rjx21v8vmyqmmj0fz1wx810s63md1vf05hyzd0v8dk"; }; - buildInputs = [ pkgconfig libdaemon bison flex check ]; - - hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ pkgconfig bison flex check ]; + buildInputs = [ libdaemon ]; meta = with stdenv.lib; { homepage = http://www.litech.org/radvd/; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7bcbb4fddb6b..7da47e339d08 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook , curl, trousers, sqlite, iptables, libxml2, openresolv -, ldns, unbound, pcsclite, openssl +, ldns, unbound, pcsclite, openssl, systemd , enableTNC ? false }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildInputs = - [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite ] + [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite systemd.dev ] ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]; patches = [ @@ -26,10 +26,21 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf" + + # swanctl can be configured by files in SWANCTLDIR which defaults to + # $out/etc/swanctl. Since that directory is in the nix store users can't + # modify it. Ideally swanctl accepts a command line option for specifying + # the configuration files. In the absence of that we patch swanctl to look + # for configuration files in /etc/swanctl. + substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\"" ''; + preConfigure = '' + configureFlagsArray+=("--with-systemdsystemunitdir=$out/etc/systemd/system") + ''; + configureFlags = - [ "--enable-swanctl" "--enable-cmd" + [ "--enable-swanctl" "--enable-cmd" "--enable-systemd" "--enable-farp" "--enable-dhcp" "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5bfb0b45c1ba..069eab421ec8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -103,10 +103,10 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.11.5"; + name = "nix-1.11.6"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb"; + sha256 = "e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3"; }; }; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 8116d0dfe9f9..5a40837f1d9d 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,11 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.17"; + version = "1.8.20"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4173/pcsc-lite-${version}.tar.bz2"; - sha256 = "0vq2291kvnbg8czlakqahxrdhsvp74fqy3z75lfjlkq2aj36yayp"; + # This URL changes in unpredictable ways, so it is not sensicle + # to put a version variable in there. + url = "https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2"; + sha256 = "1ckb0jf4n585a4j26va3jm2nrv3c1y38974514f8qy3c04a02zgc"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c7e0857c2ca4..271a89b784d9 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { || stdenv.isFreeBSD ); - buildInputs = [ xz.bin ] - ++ stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv + nativeBuildInputs = [ xz.bin ]; + buildInputs = + stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv ++ stdenv.lib.optional interactive readline ++ stdenv.lib.optional stdenv.isDarwin locale; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index aa25101636e0..ca038b3ccb49 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs ./build-aux/help2man"; + crossAttrs = { + # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it, + # which won't work when cross compiling as help2man needs to execute the binaries. + postConfigure = '' + sed -i Makefile -e 's|doc/sed\.1:|dummy:|' + ''; + }; + meta = { homepage = http://www.gnu.org/software/sed/; description = "GNU sed, a batch stream editor"; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 34eea38eb733..c1b4aa1cf2c6 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libiconv }: +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: stdenv.mkDerivation rec { name = "unrtf-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; }; + patches = [ + (fetchpatch { + name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20"; + sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b"; + }) + ]; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index b910be76b851..a0c6a66634b0 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "11.89"; + version = "11.90"; name = "${pname}-${version}"; # Make this a valid tex(live-new) package; @@ -14,7 +14,7 @@ let auctex = stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; + sha256 = "13zimbyar3159arrcklmnmjxjvibrjpkac6d53mfv03pwpc2y8rw"; }; buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03d469387eb0..e1bbb22e06f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,9 +5,7 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ system, noSysDirs, config, crossSystem, platform, lib -, nixpkgsFun -}: +{ lib, nixpkgsFun, noSysDirs, config}: self: pkgs: with pkgs; @@ -18,9 +16,6 @@ in { - # Make some arguments passed to all-packages.nix available - inherit system platform; - # Allow callPackage to fill in the pkgs argument inherit pkgs; @@ -867,6 +862,8 @@ in filebench = callPackage ../tools/misc/filebench { }; + fsmon = callPackage ../tools/misc/fsmon { }; + fop = callPackage ../tools/typesetting/fop { }; fondu = callPackage ../tools/misc/fondu { }; @@ -881,6 +878,8 @@ in gdrivefs = python27Packages.gdrivefs; + go-dependency-manager = callPackage ../development/tools/gdm { }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1267,6 +1266,8 @@ in cloud-utils = callPackage ../tools/misc/cloud-utils { }; + ckb = qt5.callPackage ../tools/misc/ckb { }; + compass = callPackage ../development/tools/compass { }; convmv = callPackage ../tools/misc/convmv { }; @@ -1488,7 +1489,7 @@ in dtach = callPackage ../tools/misc/dtach { }; - dtc = callPackage ../development/compilers/dtc { }; + dtc = callPackage ../development/compilers/dtc { flex = flex_2_6_1; }; dub = callPackage ../development/tools/build-managers/dub { }; @@ -1739,6 +1740,7 @@ in }); fontforge-gtk = callPackage ../tools/misc/fontforge { withGTK = true; + gtk2 = gtk2-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -1843,7 +1845,7 @@ in gazebo-headless = gazeboSimulator.gazebo6-headless; gbdfed = callPackage ../tools/misc/gbdfed { - gtk = gtk2; + gtk = gtk2-x11; }; gdmap = callPackage ../tools/system/gdmap { }; @@ -1868,6 +1870,8 @@ in gifsicle = callPackage ../tools/graphics/gifsicle { }; + git-crecord = callPackage ../applications/version-management/git-crecord { }; + git-lfs = callPackage ../applications/version-management/git-lfs { }; git-up = callPackage ../applications/version-management/git-up { }; @@ -1988,9 +1992,11 @@ in pythonPackages = pypyPackages; }; - graphviz = callPackage ../tools/graphics/graphviz { }; + graphviz = callPackage ../tools/graphics/graphviz { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; - graphviz-nox = callPackage ../tools/graphics/graphviz { + graphviz-nox = graphviz.override { xorg = null; libdevil = libdevil-nox; }; @@ -2005,7 +2011,9 @@ in * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for * objections before removal. The feature is libgraph. */ - graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; + graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; grin = callPackage ../tools/text/grin { }; ripgrep = callPackage ../tools/text/ripgrep { }; @@ -2121,6 +2129,8 @@ in hans = callPackage ../tools/networking/hans { }; + h2 = callPackage ../servers/h2 { }; + haproxy = callPackage ../tools/networking/haproxy { }; haveged = callPackage ../tools/security/haveged { }; @@ -2529,7 +2539,7 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nodejs = nodejs-6_x; + nodejs = hiPrio nodejs-6_x; nodejs-slim = nodejs-slim-6_x; @@ -3656,6 +3666,8 @@ in rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; rubber = callPackage ../tools/typesetting/rubber { }; + + rubocop = callPackage ../development/tools/rubocop { }; runningx = callPackage ../tools/X11/runningx { }; @@ -4065,6 +4077,8 @@ in trousers = callPackage ../tools/security/trousers { }; + tryton = callPackage ../applications/office/tryton { }; + omapd = callPackage ../tools/security/omapd { }; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; @@ -4504,6 +4518,8 @@ in xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + yarn = callPackage ../development/tools/yarn { }; + yank = callPackage ../tools/misc/yank { }; yaml-merge = callPackage ../tools/text/yaml-merge { }; @@ -4549,6 +4565,8 @@ in zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { }; + zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { }; + zstd = callPackage ../tools/compression/zstd { }; zsync = callPackage ../tools/compression/zsync { }; @@ -4722,6 +4740,7 @@ in gambit = callPackage ../development/compilers/gambit { }; gcc = gcc5; + gcc-unwrapped = gcc.cc; wrapCCMulti = cc: if system == "x86_64-linux" then lowPrio ( @@ -5273,7 +5292,6 @@ in mozart = mozart-binary; nim = callPackage ../development/compilers/nim { }; - nimble = callPackage ../development/tools/nimble { }; nrpl = callPackage ../development/tools/nrpl { }; neko = callPackage ../development/compilers/neko { }; @@ -5323,16 +5341,16 @@ in rust = rustStable; rustStable = callPackage ../development/compilers/rust {}; - rustBeta = callPackage ../development/compilers/rust/beta.nix {}; - rustNightly = callPackage ../development/compilers/rust/nightly.nix { + rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); + rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); - }; - rustNightlyBin = callPackage ../development/compilers/rust/nightlyBin.nix { + })); + rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { buildRustPackage = callPackage ../build-support/rust { rust = rustNightlyBin; rustRegistry = callPackage ./rust-packages.nix { }; }; - }; + }); cargo = rust.cargo; rustc = rust.rustc; @@ -5373,8 +5391,9 @@ in scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; - scala_2_11 = callPackage ../development/compilers/scala { }; - scala = scala_2_11; + scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; + scala_2_12 = callPackage ../development/compilers/scala { }; + scala = scala_2_12; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -5617,7 +5636,9 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; - lxappearance = callPackage ../desktops/lxde/core/lxappearance {}; + lxappearance = callPackage ../desktops/lxde/core/lxappearance { + gtk2 = gtk2-x11; + }; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; @@ -6350,6 +6371,8 @@ in heroku = callPackage ../development/tools/heroku { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; + hyenae = callPackage ../tools/networking/hyenae { }; icestorm = callPackage ../development/tools/icestorm { }; @@ -7091,6 +7114,9 @@ in ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; @@ -7262,8 +7288,6 @@ in } ); - libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; - gle = callPackage ../development/libraries/gle { }; glew = callPackage ../development/libraries/glew { }; @@ -7382,7 +7406,9 @@ in bison = bison2; }; - gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {}; + gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; @@ -7485,7 +7511,9 @@ in cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; - pangomm = callPackage ../development/libraries/pangomm { }; + pangomm = callPackage ../development/libraries/pangomm { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; pangox_compat = callPackage ../development/libraries/pangox-compat { }; @@ -7503,6 +7531,10 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; + gtk2-x11 = gtk2.override { + gdktarget = "x11"; + }; + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; @@ -7530,6 +7562,8 @@ in gtk = gtk2; }; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -7774,7 +7808,7 @@ in libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_11; + inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -8392,7 +8426,7 @@ in libpfm = callPackage ../development/libraries/libpfm { }; - libpqxx = callPackage ../development/libraries/libpqxx { + libpqxx = callPackage ../development/libraries/libpqxx { gnused = gnused_422; }; @@ -9294,7 +9328,6 @@ in libsmf = callPackage ../development/libraries/audio/libsmf { }; lilv = callPackage ../development/libraries/audio/lilv { }; - lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; @@ -9424,7 +9457,6 @@ in soqt = callPackage ../development/libraries/soqt { }; sord = callPackage ../development/libraries/sord {}; - sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {}; soundtouch = callPackage ../development/libraries/soundtouch {}; @@ -10194,6 +10226,8 @@ in erlang = erlangR16; }; + couchpotato = callPackage ../servers/couchpotato {}; + dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { @@ -10520,7 +10554,6 @@ in prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; - prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -10885,6 +10918,8 @@ in stubs = callPackages ../os-specific/darwin/stubs {}; usr-include = callPackage ../os-specific/darwin/usr-include {}; + + DarwinTools = callPackage ../os-specific/darwin/DarwinTools {}; }; devicemapper = lvm2; @@ -11066,6 +11101,8 @@ in # -- Linux kernel expressions ------------------------------------------------ + lkl = callPackage ../applications/virtualization/lkl { }; + linuxHeaders = linuxHeaders_4_4; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { @@ -11174,23 +11211,6 @@ in ]; }; - linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" - kernelPatches.modinst_arg_list_too_long - kernelPatches.panic_on_icmp6_frag_CVE_2016_9919 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11385,7 +11405,6 @@ in linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); - linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); # Don't forget to update linuxPackages_latest! @@ -11807,6 +11826,8 @@ in qt5 = null; }; + vndr = callPackage ../development/tools/vndr { }; + windows = rec { cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; @@ -12352,19 +12373,10 @@ in amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - # Oracle JDK is recommended upstream, but unfree and requires a manual - # download. OpenJDK is straightforward, but may suffer from compatibility - # problems e.g. https://code.google.com/p/android/issues/detail?id=174496. - # To use Oracle JDK add an override to ~/.nixpkgs/config.nix: - # { - # packageOverrides = pkgs: { - # android-studio = pkgs.android-studio.override { - # jdk = pkgs.oraclejdk8; - # }; - # }; - # } android-studio = callPackage ../applications/editors/android-studio { - inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst; + fontsConf = makeFontsConf { + fontDirectories = []; + }; }; antimony = qt5.callPackage ../applications/graphics/antimony {}; @@ -13190,7 +13202,9 @@ in gpa = callPackage ../applications/misc/gpa { }; - gpicview = callPackage ../applications/graphics/gpicview { }; + gpicview = callPackage ../applications/graphics/gpicview { + gtk2 = gtk2-x11; + }; gqrx = callPackage ../applications/misc/gqrx { }; @@ -13352,6 +13366,7 @@ in inherit (gnome2) libart_lgpl; webkit = null; lcms = lcms2; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; gimp = gimp_2_8; @@ -13433,6 +13448,8 @@ in manuskript = callPackage ../applications/editors/manuskript { }; + manul = callPackage ../development/tools/manul { }; + mi2ly = callPackage ../applications/audio/mi2ly {}; praat = callPackage ../applications/audio/praat { }; @@ -13693,7 +13710,9 @@ in ghostscript = null; }; - imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; + imagemagickBig = callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; imagemagick7_light = lowPrio (imagemagick7.override { bzip2 = null; @@ -13719,7 +13738,9 @@ in ghostscript = null; }); - imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { }); + imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }); # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -14586,6 +14607,8 @@ in autoAwaySupport = config.profanity.autoAwaySupport or true; }; + psol = callPackage ../development/libraries/psol/default.nix { }; + pstree = callPackage ../applications/misc/pstree { }; pulseview = callPackage ../applications/science/electronics/pulseview { }; @@ -15119,7 +15142,7 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (pythonPackages) gyp; }; @@ -15648,6 +15671,8 @@ in xfig = callPackage ../applications/graphics/xfig { }; + xfractint = callPackage ../applications/graphics/xfractint {}; + xineUI = callPackage ../applications/video/xine-ui { }; xmind = callPackage ../applications/misc/xmind { }; @@ -15673,7 +15698,9 @@ in inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; - apvlv = callPackage ../applications/misc/apvlv { }; + apvlv = callPackage ../applications/misc/apvlv { + gtk2 = gtk2-x11; + }; xpdf = callPackage ../applications/misc/xpdf { base14Fonts = "${ghostscript}/share/ghostscript/fonts"; @@ -16407,6 +16434,8 @@ in xsnow = callPackage ../games/xsnow { }; + xsok = callPackage ../games/xsok { }; + xsokoban = callPackage ../games/xsokoban { }; zandronum = callPackage ../games/zandronum { diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index db3abb531f19..a146dad63bc8 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -7,11 +7,11 @@ 3. Defaults to no non-standard config and no cross-compilation target - 4. Uses the above to infer the default standard environment (stdenv) if - none is provided + 4. Uses the above to infer the default standard environment's (stdenv's) + stages if no stdenv's are provided - 5. Builds the final stage --- a fully booted package set with the chosen - stdenv + 5. Folds the stages to yield the final fully booted package set for the + chosen stdenv Use `impure.nix` to also infer the `system` based on the one on which evaluation is taking place, and the configuration from environment variables @@ -23,9 +23,13 @@ , # Allow a configuration attribute set to be passed in as an argument. config ? {} -, # The standard environment for building packages, or rather a function - # providing it. See below for the arguments given to that function. - stdenvFunc ? import ../stdenv +, # List of overlays layers used to extend Nixpkgs. + overlays ? [] + +, # A function booting the final package set for a specific standard + # environment. See below for the arguments given to that function, + # the type of list it returns. + stdenvStages ? import ../stdenv , crossSystem ? null , platform ? assert false; null @@ -76,10 +80,12 @@ in let inherit lib nixpkgsFun; } // newArgs); - stdenv = stdenvFunc { - inherit lib allPackages system platform crossSystem config; + boot = import ../stdenv/booter.nix { inherit lib allPackages; }; + + stages = stdenvStages { + inherit lib system platform crossSystem config overlays; }; - pkgs = allPackages { inherit system stdenv config crossSystem platform; }; + pkgs = boot stages; in pkgs diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index e90668159279..60a55c657c0c 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -18,7 +18,26 @@ else if homeDir != "" && pathExists configFile2 then import configFile2 else {} +, # Overlays are used to extend Nixpkgs collection with additional + # collections of packages. These collection of packages are part of the + # fix-point made by Nixpkgs. + overlays ? let + inherit (builtins) getEnv pathExists readDir attrNames map sort + lessThan; + dirEnv = getEnv "NIXPKGS_OVERLAYS"; + dirHome = (getEnv "HOME") + "/.nixpkgs/overlays"; + dirCheck = dir: dir != "" && pathExists (dir + "/."); + overlays = dir: + let content = readDir dir; in + map (n: import "${dir}/${n}") (sort lessThan (attrNames content)); + in + if dirEnv != "" then + if dirCheck dirEnv then overlays dirEnv + else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory." + else if dirCheck dirHome then overlays dirHome + else [] + , ... } @ args: -import ./. (args // { inherit system config; }) +import ./. (args // { inherit system config overlays; }) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e3f98c7ba2e..3c7be7cc1b98 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -347,10 +347,14 @@ let ojquery = callPackage ../development/ocaml-modules/ojquery { }; + omd = callPackage ../development/ocaml-modules/omd { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otr = callPackage ../development/ocaml-modules/otr { }; + owee = callPackage ../development/ocaml-modules/owee { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1587cee7430c..3e3bc8f3b454 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2094,11 +2094,11 @@ let self = _self // overrides; _self = with self; { }; }; - CompressRawBzip2 = buildPerlPackage { - name = "Compress-Raw-Bzip2-2.064"; + CompressRawBzip2 = buildPerlPackage rec { + name = "Compress-Raw-Bzip2-2.070"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.064.tar.gz; - sha256 = "0aqbggr9yf4hn21a9fra111rlmva3w8f3mqvbchl5l86knkbkwy3"; + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "0rmwpqhnhw5n11gm9mbxrxnardm0jfy7568ln9zw21bq3d7dsmn8"; }; # Don't build a private copy of bzip2. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c6d540bfea8..3746ef6f1ef1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2321,11 +2321,11 @@ in { channels = buildPythonPackage rec { name = "channels-${version}"; - version = "0.17.3"; + version = "1.0.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/channels/${name}.tar.gz"; - sha256 = "03nalz0mqjxqlgqwkmranair2c1amry2aw52dd78ihf07dfinnc9"; + sha256 = "0m55qzifg47s0zndnh3w7fnpd3skcbkq3lv8m87xgmcrczl7x5mf"; }; # Files are missing in the distribution @@ -5833,11 +5833,11 @@ in { daphne = buildPythonPackage rec { name = "daphne-${version}"; - version = "0.15.0"; + version = "1.0.1"; src = pkgs.fetchurl { url = "mirror://pypi/d/daphne/${name}.tar.gz"; - sha256 = "095xdh10v8sqwyas02q72ij3ivd5qjg5ki5cvha0fpzd361izdnp"; + sha256 = "0l62bd9swv0k9qcpl2s8kj4mgl6qayi0krwkkg1x73a9y48xpi9z"; }; propagatedBuildInputs = with self; [ asgiref autobahn ]; @@ -9205,6 +9205,8 @@ in { propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ]; }; + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + pyspf = buildPythonPackage rec { name = "pyspf-${version}"; version = "2.0.12"; @@ -12410,6 +12412,10 @@ in { sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz"; }; + prePatch = optionals pkgs.stdenv.isDarwin '' + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py + ''; + patches = optionals pkgs.stdenv.isDarwin [ ../development/python-modules/gyp/no-darwin-cflags.patch ]; @@ -20058,8 +20064,8 @@ in { buildInputs = [ pkgs.libev ]; - libEvSharedLibrary = - if !stdenv.isDarwin + libEvSharedLibrary = + if !stdenv.isDarwin then "${pkgs.libev}/lib/libev.so.4" else "${pkgs.libev}/lib/libev.4.dylib"; @@ -23840,11 +23846,11 @@ in { sounddevice = buildPythonPackage rec { name = "sounddevice-${version}"; - version = "0.3.4"; + version = "0.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/s/sounddevice/${name}.tar.gz"; - sha256 = "f6c4120357c1458b23bd0d466c66808efdefad397bf97b1162600d079d4665ae"; + sha256 = "4ef39be2d13069fbad8c69ac259e018d96ce55c23b529a7e0be9bd9a76e2e8da"; }; propagatedBuildInputs = with self; [ cffi numpy pkgs.portaudio ]; @@ -29773,12 +29779,12 @@ EOF }; neovim = buildPythonPackage rec { - version = "0.1.12"; + version = "0.1.13"; name = "neovim-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/neovim/${name}.tar.gz"; - sha256 = "1pll4jjqdq54d867hgqnnpiiz4pz4bbjrnh6binbp7djcbgrb8zq"; + sha256 = "0pzk5639jjjx46a6arkwy31falmk5w1061icbml8njm3rbrwwhgx"; }; buildInputs = with self; [ nose ]; @@ -31896,6 +31902,9 @@ EOF }; }; + yenc = callPackage ../development/python-modules/yenc { + }; + zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index de64c2b3cc7d..f582bcf3b323 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,6 +1,14 @@ -with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; }; + +{ # The platforms for which we build Nixpkgs. + supportedSystems ? [ builtins.currentSystem ] +, # Strip most of attributes when evaluating to spare memory usage + scrubJobs ? true +}: + +with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; + let - lib = import ../../lib; + inherit (pkgs) lib; nativePlatforms = linux; @@ -16,7 +24,7 @@ let /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { - gdbCross = nativePlatforms; + gdbCross.nativeDrv = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; @@ -184,7 +192,7 @@ in /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; - maintainers = [ pkgs.lib.maintainers.dezgeg ]; - mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist); - in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools; + maintainers = [ lib.maintainers.dezgeg ]; + mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); + in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d3fb4e646c3b..2052957edd61 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -11,10 +11,10 @@ { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false -# The platforms for which we build Nixpkgs. -, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] -# Strip most of attributes when evaluating to spare memory usage -, scrubJobs ? true +, # The platforms for which we build Nixpkgs. + supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] +, # Strip most of attributes when evaluating to spare memory usage + scrubJobs ? true }: with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1d6305151ca6..cbf65870eb7e 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -18,7 +18,7 @@ , # This is used because stdenv replacement and the stdenvCross do benefit from # the overridden configuration provided by the user, as opposed to the normal # bootstrapping stdenvs. - allowCustomOverrides ? true + allowCustomOverrides , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for @@ -30,6 +30,8 @@ , # The configuration attribute set config +, overlays # List of overlays to use in the fix-point. + , crossSystem , platform , lib @@ -47,27 +49,25 @@ let inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }; - stdenvDefault = self: super: - { stdenv = stdenv // { inherit platform; }; }; + stdenvBootstappingAndPlatforms = self: super: { + stdenv = stdenv // { inherit platform; }; + inherit + system platform crossSystem; + }; allPackages = self: super: let res = import ./all-packages.nix - { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } + { inherit lib nixpkgsFun noSysDirs config; } res self; in res; aliases = self: super: import ./aliases.nix super; - # stdenvOverrides is used to avoid circular dependencies for building - # the standard build environment. This mechanism uses the override - # mechanism to implement some staged compilation of the stdenv. - # - # We don't want stdenv overrides in the case of cross-building, or - # otherwise the basic overridden packages will not be built with the - # crossStdenv adapter. + # stdenvOverrides is used to avoid having multiple of versions + # of certain dependencies that were used in bootstrapping the + # standard environment. stdenvOverrides = self: super: - lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) - (super.stdenv.overrides super); + (super.stdenv.overrides or (_: _: {})) self super; # Allow packages to be overridden globally via the `packageOverrides' # configuration option, which must be a function that takes `pkgs' @@ -81,28 +81,16 @@ let ((config.packageOverrides or (super: {})) super); # The complete chain of package set builders, applied from top to bottom - toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ - stdenvDefault + toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ + stdenvBootstappingAndPlatforms stdenvAdapters trivialBuilders allPackages aliases stdenvOverrides configOverrides - ]; + ] ++ overlays); - # Use `overridePackages` to easily override this package set. - # Warning: this function is very expensive and must not be used - # from within the nixpkgs repository. - # - # Example: - # pkgs.overridePackages (self: super: { - # foo = super.foo.override { ... }; - # } - # - # The result is `pkgs' where all the derivations depending on `foo' - # will use the new version. - - # Return the complete set of packages. Warning: this function is very - # expensive! -in lib.makeExtensibleWithCustomName "overridePackages" toFix +in + # Return the complete set of packages. + lib.fix toFix