From 9e92237ed7a03fb0d0fbb49ca48c6b9ec8d38df0 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 17 Nov 2016 14:15:47 +0100 Subject: [PATCH 001/216] gocryptfs: init at 1.1.1 --- pkgs/tools/filesystems/gocrypfs/default.nix | 43 +++++++++++++++++++++ pkgs/tools/filesystems/gocrypfs/deps.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/tools/filesystems/gocrypfs/default.nix create mode 100644 pkgs/tools/filesystems/gocrypfs/deps.nix diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix new file mode 100644 index 00000000000..c156cd13244 --- /dev/null +++ b/pkgs/tools/filesystems/gocrypfs/default.nix @@ -0,0 +1,43 @@ +# This file was generated by go2nix. +{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgconfig, openssl }: + +with lib; + +let + goFuseVersion = substring 0 7 (head (filter ( + d: d.goPackagePath == "github.com/hanwen/go-fuse" + ) (import ./deps.nix))).fetch.rev; +in buildGoPackage rec { + name = "gocryptfs-${version}"; + version = "1.1.1"; + rev = "v${version}"; + + goPackagePath = "github.com/rfjakob/gocryptfs"; + + src = fetchFromGitHub { + inherit rev; + owner = "rfjakob"; + repo = "gocryptfs"; + sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z"; + }; + + buildInputs = [pkgconfig openssl]; + + goDeps = ./deps.nix; + + postPatch = "rm -r tests"; + + buildFlagsArray = '' + -ldflags= + -X main.GitVersion=${rev} + -X main.GitVersionFuse=${goFuseVersion} + ''; + + meta = { + description = "Encrypted overlay filesystem written in Go"; + license = licenses.mit; + homepage = https://nuetzlich.net/gocryptfs/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/gocrypfs/deps.nix b/pkgs/tools/filesystems/gocrypfs/deps.nix new file mode 100644 index 00000000000..08a4afb5265 --- /dev/null +++ b/pkgs/tools/filesystems/gocrypfs/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "6c2b7d8f22c99776f8bfe17cd26d5f744a5b4cdc"; + sha256 = "1mb73vyqfy92830qif83zdlng0zycmm5fgmm9bwihqh92y8inw3h"; + }; + } + { + goPackagePath = "github.com/jacobsa/crypto"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/crypto"; + rev = "293ce0c192fb4f59cd879b46544922b9ed09a13a"; + sha256 = "12nm5h5dqqk8yrzlkmcqm0aam8l6l1s6rah48mrmz1z5bgm9h5rs"; + }; + } + { + goPackagePath = "github.com/rfjakob/eme"; + fetch = { + type = "git"; + url = "https://github.com/rfjakob/eme"; + rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; + sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; + sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6629bf9146..428249b7e92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1878,6 +1878,8 @@ in goaccess = callPackage ../tools/misc/goaccess { }; + gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; go-pup = callPackage ../development/tools/pup { }; From 6f4d4cd93be882727169233d41a70b925b8ef158 Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 1 Nov 2016 17:23:20 -0200 Subject: [PATCH 002/216] xdgmenumaker: 0.9 -> 1.1 --- pkgs/applications/misc/xdgmenumaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index cf8bcb7a51b..0d89510644a 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xdgmenumaker-${version}"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { - rev = version; owner = "gapan"; repo = "xdgmenumaker"; - sha256 = "1n29syadsgj0vpnkc8nji4k1c8gminr1xdriz5ck2bcygsgxkdrd"; + rev = version; + sha256 = "11mqafpgfnz0h0d6fxd1xsfsjxzg1abvwqgwy9jmm5xhcjx3c3l7"; }; nativeBuildInputs = [ From 0526a5c90a251cf88f247af0dc436e9b08da733c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Mon, 28 Nov 2016 15:24:09 +0100 Subject: [PATCH 003/216] services: add gatewayAddress and apiAddress to ipfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../modules/services/network-filesystems/ipfs.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index c26a7073703..104b5b92620 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -47,6 +47,18 @@ in ''; }; + gatewayAddress = mkOption { + type = types.str; + default = "/ip4/127.0.0.1/tcp/8080"; + description = "Where the IPFS Gateway can be reached"; + }; + + apiAddress = mkOption { + type = types.str; + default = "/ip4/127.0.0.1/tcp/5001"; + description = "Where IPFS exposes its API to"; + }; + enableGC = mkOption { type = types.bool; default = false; @@ -98,6 +110,8 @@ in 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}" ''; serviceConfig = { From f7c099bd8c9c2ad89408f3b689c06daa7ae654ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 26 Nov 2016 20:07:01 +0100 Subject: [PATCH 004/216] tests: added basic ipfs test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $getter can be used once ipfs supports private/local networks and or internet gets routed to the VMs Signed-off-by: Maximilian Güntner --- nixos/tests/ipfs.nix | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 nixos/tests/ipfs.nix diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix new file mode 100644 index 00000000000..92d742e4f37 --- /dev/null +++ b/nixos/tests/ipfs.nix @@ -0,0 +1,37 @@ + +import ./make-test.nix ({ pkgs, ...} : { + name = "ipfs"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mguentner ]; + }; + + nodes = { + adder = + { config, pkgs, ... }: + { + services.ipfs = { + enable = true; + gatewayAddress = "/ip4/127.0.0.1/tcp/2323"; + apiAddress = "/ip4/127.0.0.1/tcp/2324"; + }; + }; + getter = + { config, pkgs, ... }: + { + services.ipfs.enable = true; + }; + }; + + testScript = '' + startAll; + $adder->waitForUnit("ipfs"); + # * => needs ipfs dht (internet) + # $getter->waitForUnit("ipfs"); + $adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id"); + $adder->mustSucceed("([[ -n '$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.gatewayAddress | grep /ip4/127.0.0.1/tcp/2323)' ]])"); + # * $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id"); + # * my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2"); + $adder->mustSucceed("([[ -n '$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)' ]])"); + # * $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 cat $ipfsHash"); + ''; +}) From d7afb872cda9a94a1f19e328e376ed64aeacef1b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sun, 18 Sep 2016 14:29:32 -0400 Subject: [PATCH 005/216] secp256k1: 2016-05-30 -> 2016-11-27, more flags (#18637) --- pkgs/tools/security/secp256k1/default.nix | 43 ++++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 1b982bf06d1..83a23744c2e 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -1,32 +1,49 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ... }: +{ stdenv, fetchFromGitHub, autoreconfHook, jdk + +# Enable ECDSA pubkey recovery module +, enableRecovery ? true + +# Enable ECDH shared secret computation (disabled by default because it is +# experimental) +, enableECDH ? false + +# Enable libsecp256k1_jni (disabled by default because it requires a jdk, +# which is a large dependency) +, enableJNI ? false + +}: + +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "secp256k1-${version}"; - # I can't find any version numbers, so we're just using the date - # of the last commit. - version = "2016-05-30"; + # I can't find any version numbers, so we're just using the date of the + # last commit. + version = "2016-11-27"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "b3be8521e694eaf45dd29baea035055183c42fe2"; - sha256 = "1pgsy72w87yxbiqn96hnm8alsfx3rj7d9jlzdsypyf6i1rf6w4bq"; + rev = "2928420c1b8e1feee8c20dff4e3cc41a0de2fc22"; + sha256 = "1djsr2vrhh88353czlwb8bwlyabf008w1f7xg0fs3q33rf42w5gm"; }; - buildInputs = [ autoconf automake libtool ]; + buildInputs = optionals enableJNI [ jdk ]; - configureFlags = [ "--enable-module-recovery" ]; + nativeBuildInputs = [ autoreconfHook ]; - preConfigure = "./autogen.sh"; + configureFlags = + optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++ + optionals enableRecovery [ "--enable-module-recovery" ] ++ + optionals enableJNI [ "--enable-jni" ]; meta = with stdenv.lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' - Optimized C library for EC operations on curve secp256k1. - Part of Bitcoin Core. This library is a work in progress - and is being used to research best practices. Use at your - own risk. + Optimized C library for EC operations on curve secp256k1. Part of + Bitcoin Core. This library is a work in progress and is being used + to research best practices. Use at your own risk. ''; homepage = https://github.com/bitcoin-core/secp256k1; license = with licenses; [ mit ]; From 54e2973533dd95eee14088e68d50b6ab1ee21199 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 30 Nov 2016 19:10:12 +0100 Subject: [PATCH 006/216] docker-machine-kvm: init at 0.7.0 --- .../cluster/docker-machine/kvm-deps.nix | 21 +++++++++++++ .../networking/cluster/docker-machine/kvm.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix create mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix new file mode 100644 index 00000000000..709491a76f8 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/alexzorin/libvirt-go"; + fetch = { + type = "git"; + url = "https://github.com/alexzorin/libvirt-go"; + rev = "9359c4feb97212380aa05213fa30c4b7348365f0"; + sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa"; + }; + } + { + goPackagePath = "github.com/docker/machine"; + fetch = { + type = "git"; + url = "https://github.com/docker/machine"; + rev = "bb37dc7806687013c0c3097342ef7db4257655d2"; + sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix new file mode 100644 index 00000000000..46105f34b5b --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -0,0 +1,31 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }: + +buildGoPackage rec { + name = "docker-machine-kvm-${version}"; + version = "0.7.0"; + + goPackagePath = "github.com/dhiltgen/docker-machine-kvm"; + goDeps = ./kvm-deps.nix; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "dhiltgen"; + repo = "docker-machine-kvm"; + sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6"; + }; + + buildInputs = [ libvirt ]; + + postInstall = '' + mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/dhiltgen/docker-machine-kvm; + description = "KVM driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c3..90a5705825b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12565,6 +12565,7 @@ in docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; From ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 13 Nov 2016 10:38:41 -0800 Subject: [PATCH 007/216] top-level: Stop exposing all stdenvs --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 4 ++-- pkgs/stdenv/default.nix | 7 +++---- pkgs/top-level/stdenv.nix | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 0cde6a05943..4b7d81879b1 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -8,7 +8,7 @@ rec { }; vanillaStdenv = (import ../. (args // argClobber // { allPackages = args: allPackages (argClobber // args); - })).stdenv // { + })) // { # Needed elsewhere as a hacky way to pass the target cross = crossSystem; }; diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 2f2f495b388..6d2aa8c59b3 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,10 +1,10 @@ { system, allPackages, platform, crossSystem, config, ... } @ args: rec { - vanillaStdenv = (import ../. (args // { + vanillaStdenv = import ../. (args // { # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; - })).stdenv; + }); buildPackages = allPackages { # It's OK to change the built-time dependencies diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 4be34a35acb..ac84ea0f9a0 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -8,7 +8,7 @@ { system, allPackages ? import ../.., platform, config, crossSystem, lib }: -rec { +let # The native (i.e., impure) build environment. This one uses the @@ -43,7 +43,7 @@ rec { inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; # Select the appropriate stdenv for the platform `system'. - stdenv = +in if crossSystem != null then if crossSystem.useiOSCross or false then stdenvCrossiOS else stdenvCross else @@ -60,5 +60,4 @@ rec { if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else if system == "x86_64-freebsd" then stdenvFreeBSD else - stdenvNative; -} + stdenvNative diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 9f485b8c90e..adb8bdde6ad 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,12 +1,10 @@ { system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun }: rec { - allStdenvs = import ../stdenv { + defaultStdenv = import ../stdenv { inherit system platform config crossSystem lib; allPackages = nixpkgsFun; - }; - - defaultStdenv = allStdenvs.stdenv // { inherit platform; }; + } // { inherit platform; }; stdenv = if bootStdenv != null From 2df990967be3c21f074c56682f8fa47bdd7cba7b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Nov 2016 19:03:22 -0500 Subject: [PATCH 008/216] Move up `inherit` binding for consistency --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 4b7d81879b1..e48124f1c4d 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -17,10 +17,10 @@ rec { # 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; # It's OK to change the built-time dependencies allowCustomOverrides = true; bootStdenv = vanillaStdenv; - inherit system platform crossSystem config; }; stdenvCross = buildPackages.makeStdenvCross diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 6d2aa8c59b3..4c14d6411f1 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -7,10 +7,10 @@ rec { }); buildPackages = allPackages { + inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; bootStdenv = vanillaStdenv; - inherit system platform crossSystem config; }; stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; From 07a2b17cbf541c485e04f1a8ec98ffe8c24ac713 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:32:56 -0800 Subject: [PATCH 009/216] top-level: Split some of `pkgs/top-level/default.nix` to `pkgs/top-level/stage.nix` This is preparation for the latter just building a single stage, and the former building a package set with the bootstrapped stdenv. --- pkgs/top-level/default.nix | 98 +++------------------------------ pkgs/top-level/stage.nix | 107 +++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 90 deletions(-) create mode 100644 pkgs/top-level/stage.nix diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 831b1db0cea..c5b8bbac31c 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -4,37 +4,22 @@ packages in the Nix Packages collection for some particular platform. */ - { # The system (e.g., `i686-linux') for which to build the packages. system -, # The standard environment to use. Only used for bootstrapping. If - # null, the default standard environment is used. - bootStdenv ? null - -, # 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 ? (bootStdenv == null) - -, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc - # outside of the store. Thus, GCC, GFortran, & co. must always look for - # files in standard system directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" - && system != "x86_64-solaris" - && system != "x86_64-kfreebsd-gnu") - , # Allow a configuration attribute set to be passed in as an argument. config ? {} , crossSystem ? null , platform ? null +, ... } @ args: +let # Rename the function arguments + configExpr = config; + platform_ = platform; -let configExpr = config; platform_ = platform; in # rename the function arguments - -let +in let lib = import ../../lib; # Allow both: @@ -72,75 +57,8 @@ let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - stdenvAdapters = self: super: - let res = import ../stdenv/adapters.nix self; in res // { - stdenvAdapters = res; - }; + pkgs = import ./stage.nix ({ + inherit lib nixpkgsFun config platform; + } // args); - trivialBuilders = self: super: - import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; - }; - - stdenvDefault = self: super: - import ./stdenv.nix { - inherit system bootStdenv crossSystem config platform lib nixpkgsFun; - }; - - allPackages = self: super: - let res = import ./all-packages.nix - { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } - 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 = self: super: - lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) - (super.stdenv.overrides super); - - # Allow packages to be overridden globally via the `packageOverrides' - # configuration option, which must be a function that takes `pkgs' - # as an argument and returns a set of new or overridden packages. - # The `packageOverrides' function is called with the *original* - # (un-overridden) set of packages, allowing packageOverrides - # attributes to refer to the original attributes (e.g. "foo = - # ... pkgs.foo ..."). - configOverrides = self: super: - lib.optionalAttrs allowCustomOverrides - ((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: {}) [ - stdenvAdapters - trivialBuilders - stdenvDefault - allPackages - aliases - stdenvOverrides - configOverrides - ]; - - # 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! - pkgs = lib.makeExtensibleWithCustomName "overridePackages" toFix; in pkgs diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix new file mode 100644 index 00000000000..9ab9d22e54f --- /dev/null +++ b/pkgs/top-level/stage.nix @@ -0,0 +1,107 @@ +/* This file composes the Nix Packages collection. That is, it + imports the functions that build the various packages, and calls + them with appropriate arguments. The result is a set of all the + packages in the Nix Packages collection for some particular + platform. */ + + +{ # The system (e.g., `i686-linux') for which to build the packages. + system + +, # The standard environment to use. Only used for bootstrapping. If + # null, the default standard environment is used. + bootStdenv ? null + +, # 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 ? (bootStdenv == null) + +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" + && system != "x86_64-kfreebsd-gnu") + +, # The configuration attribute set + config + +, crossSystem ? null +, platform +, lib +, nixpkgsFun +}: + +let + stdenvAdapters = self: super: + let res = import ../stdenv/adapters.nix self; in res // { + stdenvAdapters = res; + }; + + trivialBuilders = self: super: + import ../build-support/trivial-builders.nix { + inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; + }; + + stdenvDefault = self: super: + import ./stdenv.nix { + inherit system bootStdenv crossSystem config platform lib nixpkgsFun; + }; + + allPackages = self: super: + let res = import ./all-packages.nix + { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } + 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 = self: super: + lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) + (super.stdenv.overrides super); + + # Allow packages to be overridden globally via the `packageOverrides' + # configuration option, which must be a function that takes `pkgs' + # as an argument and returns a set of new or overridden packages. + # The `packageOverrides' function is called with the *original* + # (un-overridden) set of packages, allowing packageOverrides + # attributes to refer to the original attributes (e.g. "foo = + # ... pkgs.foo ..."). + configOverrides = self: super: + lib.optionalAttrs allowCustomOverrides + ((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: {}) [ + stdenvAdapters + trivialBuilders + stdenvDefault + allPackages + aliases + stdenvOverrides + configOverrides + ]; + + # 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 From d240a0da1ab03ef8838553229b72b9b37a0ef3e7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:35:58 -0800 Subject: [PATCH 010/216] top-level: Remove cycles: stdenv calls in top-level but not vice versa This commit changes the dependencies of stdenv, and clean-up the stdenv story by removing the `defaultStdenv` attribute as well as the `bootStdenv` parameter. Before, the final bootstrapping stage's stdenv was provided by all-packages, which was iterating multiple times over the top-level/default.nix expression, and non-final bootstrapping stages' stdenvs were explicitly specified with the `bootStdenv` parameter. Now, all stages' stdenvs are specified with the `stdenv` parameter. For non-final bootstrapping stages, this is a small change---basically just rename the parameter. For the final stage, top-level/default.nix takes the chosen stdenv and makes the final stage with it. `allPackages` is used to make all bootstrapping stages, final and non-final alike. It's basically the expression of `stage.nix` (along with a few partially-applied default arguments) Note, the make-bootstrap-tools scripts are temporarily broken --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 5 +++-- pkgs/stdenv/default.nix | 5 +++-- pkgs/stdenv/freebsd/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 3 ++- pkgs/stdenv/native/default.nix | 3 ++- pkgs/top-level/default.nix | 37 +++++++++++++++++++++++++-------- pkgs/top-level/stage.nix | 27 ++++++++++++------------ pkgs/top-level/stdenv.nix | 13 ------------ 10 files changed, 55 insertions(+), 44 deletions(-) delete mode 100644 pkgs/top-level/stdenv.nix diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index e48124f1c4d..fcf06bcf1da 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -20,7 +20,7 @@ rec { inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = vanillaStdenv; + stdenv = vanillaStdenv; }; stdenvCross = buildPackages.makeStdenvCross diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 4c14d6411f1..e8f203d69cf 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -10,7 +10,7 @@ rec { inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = vanillaStdenv; + stdenv = vanillaStdenv; }; stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 1bc983d6312..49c4d9b8b2b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -22,7 +22,7 @@ let (import "${./standard-sandbox.sb}") ''; in rec { - allPackages = import ../../..; + inherit allPackages; commonPreHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" @@ -101,7 +101,8 @@ in rec { thisPkgs = allPackages { inherit system platform; - bootStdenv = thisStdenv; + allowCustomOverrides = false; + stdenv = thisStdenv; }; in { stdenv = thisStdenv; pkgs = thisPkgs; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index ac84ea0f9a0..bd515181fc6 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,7 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../.., platform, config, crossSystem, lib }: +{ system, allPackages ? import ../top-level, platform, config, crossSystem, lib }: let @@ -19,7 +19,8 @@ let inherit (import ./native { inherit system allPackages config; }) stdenvNative; stdenvNativePkgs = allPackages { - bootStdenv = stdenvNative; + allowCustomOverrides = false; + stdenv = stdenvNative; noSysDirs = false; }; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 4c7ebc16239..13cb21fe1d8 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -5,7 +5,7 @@ }: rec { - allPackages = import ../../..; + inherit allPackages; bootstrapTools = derivation { inherit system; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e3aeafe178d..e0a68bdca2f 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,7 +107,8 @@ rec { thisPkgs = allPackages { inherit system platform; - bootStdenv = thisStdenv; + allowCustomOverrides = false; + stdenv = thisStdenv; }; in { stdenv = thisStdenv; pkgs = thisPkgs; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index fcd0805275b..22b4dc1400f 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -127,7 +127,8 @@ rec { stdenvBoot1Pkgs = allPackages { inherit system; - bootStdenv = stdenvBoot1; + allowCustomOverrides = false; + stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index c5b8bbac31c..d1e824a8070 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -1,8 +1,21 @@ -/* This file composes the Nix Packages collection. That is, it - imports the functions that build the various packages, and calls - them with appropriate arguments. The result is a set of all the - packages in the Nix Packages collection for some particular - platform. */ +/* This function composes the Nix Packages collection. It: + + 1. Applies the final stage to the given `config` if it is a function + + 2. Infers an appropriate `platform` based on the `system` if none is + provided + + 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 + + 5. Builds the final stage --- a fully booted package set with 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 + or dot-files. */ { # The system (e.g., `i686-linux') for which to build the packages. system @@ -12,7 +25,6 @@ , crossSystem ? null , platform ? null -, ... } @ args: let # Rename the function arguments @@ -57,8 +69,15 @@ in let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - pkgs = import ./stage.nix ({ - inherit lib nixpkgsFun config platform; - } // args); + # Partially apply some args for building bootstraping stage pkgs sets + allPackages = newArgs: import ./stage.nix ({ + inherit lib nixpkgsFun config; + } // newArgs); + + stdenv = import ../stdenv { + inherit lib allPackages system platform crossSystem config; + }; + + pkgs = allPackages { inherit system stdenv config crossSystem platform; }; in pkgs diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9ab9d22e54f..0c621b81c7e 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -1,21 +1,24 @@ -/* This file composes the Nix Packages collection. That is, it - imports the functions that build the various packages, and calls - them with appropriate arguments. The result is a set of all the - packages in the Nix Packages collection for some particular - platform. */ +/* This file composes a single bootstrapping stage of the Nix Packages + collection. That is, it imports the functions that build the various + packages, and calls them with appropriate arguments. The result is a set of + all the packages in the Nix Packages collection for some particular platform + for some particular stage. + + Default arguments are only provided for bootstrapping + arguments. Normal users should not import this directly but instead + import `pkgs/default.nix` or `default.nix`. */ { # The system (e.g., `i686-linux') for which to build the packages. system -, # The standard environment to use. Only used for bootstrapping. If - # null, the default standard environment is used. - bootStdenv ? null +, # The standard environment to use for building packages. + stdenv , # 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 ? (bootStdenv == null) + allowCustomOverrides ? true , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for @@ -45,9 +48,7 @@ let }; stdenvDefault = self: super: - import ./stdenv.nix { - inherit system bootStdenv crossSystem config platform lib nixpkgsFun; - }; + { stdenv = stdenv // { inherit platform; }; }; allPackages = self: super: let res = import ./all-packages.nix @@ -81,9 +82,9 @@ let # The complete chain of package set builders, applied from top to bottom toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ + stdenvDefault stdenvAdapters trivialBuilders - stdenvDefault allPackages aliases stdenvOverrides diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix deleted file mode 100644 index adb8bdde6ad..00000000000 --- a/pkgs/top-level/stdenv.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun }: - -rec { - defaultStdenv = import ../stdenv { - inherit system platform config crossSystem lib; - allPackages = nixpkgsFun; - } // { inherit platform; }; - - stdenv = - if bootStdenv != null - then (bootStdenv // { inherit platform; }) - else defaultStdenv; -} From 39753f5360134f1aab1a949260374a876c0983eb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:37:45 -0800 Subject: [PATCH 011/216] top-level: Close over fewer arguments for stdenv stages This makes the flow of data easier to understand. There's little downside because the args in question are already inspected by the stdenvs. cross-compiling in particular is simpler because we don't need to worry about overriding the config closed over by `allPackages`. --- pkgs/stdenv/cross/default.nix | 12 ++++++------ pkgs/stdenv/custom/default.nix | 9 ++++++--- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/stdenv/default.nix | 10 ++++++---- pkgs/stdenv/linux/default.nix | 2 +- pkgs/stdenv/native/default.nix | 2 +- pkgs/top-level/default.nix | 5 +++-- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index fcf06bcf1da..10e2a766356 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,14 +1,14 @@ -{ system, allPackages, platform, crossSystem, config, ... } @ args: +{ lib, allPackages +, system, platform, crossSystem, config +}: rec { - argClobber = { + vanillaStdenv = (import ../. { + inherit lib allPackages system platform; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; - }; - vanillaStdenv = (import ../. (args // argClobber // { - allPackages = args: allPackages (argClobber // args); - })) // { + }) // { # Needed elsewhere as a hacky way to pass the target cross = crossSystem; }; diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index e8f203d69cf..174b8593c0a 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,10 +1,13 @@ -{ system, allPackages, platform, crossSystem, config, ... } @ args: +{ lib, allPackages +, system, platform, crossSystem, config +}: rec { - vanillaStdenv = import ../. (args // { + vanillaStdenv = import ../. { + inherit lib allPackages system platform crossSystem; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; - }); + }; buildPackages = allPackages { inherit system platform crossSystem config; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 49c4d9b8b2b..6182c8cc0c7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -100,7 +100,7 @@ in rec { }; thisPkgs = allPackages { - inherit system platform; + inherit system platform config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index bd515181fc6..246e656f33b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,12 +5,13 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../top-level, platform, config, crossSystem, lib }: - +{ # Args just for stdenvs' usage + lib, allPackages + # Args to pass on to `allPacakges` too +, system, platform, crossSystem, config +}: let - - # The native (i.e., impure) build environment. This one uses the # tools installed on the system outside of the Nix environment, # i.e., the stuff in /bin, /usr/bin, etc. This environment should @@ -19,6 +20,7 @@ let inherit (import ./native { inherit system allPackages config; }) stdenvNative; stdenvNativePkgs = allPackages { + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = stdenvNative; noSysDirs = false; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e0a68bdca2f..e4bf87c5202 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -106,7 +106,7 @@ rec { }; thisPkgs = allPackages { - inherit system platform; + inherit system platform config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 22b4dc1400f..0f9aee214b3 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -126,7 +126,7 @@ rec { } // {inherit fetchurl;}; stdenvBoot1Pkgs = allPackages { - inherit system; + inherit system platform config; allowCustomOverrides = false; stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index d1e824a8070..9464a8012b3 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -69,9 +69,10 @@ in let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - # Partially apply some args for building bootstraping stage pkgs sets + # Partially apply some arguments for building bootstraping stage pkgs + # sets. Only apply arguments which no stdenv would want to override. allPackages = newArgs: import ./stage.nix ({ - inherit lib nixpkgsFun config; + inherit lib nixpkgsFun; } // newArgs); stdenv = import ../stdenv { From 05c12f147e932c990f4b026b9efe0b7a1985461e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 26 Nov 2016 15:13:43 -0800 Subject: [PATCH 012/216] top-level: Move default-choosing logic to top-level/platforms.nix This mirrors stdenv/default.nix --- pkgs/top-level/default.nix | 24 +++++++----------------- pkgs/top-level/platforms.nix | 8 ++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 9464a8012b3..6b61110f1e7 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -24,12 +24,11 @@ config ? {} , crossSystem ? null -, platform ? null +, platform ? assert false; null } @ args: let # Rename the function arguments configExpr = config; - platform_ = platform; in let lib = import ../../lib; @@ -42,21 +41,12 @@ in let then configExpr { inherit pkgs; } else configExpr; - # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) - - platformAuto = let - platforms = (import ./platforms.nix); - in - if system == "armv6l-linux" then platforms.raspberrypi - else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform - else if system == "armv5tel-linux" then platforms.sheevaplug - else if system == "mips64el-linux" then platforms.fuloong2f_n32 - else if system == "x86_64-linux" then platforms.pc64 - else if system == "i686-linux" then platforms.pc32 - else platforms.pcBase; - - platform = if platform_ != null then platform_ - else config.platform or platformAuto; + # Allow setting the platform in the config file. Otherwise, let's use a + # reasonable default. + platform = + args.platform + or (config.platform + or (import ./platforms.nix).selectPlatformBySystem system); # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index efeae9a9d20..671aaea4491 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -443,4 +443,12 @@ rec { }; }; + selectPlatformBySystem = system: + if system == "armv6l-linux" then raspberrypi + else if system == "armv7l-linux" then armv7l-hf-multiplatform + else if system == "armv5tel-linux" then sheevaplug + else if system == "mips64el-linux" then fuloong2f_n32 + else if system == "x86_64-linux" then pc64 + else if system == "i686-linux" then pc32 + else pcBase; } From a55d1ecc9050a50904a13e3a34535990b9e61ae3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 26 Nov 2016 15:34:13 -0800 Subject: [PATCH 013/216] top-level: Document why `nixpkgsFun` doesn't close over inferred default arguments --- pkgs/top-level/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 6b61110f1e7..a1f3a1c38c5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -55,8 +55,15 @@ in let # whatever arguments it doesn't explicitly provide. This way, # `all-packages.nix` doesn't know more than it needs too. # - # It's OK that `args` doesn't include the defaults: they'll be - # deterministically inferred the same way. + # It's OK that `args` doesn't include default arguemtns from this file: + # they'll be deterministically inferred. In fact we must *not* include them, + # because it's important that if some parameter which affects the default is + # substituted with a different argument, the default is re-inferred. + # + # To put this in concrete terms, this function is basically just used today to + # use package for a different platform for the current platform (namely cross + # compiling toolchains and 32-bit packages on x86_64). In both those cases we + # want the provided non-native `system` argument to affect the stdenv chosen. nixpkgsFun = newArgs: import ./. (args // newArgs); # Partially apply some arguments for building bootstraping stage pkgs From 4751d9e5ad124284dbd719d3a58f42d56f1b9514 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Nov 2016 18:51:13 -0500 Subject: [PATCH 014/216] top-level: turn the screw - Non-cross stdenvs are honest and assert that `crossSystem` is null - `crossSystem` is a mandatory argument to top-level/stage.nix, just like `system` and `platform` - Broken default arguments on stdenvs for testing are gone. - All stdenvs (but little-used stdenvNix) take the same arguments for easy testing. --- pkgs/stdenv/custom/default.nix | 2 ++ pkgs/stdenv/darwin/default.nix | 10 +++++----- pkgs/stdenv/default.nix | 16 ++++++++-------- pkgs/stdenv/freebsd/default.nix | 8 ++++---- pkgs/stdenv/linux/default.nix | 10 +++++----- pkgs/stdenv/native/default.nix | 8 ++++++-- pkgs/top-level/stage.nix | 2 +- 7 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 174b8593c0a..188d0027773 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -2,6 +2,8 @@ , system, platform, crossSystem, config }: +assert crossSystem == null; + rec { vanillaStdenv = import ../. { inherit lib allPackages system platform crossSystem; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6182c8cc0c7..b9044f25cd7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null -, config ? {} +{ lib, allPackages +, system, platform, crossSystem, config # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -17,6 +15,8 @@ } }: +assert crossSystem == null; + let libSystemProfile = '' (import "${./standard-sandbox.sb}") @@ -100,7 +100,7 @@ in rec { }; thisPkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 246e656f33b..3b49d0de830 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -9,7 +9,7 @@ lib, allPackages # Args to pass on to `allPacakges` too , system, platform, crossSystem, config -}: +} @ args: let # The native (i.e., impure) build environment. This one uses the @@ -17,7 +17,7 @@ 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 { inherit system allPackages config; }) stdenvNative; + inherit (import ./native args) stdenvNative; stdenvNativePkgs = allPackages { inherit system platform crossSystem config; @@ -28,22 +28,22 @@ let # The Nix build environment. - stdenvNix = import ./nix { + stdenvNix = assert crossSystem == null; import ./nix { inherit config lib; stdenv = stdenvNative; pkgs = stdenvNativePkgs; }; - inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD; + inherit (import ./freebsd args) stdenvFreeBSD; # Linux standard environment. - inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux; + inherit (import ./linux args) stdenvLinux; - inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin; + inherit (import ./darwin args) stdenvDarwin; - inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross stdenvCrossiOS; + inherit (import ./cross args) stdenvCross stdenvCrossiOS; - inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; + inherit (import ./custom args) stdenvCustom; # Select the appropriate stdenv for the platform `system'. in diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 13cb21fe1d8..ea2ebcc7917 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,9 +1,9 @@ -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null -, config ? {} +{ lib, allPackages +, system, platform, crossSystem, config }: +assert crossSystem == null; + rec { inherit allPackages; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e4bf87c5202..34196359f52 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -3,11 +3,9 @@ # 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 -# The function defaults are for easy testing. -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null, config ? {}, lib ? (import ../../../lib) , bootstrapFiles ? if system == "i686-linux" then import ./bootstrap/i686.nix else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix @@ -18,6 +16,8 @@ else abort "unsupported platform for the pure Linux stdenv" }: +assert crossSystem == null; + rec { commonPreHook = @@ -106,7 +106,7 @@ rec { }; thisPkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 0f9aee214b3..8396bd0cb01 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,4 +1,8 @@ -{ system, allPackages ? import ../../.., config }: +{ lib, allPackages +, system, platform, crossSystem, config +}: + +assert crossSystem == null; rec { @@ -126,7 +130,7 @@ rec { } // {inherit fetchurl;}; stdenvBoot1Pkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0c621b81c7e..1d6305151ca 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -30,7 +30,7 @@ , # The configuration attribute set config -, crossSystem ? null +, crossSystem , platform , lib , nixpkgsFun From af609b02546d5361a8200a024df2c689dbba9d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Nov 2016 13:11:40 +0000 Subject: [PATCH 015/216] lxcfs: init at 2.0.4 --- pkgs/os-specific/linux/lxcfs/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 37 insertions(+) create mode 100644 pkgs/os-specific/linux/lxcfs/default.nix diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix new file mode 100644 index 00000000000..ceaed205db9 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, help2man, fuse, pam }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "lxcfs-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz"; + sha256 = "0pfrsn7hqccpcnwg4xk8ds0avb2yc9gyvj7bk2bl90vpwsm35j7y"; + }; + + nativeBuildInputs = [ pkgconfig help2man ]; + buildInputs = [ fuse pam ]; + + configureFlags = [ + "--with-init-script=systemd" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ]; + + postFixup = '' + # liblxcfs.so is reloaded with dlopen() + patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" + ''; + + meta = { + homepage = https://linuxcontainers.org/lxcfs; + description = "FUSE filesystem for LXC"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9a1f1eb12..cefa0f6be66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,7 @@ in lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../os-specific/linux/lxc { }; + lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; lzfse = callPackage ../tools/compression/lzfse { }; From aa854f192e34f3bce5f0d9bac42daecbaec16372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 12:38:41 +0000 Subject: [PATCH 016/216] cgmanager: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/system/cgmanager.nix | 27 +++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/services/system/cgmanager.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5ae69ffd223..bf7a68c6cea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -483,6 +483,7 @@ ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix + ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/kerberos.nix diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix new file mode 100644 index 00000000000..59d3deced86 --- /dev/null +++ b/nixos/modules/services/system/cgmanager.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cgmanager; +in { + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options.services.cgmanager.enable = mkEnableOption "cgmanager"; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.cgmanager = { + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" ]; + description = "Cgroup management daemon"; + restartIfChanged = false; + serviceConfig = { + ExecStart = "${pkgs.cgmanager}/bin/cgmanager -m name=systemd"; + KillMode = "process"; + Restart = "on-failure"; + }; + }; + }; +} From d331e538c2d18cc4718c823a091837e1ffa47373 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 2 Dec 2016 16:12:14 +0100 Subject: [PATCH 017/216] erlang_basho_R16: B03-1 -> B02-8 --- .../{R16B03-1-basho.nix => R16B02-8-basho.nix} | 15 ++++++++------- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) rename pkgs/development/interpreters/erlang/{R16B03-1-basho.nix => R16B02-8-basho.nix} (88%) diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix similarity index 88% rename from pkgs/development/interpreters/erlang/R16B03-1-basho.nix rename to pkgs/development/interpreters/erlang/R16B02-8-basho.nix index cbb5f0789fa..a4afd1e9b40 100644 --- a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang +{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null @@ -12,12 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; - version = "16B03-1"; + version = "16B02"; - src = fetchgit { - url = "https://github.com/basho/otp"; - rev = "cb3a485894e493ad172db2749129e613fe52713a"; - sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + src = fetchFromGitHub { + owner = "basho"; + repo = "otp"; + rev = "OTP_R16B02_basho8"; + sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; }; debugInfo = enableDebugInfo; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676..3c40896dd6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5400,10 +5400,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; - erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; @@ -10277,11 +10277,11 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; influxdb = callPackage ../servers/nosql/influxdb { }; From 629b979227b627293b839eebc9cafe31b682cee3 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 2 Dec 2016 22:59:33 -0200 Subject: [PATCH 018/216] adapta-backgrounds: init at 0.4.0.6 --- pkgs/data/misc/adapta-backgrounds/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/data/misc/adapta-backgrounds/default.nix diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix new file mode 100644 index 00000000000..72ee323030a --- /dev/null +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "adapta-backgrounds-${version}"; + version = "0.4.0.6"; + + src = fetchFromGitHub { + owner = "adapta-project"; + repo = "adapta-backgrounds"; + rev = version; + sha256 = "1yqxrwhjl6g92wm52kalbns41i2l5g45qbd4185b22crhbrn5x79"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A wallpaper collection for adapta-project"; + homepage = https://github.com/adapta-project/adapta-backgrounds; + license = with licenses; [ gpl2 cc-by-sa-30 ]; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676..68faacc1ee8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11690,6 +11690,8 @@ in ### DATA + adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + andagii = callPackage ../data/fonts/andagii { }; android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; From ffdf7ec2341726eedd19333c7a8a8b4bd8a16f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 9 Nov 2016 14:09:27 +0100 Subject: [PATCH 019/216] cpp-ipfs-api: init at 2016-11-09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/cpp-ipfs-api/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/cpp-ipfs-api/default.nix diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix new file mode 100644 index 00000000000..2c9d36154a2 --- /dev/null +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: + +stdenv.mkDerivation rec { + name = "cpp-ipfs-api-${version}"; + version = "2016-11-09"; + + src = fetchFromGitHub { + owner = "vasild"; + repo = "cpp-ipfs-api"; + rev = "46e473e49ede4fd829235f1d4930754d5356a747"; + sha256 = "10c5hmg9857zb0fp262ca4a42gq9iqdyqz7f975cp3qs70x12q08"; + }; + + buildInputs = [ cmake curl ]; + propagatedBuildInputs = [ nlohmann_json ]; + + meta = with stdenv.lib; { + description = "IPFS C++ API client library"; + homepage = https://github.com/vasild/cpp-ipfs-api; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7588e7ba7e6..70a1e950e24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6805,6 +6805,8 @@ in cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; + cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; uri = callPackage ../development/libraries/uri { }; From 88fa365cf2c52a3fa15ec12b75952c2d5a368cc0 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sat, 3 Dec 2016 07:02:31 +0100 Subject: [PATCH 020/216] marathon: 1.1.2 -> 1.3.6 --- pkgs/applications/networking/cluster/marathon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index f339657b7fe..fa19c562e8c 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "1.1.2"; + version = "1.3.6"; src = fetchurl { url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "1c1ml3blhhc10mky5pqxhpndbz6nk7qgcfbzwdqj9kqfzmwlsfbb"; + sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy"; }; buildInputs = [ makeWrapper jdk mesos ]; From 650501f5b1a7f8dbf8c40180f1b14e8b885e363e Mon Sep 17 00:00:00 2001 From: romildo Date: Sat, 3 Dec 2016 08:20:33 -0200 Subject: [PATCH 021/216] e17gtk: init at 3.22.0 --- pkgs/misc/themes/e17gtk/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/misc/themes/e17gtk/default.nix diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix new file mode 100644 index 00000000000..a5495d5120c --- /dev/null +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, gnome3 }: + +stdenv.mkDerivation rec { + name = "e17gtk-${version}"; + version = "${gnome3.version}.0"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "E17gtk"; + rev = "V${version}"; + sha256 = { + "3.20" = "1dbhwsqqk12rff1971q2snvg38dx2y33dxr2l9yvwrhrhsgmc2v7"; + "3.22" = "17ir1f7ka765m57bdx3knq4k1837p118a384qnmsj83bz15k39i3"; + }."${gnome3.version}"; + }; + + installPhase = '' + mkdir -p $out/share/{doc,themes}/E17gtk + cp -a index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/ + cp -a README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/ + ''; + + meta = { + description = "An Enlightenment-like GTK+ theme with sharp corners"; + homepage = https://github.com/tsujan/E17gtk; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7588e7ba7e6..c5538f605c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17034,6 +17034,8 @@ in crashplan = callPackage ../applications/backup/crashplan { }; + e17gtk = callPackage ../misc/themes/e17gtk { }; + epson-escpr = callPackage ../misc/drivers/epson-escpr { }; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; From 475224968c4b902bc798c374449dbf7ce0b9ef6f Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 3 Dec 2016 20:15:31 +0100 Subject: [PATCH 022/216] rust-packages: update 2016-11-15 -> 2016-12-03 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index bea2cb41a69..ef6dee3e3f7 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-11-15"; - rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; - sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; + version = "2016-12-03"; + rev = "94e482dd6667aa239e5b3b8590fc9bfa0c1fd376"; + sha256 = "0k300vhc0m8a0165pikl6rvyz0w20dnlacpb9b4jjl7gfixynlmz"; src = fetchFromGitHub { inherit rev; From e3dcf5da1d28b37308dea2e23613f8f8a4ee8c81 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 3 Dec 2016 23:36:48 +0100 Subject: [PATCH 023/216] rq: init at 0.9.2 (broken because our v8 is too old, and I'm too weak to update v8) --- pkgs/build-support/rust/default.nix | 3 ++ pkgs/development/tools/rq/default.nix | 76 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 83 insertions(+) create mode 100644 pkgs/development/tools/rq/default.nix diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index bbea045f637..a69ef5c6b07 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -6,6 +6,7 @@ , logLevel ? "" , buildInputs ? [] , cargoUpdateHook ? "" +, cargoDepsHook ? "" , ... } @ args: let @@ -28,6 +29,8 @@ in stdenv.mkDerivation (args // { configurePhase = args.configurePhase or "true"; postUnpack = '' + eval "$cargoDepsHook" + echo "Using cargo deps from $cargoDeps" cp -r "$cargoDeps" deps diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix new file mode 100644 index 00000000000..b383812d321 --- /dev/null +++ b/pkgs/development/tools/rq/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages, v8 }: + +with rustPlatform; + +buildRustPackage rec { + name = "rq-${version}"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "dflemstr"; + repo = "rq"; + rev = "v${version}"; + sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq"; + }; + + serde_json = fetchFromGitHub { + owner = "serde-rs"; + repo = "json"; + rev = "0c05059e4533368020bd356bd708c38286810a7d"; + sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43"; + }; + + v8_rs = fetchFromGitHub { + owner = "dflemstr"; + repo = "v8-rs"; + rev = "0772be5b2e84842a2d434963702bc2995aeda90b"; + sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad"; + }; + + cargoDepsHook = '' + # use non-git dependencies + (cd $sourceRoot && patch -p1 < Date: Sun, 4 Dec 2016 01:39:03 +0100 Subject: [PATCH 024/216] lib: fix typo --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1f381c5e721..c1bd764c70d 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -391,7 +391,7 @@ rec { ); in f [] [rhs lhs]; - /* A recursive variant of the update operator ‘//’. The recusion + /* A recursive variant of the update operator ‘//’. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the left hand side value. From e3d54be3873c8d954e3fb04cdeeb9694da214349 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 2 Dec 2016 12:51:58 +0100 Subject: [PATCH 025/216] dhcpcd: 6.11.3 -> 6.11.5 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 766e7505f27..beffb0c05e8 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.11.3"; + name = "dhcpcd-6.11.5"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "01lv4a7ls55iv9f9gkh6vswqmbpqkdzj4d8ayq4dcir9vz215gas"; + sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; buildInputs = [ pkgconfig udev ]; From 2401f06801cd08ee06feffc42ad3ee568d354fb5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 2 Dec 2016 12:51:00 +0100 Subject: [PATCH 026/216] containers: disable dhcpcd on veth bridge interfaces --- nixos/modules/virtualisation/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index cfc1065b729..a532696d03a 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -667,7 +667,7 @@ in ${cfg.localAddress} ${name}.containers '') config.containers); - networking.dhcpcd.denyInterfaces = [ "ve-*" ]; + networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; environment.systemPackages = [ pkgs.nixos-container ]; }); From 5c6234a7d3f0b430d7dc941dc1ab059c42729611 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 3 Dec 2016 17:21:07 -0800 Subject: [PATCH 027/216] top-level: Allow manually specifying a stdenv, and fix stdenv tests - The darwin test can now force the use of the freshly-booted darwin stdenv - The linux test now passes enough dummy arguments This may make debugging harder, if so, check out #20889 --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 8 ++++---- pkgs/stdenv/linux/make-bootstrap-tools.nix | 7 +++++++ pkgs/top-level/default.nix | 6 +++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 10d2b4decdd..bd581f71a43 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -332,10 +332,10 @@ in rec { }; # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it - test-pkgs = let - stdenv = import (test-pkgspath + "/pkgs/stdenv/darwin") { inherit system bootstrapFiles; }; - in import test-pkgspath { + test-pkgs = import test-pkgspath { inherit system; - bootStdenv = stdenv.stdenvDarwin; + stdenv = args: let + args' = args // { inherit bootstrapFiles; }; + in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 1ecb222af3e..7063d7bfcb6 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -175,6 +175,13 @@ rec { bootstrapTools = (import ./default.nix { inherit system bootstrapFiles; + + lib = assert false; null; + allPackages = assert false; null; + + platform = assert false; null; + crossSystem = assert false; null; + config = assert false; null; }).bootstrapTools; test = derivation { diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index a1f3a1c38c5..31c51215676 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -23,6 +23,10 @@ , # 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. + stdenv ? assert false; null + , crossSystem ? null , platform ? assert false; null } @ args: @@ -72,7 +76,7 @@ in let inherit lib nixpkgsFun; } // newArgs); - stdenv = import ../stdenv { + stdenv = (args.stdenv or (import ../stdenv)) { inherit lib allPackages system platform crossSystem config; }; From 64aabae8e24ba6278b28aef3587dc12b1805f42b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:09:49 +0100 Subject: [PATCH 028/216] perl-CryptX: 0.041 -> 0.044 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index efc4faa4786..288d47a17df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2760,10 +2760,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.041"; + name = "CryptX-0.044"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "481f8c9285d6ce3cf330e1fa52c835a202debdac5d81e1acd20bd1d93b99790e"; + sha256 = "15e5e6bd7b90af24c7e730751fec7b10d8e22ef4380d527bda242dee7dd20443"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { From 0dc4e70fc99defb4c7ea1d4ed0d0690c9752b22e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:08 +0100 Subject: [PATCH 029/216] perl-Math-BigInt: 1.999801 -> 1.999802 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 288d47a17df..740292886dd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999801"; + name = "Math-BigInt-1.999802"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "41deb23d453f5a376759fff155e4947988a6b6713a4164f21aedac8238089e57"; + sha256 = "a44ceb255a76b7f455ef41f4f12e8923fe3662255853c4d0f3ad1f77b9eaa491"; }; meta = { description = "Arbitrary size integer/float math package"; From 7cdf160f34f249477e1ce9102052c84872e34228 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:26 +0100 Subject: [PATCH 030/216] perl-Test2-Suite: 0.000052 -> 0.000061 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 740292886dd..ef8984230f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12256,10 +12256,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000052"; + name = "Test2-Suite-0.000061"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "0f571c8d8939eb90d06dd1da0681ca6af3bd1012a6c03e7bfb924dab675a6fa4"; + sha256 = "b2ef2a59c8864c79f6c6a64c65e12c93f881361e4d9eb54419fcb4785c08ea75"; }; propagatedBuildInputs = [ Importer TestSimple13 ]; meta = { From 64291e4fa289e10c63eb54e1cdc00a447271d593 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:44 +0100 Subject: [PATCH 031/216] pythonPackages.slob: 2016-03-04 -> 2016-11-03 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e8ce52c66b..fc5972bfbf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23151,15 +23151,15 @@ in { }; slob = buildPythonPackage rec { - name = "slob-unstable-2016-03-04"; + name = "slob-unstable-2016-11-03"; disabled = !isPy3k; src = pkgs.fetchFromGitHub { owner = "itkach"; repo = "slob"; - rev = "31ad0e769360a5b10a4893f686587bb8e48c3895"; - sha256 = "06yn510178awhjsvy88cpjz7rlmyviqd5g58gc8gf4ivyqdlqbsl"; + rev = "d1ed71e4778729ecdfc2fe27ed783689a220a6cd"; + sha256 = "1r510s4r124s121wwdm9qgap6zivlqqxrhxljz8nx0kv0cdyypi5"; }; propagatedBuildInputs = [ self.PyICU ]; From 33abc705b31a294d9e788bda5b0b1708c8eed92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 18:07:04 +0100 Subject: [PATCH 032/216] xorg-server variants: eradicate symlink to /var/tmp - Fixes #19673; it caused problems in combination with buildEnv. - As noted, X falls back to /tmp: https://github.com/NixOS/nixpkgs/issues/19673#issuecomment-258871876 - Removing the directory is still required, as X would attempt to write into it if allowed - and probably succeed in case the user set nix.readOnlyStore = false; (X runs as root). - Archeology link: 9d1569316. --- pkgs/servers/x11/xorg/overrides.nix | 4 +--- pkgs/servers/x11/xorg/xwayland.nix | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c87acfee43a..8d681744131 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -459,8 +459,7 @@ in "--enable-glamor" ]; postInstall = '' - rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled + 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 \ @@ -510,7 +509,6 @@ in ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled cp -rT ${darwinOtherX}/bin $out/bin rm -f $out/bin/X diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 729fcc2e344..ee4b5695c7c 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -25,7 +25,6 @@ overrideDerivation xorgserver (oldAttrs: { postInstall = '' rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled ''; }) // { From 84d737cfe92967b9759f191d1b7c90ff87bea02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 09:58:18 +0100 Subject: [PATCH 033/216] clisp: remove Darwin from meta.platforms for now It's problematic. See #20062. --- pkgs/development/interpreters/clisp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 1a05f19bd82..2386cc27155 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -26,7 +26,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null stdenv.mkDerivation rec { v = "2.49"; name = "clisp-${v}"; - + src = fetchurl { url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { description = "ANSI Common Lisp Implementation"; homepage = http://clisp.cons.org; maintainers = with stdenv.lib.maintainers; [raskin tohl]; - platforms = stdenv.lib.platforms.unix; + # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 + platforms = stdenv.lib.platforms.linux; }; } From 374ac13a6ee283fe45c489d642ea39a6199a5c48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 10:16:14 +0100 Subject: [PATCH 034/216] Docs: fix Python docs --- doc/languages-frameworks/python.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index df60cc1e573..121e123c8cf 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -409,10 +409,10 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are as respectively +Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively `python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python35`. The default interpreter, `python`, maps to `python3`. +`python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/python`. @@ -437,14 +437,16 @@ Each interpreter has the following attributes: ### Building packages and applications -Python packages (libraries) and applications that use `setuptools` or -`distutils` are typically built with respectively the `buildPythonPackage` and -`buildPythonApplication` functions. +Python libraries and applications that use `setuptools` or +`distutils` are typically build with respectively the `buildPythonPackage` and +`buildPythonApplication` functions. These two functions also support installing a `wheel`. All Python packages reside in `pkgs/top-level/python-packages.nix` and all -applications elsewhere. Some packages are also defined in +applications elsewhere. In case a package is used as both a library and an application, +then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made +available for all interpreter versions. The preferred location for library expressions is in `pkgs/development/python-modules`. It is important that these packages are -called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee +called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee the right version of the package is built. Based on the packages defined in `pkgs/top-level/python-packages.nix` an @@ -462,14 +464,14 @@ and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` * `pkgs.python3Packages` pointing to `pkgs.python35Packages` -* `pkgs.pythonPackages` pointing to `pkgs.python3Packages` +* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function The `buildPythonPackage` function is implemented in `pkgs/development/interpreters/python/build-python-package.nix` -and can be used as: +The following is an example: twisted = buildPythonPackage { name = "twisted-8.1.0"; From d34ccd1db4607fedc2ec700193edb4204dee54f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:40:35 +0100 Subject: [PATCH 035/216] xf86-input-synaptics: 1.8.3 -> 1.9.0 I'm getting new error in X.0.log: "Synaptics driver unable to detect protocol" but the touchpad still works fine. It seems the driver is trying to additionally apply to my regular (wireless) mouse which fails. I hope this is just harmless. --- pkgs/servers/x11/xorg/default.nix | 52 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 16 ++++---- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2c27d6483be..399ca7734e7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,55 +1593,55 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.2"; + name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; - sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.8.1"; + name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; - sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.1"; + name = "xf86-input-libinput-0.22.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; - sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2; + sha256 = "1qpaffl21xxjqcn4cqdfnd1gvxwdxizvvkimkypf4j6l5q3v8qn7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.1"; + name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; - sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; + sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.8.3"; + name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; - sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; + sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.2"; + name = "xf86-video-amdgpu-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; - sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; + sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.1"; + name = "xf86-video-ati-7.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; - sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; + sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.1.0"; + name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; - sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; + sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 161d7bda85e..eece5ff3ed8 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,17 +120,17 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From bf220b1b4aa8e5e2939d29cdd2fe9f566ccc25c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:49:49 +0100 Subject: [PATCH 036/216] Revert "xf86-input-synaptics: 1.8.3 -> 1.9.0" This reverts commit d34ccd1db4607fedc2ec700193edb4204dee54f4. By a mistake, it included much more than intended at this point. --- pkgs/servers/x11/xorg/default.nix | 52 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 16 ++++---- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 399ca7734e7..2c27d6483be 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,55 +1593,55 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.3"; + name = "xf86-input-joystick-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; - sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; + sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.9.0"; + name = "xf86-input-keyboard-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; - sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; + sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.22.0"; + name = "xf86-input-libinput-0.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2; - sha256 = "1qpaffl21xxjqcn4cqdfnd1gvxwdxizvvkimkypf4j6l5q3v8qn7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; + sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.2"; + name = "xf86-input-mouse-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; - sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; + sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.9.0"; + name = "xf86-input-synaptics-1.8.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; - sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; + sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; + sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; + sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.2.1"; + name = "xf86-video-vmware-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; - sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; + sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index eece5ff3ed8..161d7bda85e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,17 +120,17 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From 3b3daf4104beb382f15079fbef385e8234ad8a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:52:53 +0100 Subject: [PATCH 037/216] xf86-input-synaptics: 1.8.3 -> 1.9.0 I'm getting new error in X.0.log: "Synaptics driver unable to detect protocol" but the touchpad still works fine. It seems the driver is trying to additionally apply to my regular (wireless) mouse which fails. I hope this is just harmless. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2c27d6483be..5a8ba2c9ba0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1637,11 +1637,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.8.3"; + name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; - sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; + sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 161d7bda85e..263ac53a29a 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 From 1b158bd1c816f3dafec27ade3961c2dc1b3425f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:57:26 +0100 Subject: [PATCH 038/216] xf86-input-*: update drivers not in common use --- pkgs/servers/x11/xorg/default.nix | 18 +++++++++--------- pkgs/servers/x11/xorg/tarballs-7.7.list | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5a8ba2c9ba0..5b1dfb4c3ec 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,22 +1593,22 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.2"; + name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; - sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.8.1"; + name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; - sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1626,11 +1626,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.1"; + name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; - sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; + sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 263ac53a29a..1dcde0cc4bb 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,10 +120,10 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 From 7c7dc15cbfc8c513173ec461e901bf5271e4b47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 12:39:04 +0000 Subject: [PATCH 039/216] lxcfs: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/lxcfs.nix | 49 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 nixos/modules/virtualisation/lxcfs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf7a68c6cea..155d7a5ef92 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -618,6 +618,7 @@ ./virtualisation/docker.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix + ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix ./virtualisation/openvswitch.nix diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix new file mode 100644 index 00000000000..48462dc66da --- /dev/null +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -0,0 +1,49 @@ +# LXC Configuration + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.lxc.lxcfs; +in { + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options.virtualisation.lxc.lxcfs = { + enable = + mkOption { + type = types.bool; + default = false; + description = '' + This enables LXCFS, a FUSE filesystem for LXC. + To use lxcfs in include the following configuration in your + container configuration: + + virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf"; + + ''; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + services.cgmanager.enable = true; + + systemd.services.lxcfs = { + description = "FUSE filesystem for LXC"; + wantedBy = [ "multi-user.target" ]; + requires = [ "cgmanager.service" ]; + after = [ "cgmanager.service" ]; + before = [ "lxc.service" ]; + restartIfChanged = false; + serviceConfig = { + ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/lib/lxcfs"; + ExecStart="${pkgs.lxcfs}/bin/lxcfs /var/lib/lxcfs"; + ExecStopPost="-${pkgs.fuse}/bin/fusermount -u /var/lib/lxcfs"; + KillMode="process"; + Restart="on-failure"; + }; + }; + }; +} From cb2c5f4a4384e944299b70eacd638a0cd7e8d071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 11:31:38 +0100 Subject: [PATCH 040/216] xf86-video-ati: 7.7.1 -> 7.8.0 I runs fine for me. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5b1dfb4c3ec..fc064e6218f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.1"; + name = "xf86-video-ati-7.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; - sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; + sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1dcde0cc4bb..0476fcdc2b8 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -130,7 +130,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 From 8e8742eac0e8b1e8af23a0ef678d39bdc94b0527 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:33:43 +0000 Subject: [PATCH 041/216] perlPackages.ModuleBuildPluggable: init at 0.10 Add the Perl module `Module::Build::Pluggable`, version 0.10, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef8984230f4..e316fd0ee04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8097,6 +8097,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleBuildPluggable = buildPerlModule rec { + name = "Module-Build-Pluggable-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; + }; + propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ModuleBuild TestSharedFork ]; + meta = { + homepage = https://github.com/tokuhirom/Module-Build-Pluggable; + description = "Module::Build meets plugins"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildTiny = buildPerlModule { name = "Module-Build-Tiny-0.039"; src = fetchurl { From e12b2b8119084d9ba30534aeb8de987113783d8e Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:40:54 +0000 Subject: [PATCH 042/216] perlPackages.ModuleBuildPluggablePPPort: init at 0.04 Add the Perl module `Module::Build::Pluggable::PPPort`, version 0.04, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e316fd0ee04..c3cd7b88203 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8111,6 +8111,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleBuildPluggablePPPort = buildPerlModule rec { + name = "Module-Build-Pluggable-PPPort-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; + }; + buildInputs = [ ModuleBuild TestRequires ]; + propagatedBuildInputs = [ ClassAccessorLite ModuleBuildPluggable ]; + meta = { + description = "Generate ppport.h"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildTiny = buildPerlModule { name = "Module-Build-Tiny-0.039"; src = fetchurl { From 524f7c02dcd43a8807426874db0560d8e4ceb900 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:45:12 +0000 Subject: [PATCH 043/216] perlPackages.HTMLEscape: init at 1.10 Add the Perl module `HTML::Escape`, version 1.10, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3cd7b88203..a906bcce7cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5976,6 +5976,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree ]; }; + HTMLEscape = buildPerlModule rec { + name = "HTML-Escape-1.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; + }; + buildInputs = [ ModuleBuild ModuleBuildPluggablePPPort TestRequires ]; + meta = { + homepage = https://github.com/tokuhirom/HTML-Escape; + description = "Extremely fast HTML escaping"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLFromANSI = buildPerlPackage { name = "HTML-FromANSI-2.03"; src = fetchurl { From 7f5af41140ff9443779fcf3ce78e59304af7d6d3 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:48:54 +0000 Subject: [PATCH 044/216] perlPackages.Swim: init at 0.1.44 Add the Perl module `Swim`, version 0.1.44, generated by `nix-generate-from-cpan`. This Perl module is the reference implementation for the lightweight markup language [Swim]. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). [Swim]: --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a906bcce7cb..03c166b65fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11854,6 +11854,21 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.subversionClient ]; }; + Swim = buildPerlPackage rec { + name = "Swim-0.1.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa"; + }; + buildInputs = [ FileShareDirInstall ]; + propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; + meta = { + homepage = https://github.com/ingydotnet/swim-pm; + description = "See What I Mean?!"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Switch = buildPerlPackage rec { name = "Switch-2.17"; src = fetchurl { From 16a0657c9b7558129d277c7d67b8430b6115e4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 13:34:16 +0100 Subject: [PATCH 045/216] xf86-video-amdgpu: 1.1.2 -> 1.2.0 I only tested building, as I've got no compatible GPU. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fc064e6218f..08072b2e753 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.2"; + name = "xf86-video-amdgpu-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; - sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; + sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 0476fcdc2b8..cf72e2fcf33 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 From 8d86d16db3c8a17ffa60c69b745eae4aece627f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 13:36:21 +0100 Subject: [PATCH 046/216] xf86-video-vmware: 13.1.0 -> 13.2.1 I only tested building. --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 08072b2e753..bb7675ff50a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.1.0"; + name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; - sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; + sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index cf72e2fcf33..d501907650f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From d281a939602688577e0103ea3fad906abd7a12f5 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:52:34 +0100 Subject: [PATCH 047/216] sbcl: 1.3.10 -> 1.3.11 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 788160b5888..cc44c13940e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.10"; + version = "1.3.11"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0xspp04y0l0yxfi1zyv0qsj9b6px5i88xpannwpc45mkj6nplmja"; + sha256 = "0hkn760d4dhw1md0zqldbpc94nwp25d73sjdrdmhfqjcz6c2syh7"; }; patchPhase = '' From 13f82b04456ae56e0069c313c112aa7e7ce00677 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:53:26 +0100 Subject: [PATCH 048/216] picolisp: 15.11 -> 16.6 --- pkgs/development/interpreters/picolisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 9c669ceed68..04aca84f902 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "15.11"; + version = "16.6"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "0gi1n7gl786wbz6sn0f0002h49f0zvfrzxlhabkghwlbva1rwp58"; + sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm '' From 194a2ae86aaac2840bd349448ef5858ce868cddc Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:55:32 +0100 Subject: [PATCH 049/216] sbcl: fix disabling threadSupport --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index cc44c13940e..0198dac1c44 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { (disable (x) (setf features (remove x features)))) '' - + stdenv.lib.optionalString threadSupport "(enable :sb-thread)" + + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + '' )) " > customize-target-features.lisp From c410dc75f26e9dab5c06804e769733a125385d23 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:59:49 +0100 Subject: [PATCH 050/216] sbcl: avoid using wrong options --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index f8352f0a362..200293c6f51 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,7 +23,6 @@ let sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; - x86_64-solaris = x86_64-linux; x86_64-freebsd = rec { version = "1.2.7"; system = "x86-64-freebsd"; @@ -32,6 +31,7 @@ let }; cfg = options.${stdenv.system}; in +assert builtins.hasAttr stdenv.system options; stdenv.mkDerivation rec { name = "sbcl-bootstrap-${version}"; version = cfg.version; From 18eb185591185a2d82c73a5584bac2d22dbeaaa0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Dec 2016 14:26:16 +0100 Subject: [PATCH 051/216] sbclBootstrap: list something for Solaris --- pkgs/development/compilers/sbcl/bootstrap.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 200293c6f51..8f442bd890b 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -28,6 +28,11 @@ let system = "x86-64-freebsd"; sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; }; + x86_64-solaris = rec { + version = "1.2.7"; + system = "x86-64-solaris"; + sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; + }; }; cfg = options.${stdenv.system}; in From fd6dbd9d177b9a213cd2830873a6ddd311f743eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 14:21:13 +0100 Subject: [PATCH 052/216] blueman: add missing pycairo --- pkgs/tools/bluetooth/blueman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 2efd4660bbc..7af5f941b28 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ dbus-python pygobject3 ]; + pythonPath = with pythonPackages; [ dbus-python pygobject3 pythonPackages.pycairo ]; propagatedUserEnvPkgs = [ obex_data_server dconf ]; From 9471411a3cde9d15adc55c69b0c75bbcb44bd2fa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 4 Dec 2016 21:45:42 +0800 Subject: [PATCH 053/216] wp-cli: 0.24.1 -> 1.0.0 --- pkgs/development/tools/wp-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index a116e8b73e2..30d509a5e5e 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, writeText, writeScript, fetchurl, php }: let - version = "0.24.1"; + version = "1.0.0"; name = "wp-cli-${version}"; phpIni = writeText "wp-cli-php.ini" '' @@ -18,12 +18,12 @@ let src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "027nclp8qbfr624ja6aixzcwnvb55d7dskk9l1i042bc86hmphfd"; + sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp"; }; in stdenv.mkDerivation rec { - inherit name; + inherit name src; buildCommand = '' mkdir -p $out/bin From a1ae6273626b467906ae964eca4b16b04e9f8953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 14:48:47 +0100 Subject: [PATCH 054/216] nixos GDM: fix #19896 - As noted on github, GDM needs different parameters for X. - Making xserverArgs a true list instead of concat-string helps to filter it and it feels more correct anyway. - Tested: gdm+gnome, lightdm+gnome. There seems to be no logout option in gnome, and gdm doesn't offer other sessions, but maybe these are normal. --- nixos/modules/services/x11/display-managers/default.nix | 1 - nixos/modules/services/x11/display-managers/gdm.nix | 7 ++++++- nixos/modules/services/x11/display-managers/kdm.nix | 2 +- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/display-managers/sddm.nix | 2 +- nixos/modules/services/x11/display-managers/slim.nix | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c8a1a2361f7..c0daf30d04e 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -187,7 +187,6 @@ in default = []; example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ]; description = "List of arguments for the X server."; - apply = toString; }; sessionCommands = mkOption { diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d3aa63fd428..6c63fede857 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -92,10 +92,15 @@ in users.extraGroups.gdm.gid = config.ids.gids.gdm; + # GDM needs different xserverArgs, presumable because using wayland by default. + services.xserver.tty = null; + services.xserver.display = null; + services.xserver.displayManager.job = { environment = { - GDM_X_SERVER_EXTRA_ARGS = "${cfg.xserverArgs}"; + GDM_X_SERVER_EXTRA_ARGS = toString + (filter (arg: arg != "-terminate") cfg.xserverArgs); GDM_SESSIONS_DIR = "${cfg.session.desktops}"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 8b51c621e11..04701a1640c 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -25,7 +25,7 @@ let FailsafeClient=${pkgs.xterm}/bin/xterm [X-:*-Core] - ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs} + ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} # KDM calls `rm' somewhere to clean up some temporary directory. SystemPath=${pkgs.coreutils}/bin # The default timeout (15) is too short in a heavily loaded boot process. diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1d309aa3429..4afef32aaa4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -23,7 +23,7 @@ let else additionalArgs="-logfile /var/log/X.$display.log" fi - exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} $additionalArgs "$@" + exec ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} $additionalArgs "$@" ''; usersConf = writeText "users.conf" diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index dda8d0f7629..6630b8257e4 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" ''; Xsetup = pkgs.writeScript "Xsetup" '' diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index ca2ae1a4772..68acde85b5d 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -12,7 +12,7 @@ let '' xauth_path ${dmcfg.xauthBin} default_xserver ${dmcfg.xserverBin} - xserver_arguments ${dmcfg.xserverArgs} + xserver_arguments ${toString dmcfg.xserverArgs} sessiondir ${dmcfg.session.desktops} login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now From bb84c688f61753a1f1fa1a35b808f1497d0852e2 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 4 Dec 2016 13:26:58 +0100 Subject: [PATCH 055/216] rustfmt: 0.6.2 -> 0.6.3 --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 335c469e0c1..9372b448cc7 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "4418fab4f24e6497aa2a1f71bb4cf963c2971a28"; - sha256 = "0x2kg2sqpj4lsqqskcy5p0w3264f0by1irkjj369ch89xax7l52l"; + rev = "61ab06a92eae355ed6447d85d3c416fb65e96bdb"; + sha256 = "0fa16ycbvhyxs1b278q8jizrx9z0gis0ysjwk8fjws0282xsyvbk"; }; - depsSha256 = "022mwggmy6p9n8dh22y6m3sadrwvwlbpj9w9ki9avmgsm3cj2mhs"; + depsSha256 = "1qg04nzba30fqswjf97wf0slai6lhrsy0bfv648sqnrf50virx5h"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From 63a5dd7e25c41a4b7074cbc9f93fe8b170f48200 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Dec 2016 14:17:12 +0100 Subject: [PATCH 056/216] firefox-bin-beta: 49.0b1 -> 51.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 368 +++++++++--------- 1 file changed, 185 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ce49d92e335..bf45e30eb45 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -4,189 +4,191 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "49.0b1"; + version = "51.0b6"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "98736e1a7503e6550491147b418815abc1cc59e58172ca45933f24f8a3df1d2e2d614d059d1159fefd727e771489c488a369e0b1f9bb7a25c8eb75cfb4c3e2b0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "e8186d58d6c3847b475ac3c55f97476f393bb2ef210a4b7ec95d174d160011e0b4d0798de8bd33ebd30c342506f713a71509eba06fab03dc6b0fee7524f19dcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0732de2c643ec1ac17bfb3b7629207cfde48f4a135b7dafd6a5efbac3231382fdc5f19048cb76f3da3bca255bf9816956e301e26cf28390ea9cccada67d920cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "ea5c72eb31b41714d57385040cd2d80f273b4177a576685ee752b2e92f90f8d9b5439e1f52dfc9941143bf91248be72aa670d134ba523cca856d175960bb3f40"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "36e3b5c374522efe6dfbb3b072ed2a75b3bcda8934c4763468643999fd14bcf043a2e4a0a5c62ada2f2d903a1f593e06976354a620733523ff806f6b8fecf1ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "398134c3133b75f027743ded416f3063d74ef777cc854992cd39aabb6397b00fff8dcf5116dabdfccee6ab1335bc296ccd991b3a4d72707735880d94b8f81af7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "395b9abf6a6f01f448d7671908c2d7903604592490109793f3e36ba83375685aa43007bec07d3f28997416d8aa02df2597ce3392b7c1e83e1af4911203e2baaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "731d61dbc03548c77aade87c413f91d727cc8a87e15c202b73dece2a17c2bab887eb3912077aea670d9a928e930c4550ef2150442be8894e59b082c6f3d4b479"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "7f2d08dbeae79e7f903ed182c9eeb436f227ed9ff9db17d93f2c34efc3353788a0b499e23f2fb3eb892c9ee1592493cd8f960a6092f83b19de9419c7bd4ec3e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "311e413592438b610b8402eb00ed19b87caaa02522e8c40fff454d6d3fd8e0b7d5cf9223a6fc52d7c5f0be23baebb87639c2c64630e5a1a966d341b679bc1d03"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "a782df4a337fe18a7bb85c2a252444154100a597253d98d25c268c69a430045e4722a888f3d5fa51926de3571dd1941c117cd34537ff866c5d34279f3861e0e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "87a7759ecd002f994ebf7334b9c8c4c042ed6b84bc33485c791c5ba49bb7477ec801531a0723820aa181770c3d404eb7a0f7fb91818c38044ca9e3a130962899"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "d3822be0aebbbaf200e243c3e0ed0564cf6b5a9f14825f477767f98b796afedde9c6018f3b34c0263553fe190516ff0020e591ddc8ed688cab9454b7760cf131"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "2a70bffe3da3d3a9a61e649badc3a64f3110950cfc0b3cbb42c6f799465d928ec12c9efd1e7ee6ea978c865e2d3fe05d732a870654bf629f083f15357b360ccd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "edc39ed32b7d990074ae3a5099cc4a0caf23190364eb87d1218a61a25b66777fa02b5df6f20c96c5ea67798a999f0cba6873d5d23b583bcd3d6ee90a7c978847"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "d0558a2e751d561e2f316a7bd57c3a8d92e8d5cb56e5eb28d44b5d40303550afef2bb9b69dfb0b80d1ef706a33717017eb077d3b2bca9277294cc76656a6131b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3524f48e8fb8b0c98c8df55d3e2934240eb414160d0e17d6f9beccb6b0540b9c9b554757e99dc99b16e685779c5d3395ff9bdb5c3a6c9faa2e88e099986aa4df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "f44089b4c10a0791d98e75580c1316f400c7fadd48050d9f3a352064005b3b4205db7ef54bb1ab7bf6518f7bdb3be5f853f490cc0247f3f7a4ee7d6c50cbd20b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "39b42d189a8ba7508e98045e1d94a1c79f8544cf4b2e2cc5187356d7f9ab6deef012c6e5d2220b2ce2b5a58f565289c5aeaee6ddcf0ab7b0cfcf18a902b95715"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "210c40e18347440077ddd0ffd25426fe583547a2a9bfbecf3e8ba3d0159d7f7317c06f893731512cc0666af488f32ed5808c8e2aabc921367f538695ba49fde9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "dadbab0c70f22ec20a253d73081d3ccecbe148c6b0e854b85e7c079f4979f746c79fd5febd916c167cedd78ef04f5e0b2d2c925999424bb77118d251287311a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "8a2b9fe150579e487063f68373157ba087c571f53a98dbc9251deee92ebc58d587e38be2bc0412ed02cd8ccd485d91bc2fe5d70c223e7fe6edd996d9bfb89bfe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "7a3a3c5015f407a1b7ecbf35763ea091cdcd3652c7916fe81d39336521fd6ab908a549bec8d39e089d0161fb6b37894b893058b523f78bb76e75dff21852fd13"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "9a7b5efd1f8d35f8cacaeefcb446028745bd999765fb04e60403b710cc9e5be14d172b6f0c2b08f1093083b6c4d94f22117f2b717473f5cd2bdc43ecaaec50a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "4671c1ed650df67ecdf152ae1503979f52b001660e167ea4ca1c47e1152e1450e2a5eac306b302c55b28e686c8535f6d612faa4c53b81cc5297e765c1bdd0afc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a2e4417c3987c8ab15ef8afd4fa130f6c45550c57a4605ffa301dc7d4ff49620c768d83e9de00f509dbb0cfd94530f4cb102cdb1f2a01eba091982fbfcd82d36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "076f1deebdec83f76b44c41820253a7659b6702a1b1ef7139419a50411f2f752e764f96f84be24d84be388a3a3083656f967ee53ae1c640651dcac46b6dcd089"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "6a34ba7edb264cf974fa23650c73bcdca3e9344dfa82f3adf56c04a73439af5a093789e38406e2ec94c97635883eda2a232fe33a1746d08ff148022a1bb61fd1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "0657e07ceb245e435dcb3c2e36e71054bf369c088e42ad0b7448c05c5d6a666ba5505da01d2e232388794ce5ae3be8dd1ce30ab0926dc9948d2a1291948f9b5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "4e95bff1e40614451baad90fb3ef76e27f2ee5d1d2ede400c091f46421b6b17a0c91bad04a45208219ef7513046749b9a42a147cdf7ba52a88dd515f5dc27cec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "73264dd3b43e4ea4028bf622a2062797e4a28118ba597df19affa7fe38e630aac4a960fde8eb6be4a1e64d91b3b01e986d93684819c54e66c506153b19a06550"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "a94a811ede59154c98e87c47bedf4a5faae44cbf2c87bd7346476c92977abcdb96b79cfe379a04a459daa576170849a5c2c779a14948e51e046fc6fcf0ba4571"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "cc45c49758e3542ce704f941fda143ec531c9c0b9b0b28eade737e792afe7bad0db708a61510fadcede7af64622b7a97cb1f2c8eae7385ab447dc4a4198c07d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "07999f0049f305e75ec3fd1102673576e685e42b894db7ac8eef4d4dd1b4d2599a47b8f1ac034c728a5f3bb433ed96550907dd2f9e63a3fbd0aa43b65f2ca744"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "115840053470a057de9afeecc8a74113ff97c06293ce52995ef2bb473217d7b057329a4bb239bd21799d894e6a11081e7afe5191cc1ffb8887481fd08911f333"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "358f79e56cab4260557fdd999a70d025c6b2f8e7ea01a5767500e4b1906a57994592c633b7e10b9aa54a7a2dfd98f86bb3a8f8b09c364d8675bad5d74cedfd2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5f80f4e32a71560188a21bb6b457b66a692f5eb32c5b45e04c40770b83689ead6bc07ec4a110f3855f5fe0e034f7b64ef8b5fe80526c708077664b179def71f6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "01c71572560665dafa87ae8b327ee356b18b5ef08df093792c07b3858c42f2f9f3a89a2752fee35503785cf10130ca22fb21db83ce48fb902876eb9780b959cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "11385bdd26fd0eb9eb505141af2033a9e3b85f0d748959938eb51b9d7bb9e4c801ecf19e351957b9f8549d487086968b1f86e19534b09997b04642ced3f708d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "4daa34474c395c52c42c12f03125db8266e83ac1d8e5b098f0371cab7445b767abfb965668eafff466857ac99b6f4c00f4238d00b2f3915f228a25277b54fc2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f77b62b8acabbd5afca19572be983c2f81200ff2bccabfe45b6c3d41c32de90cb4fac56db7be01fcf6a8dd69a72056e903f62d2af08b7ef0a06d18588c685b8e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "9a3852f3dec48d5c40c09d6c961f87fb34f7fd6423ac86c4f4fe293560769c1e5a40f0d3e307fe65cdf614fe6b7fa7b1279c59b8a514e83e121b58ca90b46d31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "3197dddc1f6aa65cc7bef6217175d308c29f1bc87014e651af76b490601cc202e9609d2728ba2c05203cfb93735094dc7efc2ee9f02b8544776ead8e788ac7b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "c1dcd26ed3b07c555793304c15644033105a72390c1307921fb215a06ddde547a34e1d027966e524878adf26a8fd3323d3d59c2914bfd20b6e7b7b4e59f54eb3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "27d8f7ca57bd1fad729e73c0fce7f33da77249f1668c4d2b546db8b0edbddff4795537250c190d59cebd83dd91a06baad9b791c7c7ffec2f4d82cfdf15bb58f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "1e267127d21a6f7c64acd7e1a991a70b51742bdc2ae83f669a25203f710483a35b3bc7a9f226ad2efed77ef88161d345d312efba32e9b38d60d2144a1ff1810d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "37fc1a82999c427496fb50ab6ce47d719add8f2e00d47269d266418dc1c1cb4191675a0cef398098fa17e9ec510a40250628eb5290b270c502316b3694361f6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "5ce15a1e1d9a5d3c26a2e1b2705c11fcd42acbd296231f2d25d7b130185b09ab25d0332c199d0f8e4994b30c97ea8d80e1f1ceaab8c8d8ffeaa2a2da91b32875"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "bb5e5f0b07054f2cfaa047e8df129c0fede79f6e5d736014cea52bc59b8b4c5276bf3c4217b818adf2ddf11c054c8a5ddc782a9c0b529b7164bd6f1e7edb6ca4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "01d363154887ebf4c008646c4d749c89f8d748d9b0f76e19de37dc097517aa67485830679406b57348a670568f9406fe14fd22e01410f3a00e102b5436779193"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "8fa22a6ac6e2f9553bfc6fd7b0326ce327e4352b83e45d89ea0f79267073e03bba7dd1f2c2c2de40e3533cb0af97673aaa758eb0914c090078306f4b2902e361"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "da2b44fc3bd5c7536744b1355ee9640b2d430c32c3127ce1f8eea09cf88016c0e2bd9768925abf19b49ba62c55d90c029465b03c307fbc361ad95f4c28acb419"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "2cbc20485b5faf26a7f8978b63b8c135582569bc5d68c96b2dcd3d66864b2158479b7c5db0521ccb9c2de4eda6b4ffdea04ea480ac9b3e4609fade7f17806a6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ea8bfed6bb886d23f8755b8187495ead5aa955c9fa45db1249a2f23477bf01dae4959cd4eeacffb6c3a6402d47da458c9d9fdb43243d64e19e3d66e3e1b85114"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "ffb37896e2f7de03c26b6e182416c399b9776bb14828fd54ebb34406f25ef77bc9eb975a13b7c9c9b02bf78b496928abc059283322fb1422d63d506f40b533a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "635e7f1e0fe96d6e074bb1f2a4e92d98e0fb4049f7bf34f5e5547fadd00691e27efbd5acf6b79ea9e3bbb8d7b72a50f7beb64bbabfc55601645292a83384a2a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "f67781fcf3ff9e4dfc1ed042bbc6c8aede1a06a6f9b4f9f4c969a9df769114febcdb4bae191ccc9ac10cebe727f495307e497af721c326ad7d2bb6894fd93944"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "42236f745af27e5ffbd1370b9d5136793d1c0ffcd1a1f8299f3a3d439e2671175524416bba6e1ecd162d9f986f89da0d3d1ffc760f2d48c5d28a99d74c467bbb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "d2823810c39808332c46cc39d50c552efb61d74dbc7fb59dfd5b76d1efae544b52de89cac42be4944d831691971d4d8c880ed1cffd9448b05872acf7da39b698"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "61fb55d812c8b487ddad136f9c908396aa02e3ec4eee3f2f3fefd883c5aaf24a0c138366326bfbebe59b7065cc6f8f99550823e46bad876db8d930251f6a4492"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "5086ad7828197b129d8cd25fbbe7bf0e152b3476ea886ed8cc02290d4ab4912cd02ccdee0c02f08c73dffe6a0b34c11dceeba73cd948c03b26fea8c3bb2a84bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "b701decbbb6374ebb39522b068a36fb7c3bedff9f2b76cb655cd56addd592bf7d118c828283f52686545a6d9f603b674d8d80b35db217b5637fe2b29864e35b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "e14d7a15eb97c7b35bcdca156a86514ad8ca91d9af8978d9e9c1afeef6e71fd3f990daabd65efe424c6275944ea1922c3a313d562e710ee747b4e63d950c6578"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4a0cd3b22daae4cba54473e4b144062e93dcc995a00e4f94fb66349e52274a5504b8e91e681305999fbd0acc3691fb011cc4db5485d59a9de79f542c3fd4dc64"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "d199ced706d4dd7f1b21999c335c500cacb8c1e4ece153f2f169711b4b381c316d5c2654608bb6f9a035f8c318c6ec96afe217ee6480451002e8f3269b4f0a82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "58bb1595a4eb0dc651ad4778674103b42621375f8f7d138ac658915a974be52c35fd3944c099ee7ff791d7441cd818b09cddfb2a1498274aaecbaba8cbbd8ba7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4796471c2c42d9f5f278615b4a29edd80df8c113f42929a97c211bd63fe905bb7861a4c42474c6f19847308c2444e5549b7844824d99e6f236bcd0e2ab44e906"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "5d61a0ce98ffb8b9b3a8942b756ecaccaed33fe02513607aacf5338141beefcdcc547815d0f522da57ea1ba81dfcfb0c0e3ca6a0df237ce12501c41a157cfb51"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "6d69faed2f0c72d47311b2a756cd08c1f0b3c142129fd062bce661ec90a888e1ab246a04fd10dc2ba987ee2602f43b794a1507a7f23a5c65e909c0378e2bdea6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "c92b0a2d591037bfda7831767d3c3f3d324190cfb26100bfb26cb12d9281a1b3a487141e4db5112cf122cb4e236ffded74d751aef2590fe703201128a1c453ff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "25cddb8ea11d5422f966c1467d225743aa5807df9131563ed272953b4fa5004c331de87629e2eb6ba1903ad9abf8f0745be966f2e29c82fa74f620f08473f638"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6ea3b911dcbf66fa365b2ce6a6722ce3e412e61e9779d647fdc42d6e9571d60b3908af034658cfa42bc22432ab0a360f9eca676ef3f22b36f05008a33760b1db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "7d594f87fc45fd1ef00f2d62dc1c0a382eabd02745cee1901d133f853cc937a4c8915615c189ee6c5378d161fc75230a1c250c789a8c734aca7eb23bb44d45cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "af5a12a3cf90eeaea1f028d4c9a6985d9d8c994947b7976b1a3e8e0ec1af18bab4f8d7b5b86105eb119b1928c23abb4cb7fde737662eb06e0b8394b19573daef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "8f0e9fa58b929fe1d5640a373ec0b9a93eac336989b1cf10e1577ef8b3b57786f51a40fb0b6a2401faf192e54f7793f04ac3ebccef5dec56a48ded34cbd5cbb7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "8719d4655bf8ac157a6d144ff9acbcdcc138094a3d589a4078d9786acd036adfae6216846681a8feb33f9e020129acff3756074bfe18289cca126f140c4be1a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e198a3becf663600184ee46f5d7043d5349abf10e2e951abfef7782449c142755fa0a37defaadecd674fb92589c24c3d49b45fadcd75ccfb81dea5ddd42b766e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "e37ed350a7cdd5801631ddc934874016b38e4596b1d397d28a9735a977ceee80a70f0b382c186a88bef39c3c747f9825805a2c8143e0fb7b7be574c07301b77d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "24b41e132f5aac62884d6b5703a8c3be679d6f8201a3abd3ed966cfe349055102bf099cec81f01cd86b40499c597adfbcbae2ca17bc6767c18aa9c0f1c317fb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "27c62ad953946a1c40b7b7393cc249a9fc2047c6a251c4d27c5a1a9ae8e8361a14c3fa934f6669f0e7a99b27573fac6c5e151ae9c590bb58327ab503f4482ba5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "aea376e23c7522fdd3c0c82f39455b8bbe67ce7008e1e1d9de575f98776fdf3bfa06bab3ba0da81862c0a7242ab9cd2ab1f873a34df084a88ec82ec45c088611"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "4dbb401a0f92e02ee8822379a6313a9e7822d1155d064199272dd2be921d9dc7849439b04be3f25043fe37f43a3dee3e7b21831eabd1c555d5292694975987ae"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "97888c66cec9bfd111e76fc22440dda604c643396679abad421223b10688763a5d0e64fec46dd94084f30d819a5a12df4fd78434c4b03290fa745b60281b39eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d46a2aec65b32e9b92a11230465ee6e2f83cef5a5b95057710f0ebdb3581810a1cbff09563f9ad3503a2c7217947369fdd80e0217318a40feed7bfd01fdbbcff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "48c3142a39ed9d9173d1c25337d65367f1430804b13d0c9595ac2546c7c22a177a4d528f37d773ddff3379bc7bdba5e69002f2a37c837aa95a29d4e52774e65b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "cc3c1520f6ec453bd7e347791f8ab3da06a3aeaccb44cfe5491a4fcfdf69ed7baef66c2d31a9ebad9d2538b6ff8f1dd27b20a8f42665a1c6ee57c5f60094ef71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "86dce4d32a3f01493ce83379cb20bb2e267dbeb770b9631914d3b9e722cdb9ae5a0a974b323ee2ed17fb97bd232baaaea1e53ea6f29b11253046656f98219cde"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "446c11ab6645e17465e24fe1d4dbf27175b27e4808bc66084bcf8a1760883f6a36a5992be18ab26115f75bf0dce780c42fcabb1af3d2009f4ff7015bbe0612fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "8eae4fae6e4a7d5acb9ad2b83c4f7b4d2c7edd75a4d320b6665d803d44fc448214ac71b2c86c9b16e6450f7b5238db8633a917f201b5d45f2cc03a31df2ac9d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "c937552d45b948fde0854ab6ec27f77aebf7fa13eb6ff5fbcc74e86309581fe6ec799580fca7e131c940d218d09f70e4e49dc5348ec99e4d5ae6a0c63c9a6f06"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "4c38f40861411365e4a67bef548252328024438fc3a39260708a505a625ae9fc2912bd537a83bbe4125a027b50916daceae369a68d0ea7ba309b8595f8864fd8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "fa298f7b4cd8fa50767f8b9a2bea0bd10e898a9e3042a0e09785ac74559b05877dbbc663ddb185146062fb1b3018a06f7e948fc33711726e43d5f33df1b3aef4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9e2838645094c6f8703857b674916517a47328aedead3e10dd3801abfe94971a648d792cbc1abfcfc7e39629aa7936d74cb711b53daf9f7198594e7b82c063ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "a84c9f9f20e19d3820b632f3ba4c9c479066459d293a57b5ff8fd4dae1d1451f812b0a6a71e72559d3ae0596a4ccb5fd09c0056a2726ac3a0c1cf083595adceb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc84f03e90ca309805c85f45f8e3a54c92e80237980b488abcac0eee1083237a51f30847b84adc3b6051b6d9c9075799c295996d5a912b7ebfb290911006b8c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e3d9e20347ffdce67d5bf5c720c93330b6a19e9733eab79f07820b50cc4ccd39a7f0736b0355f15e5bd59a8de24a0e9105bedb9d8da1cef125ea88cd1e6865c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "5b4966046dae0bb27a9fde5850fe291820b19c5e41fef4f010faa4d2d040ffcccb487d7f7647d0286e8e4e7fd27b50a12047d6fc95dc70dc34e7e1da4bce6b37"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "7b30d841c840af2c9b55173ac31ce5880a8b01daefd7871a4519107d276660af072c097479ae92b5b83379cd36a7c68ecf2d781d16b75d5eb38648aef6d89288"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "920e34f7db5452fad20303296b49f7d3dc7bc780735ef881c4c2cb42f2393d3be319adacbda74cfa965283681a01260dbe2298244fba5e541b807f7faffdf285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "3af89ab3f92d771fa82c58fc5ebdaa9ad11d7f89b57357e98ecadcd57bcadfe66101d09b187daec1c64dff808172eac5a608239be6c991e2a725ea9421e4b8e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "e0239291135a98bce718d86831a0aaf3486c0e1ff54c98e65e970d1824786624e76ae73572b85f009b413bbe8c61aff41972629819812eb36918d4f2e864a274"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "998635a41eb45b8329f70837d0096cc69c6c7983ec48a208185fb0f3ee56c607c68178ac6f8c02de34c62e5c7ab38c1829b445dfed80f7794b7ef4fcd9ddc4aa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "aee3c991acefbf1e257882bbd34eaee45415eecfb3fee2fa47a1d70cc5b6780b0894165a4c25609d595e4759d56ff0767b42f5b1d9174b4c1daa3e967871b66d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "e2170378be3b442bd97066d740d458e82d282cbcdcac555d425d16082ca22c766832a8602071135cf9802eb97b0c6f7f414fe076ddb976d84a4ddb1f1ea23bcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "71e8ebcec8758c4fcd6056530b26c2fed1512f36746d431660eb603838c22e7c9c86a560ba36bd18e3df783531e608c67daceb50ea1758671c489ce91e214690"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ed54aa4da9b6b2692c7d275d11ea53a85bd4ad131ecd644ec37acd3efbd51a25358c6b5720227e5cffb291d018c0890d46d09b61d3782e8000012893da10d144"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "678f4cfff160cfc6fd4f8e478f64ace3658c84672153c501f817a1456d7f7721d891d0186dfffa32e12bbbb46421e08e46753dc01021d3361b2e863176b32288"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "ec945284725364eff8e57d2f2e8bee7d35d8c217423b21d97328c8c5c2d43575c2af30fc93c8e128131c72ca7b2ea7420b88b21ded184a6b5e242fc76731e25a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "07839edad66284da56ec54366fef1ef0d1a55b6e7f7d215d9f52827e080d070c07be4948df13d3b082bb5962e00d503b4916937bcf5045d9e3f9896e7c8698d1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "6183cd77dfef7ed41e2049f3b423942eedcc2d5a49f820226c1fa366cbb75f63954b26c7797da42a11ec63f19bfc5bf19ebe605ac0d501391f64f5f168e157a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3e78f5ada0a37d181e4a7b5ef90ad39fcc0216783e6ef26de826c642f1aaea59cb968636b0249af9ff92b0ef32fdde051c2d6a71d4aa2e6ac35aecc062f8e222"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "b8e8f635e927beaa0a12e92e025deaa2e98cf2d19dacca5ae91c21fe6c41177c8670b46b1a896f1b8b80fc60d806f1642bf787c44058077c4225a6de8902e664"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "e71759b4088ab845c193271e0c48c319401362c8d2f0def8342807a972f70db6963ea405c93fb8832cae1f930503a3a54458de230d17d53cc376946782cb6e3f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "616a104d2ef421c162e6688d4128995faddac35f95327fccb313e20e56c410558f39869041900ac246d2cdbf510552bdc8a006623d8c6bbbf5350b6d7bd94899"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "2c413f2194c147fa4c3e21a9bdf67157fa7ea51dc7129dd8cb34e3b645600561ad9e9ebf3608cd75fc17e7d7b95cec49bb746d48c0b55fb4ea7b9ba7a359cfee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "2743486ad0860c500a6a9146a49ec6190867706a74350310ed2987b71c5503886ba2931ba066f373fd05342198f6e8bf2a491cbb4a85c0763f1a68c1a124f796"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "7e5bbede973200faf58753d0de6041298f8d31937e19b9353bb83043229c8634cafc2e79129e9a8b34d1b4be451b6d3ad77e3ceb21ce8bf1a35f386ecdd64d09"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "8e51758b070bbde4d7bb4cd8aee148c1e8fef2d5bf236a4801b58e8acdfa567b6df5d32c3d46ddf965a599ba79c95b0884210bc3166fb8e9408e5255fcfaf5c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3d945094b78f360045cfe6e1ffd53ac15a070b61adafec3063a88dd7f6ad4972fa5d4cc0398aa9bf30494be4326b63c8d8340ebd25d15c231c39d9a8b9c18da4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "d2e8537a64747c06b2fe05b080c0eb0af82e1f4427a396c90006d012b663c1d34273307af4995b6ff8e75de4e3727cc3f736c7a9a78e0042f2f8d018ce525582"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "561b7a1d3f308552ba8b2084c86d6318b901fe8a7fff3254b65b790e4909dffb355eaaa898ee352310b8633fc695c6d7feb1d13ab60bf491a0668dbb05297b7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "6970448bfda2c54605d052570fa3ac81cfd554611c994125247ff4927807938a80fa65405ddc14a295a38bae9a1d9fcf460b32e5ba0cdff5cc690b57cb4a8d87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "43b9022cd14ca829cc1f8546a9e13767e6f32daa3b008b6864a8cae3a8e6f99e70df0a05fdaa724e92fad38aabc5ffdbc9685795a0cbf1c914fbe3b515e80c99"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "16e029ba38ba9a88d57a72d7bb3ac843916f2e15b4a288815f59109cad9bb1c70beb0716360df4977231fe91f18ba3490168a857ce94c04d85a1aa5927372571"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "f418c661961f6c2e6fae0a1cd5329c35b331fa64bf9aa6d186f59d7b778d5b3fd7d6d548f69ba86f5b031bade68ec118aecc4aefc9a90ebc219945ce907f31be"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "05630d2f74ea7f70e9dd97284b41c4d4da2d325884696f58b1f88b3e29c4d5bcfa1ba7cc5f3aa412c852ac61f406fec29e0d3fea7820759d87f022811e6c5b0f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "81127ce66c7f7da82e6059abaf002b79225bea3e69558636d5aaccba0c9df97adcc8c041b9239ec8763e28040807151b2ea01c795f4df088b896b774ea2e6162"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e6c13dcdef6935921f74beaad25ceb8394a1256bc3ac6a1d76f3957f067d0bf1572d1a7b8ea2da6ffeb0eff8a4b2a1d80215f5169dce3c701fcc40dece34bd3e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "b97db2d48eb98be9228358a0a068ea93d21ce4a5f6d138d079461c0a7f93d3a726d141adb43f41a56e658f629366eebb7ed4a0a1594a9d265ef121faabb14d52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "acd10d50291fd833a574d049d99a567383dbb4483ecc45583dd977c3c67fabb9d450c802b8e2eb3d4eabc719f68f0db4e2a102bd716a4bf50aa02724da382f58"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a07fb8c7ee065b0b7a4a3fa33e8dad026b65e42920398e6fdbf186985e46c6c55b72ecff087aace1559df286b7832a6de8215b713274234242531d7807d90180"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "37d17e905e92aa51d82f13e33415738cf8a5952617bec6a6e095147efca81b7196f997b47167abdd7a8d041c3308307c587a29ca3ec9f2e65e71d15b68b8bbda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "85ec647821f82cc3ad99142e8e4425a00b6e0b273f137cdbff10c4e91afbdf4eb9feb7d4a2c9f80191cec918180aab0a84f96b7de1efda1fe0cdf9e1c44446eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "8819b00e2fdc06fb17873c769f7c8461fa131bcb12f0fd191a08a3a6526571fe40caa7cd8f7ef8e0d8722bae84699a479105cf518897c76aee674ea8a2dddc2f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "70f7cdc912a6d1c5360b58ce522386ed9562aee8dffbf4a1f653871114359880df3f98629a2d4fe5556a1ba89fc5ec90a2c3da2d56ccf419f3956dfad157a3f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9b60f41e9fd92c1d22dbfa1d287081d9514e081940dd9cbe1c9b4467926d83cec9ff43caf854710ec59d805293a83ea5defab887be5a93c8eedfa959b74ba783"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "80372feb8348b48627a93c5f2a5486933fe731a3fdfa2da6d71a7c75b35f585cd5b2cfa0760bb17de8fb98be1ef3dd90339a635ce25749bd27d147b316847084"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "445b104cd539f088a5cecbad4a1a861096542d1a4f2c95696ec51d43d08f10fc71513cceb5a68fa179fd988abaedb20829742f108f529face6e8e442576abb54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "0788d7f599c3f46dfe485ed1ded013a7d87db6aec63193887f5e6b8c3636e0b117f4b854c5b0f60ee8b9683e6d46390f365a19e499fabc2a78ac29380dd26b35"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ced012e0d447aae654edde3b26422f895440d8aa0822f3a14450142f6d97c20e74d1ec068bf2cde4a81270a77ef01a23646532e55ada6dc41603b013945986cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "d27ad4e240ee032cf16ecdc5588d3bdfcc81d338ef357c96194bc33d5d0d571c3826d298215b9cf058dec1cdb86d2bb41d5739ee4f49292bcc290ea4d50d2ca7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "e80d1df4ea210d5a3731803026c3fca5143ade3e7f994a7a7bd673a6ba8b7df8eff9784e9bfe6d3360caf5c50609835ffaab631ecb5aafe71dde8adafa91db04"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "75f10944c6ab83ca1ca49d2bc05e8923830b1fa236620ceba9cbe2f874713cd49a6f0ea4968ce3ad08a5196746dbe3c48a3b51eb0f6d8d310715c6636d17d1f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "35df8ad315c60342119605cbad7fc1614002750ba6745d35d25653eaad6eedd7b039271b2900f712ec5a1c03425a902f5009e76b8c42bb074d5f64d6f6ea7477"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8c31aa2df6cf1e1006691152e74aaf4b580a3b15d141444eab1cd4f3adc1066e7ac9c8196c8cd87902d590cf605bdf449d71fcb34b132a9221b101e0c16efe8d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "ff6d5a5bc127841a1e92eb6bc22d157a57d7f48e4bc95b68907fee50683b20a0dcfd9e5a567f013a6c72311b9441231e986c7659fa60b894ea34d265786a857e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8e7a794a3dde3b9fbe82c367d44134979cc45ad115fbc82bc8b9c8c438a857abe2e4962f50fa69ac7c22772ba3eb21c464bb800bef9eee9f2b33636f43261d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "c653182b26d643d32e0983cf546fe8f0e5a96b7f174c52e8a9025fc56f17ce6ae12b1362abe9b408cb9970b15fcacad1747b41be86bd2475a3e3c45665f88355"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4e4ab25fc8048b4bd9129a554b465ced3ff773d9a7eed9715c71ab92852573712c58667971a1dec556917603c493872577b003168821350ceaa3dc3dd9e2211c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "a8a9dad2f7563b686012a002b8fedac3b0a68f73986db717b901e832c57d1e4b2304b47aabcc17f5e453de3467caf8aabf9635e6db7772ef340fa38fed29eb0d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "2e2f936448e58f8b3b46119e06b2ab5f1c181536939127de0a76931ac992f28ea307227d5c61aa8b440907aefaeb95cdf81f9d0184c78234f82f6d965c045c98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "14d5960a06fb7135bbe78ea7123a7c151c4494898ad6ea1a5386f0532f0a5ec35ef58e3fcb82381afdf47ca1c0e6954d0903232d1ee06d9c2a606e706d22e82e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "04f2f408835a9bdddd4a4c256d9a0040171760f5bce1b7d5e9c3a4ce2c74682c4016ee93f8da193280c7fd3d47ef839d67e0c480d5abd8c2235e61b9c039453d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "631c9305f259aab364c71550ad14a0cfc6edc24a43eac08345e4331cfd4192faf710f077f5b2a5fad169b15098725c996587b96261dc18b96bc18f2a63c62e34"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "b8605cc6851440a615cb8a29d6baadb90fc783270253c25992299b1ced630094c891d41a49a9802e47aa2f9e1656875825dabb31450d7765658e5fd4f3815b10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c17946e4d664eefbeed3a3e3430b4c5b9ffcb69628344568b354092fb72142e7da107b1a88d1af89caa7ae63a0cb76814662fdffc9e179213df4e10a3290596b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ecab80a09b8c2eb75f38c14c169ee88f78266973d21da9295d5cdbeb329a43e3978feca7bada4ee049b24cb914dcd2a4ebaa95f42ed6966cf614c55a229862a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5931bc9ddb86a39fd0edda4cbedfa6838549201efb882eb9a3c25ea88031fe4aed971ef327d6c356c99a0610a19e99a6ec49e755888b00882c6039f2c0e4cfc5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "57895b4d8a0319d25288661b145d0aa59afbbd36edd8fbdf777d95f48fffa53d3dea546f465ce2070b801bcf751b03182711e5f74ca01f72258427fd37b2f038"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "67d96d069f43312a4c5870c2a9715e9aa5e7592b12302a773c8d6fd9f9979e63a5053d54f326d66374f216d1e69203fafef436be6b015269513f8f4a289aa796"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "f7b1ddace365492563a3eb985067e0c19270725a8db571b626000593b7e89130345b61199d50d41daadd499ecc6858fcb46115dac455cc62ed21460b916eaf41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "7ac9fbd7b3175d82e73fe176481c3611eaf313fd006cf1191b79860f215af8847af88299fcf673d9e9a52db4a68a4ea4e95b632729c7b221f38e35926d60bc93"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "05a83591aaf1d5fc15b9a0445e2d5a20798329b3842992ccd82d22e4c788bbd34cdb46b09b48cf044369742f2b6244857e7d00b68160d094fe01465b746e0493"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "ec3cc0ae6d3765e9942436fadcb6208672a745df670a9e5881d243812b86023e8181f5b1b6d3ad3a2dbf8b93e80e3c8b2eee4622b511566b3ca7902b454d698c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ab9a5d17a70bd8685370898ad86ca867bb9a919169ef4c8ee6dae07836f4dfa58d3dead4565462b6f12d3c39c16b50ef99919f850928de0527c55563edac66ed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e3d216ee3ab627f7f86ef192f63a63f1e20bbc22df4947f53e3d9f8902e3871b7fb797eb409f0cf966be4da5b1ae05461c0b0dab7788a6c87069f940e1cc5498"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "4df9b93ba7bb70fa0c7c3c4e9a88cbfd8197c6bf628d2107a2a57105307a50cb08d8fc114e456b125164668c6f48aef1f0e4b71b52eb045e6b8be792e8b8e38b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "51ed80166e1224db790dbdffc60d0eda618eaf67f473fb60ff0bb6a6f15d45fa8d44a31c6d4bc747752dac8fc3075371b4798040afaa594b713c331a91633724"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "7db1ec390a2d4f120eff21fbaee7700d106c4fd5c1ee1216bba0c7f896e6708bbc1da4c0f1f3ef1dd6f830ed58256fce36616950df9eae3307d2bffba6c3147f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "7f1295dbb8c66e22dd818e9fcc910957328dee42ffed8ad3f987b1959bf6f1c01f8f94657dcf0c2593ff747308c6fccf14fa3716fb4b189fb03b77332300823a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "81b1d6cd6e5666307ea592992084f7289a5eed5a732070fd65532722f6a345cb78de868e15f3e74dc15d97cfb57f346b7e36559c5f40769391f6616c897b218c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "752a9aaafe23559f2cb15e6652012803eeca5e3b584dd5515fc496d62671090272b7154f1e5f701a2cc6f848b5d2a1050966c1b9cccfab7cd16fe88d66a101c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "44b6ea23bd56ad74892f00f1abd3aaf1d0e8d748814b509f791dc0ac4d303c61cb3f5d9988c07028e9dfe88ef8130fb300c131b96fa1f1b5fb4693c8a2dc0c4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "94a7da589c758fc5766ade665f15af4704aae4e0729fe0a92235804c42a280bdedc3b0d2d23f153243765fb803d05023c1f4900367fcbf1b60ec5a9449f99226"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "e1674665330ce86c9ce6379e81f71ce7e1dd58f1dcf7ce4141a681e1135262565021c0885e884065b5f3637884ef25f7611c7ababa614e0f3e561051925fb168"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "74da3a781ceb5937e42f3aa8b6f2aa3481d439e67ab16e1745a9248efe96129c6962583276e06e417b7930ac65d4681f6362eef4cb916a5943f50b7ef98aa4a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "052c729f9a90bb02e60dc5d0639fb9639669aba511fbfb5cb727500892e58519f3b6231144741a163622a5bcbe855d38b530780350c5caf33d43d297769b0aa0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b0c436603ed7ab7004e84f2e0654f04c5e5f3fb7866faa7548e675e8246adb2a60528d476292be99206a3e1b6342ced48d80031c8caba11f01a1534ae17901fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "c591789133b5c73026d1f5131581f91c21d8c6ea402dfcfb80ff1dd5e07f7985274ef8682fc7a576421b05721df9533a14bb34ba95193178e62b6e195fae0ae6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "762eec0143e00d41d909f865dfef006a460a5b046b75f1132b63d76dff6380d40284a04b07415785f0bbadc457cf66f3aed1bf47e34cf5d5909fb6f8fddf58ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "b7eacd7854170626e9135d2bd5360b9d2073afc64ecc9f963de8b03ea550a0f6d2c4bae48268d2f9d0c09e7747dcbf8d06eaff4951cbf5953c237a8461b163df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "78968866d80798b3360d3860db039b4f5ab4d62618be681188799efa675ed83b84b4b266dee84ff26d27afdbb8a08f3a3bf73f3bc85289473e7e7836e4a92cab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "9922d61aca30e0b95209010be736dd144c3c65986c08852798997cf3cf8e4969f815565bcdf1f0d82a81bbaecf3f4cf478cda66a2cd757f36043717ddce3385d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "de99e6e07ea084406927551ccbb549bfe583e21e16873707124d897c38dc04b183476eb620f5d457e19375df51a19d3b57bc3afe344efa07d7832ac973ea30eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "cbd0e1e659c0568ee66004664cb5277b1df291747fa22d5dd2b0c68edc59ee9efd3bdb14c6ad60509dc613e80e955314c50b589a5aa9ab52dcfb7efeb8a0772b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "e4a653eec075b975f3a3d6f73874909f61a82bfded01935ea152d56b7249e726099ae873a347adff4d6fa82f73a267415711483a56845980d199fbebe57a9c23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "c6705fbd66a251d3427da98d1efa67d7a3f8683f166b7daab8902480c009b4ab183ff1d4f2242628ce3c11a828b74c605d5c17322234cb7972930174a070bd41"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "cf5df1e60d2ee8387c173e5ea73699b29ba80251d2497b4e3cb25cfb37fe2bf8967f8d39be091ae5adea2d30cb8c911124bd4272c92e9d0ee811f36d13c62efe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "d6c91653320898857096b209f2572454351edd4aa4778e8bc91a6628870ca476f80ed48bd17b651e4dcbdd75013dac2b325cfe4e9aab6e62fbeec16f7013e8c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "0e128e4c2edde6b9090e1278b5da9bfcf6fc6cd57c739fdad86084bc0e64637b6d9ce1fd31b1da53b85f460f26d9a02b7c95bd427de08dc46415e35dfa381b1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "1fcd00eaf90603969e1e57ab486c088d7ca769c67382398caf1d0217134d6a814200f4c64a6ef8a5a58647e3cb0d45cacb6cf2cf64d7139443077905e4ceca72"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "fa223a00223abe964d6515e195dc4bef25a420ffbdc3131d13210ff70c584707757dfd44e53d2a3ca062cbe860ff3df590cf423fad5dff5dfdb1721f321a5b98"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "0314d493a15bd8069a6fcd4c86036e300ca7391f9b881d355065ebc248f9a4242787cfed6f5d13c7de828340c9013a325f011995b9544610aa93ade607334e99"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "835c02a80228fc317d8bc81429fa6331a5381e5ce26b7cf315c30d05e7bf8a29197d4105335bf8b32b0a9e2b65acd8c9c617afee5af3339777a0e23558dd92c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "a63c05959fc74bca79f6760a31ce0be0ab19ebf372a83fcfb5b2e1807e025462f4fd6236f8848bc2f6066048862cdf6b68fa66de0aa3a0b0d7c65ccca097d9d6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "dbf48a762de944e8ffd39d65d4b94f67e4b2d3bf91ed0763e44f32343af0dc1183087421d0c6f737c6826e94fb205772cd6d484bfb45b19755948d602d02ae91"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "a514ee7d9acdb0dcb95a5c02c8d786481b1d66b8d7de2c8c05793a330d711dc5b0136a822dacc6cf81e338a9e3eca93ff9a25fef457739c5767bd01ec10458f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "6bac773ce99d25062f188a01c3006689ff7441af29a80da323e7ebe09c678a426cc3938f0a1a83051bb0efe791e4779a92b6cd09a23c676ee3629ca2d8a43da7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "2738e2e97d52003b4f9b55e8912bceecc86a23c4e1db432db9e9d552e91c33bf0e523a924fc1011e45887b9432af801fab93574d808cfa1dbe77a0ae6056a2cc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "2648c10bddde134ee699c0b26be5520a8a47d2cd0ebe99fa114b2ed7f19ba7fddd0696585732d154db67099795e6aec922d49f9871a24eda571bd6e0c24dea35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "c88648df222958a1c3c9ac71e54f2b248625a6637e46c2f39419ca3c57215f5af8ce16f4662326d24712f4cdf0b5f533e48a4bfd903e5cba66b579384d3bc7c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "b97ba8c5bf7f282a323ad3a4e423e85cb9122b470a94eeca91df3c00c6ab3331e02bf36ad7e87684ae3f73770c213ba19ae7179117228ac7808ad2fbe5d99145"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a5b160f8776b396dd837cc574cb4ae625e58afa0443ae12ccf857d52b5d5e16d21bea6dcfe7a77e52db6c038541f01efc78d4da0de74625992e3d833f84f0b94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "a03eb659b54067721861a89d578b3fca086b02c8013e7e05b724caaa020f301a4015d81e4d9f2dcd69223930c94b4e0e7f12d4e0de4b2fe271bf903b75ba9ca2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "18cb9436347d690aa1c7900f8eeaaccfcdc585c3ffe921cd77860596cb8cde01174d709d03489483b5867fb9d647baa9885673b983037656f020d245f4159da2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "c64e5146ea1bdcd65b46dca33c8ac772d4c82ad49dc01fb4f1e51a56595e68167f7e4c8ecbe0fa3df258eb6f1ad6c2d9d0eb281e5c7b92831a03f7fbf8e2ddd0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "db8c8aaebf6679bd28d615e1e2304285ed0848906f93425a255171f48d6c75aa40fb2d88f71cf85eff3410d199032ff152585e277efe78c69440778705ef3b26"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "8c27b06059b07d2c915fa11ec7d57c7519093a9480dac97cd6c4a024777a79d64687cd3d0c48d0c723aa10ee533164c4f67be9ad6d1379bffac98755a4a3a980"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "47cbf1f054fa5820ce1f8f769ce90ac26758f99ad300069e3a6c029e01115c3b12b08c812ebe1309667c17c1640d6cb2e7174fc6e050db8f013003436b7845aa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "94ffb85f667d4a39c0de3d4b0853e72e9ad2d60822e7224110aefb187aea5ece6c0be0e82ec4d4f686c6ad710b73c54c70cae10282ec0b48ca6623d3d7558444"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "8c5f82a831e31c42629f5e6c6406d5a1ecee37506b89cad845abb110b0f2b5a809ce3e81e8a70915f993fa96891fca4a5e36ff778bd45d23d2671ab55da9f874"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "2523492cbcd990a0204dca79f393b7e034d1337e9ff81398de78575d2a98c806680cc363f7339514d9f57308bfe4cd863c8710f6bb6373487b584aa1e8de4077"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "77080af629015197663e1e3de1feb76da0ccba3ce1341cf7592ef8d6d0b477f1349d944762d1e810d1cc3c8a0eb23bf44f73e7c00d07d1e9c2a0bc2e2c1692eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "3c4f972e53540ba28be94bdc1e0b67b6c744a20f0ce2c6bfa7a1a92ab20ba806a73f39c5c0afb0e83ed5c822dfb42ea7c0c2806b91cd889070e148de8e5d47a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "d082549257e17392f75485548b1ed8062e155687c3d2f0a3287ec5139e6ad1db9cb4a8a449ed2ce18650e07719b03a3dbe1ac25589102c322727767a6d663dd9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "8b268c1d9e35a91e2a71623404fead75966d39d893944c311ceb572e02673a06c61ef0e08b9c0ba246e6fcd23772e94e7531be535b69c27840478ee1ce3cbe6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "0b58e025fc3490c6b94df2f60c722edf909bccec3264bb9f618e54391cfbee8800a6ae1a2c625f68b975daae73596464bb53ffebbedd545bd4a79e77c1d9ca33"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "c2fb608c2c71412f192b1b910ffc7b270fb8d02b52c76af26fafe362c0cdb282086e902fe1e9eb3bc9d2d022e474816c45092480d199fe3b039083f0de94a3e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "4f0633677c15ce3b9a4d3bade50c5d4e18c76b898cf82a6169213674220d4b82132912947aefdc2ff90e6e639224d76f3508242d664d051475366efeb4adf84d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "d7d7ec0004bf4712082c57f30e069cbcde9c70cd10d412979228f18fe2056cbab9c741cfda76c8cf5ffaa3086320dd4fede0e140fcc88fe200944e2f407f7606"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "089054405ee749b30895a8c6cd83a630399ef9cc493dd4f50d0654241ab35ee63c989ce03996f0921820ae701e90bd7af7b6a0058ecba25aa5272ba151da9f02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2fc754b1d951b4d008d9d7a0cfd2555e394e09f8a28adf00334fa780532d8694a78c19831500fda3aa1e85bbc649b7156400d659de45ac4d4ecc3dac3c642124"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4c4ec11a0642efe15b82991e8e3d614a239dab86866773b2ad966c45d928a0b6cba73c65bddbd0233cce0bcec7489ee2899115a8e38f02db1490a5a9814a5c30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "6dcc54ba099ea5c6845b109eb98cee58dff6bf2dbf442723a3369bd673d43ffa01c7656011d6280f5588e4ee49e8214de327ac3d7fd92ea0cf10fc9a00a3ccd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "7c53368377d6b4258ba5a64fe16af394b514abcf516d04551c7fb22ff09ccd4fa37b0e16a21af179329f78c8970179b4d66b2882ede54960e9a7524403f7e7ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "d3c8f949401e6b9ade7e620e0c0f9324d1440a313521d385d7ed038d16628c70762a90a46c45eb74c6880ff35c3ac856e3a083317c016ece2d4bc8e740fd6aec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f774c2c8803789dfd335dd6bdcab442eaffb2b7bdc1a3a59509060af8e1baf57e56bbca17224038fbadef1168ae20063cae8e6f98912ee35f031870ab65155b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "802e89998c068af3712daebe727d7e865446189b436823175dceb325ea4c3aad8a0b4786961cd28013fa892d9b94d3bafd967bc8d3ebb40bd7d97a76a7c5bcef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "103dc2a263d1eeb0bea61e3ddff6d16e399501c59a61045b5821654af7804bac571ce6fceb1e6616da44384d910005cacf44e515028e5da8ad58f1804298c0be"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "0204acc897416b13938127b4fcf57eae2abd50f4cead0124f3422efd4e9122c8d3861be6fc5da0d996260205b938e36cbd064d4f2fde48b1e6afcb2dc3f92f1e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "dc3f7f830ede78340d323f5062edc564fec3bca2eee32bd88d729227e8b7cda4739e56dca54fd7d8a7856778843012b3c52acf4d773ab53249ea8c186896b7ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1a35ab3546f2358d8c3dcfe85528bb42142fa44a565b0d6dedbbff95d230e25ee5627753de50d7868617de5086e8ff0d668626b17cf8f47c320865e1c5a4a3f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "ae16ef4d94c2b75bf57f425aa670ab71525655a1a092d7151a513c783c7b4967f5b7e0726e4aad676615165d84551f8ec59b7cc8ad18570834e9abb1089fca6a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "9f389f9e5bbc30be888942f62dc35360d01d195cba416066321c5f2153f9aa8c7d02f52452ecf1f5d0d290c246066b9fb19f93141ffa0dbced4624495ac3c515"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "cebede3a4d5750f5b7160dfb8609faf7c73892689da08c7b93b87b6cf159184e04016b3ae92a49bfb8d40c50ac45a8806ac45c30b436a466875cedf4a0270994"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "b58dc439dc2186bb23e5e401db162717fa0adb90517660516cda553f00100120da2db07e5de8aefea2159537408217825efe1e8d843b75175848f1cfc88f6151"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "3a263de75799e50ec08961b0f25c3e5366129aff7e466f9dcd8820f1f455cf1ec959ac9a4388ae8edd92f3f5a1647068cd699b809f1e4de9ea9f3dd25b4a4e4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "1d466f5c2c2f557fee8b9997fb9f17bedcdc3287a3cf972cb963e47cbf6cd3a440296ffe60d93a45394f83603445a31338f055835f965a09fe4f32839b628ada"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "70f2d3009b715e27b350bcedd6503a311db8a2c6c75fa29eacdf13a8ea7fcc674680f59dfd18bc2b0440dd528d8e63bd885ee5ff3dfc88361efd3fb137ff3903"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "c9c51ca82cfc0062576a230a0f78900a62a188724f7eecd3786e78e37c4ba410dcef2953cbb5ffb4eb4c9f750bfc70ea0aeafdd75378b51bdaa825521db0f862"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "8cfcd9b768bb83978697db322ead6afe39b6dfee7c05b1b4291f2acc9f84e450c79f419b3a158e3e9757c36d739ecb4325ac51d129015309999b5b0cf8f53df0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "cda51c8a34b72ee822542da864f9de3d43a7448d5db77ca775eb7cdbbbc99c432918bd397f53a284cc30257793f1cf50d80de4621e53af99f61b2e6542a27751"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "470b4d9545479ed1f97059d4af318c7f38aca6bd80754c0e56c78912164244b4ebcb9aa697a653d608bd26919f76fe0a12dcd02423315570d91aa4b822ef2e76"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "dbe302146776542e63f0b98149ad72f514195f7c3f7589a14d9bd96b36d60710bfb2df8a8a931122e58ff75909832a6d26366b171bcb2c78c08c17073726d8fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "725c8f4e6ee92877635993bdc83b5d6098531274239e74399cf94c156dd0193b900564a6a1c99b2b57c896f43b9769ccac1d6f280f5338e407a07a740ee4ed2e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7e5c390195258b50f5e9a43def66550b11c1f410b21e69e141bc5903ff0cd6b9329a5927249078d64de31edfc8f711f6616f8d9e2432e5e1a03d4472ead43bc6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "8ce26856aafb9b496b703c5446a9aced0edafd21c321496021da83efb57514c38ec4065e0f3bbc79342eaab524a4592fe7d5757867bc7af778717857d1701b45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "152c5c7721c373a1d618adb8b89e47365a5e45d621c1dde7070c57ba34091a31c712920d465dbfe3b4fa4c92547249ea4cd296b1524e774d151d512b8931ccbb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3b5a92eb7c1871551b16a4374713df0db4d9af2d288e4a1b4851ad805076c7f4359d164ea1079ea6a48dd42f6496bab748037c7fa2f3be338823279552726f87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "cad55002d699a0791496f4b839899d1c3ed312765e62f4c02fd9886b349f7b2bc9a531003c97be3ff75838d011cef2b82b7ff3a2d41f84a2189d098a8557577e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "807180c0e71c13ed5e9081c135b9de19b0f9ce60998b43d6c22364a6f07d9b8e835993e5a12d8c81f3090d48e53bdf84d43f0a1c5829e0e88b273e4e1eb92f1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6e6e2efa9b4a5b9ddb745a2a037ac83838a6038f4f97a4784cdc9421cf8b673b51d1c814ab0b5e6114b27bb19ac3b32a42f15e9b0db052025246de53268b40b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "a7e2fa69e0a9eddb019874c450a9874c9b302084872c536f04012990898e7a9fabe0eeaa1052a1888dc21bff54bb0872c3bce9c4df6c0026caaf93e1ee8fa533"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "da861b0bbfabc6dfaf46f9b45038794da940023d0428b97957f220f8287d081972e2e97383c7e3d31e4af53ad769ef23490f451929c9ab2bb58f3eddd1f02c5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "9d61356a39ca08c751668969268fd219ee35428d9353f2cb8862d9552403dbe8c05ef961e0694eadaa82de9207e90fe5b349dc27a4d50981c6eb83f59617af85"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "54c1e3c396859376c7d95808f39b564380a875abda74ca7eed9ee96947f4afff3088b30d6b7c70de830bca81a8abca9c0379733130be4617e6e44218a96ea3e7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "d72a791e014c7c5a6f6304f35c74f572de4ab68f514598fe076d6218b152bd12f2a764262888faeac397f802849920adfe5e97a3b7d4331e43e4ce2de75aa31f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "38981f59e6499e1f0d7cfb88a0a62ea0b3874a5b956442da0c9a2852a8c35e6885ba467084c74b482b1bec80513c37835a9dbc5372898ec4500f4de9afb5a71b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "c44d87a70e45d31412f38d0ba0a25a1b58d661d91c7a9b6deae19ec40c88da4a480933ba257cb83fea4120d31c3f959ce9c5ad0da4c10247b5fa2c68fdee6aca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "fcc6c0432e61b90c7cf8983846d89fcd89c7b9a87eae2c6421194a8c26a4210e2dd7ec87be25e3ee291163fc70ea7703f26adc73137d4adc7ec09b09c152b071"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "a782a9bc8a2008a37feb74b4acbbb679eb406fa04745d38196f16304275727cf2215e301f3f25df443430684dffe800534e6f7bd7d35effb2f051895b8426825"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "eb59334967705f215d5ab445e829ed1d1c53859589b08610d349cf2bdf28a36bc1ebb1bb18afcb8279790ebcbc6dab032bbc0389020959709d46e3e23eae08c2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "e0cbf0607d45cf2f079ca2d138d26866bc2d0a65be9e64514417f77ecb89a0228ae228b876af56fce712d9e47aaa41f93c3c908ded27e2a8a1224b2100919f92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "1202568d873164c3bd104ccccdde7e201a7e15b88aed1ea6f1fc76099df98fb074a99f3f3fddcbd46992c603a7009ce6dc769641737cac82755c0d2e5c410a38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "9d05eff13dfecee6f488d7748c3d109ae6d441760a5fe385011fe1a9d7cea2e4c1a8e3fad8fa8216a45af2d8f99ec8467d588f8fae410eb52f71d408dbbd03b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "a35c3679d390ee6bc1ace19a07dd3e96b4bac7147d698ebec42f1fb800c9f9f259c194140ff821a8fd84c0ba8171c5aea01257987b051a07a705c82b60ac1f34"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fe1a5472ce390b5f6825a40176e3e3e13d79931cf44447da06bf08fa8c483368f95877b848302e7e9cb0c4a8b7e13db03fb7bf895c78b8b5ac6e707dc2ac5979"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "f3ee08747a0b209681d53fcb82b139bc75797f0c7b60bf35e55c2b702213fc99e99133d9be0df74a4b925d706583f545bd33d99b96ad5eba2e7d7308c4bec318"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "a2d170a74de204d24a883cb0be93f9c55eaec4d8872a85e59be3005df7b6f78f02d95bcc0cf24e9b9ee6f6b9e301acec7e692d259b98718b4088b84c56ae0347"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "22ae95d23ac80add17200e042e03830cd1e9e709d34e5906217abacdd626533e1e1c359e1312b2dcf44d0dc184e0d9c523dc870c04a759c7c8d7f42abc05391b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "dede1498aae89a5cf2e78ce927efd801d058fa0a7cfcda6d2aca816b913206e39b78581f48100b2ecde4d9408be30f221e66cdb7d1d1b4e9a86d5a8beed372b5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "552c6398313ac5e8d49373ac8959b3e39281a067ecceceef8d3d26c53ec276a8fcde181dc96072cd82aac8e952f81a821f87349a58a9f43c4ee41410bfc955c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "2d3b69d793ae4483dd73bd205f6692f86254735a885609033994e697b6df0b843612a10df0c227af280b94d1435555b3caebaa7ce0d229e3960f1d219d1ba180"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "760b31298a9f7ee58035089581742e3a855aeffa4ba7a2b34d927e52834a684329f8849201f348395f3224e60aed6540cdb76ca3c5a8fcb0d34c343317423917"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "be01e48d71ffcfd99973e1d34d3c8779cd79c13a16f325f9e760ca282d7ccf1582e3ee33eecec2f4146ad4001ecf9d8c91a6dd433918c4993e5920fd743ad50f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "98bda73d7c1cbcccd64b186747e5cbd9a798704c731bf76f05710be945be08a0f6538d1cbf9a839d939371e57428a3be66feabf06cc6166aba27541599748dcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "45c337a8c734778f20ed5199911c24b92dcd24d27d4213b9932be675b215fcca39953e914c0ad4ffd35b4401f8debc89cd0d28e5c3b980c94e9f6d1d59f8b105"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "f28cc5822333bd4497a7d5f5e494e551baba9b7c73f7eb303bc7fc3b907333ebf759ad7e05c0e1b85eec178795ecad4803d0dd872470ac6a55ec4f3856e6596e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "62e5bc1312904866c09a82ac1a237e0c6b58ddb43f5ba154162ba5d4f51b0df5c54b92f4d6cb0be76f6d5aa5308ad2cca079bdfdcf1893d03f470898d4524015"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "fa7c0cee7be57b9dbc48785a9320597d03a68508578be7dc0e0d465d30c0d6fc54f330b2f65bf21be0c99c9355daf93f53a7a3b0dc25eda2dd109ef7fd04368e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "14d190cd8b483af4d9d7c97441e9fb198c1f675e4cc8878e692d940366ad83a48a279957270a4022ca056e0bc28b0c8de625bc81025bef4db1d5e39942376747"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "d62906737f20a0e886800f883fb671ac798b3cfa04303d364ce513040be3decac3da828578c8fb971908e14cfe07b82021d33f9c24216dc2869524fa2923955b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; sha512 = "417ae8fca27325c1a1f20b3ee88845db8f03350287869986c6665bd64970bb3f828ebbb516d36c5b9048d848c65f767c539198ee5aa29047cf145851b3a1148c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; sha512 = "c4d445c52a0579bb6e38e1919a47e7cb26667a1e9b7c54a3d581d56cb55e810fc44cfaba17a89e65aff214d1ad22bb43141a2a776f86a9e068ccc0743c9dc202"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; sha512 = "64b677faaf6550dedc968116a86342facc92d7b2aaff8e2f47256a9151bb834e79fc08597808f37541b303eda283d9b8138972547db614a07ab87ea339f44df7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; sha512 = "51971dab1d818c0360e351738f96083ebfc493397eb48e39ea2ff129c155bbabe50b591180f32ff6464c66fecaa8fd8b872e206846450ae8e6c76da21c538f8e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "3674f209fd4b80daf47319a5ae6014490a9cfc3a64c548d84439dfdb14a3f2053c94cc5e47285924e21409fbaae03cd1f2fbcec02bf5fadf1567379d172cae2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "a7621c7f77f3315bbfac9c3587f05f726a65ba8711071f4f48bdb0e7cfa866f08f7c8bdc71b02a35ef47ed6572d899ad8c5a81977361c9e3845c4ccb84fe4f89"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "e9358288bd40d66ed2f27676cf92974e1c54f098f8a7978bc8d914a5e045bf94c68efa25674e42f4d976dfbdc1ad23b44d1174f0310e798f1cb1c7c8c1b93349"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "f5748497701c5c66fcf9fd508664c6846eda0c353782a259c58ddb0852f49dee6bf1b067ea87be53047d31debcc3cd242692bfc831a8b30b6aa01303d9b0a243"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e8f8331ff3d638955d087d2b75ffe7fa04426b6f72a35e1b0e194c92948793fc25e25ae927f03f119dac01a6cbd30f944f5022c32ff933b15a8dbe67245f310c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "bc82153cc0a490be1c0e8197c3bb5d69bfb3799cabf4ef55650ea9164ce68c94e846b129fe8988c5cfc9699141b6313add4caff4bba2dff48dc17af2e173cedc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "58437f794e59333093bbd5a4d673d1a3149ca3468ef9a31bb0fdb4c40773faa6ed688b7636191223021e9bc7bfc09726dc45ad627e4f731f19ee78cd782ecc08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "e3528d611eaab0313edd3def0753ddad32a624136c32ea181807b0efd63f5205002a689d5b9ebadc4dfca8059dc4ecb236709b9c64d4743989c9a590a326698b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "80c30dc8064a0a075613c6720b976379b3a9fc4ca05db2c727a4bf1e4abbd4f6f44b45eba42bc3633c164cc3c15ef756b85d638d3ab857bd0e6d21d9e6f640fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "22daba4493e91d7ee15e7f9a0849f73dcde985ad909d3a8502b30a6e350cf04dc98fe2728068d2f3d8b7b5106d57caaaadb2fae70d49d50d893854b99a926485"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "fd4ce4207ea3eebda966881ab9f113688122322d16a2c9a205b17d7c73ae0de4fd5a48789e01c96392ac5c84a59a790269329ddd9686b9cfa64c787a817101bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8dc6e28946a238db81695080f73b3502e0f88bdb2d835c88574f79ab25896162c84b9184a37142c8ca1fe3b28f42d87be9e88b59233dde36287d5b05371824eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "57877344c135ad47073e992a06e5568a4564209f2a79c2b1851d69b2fff6c9c32d96cf3278e1bba4d91fc001765f4d65d6d4b730603ac0a5cc28d2520fac2d60"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "f289cda83f46ae3d2343f66bcd007d99862768ee48220a92e79f2b7941a2b2a56ea000cfa1986283e2fc9ceac749f264f122503f1bf71676888473bac9841d47"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "07a87e16e68b9089c7aa58048ae4b41e15bc267d9810a218c9473f0d1082ac935fa5adb759a9ac43c0bf2a6e79e830c6344943cb7b61b73746911dbd66a7fdaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "34aec0414161df6ab435b7518f1d522c4bce6eff415f3ff103d31e9ae6099ff6b3be03099a0f5a21754daebdfff852193e2bb93ee52d622d26644aea94d72aee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "8e4a61d4f20c17f1dc2748568d731f8e9f9050741896f98ec761d551a0c9bf0836731ba9049684819d71f6eabae7f2d1e93e0add593661d882d619783fb996ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10696ef0643af2ed0a7681f6679c6eaef375ef1e193b0b0e315d0ff4aeedb373235ec4e8d26fc562887361ce659a85163c276ed1fd4d4563dc945c7281786298"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f2300cfbce84cf49b434f56b262c34e734eb2ed47abd5b318b9ac9197252869c80b77a7e0617a61f8a1d06a7e6c083479833865b5f1a0e3172102c07d8b9d878"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "ac0a334c3beb163351b4fc7eb42ea8363ba9667a52cb14c59f32c404bc362da957f22a44d49f09299c73971a737685d8a93c1fe4eb456489fcab2eab1be1b6b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "e8536f0786bf5a49536f7703ac50fbaf31db932c1c855988c192d495365e677f674f1d84bdd5b5d07ae0b04c6498262a29d11949f4ee172d1ed97c3708e2e0e9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "b7d89ca6b79661098ee64cbf945a7080b76a8557f9a2b33fb18b8166bd9cab9cf4c775e3460bb4637121c6ae2159786e185c33cd8eb819410edf71d8d962ae6b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c3d6c1772f2d53e6e3928d9c680e737a03cba9fb22fcfe051c49afe147502c6b458832c735ecefd29a06a22fd91ec13f98f0590f386c5331d6faefb83afc64a7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "8f44e7510675d691a4735d13169c529414942b8a18c8106dc220b53f4d85f9c1284314279ef5cd1d59543baa60803f117796f2fd2d55ecc01a6b67314b1e23a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "2d42ede2a1232c48068bbde4c9401e495b82ebc356cee2490e8282e7a50e7ebdaf235e5d109a6ad1e30bb4773b81a75dd8d8f338738db499a8bc910a435fcde9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "05ff88244ec7c715e642c62a2f71980e94346624db05b35fe35a605f8c9bf0fb661cd0aad8ffc7a290a3507711053f7d31573d4e7e82482de63db3492197a7b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "3f7d57fd1a64f4c99a573c6c2272999bb9bed78648a1476ae3d1d843ae7407612a750b07b6730c0c326b57e16c87df374049c49f8e9e2fe9ca7d14860af983a3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "26ba18dee36247d64447b7aaed71795e582e86e333e0feb95f1085b26508299044a970fd535bf57f38e0caedd116e10a3eceba05c5f1cf92649553d6ad95d1d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "649a79569ca51e418101d013061bb7ae977d80e0ca4854c03e256e214e4a0c2373caf994fb1d41db6beb4816524e4ba76d434b7a2942b20cd628b42f409792b2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "61a99b54b807e518e62813e76606111737904c20afb73c12e5ae866476f829a177365a4c8c9d36bd5fa2a355f512f556fbc9bbc7d1fdb962535dbd6340907b04"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "68a761c18b24f5ab5ee511f635653d1c3e798239f82a120c2bce73d5f0e706b5b8dad2540ece11361c0652f34b00f767c6be2c700c69a0d0eb08c35bfec29fcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "4640280e8645f2ac9ec96a5b02a2705bcc96f2bd3d25c6456a5d4b0a45100f264afbf618dcd8e5b211b2c8186a2ed8bd0e306d95b118e52bd6548caf5f32d58d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "2d57687e8fbf53cf2bd8b0bc6780dffdfe1284b47fbef20ab9fa591e2eefec00e097bdd24159a28700d47f02273395f32fcabb401d0f5f3e13cce75481b9cd7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0898c9577c92d92e51026948fdd1b201e989ca1b0ef0515f3a22a9ab2fc0932b99d859c90ca0137a8bbd913c2d5f873a77b75fdbf01c330064ed2f854fc58dcb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "afaef3a9d125774454adf37f83447600536db9abd7bf388a2a9e9024ee46f67269f122c39041b5537be23b19af39e8efc27cf142064fdfcb5cd3f404792b1383"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "350c67a48d318bb19cf4885718d336f3242a648b40e0f79096214f4fd6254882ff1af2a50111424a00d2396fd1c481a9ba1125f098794296899cf306269993cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c3a34e85cde018ef1323786e373e8842cb6c590cc8db64441e99d5a092d87ca7cd935dd238b30a2752393515fd5455100e97a98e08b395b4082d09e800e25846"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3d986e9e932156db8db994484f19519dd5dad00e4edd04d5d2510e1aa1c9360e0cb01f9369705861e806796cbe246c1c79882320caf91a59fd400b439bb4db8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "2aa6b07f64b83287aeee048edf436632737da32188ce650ea2e323fa5587457cbceb05356b3917b75bcd1927bb9cf1da89e23fdebc3db2096bd4598ce8cc714d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "87614bfa16f6bc89180775331a52054a597ab54232a92af0062ea47b8a1c348d9f20b5802e2cb74f1619120eed56ed02bdc705e81f5944798ea2261384764d1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "1e774ec46f28bc561bc5dbc9af3c0c5a198485f5da7a7fc7d5d1ef920b54227ddc9b0168b7cce30cc30cd606513aaec317369335deb945bcf94fb49bf29367dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "24239e55efc9ec3979a0ae64cc977ebf853817b358c39266099bf892fc6cff7bc4e3adbc927684a95b4abb9ffd08877c5f25b2e579884ca93e0dad8a717a79d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "3d449880c97442f60aee98be29abd097330b95acd9f121a57744d5694f5471afffc337239b2d3e527b2dc709daf0607b73ba664ddd466eab6236f3d842ee93f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "90c0cdc6d9fae3620770455b80db01920685abe7514b2b112af32ee7554d0896e4877f2f9ad38f827ad8cea9fc8f9f0c6b97c049d7e98cdf20612a50018bbcc8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "42d9d4e4f2fe48e1c7db8395eb22737bd42b7a771bf8bb0f69b210fc4a2fafed421e22f498d68d1ab3e1661a3e828c1e21e096d655f47d6c6216c6c8bf4a38e8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "8456ce7fe9ec9ae2c8e4ee74ceaa75417d33559e84277350ae058a109f3b8cb7bcc52e35684bb343f8cd3f020df31c26ff15d4e6bfbe4d89733bbd4cefb307ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4d0132f95f13076df9cc4fc6e6fe6912d16aa3c71fd18a6dc81f4ba9dc53842b7cb4a3fb4da62436fe6d9e4061e90b8c02ec686644020437b7da78ea5ab09479"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5947c45892fcb7f1d0beb429ef12448242631c14e568495d6c3a1e21d01cc44e316ada5c9d9099e8835e2abfd286589622b25eb8730ef2fce9ac18c6b854dd01"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "93eabc3dfdff6089ba9ca7ec7210ebf174fd548d4c5e3076551470a27b0b7f19ab8d4b6813aeaf7206ea8bde863cccc2e34f447e4f09a3b0b0f632dfe5c1bf05"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8b4a24c9eecfc02ef1dd297e98590471ec3a9ee37abc248f06ee69e0b822537765fa1d6dc255c9424e996af27f1cf6f45f50728d2c2be52b8e58ed3e8c1cef7d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "ee064cabe643fce46242fed3292e3067159ce0dc57f08d8af67658f37b7cefe80082609be57e024b939054cda80f7573ca6715bdd4f084bb847e32776267394f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "a8207ba7d7606e93f6f39ca9e05320181353d8bd05f519196a20cbe335aba825edaa1403488c539ae9c622949d6b9c81bf5a711cc1118963e8a66a12e2bc5133"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "3a5c3ac7b1482fac457a5e537d743f14eb99b6d139ed840cc5c1fa4020e7c4950957b9cafc19dda8ec21741b48698a91dbe3dd455c9b002af407eb68a29cc8e6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c3b34c6e958344acb66101712d4ddddf4041e060e45037aed5e35b8006d37bc92d88c9478538a2e3ba0dd14f78ef0027a3a4f569038ba3fd06ce3c2438c48a34"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "00782a5b28cc04a1fe58309503bb984b29c6842e4ebd9c8e43d8965d9041b3a676208134307d3b8f04637458e052dce8c3d5fcb593d48ef93a71fe3bccffb684"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "27ea36701359e9baf447434d34cd4e4615f4e4d1d1a82cf93e79390320b0f76ced36784d66fda6354fe5bd5eed8bb6c74306c922880b8d42097abbb34bb0b6f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b32b88641024c0f263bf8e190ab0bd8e3d2d6091aa38733971cb8f00ad1c776859d5b037ef6f2b6d220f93629b39c8730f99bba654bc3791e767b3f7182ca758"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "06b188b1dd9113a51d2cd369721919ff6132cceb108304b485c9d42898cc7b20d821ac201102af4652f157ea56cd7e17b5bd09ec645243df7ef8e2030b003d2a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "08a713dda121e0df1131dfb50c5196c2b2e4ca58823a56453c23955d94f53b877f737c5f5d805f1203a4c9361f25d0f8e8327cfbefe9fdc32d2ddd5dda359e14"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b1d35953186b4fe3a1a823cec5a399f81ffcbbb2379e488805de10751614300994e4ae6f5e68396d2d45b72ba2cde0874690a8c7d47ab224d1e653a3ff380294"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b8986fe3919db0386ed411c1269aba0f38fa6c01a36b24544e91e382e3f22a72b5cccebcbd59e21a1573910b9f4b838cd482e588a92153b3932835bbb87b8061"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "a98aa3c2ef28ece7ef2866af5f0044f195ddf56152131d608320dc211f5eb4d5f5be0a95e138598e32d4160baf29281219e6bbc38349ca374289144dbfbf94a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4f040903bf00eb129adb0aa431921bd39754815b8a789b9e8118ecd87bd6923ae02faff7791f17e326dfb844745b1b12ecdf8978c814be0964825dbdacad146f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "b2e54cb4ff6421923e20be26db7ef302715a29f49c4c0723191096aad9a910e3f68291d932bee6f5a26fb3f85252a2cb89434dbf8acc2ff19860123bb00ee18b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "b2868ea454d231e87e1389005d5ed7863865e708ac2b99075f08644875323427e4dc92a245be4de90f4d5e3791b352a27e26e3ab2c08e6f3dd8377225af70a00"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "e3682094081d4131e68a9fb4bab81a5430fe4bd8cc1903f24c48e110313d3489e338d58dcd6719a28d5363bb35c734144a695c3e81d1a805a0f20679a52ff645"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "dfa63ee5ba94400175f1252c06bbc1070579a3fc9395f55528cfe6a0a99bc6a654708ffb930efa4153322c76532d201863206b14f07973bf6713c90b297898b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29c9efc3253770b953634e6f2d09cf82245c9b580a43103a28a14adc795ae307644edf3dee65ad4d7248efde6562485750f1d976eebd413f339044774b9660fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "43157bfb4bca885e830035e525ef2642795e9f22e582c486f28a99acf462dcb09142b9e1fc35f014f800e5f30365d6bc76b0c4b7caeebbd9e2e3fb4bfeb780c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "33790606f02644a0b99b43a3e7d9df77dfbea8404d8ea2ad34ab81090fba6fe4553fdce83425e27a5816f8af0725f598efa0cefba755af537f1d0a953eafe8af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "0ce3bcd1bd6c7aa9d363ca869d9f1638f930b5df7a7e22b88b12300dba8cc0ebb9e7e1b61318b49e9452f21f1855dd3e0b38448f4067d2a0683b6aaae39e90ae"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "24ad9eb31144e51e69653c50501ad2c8e8a5c40d13464da3ab8af464cbeda9fc37a47401987f48157603f679ff281728ebb10e686659f1cce8db764a4c0b3216"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "c68aae839b6438ef934953c419d99921378bd81aa08da9653299a3410d2e102ad9890870e99ff9541477a0dcf779d8e80905b6741b8f40faf4fa9b7fa8fcf86c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "1b5263078040636fa3dda434ab9433c96e7ba4d10460174de5d5abc1f05de8faa930ee1fe24dd9f8dc05bc20d6087d7657bef390725d446a4ad292e2cd06ab7a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "c4422a3f38d47cf9caea2ea93f5eb4c402461a76fbd8285f8894bbf3d4ae0bb484be20f0761425ac9139facb1fca12ca4122efef47391b988d4dc4118482d660"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "97ecde3e48e7f3cabe8b80db7c74b34946407831aebecc87fe5913a8622b866914d2a6bcba8166c4d8e85b35eec43eec337a2389a9856d9ca48f4694d61838e3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "5cefa5a67a1d468c017294884b04d3ae412f1f3bce56fb96e72919266ba697b46430460334d3593608d08238921517b9972435bd76fdf012ff3fec51bc64de82"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "e37d07897665c195648c7b96ad47487bbe1671f9aedb06e9e5ca415dfc0484b7a13171b217866af1ab29b2e3376c45bf382e9d9bd804d57030ab401eb083560d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "485a9f5184722c59a4a60a8f02c0c10d4f8fed359083a70701462a311caf652170625f06eabd5baa9f8b5312ca978c48c4da01a4de49c35f52a8c8c6a2d738bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "5c1a87b1a96149f67c3213315c13524cda3d29b47ae078e22c04685de4f961c3a9bfd77a79c48e3ae619cf2bee7f035c725e480337d7e3491d48abab1bff1aaf"; } ]; } From c09e043d531ba693b881598e37621a06d592767a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Dec 2016 14:16:40 +0100 Subject: [PATCH 057/216] calibre: 2.70.0 -> 2.73.0 Fixes #20896. --- pkgs/applications/misc/calibre/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4fcb3a085bd..b98d327d3b8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.70.0"; + version = "2.73.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; + sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; }; patches = [ @@ -46,15 +46,11 @@ stdenv.mkDerivation rec { ''; dontUseQmakeConfigure = true; - # hack around a build problem - preBuild = '' - mkdir -p ../tmp.*/lib - ''; nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ - poppler_utils libpng imagemagick libjpeg + poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with python2Packages; [ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow From 09fac98bf0cadc2ae81d4366b8680645dda450e1 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 4 Dec 2016 15:14:06 +0100 Subject: [PATCH 058/216] blueman: use "with" expression for variable --- pkgs/tools/bluetooth/blueman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 7af5f941b28..1c1085ff814 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ dbus-python pygobject3 pythonPackages.pycairo ]; + pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; propagatedUserEnvPkgs = [ obex_data_server dconf ]; From 605f923e92b7e16ce008b0611bbd34fbc9e5cbfc Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 4 Dec 2016 06:42:42 -0800 Subject: [PATCH 059/216] libxslt: fixed crossDrv, where no python is available --- pkgs/development/libraries/libxslt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index df054319479..ebad3fd3eb1 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs -, pythonSupport ? true, python2 +, python2, pythonSupport ? (! stdenv ? cross) }: assert pythonSupport -> python2 != null; From 63a1edb58fd4d567a0c39dbf66b7014c99d9e14d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 16:16:42 +0100 Subject: [PATCH 060/216] ion3: requires lua 5.1 See e.g., https://hydra.nixos.org/build/44338071/nixlog/1/raw --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c23ad15ae..887a2018e91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13479,7 +13479,7 @@ in inspectrum = callPackage ../applications/misc/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { - lua = lua5; + lua = lua5_1; }; ipe = qt5.callPackage ../applications/graphics/ipe { From 9ccc14b1bc1d7714e908d79f37785c5b80f045dc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Dec 2016 18:18:06 +0200 Subject: [PATCH 061/216] linux_rpi: Add some feature flags Copied from linux_4_4 (except for the EFI stub thing). Otherwise the firewall module fails to evaluate: Failed assertions: - This kernel does not support rpfilter --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 3d046ee8f59..f41c53da5a6 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -16,6 +16,9 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { }; features.iwlwifi = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; extraMeta.hydraPlatforms = []; })) (oldAttrs: { From 659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Dec 2016 00:24:15 +0200 Subject: [PATCH 062/216] coreutils-prefixed: Fix build since the single-binary changes With the symlinked build it's only renaming 'coreutils' to 'gcoreutils' and leaving all the actual command symlinks alone. Instead of custom renaming scripts, let's use --program-prefix from the autotools kitchen sink. This has the nice(?) bonus that the manpages also get prefixed with 'g' now. The build system refuses to enable both single-binary build and --program-prefix - but the symlink-based single-binary build couldn't possibly work either (as it will be looking at "$0" for which command to execute). --- pkgs/tools/misc/coreutils/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e1d9bb921fd..8f09a677b8e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -39,7 +39,8 @@ let configureFlags = optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") - ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"; + ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" + ++ optional withPrefix "--program-prefix=g"; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -89,14 +90,7 @@ let makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # e.g. ls -> gls; grep -> ggrep - postFixup = optionalString withPrefix - '' - ( - cd "$out/bin" - find * -type f -executable -exec mv {} g{} \; - ) - ''; + postFixup = ""; # FIXME: remove on next mass rebuild meta = { homepage = http://www.gnu.org/software/coreutils/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887a2018e91..78a8c9ac657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1286,7 +1286,7 @@ in aclSupport = stdenv.isLinux; }; - coreutils-prefixed = coreutils.override { withPrefix = true; }; + coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; corkscrew = callPackage ../tools/networking/corkscrew { }; From 4c9bebf8c21789d9f29ecae418407087ddb33a11 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 4 Dec 2016 09:46:38 +0100 Subject: [PATCH 063/216] kdevelop: 5.0.2 -> 5.0.3 --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 10 +++++----- pkgs/applications/editors/kdevelop5/kdevplatform.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index cf1d70350ba..19ffb2c4959 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -4,13 +4,13 @@ , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info -, libksysguard, llvmPackages, makeWrapper +, libksysguard, konsole, llvmPackages, makeWrapper }: let pname = "kdevelop"; - version = "5.0.2"; - dirVersion = "5.0.2"; + version = "5.0.3"; + dirVersion = "5.0.3"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666"; + sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform kdevelop-pg-qt shared_mime_info libksysguard + kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped llvmPackages.llvm llvmPackages.clang-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index d8a7e7f2b9e..93c3eac9c34 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -6,8 +6,8 @@ let pname = "kdevplatform"; - version = "5.0.2"; - dirVersion = "5.0.2"; + version = "5.0.3"; + dirVersion = "5.0.3"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec"; + sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; }; nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; From ae0bfae8102196fed738a0140ae14f3a41f836f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 20:21:25 +0100 Subject: [PATCH 064/216] cairomm: fixup url I've got no idea why there are two tarballs with same name but different hash. --- pkgs/development/libraries/cairomm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 47f0668e5c7..b1ee0b8d273 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.cairographics.org/releases/${name}.tar.gz"; - # gnome doesn't have the latest version ATM - #url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + #url = "http://www.cairographics.org/releases/${name}.tar.gz"; + # gnome doesn't have the latest version ATM; beware: same name but different hash + url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; From 0fd5a0c8a3401d89ffd7e651e0d258f24a613ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 21:11:28 +0100 Subject: [PATCH 065/216] lyx: 2.1.5 -> 2.2.2 ... and use Qt5 now! --- pkgs/applications/misc/lyx/default.nix | 26 ++++++++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 58d95d3b3fa..0da6e8eb34a 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,29 +1,35 @@ { fetchurl, stdenv, pkgconfig, python, file, bc -, qt4, hunspell, makeWrapper #, mythes, boost +, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: stdenv.mkDerivation rec { - version = "2.1.5"; + version = "2.2.2"; name = "lyx-${version}"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz"; - sha256 = "1wrcxsvr5kx8cfdabshzmcjrb3rmy5bh74njnzpq9m5xms8parrf"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; + sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58"; }; + # LaTeX is used from $PATH, as people often want to have it with extra pkgs + buildInputs = [ + pkgconfig qtbase qtsvg python file/*for libmagic*/ bc + hunspell makeWrapper # enchant + ]; + + # bogus configure script tests + preConfigure = '' + NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)" + ''; + configureFlags = [ + "--enable-qt5" #"--without-included-boost" /* Boost is a huge dependency from which 1.4 MB of libs would be used. Using internal boost stuff only increases executable by around 0.2 MB. */ #"--without-included-mythes" # such a small library isn't worth a separate package ]; - # LaTeX is used from $PATH, as people often want to have it with extra pkgs - buildInputs = [ - pkgconfig qt4 python file/*for libmagic*/ bc - hunspell makeWrapper # enchant - ]; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a8c9ac657..50200dc3c69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13743,7 +13743,7 @@ in lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = callPackage ../applications/misc/lyx { }; + lyx = qt5.callPackage ../applications/misc/lyx { }; magnetophonDSP = { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; From 2f861e6ba652eb580babd179a632a1413caae061 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 22:07:11 +0100 Subject: [PATCH 066/216] chkrootkit: 0.50 -> 0.51, fix build --- pkgs/tools/security/chkrootkit/default.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 2dad4b3e43a..54aeb32cabd 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,15 +1,25 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "chkrootkit-0.50"; +stdenv.mkDerivation rec { + name = "chkrootkit-0.51"; src = fetchurl { - url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz; - sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m"; + url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; + sha256 = "0y0kbhy8156y8zli0wcqbakb9rprzl1w7jn0kw3xjfgzrgsncqgn"; }; - installPhase = " + # TODO: a lazy work-around for linux build failure ... + makeFlags = [ "STATIC=" ]; + + installPhase = '' mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin - "; + ''; + + meta = with stdenv.lib; { + description = "Locally checks for signs of a rootkit"; + homepage = http://www.chkrootkit.org/; + license = licenses.bsd2; + platforms = with platforms; linux; + }; } From ea412cd5a1b3ca93d86f7a43dcdecb5784155dae Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 4 Dec 2016 22:11:24 +0100 Subject: [PATCH 067/216] lib/generators: add toKeyValue & mkKeyValueLine (#20903) generators for the common use case of simple config files which hold keys and values. Used in the implementation for toINI. --- lib/generators.nix | 29 +++++++++++++++++++++++++---- lib/tests.nix | 16 ++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 27d4142e8d9..2c0cf5775f4 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -17,7 +17,29 @@ in rec { - /* Generates an INI-style config file from an + /* Generate a line of key k and value v, separated by + * character sep. If sep appears in k, it is escaped. + * Helper for synaxes with different separators. + * + * mkKeyValueLine ":" "f:oo" "bar" + * > "f\:oo:bar" + */ + mkKeyValueLine = sep: k: v: + "${libStr.escape [sep] k}${sep}${toString v}"; + + + /* Generate a key-value-style config file from an attrset. + * + * mkKeyValue is the same as in toINI. + */ + toKeyValue = { + mkKeyValue ? mkKeyValueLine "=" + }: attrs: + let mkLine = k: v: mkKeyValue k v + "\n"; + in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); + + + /* Generate an INI-style config file from an * attrset of sections to an attrset of key-value pairs. * * generators.toINI {} { @@ -41,17 +63,16 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}") + mkKeyValue ? mkKeyValueLine "=" }: attrsOfAttrs: let # map function to string for each key val mapAttrsToStringsSep = sep: mapFn: attrs: libStr.concatStringsSep sep (libAttr.mapAttrsToList mapFn attrs); - mkLine = k: v: mkKeyValue k v + "\n"; mkSection = sectName: sectValues: '' [${mkSectionName sectName}] - '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues); + '' + toKeyValue { inherit mkKeyValue; } sectValues; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/lib/tests.nix b/lib/tests.nix index d59814987ed..afbaf11a7f7 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -135,6 +135,22 @@ runTests { # these tests assume attributes are converted to lists # in alphabetical order + testMkKeyValueLine = { + expr = generators.mkKeyValueLine ":" "f:oo" "bar"; + expected = ''f\:oo:bar''; + }; + + testToKeyValue = { + expr = generators.toKeyValue {} { + key = "value"; + "other=key" = "baz"; + }; + expected = '' + key=value + other\=key=baz + ''; + }; + testToINIEmpty = { expr = generators.toINI {} {}; expected = ""; From 9adbe60c81c781c5da1fc8c99d0cdffbb57062e3 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Mon, 5 Dec 2016 00:15:55 +0100 Subject: [PATCH 068/216] sbcl: 1.3.11 -> 1.3.12 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0198dac1c44..8fa4741a4a1 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0hkn760d4dhw1md0zqldbpc94nwp25d73sjdrdmhfqjcz6c2syh7"; + sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0"; }; patchPhase = '' From 55eb7411462bffc81c2c6b5347868057625c10ac Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 01:59:43 +0200 Subject: [PATCH 069/216] xsokoban: Fix build --- pkgs/games/xsokoban/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 502771e18ee..47d05b7e3f6 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -11,16 +11,19 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 xproto libXpm libXt ]; + NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + + hardeningDisable = [ "format" ]; + preConfigure = '' sed -e 's/getline/my_getline/' -i score.c - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm.dev}/include/X11" - for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done + chmod a+rw config.h cat >>config.h < Date: Mon, 5 Dec 2016 02:09:18 +0200 Subject: [PATCH 070/216] snack: Mark broken Besides the hardeningDisable I added, something else is broken. gcc -c -O -fPIC -DUSE_TCL_STUBS -DUSE_TK_STUBS -DOSS -I/nix/store/q2k3anmbnwklaxih3brk9g6mxzjv155z-tcl-8.6.6/include -I/tmp/nix-build-tcl-8.6.6.drv-0/tcl8.6.6/generic -I/tmp/nix-build-tk-8.6.6.drv-0/tk8.6.6/generic -DTCL_81_API -I./../generic -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 ./../generic/jkFormatMP3.c ./../generic/jkFormatMP3.c:34:26: error: expected declaration specifiers or '...' before '(' token #define roundf(x) (floor((x)+(float )0.5f)) ^ --- pkgs/development/libraries/snack/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index c2fdc8036c7..9bae9feb693 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ]; + hardeningDisable = [ "format" ]; + postInstall = "aoeu"; installPhase = '' @@ -27,5 +29,6 @@ stdenv.mkDerivation { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; license = stdenv.lib.licenses.gpl2; + broken = true; }; } From 1e7bb272e14ad362dccce242c261b74d796d5de5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:17:41 +0200 Subject: [PATCH 071/216] U-Boot: Add platforms to legacy U-Boots Or they will be tried to be built on x86_64 since #19990. --- pkgs/misc/uboot/guruplug.nix | 4 ++++ pkgs/misc/uboot/nanonote.nix | 4 ++++ pkgs/misc/uboot/sheevaplug.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index 258ba999bf8..9f24f1da86a 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -50,4 +50,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "armv5tel-linux" ]; + }; } diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index 8b2de80c79b..2783927ef57 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -57,4 +57,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "mipsel-linux" ]; + }; } diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 4d4f61c40a7..53d811d1a44 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -54,4 +54,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "armv5tel-linux" ]; + }; } From f91458ca3848e69d98696998b30f4004f2b18add Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:36:54 +0200 Subject: [PATCH 072/216] reattach-to-user-namespace: Set platforms --- .../darwin/reattach-to-user-namespace/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 60b461a8040..0d5e21485b9 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -2,15 +2,21 @@ stdenv.mkDerivation { name = "reattach-to-user-namespace-2.4"; + src = fetchgit { url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; sha256 = "0hrh95di5dvpynq2yfcrgn93l077h28i6msham00byw68cx0dd3z"; rev = "2765aeab8f337c29e260a912bf4267a2732d8640"; }; + buildFlags = "ARCHES=x86_64"; + installPhase = '' mkdir -p $out/bin cp reattach-to-user-namespace $out/bin/ ''; -} + meta = { + platforms = stdenv.lib.platforms.darwin; + }; +} From 571cf4f2095744011a5a7629a1ee71ea4d40a7ea Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:40:04 +0200 Subject: [PATCH 073/216] uisp: Fix build --- pkgs/development/tools/misc/uisp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 234ff82b50a..6e2498bde64 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -8,9 +8,12 @@ stdenv.mkDerivation { sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; + platforms = stdenv.lib.platforms.linux; }; } From ad489cec10a9edc377fa0ca0651846f1beb7ac2f Mon Sep 17 00:00:00 2001 From: Greg Hale Date: Mon, 5 Dec 2016 01:36:42 +0000 Subject: [PATCH 074/216] Add pandoc dependency to heist to restore working heist tests --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af433eb7382..24299c9418d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -186,6 +186,11 @@ self: super: { })) else super.hakyll; + # Heist's test suite requires system pandoc + heist = overrideCabal super.heist (drv: { + testToolDepends = [pkgs.pandoc]; + }); + # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required # on darwin: https://github.com/NixOS/cabal2nix/issues/146. hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; From 10b16b23273a711792697c213643de3731fb35ef Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 5 Dec 2016 08:48:14 +0100 Subject: [PATCH 075/216] mutt: 1.7.1 -> 1.7.2 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 2bea04ceedb..195cf13e4c2 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -20,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9"; + sha256 = "1yazrl82s9fxmamnlvwmsxhwrxnwv6kwakgfmawda8ndhwb50lqm"; }; patchPhase = optionalString (openssl != null) '' From 8dadb44196a07f6b4ab42b16fdb64f2fcc3fc94c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Oct 2016 13:31:07 +0200 Subject: [PATCH 076/216] pythonPackages: use fixed-point combinator Use a fixed-point combinator for the Python package set to allow easier overriding of its contents. Earlier implementations were proposed in #16784 and #17428. This commit is by comparison much smaller and changes only what is needed. --- pkgs/top-level/all-packages.nix | 7 ------- pkgs/top-level/python-packages.nix | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d24a89ff7..e0b0656a59e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9897,37 +9897,30 @@ in # regardless. python26Packages = callPackage ./python-packages.nix { python = python26; - self = python26Packages; }; python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { python = python27; - self = python27Packages; })); python33Packages = callPackage ./python-packages.nix { python = python33; - self = python33Packages; }; python34Packages = callPackage ./python-packages.nix { python = python34; - self = python34Packages; }; python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python35; - self = python35Packages; }); python36Packages = (callPackage ./python-packages.nix { python = python36; - self = python36Packages; }); pypyPackages = callPackage ./python-packages.nix { python = pypy; - self = pypyPackages; }; ### DEVELOPMENT / R MODULES diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc5972bfbf0..ca2e88da94e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,7 +1,14 @@ -{ pkgs, stdenv, python, self }: +{ pkgs +, stdenv +, python +, overrides ? (self: super: {}) +}: with pkgs.lib; +let + packages = ( self: + let pythonAtLeast = versionAtLeast python.pythonVersion; pythonOlder = versionOlder python.pythonVersion; @@ -31323,4 +31330,7 @@ in { zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; -} + +}); + +in fix' (extends overrides packages) From 31e32b6d9ee2712966e2b09a68d4f783c164ddd3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 09:51:12 +0100 Subject: [PATCH 077/216] Python interpreters: add pkgs attribute A package set is constructed for a specific interpreter. Therefore, we add the possibility to override the package set to the interpreter. This should make it easier to override the interpreter and the package set at the same time. --- .../python/cpython/2.6/default.nix | 11 ++++++-- .../python/cpython/2.7/default.nix | 10 +++++-- .../python/cpython/3.3/default.nix | 10 +++++-- .../python/cpython/3.4/default.nix | 10 +++++-- .../python/cpython/3.5/default.nix | 10 +++++-- .../python/cpython/3.6/default.nix | 10 +++++-- .../interpreters/python/pypy/2.7/default.nix | 12 ++++++-- pkgs/top-level/all-packages.nix | 28 +++++-------------- 8 files changed, 59 insertions(+), 42 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 64f2b80d09f..9a4c2d5b398 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage -, python26Packages }: +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: assert zlibSupport -> zlib != null; @@ -100,13 +102,16 @@ let ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy26 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index a6eeee25be9..4a25382997c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,12 +10,13 @@ , zlib , callPackage , self -, python27Packages , gettext , db , expat , libffi , CF, configd, coreutils +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -180,11 +181,14 @@ in stdenv.mkDerivation { rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = libPrefix; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy2 = true; isPy27 = true; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index b25e2ffd0cb..6a543a8a0ee 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python33Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -102,11 +103,14 @@ in stdenv.mkDerivation { ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 43edce8a44c..623fa5d74f6 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python34Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -111,11 +112,14 @@ in stdenv.mkDerivation { ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index dd2cce707ef..7172e429f23 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python35Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -110,11 +111,14 @@ in stdenv.mkDerivation { rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy35 = true; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index d5960ccde99..f65989f5bb5 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -11,8 +11,9 @@ , zlib , callPackage , self -, python36Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -99,11 +100,14 @@ in stdenv.mkDerivation { ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index bce6d19d58d..1fd9eaee430 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11 -, makeWrapper, callPackage, self, pypyPackages, gdbm, db }: +, makeWrapper, callPackage, self, gdbm, db +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: assert zlibSupport -> zlib != null; @@ -120,14 +123,17 @@ let echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; sitePackages = "site-packages"; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b0656a59e..b3ecfb0d67a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9895,33 +9895,19 @@ in # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works # regardless. - python26Packages = callPackage ./python-packages.nix { - python = python26; - }; + python26Packages = python26.pkgs; - python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { - python = python27; - })); + python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python33Packages = callPackage ./python-packages.nix { - python = python33; - }; + python33Packages = python33.pkgs; - python34Packages = callPackage ./python-packages.nix { - python = python34; - }; + python34Packages = python34.pkgs; - python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix { - python = python35; - }); + python35Packages = recurseIntoAttrs python35.pkgs; - python36Packages = (callPackage ./python-packages.nix { - python = python36; - }); + python36Packages = python36.pkgs; - pypyPackages = callPackage ./python-packages.nix { - python = pypy; - }; + pypyPackages = pypy.pkgs; ### DEVELOPMENT / R MODULES From 3d59b82925da364a509673fdb74ba69aa77d58db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 11:55:25 +0100 Subject: [PATCH 078/216] DOCS: update Python docs to reflect fixed-point combinator --- doc/languages-frameworks/python.md | 85 ++++++++++++++---------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 121e123c8cf..fc0100c5f2d 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -434,6 +434,7 @@ Each interpreter has the following attributes: - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. - `executable`. Name of the interpreter executable, e.g. `python3.4`. +- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Building packages and applications @@ -699,59 +700,55 @@ should also be done when packaging `A`. ### How to override a Python package? -Recursively updating a package can be done with `pkgs.overridePackages` as explained in the Nixpkgs manual. -Python attribute sets are created for each interpreter version. We will therefore override the attribute set for the interpreter version we're interested. -In the following example we change the name of the package `pandas` to `foo`. -``` -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = (super.python35Packages.override { self = python35Packages;}) - // { pandas = super.python35Packages.pandas.override {name = "foo";}; - }; -}); -``` -This can be tested with -``` +We can override the interpreter and pass `packageOverrides`. +In the following example we rename the `pandas` package and build it. +```nix with import {}; -(let +let + python = let + packageOverrides = self: super: { + pandas = super.pandas.override {name="foo";}; + }; + in pkgs.python35.override {inherit packageOverrides;}; -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = (super.python35Packages.override { self = python35Packages;}) - // { pandas = super.python35Packages.pandas.override {name = "foo";}; - }; -}); -in newpkgs.python35.withPackages (ps: [ps.blaze]) -).env -``` -A typical use case is to switch to another version of a certain package. For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. -In the following example we use a different version of `scipy`. All packages in `newpkgs` will now use the updated `scipy` version. +in python.pkgs.pandas ``` +Using `nix-build` on this expression will build the package `pandas` +but with the new name `foo`. + +All packages in the package set will use the renamed package. +A typical use case is to switch to another version of a certain package. +For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. +In the following example we use a different version of `scipy` and create an environment that uses it. +All packages in the Python package set will now use the updated `scipy` version. + +```nix with import {}; -(let - -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = super.python35Packages.override { - self = python35Packages // { scipy = python35Packages.scipy_0_17;}; +( +let + packageOverrides = self: super: { + scipy = super.scipy_0_17; }; -}); -in newpkgs.python35.withPackages (ps: [ps.blaze]) +in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) ).env ``` -The requested package `blaze` depends upon `pandas` which itself depends on `scipy`. +The requested package `blaze` depends on `pandas` which itself depends on `scipy`. -A similar example but now using `django` +If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages` +as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. ``` -with import {}; - -(let - -newpkgs = pkgs.overridePackages(self: super: rec { - python27Packages = (super.python27Packages.override {self = python27Packages;}) - // { django = super.python27Packages.django_1_9; }; -}); -in newpkgs.python27.withPackages (ps: [ps.django_guardian ]) -).env +let + pkgs = import {}; + newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: { + python27 = let + packageOverrides = self: super: { + numpy = super.numpy_1_10; + }; + in pkgssuper.python27.override {inherit packageOverrides;}; + } ); +in newpkgs.inkscape ``` ### `python setup.py bdist_wheel` cannot create .whl @@ -772,9 +769,9 @@ or the current time: nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" ``` or unset: -""" +``` nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" -""" +``` ### `install_data` / `data_files` problems From 44cc1d71931dcd67b48d133991a3d0b54fff36f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:58:31 +0100 Subject: [PATCH 079/216] pythonPackages.zipfile36: init at 0.1.3 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca2e88da94e..24bdb9b8f12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31330,6 +31330,27 @@ in { zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; + zipfile36 = buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = licenses.psfl; + maintainer = maintainers.fridh; + }; + }; }); From 03aacfaddd92985c82d6c0638a9a6304aba54a11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:58:50 +0100 Subject: [PATCH 080/216] pythonPackages.request_download: init at 0.1.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24bdb9b8f12..85feb55ffa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21731,6 +21731,27 @@ in { }; }; + requests_download = buildPythonPackage rec { + pname = "requests_download"; + version = "0.1.1"; + name = "${pname}-${version}"; + + format = "wheel"; + + src = pkgs.fetchurl { + url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; + sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + }; + + propagatedBuildInputs = with self; [ requests2 ]; + + meta = { + description = "Download files using requests and save them to a target path"; + homepage = https://www.github.com/takluyver/requests_download; + license = licenses.mit; + maintainer = maintainers.fridh; + }; + }; requests_oauthlib = buildPythonPackage rec { version = "0.4.1"; From c6a7d8e10f1e04ccef93d51459697c4b0a3a8f66 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:59:11 +0100 Subject: [PATCH 081/216] pythonPackages.flit: init at 0.10 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85feb55ffa0..3575018870f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6866,6 +6866,29 @@ in { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); + flit = buildPythonPackage rec { + pname = "flit"; + version = "0.10"; + name = "${pname}-${version}"; + + format = "wheel"; + + src = pkgs.fetchurl { + url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; + sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428"; + }; + + disabled = !isPy3k; + propagatedBuildInputs = with self; [ docutils requests2 requests_download zipfile36]; + + meta = { + description = "A simple packaging tool for simple packages"; + homepage = https://github.com/takluyver/flit; + license = licenses.bsd3; + maintainer = maintainers.fridh; + }; + }; + Flootty = buildPythonPackage rec { name = "Flootty-3.2.0"; From 42bad32e130378428647d88d6809f23591b85606 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 13:04:52 +0100 Subject: [PATCH 082/216] buildPythonPackage: refactor --- doc/languages-frameworks/python.md | 2 +- .../python/build-python-package-common.nix | 27 ++++ .../python/build-python-package-flit.nix | 19 +++ .../build-python-package-setuptools.nix | 56 ++++++++ .../python/build-python-package-wheel.nix | 20 +++ .../python/build-python-package.nix | 129 +++--------------- .../python/mk-python-derivation.nix | 4 + pkgs/top-level/python-packages.nix | 1 + 8 files changed, 148 insertions(+), 110 deletions(-) create mode 100644 pkgs/development/interpreters/python/build-python-package-common.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-flit.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-setuptools.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-wheel.nix diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index fc0100c5f2d..e7a8b034a11 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -523,7 +523,7 @@ All parameters from `mkDerivation` function are still supported. * `postShellHook`: Hook to execute commands after `shellHook`. * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`. +* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. * `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix new file mode 100644 index 00000000000..80d40013f15 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -0,0 +1,27 @@ +# This function provides generic bits to install a Python wheel. + +{ python +, bootstrapped-pip +}: + +{ buildInputs ? [] +# Additional flags to pass to "pip install". +, installFlags ? [] +, ... } @ attrs: + +attrs // { + buildInputs = buildInputs ++ [ bootstrapped-pip ]; + + installPhase = attrs.installPhase or '' + runHook preInstall + + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + + pushd dist + ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} + popd + + runHook postInstall + ''; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix new file mode 100644 index 00000000000..8628c3df769 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -0,0 +1,19 @@ +# This function provides specific bits for building a flit-based Python package. + +{ flit +}: + +{ ... } @ attrs: + +attrs // { + buildInputs = [ flit ]; + buildPhase = attrs.buildPhase or '' + runHook preBuild + flit wheel + runHook postBuild + ''; + + # Flit packages do not come with tests. + installCheckPhase = attrs.checkPhase or ":"; + doCheck = attrs.doCheck or false; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix new file mode 100644 index 00000000000..f077533ecfe --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -0,0 +1,56 @@ +# This function provides specific bits for building a setuptools-based Python package. + +{ lib +, python +, bootstrapped-pip +}: + +{ +# passed to "python setup.py build_ext" +# https://github.com/pypa/pip/issues/881 + setupPyBuildFlags ? [] +# Execute before shell hook +, preShellHook ? "" +# Execute after shell hook +, postShellHook ? "" +, ... } @ attrs: + +let + # use setuptools shim (so that setuptools is imported before distutils) + # pip does the same thing: https://github.com/pypa/pip/pull/3265 + setuppy = ./run_setup.py; + +in attrs // { + # we copy nix_run_setup.py over so it's executed relative to the root of the source + # many project make that assumption + buildPhase = attrs.buildPhase or '' + runHook preBuild + cp ${setuppy} nix_run_setup.py + ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + runHook postBuild + ''; + + installCheckPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + + # Python packages that are installed with setuptools + # are typically distributed with tests. + # With Python it's a common idiom to run the tests + # after the software has been installed. + doCheck = attrs.doCheck or true; + + shellHook = attrs.shellHook or '' + ${preShellHook} + if test -e setup.py; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.sitePackages} + ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path + fi + ${postShellHook} + ''; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix new file mode 100644 index 00000000000..7be0a4c304a --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix @@ -0,0 +1,20 @@ +# This function provides specific bits for building a wheel-based Python package. + +{ +}: + +{ ... } @ attrs: + +attrs // { + unpackPhase = '' + mkdir dist + cp $src dist/"''${src#*-}" + ''; + + # Wheels are pre-compiled + buildPhase = attrs.buildPhase or ":"; + installCheckPhase = attrs.checkPhase or ":"; + + # Wheels don't have any checks to run + doCheck = attrs.doCheck or false; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index a92296cedba..e15405e2981 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -7,120 +7,31 @@ , python , mkPythonDerivation , bootstrapped-pip +, flit }: -{ buildInputs ? [] - -# propagate build dependencies so in case we have A -> B -> C, -# C can import package A propagated by B -#, propagatedBuildInputs ? [] - -# passed to "python setup.py build_ext" -# https://github.com/pypa/pip/issues/881 -, setupPyBuildFlags ? [] - -# Execute before shell hook -, preShellHook ? "" - -# Execute after shell hook -, postShellHook ? "" - -# Additional flags to pass to "pip install". -, installFlags ? [] - -, format ? "setup" +let + setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; + flit-specific = import ./build-python-package-flit.nix { inherit flit; }; + wheel-specific = import ./build-python-package-wheel.nix { }; + common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; +in +{ +# Several package formats are supported. +# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. +# "wheel" : Install from a pre-compiled wheel. +# "flit" : Install a flit package. This builds a wheel. +# "other" : Provide your own buildPhase and installPhase. +format ? "setuptools" , ... } @ attrs: - - - let - # use setuptools shim (so that setuptools is imported before distutils) - # pip does the same thing: https://github.com/pypa/pip/pull/3265 - setuppy = ./run_setup.py; - formatspecific = - if format == "wheel" then - { - unpackPhase = '' - mkdir dist - cp $src dist/"''${src#*-}" - ''; + if format == "setuptools" then common (setuptools-specific attrs) + else if format == "flit" then common (flit-specific attrs) + else if format == "wheel" then common (wheel-specific attrs) + else if format == "other" then {} + else throw "Unsupported format ${format}"; - # Wheels are pre-compiled - buildPhase = attrs.buildPhase or ":"; - installCheckPhase = attrs.checkPhase or ":"; - - # Wheels don't have any checks to run - doCheck = attrs.doCheck or false; - } - else if format == "setup" then - { - # we copy nix_run_setup.py over so it's executed relative to the root of the source - # many project make that assumption - buildPhase = attrs.buildPhase or '' - runHook preBuild - cp ${setuppy} nix_run_setup.py - ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel - runHook postBuild - ''; - - installCheckPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} nix_run_setup.py test - runHook postCheck - ''; - - # Python packages that are installed with setuptools - # are typically distributed with tests. - # With Python it's a common idiom to run the tests - # after the software has been installed. - doCheck = attrs.doCheck or true; - } - else - throw "Unsupported format ${format}"; - -in mkPythonDerivation ( attrs // { - - # To build and install a wheel we need pip - buildInputs = buildInputs ++ [ bootstrapped-pip ]; - -#inherit propagatedBuildInputs; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - # patch python interpreter to write null timestamps when compiling python files - # this way python doesn't try to update them when we freeze timestamps in nix store - export DETERMINISTIC_BUILD=1 - - runHook postConfigure - ''; - - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - pushd dist - ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} - popd - - runHook postInstall - ''; - - shellHook = attrs.shellHook or '' - ${preShellHook} - if test -e setup.py; then - tmp_path=$(mktemp -d) - export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" - mkdir -p $tmp_path/${python.sitePackages} - ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path - fi - ${postShellHook} - ''; - -} // formatspecific) +in mkPythonDerivation ( attrs // formatspecific ) \ No newline at end of file diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 0f798c63e8f..c8fedaf75fc 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -57,6 +57,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { inherit pythonPath; + # patch python interpreter to write null timestamps when compiling python files + # this way python doesn't try to update them when we freeze timestamps in nix store + DETERMINISTIC_BUILD=1; + buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3575018870f..12204207275 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30,6 +30,7 @@ let buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { inherit mkPythonDerivation; inherit bootstrapped-pip; + flit = self.flit; }); buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); From d228d528707d87e52e803b212dd595619a863aa8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 10:22:43 +0100 Subject: [PATCH 083/216] entrypoints example --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12204207275..dfe5a8841ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,6 +6564,21 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + entrypoints_flit = buildPythonPackage rec { + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; + format = "flit"; + + src = pkgs.fetchFromGitHub { + owner = "takluyver"; + repo = pname; + rev = version; + sha256 = "1asi3xfym1g9z24p9ivzyp4smnl600w8hghlv5dziabj6csj8s1h"; + }; + propagatedBuildInputs = with self; [ configparser ]; + }; + etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 74d0f5726916f92b357e5e14225d59e78f2a69c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 10:31:53 +0100 Subject: [PATCH 084/216] Revert "entrypoints example" This reverts commit d228d528707d87e52e803b212dd595619a863aa8. THe example was not supposed to go in. --- pkgs/top-level/python-packages.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfe5a8841ee..12204207275 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,21 +6564,6 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; - entrypoints_flit = buildPythonPackage rec { - pname = "entrypoints"; - version = "0.2.2"; - name = "${pname}-${version}"; - format = "flit"; - - src = pkgs.fetchFromGitHub { - owner = "takluyver"; - repo = pname; - rev = version; - sha256 = "1asi3xfym1g9z24p9ivzyp4smnl600w8hghlv5dziabj6csj8s1h"; - }; - propagatedBuildInputs = with self; [ configparser ]; - }; - etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 8ba68644c6cd7b24e61260949e9c9377a24cee86 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:11:44 +0100 Subject: [PATCH 085/216] pythonPackages.django_1_10: 1.10.3 -> 1.10.4 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.10.4/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc5972bfbf0..6a7d67d5d90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9820,12 +9820,12 @@ in { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10.3"; + version = "1.10.4"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg"; + sha256 = "0asw60i4r5cdxb2jp6r09pdrwxxp8mvwbkz7vnx15n0hwmig1xzz"; }; patches = [ From feae2732b145cef097c984f86893d9030be098d6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:12:24 +0100 Subject: [PATCH 086/216] pythonPackages.django_1_9: 1.9.11 -> 1.9.12 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.9.12/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a7d67d5d90..9368c1424ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9852,12 +9852,12 @@ in { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.11"; + version = "1.9.12"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "17bxmfp92bdwjachjqb5zdlay5fhv4125hc85ln4ggyz0f5zvp6s"; + sha256 = "0daaz2rp1rwwpzm5l29wcgg1gbw9yqzcv9x2dsjfz29n806q685x"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) From a56e180629b7ef16ca27298d0fda8c6032dced9e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:12:54 +0100 Subject: [PATCH 087/216] pythonPackages.django_1_8: 1.8.16 -> 1.8.17 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.8.17/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9368c1424ba..1cc032cc380 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9876,12 +9876,12 @@ in { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.16"; + version = "1.8.17"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1pc1j3q64v65c573xwx64apjnf2v19nzxsidjiyp02c6l8bsyji2"; + sha256 = "01zb2l0gcdb2wgxmvvrhjj9ccdj1mfhn6zhqcdq04m7lzi4dc6q2"; }; # too complicated to setup From 3798da2c410cb81a6f4ae4975a9245e54c2ff370 Mon Sep 17 00:00:00 2001 From: montag451 Date: Mon, 28 Nov 2016 08:12:52 +0100 Subject: [PATCH 088/216] libibverbs: add pkg-config support --- pkgs/development/libraries/libibverbs/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix index 8e37648adfc..2243f832b7a 100644 --- a/pkgs/development/libraries/libibverbs/default.nix +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -46,6 +46,20 @@ in stdenv.mkDerivation rec { make -j$NIX_BUILD_CORES make install done + + mkdir -p $out/lib/pkgconfig + cat >$out/lib/pkgconfig/ibverbs.pc < Date: Mon, 28 Nov 2016 08:13:23 +0100 Subject: [PATCH 089/216] librdmacm: add pkg-config support --- .../libraries/librdmacm/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 2b8720357a1..791e59cbc90 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, libibverbs }: stdenv.mkDerivation rec { - name = "librdmacm-1.0.21"; + name = "librdmacm-${version}"; + version = "1.0.21"; src = fetchurl { url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; @@ -10,6 +11,22 @@ stdenv.mkDerivation rec { buildInputs = [ libibverbs ]; + postInstall = '' + mkdir -p $out/lib/pkgconfig + cat >$out/lib/pkgconfig/rdmacm.pc < Date: Mon, 28 Nov 2016 08:15:56 +0100 Subject: [PATCH 090/216] corosync: 2.4.1 -> 2.4.2 + various improvements --- pkgs/servers/corosync/default.nix | 55 ++++++++++++++++++------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index d04a1d124fa..dc2f0f6fd70 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,50 +1,61 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb -, dbus ? null -, librdmacm ? null, libibverbs ? null -, libstatgrab ? null -, net_snmp ? null +, dbus, librdmacm, libibverbs, libstatgrab, net_snmp +, enableDbus ? false +, enableInfiniBandRdma ? false +, enableMonitoring ? false +, enableSnmp ? false }: with stdenv.lib; + stdenv.mkDerivation rec { - name = "corosync-2.4.1"; + name = "corosync-2.4.2"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y"; + sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj"; }; - buildInputs = [ - makeWrapper pkgconfig nss nspr libqb - dbus librdmacm libibverbs libstatgrab net_snmp - ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; - # Remove when rdma libraries gain pkgconfig support - ibverbs_CFLAGS = optionalString (libibverbs != null) - "-I${libibverbs}/include/infiniband"; - ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs"; - rdmacm_CFLAGS = optionalString (librdmacm != null) - "-I${librdmacm}/include/rdma"; - rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm"; + buildInputs = [ + nss nspr libqb + ] ++ optional enableDbus dbus + ++ optional enableInfiniBandRdma [ librdmacm libibverbs ] + ++ optional enableMonitoring libstatgrab + ++ optional enableSnmp net_snmp; configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-logdir=/var/log/corosync" "--enable-watchdog" "--enable-qdevices" - ] ++ optional (dbus != null) "--enable-dbus" - ++ optional (librdmacm != null && libibverbs != null) "--enable-rdma" - ++ optional (libstatgrab != null) "--enable-monitoring" - ++ optional (net_snmp != null) "--enable-snmp"; + ] ++ optional enableDbus "--enable-dbus" + ++ optional enableInfiniBandRdma "--enable-rdma" + ++ optional enableMonitoring "--enable-monitoring" + ++ optional enableSnmp "--enable-snmp"; + + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "COROSYSCONFDIR=$(out)/etc/corosync" + "INITDDIR=$(out)/etc/init.d" + "LOGROTATEDIR=$(out)/etc/logrotate.d" + ]; postInstall = '' wrapProgram $out/bin/corosync-blackbox \ --prefix PATH ":" "$out/sbin:${libqb}/sbin" ''; + enableParallelBuilding = true; + meta = { homepage = http://corosync.org/; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington montag451 ]; }; } From 7f561ef302c471912d42ca368011869813ac21dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 11:39:40 +0100 Subject: [PATCH 091/216] pythonPackages.cffi: 1.7.0 -> 1.9.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12204207275..739ed0ce78d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4734,11 +4734,11 @@ in { }; cffi = if isPyPy then null else buildPythonPackage rec { - name = "cffi-1.7.0"; + name = "cffi-1.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cffi/${name}.tar.gz"; - sha256 = "1pv0pf38h375r581zyckb1d2phcgkszsx2n6354g6qc3zmmdvmbf"; + sha256 = "563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8"; }; propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; From 7d44426ccd2cbef148fd4afada6568b04b952bf0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 12:05:37 +0100 Subject: [PATCH 092/216] pythonPackages.zope_schema: disable tests See https://github.com/NixOS/nixpkgs/issues/20791 --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b2b995421b..d02c45063bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27107,6 +27107,11 @@ in { propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; + # ImportError: No module named 'zope.event' + # even though zope_event has been included. + # Package seems to work fine. + doCheck = false; + meta = { maintainers = with maintainers; [ goibhniu ]; }; From 9353d8c1ea1e66ca5de955c1926a966f39b30ca3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:16:18 +0100 Subject: [PATCH 093/216] torsocks: 2.1.0 -> 2.2.0 --- pkgs/tools/security/tor/torsocks.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index ee4749683a5..9577bc4144f 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "torsocks-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchgit { url = meta.repositories.git; rev = "refs/tags/v${version}"; - sha256 = "1l890pg0h2hqpkabsnwc6pq2qi8mfv58qzaaicc9y62rq5nmrrws"; + sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc"; }; buildInputs = [ autoreconfHook ]; From 8aebb6b18107a31798f13eb793b7ca4129062580 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:23:02 +0100 Subject: [PATCH 094/216] torsocks: expression cleanups - Remove redundant preConfigure torsocks installs into $libdir/torsocks, so setting libdir=$out/lib doesn't really help. To put the shared objects into $out/lib we'd have to manually move them into $out and patch various files (the script itself expects $libdir/torsocks). - Use nativeBuildInputs --- pkgs/tools/security/tor/torsocks.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 9577bc4144f..01d426b2702 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -10,10 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc"; }; - buildInputs = [ autoreconfHook ]; - preConfigure = '' - export configureFlags="$configureFlags --libdir=$out/lib" - ''; + nativeBuildInputs = [ autoreconfHook ]; patchPhase = '' substituteInPlace src/bin/torsocks.in \ From 95608c3e8d222e19f57b1ec7924476529ff0ee2c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:58:12 +0100 Subject: [PATCH 095/216] torsocks: redo patching, ensure getcap is available --- pkgs/tools/security/tor/torsocks.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 01d426b2702..a28d477d3f8 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, which }: +{ stdenv, fetchgit, autoreconfHook, libcap }: stdenv.mkDerivation rec { name = "torsocks-${version}"; @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - patchPhase = '' - substituteInPlace src/bin/torsocks.in \ - --replace which ${which}/bin/which + postPatch = '' + # Patch torify_app() + sed -i \ + -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ + -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ + src/bin/torsocks.in ''; meta = { From 07c0cdcba279be30faf8b1fd4443b274d3785f90 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 19:31:27 +0100 Subject: [PATCH 096/216] torsocks: enable install check --- pkgs/tools/security/tor/torsocks.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index a28d477d3f8..466dc4b4e46 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { src/bin/torsocks.in ''; + doInstallCheck = true; + installCheckTarget = "check-recursive"; + meta = { description = "Wrapper to safely torify applications"; homepage = http://code.google.com/p/torsocks/; From 407537a4bc33f0f74b00b84cbe97ac705ae05a07 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 13:13:12 +0100 Subject: [PATCH 097/216] privoxy: 3.0.24 -> 3.0.26 With some minor cosmetics --- pkgs/tools/networking/privoxy/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index a6dcd1fc0c3..0c3abf76dc1 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -2,14 +2,20 @@ stdenv.mkDerivation rec{ - name = "privoxy-3.0.24"; + name = "privoxy-${version}"; + version = "3.0.26"; src = fetchurl { - url = "mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/${name}-stable-src.tar.gz"; - sha256 = "a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012"; + url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz"; + sha256 = "1n4wpxmahl8m2y3d1azxa8lrdbpaad007k458skxrpz57ss1br2p"; }; - buildInputs = [ autoreconfHook zlib pcre w3m man ]; + nativeBuildInputs = [ autoreconfHook w3m man ]; + buildInputs = [ zlib pcre ]; + + postInstall = '' + rm -rf $out/var + ''; meta = with stdenv.lib; { homepage = http://www.privoxy.org/; From ad88f1040e2556ba678afb33dac28387ddd3543a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 12:25:31 +0100 Subject: [PATCH 098/216] privoxy service: additional isolation --- nixos/modules/services/networking/privoxy.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 94beb78ef5a..e74fe44d76e 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -100,6 +100,11 @@ in after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}"; + + serviceConfig.PrivateDevices = true; + serviceConfig.PrivateTmp = true; + serviceConfig.ProtectHome = true; + serviceConfig.ProtectSystem = "full"; }; }; From 3dcdc2d2b054933a5812411c44a11bb4114b309e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 12:27:51 +0100 Subject: [PATCH 099/216] privoxy service: remove static uid The service owns no data, having a static uid serves no purpose. This frees up uid/gid 32 --- nixos/modules/misc/ids.nix | 2 -- nixos/modules/services/networking/privoxy.nix | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 41ee63a9603..bc69102ba39 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -58,7 +58,6 @@ #utmp = 29; # unused ddclient = 30; davfs2 = 31; - privoxy = 32; #disnix = 33; # unused osgi = 34; tor = 35; @@ -322,7 +321,6 @@ utmp = 29; #ddclient = 30; # unused davfs2 = 31; - privoxy = 32; disnix = 33; osgi = 34; tor = 35; diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index e74fe44d76e..49ca839a2c3 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -6,8 +6,6 @@ let inherit (pkgs) privoxy; - privoxyUser = "privoxy"; - cfg = config.services.privoxy; confFile = pkgs.writeText "privoxy.conf" '' @@ -88,18 +86,20 @@ in ###### implementation config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = privoxyUser; - uid = config.ids.uids.privoxy; - description = "Privoxy daemon user"; - }; + + users.users.privoxy = { + isSystemUser = true; + home = "/var/empty"; + group = "privoxy"; + }; + + users.groups.privoxy = {}; systemd.services.privoxy = { description = "Filtering web proxy"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}"; + serviceConfig.ExecStart = "${privoxy}/bin/privoxy --no-daemon --user privoxy ${confFile}"; serviceConfig.PrivateDevices = true; serviceConfig.PrivateTmp = true; From 497e6d2f1d149f5fbe004e15fe8c384eed993943 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 5 Dec 2016 16:38:17 +0300 Subject: [PATCH 100/216] haskellPackages.haskell-src-exts-simple: build against new haskell-src-exts --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 24299c9418d..6fb76bcfbee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1018,7 +1018,7 @@ self: super: { }; # Needs new version. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; From e43a99ec9f715f3962422107118b981aec391b6e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 16:25:46 +0100 Subject: [PATCH 101/216] electrum: 2.7.11 -> 2.7.12 --- pkgs/applications/misc/electrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 458aed051a2..2ec212d493b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.7.11"; + version = "2.7.12"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb"; + sha256 = "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n"; }; propagatedBuildInputs = with python2Packages; [ From c1d98d959b38df00a1d933a5a9a381aa80096024 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 17:29:39 +0100 Subject: [PATCH 102/216] buildPythonPackage: add configurePhase, fixes #20926 I had removed the configurePhase in https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This seemed to break packages that use cmake. --- .../interpreters/python/build-python-package-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 80d40013f15..63936a00b39 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -12,6 +12,11 @@ attrs // { buildInputs = buildInputs ++ [ bootstrapped-pip ]; + configurePhase = '' + runHook preConfigure + runHook postConfigure + ''; + installPhase = attrs.installPhase or '' runHook preInstall From 47d4575255ea8159c5e84c1774c43d0f2d1d2bc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 12:46:57 +0100 Subject: [PATCH 103/216] pythonPackages.setuptools: 28.8.0 -> 30.2.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index ed8bbab29a7..7c992921e94 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -6,8 +6,8 @@ let sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; setuptools_source = fetchurl { - url = "https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl"; - sha256 = "2e59d06ac798efce29c567ee0e0687514efca529a665b8f364cf497cd10d21b2"; + url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl"; + sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1"; }; argparse_source = fetchurl { url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl"; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index bba5a6c942b..63e05736d79 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { shortName = "${pname}-${version}"; name = "${python.libPrefix}-${shortName}"; - version = "28.8.0"; + version = "30.2.0"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz"; - sha256 = "432a1ad4044338c34c2d09b0ff75d509b9849df8cf329f4c1c7706d9c2ba3c61"; + sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857"; }; buildInputs = [ python wrapPython ]; From 0dbc1e4b5b97afaca25339a3047a7c3d23369fbf Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 5 Dec 2016 13:48:33 -0500 Subject: [PATCH 104/216] minio: build on all 64bit platforms --- pkgs/servers/minio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ee37107858b..fef4d55b36c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.x86_64; license = lib.licenses.asl20; }; } From ef26ce0102ad398117244e937ee9c5a40d7f2dc8 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 5 Dec 2016 21:09:22 +0100 Subject: [PATCH 105/216] sonarr: 2.0.0.4389 -> 2.0.0.4409 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a6f0fb80055..5deb3ea871b 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4389"; + version = "2.0.0.4409"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "17vvfld6m1wr8yxvm9i7gaxny04ymvq86pizad816a73jk4h16my"; + sha256 = "1kaj1m4ifby8liks8i7fsbgwbajaqwd96yindqp5maf2n6px2nw2"; }; buildInputs = [ From 90292a8093fe20c2214afaae0d6f294837b5837e Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 5 Dec 2016 21:09:48 +0100 Subject: [PATCH 106/216] nzbget: 17.0-r1686 -> 17.1 --- pkgs/tools/networking/nzbget/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 4ba293dc12c..18995553d0a 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,12 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "17.0-r1686"; - filename = "nzbget-17.0-testing-r1686"; + version = "17.1"; src = fetchurl { - url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${filename}-src.tar.gz"; - sha256 = "0hk0hiccdk3bivdnc2635kqqdwgwf73wvis1wl9k0snds25dwfiw"; + url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; + sha256 = "0fcw43bigjmgxcz1jvqpd01sz4vciqsm311cbfv9lvmvv40gag2b"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls From 1915170dde9b05d8547b6b04f41400aeed67f1b2 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Tue, 6 Dec 2016 00:28:09 +0300 Subject: [PATCH 107/216] idea.datagrip: init at 2016.3 --- pkgs/applications/editors/idea/default.nix | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8c05026e7ef..b58d6816c97 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -115,6 +115,22 @@ let propagatedUserEnvPkgs = [ python ]; }; + buildDataGrip = { name, version, src, license, description, wmClass }: + (mkIdeaProduct { + inherit name version src wmClass jdk; + product = "DataGrip"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/datagrip/"; + inherit description license; + longDescription = '' + DataGrip is a new IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, + construct efficient, statically checked SQL queries and much more. + ''; + maintainers = with maintainers; [ loskutov ]; + platforms = platforms.linux; + }; + }); in { @@ -321,4 +337,16 @@ in }; wmClass = "jetbrains-webstorm"; }; + + datagrip = buildDataGrip rec { + name = "datagrip-${version}"; + version = "2016.3"; + 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"; + }; + wmClass = "jetbrains-datagrip"; + }; } From f4fd4678f0d51c0efc04cc91880d854e6e197976 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 5 Dec 2016 23:40:31 +0100 Subject: [PATCH 108/216] perl-Tk: 804.032_501 -> 804.033 Also remove unnecessary `configurePhase` and add X11 include path. Fixes #20932. --- pkgs/top-level/perl-packages.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03c166b65fd..485c0a95dc3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13921,19 +13921,16 @@ let self = _self // overrides; _self = with self; { }; Tk = buildPerlPackage rec { - name = "Tk-804.032_501"; + name = "Tk-804.033"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; + url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; + sha256 = "84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad"; }; - makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib"; + makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = with pkgs; [ xorg.libX11 libpng ]; - configurePhase = '' - perl Makefile.PL PREFIX=$out $makeMakerFlags - ''; - doCheck = false; - meta ={ - homepage = "http://search.cpan.org/~srezic/Tk-804.032/Tk.pod"; + doCheck = false; # Expects working X11. + meta = { + homepage = https://metacpan.org/pod/distribution/Tk/Tk.pod; license = stdenv.lib.licenses.tcltk; }; }; From ee2d5e44c2492472faa5a1692ff5d1629dfc2287 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Dec 2016 00:00:24 +0100 Subject: [PATCH 109/216] pythonPackages.django_1_6: 1.6.11 -> 1.6.11.5 Switch to the reviewboard fork of Django 1.6 because it's not maintained upstream anymore. See https://www.reviewboard.org/news/2016/11/01/new-django-1-6-11-5-security-releases/. --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d02c45063bc..3e1ad03ecd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9956,14 +9956,14 @@ in { django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6.11"; + version = "1.6.11.5"; # Support to python-3.4 and higher was introduced in django_1_7 disabled = !(isPy26 || isPy27 || isPy33); src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y"; + url = "https://downloads.reviewboard.org/releases/Django/1.6/Django-${version}.tar.gz"; + sha256 = "0yj0fw3iql031z8l5ik1fb25sk3l5bw2vc63bbyg5rz2k3znl4il"; }; # too complicated to setup From 601b47ab94e3aeb976d8eb9818b7f97f79edab58 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Dec 2016 00:02:59 +0100 Subject: [PATCH 110/216] pythonPackages.graphiteWeb: fix dependencies Fixes #20885. --- pkgs/top-level/python-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e1ad03ecd9..3dfee9a6817 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10147,6 +10147,15 @@ in { }; }; + django_tagging_0_3 = self.django_tagging.override (attrs: rec { + name = "django-tagging-0.3.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; + sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; + }; + propagatedBuildInputs = with self; [ django_1_6 ]; + }); django_classytags = buildPythonPackage rec { name = "django-classy-tags-${version}"; @@ -27951,7 +27960,7 @@ in { sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django django_tagging whisper pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_6 django_tagging_0_3 whisper pycairo ldap memcached pytz ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ From 8c1f5afdf3570c18da7d40bc767115f1254253c5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:02:10 +0100 Subject: [PATCH 111/216] grsecurity: delay toggling of sysctls until system is up We generally trust init, so there's little point in having these enabled during early bootup; it accomplishes little except fill our logs with spam. --- nixos/modules/security/grsecurity.nix | 47 ++++++++++++++++++- .../linux/kernel/grsecurity-nixos-config.nix | 3 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 92afb74956e..6838dbd111b 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -109,19 +109,62 @@ in boot.kernel.sysctl = { # Read-only under grsecurity "kernel.kptr_restrict" = mkForce null; + + # All grsec tunables default to off, those not enabled below are + # *disabled*. We use mkDefault to allow expert users to override + # our choices, but use mkForce where tunables would outright + # conflict with other settings. + + # Enable all chroot restrictions by default (overwritten as + # necessary below) + "kernel.grsecurity.chroot_caps" = mkDefault 1; + "kernel.grsecurity.chroot_deny_bad_rename" = mkDefault 1; + "kernel.grsecurity.chroot_deny_chmod" = mkDefault 1; + "kernel.grsecurity.chroot_deny_chroot" = mkDefault 1; + "kernel.grsecurity.chroot_deny_fchdir" = mkDefault 1; + "kernel.grsecurity.chroot_deny_mknod" = mkDefault 1; + "kernel.grsecurity.chroot_deny_mount" = mkDefault 1; + "kernel.grsecurity.chroot_deny_pivot" = mkDefault 1; + "kernel.grsecurity.chroot_deny_shmat" = mkDefault 1; + "kernel.grsecurity.chroot_deny_sysctl" = mkDefault 1; + "kernel.grsecurity.chroot_deny_unix" = mkDefault 1; + "kernel.grsecurity.chroot_enforce_chdir" = mkDefault 1; + "kernel.grsecurity.chroot_findtask" = mkDefault 1; + "kernel.grsecurity.chroot_restrict_nice" = mkDefault 1; + + # Enable various grsec protections + "kernel.grsecurity.consistent_setxid" = mkDefault 1; + "kernel.grsecurity.deter_bruteforce" = mkDefault 1; + "kernel.grsecurity.fifo_restrictions" = mkDefault 1; + "kernel.grsecurity.harden_ipc" = mkDefault 1; + "kernel.grsecurity.harden_ptrace" = mkDefault 1; + "kernel.grsecurity.harden_tty" = mkDefault 1; + "kernel.grsecurity.ip_blackhole" = mkDefault 1; + "kernel.grsecurity.linking_restrictions" = mkDefault 1; + "kernel.grsecurity.ptrace_readexec" = mkDefault 1; + + # Enable auditing + "kernel.grsecurity.audit_ptrace" = mkDefault 1; + "kernel.grsecurity.forkfail_logging" = mkDefault 1; + "kernel.grsecurity.rwxmap_logging" = mkDefault 1; + "kernel.grsecurity.signal_logging" = mkDefault 1; + "kernel.grsecurity.timechange_logging" = mkDefault 1; } // optionalAttrs config.nix.useSandbox { # chroot(2) restrictions that conflict with sandboxed Nix builds "kernel.grsecurity.chroot_caps" = mkForce 0; + "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; "kernel.grsecurity.chroot_deny_chroot" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_deny_pivot" = mkForce 0; - "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; } // optionalAttrs containerSupportRequired { # chroot(2) restrictions that conflict with NixOS lightweight containers + "kernel.grsecurity.chroot_caps" = mkForce 0; "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_restrict_nice" = mkForce 0; - "kernel.grsecurity.chroot_caps" = mkForce 0; + # Disable privileged IO by default, unless X is enabled + } // optionalAttrs (!config.services.xserver.enable) { + "kernel.grsecurity.disable_priv_io" = mkDefault 1; }; }; diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 2193dabd0bc..e54ab8c4944 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -55,5 +55,6 @@ GRKERNSEC_MODHARDEN n GRKERNSEC_SYSCTL y GRKERNSEC_SYSCTL_DISTRO y -GRKERNSEC_SYSCTL_ON y +# Assume that appropriate sysctls are toggled once the system is up +GRKERNSEC_SYSCTL_ON n '' From 071fbcda2462114ce2bcabb97e011083024774a7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:04:49 +0100 Subject: [PATCH 112/216] grsecurity: enable optional sysfs restrictions Fairly severe, but can be disabled at bootup via grsec_sysfs_restrict=0. For the NixOS module we ensure that it is disabled, for systemd compatibility. --- nixos/modules/security/grsecurity.nix | 3 ++- nixos/modules/security/grsecurity.xml | 9 ++++++--- .../os-specific/linux/kernel/grsecurity-nixos-config.nix | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 6838dbd111b..3726b6c7818 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -59,7 +59,8 @@ in boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos; - boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; + boot.kernelParams = [ "grsec_sysfs_restrict=0" ] + ++ optional cfg.disableEfiRuntimeServices "noefi"; nixpkgs.config.grsecurity = true; diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index e41748358fb..a991758021a 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -151,9 +151,6 @@ a TCP simultaneous OPEN on that port before the connection is actually established. - /sys hardening: - breaks systemd. - Trusted path execution: a desirable feature, but requires some more work to operate smoothly on NixOS. @@ -357,6 +354,12 @@ pax_size_overflow_report_only: log size overflow violations but leave the violating task running + + + grsec_sysfs_restrict=[0|1]: toggle sysfs + restrictions. The NixOS module sets this to 0 + for systemd compatibility + diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index e54ab8c4944..96da936642d 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -29,6 +29,7 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y # Additional grsec hardening not implied by auto constraints GRKERNSEC_IO y +GRKERNSEC_SYSFS_RESTRICT y # Disable protections rendered useless by redistribution GRKERNSEC_HIDESYM n From 31d79afbe5c0dc4f5343e842e40ada6738b1abb3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:14:02 +0100 Subject: [PATCH 113/216] grsecurity docs: note that pax_sanitize_slab defaults to fast --- nixos/modules/security/grsecurity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index a991758021a..97628b0fe32 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -347,7 +347,7 @@ pax_sanitize_slab={off|fast|full}: control kernel - slab object sanitization + slab object sanitization. Defaults to fast From 0e765c72e5c1f12d629d9d23d34f5fcb235e2833 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:19:33 +0100 Subject: [PATCH 114/216] grsecurity: enable module hardening --- nixos/modules/security/grsecurity.xml | 8 ++++---- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 97628b0fe32..5b3e4db03a1 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -153,10 +153,6 @@ Trusted path execution: a desirable feature, but requires some more work to operate smoothly on NixOS. - - Module hardening: would break user initiated module - loading. Might enable this at some point, depending on the potential - breakage. @@ -292,6 +288,10 @@ to override this behavior. + User initiated autoloading of modules (e.g., when + using fuse or loop devices) is disallowed; either load requisite modules + as root or add them to. + Virtualization: KVM is the preferred virtualization solution. Xen, Virtualbox, and VMWare are unsupported and most likely require a custom kernel. diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 96da936642d..c426799f59d 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -31,6 +31,8 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y GRKERNSEC_IO y GRKERNSEC_SYSFS_RESTRICT y +GRKERNSEC_MODHARDEN y + # Disable protections rendered useless by redistribution GRKERNSEC_HIDESYM n GRKERNSEC_RANDSTRUCT n @@ -51,9 +53,6 @@ GRKERNSEC_FORKFAIL y # Wishlist: support trusted path execution GRKERNSEC_TPE n -# Wishlist: enable this, but breaks user initiated module loading -GRKERNSEC_MODHARDEN n - GRKERNSEC_SYSCTL y GRKERNSEC_SYSCTL_DISTRO y # Assume that appropriate sysctls are toggled once the system is up From cc396697a6078d4137e1e1996989408d666fb3d8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 23:55:40 +0100 Subject: [PATCH 115/216] grsecurity: enable ability to lock in readonly mounts --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index c426799f59d..64722635f41 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -30,6 +30,7 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y # Additional grsec hardening not implied by auto constraints GRKERNSEC_IO y GRKERNSEC_SYSFS_RESTRICT y +GRKERNSEC_ROFS y GRKERNSEC_MODHARDEN y From 9578299bbe5c4f78468fcad6e66c5f4a14c61eb2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 23:56:22 +0100 Subject: [PATCH 116/216] grsecurity: 4.8.11-201611271225 -> 4.8.12-201612031658 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 4937c2271c7..715af76267c 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.11"; + version = "4.8.12"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; + sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fa5984ebf8b..124518c36b2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.11"; - grrev = "201611271225"; - sha256 = "12vcy030vxi7h2dxyikfj8cirrifk9j186dbc2vk45dv4flcxpac"; + { kver = "4.8.12"; + grrev = "201612031658"; + sha256 = "06n96jk471xp7m8sf504bw9x6mk893jpymglgw037b21cbv88rrp"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 67e1c1b4a7ad5529cf0ac48bdbfc3164e072eae9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2016 19:32:56 -0500 Subject: [PATCH 117/216] Add pythonPackages.wp_export_parser --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dfee9a6817..f6dc4685dc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31386,6 +31386,18 @@ in { }; }; + wp_export_parser = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "wp_export_parser"; + version = "1.0"; + src = pkgs.fetchFromGitHub { + owner = "RealGeeks"; + repo = "wp_export_parser"; + rev = "479211f6c5a7d034fd77762dfed381c3315cd773"; + sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi"; + }; + }; + zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; From 200715b022138c97977368e40428ffa01b33ccd3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 5 Dec 2016 19:38:26 -0500 Subject: [PATCH 118/216] scala: 2.12.0 -> 2.12.1 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index decbf678c34..bc7da3581de 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.12.0"; + name = "scala-2.12.1"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2"; + sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d"; }; propagatedBuildInputs = [ jre ] ; From c9d1d430ec34d667ce9d0b86f843801d1cf3b753 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 5 Dec 2016 19:40:11 -0500 Subject: [PATCH 119/216] linux: 4.9-rc7 -> 4.9-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 95e89005b0f..394469d06fa 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.9-rc7"; - modDirVersion = "4.9.0-rc7"; + version = "4.9-rc8"; + modDirVersion = "4.9.0-rc8"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; + sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7"; }; features.iwlwifi = true; From 6b6f97fecce1d7c231ecd461443d051eff5005c3 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Tue, 6 Dec 2016 09:23:59 +0800 Subject: [PATCH 120/216] minikube: init at 0.13.1 --- .../networking/cluster/minikube/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/cluster/minikube/default.nix diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix new file mode 100644 index 00000000000..857e8e72d12 --- /dev/null +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, kubernetes }: +let + arch = if stdenv.isLinux + then "linux-amd64" + else "darwin-amd64"; + checksum = if stdenv.isLinux + then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j" + else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p"; +in +stdenv.mkDerivation rec { + pname = "minikube"; + version = "0.13.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}"; + sha256 = "${checksum}"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ kubernetes ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir -p $out/bin + ''; + + installPhase = '' + cp $src $out/bin/${pname} + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/minikube; + description = "A tool that makes it easy to run Kubernetes locally"; + license = licenses.asl20; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9702500fc38..a8c1bcf99bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13479,6 +13479,8 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; + minikube = callPackage ../applications/networking/cluster/minikube { }; + minitube = callPackage ../applications/video/minitube { }; mimms = callPackage ../applications/audio/mimms {}; From 02ecd0f0f76248e6a40ee62686ea94165b464fb1 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 6 Dec 2016 00:46:48 -0500 Subject: [PATCH 121/216] pssh: init at 2.3.1 --- pkgs/tools/networking/pssh/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/pssh/default.nix diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix new file mode 100644 index 00000000000..7ae41a3e176 --- /dev/null +++ b/pkgs/tools/networking/pssh/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "pssh-${version}"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = "pssh"; + rev = "v${version}"; + sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; + }; + + meta = with stdenv.lib; { + description = "Parallel SSH Tools"; + longDescription = '' + PSSH provides parallel versions of OpenSSH and related tools, + including pssh, pscp, prsync, pnuke and pslurp. + ''; + inherit (src.meta) homepage; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1927b7d6e1..602622c7a32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3382,6 +3382,8 @@ in psmisc = callPackage ../os-specific/linux/psmisc { }; + pssh = callPackage ../tools/networking/pssh { }; + pstoedit = callPackage ../tools/graphics/pstoedit { }; psutils = callPackage ../tools/typesetting/psutils { }; From cac53b75a8a85394a132614f631196103693284f Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 6 Dec 2016 09:46:33 +0100 Subject: [PATCH 122/216] hipchat: 4.28.0.1659 -> 4.29.4.1662 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e4cc2700c03..326f9563070 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.28.0.1659"; + version = "4.29.4.1662"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "091njvbihn0l7j5ymnl8ynz51pcy9varbvvny880r8szldash90y"; + sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y"; } else throw "HipChat is not supported on ${stdenv.system}"; From d2fc461f6badbfd6cc2b32c42b8e6661c9675afc Mon Sep 17 00:00:00 2001 From: Mikael Brockman Date: Wed, 7 Sep 2016 17:06:21 +0300 Subject: [PATCH 123/216] awslogs: init at 0.7 fixes #20921 --- pkgs/tools/admin/awslogs/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/admin/awslogs/default.nix diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix new file mode 100644 index 00000000000..dffef09a5d4 --- /dev/null +++ b/pkgs/tools/admin/awslogs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "awslogs-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "jorgebastida"; + repo = "awslogs"; + rev = "${version}"; + sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm"; + }; + + doCheck = false; + + propagatedBuildInputs = with pythonPackages; [ + boto3 termcolor dateutil docutils + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jorgebastida/awslogs; + description = "AWS CloudWatch logs for Humans"; + maintainers = with maintainers; [ dbrock ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 602622c7a32..93a04552224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -475,6 +475,8 @@ in awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix + awslogs = callPackage ../tools/admin/awslogs { }; + aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix azure-cli = nodePackages.azure-cli; From 6bfffa9932e6f5aca58ecc72f5814ee49a901cb2 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 6 Dec 2016 11:17:27 +0000 Subject: [PATCH 124/216] digital-ocean: Init at 1.10.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6dc4685dc7..7b0825d0966 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5498,6 +5498,27 @@ in { }; }; + digital-ocean = buildPythonPackage rec { + name = "python-digitalocean-1.10.1"; + + propagatedBuildInputs = with self; [ requests2 ]; + + # Package doesn't distribute tests. + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-digitalocean/${name}.tar.gz"; + sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; + }; + + meta = { + description = "digitalocean.com API to manage Droplets and Images"; + homepage = https://pypi.python.org/pypi/python-digitalocean; + license = licenses.lgpl3; + maintainers = with maintainers; [ teh ]; + }; + }; + libtmux = buildPythonPackage rec { name = "libtmux-${version}"; version = "0.6.0"; From fc9e65c5589d5aa2443a1be75794ec0a5bcb2ea1 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 6 Dec 2016 14:16:30 +0100 Subject: [PATCH 125/216] pythonPackages.escapism: init at 0.0.1 --- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0825d0966..d769053f0f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6434,7 +6434,6 @@ in { }; }; - ds4drv = buildPythonPackage rec { name = "ds4drv-${version}"; version = "0.5.0"; @@ -6585,6 +6584,26 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + escapism = buildPythonPackage rec { + name = "escapism-${version}"; + version = "0.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/e/escapism/${name}.tar.gz"; + sha256 = "1yfyxwxb864xrmrrqgp85xgsh4yrrq5mmzvkdg19jwr7rm6sqx9p"; + }; + + # No tests distributed + doCheck = false; + + meta = { + description = "Simple, generic API for escaping strings"; + homepage = "https://github.com/minrk/escapism"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; + }; + etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 1a427cf6251f5ed5205fd1c4c3164ac947d5c204 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 14:29:29 +0100 Subject: [PATCH 126/216] privoxy: enable pie --- pkgs/tools/networking/privoxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 0c3abf76dc1..9a8dfca9f24 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec{ sha256 = "1n4wpxmahl8m2y3d1azxa8lrdbpaad007k458skxrpz57ss1br2p"; }; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ autoreconfHook w3m man ]; buildInputs = [ zlib pcre ]; From 148ee2cba9b1654a5d3abe5124b32aa7d03528e6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 15:41:03 +0100 Subject: [PATCH 127/216] privoxy: homepage now reachable via https --- pkgs/tools/networking/privoxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 9a8dfca9f24..12744456cc4 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - homepage = http://www.privoxy.org/; + homepage = https://www.privoxy.org/; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; platforms = platforms.all; From db0bd30a7cafc5d519fae7cb52e55673b319a4c1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 15:45:45 +0100 Subject: [PATCH 128/216] ion3: specify meta.{platforms,license} --- pkgs/applications/window-managers/ion-3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index f4199073077..c13b950599e 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation { meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; homepage = http://modeemi.fi/~tuomov/ion; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.lgpl21; }; src = fetchurl { url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; From 736169d01dd05e50b8a70212a28c9e7f61249348 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 6 Dec 2016 16:36:06 +0100 Subject: [PATCH 129/216] buildPythonPackage: yet another fix, fixes #20943 I didn't copy the old behaviour correctly with c1d98d959b38df00a1d933a5a9a381aa80096024 --- .../interpreters/python/build-python-package-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 63936a00b39..381606acd8b 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -12,7 +12,7 @@ attrs // { buildInputs = buildInputs ++ [ bootstrapped-pip ]; - configurePhase = '' + configurePhase = attrs.configurePhase or '' runHook preConfigure runHook postConfigure ''; @@ -29,4 +29,4 @@ attrs // { runHook postInstall ''; -} \ No newline at end of file +} From 462a63bb1e6abafb2014b097e48703301283c97e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 6 Dec 2016 16:47:17 +0100 Subject: [PATCH 130/216] beets: add missing dependency six, fixes #20946 --- pkgs/tools/audio/beets/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0c6dc9219c4..60cfe4a2814 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -84,6 +84,7 @@ in pythonPackages.buildPythonApplication rec { }; propagatedBuildInputs = [ + pythonPackages.six pythonPackages.enum34 pythonPackages.jellyfish pythonPackages.munkres From 14e53ca5ab779f64aee599787ce070888c2af246 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 6 Dec 2016 13:07:02 -0500 Subject: [PATCH 131/216] sudolikeaboss: 0.2.1 -> 20161127-2d9afe1 --- pkgs/tools/security/sudolikeaboss/default.nix | 14 +++++---- pkgs/tools/security/sudolikeaboss/deps.nix | 29 +++++++++++++++---- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 6e2d6888f2e..066fef39a82 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,15 +1,20 @@ +# This file was generated by go2nix, then modified by hand for Darwin support. { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: + buildGoPackage rec { - name = "sudolikeaboss-${version}"; - version = "0.2.1"; + name = "sudolikeaboss-unstable-${version}"; + version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; goPackagePath = "github.com/ravenac95/sudolikeaboss"; + src = fetchFromGitHub { owner = "ravenac95"; repo = "sudolikeaboss"; - rev = "v${version}"; - sha256 = "1zsmy67d334nax76sq0g2sczp4zi19d94d3xfwgadzk7sxvw1z0m"; + inherit rev; + sha256 = "0ni3v4kanxfzxzjd48f5dgv62jbfrw7kdmq0snj09hw7ciw55yg6"; }; + goDeps = ./deps.nix; propagatedBuildInputs = with darwin.apple_sdk.frameworks; [ @@ -29,5 +34,4 @@ buildGoPackage rec { maintainers = [ maintainers.grahamc ]; platforms = platforms.darwin; }; - } diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/pkgs/tools/security/sudolikeaboss/deps.nix index 04f831675fa..350306a24f4 100644 --- a/pkgs/tools/security/sudolikeaboss/deps.nix +++ b/pkgs/tools/security/sudolikeaboss/deps.nix @@ -1,13 +1,30 @@ -# This file was generated by go2nix: https://github.com/kamilchm/go2nix -# v1.1.0 or 1.1.1, not 100% sure +# This file was generated by go2nix. [ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "881bee4e20a5d11a6a88a5667c6f292072ac1963"; + sha256 = "176a09lp20f0qfhwwlh2xg0vk7z1g7gq8k2wr3sg1fd8m86wrzzg"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; + sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; + }; + } { goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "55f715e28c46073d0e217e2ce8eb46b0b45e3db6"; - sha256 = "0fvqxh1dx4f189y90fhrjapb4g51d7cp203jahxfb19k1k8c3942"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; }; } { @@ -15,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "2a824cf9226006580a06d9fa8f10901c17b49ed5"; - sha256 = "19hc83dsa8k1zbzb16v9yc44grscl9r4fxlpwqi3f6zqfrv0qk4n"; + rev = "0c96df335ed3f17f758cba1a2c71b7849dd828e3"; + sha256 = "02zn1f539y5yc1sx82ym8c3pp3z371d1ldhl20skwjwbdw1ln8hm"; }; } ] From 80f2e535b35c5d099ade15aa5c74bf0736e54919 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 6 Dec 2016 20:24:26 +0100 Subject: [PATCH 132/216] pdfpc: 4.0.3 -> 4.0.4 --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 812c7ec6114..848b39eeb07 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "1fcwxvik3nnn0g37xvb30vxaxwrd881fw07fyfb9c6ami9bnva3p"; + sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q"; }; nativeBuildInputs = [ cmake pkgconfig ]; From b165b5e9240d294a4f02d066e6acc290e9a48e6e Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Tue, 6 Dec 2016 22:26:41 +0100 Subject: [PATCH 133/216] portaudio: remove old version portaudioSVN The project is now using git and the sha for the source is wrong. Can not find other derivations using this. --- .../libraries/portaudio/svn-head.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/portaudio/svn-head.nix diff --git a/pkgs/development/libraries/portaudio/svn-head.nix b/pkgs/development/libraries/portaudio/svn-head.nix deleted file mode 100644 index 12b8257084b..00000000000 --- a/pkgs/development/libraries/portaudio/svn-head.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchsvn, alsaLib, pkgconfig }: - -stdenv.mkDerivation rec { - revision = "1788"; - name = "portaudio-svn-r${revision}"; - - src = fetchsvn { - url = "https://subversion.assembla.com/svn/portaudio/portaudio/trunk"; - rev = revision; - sha256 = "0vhiy4lkmv0flhvkbbra71z5cfr3gbh27bbfcqqdc939b4z35lsi"; - }; - - buildInputs = [ alsaLib pkgconfig ]; - - meta = { - description = "Portable cross-platform Audio API"; - homepage = http://www.portaudio.com/; - # Not exactly a bsd license, but alike - license = "BSD"; - }; - - passthru = { - api_version = 19; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a04552224..7f4e2caf062 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8917,8 +8917,6 @@ in portaudio = callPackage ../development/libraries/portaudio { }; - portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; - portmidi = callPackage ../development/libraries/portmidi {}; prison = callPackage ../development/libraries/prison { }; From 271c0f54518a8e5798cf7b27d99947c64998659e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 6 Dec 2016 23:19:34 +0100 Subject: [PATCH 134/216] lib/generators: mkKeyValueLine -> mkKeyValueLine (#20920) Rename, since the previous name was potentially confusing. --- lib/generators.nix | 8 ++++---- lib/tests.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 2c0cf5775f4..4d3c920b0ae 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -21,10 +21,10 @@ rec { * character sep. If sep appears in k, it is escaped. * Helper for synaxes with different separators. * - * mkKeyValueLine ":" "f:oo" "bar" + * mkKeyValueDefault ":" "f:oo" "bar" * > "f\:oo:bar" */ - mkKeyValueLine = sep: k: v: + mkKeyValueDefault = sep: k: v: "${libStr.escape [sep] k}${sep}${toString v}"; @@ -33,7 +33,7 @@ rec { * mkKeyValue is the same as in toINI. */ toKeyValue = { - mkKeyValue ? mkKeyValueLine "=" + mkKeyValue ? mkKeyValueDefault "=" }: attrs: let mkLine = k: v: mkKeyValue k v + "\n"; in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); @@ -63,7 +63,7 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? mkKeyValueLine "=" + mkKeyValue ? mkKeyValueDefault "=" }: attrsOfAttrs: let # map function to string for each key val diff --git a/lib/tests.nix b/lib/tests.nix index afbaf11a7f7..d33e3a824e3 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -135,8 +135,8 @@ runTests { # these tests assume attributes are converted to lists # in alphabetical order - testMkKeyValueLine = { - expr = generators.mkKeyValueLine ":" "f:oo" "bar"; + testMkKeyValueDefault = { + expr = generators.mkKeyValueDefault ":" "f:oo" "bar"; expected = ''f\:oo:bar''; }; From 5373ca9712cd275169aa8b47c321b13ab0259811 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 6 Dec 2016 23:24:42 +0100 Subject: [PATCH 135/216] haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614) Both experimental libraries that are in the ghcjs GitHub organization, but are not yet officially released on hackage. --- .../haskell-modules/configuration-ghcjs.nix | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 894022c176b..826869f828b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -76,6 +76,7 @@ self: super: ''; }); + # experimental ghcjs-ffiqq = self.callPackage ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim }: @@ -85,15 +86,37 @@ self: super: src = pkgs.fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs-ffiqq"; - rev = "da31b18582542fcfceade5ef6b2aca66662b9e20"; - sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y"; + rev = "b52338c2dcd3b0707bc8aff2e171411614d4aedb"; + sha256 = "08zxfm1i6zb7n8vbz3dywdy67vkixfyw48580rwfp48rl1s2z1c7"; }; libraryHaskellDepends = [ base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = stdenv.lib.licenses.mit; + license = pkgs.stdenv.lib.licenses.mit; }) {}; + # experimental + ghcjs-vdom = self.callPackage + ({ mkDerivation, base, ghc-prim, ghcjs-ffiqq, ghcjs-base, ghcjs-prim + , containers, split, template-haskell + }: + mkDerivation rec { + pname = "ghcjs-vdom"; + version = "0.2.0.0"; + src = pkgs.fetchFromGitHub { + owner = "ghcjs"; + repo = pname; + rev = "1c1175ba22eca6d7efa96f42a72290ade193c148"; + sha256 = "0c6l1dk2anvz94yy5qblrfh2iv495rjq4qmhlycc24dvd02f7n9m"; + }; + libraryHaskellDepends = [ + base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split + template-haskell + ]; + license = pkgs.stdenv.lib.licenses.mit; + description = "bindings for https://github.com/Matt-Esch/virtual-dom"; + inherit (src) homepage; + }) {}; ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { libraryHaskellDepends = with self; [ From c182733691b2e72f8bcf6d9d9f81a1c801df3449 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 7 Dec 2016 01:44:34 +0300 Subject: [PATCH 136/216] skype: return to stock qt4 Fix a SIGABRT, also finally get rid of qt4_clang. --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a04552224..7755312e57d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8964,8 +8964,6 @@ in qt4 = pkgs.kde4.qt4; - qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true mesa = mesa_noglu; @@ -14565,9 +14563,7 @@ in siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - qt4 = pkgsi686Linux.qt4_clang; - }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; From 26d6722381e88959ffb1d131af67d6701b8e7230 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Wed, 7 Dec 2016 07:13:08 +0800 Subject: [PATCH 137/216] kubernetes: 1.4.5 -> 1.4.6 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 44444417f3c..46f5d7fa50a 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.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "13lzprvifppnz2r189di7ff2jhvd071b6hxyny12p2hw1b3knnvb"; + sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; From 705e29046de5eb5ec21894743835676343ef78cb Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 6 Dec 2016 15:39:34 -0600 Subject: [PATCH 138/216] icu: remove icu4c-54.1 Only zoom-us depends on icu4c-54.1. Since we know that version has some vulnerabilities, and zoom-us appears to work with icu4c-57.1, I remove the icu/54.1.nix file, remove icu_54_1 from all-packages.nix, and have zoom-us depend on icu (i.e., icu4c-57.1) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- pkgs/development/libraries/icu/54.1.nix | 11 ----------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/development/libraries/icu/54.1.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f0243f45b8f..5f4e0ca1ee0 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,7 +4,7 @@ , glib , gst_plugins_base , gstreamer -, icu_54_1 +, icu , libpulseaudio , libuuid , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { glib gst_plugins_base gstreamer - icu_54_1 + icu libpulseaudio libuuid libxml2 diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix deleted file mode 100644 index a2465ce930f..00000000000 --- a/pkgs/development/libraries/icu/54.1.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: - -let - icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; -in - stdenv.lib.overrideDerivation icu (attrs: { - src = fetchurl { - url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; - sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a04552224..f685175ec41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7473,7 +7473,6 @@ in hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; - icu_54_1 = callPackage ../development/libraries/icu/54.1.nix { }; id3lib = callPackage ../development/libraries/id3lib { }; From 984d9ebb56edf3ef2b0690e45c357be35b741dc3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 29 Nov 2016 02:16:15 +0100 Subject: [PATCH 139/216] hidepid: polkit and systemd-logind compatibility `systemd.hideProcessInformation = true`, would break interactions requiring polkit arbitration such as initating poweroff/reboot as a normal user; the polkit daemon cannot be expected to make decisions about processes that don't exist as far as it is concerned. systemd-logind lacks the `sys_ptrace` capability and so needs to be part of the designated proc gid, even though it runs as root. Fixes https://github.com/NixOS/nixpkgs/issues/20948 --- nixos/modules/security/hidepid.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index ee351eb8447..96443fda758 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -19,7 +19,9 @@ with lib; config = mkIf config.security.hideProcessInformation { users.groups.proc.gid = config.ids.gids.proc; + users.groups.proc.members = [ "polkituser" ]; boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ]; + systemd.services.systemd-logind.serviceConfig.SupplementaryGroups = [ "proc" ]; }; } From c56fa24745374b95ed4ec08a3004d8aab844da09 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 7 Dec 2016 15:01:03 +0900 Subject: [PATCH 140/216] styx: 0.3.1 -> 0.4.0 --- pkgs/applications/misc/styx/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index aa1c1deebd6..15e8453de51 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, caddy, asciidoctor }: +{ stdenv, fetchFromGitHub, caddy, asciidoctor +, file, lessc, sass, multimarkdown }: stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni"; + sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs"; }; - server = caddy.bin; + setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; + + server = "${caddy.bin}/bin/caddy"; nativeBuildInputs = [ asciidoctor ]; - setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; + propagatedBuildInputs = [ + file + lessc + sass + asciidoctor + multimarkdown + ]; installPhase = '' mkdir $out @@ -24,6 +33,7 @@ stdenv.mkDerivation rec { 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 From 30d4eca088ce837cc1df5237fdcd84dff2218130 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 7 Dec 2016 15:01:29 +0900 Subject: [PATCH 141/216] styx-themes: init --- pkgs/applications/misc/styx/themes.nix | 92 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/applications/misc/styx/themes.nix diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix new file mode 100644 index 00000000000..2b3570608af --- /dev/null +++ b/pkgs/applications/misc/styx/themes.nix @@ -0,0 +1,92 @@ +{ fetchFromGitHub, stdenv }: + +let + + mkThemeDrv = args: stdenv.mkDerivation { + name = "styx-theme-${args.themeName}-${args.version}"; + + src = fetchFromGitHub ({ + owner = "styx-static"; + repo = "styx-theme-${args.themeName}"; + } // args.src); + + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + maintainer = with maintainers; [ ericsagnes ]; + description = "${args.themeName} theme for styx"; + platforms = platforms.all; + } // args.meta; + }; + +in +{ + agency = mkThemeDrv { + themeName = "agency"; + version = "2016-12-03"; + src = { + rev = "3604239cc5d940eee9c14ad2540d68a53cfebd7e"; + sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61"; + }; + meta = { + license = stdenv.lib.licenses.asl20; + longDescription = '' + Agency Theme is a one page portfolio for companies and freelancers. + This theme features several content sections, a responsive portfolio + grid with hover effects, full page portfolio item modals, a timeline, + and a contact form. + ''; + }; + }; + + hyde = mkThemeDrv { + themeName = "hyde"; + version = "2016-12-03"; + src = { + rev = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28"; + sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6"; + }; + meta = { + license = stdenv.lib.licenses.mit; + longDescription = '' + Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar + with uncomplicated content. + ''; + }; + }; + + orbit = mkThemeDrv { + themeName = "orbit"; + version = "2016-12-03"; + src = { + rev = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4"; + sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64"; + }; + meta = { + license = stdenv.lib.licenses.cc-by-30; + longDescription = '' + Orbit is a free resume/CV template designed for developers. + ''; + }; + }; + + showcase = mkThemeDrv { + themeName = "showcase"; + version = "2016-12-04"; + src = { + rev = "33feb0a09183e88d3580e9444ea36a255dffef60"; + sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf"; + }; + meta = { + license = stdenv.lib.licenses.mit; + longDescription = '' + Theme that show most of styx functionalities with a basic design. + ''; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 564e52777f7..4afa32a1125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14596,6 +14596,8 @@ in styx = callPackage ../applications/misc/styx { }; + styx-themes = callPackage ../applications/misc/styx/themes.nix { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; From d76c48796e0b89fc2ea3082e2dafc5afe6cbbed0 Mon Sep 17 00:00:00 2001 From: demoslam Date: Tue, 6 Dec 2016 22:22:03 -0800 Subject: [PATCH 142/216] silver-searcher: 0.33.0 -> 1.0.2 --- pkgs/tools/text/silver-searcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 2f12020afc3..26e1f9ef275 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "0.33.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "19705cgn8h476hkfyal3s5kx9mnz64hiz6dihnrx22fa3xvjfzlg"; + sha256 = "1c504x62yxf4b5k8ixvr97g97nd4kff32flxdjnvxvcrrnany8zx"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From 08721190a5e71ead08f4283e075ad92a4628da06 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Dec 2016 14:34:43 +0800 Subject: [PATCH 143/216] dropbox: 14.4.19 -> 15.4.22 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3c1ae4b2bbd..edfa9a6d755 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 = "14.4.19"; + version = "15.4.22"; sha256 = { - "x86_64-linux" = "06ln88dx6k1d2b2wwj66gj1gyy0s3xvs7m50v8i2ycdw3d9kimkw"; - "i686-linux" = "0mil1h86r8fmzxb6d7ycwz9yqkmj66k37zxxb2x8mw15l9qndrwf"; + "x86_64-linux" = "105a64w6rxhrg2dcpb4h4a2956x2r7flf41rszhw5nnczal0s8gx"; + "i686-linux" = "001c6dfdxip67w19h3zlx8w72kvnkl1hbkj7gqvw9lixmnq82fhr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From f067bca841e788cc744b285840b53d0610d57ddf Mon Sep 17 00:00:00 2001 From: David Terry Date: Wed, 7 Dec 2016 09:06:25 +0100 Subject: [PATCH 144/216] nixos: docs: note that channels are per user --- nixos/doc/manual/installation/upgrading.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 65d395b0c88..c974523f886 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -101,6 +101,11 @@ channel by running which is equivalent to the more verbose nix-channel --update nixos; nixos-rebuild switch. +Channels are set per user. This means that running +nix-channel --add as a non root user (or without sudo) will not +affect configuration in /etc/nixos/configuration.nix + + It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database From 72004245891286f92542abd9517bc4d982eb7d06 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Wed, 7 Dec 2016 11:25:32 +0000 Subject: [PATCH 145/216] hashcat3: init at 3.10 --- .../security/hashcat/hashcat3/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/hashcat/hashcat3/default.nix diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix new file mode 100644 index 00000000000..ef41b0b2a0e --- /dev/null +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, opencl-headers, opencl-icd }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "hashcat-${version}"; + version = "3.10"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz"; + sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v"; + }; + + buildInputs = [ opencl-headers makeWrapper ]; + + makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; + + # $out is not known until the build has started. + configurePhase = '' + makeFlags="$makeFlags PREFIX=$out" + ''; + + postFixup = '' + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${opencl-icd}/lib + ''; + + meta = { + description = "Fast password cracker"; + homepage = http://hashcat.net/hashcat/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.kierdavis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b206f89402..3701d224f8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2101,6 +2101,7 @@ in hardlink = callPackage ../tools/system/hardlink { }; hashcat = callPackage ../tools/security/hashcat { }; + hashcat3 = callPackage ../tools/security/hashcat/hashcat3 { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; From 797a784d6f45e26e11e970d3668a763621bf1b3c Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 7 Dec 2016 13:16:11 +0100 Subject: [PATCH 146/216] python-mapnik: add cairo to buildInputs --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d769053f0f8..f71b48d2c53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8169,7 +8169,7 @@ in { disabled = isPyPy; doCheck = false; # doesn't find needed test data files buildInputs = with pkgs; - [ boost harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; + [ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; propagatedBuildInputs = with self; [ pillow pycairo ]; meta = with stdenv.lib; { From 76ef70af7d2bcdbac6c3ff5e182f3cbd7516f42f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 07:24:13 -0500 Subject: [PATCH 147/216] imagemagick: 6.9.6-2 -> 6.9.6-7 for CVE-2016-9556 and CVE-2016-9559 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c7d1adfdd18..1095ff97fc5 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -11,8 +11,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.6-2"; - sha256 = "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r"; + version = "6.9.6-7"; + sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From a11ad092d65d1ac63af1b9b8b6b39afa862d7c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 7 Dec 2016 13:25:18 +0100 Subject: [PATCH 148/216] digikam: remove file unintentionally resurrected ... in 8b565d647. Git's rename semantics is a real PITA. https://github.com/NixOS/nixpkgs/commit/8b565d647#commitcomment-20099695 --- pkgs/applications/graphics/digikam/5.1.nix | 120 --------------------- 1 file changed, 120 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/5.1.nix diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.1.nix deleted file mode 100644 index 6bd572e99bb..00000000000 --- a/pkgs/applications/graphics/digikam/5.1.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ stdenv, fetchurl, cmake, ecm, makeQtWrapper - -# For `digitaglinktree` -, perl, sqlite - -, qtbase -, qtxmlpatterns -, qtsvg -, qtwebkit - -, kconfigwidgets -, kcoreaddons -, kdoctools -, kfilemetadata -, knotifications -, knotifyconfig -, ktextwidgets -, kwidgetsaddons -, kxmlgui - -, bison -, boost -, eigen -, exiv2 -, flex -, jasper -, lcms2 -, lensfun -, libgphoto2 -, libkipi -, liblqr1 -, libusb1 -, marble -, mysql -, opencv -, threadweaver - -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake - -, oxygen -}: - -stdenv.mkDerivation rec { - name = "digikam-${version}"; - version = "5.1.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; - }; - - nativeBuildInputs = [ cmake ecm makeQtWrapper ]; - - buildInputs = [ - qtbase - qtxmlpatterns - qtsvg - qtwebkit - - kconfigwidgets - kcoreaddons - kdoctools - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui - - bison - boost - eigen - exiv2 - flex - jasper - lcms2 - lensfun - libgphoto2 - libkipi - liblqr1 - libusb1 - marble.unwrapped - mysql - opencv - threadweaver - - oxygen - ]; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - ]; - - fixupPhase = '' - substituteInPlace $out/bin/digitaglinktree \ - --replace "/usr/bin/perl" "${perl}/bin/perl" \ - --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - - wrapQtProgram $out/bin/digikam \ - --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" - - wrapQtProgram $out/bin/showfoto - ''; - - meta = { - description = "Photo Management Program"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.linux; - }; -} From e5cca82d7969879c1b50f1cd9325ebbbfa76839f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 6 Dec 2016 16:34:18 +0100 Subject: [PATCH 149/216] make-disk-image: run tune2fs after umount to skip fsck tune2fs marks the filesystem as clean to prevent resize2fs from complaining. But we were invoking it before we mounted the filesystem, so the counters would increase to 1 and it broke the functionality. By moving the call after the mount, I have confirmed it works by: $ nix-build nixos/tests/ec2.nix cc @rbvermaa @edolstra --- nixos/lib/make-disk-image.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 58d0cb38d75..b8411f5e5ec 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -61,9 +61,6 @@ pkgs.vmTools.runInLinuxVM ( # Create an empty filesystem and mount it. mkfs.${fsType} -L nixos $rootDisk - ${optionalString (fsType == "ext4") '' - tune2fs -c 0 -i 0 $rootDisk - ''} mkdir /mnt mount $rootDisk /mnt @@ -97,7 +94,9 @@ pkgs.vmTools.runInLinuxVM ( umount /mnt - # Do a fsck to make sure resize2fs works. - fsck.${fsType} -f -y $rootDisk + # Make sure resize2fs works + ${optionalString (fsType == "ext4") '' + tune2fs -c 0 -i 0 $rootDisk + ''} '' ) From 00b3d6957af15a22281eb2a88e732597d0b7a848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Dec 2016 01:03:18 +0100 Subject: [PATCH 150/216] pythonPackages.chameleon: 2.15 -> 2.25 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f71b48d2c53..1b08d0e6fb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9771,18 +9771,15 @@ in { chameleon = buildPythonPackage rec { - name = "Chameleon-2.15"; + name = "Chameleon-2.25"; src = pkgs.fetchurl { url = "mirror://pypi/C/Chameleon/${name}.tar.gz"; - sha256 = "bd1dfc96742c2a5b0b2adcab823bdd848e70c45a994dc4e51dd2cc31e2bae3be"; - }; + sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + } ; buildInputs = with self; [] ++ optionals isPy26 [ ordereddict unittest2 ]; - # TODO: https://github.com/malthe/chameleon/issues/139 - doCheck = false; - meta = { maintainers = with maintainers; [ garbas domenkozar ]; platforms = platforms.all; From b6363c7bc89514e14573cf806326adac46ad06a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Dec 2016 13:29:07 +0100 Subject: [PATCH 151/216] make-disk-image: make store validity fix optional This is useful for EC2 AMI generation to speedup the process. In my case it removes 13min out of 45min when generating an image on EC2. --- nixos/lib/make-disk-image.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index b8411f5e5ec..e279803f2ea 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -27,6 +27,10 @@ , name ? "nixos-disk-image" + # This prevents errors while checking nix-store validity, see + # https://github.com/NixOS/nix/issues/1134 +, fixValidity ? true + , format ? "raw" }: @@ -68,9 +72,11 @@ pkgs.vmTools.runInLinuxVM ( printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - # Add missing size/hash fields to the database. FIXME: - # exportReferencesGraph should provide these directly. - ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group "" + ${if fixValidity then '' + # Add missing size/hash fields to the database. FIXME: + # exportReferencesGraph should provide these directly. + ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group "" + '' else ""} # In case the bootloader tries to write to /dev/sda… ln -s vda /dev/xvda From c677c35922b06f8861bfd97e79c3e8803e55fe0c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 08:10:39 -0500 Subject: [PATCH 152/216] calamares: remove due to being broken and insecure. --- pkgs/tools/misc/calamares/default.nix | 57 --------------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/tools/misc/calamares/default.nix diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix deleted file mode 100644 index 9356eb36549..00000000000 --- a/pkgs/tools/misc/calamares/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted -, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "calamares"; - version = "1.1.4.2"; - - # release including submodule - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d"; - }; - - buildInputs = [ - cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted - extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart - ]; - - cmakeFlags = [ - "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" - "-DWITH_PARTITIONMANAGER=1" - ]; - - patchPhase = '' - sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ - -i calamares.desktop \ - -i com.github.calamares.calamares.policy - - sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/timezonewidget/localeconst.h \ - -i src/modules/locale/SetTimezoneJob.cpp - - sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ - -i src/modules/locale/timezonewidget/localeconst.h - - sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ - -i src/modules/keyboard/keyboardwidget/keyboardglobal.h - - sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ - -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp - ''; - - preInstall = '' - substituteInPlace cmake_install.cmake --replace "${polkit-qt}" "$out" - ''; - - meta = with stdenv.lib; { - description = "Distribution-independent installer framework"; - license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b206f89402..922af73fd20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -715,12 +715,6 @@ in caddy = callPackage ../servers/caddy { }; - calamares = qt5.callPackage ../tools/misc/calamares rec { - python = python3; - boost = pkgs.boost.override { python=python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; }; - }; - capstone = callPackage ../development/libraries/capstone { }; catch = callPackage ../development/libraries/catch { }; From e42f6a11acb1cdd5b8bb033ac275ff15e1e48d11 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 08:49:24 -0500 Subject: [PATCH 153/216] gstreamer: 1.10.1 -> 1.10.2 for multiple CVEs CVE-2016-9807, CVE-2016-9808, CVE-2016-9809, CVE-2016-9810, CVE-2016-9811, CVE-2016-9812, CVE-2016-9813, CVE-2016-9634, CVE-2016-9635, CVE-2016-9636 https://gstreamer.freedesktop.org/releases/1.10/#1.10.2 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/base/default.nix | 5 ++--- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ges/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/python/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/validate/default.nix | 5 ++--- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4e18e4d16b2..7479c153af2 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.1"; + name = "gst-plugins-bad-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk"; + sha256 = "0fisnnfpp3s8pbm6hjrfi4wjpq2da8c6w3ns9pjcg7590f9wm587"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 319f7c75a75..c3e8f3c65a1 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.1"; + name = "gst-plugins-base-1.10.2"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6"; + sha256 = "086yjwmp4fykcqkj6zqhwrk2z49981kl8x545vz2wvblrc7x9h7v"; }; outputs = [ "out" "dev" ]; @@ -44,4 +44,3 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; } - diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 55da05c4c97..8b27fa7ad3b 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.1"; + name = "gstreamer-1.10.2"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn"; + sha256 = "0rcd4ya4k99x6ngm9v78as7ql0rqibkwshc13lb4rjdszs0qw3hm"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 06776de9340..a45c190b020 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.1"; + name = "gstreamer-editing-services-1.10.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9"; + sha256 = "0hx7bwj8li88qq09slvdxlnfq76hr35nyjvd4ixrz5gmkpmrl5fv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index ba6f79c138a..fbf67fb34f5 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.1"; + name = "gst-plugins-good-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57"; + sha256 = "04rksbhjj2yz32g523cfabwqn2s3byd94dpbxghxr0p9ridk53qr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7ae10f50c4d..447b679898a 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.1"; + name = "gst-libav-1.10.2"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7"; + sha256 = "0g778j7w4vpbhwjzyrzpajvr26nxm6vqby84v8g1w1hz44v71pd3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 78127e3ce98..880b5d734d4 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -6,14 +6,14 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { - name = "gst-python-1.10.1"; + name = "gst-python-1.10.2"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak"; + sha256 = "1sljnqkxf2ix6yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index df5b682a237..981a05b4f1f 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.1"; + name = "gst-plugins-ugly-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55"; + sha256 = "17gc2zd3v6spmm2d6912sqfcyyv5f2ghdhq31f5kx5mw5r6ds0zk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index f18b9fc214d..f136df099bf 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr"; + sha256 = "1abzaj9kczap1xmalgzid1k3gqcn1ghnn76cn2kclc1gbfwd4ccy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 2f5ba2372ce..a05bbd3e9a2 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.1"; + name = "gst-validate-1.10.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7"; + sha256 = "1mwyk3b19aq78mjhmrpc7qqs9flrykrn1j763g5wx546swc489xy"; }; outputs = [ "out" "dev" ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; } - From 59134519eefd1bc2b855b7e918e3f380e8c222dc Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 7 Dec 2016 17:58:36 +0100 Subject: [PATCH 154/216] fix win-dll-link.sh setup hook (#20925) if a dll is symlink then dll files from the symlinked directory need to be taken --- pkgs/build-support/setup-hooks/win-dll-link.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index be63f69ca10..634a9d18f00 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -33,7 +33,7 @@ _linkDLLs() { # That DLL might have its own (transitive) dependencies, # so add also all DLLs from its directory to be sure. local dllPath2 - for dllPath2 in "$dllPath" "$(dirname "$dllPath")"/*.dll; do + for dllPath2 in "$dllPath" "$(dirname $(readlink "$dllPath" || echo "$dllPath"))"/*.dll; do if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi ln -sr "$dllPath2" . linkCount=$(($linkCount+1)) From 49187304d8fcd8272f0e85e4f78a603ed1055cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 7 Dec 2016 18:25:04 +0100 Subject: [PATCH 155/216] libdwarf: security 20161021 -> 20161124 /cc #20972. It seems safe API+ABI-wise: https://abi-laboratory.pro/tracker/timeline/libdwarf/ Also nitpicks: meta.homepage, etc. Note: `darwin.dtrace` probably contains an embedded copy of libdwarf, which I didn't (attempt to) fix. --- pkgs/development/libraries/libdwarf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index a064769ec84..eda68fc73d3 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20161021"; + name = "libdwarf-20161124"; src = fetchurl { url = "http://www.prevanders.net/${name}.tar.gz"; - sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd"; + sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" + + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; }; - configureFlags = " --enable-shared --disable-nonshared"; + configureFlags = [ "--enable-shared" "--disable-nonshared" ]; preConfigure = '' cd libdwarf @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://reality.sgiweb.org/davea/dwarf.html; + homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; }; } From 1039d9d7ebafa38aabe7f96e69dbedac8beb39c5 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 16:52:34 -0200 Subject: [PATCH 156/216] arc-theme: 2016-10-13 -> 2016-11-25 --- pkgs/misc/themes/arc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 09599604a47..523ac16bf6a 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arc-theme"; - version = "2016-10-13"; + version = "2016-11-25"; src = fetchFromGitHub { owner = "horst3180"; repo = pname; - rev = "a9ce9d56ae61f23592fa4a8c200085dde7b43e07"; - sha256 = "02w8nckd4q548shdgml9ndnbnq1g7nq6v8df89mx4l3lc9r6354y"; + rev = "d641d3de1641a9aa0a0f6ac1bacec91d9fdd3326"; + sha256 = "06ysd19bpqsng2bp2gqzn0wpjhldxgwvlzngrs6mkm9hr7ky5z00"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From a634fe83a32b57ebd3e98bfa69d314d0b8770958 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:10:45 -0200 Subject: [PATCH 157/216] arc-icon-theme: 2016-07-07 -> 2016-11-22 --- pkgs/data/icons/arc-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 760329a94bf..91e379de223 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "arc-icon-theme"; - version = "2016-07-07"; + version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; repo = package-name; - rev = "664c05e723ac2971feb123d7baca3d298248e7f9"; - sha256 = "10vicnrv2v7y4capvllaz9x3nzjkjj9fs1dspjjjg6if3gcif7m4"; + rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; + sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; nativeBuildInputs = [ autoreconfHook ]; From 1494ede691aaccdd9c26ecee1440e43c2966ea6a Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:27:42 -0200 Subject: [PATCH 158/216] paper-icon-theme: 2016-06-08 -> 2016-11-05 --- pkgs/data/icons/paper-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 4baaca194bf..13adb7efaaf 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2016-06-08"; + version = "2016-11-05"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "6aa0a2c8d802199d0a9f71579f136bd6476d5d8e"; - sha256 = "07ak1lnvd0gwaclkcvccjbxikh701vfi07gmjp4zcqi6b5crl7f5"; + rev = "2a1f25a47fe8fb92e9d4db5537bbddb539586602"; + sha256 = "0v956wrfraaj5qznz86q7s3zi55xd3gxmg7pzcfsw2ghgfv13swd"; }; nativeBuildInputs = [ autoreconfHook ]; From 1678119dcc9ce7623bd8ad0932cdaa9d0486a1b9 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:38:07 -0200 Subject: [PATCH 159/216] paper-gtk-theme: 2016-05-27 -> 2016.08-16 --- pkgs/misc/themes/paper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix index 5dfb54fa493..32883127c06 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation rec { - version = "2016-05-27"; + version = "2016-08-16"; name = "paper-gtk-theme-${version}"; src = fetchFromGitHub { owner = "snwh"; repo = "paper-gtk-theme"; - rev = "06fb8b41743dd99410c08a9beabc323e6631d009"; - sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni"; + rev = "f75724fd76fd2e5681a367cca246a51f845320c3"; + sha256 = "0dqllzjk9ggnbh8vvy2c81p3wq6cj73r30hk7gqhrn8i91w8p896"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; homepage = "http://snwh.org/paper"; license = licenses.gpl3; - maintainers = [ maintainers.simonvandel maintainers.romildo ]; platforms = platforms.linux; + maintainers = [ maintainers.simonvandel maintainers.romildo ]; }; } From dd5eb0d03af850977934d71ebffaaa1ca6c66cbc Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:56:14 -0200 Subject: [PATCH 160/216] elementary-icon-theme: 4.0.1 -> 4.0.1.1 --- pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index b15e8dea5bc..008a4112531 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.1.1"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "0cbgbd9fqxk6rbsrj0gbh1rcapkkdlaig79kilq798v94jfdskrl"; + sha256 = "1p20569lxgkif4gzvgpisd8vg93zxd6447y634lv7ay85nq4lx76"; }; dontBuild = true; From 979a1a10438de2fa7822376b077aa4d2d25c4786 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 18:33:28 -0200 Subject: [PATCH 161/216] numix-icon-theme: 2016-10-05 -> 2016-11-13 --- pkgs/data/icons/numix-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index be224f418e8..8732172ead4 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-10-05"; + version = "2016-11-13"; package-name = "numix-icon-theme"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "e03eb71454c176a98733eafa268ff79995f8159d"; - sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi"; + rev = "45878a1195abd997341c91d51381625644f9a356"; + sha256 = "0in7vx8mdwbfkgylh9p95kcsnn7dnv2vpmv788n0bbgldxmrldga"; }; dontBuild = true; From 0a0996969321f2557a645eb6033312b7da7192a5 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 18:45:25 -0200 Subject: [PATCH 162/216] numix-gtk-theme: 2016-06-12 -> 2016-11-19 --- pkgs/misc/themes/numix/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index b8dac254009..740bafe8bd4 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2016-06-12"; + version = "2016-11-19"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "1d941a15971f43fb2f5675c7059bf313b78797fc"; - sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i"; + rev = "0e4a840bd1ec434ba660418caaa59ada05d8660e"; + sha256 = "09nacjwrl5k3dgji2smdv6q5v23qjzfayic044bnjfm5d3p3yf6n"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out + patchShebangs . ''; meta = { From 41256881bf8407cfc07370059634030574830090 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 7 Dec 2016 15:01:32 +0000 Subject: [PATCH 163/216] gti: 2015-05-21 -> 2016-12-07 No need to replace gcc with cc thanks to https://github.com/rwos/gti/pull/26 --- pkgs/tools/misc/gti/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 3705dd832e9..726c7a115ee 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { name = "gti-${version}"; - version = "2015-05-21"; + version = "2016-12-07"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; - rev = "edaac795b0b0ff01f2347789f96c740c764bf376"; - sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn"; + rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32"; + sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr"; }; - prePatch = '' - substituteInPlace Makefile --replace gcc cc - ''; - installPhase = '' mkdir -p $out/bin $out/share/man/man6 cp gti $out/bin From 6f0564bb8cbdc2d85ad82d27d9ea93ec0c6970f6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 3 Dec 2016 04:22:13 -0500 Subject: [PATCH 164/216] melpa-packages: 2016-12-07 Removals: - debian-bug: cvs server timed out - elang: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1739 +++++++++-------- 1 file changed, 953 insertions(+), 786 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 7214f1c850d..8ac53e85728 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20150906.1008"; + version = "20161202.725"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "6b3365063ddfb88d5527618217bb56166349ad4e"; - sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5"; + rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; + sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -464,8 +464,8 @@ src = fetchFromGitHub { owner = "xiaohanyu"; repo = "ac-geiser"; - rev = "cecfcf1a5c4be580b9337d9f4f9337c6ae1e0d91"; - sha256 = "0zaia963kpnqmlxafp0m0jibzz6fvvjj7f1v4lcwb9cvs2b7vq1m"; + rev = "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a"; + sha256 = "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser"; @@ -985,12 +985,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160925.1210"; + version = "20161203.1059"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "822628e39345b77f9444fdfc17bd660b7831e536"; - sha256 = "002wi64awig3kdyihqdisxsfaiailyjw90ah9j1i6qqasgvm9acn"; + rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a"; + sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1173,12 +1173,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20161123.407"; + version = "20161130.150"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "98bb27cea55250bbd32e44002b48cd59e436c089"; - sha256 = "0lv7jn4s0fb995z3hy2s3z22yg69zncxc9hwsmpdgh56ds1mw68i"; + rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; + sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1299,12 +1299,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20161016.1016"; + version = "20161201.1001"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "a8c462fbc03ef74e65f4d4a323ae3581f99e9683"; - sha256 = "00j7mvzn1qsbk5xcw4h2wzwp1wzjvdn9qa3s0laa9x33k6kpxbha"; + rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c"; + sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1570,12 +1570,12 @@ all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-dired"; - version = "20161113.1217"; + version = "20161203.605"; src = fetchFromGitHub { owner = "jtbm37"; repo = "all-the-icons-dired"; - rev = "e0244106e06a7cf769bcf36a34fff211d8f67e62"; - sha256 = "1xgp72ycnl1m1lx3cnygd0nssn6nr0x543rq1cmdxdr6snf5j152"; + rev = "3ccab8ae4113e03ff2c7b103d388fa6ec1447d9c"; + sha256 = "0rbcbhsw5js9wx29pp65s7q6mxhbz1jskhvzl0k4gqlk4m6gqcxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired"; @@ -1591,12 +1591,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161116.534"; + version = "20161124.550"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; - sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; + rev = "977b53e28b3141408fff4814be8b67ee23650cac"; + sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -2081,11 +2081,11 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20160822.1852"; + version = "20161207.238"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; - rev = "86560874b1c77932502efd42727b783ebc2d173b"; - sha256 = "1ng89ajvhrzbp7cfpb6vhq7507ybi18gicn0j89m3yrl7vfiwx4n"; + rev = "43e88980a29618dc03f96ce38b67b2a7caadd9d9"; + sha256 = "0dcaqss1b3myn8b4xfpyhnp9h2xniainayflhhgdk88y7vbfx0j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; @@ -2696,12 +2696,12 @@ assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20161114.1451"; + version = "20161203.327"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "9521b074808d30c50d45eba7d5c186c79d165e8c"; - sha256 = "164kapf9n5gqgnsg3rrlb5r2j9sq5yn7kf1bd1vfh3i5zdlhl0wy"; + rev = "47ce039423f660174d097698615aaad6c77e87fb"; + sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; @@ -3820,12 +3820,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20161005.720"; + version = "20161129.621"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "591102f3826b1ab0731866a4926e708e6fc014cc"; - sha256 = "0cwrk8iaibd280w4c5yr0swfglsx9fwjqqshky2m1fc5kf332vpv"; + rev = "f7861aa9607c0f05b3336443df5380a6daba0485"; + sha256 = "0vxam51g7r4wixw7w8frk1af6m5n7bswjbjya77dnwxcizgwiq6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3904,8 +3904,8 @@ version = "20161120.1200"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "485778b352fd"; - sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; + rev = "110e20a7a86c"; + sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -5236,7 +5236,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20161118.1618"; + version = "20161127.1727"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; @@ -5276,12 +5276,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161116.1212"; + version = "20161125.448"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "0ca91753aeb3a523b56e745f83087017ffefd5de"; - sha256 = "04zv2kl3mvn61k9zwr6j7scxv8mfi13gvnyx1hdzbrb28dw22dg3"; + rev = "981d5becae30a31b6ef4f87680386148d0535455"; + sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5814,12 +5814,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161115.1058"; + version = "20161122.946"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "76f45f8c821cc5f2e0da721a0ad025b625feaa70"; - sha256 = "1nx99a50g123jxrlnbpxn5i8imh8320jjsh9r067iqbj6dl3hajf"; + rev = "65884653411b116029680d6c3154edd0eb9e5e9a"; + sha256 = "1xiy7q79zbqyf0phq97zgkprj0j577xbnh24zh3fbs9i6nbiv46x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6341,7 +6341,7 @@ version = "20151009.845"; src = fetchsvn { url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16554"; + rev = "16555"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6551,8 +6551,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6593,8 +6593,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6780,8 +6780,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "26e76a63dd9b5fe3c9bddec93c3fd65e3436a595"; - sha256 = "18xr1hz602y684f1hzg3k5qnkxkymkw7r4ssbgxql6gpjqxpk918"; + rev = "334d1fc9b5638725ac7454dee5e95ea4f6ba8793"; + sha256 = "1n8bz9j5qwkbyfp4jf5wr1injwybwnm66hp2rlfqnlrf9w54pyi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6820,7 +6820,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11894"; + rev = "11909"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -7171,12 +7171,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161117.524"; + version = "20161123.1614"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "2636a572b6d3b3b529658db465fc5eebc75859fb"; - sha256 = "0hyafgarsriw678arwim4n1jg31zf41yzjsmgpfcd0nn9gpb1q0q"; + rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f"; + sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7399,12 +7399,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20161121.312"; + version = "20161201.757"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "adab93a7a2b00e03b75aa6086b0457a2e94cc85e"; - sha256 = "1nrpdah0n7ym0mhk59ifpndxnyi1myv6bwvk1b9m87r7mbw2zzw0"; + rev = "d19cf7d9d36c93eda56e1de63705a9c6c92e92ef"; + sha256 = "1hn6kzbz3n1jxfsv23m49b0rjjzh7inf4klm31avhyndgas3bvgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7675,8 +7675,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "287759"; - sha256 = "1z80wgs7p8xhlfpdisyhhpk4ha0azpbicrp8hqlkrzn7rmlgmiij"; + rev = "288906"; + sha256 = "0m24mss1ra1k46vn473qlnjbm0zzw4s154gnhf0lpk4f80b9wy11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7881,12 +7881,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 = "20161005.344"; + version = "20161127.1306"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "8bacd65fb89a530f8e72b5ee78593e7dfcef57e3"; - sha256 = "1pj72q9mqjj22h5cplxgplp1wcljcyg46ni8j6xh3ys3j8bs3jyp"; + rev = "0be07c6ca67a9ef52022286342c22eb4e0f3133c"; + sha256 = "0g113b4mm5ggb67vmj57zy6p1q61pzff9hq06y2sm5lx8r5a3rk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8145,12 +8145,12 @@ clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20161122.316"; + version = "20161124.552"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "cbc902307a158949f3060fde1d2994b5c8e6aa6c"; - sha256 = "0lb93vf8kh92c026x7mjkzx46gvddadlc6mps1kzy3vyrp0vj3p1"; + rev = "0938671fef3311c5d7c1e46e06d5264e98254c96"; + sha256 = "08qaw7g5mldi886hr0i46wihmij2sip81bdj9p8r4zmvm1gxly00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8163,6 +8163,27 @@ license = lib.licenses.free; }; }) {}; + closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "closql"; + version = "20161130.925"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "closql"; + rev = "8b063e70808049210b749164b8f22f56924b9949"; + sha256 = "1qhm8zmidinr35lk0pff6nla3d05cqf81hjb55yrwvdvyr5gyl1k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; + sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; + name = "closql"; + }; + packageRequires = [ emacs emacsql-sqlite ]; + meta = { + homepage = "https://melpa.org/#/closql"; + license = lib.licenses.free; + }; + }) {}; closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; @@ -8271,12 +8292,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20161023.1225"; + version = "20161203.804"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "16449deab6d160c7f0d3d0e50013b6606e958138"; - sha256 = "0fhahc1c8a7qdndgj4gp1lkxw6k80m8ajab8z9w4r8793gbvdrd8"; + rev = "379f8a45e6a210da53b7ee76f081420f371a2c2f"; + sha256 = "189pvk3kgay05s671dq4xsqvvylz7rl38djr3hw5finjkrb26rkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8296,8 +8317,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "8288d16126193e86bb6880a7d7b749649ad83e2c"; - sha256 = "1667641a08jhxv6n0ni1k8pdn42bf6qg3bj5z7h9mn8kl0jsq6ha"; + rev = "b620772b11fe396194148ec4768bd59ad89fb91f"; + sha256 = "1n057g3fmycy6j0yw8a0avn1iblp0ymn24x2dv3b3pff26w7xfhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8331,22 +8352,22 @@ license = lib.licenses.free; }; }) {}; - cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shell-split-string }: melpaBuild { pname = "cmd-to-echo"; - version = "20161105.505"; + version = "20161203.1333"; src = fetchFromGitHub { owner = "mallt"; repo = "cmd-to-echo"; - rev = "b8915d5f0a79767c29f38ccb7b4416390436e932"; - sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa"; + rev = "e0e874fc0e1ad6d291e39ed76023445297ad438a"; + sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; name = "cmd-to-echo"; }; - packageRequires = [ emacs s ]; + packageRequires = [ emacs s shell-split-string ]; meta = { homepage = "https://melpa.org/#/cmd-to-echo"; license = lib.licenses.free; @@ -8559,22 +8580,22 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20160808.1712"; + version = "20161124.832"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "026222983aee3842f6ddac9024364dcaacd9a73e"; - sha256 = "13icfx0h89hb2180srqnvrm415cijn2v5l8i8hdv820wkd2v9lx8"; + rev = "d7d554cbf435aa875fbf56e67c4374375a164a93"; + sha256 = "1glif3jxh31cmy2rgz39bc2bbrlgh87v5wd5c93f7slb45gkinqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1"; name = "coffee-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/coffee-mode"; license = lib.licenses.free; @@ -9039,12 +9060,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20161113.1747"; + version = "20161126.1629"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "1c516df435577b2c85995c1cbe80a9968d9ae6a0"; - sha256 = "0s2dkxp1lzpma0jddh4k2fn78nsnkggcsvih4faankh05jay9i7b"; + rev = "ec7a8608853f41d42c357f214de069ae06c9d576"; + sha256 = "13bdf1h09v6vn5947pl9hg90wp0ch6ng713fnwglca6lk5rf5fqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9215,12 +9236,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20160715.344"; + version = "20161201.631"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "1929d2172875a27133d06196cd3427b7c475b7c5"; - sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr"; + rev = "20f3ede0ca3a90a68b700704bff830ca18598f73"; + sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9331,8 +9352,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9925,8 +9946,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10169,22 +10190,22 @@ license = lib.licenses.free; }; }) {}; - copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copyit"; - version = "20160607.1005"; + version = "20161126.429"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; - sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; + rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; + sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit"; sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0"; name = "copyit"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/copyit"; license = lib.licenses.free; @@ -10197,8 +10218,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; - sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; + rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; + sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc"; @@ -10256,12 +10277,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161119.850"; + version = "20161207.331"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10316,6 +10337,27 @@ license = lib.licenses.free; }; }) {}; + counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-gtags"; + version = "20161024.633"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-counsel-gtags"; + rev = "59e7abc97715507e3c524a3e7132d38ed7ab0a12"; + sha256 = "01i1ilp87hg9s5bh4n7msf8ljx9h7ml3cxlawqh7y8c04m83yamp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; + sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + name = "counsel-gtags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-gtags"; + license = lib.licenses.free; + }; + }) {}; counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; @@ -10340,12 +10382,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20161022.1525"; + version = "20161204.1156"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "675d17d2dc8c5016e6aecff76af3bd39ec4c5536"; - sha256 = "0x9lfavgm7pgnxqsn530mjdv2qdl0vcp20irg2g26cy16y555w7k"; + rev = "86ddf43616f2560f2b60b3f154783af25cd2e03b"; + sha256 = "1plr44jaznk1kdphjb7wm1mnxxg75fm6s0pnqmxmi6830gfviylh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10445,12 +10487,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20160928.549"; + version = "20161201.1441"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "6ea0b6abb1274f61e47c2a0cc09451d6824f7a60"; - sha256 = "1691dk3iqswljhjap6g5n3lfskkwz3k0dg3yk6ga84ys586mm804"; + rev = "2c48c1bacee286d927038bf0c893678931f0f956"; + sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -10610,22 +10652,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }: + cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20160703.158"; + version = "20161130.2036"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b"; - sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92"; + rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; + sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; name = "cricbuzz"; }; - packageRequires = [ enlive ]; + packageRequires = [ dash enlive s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -10988,8 +11030,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d"; - sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk"; + rev = "f66ed8d4cf4cd9caa26351e27185329ca74c4cc5"; + sha256 = "0yh4hynpq7wxwnl10nrhfbxa160p8d211637x665rqqcgsc40sp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11273,8 +11315,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "530729168f51e071bbff6259dab6426425777e92"; - sha256 = "15nq08fhxg02ilmin6y0119y85z2y1rnllgj8g12kg71zghqwj0s"; + rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; + sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11374,12 +11416,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161121.123"; + version = "20161128.545"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "8fd6c58d0d7ce9df77f465a456e3c3fe2e00ec0a"; - sha256 = "0bbw4bvrxfhg9fmm9fp1p3cwr1j9z9kysmk3n0jq5xryxsnpk8kl"; + rev = "daf31ca666a2b82d305b60255234b84d70b8d037"; + sha256 = "1172qv32z80nafcmj4b60bv678ab565w9smpsdpvravrp5z4sdca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11395,12 +11437,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20161120.1330"; + version = "20161125.455"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "9f1d1120326fa9028770b33a150c7dfee49d6de4"; - sha256 = "0n76vywm6nsmlhq9papaxnqi2mwg9sszjgzxpxz0bi1y30a392ll"; + rev = "6280169aec81fe9deb3a78d722ae0ab15866e78e"; + sha256 = "0vdvs76bhrq07ak25vasg6pq1hfdjhksl325g5idsjjnhvb0mp83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11689,12 +11731,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20161121.1329"; + version = "20161204.1138"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; - sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; + sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; @@ -11878,12 +11920,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20161110.548"; + version = "20161127.118"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -11896,26 +11938,6 @@ license = lib.licenses.free; }; }) {}; - debian-bug = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "debian-bug"; - version = "20140131.929"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el"; - module = "emacs-goodies-el"; - sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-bug"; - sha256 = "0qlksbiw9qb0bv85b3rimsmzfr8dhbjjg4h0wnx7x434m6wqlm1a"; - name = "debian-bug"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/debian-bug"; - license = lib.licenses.free; - }; - }) {}; debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "debpaste"; @@ -12813,12 +12835,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "20161030.1510"; + version = "20161206.130"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "6869d1aee10317f2d4fc49d343d642d422b7117b"; - sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb"; + rev = "4397e7858d5e63c251acc2741d78fe8e178cb206"; + sha256 = "0g97lii8n9pal46kipw59nj78qv3l0gpy6rwbd702gxccj94glgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -13867,12 +13889,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161031.249"; + version = "20161123.2356"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; - sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; + rev = "074156c4cc5e71fcd9dc4bfb68792403acfdaa16"; + sha256 = "0shsh1rj01a6bcr6sm073p60spy61vqnr8nhkcfa6lh2ccigxv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14022,12 +14044,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161118.1805"; + version = "20161206.2238"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "4074e83f9c6426aa3b9129b1510aa97b281d9e90"; - sha256 = "0a3c3q9acxk8i94lrhg0cccz58zr34xhphfh7q1140qfvgv0h1ql"; + rev = "d27dc431972d4b645cc41412e6fe052bf8d9f061"; + sha256 = "1pqmbq4lbcyxhkzqxany8il9crh8sqgaamn45fbjrm70g6g80yak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14470,7 +14492,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1770969"; + rev = "1773071"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14571,12 +14593,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161120.1027"; + version = "20161126.2045"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "358f2687d1adc536b5fde9b14e24ebeb1e9f458f"; - sha256 = "1g293b0yfhg1ncbnqyjm2ccm098jd9q4yb0xj85nz78ilf91ff19"; + rev = "14a6751d3858a21a8d4bdeff18f7f7b07daf056d"; + sha256 = "1khnzv5kzw2654yjalnvabdxrp3ahjl9sfl1x28l4valm8b5ndj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -15095,12 +15117,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161114.205"; + version = "20161206.1633"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "e4e9e261f7420763b82f509e35cb6802f83cb15f"; - sha256 = "1kcbciayn8i3cmw8bxikpdrk9z3i66h1zgnbnbjm84xvxppins61"; + rev = "87546fbf0202ca4f476b77f8afaaa532f38dd2d9"; + sha256 = "0wwk3xv0qv9fl7crdfbldsnwxwnhqqsq0kgyp4vfwjqyrj78cb66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15116,12 +15138,12 @@ ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebib-handy"; - version = "20160509.1556"; + version = "20161126.140"; src = fetchFromGitHub { owner = "tumashu"; repo = "ebib-handy"; - rev = "62215c400934a5d5c98bcb906d122b1e6f71b7c2"; - sha256 = "0z89gggdgy2icnc6vwwbqbpnzbixxm6njgkz37zrrpwk23jsx1pb"; + rev = "e4815b2d127300361b8528681d2d36ad5465e574"; + sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy"; @@ -15176,12 +15198,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20161019.838"; + version = "20161206.908"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15467,6 +15489,27 @@ license = lib.licenses.free; }; }) {}; + edit-indirect-region-latex = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild }: + melpaBuild { + pname = "edit-indirect-region-latex"; + version = "20161128.2245"; + src = fetchFromGitHub { + owner = "niitsuma"; + repo = "edit-indirect-region-latex"; + rev = "05043f2c0c9838947d3ca4b51b695deb7c47612e"; + sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/688f0b6802d04d133afc3de7371f65b8d5d2bad4/recipes/edit-indirect-region-latex"; + sha256 = "0lsqz09c4p2gl1xd673783hmmh7y5iq4kw521q7hiza4xbaiwpr3"; + name = "edit-indirect-region-latex"; + }; + packageRequires = [ edit-indirect emacs ht ]; + meta = { + homepage = "https://melpa.org/#/edit-indirect-region-latex"; + license = lib.licenses.free; + }; + }) {}; edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-list"; @@ -15533,12 +15576,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161108.6"; + version = "20161205.1743"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "6006bdf8a524b57e54de09309e98439226ed9e33"; - sha256 = "0hc0av6s8qn3aym9bw541j9c25fxn0hds3f28aavdsj8c67d482z"; + rev = "627588cdecba03faad831fae380f1540551b893f"; + sha256 = "0yivg6caiqhflijj8m24nl2s3klazy3sbd2bli145hrddfjhzn8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15693,8 +15736,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "c886d70c85d57e93c6c73499bc7416c66fe28bfb"; - sha256 = "06bsq8vgalblz4wwlaq6visv3ip2dbg9q094iavxnv2536mkylvm"; + rev = "60c403e10a530ac503367bc538d9d0f48478089e"; + sha256 = "0y3g5n77qph41d07zblj962g247j9bzcp28mdp80k229w1j8x90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15771,12 +15814,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161116.1344"; + version = "20161205.1432"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "7d82b45f537cd18cbce858591d9c76a5ce6c291d"; - sha256 = "1ndnwpcyg8aqcidxc527gp90q6snls3490diijxcy7483k9z2awk"; + rev = "0805f4b15419bb92641bf09735be9bc2c72a3838"; + sha256 = "07d26n946j19v0swx89d53mdsw1w3ar85ickswhj5fz1m3g9r4fc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15813,12 +15856,12 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20161111.854"; + version = "20161207.410"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "de50a6296707d8db9ee0d3ffd001bae89d5e7e4a"; - sha256 = "0v3z48jnlbg3xwbv58kgi55b8q65gac66062yykcg3p7qcyx0az8"; + rev = "40e7a7d31ee160175aa89583609d3f953fb066c6"; + sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -15880,8 +15923,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "417fbc84e2458954969d748b1dac504f126cdecc"; - sha256 = "175xgcd2lymgyzk2fgiws1zycwcaljhjzdinimhxziz6v7007sy5"; + rev = "840c4b1c8aecde69e79c5ec944a62fb8e9e82f74"; + sha256 = "1nvd2jlb3qaharij3hqcp98vzawyf4p0f72fwd61ld13bmxlxyvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16122,27 +16165,6 @@ license = lib.licenses.free; }; }) {}; - elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { - pname = "elang"; - version = "20160104.656"; - src = fetchFromGitHub { - owner = "vkazanov"; - repo = "elang"; - rev = "30dc30c2c55e902fb213865aa79e2cbbc0dbc88e"; - sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang"; - sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy"; - name = "elang"; - }; - packageRequires = [ names ]; - meta = { - homepage = "https://melpa.org/#/elang"; - license = lib.licenses.free; - }; - }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -16227,12 +16249,12 @@ electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-spacing"; - version = "20161113.916"; + version = "20161127.720"; src = fetchFromGitHub { owner = "xwl"; repo = "electric-spacing"; - rev = "7231d6e238420c32af0dec4ad82f7ca1d17f4344"; - sha256 = "1xy9ibkvkndqxpbsia43l0g53yjf2idf99rhdcsf9xqyaknchx2q"; + rev = "b9a4bb5e9a5867d089779e62e1e51072ffc3c8f8"; + sha256 = "0a7ikd46xwjpc8ya2cb75xabrihn58ihk4r1wpsqj6dkhifch47p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing"; @@ -16465,12 +16487,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161114.1550"; + version = "20161205.444"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "5d55d0ffc5aa0d12ebcedb027d0a307564238ecd"; - sha256 = "0x6vqldg0nmgx5kzijamygmba7hlhnniyf6k1s3mdy5w8ib6vd6a"; + rev = "412dafa219ab4eac6eddcc793588d26d2df6fe21"; + sha256 = "0nl39ikk8nlc0xar8r8s2g9dp2n52qi1gmksnck7klbphmw6xx3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16801,12 +16823,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161028.215"; + version = "20161125.56"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; - sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; + rev = "1332a08d5895acc5d14f23dea927fb8e715bd415"; + sha256 = "1alsygm1n24y4asf0l0bgg3l0i628m7xpva8xfw1vw69r06dvypp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -17332,12 +17354,12 @@ emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emlib"; - version = "20161113.829"; + version = "20161126.723"; src = fetchFromGitHub { owner = "narendraj9"; repo = "emlib"; - rev = "818254e86fccb45c7b938d149a588ceae43c29d2"; - sha256 = "0zr26za7n0s07c1gz7jxscpdwspi2rkljzcjblvgg0zy7p0g09cg"; + rev = "dea2af00f551ea580c641d86dd69219f7d4f3685"; + sha256 = "0p52pkq3wvnhg0l7cribhc39zl1cjjxgw9qzpmwd0jw1g1lslwbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib"; @@ -17456,12 +17478,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20160724.729"; + version = "20161204.633"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d3e3bace6b648f5b60d833a72a50603545102934"; - sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; + rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; + sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -17645,12 +17667,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160928.550"; + version = "20161124.940"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; - sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; + rev = "62609316f269bed9e6775f9614783789a79268e7"; + sha256 = "04wwi7f6cma1s0nhw2k756k3x3sjsc5s7iq1q6zlq4wmz08czg6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -17687,12 +17709,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 = "20160613.1430"; + version = "20161206.1325"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "27f324c5da2f7c5a13f1f5e970606cf45f24199f"; - sha256 = "10pbs3wk40ahskz63gfjkqrsj86fy363w50bzlm5ipa82plwgic0"; + rev = "d1b2db7b4aa60379528c68753e0fb7952c803830"; + sha256 = "0y01flz5q3q9kdxgw9n4bxagygvy73y6x5k83kyxrjiz4m3xz21p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -17867,12 +17889,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161110.1316"; + version = "20161203.1059"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "d46a4fda456f42f71e8a2ef91347f463f81cf2f6"; - sha256 = "0s2351irpi29ry29cvzix1603n41qp2smgfgcylq14d38xz9a0jc"; + rev = "8a0e14c292814c072633681bc8d06a8b821be052"; + sha256 = "1xfnj7khfqx6m1121jlym35bfw3dgw1p5kx6qs0g15s8bnjbp3bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17977,6 +17999,27 @@ license = lib.licenses.free; }; }) {}; + epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "epkg"; + version = "20161201.1358"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "epkg"; + rev = "846c5ee182e6572af3034c5b43d439a6c915d243"; + sha256 = "17i68vsl1grffs7j5n7lzkwi870fci7y84q5i7qwvip3vhpxlczr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; + sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; + name = "epkg"; + }; + packageRequires = [ closql dash emacs ]; + meta = { + homepage = "https://melpa.org/#/epkg"; + license = lib.licenses.free; + }; + }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -18441,12 +18484,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161122.2237"; + version = "20161206.1258"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "427d0e47afe66d0c870c026ba5b8a93bb0b76415"; - sha256 = "0g783js3hi7i3q23mca422w3zlxv2i5f1l838ddwxyzzdzyg5if5"; + rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c"; + sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18483,12 +18526,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161108.47"; + version = "20161129.304"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "8fade0888ff75fafb2abb512cfb97bcb5472fec1"; - sha256 = "07jksnfp4xwl1059pj2aphc5saqbcgsfixy7bhz3k70j9zv6dgad"; + rev = "a0d365fc3c41464e77d24942aa3255788c5959a5"; + sha256 = "0sikbfbh8im6lrgylbnidgz7jzz3prip5xxmj1vx077jsbs263al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18812,22 +18855,22 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20160509.138"; + version = "20161126.758"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf"; - sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0"; + rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; + sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; name = "eshell-git-prompt"; }; - packageRequires = [ cl-lib dash emacs s ]; + packageRequires = [ cl-lib dash emacs ]; meta = { homepage = "https://melpa.org/#/eshell-git-prompt"; license = lib.licenses.free; @@ -18878,12 +18921,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20151110.2046"; + version = "20161206.2249"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "5a1317a58d9761c200d0ad49dc4793dec9f9490f"; - sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0"; + rev = "033924f138f19f22a30c1845e728691e5615fa38"; + sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -19652,8 +19695,8 @@ src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-exchange"; - rev = "6e80e2509bcc14d84ca04e3c463c04e4c999efa4"; - sha256 = "1ffhkl7ssfbngvgdjaxqdihi246lgcsgwqc5m8lil7s00xrj3gw2"; + rev = "8902966aec2709b7e680d13c362d74b7f89b909b"; + sha256 = "1jfjgh75ycm6i01zpnz8y1hp205w61rqbvargk3rp65c34j48dcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange"; @@ -19858,12 +19901,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20160728.751"; + version = "20161130.847"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; - sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; + rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d"; + sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -19897,22 +19940,22 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20161121.418"; + version = "20161130.454"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "8a56092b38755de9f314faa3b137805bd5ce5fef"; - sha256 = "1i0gfhc0pi67dl451i2n6sn20mxp7nr6py43zrahrjwakh5xqhfg"; + rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; + sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; name = "evil-matchit"; }; - packageRequires = []; + packageRequires = [ evil ]; meta = { homepage = "https://melpa.org/#/evil-matchit"; license = lib.licenses.free; @@ -19921,12 +19964,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161122.812"; + version = "20161123.1318"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "6d260c2badf52dca81aa3589d16ce6684b5ecc3e"; - sha256 = "1k55xipsscs059rbsxidk7w1zlxlyslhwaag36i4i3plhh1zwl9f"; + rev = "5db7d1cb39d3193089407deee4a2b21a5b1ef782"; + sha256 = "1lghqmdlbz56a9g0p5r4wgw24zj8ymqjarx03zxqqmjigy9792h4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20149,6 +20192,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-register"; + version = "20161127.2159"; + src = fetchFromGitHub { + owner = "Dewdrops"; + repo = "evil-ReplaceWithRegister"; + rev = "c979aa2f4d730d2a741358e357d18544edd46cd2"; + sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; + sha256 = "0qyym6vwjs0aqf2p28rh96v30pgxg060pxyij0vrfj469wzmlrj9"; + name = "evil-replace-with-register"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-register"; + license = lib.licenses.free; + }; + }) {}; evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-rsi"; @@ -21107,12 +21171,12 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20151207.2316"; + version = "20161203.2208"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "8726a367048054add81ecea7543de00688056735"; - sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5"; + rev = "9883cf23f632357fa42ffde3e4942bf9022a4fac"; + sha256 = "12i5n7aw9nhlh1ghj98jsigbj55qx85v0i8j154sqv7spx8anf2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; @@ -21397,8 +21461,8 @@ src = fetchFromGitHub { owner = "snarfed"; repo = "fillcode"; - rev = "ae5f6c6de81a7681c8f883e7fce36fd0f2b3c1e8"; - sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47"; + rev = "1f64f0303a3157eabec355fd155571bb0c042489"; + sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode"; @@ -21455,10 +21519,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20160515.950"; + version = "20161128.1426"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "0a2wgdrj6yxvpmzqiqpgzj3gbf04fvbhrfa3213hiah1k9l066m5"; + sha256 = "1h4q2v88wvfmzdmaqnp9fywna7n9a94kziz6hjdf1xhc5a7lxqsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -21474,12 +21538,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20161026.145"; + version = "20161202.2205"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc"; - sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6"; + rev = "1c50ca72acd816c5d5b3fbdb605bbd85a0172b11"; + sha256 = "0nzn5bccxr8nsxqbc2gx17hrydbx511h4ba6bz3gaf78qfppn2ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22098,12 +22162,12 @@ fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; - version = "20161112.1659"; + version = "20161124.1145"; src = fetchFromGitHub { owner = "defaultxr"; repo = "fluxus-mode"; - rev = "512b104fbcd5f70dcdc7ae58c627340f036ae133"; - sha256 = "054wahxnx204y8bqmmq1824caidwvvnlr2l88ar4ax0l5bmhxdyg"; + rev = "6670eeda008e2f0180e549624da708d5aa3599f6"; + sha256 = "1r2i88qv7zxcgccvyxpgq36ilsv3rdplx52pvd6kvfcw7whym205"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode"; @@ -23106,12 +23170,12 @@ flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: melpaBuild { pname = "flycheck-scala-sbt"; - version = "20161122.1022"; + version = "20161127.1321"; src = fetchFromGitHub { owner = "rjmac"; repo = "flycheck-scala-sbt"; - rev = "1e78ac4922a8073ba6ec78672404a2008233f9ca"; - sha256 = "0iqrr56zgk8yvjc6wvz34pjv1nki6zj8g9b8i0kha31y8pz4n2sy"; + rev = "5b2c7a24b5b57573d0f9dbc759158bf90fa305da"; + sha256 = "08p2acxa8irqb75d6ygk4rvh3i25faz06ilmqj3a3lf0xs0v5adc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; @@ -23236,8 +23300,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -24426,12 +24490,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161120.1244"; + version = "20161201.113"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "312f3860aa84793bec30b3f5410b786ad3b45f2a"; - sha256 = "03b3z2qlv5rv5a47xpzlg5da1wc4hj24kpqh83j5wrpbddc8lans"; + rev = "0d22cedbaf2530386eeb5faff8feef6a7a25ee82"; + sha256 = "1y3kr2k7h7w7d8k2ivj06fy4cqhw7gin39id2m3zfidq1cln02aw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode"; @@ -24489,12 +24553,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20161011.2319"; + version = "20161207.141"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "bba892a595efa1e376637dab6b31473faffdf754"; - sha256 = "0c77dkc5rqzybym2n7mqi5jhkr1g0r77yrfmbpakbc2l0550bg8r"; + rev = "cd164b75fdad957a8ac2548d0ddff84ae3359488"; + sha256 = "01dlnkzm2rl6lli2r9rz8kd9w4xp236ag6i3gdr5raflylf2yxp4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -24712,12 +24776,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20161103.300"; + version = "20161130.653"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "cb70988aae85b03a26be9b3e2a70742658ff2502"; - sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8"; + rev = "22cf1815574c2d463c6a790afc7378db9d701fc2"; + sha256 = "1jqh518kn5c7gk8dqbx28inq71a1i95qafixa5kbh8my6kka7yr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24762,11 +24826,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20161007.2213"; + version = "20161123.2000"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "0590ebf914cad5794ca22e052a5df4c93d3fb924"; - sha256 = "0k77ls6rxr6nax39b5f1gzhj3rr4yzinp354dqqvz82yc473pnb0"; + rev = "4e3fe96d3db816da1a1e252eb3a9c1d6424fa786"; + sha256 = "0fm2wxll3y5ypjqp324znzi94dpxpkbn9s0zf2klgjzd8mb97x5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25028,12 +25092,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20160320.228"; + version = "20161203.231"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f"; - sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2"; + rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; + sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25110,12 +25174,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20161122.117"; + version = "20161201.1330"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "2ce3a7ef135f570239820d37fd6e7a338a680c27"; - sha256 = "1l9qw6zglna3wvrvayiqfl65vn19i5hrv3mrk05yj3lvi6h4wh70"; + rev = "04fd7b24c705e1ea1c8b3b8e4ff178ed7ecc6d12"; + sha256 = "1jsfgm57i928wgn4540m48jady61i7k0bka1mw1i462m3wc62nba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25173,12 +25237,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161109.950"; + version = "20161202.1657"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "847ccd4f86714ba145f2b19af6ddab2441f5c6cb"; - sha256 = "1g2m5r68l69i9j3pmcaccdk2qaaf4jfynhfxa7191id6gvhk3np0"; + rev = "6893f692259c0241049bf614147160c44dd4ba3e"; + sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25194,12 +25258,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161108.2042"; + version = "20161203.1641"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "e0473d2bdbdffd97c159cb610978a13d0b9dfa38"; - sha256 = "1x734lvxpppd3njydmagiw6a0khjc3mqmicv4bgw8l0yd5b2fqjk"; + rev = "11f21c9c53091bc538652f1448e75557ad526b9c"; + sha256 = "0pyyvab0l5xbkm4w9sc34g68vz56qsy8fkhj5nh00rigwi9pcsla"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -25215,12 +25279,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20161122.1306"; + version = "20161207.434"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "4bad5dadf32d99fb41214cac62a08b6f5c69b234"; - sha256 = "1b04ny938lvgkdza5ih17clmpxbwhwxliczq4kx0wq301djgnwp0"; + rev = "ee920766ed53b29dc87f4ec400b8212c9a8c1198"; + sha256 = "0krc3lp5k8nm67623v6lr41sj1fnyvp4axbs2pgh0biiq7yaff2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25387,8 +25451,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf"; - sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq"; + rev = "8be4885d8638b52acb16f26ce03f4182902c0a7b"; + sha256 = "1jpf76kmqhmhz6gizm9njiid9ahlk5254ag71fgqhij5a0cqijm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25551,12 +25615,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20161118.2026"; + version = "20161127.855"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "222ce5eff8f31ccf783fb9082734c3f6551e7c80"; - sha256 = "18wfx3n96x8dwl8fpfrkz3ad0aw6sy19hhk595df282bhz9h5995"; + rev = "62888de7f776c867a51cee4d5d55edc561e519cc"; + sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -25677,12 +25741,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161108.1335"; + version = "20161206.1703"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6e23f2de27a5de23ba36305c7f5e823db44541ec"; - sha256 = "0vn4ibfvbnqgb5hc9sd8ysmd80ky7i1q5vhqxgiffm94ir8ihn5m"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25695,22 +25759,22 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20160122.749"; + version = "20161206.1051"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "df1c86ac1ec9f40b11fa5c7400966ef97f4c3c67"; - sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s"; + rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608"; + sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue"; sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3"; name = "git-commit-insert-issue"; }; - packageRequires = [ github-issues helm projectile s ]; + packageRequires = [ github-issues gitlab helm projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -25845,12 +25909,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20161019.1718"; + version = "20161203.1823"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b"; - sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy"; + rev = "255f42e72f7565eeb7feb40e18507348dfccec0a"; + sha256 = "1333vll16snfg135hbczl8d0l8smqz98kz89jv4fcyp9gs6g8sp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -25908,12 +25972,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20161115.1420"; + version = "20161125.142"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "6e2754b02afc059d431de71724a7186f051d965a"; - sha256 = "198rqljshrjypl7a08z62lmw1q8fz38zg6k5h6jv7kz0as3md4pz"; + rev = "d67901fd3f87f4836386d85a4a7df8a300d47147"; + sha256 = "0rgcr26snphimiigs3krzb577zd6xpzzhw1mcvmq2cjbc6hi6sdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -26202,12 +26266,12 @@ gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; - version = "20160916.1128"; + version = "20161203.9"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "gitter.el"; - rev = "18dcb779350367af49d34b4a1c6c3f576657c327"; - sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p"; + rev = "6e92491ddb7079f868ffcc07d69bc82ef35d7d2b"; + sha256 = "16hnw8bcbbnwzw9mbb98icri7q7zl39b60r9gn5gr3bxaarbh9dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; @@ -26412,12 +26476,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20161122.2133"; + version = "20161129.303"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "3e22988086760f62eee7b6b2a2e3e23392234b74"; - sha256 = "12mc8cvi9b92hmybzbnp0pd22dgcysxc0wklngkcj6ssq6ybzzzr"; + rev = "8a2bdfe945ff2d1a78f6159528f6ad3420701046"; + sha256 = "0spn4lkvilmy48xvkpma4l30i7rzxknp56nr2kcvpdlb0mk3svzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26791,8 +26855,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "f5dbee749009a1bd1933d8c2adb7ccda2c330374"; - sha256 = "1nb4adj32qxh4cvxlqvf9ypjymni4jbzswhnw7mzlbma4h2jkk8b"; + rev = "3544b590e9867f2697c2be62389a4c1edb39aed8"; + sha256 = "0dsn8dpfsikchbcsr009sfhics87hzb3fch4wxxxlhgh5j77nxiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -26829,12 +26893,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20161122.804"; + version = "20161203.1747"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "b3b5c98dbc86f7ae6fc631c29f55807bfb8dea89"; - sha256 = "10habaq2f6rh7fdpa5mv76zfvmls7g0n4hq5ka27g2yb30qqhllr"; + rev = "d0d772bb60c872d81572c5293d5d0a7517e4b839"; + sha256 = "1gf8djbnm6x9d9s2qg33cfrn2fbxh5pq441rrfi7il13vgf83v70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -27018,12 +27082,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "20161029.2346"; + version = "20161205.143"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a"; - sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; + rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; + sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -27249,12 +27313,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160909.1358"; + version = "20161206.1408"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "a1e95d9f01550b5170db052887be3d45482dddc1"; - sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4"; + rev = "52d34c96b400b1b933c727933279f79256951b19"; + sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -27414,12 +27478,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20161020.1626"; + version = "20161201.1112"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "3a056363adc4b1a0125f5bda9a0395010d805615"; - sha256 = "01czx49dkxg5wvb2aqk474dmsnr63cmhziim2v8hrv546gp31v46"; + rev = "5b4d52150638665b6378a65b3d579c74718c5bff"; + sha256 = "1x46axy950x8japxiabrf293x7jn146jrdimznmckkapfszxrpdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27495,6 +27559,27 @@ license = lib.licenses.free; }; }) {}; + grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grab-x-link"; + version = "20161130.2147"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "grab-x-link"; + rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; + sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; + sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; + name = "grab-x-link"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/grab-x-link"; + license = lib.licenses.free; + }; + }) {}; gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "gradle-mode"; @@ -27636,12 +27721,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "20160724.454"; + version = "20161204.807"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; - sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; + rev = "62cc73fee31f1bd9474027b83a249feee050271e"; + sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -27720,11 +27805,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20161102.621"; + version = "20161130.732"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "fe70088c54b9"; - sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; + rev = "c7e2817461c3"; + sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -28134,12 +28219,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161116.2359"; + version = "20161126.706"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "5fc61367185ca5e2bd5a7a92c1317c60b7edf13f"; - sha256 = "0x8wz1wrdzdyvghbng1j0kd8gv0q70vkqzqzwhyhzvmsx2x2cs97"; + rev = "7cb746755a47e90aa286e32f49fd3417f632e98b"; + sha256 = "07qbrk904iw3c4kj5ql5hy9znkpi8hcf5b9aag2x5m2c6jh066y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28780,12 +28865,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161123.409"; + version = "20161207.428"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; - sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; + rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; + sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28864,12 +28949,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161122.1853"; + version = "20161203.523"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "1e882d3b409ae46aef98f01e6bcd0bea72a2c801"; - sha256 = "1pip5hp4phi8kyr7z2w9px6p45w0xzb96rdrb6yn66cl6kafwqli"; + rev = "323524bd65d59f11d1a940a46a60448da85a2a63"; + sha256 = "1bmkn6hn02fichylmr5pla3lbhixcn6h1znp77dg5j80npzb27yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28990,12 +29075,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161119.412"; + version = "20161202.236"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; - sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; + rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; + sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29347,12 +29432,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161113.908"; + version = "20161206.2324"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; - sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; + rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; + sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29435,8 +29520,8 @@ src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "bf80144f7cb810a0db89036b886d0e6f580ef7d7"; - sha256 = "1r3x72pd9wzqrkkwafmv64lcr9f1mrzbm1f3qv5fvv5xrs3qib2h"; + rev = "414e2a19664c21010622e41da49ef90cfc8075c7"; + sha256 = "02dgbprhvrij4k5wgvfgx8wpi36wwk5rsyfsya13mz6navx5nqgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -29641,12 +29726,12 @@ helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; - version = "20160604.52"; + version = "20161202.517"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "f196980c047800ef6650f880e26e0b7c29278a20"; - sha256 = "0xl2nakprgjf65haa0xn0jkh69skmbp3k6q1bamvqijgvra9waa0"; + rev = "294850c4ce16ae25f2214f863cee0118add60974"; + sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -29876,8 +29961,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "6b5abd45030d0c505bd4db7cc2a949ab5fa6d3ca"; - sha256 = "0chjyvp98g0wviisnbw07cmv3fzfmzcw2ygbn4jh5frr9kpchkf5"; + rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17"; + sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -30522,12 +30607,12 @@ helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: melpaBuild { pname = "helm-notmuch"; - version = "20160412.1206"; + version = "20161127.2308"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "e3c41e6b1458c6fb686bbcc8c8827dca98f306d0"; - sha256 = "04c6k1rxdi175kwn146sb2nxd13mvx3irr9fbqykcfv81609kqx3"; + rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf"; + sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; @@ -30540,22 +30625,22 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: + helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-open-github"; - version = "20151226.642"; + version = "20161203.604"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-open-github"; - rev = "4c5a47003b2efed1c3437e91121a77d082cf64c8"; - sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851"; + rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc"; + sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; name = "helm-open-github"; }; - packageRequires = [ cl-lib gh helm-core ]; + packageRequires = [ emacs gh helm-core ]; meta = { homepage = "https://melpa.org/#/helm-open-github"; license = lib.licenses.free; @@ -30879,12 +30964,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161117.700"; + version = "20161201.222"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "06ee938ee8c7c9c98a3f627c5c36de7645f5f28d"; - sha256 = "1zzidm622w3fgk9f5daj6njfjmfl1yrpdx03xrhg4raibh8j53lm"; + rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381"; + sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -30939,6 +31024,27 @@ license = lib.licenses.free; }; }) {}; + helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rdefs"; + version = "20161129.2136"; + src = fetchFromGitHub { + owner = "saidie"; + repo = "emacs-helm-rdefs"; + rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; + sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; + sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; + name = "helm-rdefs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rdefs"; + license = lib.licenses.free; + }; + }) {}; helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; @@ -31131,12 +31237,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "20160530.1236"; + version = "20161202.1252"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "c8f007c75b00be155b62d6b44f1f275a914bf31c"; - sha256 = "0i8qhlyil4p11lnb6f1x9qv7f5131dg0f74anbvnc1wjga0jifzx"; + rev = "7af4e4b44671f739b39584fc50c20084700701ac"; + sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -31757,10 +31863,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20161103.1410"; + version = "20161127.1729"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4"; + sha256 = "19niikr5608xq67hcknmg5s7qxcb867ff79xcn58162px8d41v3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -32167,8 +32273,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "295246ef496f3f2bff45a098433f171e0350b889"; - sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk"; + rev = "4b0b4f44bcf14d603f88842d66a62099f1e81a47"; + sha256 = "0hfr0njzz5czprqb4sg06vhdfs7vsw079p7v8xilz32s3priz4lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32657,12 +32763,12 @@ hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; - version = "20160731.2106"; + version = "20161130.1955"; src = fetchFromGitHub { owner = "ryoung786"; repo = "hound.el"; - rev = "209b87b64a0477718e5f0ec721a1a4b7f323ddff"; - sha256 = "0w7vknf8nz9a3rqwzpdp1lnscx0kamgyrd9mvravkp6644kjw3k4"; + rev = "dd95fc10b79029142c95307e895da0bc92bba28c"; + sha256 = "0c0fjfb8l0ladxw8b2ylnrnzw8k0xffl40hnkrc4bdzbl48zn55g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; @@ -32845,16 +32951,16 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20130207.1202"; + version = "20161206.1142"; src = fetchFromGitHub { - owner = "dunn"; - repo = "htmlize-mirror"; - rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f"; - sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp"; + owner = "hniksic"; + repo = "emacs-htmlize"; + rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; + sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8d1d4a17daa60f577c3f88f757997fa42f7b527e/recipes/htmlize"; - sha256 = "03rv3myds696gasfqw3lwvsjd680xgwcf9kilblzxdidd7l6n5xf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; + sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; name = "htmlize"; }; packageRequires = []; @@ -32866,12 +32972,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20161122.819"; + version = "20161127.1449"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "e1e9f7fb5240ec17ff21988993ca8dcb873ea78f"; - sha256 = "0r7nbhnw5mxwqlmb0diylfmiyrb7vvdqaa5h9hb746vf7pwqgcz0"; + rev = "18057d0967015979ee7e59598b1d3410d5966fcb"; + sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -32989,12 +33095,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "20161120.2203"; + version = "20161128.2238"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; - sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; + rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; + sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -33094,12 +33200,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20161117.1028"; + version = "20161204.505"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "a72d68a0f6492af6201fbdb88211cb2f7488f3be"; - sha256 = "00k9q0fv5ca4g397f39fiyjzp827b7biyx2gly69xxgir44j9jgb"; + rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2"; + sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -33261,10 +33367,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20161118.1605"; + version = "20161127.1745"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; - sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; + sha256 = "1j7x19jlr42mdncc3ignyra1m3w5a5gf0x51hjygrk7fh627i1jr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; @@ -33298,12 +33404,12 @@ id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; - version = "20160425.216"; + version = "20161124.2045"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-id-manager"; - rev = "cf0c3743f6a1a1d63637e25fff2ffa948ba40f3a"; - sha256 = "0xd0zhbabb9cx4rsapvq6qs40w4q2cav6p16vrka54rmr98544vl"; + rev = "98bd85db17914af59e7b75c89e82117323965af2"; + sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager"; @@ -34294,22 +34400,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 = "20161114.1455"; + version = "20161128.1613"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; - sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; + rev = "4818ece32dae9df773972815559617b803a3ac2c"; + sha256 = "08hk5z5n1jk6wkwqn5lwk530ykrdf2v5xzds9z540vmk4dzv406q"; }; 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; @@ -34360,12 +34466,12 @@ indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20161029.706"; + version = "20161203.349"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; - rev = "a9f228bab20285d599976d3acd506b38e03a0ff3"; - sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy"; + rev = "d80155197d4a5691ca038c2f3cc14cf4b2a4a3d0"; + sha256 = "1xrc3q7nnfcfycklrj7r6w36sipc7am1izx9kjqzalarkajlcsfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; @@ -34465,12 +34571,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20161019.1425"; + version = "20161204.1637"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "df014b0717d5b35b54587fcfcda6f753d3e1091e"; - sha256 = "1vbykxzy4b4vgnvrjj9vwi2m4f65i1wkw2kiy0l4abssrdwsnsdc"; + rev = "e05cc847385f9160703ae00b8046bb2a9eafdd64"; + sha256 = "1zgqvsgv6b6bysw22yybkasra45fy9i8v7dp8bhnkiwgldjsk98i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -34507,12 +34613,12 @@ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; - version = "20161017.157"; + version = "20161126.1727"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc"; - sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; @@ -34527,10 +34633,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20161031.727"; + version = "20161127.1748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj"; + sha256 = "0mz8vq55r3n89187q2qc60n0s5iigv0i19pzb3zxbca8769vlbdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34609,12 +34715,12 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "20160822.701"; + version = "20161206.645"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; - sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; + rev = "7d8fb124806291f7f6ef2ec3a664ea25899b6d68"; + sha256 = "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; @@ -34860,12 +34966,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161123.613"; + version = "20161204.626"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "eaa1b303d63650732a7146e2fdb1a601d791c344"; - sha256 = "1rhhdaysj7vfslwmjqs92xyqm9vggsr9m50lxn6ndhan0xlvzcb9"; + rev = "c03881e03973972b44fa0e775ed2e832ebb76815"; + sha256 = "1dlpnnajp1qg4kc99c9zhwxwy36cjicnfvbnlvjwn6flz415lavx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35192,10 +35298,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161115.1908"; + version = "20161205.1445"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "17ldy140kn4zgji12x4qaijg06r858zjwbvxjwarrv1rl2cny59m"; + sha256 = "02k88x6gn9sk7w352q2vgzgfmmv0p2gv4k7wm9k5pyymy0j9skna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35210,10 +35316,10 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20161117.1101"; + version = "20161127.1755"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - sha256 = "1i832162b6cjlygnzmi8yjjc37dxamz1mnhlli5pif9xwa5g824m"; + sha256 = "1nni8lbmh215icv2n5kzq59vbnjq2z3h021drk6szdxm5hcsgmg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -35418,12 +35524,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161118.1213"; + version = "20161204.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35439,12 +35545,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161119.412"; + version = "20161202.236"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; - sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; + rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; + sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35506,8 +35612,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35710,12 +35816,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161121.1422"; + version = "20161124.500"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "1ec4939d81e410c081b709505d812775bb8338e8"; - sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; + rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; + sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -36046,12 +36152,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20161119.911"; + version = "20161206.1410"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "9ec9a5e6bcc22490ca06ddc05dd174fe03c6fa0d"; - sha256 = "0z6bp76q9r6h4bps340xw9vg8adm3gmdmaiya6d01ymaid7qfydn"; + rev = "e903628a0260787e4fd0834b314cba63cee53f63"; + sha256 = "1444yzxxfmwq5igcxlzd9yknghqbzinimsc23zbsk21in31rrnlj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36358,12 +36464,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20160222.440"; + version = "20161128.748"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "ce63cb10e5a69c9017ceccf8adb7ab33450b057e"; - sha256 = "08wffbljnaxz2sh72vsqpq1lc47mnh4d47fl71dvw4pqs50zp8v0"; + rev = "f2dc70af890694828b8227b2727240e82780d7e5"; + sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -36526,12 +36632,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161117.1621"; + version = "20161205.1446"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "2a796499afd95a5b9f0eb2fb338102e917f30c93"; - sha256 = "07i41zblbb733wj7wgpdwqnw0ml0mkkh053prbk8g8ghwcrm65ld"; + rev = "3106e3c47dde930fdd4867e8583fd7e9bb418996"; + sha256 = "06wvjbxn6dbrwi26flqbs6y8c4dw7nr0bdsplwzw2ikwpdsgjsrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -36572,8 +36678,8 @@ src = fetchFromGitHub { owner = "thomblake"; repo = "js3-mode"; - rev = "7fceb21ec56aac7af4b189bb0c0d0cf620327f5a"; - sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5"; + rev = "229aeb374f1b1f3ee5c59b8ba3eebb6385c232cb"; + sha256 = "0yd2lck1kq01pxk86jpxff5ih6fxx1a1wvl7v8b5ys7gi33fjqz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode"; @@ -36839,12 +36945,12 @@ julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "julia-shell"; - version = "20160514.728"; + version = "20161125.1110"; src = fetchFromGitHub { owner = "dennisog"; repo = "julia-shell-mode"; - rev = "b9d82d0cb8d4d50c385e03312f08ab5d7676bf67"; - sha256 = "056pyq31fq86fskwhqny8n6jzavgcjv979kkg9hwbz7h90zvf9q4"; + rev = "583a0b2ca20461ab4356929fd0f2212c22341b69"; + sha256 = "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812c6a8498949d8bd9828a95433c539da87c1c8/recipes/julia-shell"; @@ -36878,22 +36984,22 @@ license = lib.licenses.free; }; }) {}; - jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: + jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: melpaBuild { pname = "jump"; - version = "20161016.2313"; + version = "20161126.1728"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc"; - sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364"; name = "jump"; }; - packageRequires = [ findr inflections ]; + packageRequires = [ cl-lib findr inflections ]; meta = { homepage = "https://melpa.org/#/jump"; license = lib.licenses.free; @@ -37594,8 +37700,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "3de25e142921667a5df95ee886b38c868dab927c"; - sha256 = "1pkfi0gz7wm5xig6im25r6f12mw34n113nn9hbwpd0vsxyl6pv5p"; + rev = "0ebcdb7e4eb5dcab919779111374191bcf0f03a6"; + sha256 = "16g5s7s3rdd8jvm9g3bhdq3xwgx5gf4nxdjw2pbqhiparnkkqsz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37671,22 +37777,22 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20161007.1409"; + version = "20161126.1914"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "5d767f98a65101cd32ea2dcc897967649b964a8f"; - sha256 = "0v3lh67a2z0hl7qzcnp5cihgfl7421dircrsi7n0csbzla02wxqq"; + rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946"; + sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; name = "kodi-remote"; }; - packageRequires = [ request ]; + packageRequires = [ json let-alist request ]; meta = { homepage = "https://melpa.org/#/kodi-remote"; license = lib.licenses.free; @@ -37909,8 +38015,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "6c217731977a9bd66330e9cd1e2bddfda47118bd"; - sha256 = "0mqgjq6l7b7rcky86fd1mwxwnvn269b8gj6v0y72hhkk1cmrh17s"; + rev = "3d180e556e20520081cbd05ec51aeb527bb48846"; + sha256 = "11p86v1qmgrxsv4zr14ygs43s9vdn4kscxr3gbjxz31ikbxf9w3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -37925,10 +38031,10 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20151231.1409"; + version = "20161127.1758"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lacarte.el"; - sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2"; + sha256 = "0bpjrnxfxfmrjj07hf5sgxjm4v8i6hr7ssq235jbh4r29vgf9qlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte"; @@ -38007,12 +38113,12 @@ language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "language-detection"; - version = "20161122.2344"; + version = "20161123.1013"; src = fetchFromGitHub { owner = "andreasjansson"; repo = "language-detection.el"; - rev = "14302e31a319dceb6ec78cf3d7cc93d8402e2cab"; - sha256 = "1ci5ixj0cqcbsabh4gwhicimnmlcl3wl8nv69ydvi60yfwhgq5fh"; + rev = "54a6ecf55304fba7d215ef38a4ec96daff2f35a4"; + sha256 = "0p8kim8idh7hg9398kpgjawkxq9hb6fraxpamdkflg8gjk0h5ppa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection"; @@ -38132,12 +38238,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "20160708.902"; + version = "20161201.835"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "54ddb8742c50a338639625183f7315278fa7369c"; - sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; + rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; + sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -38279,12 +38385,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161030.1103"; + version = "20161204.758"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "20901f226c0fc32dbd2a2836bdf6525389205313"; - sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih"; + rev = "187851c47cd5a2ab397fbbdb09d2cf9ce6d50cae"; + sha256 = "1xhc5cvw7j6ninfw5knxqsjyxwg7p7ccf24gx72ik4gmddlki1x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38384,12 +38490,12 @@ lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }: melpaBuild { pname = "lentic"; - version = "20160721.1552"; + version = "20161202.1352"; src = fetchFromGitHub { owner = "phillord"; repo = "lentic"; - rev = "90a05765ebe890c0da88fe5177171473fe729574"; - sha256 = "1s82s5d7www2blz4zbyjdxwiqg9xb24gk5scxd8b8xqr7wd20sqj"; + rev = "678db9327209a1e6200c9272f4080595dc68f8a5"; + sha256 = "1wziqwclrkrz6bs66mj2rqcgavyf11l7iaz8vksv7vw6fh18bpbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic"; @@ -38468,12 +38574,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161119.1315"; + version = "20161202.46"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "1d4e77898228dbed46971a3f483bbca6c526643c"; - sha256 = "0b1lwccpkzzd8gpqsbn9y4drdsgg0vp48z21mnlnkfza9hnmb1l5"; + rev = "a8c6fc562043f1f4821d44e097713db2c67526ce"; + sha256 = "0l55k47szdhk4hhkddpfq6lrya9gc5n0ayslzjvz8g07g3m6p1y3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38528,12 +38634,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20160810.1940"; + version = "20161204.908"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "1023ef8057335e627b7a2b20b2b144068aaab7c3"; - sha256 = "0041gwmkcjsk9c0j316hl1s588wxa7dkn8vm1fc2s9nsvhang8ab"; + rev = "64653b77c1d1a61f7e968d50fc1ffb1c03711b5d"; + sha256 = "0296fbnbl3rvrk1x8xbaq7y14jz3qvr1wkrqb5fx30bfjjfk3zc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38845,12 +38951,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161121.56"; + version = "20161129.743"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "30e7745dd9a14a75c2eb1651c047304369e540e1"; - sha256 = "1i46w7m1pmvws6cgmaxwq3kajz6nirrz1bw7kq03ndx03nxc20d8"; + rev = "806b7dd5deb620751afc88480888e9bcc9f38e88"; + sha256 = "1c0zxjkq25a5aqxmbmnjih44as21g6yva05h9srxzbwn0w45mv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39158,12 +39264,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20161122.2243"; + version = "20161125.2208"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "3fde06dde5d541b7be4536bdbebaa6cd1e01a5ad"; - sha256 = "1nmsvmkv6r0qny2l8s52hld11mv74kbksz0j4vqji624im1d659w"; + rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; + sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39245,8 +39351,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "e547b01b86f262d20c875cf3e2ecf7af0bea1e8d"; - sha256 = "1ldlla2bh1073c0hy9g6zrngmpf017jnq0sap4hcw1bg1dbcwyh9"; + rev = "1517e2ed72820d41a169f195c500d7adf2ff65ea"; + sha256 = "1bi1pk6yl31fg8yv6c7dkkb57ahs9cig2dy0lw137n4bgrd4l3jd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39864,12 +39970,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161123.617"; + version = "20161206.2039"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; - sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40039,12 +40145,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161123.504"; + version = "20161206.1703"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; - sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40144,12 +40250,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161105.1817"; + version = "20161129.934"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749"; - sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy"; + rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb"; + sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40459,12 +40565,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161121.1435"; + version = "20161202.2205"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "6a0e74bfff0f1d74d179ebdf7894eb6e15381bd4"; - sha256 = "03hbyf0bj3lywbl919khnmhqwwkj7bcnvlhnspa8psi5xl6m05zq"; + rev = "2282848c1ab80f606390824711ca4a80548e6dac"; + sha256 = "0ckm7a0x367k3vv8ighl2ah2h8nwsgzqn30makrr7gqid6fas92s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40645,22 +40751,22 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: + markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20161122.1102"; + version = "20161207.59"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "c9c9bfb4490b52ff1b6ef05d4e108a04b3bfed75"; - sha256 = "1zzy47m9hxjxvqc34p99r4gda1czvcracsmkfylj1rr2frilhvsx"; + rev = "e1fce78ad3b96799675765140e0fa6936467be62"; + sha256 = "0dwrb0b0ninasf538lsv41gq4v3pw15i6mc90cs3nqi50i5l64c6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg"; name = "markdown-preview-mode"; }; - packageRequires = [ cl-lib markdown-mode websocket ]; + packageRequires = [ cl-lib markdown-mode web-server websocket ]; meta = { homepage = "https://melpa.org/#/markdown-preview-mode"; license = lib.licenses.free; @@ -41477,12 +41583,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161030.1807"; + version = "20161123.1840"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "15469053c8d7996b82270179d879d6e1e038282b"; - sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni"; + rev = "90485fb0f21c250d308d1952ccad1049e766fcd8"; + sha256 = "03bksshs2n3jxiccbgd86kbbwm79hmvsrbxw4yyjv311w8p2i1gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -41690,8 +41796,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; - rev = "38e1f4711b57b07876aa5cdab5af741ace0aeb83"; - sha256 = "0v9s7fdy7r16m988880jxmlx7ypgwgav11fa4yixx4dximgbc2lc"; + rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba"; + sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; @@ -42201,12 +42307,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20160808.525"; + version = "20161125.2230"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "0b5e76b2418d455bf7cf8ee52dd3354964626b5e"; - sha256 = "1z9jrc85mlgcqpyys9filyaav7f8asn2w5dd2q5wp4s7i3gj8mc2"; + rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8"; + sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42321,12 +42427,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160907.727"; + version = "20161129.115"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23"; - sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj"; + rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3"; + sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -42447,12 +42553,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161116.1128"; + version = "20161206.1333"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; - sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; + rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; + sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -42697,8 +42803,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d"; - sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4"; + rev = "ad7622969366e40401af877db75940ae23b5e4fc"; + sha256 = "0d2xabp9dkzixn7kqsxpapjcy846wgsh27l468pl2ar6pxnwwc86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42987,12 +43093,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20160911.41"; + version = "20161205.2"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "b695dcf4688e288488a6dd1583de3782df0a4549"; - sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l"; + rev = "0b7908280c97c1fe29de0d10ac2715344e36b1e4"; + sha256 = "0ifwf5skadck4x11v6s12pdfraxcmdj335jmhvgn3r4gzg55qgl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -43089,11 +43195,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20150314.744"; + version = "20161204.223"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "f7fd0ae6819e"; - sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c"; + rev = "a6fd748acd9b"; + sha256 = "0j6lq5sxrn5yvxja5ag0q01bic6r6hbnfr7010ahc3bwl78yslc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -44125,12 +44231,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161115.628"; + version = "20161124.739"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "5c7c66d6d0c14f45bbdfdf04610243c805a4c298"; - sha256 = "0wp55fpqqw0lz3n8ng0g5dydbipcxxvl679m65jla0ciqgj2fh8d"; + rev = "c5e15a42f0a95b8c675c739903ee4aa24ad41b8e"; + sha256 = "1hrh1h1dxwfsylwc03kj6yp5g7a85b53jahkvzyjyzmnnylw3zpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44381,8 +44487,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "3082aa69b7be2a2a0607441a7a2615d78aa983d7"; - sha256 = "0i7qadg281mv6f0ccafmn7fbcg9civqv65gz8wal9v975mh5nzsw"; + rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57"; + sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44423,8 +44529,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "7ee43df8622cc0589d54248fb44cebe1c1d991d2"; - sha256 = "10lzqqxd7nmzlma05ralfkzg3yk8j1qxvnnk12y466q8gbxk7fca"; + rev = "ceeedb58d23950f0ae3944484bca331e5cbb8053"; + sha256 = "1pnh32h2ga5ny6b4snzlsv4fbp30dzmkhs58aajp5zx05bngvgkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44545,12 +44651,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161120.1243"; + version = "20161130.519"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e1f11f07bcd2e2bae8b7217b0f6795d0cb0e6b8c"; - sha256 = "0dmkmvdm5ygm2dwwf7bgwhv9qv5l0h41a00s0l7ic9bclpx5yz50"; + rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; + sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -44692,8 +44798,8 @@ version = "20161117.425"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "518843747835903b77889da30ce8c4518a5c0574"; - sha256 = "1wc0wslpscx79cy1acjw5yl7nk0jj5gx1r6j13mc9pd5hrfh5rxh"; + rev = "71f1228a518f08e94dc1ea4e2147f80d3484c615"; + sha256 = "0mc0pmykw0a9yz61jsfpj3gk83hv5d8zhjnvwvjgkwm5akaidf8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -45066,8 +45172,8 @@ version = "20161122.1222"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "485778b352fd"; - sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; + rev = "110e20a7a86c"; + sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -45335,12 +45441,12 @@ ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-mongo"; - version = "20160504.1434"; + version = "20161130.152"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-mongo"; - rev = "abfe62e964f6f3e097f94111ae14247e1f442134"; - sha256 = "1xrapp8mvxlbz0v5s3lrmfacijdgs6qrpklbk85rswx1gisl0kmb"; + rev = "d64a507c2f9e2a1f8062acae50199541fc23be65"; + sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo"; @@ -47186,12 +47292,12 @@ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20161117.637"; + version = "20161126.1955"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "2977efc1c7d7de5a8c806277e08883aa80c40930"; - sha256 = "0w34j1rql98ca2fi77p4hx3kbkd13xqq9iym72d0qmphzh8xbqmb"; + rev = "28b460821c6227402ed2cb3222ea45bb99f7d43e"; + sha256 = "1x3y5jlcvqzzxi1rvhj9hbirgbav82m7kqmc49cjcdga5zs4x458"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47273,8 +47379,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; - sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; + rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; + sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47290,11 +47396,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20160808.220"; + version = "20161126.239"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; - sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; + rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; + sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47444,12 +47550,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161105.1652"; + version = "20161130.1053"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d"; - sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32"; + rev = "9de96eef6f187a10cd910e3bc3eb274d38856819"; + sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -47525,22 +47631,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "20161103.2316"; + version = "20161205.1508"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "a68ef488404f175d8b8867ad958233f927e451f1"; - sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r"; + rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; + sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs pcache projectile ]; + packageRequires = [ dash emacs projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -47639,12 +47745,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161117.630"; + version = "20161129.417"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "72ee7410b218d39a3629f3e092e10ecb37e183db"; - sha256 = "14jf4qdi3lnm8k8cdl99bmy7zqh0brdrbz166hhlih7sn1lgsywa"; + rev = "d3319a7a3d724ee51a9b97328bf778324e4ab9e7"; + sha256 = "0s3h1yji4z42nd2pc50mddpvpkgi7066c3l1kb6jaywaj3yw2bi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -48916,12 +49022,12 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20161101.1920"; + version = "20161125.35"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "973bb43495213e883383cf263ce173e36e09fb66"; - sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz"; + rev = "d9cf410096fb27be8eb13b2207697f8530f62abf"; + sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; @@ -49231,12 +49337,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161111.1451"; + version = "20161124.1615"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "46562bac48a22fdc8492b76d63722c1dbcfe2e63"; - sha256 = "1l0rhdlzkvx1zzif8k3y1b8wxmi3yf08k7ynzzz5dgidxdvg1bd0"; + rev = "633fbff47fd4872d55d672029300c043e13e966e"; + sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49294,12 +49400,12 @@ package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "20161115.108"; + version = "20161125.930"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "6f283b06ab87cce071fe71a9b22eb791d4da0289"; - sha256 = "0ihynkr446w065wd8psljdyrax53mcpv18l1k5kzlhp9hplykaqw"; + rev = "1ad19f3a9de68ae68e6dd2d4dad31532b4de1700"; + sha256 = "04ckdz80paj1dz1q659cgm7hkdh828ckxlch6iq18abr1ijzl8vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; @@ -49378,12 +49484,12 @@ page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20161015.1709"; + version = "20161205.2251"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "65fc27e4c89eb0b37dd3a8e87c32ceba78f37f42"; - sha256 = "0lxfjryq13zg0ikbn1ydqghs57z6yxqwb5wvzkn98mf98iq6nlsp"; + rev = "c133848345ceef91e257aab8804c61f31c31b264"; + sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; @@ -49501,12 +49607,12 @@ pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; - version = "20160607.1010"; + version = "20161128.357"; src = fetchFromGitHub { owner = "zonuexe"; repo = "pandoc.el"; - rev = "5f96efe8804cf949de2896fcb3015513275b9118"; - sha256 = "1r1rzaidg3pd8q5alv76drv843hwj9yzkn5hsaf4qnqrkkqwly8y"; + rev = "198d262d09e30448f1672338b0b5a81cf75e1eaa"; + sha256 = "0njc6xlwa8hihyqrk0hs12sb6rs7jma2wpjfr8xsj9p8jld4y359"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc"; @@ -50316,12 +50422,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161113.514"; + version = "20161207.521"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "3c1cc818e7f32b918ac2ef3b48940f25d72e9e1e"; - sha256 = "06v3y0y9l32wqwpg80g9ii0miahvpxcx9jkhpykydvm0q0vb68ww"; + rev = "3ecbbaf1606d23fb1abbefb6d359f47aaf153f84"; + sha256 = "1jn118f3mdz7wb1a58myahj4ir29rwxbfx1595gjcxkkpw0cyw11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -50504,12 +50610,12 @@ persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-overlays"; - version = "20160426.1221"; + version = "20161127.2300"; src = fetchFromGitHub { owner = "mneilly"; repo = "Emacs-Persistent-Overlays"; - rev = "e89a04643dc4532882352888755d9d5e26c46ae4"; - sha256 = "0iw9qsqy1aszwfzfslyxz31zav4xq8pbrx0mwxqix5lvy7768ppp"; + rev = "f563c8b966edc78c9d806661c4eb80e4781c4eab"; + sha256 = "0csllpkpjf4csw3zfaw8k05jg078najfmjz6pz1jcl6b4sxjdfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3673c87c5ca883b4f713efeae912c3ad991c667/recipes/persistent-overlays"; @@ -50903,12 +51009,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20150406.2002"; + version = "20161206.1519"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "314602b2e68c4054159ab3f0f6f6b658f232ada5"; - sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg"; + rev = "bd4962562a3d9f7330b9fbe8684ac6ba76feaab5"; + sha256 = "0mm8gyw6qzn6bkghrdsar0gbyv6sz5x2m3dii0frablgw9zac4nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -51008,12 +51114,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160910.1801"; + version = "20161205.1642"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36"; - sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg"; + rev = "f2dc941cef948fd35947c9f0f6fa2e9ad10e174d"; + sha256 = "11vk2di9r6059ymb1j9qvi3gxcyk4fpl7ni7pap9hyhxf3gayknh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51306,8 +51412,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "pinyinlib.el"; - rev = "238f27746dafac576f0aa686b37dacfdd2327127"; - sha256 = "0wbdhd3wqha3ahyakdjj4ki3998l0fafi86l26gkir1bq2qpkmcs"; + rev = "457b5ac6611d0f35ff2444e62008c798b45ae368"; + sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; @@ -51533,12 +51639,12 @@ platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; - version = "20160327.1820"; + version = "20161206.636"; src = fetchFromGitHub { owner = "ZachMassia"; repo = "PlatformIO-Mode"; - rev = "4b514ea9c82c95cbe8756cbbcac4638b4e2790aa"; - sha256 = "0xiss3c6inz27yf08974mm4wg9dx8rcqqj77zp4rxhyhiqxzv338"; + rev = "9cd77621fb1aa64c6d2b346cef99373d659e4999"; + sha256 = "1myq0k8hnd8niwwskbfyy17lhgislzx9gshgsfhr8xg6b4id3p1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; @@ -51719,8 +51825,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "1d12aeb7334104f77070361492ff7cc8225503f5"; - sha256 = "15c1lij2c40xmqbq44xv6wvinjcq4j0l80rcc4yvdv8ik436phmg"; + rev = "7eb592d6a7071a4d8d33f15668c33da79ec42780"; + sha256 = "0d3vqx0khw46g9692cd7nf5xpgbmsw9r79s4jmm11wsz552fp7d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51859,12 +51965,12 @@ polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20160805.448"; + version = "20161205.46"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "8a39ed6817298508c71f28effb0354a00f2235b4"; - sha256 = "1knms39cd97hkwi3ya6asnzri15fbskqq8zb4ly9ax8a358ryaz3"; + rev = "ef56a732cbfe86e982d5c982c0c7bd3909c7f840"; + sha256 = "13pj6hxz5018qyv08xh9q3bmng9qrikpnv55a3c1y8v0z68ppmkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -52090,12 +52196,12 @@ popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-switcher"; - version = "20160622.1024"; + version = "20161130.656"; src = fetchFromGitHub { owner = "kostafey"; repo = "popup-switcher"; - rev = "a17ac13a08119f4164f25514f08556f7ce660ae4"; - sha256 = "1vymgdyzvx0d5i4da9q0x29x8d0lxi084rq68i6gi686x5nhglil"; + rev = "86809fbd3c3c3d566043043b6577ccf8133ac855"; + sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher"; @@ -52876,12 +52982,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161118.530"; + version = "20161130.1025"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "0231a7bb4b70ef3ee0e6a30185e9791a028e718b"; - sha256 = "1vrhd7j4dk8pkm2vlh46hckfw63vpzrkylk3v5y2l4khg5ak66wb"; + rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; + sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -53153,8 +53259,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "c9504715634948c9f8f306330449f296d926b74e"; - sha256 = "0pvxh58vvvgrlf6gjrhg016k7hys8wmraxd38k0kdjw4srisj319"; + rev = "607b92149948393311d66329b9851f5971662f19"; + sha256 = "1pdszacywqkk2p5f9jigbm0brz0i5a1n9lijl1kcx4lblzyq755d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53167,22 +53273,22 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20161012.143"; + version = "20161204.958"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "756bead9d5153a6ed47e4f86f42be0c49c95cace"; - sha256 = "0mkvnhyl5lxbzjks8769pgzzafhi9z1sr768c67zmgbzz6fl0rmi"; + rev = "59766a43a2cdf6f44ba9fa038f9997963f191e1c"; + sha256 = "0aam1vwlidfsqpdnv2s642pzdqngjb4j6lm5ms8fm1q589fc8vys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; name = "psc-ide"; }; - packageRequires = [ cl-lib company dash dash-functional s ]; + packageRequires = [ cl-lib company dash dash-functional emacs s ]; meta = { homepage = "https://melpa.org/#/psc-ide"; license = lib.licenses.free; @@ -53296,12 +53402,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160915.252"; + version = "20161206.1934"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; - sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; + rev = "cd4cc093c62735c3947f4f7ff458a2a0a153645f"; + sha256 = "1bbqm704cfm76qd6fh9x4lij72hchciy60hjp2wxv2n5j51xqlq7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -53380,12 +53486,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20161020.309"; + version = "20161204.713"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "0a7177c8b0437f1e716da428053fa8d5113a2f51"; - sha256 = "1ma0yyf176nz3df5mxzim715g40g4v2snb51ljxax2rs1az04wxb"; + rev = "bfa9512bcaa91cc2068d280d646d7a794da82905"; + sha256 = "09jfb9xldpcg7z9hh7yka1pcrm008h6sx209lhnwmg2qn5dj4rsb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -53887,8 +53993,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "23e59c80cfcba5878b7f634464a203017ab91187"; - sha256 = "1gylvfl2bd6f5n60g0l5z2ymaasgvcj1a5ar5fh46snsln5j83zl"; + rev = "dcebae55d3b3246078658cd3a2f100f80a8cff32"; + sha256 = "0gmia3yd9rvvriy04m91zrgx2sd1if141317741vv250ji4lql7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54030,12 +54136,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161120.952"; + version = "20161124.930"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "ef639cf5bfa8bbe6a4321eb58534768dcc7608ca"; - sha256 = "0ay3jbpp70r6a02rwk6bll0blzv7f61k081jlby5y1g1xd753p2g"; + rev = "d30c9033fde2f4ce03b4f4792792a9603cd26bab"; + sha256 = "1bgzkbhl00cc60y0d34cx7i6y560wf9jx9fb3d4wz06vh3322mb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -55084,8 +55190,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "4246e34d7a6f668f5d9d403de054ef68e6d89548"; - sha256 = "0rnqs09q30rshp3lyslwh3rxgn7ay370y9ain1bhf2p2ww9j3m5i"; + rev = "809658d30038e4fab186d47730a3790abf7cd2a1"; + sha256 = "0r1xz8l2513xhzc0dv97g4r6pxnyk5kwcih4jfribhxil0xjd5g0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -55399,8 +55505,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "d68a46821809251d04eea062916238131130b477"; - sha256 = "0a0p57x1gizbzp793l0k7mra5qv36ml8zzpva47l34lhywd914xn"; + rev = "40f94f3c63087c05ff989dd3dc27db0ef9a638e5"; + sha256 = "1fjr85b5k8zfcdsa4si602r12x0pa7xb208y3j5ld35gwmwr493x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55478,12 +55584,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20161118.1715"; + version = "20161205.549"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9ade146339e9883a65b109497574910d9e618aed"; - sha256 = "1ff79jyfk2aahxazsa9drsq4j4sl2n88b52ikk3dmsrl08bvvzvq"; + rev = "3609642fc83f344783e7c8229edb529264ca1eea"; + sha256 = "01qc7qsyhcm3i0ix4zhzwiq770mf2z0831gz1ybjaa6f5lwqslx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55750,12 +55856,12 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "20161120.200"; + version = "20161203.414"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "bd2d28738368a047d5f407034f78839a7e514489"; - sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; + rev = "50044030969d68e9f78a6db4e0a9229f5f3eaec3"; + sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; @@ -55771,12 +55877,12 @@ replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-from-region"; - version = "20150406.1729"; + version = "20161203.1306"; src = fetchFromGitHub { owner = "rubikitch"; repo = "replace-from-region"; - rev = "cff9fdf4ca351f8c5848e3516ccd76cc9be6ffa8"; - sha256 = "0w9ry16crcgc6aiq0xwzf7b301kkw6i44jc0dhfj621bhgmf30aj"; + rev = "959ab7b2e2f19f3b559fd1228597530ce0694d7c"; + sha256 = "0xmslc7r0lsi7566ajrr9sqvzmfp7qjgfg13pf6n63rb3rsk72ny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region"; @@ -56602,12 +56708,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20160715.509"; + version = "20161129.1525"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "9e254cef81dc5533739efab2d81a575df0334629"; - sha256 = "1wcdq3hyb0q7l6nj6qbaf32m3mhfiph4kdd6frxf0fb93b8rpciz"; + rev = "8e05e95548da58c63d8b805d4516eb892621f8e3"; + sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -56623,12 +56729,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161115.1841"; + version = "20161126.1011"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1360dac22af6b227a209aa9840336bab7f1b21e2"; - sha256 = "06cnvxfvwcli2rr6wgsncp30jxmpyq0zbp2yrbxhyl7q9g875s85"; + rev = "cc36a69e4190ed2b071c136b332ec4bca10e967b"; + sha256 = "11h8r79v79fhhbjyxlazzqrqxw8abf6xy6a9bh4gp0j7l4kmch98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56689,7 +56795,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56884"; + rev = "57016"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -56769,7 +56875,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56884"; + rev = "57016"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57332,12 +57438,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161117.1519"; + version = "20161202.227"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "dd0c42a1eb739529cab2becb791badfd2c4148da"; - sha256 = "0ca9pd3si7gw7wsibryhhr9in6ymask2icv79qrdcpz4qhlhby52"; + rev = "035af95164f7bce342d4663aa7da00852dfec500"; + sha256 = "06j16hgvzbbp9d4bvn3fdsmw3isaw017dydjyiqmjpfzbaxg9yac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -57357,8 +57463,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "dd2e9af171bd343af080b37add48a0edbf043a07"; - sha256 = "06q66m6i97i7a5qpxslgwighaqbn23gfhjjr4baxpi7cs04xyfbf"; + rev = "51923888a39137f2c46bf3a650fef66206e81b2c"; + sha256 = "18vf195fd2p8wiw4qag1pq1vrv6ria8j76lgzf3ghkqj0s7bd5rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -57479,11 +57585,11 @@ schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "schrute"; - version = "20161024.54"; + version = "20161124.1227"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; - rev = "1bfcd4a24ac833448355facc82255344d61d8fa2"; - sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4"; + rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; + sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; @@ -57829,6 +57935,27 @@ license = lib.licenses.free; }; }) {}; + sdlang-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sdlang-mode"; + version = "20161130.2311"; + src = fetchFromGitHub { + owner = "CyberShadow"; + repo = "sdlang-mode"; + rev = "d42a6eedefeb44919fbacf58d302b6df18f05bbc"; + sha256 = "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/691af79137015f15a3d383439e534e255ba4b36d/recipes/sdlang-mode"; + sha256 = "1z6n374z55dr2c6xdwgvmpznd5gk9y23k136zmy29b68j2kswj6l"; + name = "sdlang-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sdlang-mode"; + license = lib.licenses.free; + }; + }) {}; search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "search-web"; @@ -58038,12 +58165,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "20160824.1522"; + version = "20161125.429"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "dcbfc60658ab698e7c43baa5871af7aff2e35823"; - sha256 = "1fd3liqdhd0dw1kkgjz3qvajnlr8k60gbcgfzy3s858q2x6ranfl"; + rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6"; + sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -58532,12 +58659,12 @@ shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-pop"; - version = "20160611.540"; + version = "20161127.623"; src = fetchFromGitHub { owner = "kyagi"; repo = "shell-pop-el"; - rev = "38e702f6980f4ac9d8a836cb8b7fe3b406aa52bd"; - sha256 = "02ga9h8s5lh1z6nqgi4d6icsdc1z46hk713vzfr3q1sdir1nbf58"; + rev = "788250f22a4e652407eef117f19d6f4b56d7f919"; + sha256 = "0dd4hxbw6q9fazdjqdlfvv2g7fggmfhfmmy9ncipy4v8yd2d74pn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop"; @@ -59030,12 +59157,12 @@ simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simp"; - version = "20160315.924"; + version = "20161206.2151"; src = fetchFromGitHub { owner = "re5et"; repo = "simp"; - rev = "f74467507983a3c8a8b61268e07219fbaa628ae5"; - sha256 = "177bhvynqsdfwwqhhlh1v0pqvscy3xv6hhxi7fb42l5dmsw5b97z"; + rev = "13959cabdc7a10d8878592ef4333b3e6df2f1483"; + sha256 = "1wph7r7r9s867wr6j17fqch8hmj20fksrhl80bw2k4vyscaj0f22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45ff5b788e12218f8e2df7e53444796ca4b929fc/recipes/simp"; @@ -59238,12 +59365,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20160922.801"; + version = "20161130.609"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "ea82d5e3e1226605e7b04054a77cca7431fe4709"; - sha256 = "0p6zlm46pq9id74bqpgscqczpkk991mzh8d6264g5qxj0az22iia"; + rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; + sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -59322,12 +59449,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20161122.905"; + version = "20161205.419"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "051068d58a724695bb067e268d317c8bfd222ba9"; - sha256 = "0pczkbmgf5slr05lrsg8q6a67hbmvl20yb9w86j205y8hq5zz4pb"; + rev = "3417b6f306dfcddde17b86f29a336b76420cce89"; + sha256 = "05bz5bsj3vkfjp1wh477fzjlkv5hbhr4anfxlx2a1r7wimmlrmbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -59382,22 +59509,22 @@ license = lib.licenses.free; }; }) {}; - sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sl"; - version = "20160729.2101"; + version = "20161206.730"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "sl.el"; - rev = "76a8eae2b3fc449ed81b2a577c53939434851635"; - sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86"; + rev = "be3ef1bad689ce9f7e20a15728a07d75eb9066a9"; + sha256 = "18xdny9da1vr79jlnhm34kvjrm0wy82ir7885a64z77pjbnxxs2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; name = "sl"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/sl"; license = lib.licenses.free; @@ -59406,12 +59533,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161113.1832"; + version = "20161202.2316"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "70e4c3450a489185220756ea8ccef8ab453ff07f"; - sha256 = "09591nsimwavdzbdz8kj374yy8gglcc5w7gpqvxq4fnrkfda6dgd"; + rev = "d0924e13fe88bd8f920d55bea7317d714f6992d9"; + sha256 = "1ij55zldz90ima8q9ay6957rzki9gcqfdfq70lgy41bgcafqp3qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -60158,12 +60285,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161121.358"; + version = "20161203.436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "b661715c377a02e8fb71209cd918f1188d1923d3"; - sha256 = "1g05h5fzwg63r6n85gphg4giz2cw6miqckdjbwcam098dk1igyby"; + rev = "f55a741c9e54b271c7fd9c213937fb668e6771d6"; + sha256 = "0rx8wgpxfc31ynm2lzqnnbqzx8c308hv9flxv2qs1ajj4c55wrpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60514,12 +60641,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161122.1546"; + version = "20161123.2130"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; - sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; + rev = "e4a0916d3b60dc4b7e98db59a2c2e2db4bb71fea"; + sha256 = "1463949imwyg3kd4988fz38i472lppvphga0qinn27ddwkrf0v0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -60661,12 +60788,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20161009.838"; + version = "20161203.301"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "43d25005f8c06cd145b9fe55c7f9c4b626293b1b"; - sha256 = "19hl3pfr04l3pli0dnall9gbymh0k17m9r5dzm36dx3a7m5v3j4l"; + rev = "f4840394caba81909eacc8807cab904a0af87419"; + sha256 = "0s6zs2mmwwq6df8yiwp8ykz3qqfn7scwkz35rj7bzdnbls8rwaaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -61025,12 +61152,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161024.1259"; + version = "20161205.1104"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326"; - sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy"; + rev = "069cb4c14e33270a6316fa7e60a1cee20eb7f13e"; + sha256 = "18xr5vy1va2ppd8fbrmrjgm0izly9fzjznp6mp3b85qfczv1wz4k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -61109,12 +61236,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161029.531"; + version = "20161127.955"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "74b901d5689ee4864c4d552d7052b8f128f77339"; - sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx"; + rev = "1a806aabb8d9405c3d09248f6cd9905883c05b71"; + sha256 = "07fg44skbkkwwjd3173ilf0p6fp6sp0bwz1s1ccqjcsb7p21mrvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -61666,12 +61793,12 @@ srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; - version = "20161116.2201"; + version = "20161130.2112"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; - rev = "f98172442c1a3da1a57f7d1f8d44ffedda4e3025"; - sha256 = "1dlzipvafjbnv8ih62ldfyv7yri0zz0gkfnhdlkv4l1482xdg5yn"; + rev = "8707d93ede4b45c6173641d3482b0d8ffbbeb860"; + sha256 = "1k4jsklaqmzg6lmrb1sgkwrqpl3qvycqxqdfc129vrg4gybhsavz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; @@ -61750,12 +61877,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20161120.148"; + version = "20161206.2115"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "61a16be9fb34486b68e116dd57a4a0a057b8a3e5"; - sha256 = "1v01yl1jf93dsqn6myc2yj6z2cjr9pq2q3cawj5kn21qc53q33fd"; + rev = "740c27df2a6cfc688267e97ee8017b8fb3ac624c"; + sha256 = "0qy02zifxfwvvy12jfx83lrkdjlglfb6m5ifm4b8waa6nbmfpvy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62004,8 +62131,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "ef93c20469c08feef7fd915bb773b53e0673679b"; - sha256 = "08xjp9r2cx9jp4gvnadm1x72mqicwkj6rzmzgm976xrndi47cakm"; + rev = "0accbea79b9cae8dae68ff64d35fd342792c15dc"; + sha256 = "13ab7k0c5az712ph2a879da84mwijvb1mxzn59cv3xkriabndk4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -62535,12 +62662,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161119.1334"; + version = "20161205.450"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "99baeba41c06f8ac67570de679405d83a8962fb0"; - sha256 = "0piwn9bpfiiv8vgk9bhrvlh25kfh1sa1a7dqpp6dsrvg1swjqwj1"; + rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f"; + sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62907,12 +63034,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161011.747"; + version = "20161206.155"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63260,12 +63387,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20161116.506"; + version = "20161124.910"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "c2f0e4024efe07af7c8aa431c3dd3640c22f39ad"; - sha256 = "01f0qr0mvqj9dh9zzk9y70kivyrdvcn45gpzakqi7vnkvqap86lv"; + rev = "b2582df8f6c1125636f113100a77edcde0879c22"; + sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63323,12 +63450,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20160928.1956"; + version = "20161201.2217"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035"; - sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld"; + rev = "fa1277d1cd955b031a943d52d370e97aec3f2cac"; + sha256 = "1j1q60hjfx6ma82j6dil0a16jrablzskh76l0gcdq0c8rjdqb4i4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -63641,8 +63768,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "6eb5781af166bb8850e83fe7bb9be74f274f2b99"; - sha256 = "1yzx5ijjpg7dn6vnp66qq8fazb389wkpki4kpn3jvwc2462i2z6r"; + rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3"; + sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -64040,8 +64167,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; - sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; + rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; + sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64061,8 +64188,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; - sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; + rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; + sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64306,12 +64433,12 @@ theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; - version = "20130725.1919"; + version = "20161130.1440"; src = fetchFromGitHub { owner = "hadronzoo"; repo = "theme-changer"; - rev = "c28ea477e8277c03e14657f167695e3c4bf3c11f"; - sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8"; + rev = "60e3dd7cbd237225fef34179168006501a27b06b"; + sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; @@ -64491,8 +64618,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "84d6af4cf903571319e0ebddd7beb12bc93fb752"; - sha256 = "1809p5fi1si0l4qfw99d3rkcd1jsfyrvrqwf7xxvwxwjca3zqdxi"; + rev = "7ab125a253e5aebbf2a0ed9a0a1602a4b879eca7"; + sha256 = "11wsdxjjw4l7h79achnw6kq5qs3dwyinkfn4r26bijapmk60626s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -64548,12 +64675,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161123.255"; + version = "20161205.2257"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "9e5baa6ced305f440f67bcc803e24f0a03ec2b0a"; - sha256 = "1xbj704y91300g6nbr01abf9xsfrpc3qykpz5jm35ra54hnvj11c"; + rev = "2351b8240faaf7fc7785516c0480d54e78e0d3e3"; + sha256 = "14wfh3siwsxdicb382w9ygjmz6xxqm1724xypxva4n26666fc2da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -65589,8 +65716,8 @@ src = fetchFromGitHub { owner = "josteink"; repo = "ts-comint"; - rev = "2e71708dcd6f3af62501912904c85075d70edc7c"; - sha256 = "1m8rcz6yj8j49jxyjg330bgw3d6mqmzf3f1ja1ngjsfhpkl27v99"; + rev = "53e0326149d74ac13850f052dcdae4a070d63480"; + sha256 = "0jrl161lkjdk9appn42g8nybj7sdrpvr0h7c48kj4vvsfmlmrikp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint"; @@ -65688,12 +65815,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20160710.1045"; + version = "20161129.1516"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "1e68a0addca6165b8f1cadfcd15c0b7ef5184e9a"; - sha256 = "11g1gimcp4w59pd316my8zmi4y78zf9avxhck829f817a97kf5fn"; + rev = "f2c75b3dce0760a84d2558d9e8ef43d5f4559c47"; + sha256 = "1nsj9iqinmnw10b0ij636nikdfhz946rd97751pzk4irwsbycxyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -65940,12 +66067,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20161123.6"; + version = "20161130.1944"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "d5c4fb27c896e37d6adaa61f55b275ba9efa7b98"; - sha256 = "09kg5axl0aazfglzp0zm5wj3rrqkvdhiwlafliw2icrspygnk7ra"; + rev = "f72826e564dc9d7b60dd9df3c6337f33b02560bf"; + sha256 = "1mhsznkg7hnhb7ypbx0ljg3scawz6dsa5l2vaapb51akaf87a267"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -66000,12 +66127,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20160531.931"; + version = "20161125.1205"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "0e5b374830e85a32b51a4cc8206df8e494378cb2"; - sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng"; + rev = "0ec57775db48d3a2d73998d569626cc720618786"; + sha256 = "15wl6vymbdc3fzsk4fn12j7nzdg9iqzfi3lnw68bl0p00s3i37pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -66046,8 +66173,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "typoscript-mode"; - rev = "0d414e15c8217b5ed42080c84f1c4cc39fdb18ab"; - sha256 = "1i6667dn8avk2lm37lq2ga3d716d34yqz5zqd8j1lq4xyjaq3qj6"; + rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99"; + sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; @@ -68114,12 +68241,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161119.924"; + version = "20161203.834"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "de14f795f0256642eb03fbaf3182896619203c66"; - sha256 = "09qfc1q4954p5fxgcrkgd9rhff3f2cq1sgs6ydznqmsah5nvfcr0"; + rev = "f0aec22fd9cbefb8246f8ae533716b7cce016077"; + sha256 = "0zmn8jyvs164kim3avvdaw66rmdh6nqbm5qi6bpz5i0zb3w36jzn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -68450,12 +68577,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161121.2003"; + version = "20161205.1129"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "b5a9d7d1ce028ce904cb8479a10440ad6c839221"; - sha256 = "184if1gyxnvrqjd3i59kjg5sndaa0fq50l267qgbxv807w9akha3"; + rev = "786d800f61e25a1892c44f68a3e21c0507d03a1d"; + sha256 = "0whh6srdw1byr3zq84q3z847jlfsiqvmz2pybkvvdc4j5bfbr7hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -69008,8 +69135,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d9ebfc6c8722"; - sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; + rev = "c8c2934f6674"; + sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69046,12 +69173,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20161109.403"; + version = "20161201.925"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "7b6ac3acf02fcfe118685011d46bb8f6b5cc493c"; - sha256 = "0vvr6agl2db16wppgg8rcd3q9sq5c8xcc518hmxq9drdhgn1az1s"; + rev = "ee41302fea917eb113182bc1eb8d44de882233f8"; + sha256 = "165shk1bi5lhbx06mavvlpcqvdjpnwdp29l9gqnyxclc7nm0i05b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -69235,12 +69362,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20161122.954"; + version = "20161206.201"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "7f4b1367ba8d86f7c2d8a47f7dd9ac87c4104620"; - sha256 = "0n0gdvhzaqkacj44ia5mnx9xcq213apmwxbkm0xhlmmirz6l336h"; + rev = "c1a5e644320b98467a31b0c363edc8229927ed78"; + sha256 = "11pb3sd1jn5jfhx0q4pwpiszaadbyag9zjb6iy6sl1nhs2z22acn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -69571,12 +69698,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161116.1343"; + version = "20161202.1016"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "4b58d598a48f7d8203c1673ceaa05e2fa4f83b68"; - sha256 = "0b0i2vxmzr79f6va19nn6ls1gl2hv4nk8w8w6hmghcsbdi4npmg3"; + rev = "de18e02b5fbbc82de463727d519ccf8aa45fe997"; + sha256 = "1n40lp273zjjd82ggzvibzxcp8szyxdqpz8c61mdfq8hyk174nmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69673,6 +69800,27 @@ license = lib.licenses.free; }; }) {}; + xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xah-math-input"; + version = "20161206.1107"; + src = fetchFromGitHub { + owner = "xahlee"; + repo = "xah-math-input"; + rev = "4f36d0d949ec8d930aa5e3a0cdaa9fb136244436"; + sha256 = "184kciyvs9qgzlf33y11y8x4rixfg1sx067qh67yjwgl2wzwbwfm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; + sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a"; + name = "xah-math-input"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/xah-math-input"; + license = lib.licenses.free; + }; + }) {}; xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; @@ -69785,8 +69933,8 @@ src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-xkcd"; - rev = "2c538d41a9728939cc5e8292faa78ed50997877d"; - sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x"; + rev = "66e928706fd660cfdab204c98a347b49c4267bdf"; + sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd"; @@ -70012,12 +70160,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161110.1630"; + version = "20161128.1657"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "34318edd4a552f194affb9858fce241747d0c79c"; - sha256 = "0kv843wl0j1zwpcxmzbbpci6yrjvyhamwxbv7568yv5hzscm0sh7"; + rev = "67860d31c4a4e8e8781bf2c8888f40001614f54a"; + sha256 = "01if8ggkpli7md0yg4c3gv8nn0di3drs2frcfm9cd4d4jc7wc7l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -70345,12 +70493,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20160822.1207"; + version = "20161202.1055"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "0931e0f4ee3ed060be87f529cac4950af534ffac"; - sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x"; + rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f"; + sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -70450,12 +70598,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161110.1226"; + version = "20161201.1520"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "8412d71e44576c6e9f182109219a8a71cf9d4311"; - sha256 = "0x4lbg6psffpw0s4nji6iyp3iqdip5l6m2hkcg4y5va048hr4hbf"; + rev = "7b013dbbdbaa692199616e5ef727b5d4e3149e63"; + sha256 = "1l8n4ab0ls5zmdn6l8836qc220s4lh05q99bzad716h42p5va4gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -70489,6 +70637,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "20161001.518"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "0c098405a3c9"; + sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -70534,12 +70701,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 = "20161121.5"; + version = "20161128.358"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70770,22 +70937,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20161108.858"; + version = "20161202.731"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "32873003d1c120f7f4fe1438df9a4c1c08785996"; - sha256 = "0g6yknx9gdpk8ccqcjzq4rglrrlpi8npm7klfrv3xiz48sb6igaj"; + rev = "5ebe8195d77b0c35baccd4279d6e0b92731c35fa"; + sha256 = "1mdihfra7p7hvqsif1zlwnw46kvqp70r67f7qkwnlwhywgggvkvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline ]; + packageRequires = [ all-the-icons flycheck magit ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; @@ -70961,10 +71128,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20160819.1426"; + version = "20161127.1801"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "1dmcslyf9wm6hmyj8lshs97s3pn6y5m5q4i75p4gzrsgqgyc0h5f"; + sha256 = "09lwqkfcz97jpzfr4q5ir6m8zxligkkf70b2ppnnchhmdghs0yx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; From 6ef023a62b55a0564c9d542ee3ac151ac1b9e647 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 3 Dec 2016 04:24:29 -0500 Subject: [PATCH 165/216] melpa-stable-packages: 2016-12-07 Removals: - elang: removed from melpa --- .../emacs-modes/melpa-stable-generated.nix | 690 +++++++++++++----- 1 file changed, 512 insertions(+), 178 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 4df78d2202b..38ab70fd4f9 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -191,12 +191,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "610ff778697eb5499394be3fc3652756d0bfb772"; - sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam"; + rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; + sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -1052,12 +1052,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; - sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; + rev = "977b53e28b3141408fff4814be8b67ee23650cac"; + sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -3888,6 +3888,27 @@ license = lib.licenses.free; }; }) {}; + closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "closql"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "closql"; + rev = "5e9d64288863d6d33fac73ccf356427215daa9fb"; + sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; + sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; + name = "closql"; + }; + packageRequires = [ emacs emacsql-sqlite ]; + meta = { + homepage = "https://melpa.org/#/closql"; + license = lib.licenses.free; + }; + }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -3933,12 +3954,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "5cfc2e926af645840c6a0464451af18f08528879"; - sha256 = "13kxazjv6vsxsiyyr7qk0gnw4q55z0pa5icz0b4swvm96c4kywg3"; + rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4"; + sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4965,6 +4986,27 @@ license = lib.licenses.free; }; }) {}; + counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-gtags"; + version = "0.1"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-counsel-gtags"; + rev = "8066dd4cd6eb157345fb43788bacf2c5d746b497"; + sha256 = "07kxv56p340a913673h30q65814ji7lwc6gsn9vcr18rsdaj7qwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; + sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + name = "counsel-gtags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-gtags"; + license = lib.licenses.free; + }; + }) {}; coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; @@ -5070,22 +5112,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }: + cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.3"; + version = "0.2.8"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b"; - sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92"; + rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; + sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; name = "cricbuzz"; }; - packageRequires = [ enlive ]; + packageRequires = [ dash enlive s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -5175,6 +5217,27 @@ license = lib.licenses.free; }; }) {}; + csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "csv"; + version = "2.1"; + src = fetchFromGitLab { + owner = "u11"; + repo = "csv.el"; + rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411"; + sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv"; + sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd"; + name = "csv"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/csv"; + license = lib.licenses.free; + }; + }) {}; ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctable"; @@ -5323,12 +5386,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.25.1"; + version = "0.25.2pre0"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "278a567621d586af74a1c845de0a1426b686c72e"; - sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j"; + rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; + sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -5470,12 +5533,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; - sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; + sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; @@ -5993,12 +6056,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "0.3"; + version = "0.4"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "7fc95de6d7722b304124a890e4fb577e16897b1f"; - sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb"; + rev = "bd10690402aa451e65cbadb192356386cd855abd"; + sha256 = "1millrv2rgiswnh9hrprqx2lmbi9h8fasgin5clhixafhmp9l6sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -6354,6 +6417,27 @@ license = lib.licenses.free; }; }) {}; + docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "docker-tramp"; + version = "0.1"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "docker-tramp.el"; + rev = "d8b510365d8e65551f4f792f251e7212411708c3"; + sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; + sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w"; + name = "docker-tramp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/docker-tramp"; + license = lib.licenses.free; + }; + }) {}; dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; @@ -7443,27 +7527,6 @@ license = lib.licenses.free; }; }) {}; - elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { - pname = "elang"; - version = "0.0.1"; - src = fetchFromGitHub { - owner = "vkazanov"; - repo = "elang"; - rev = "ae42437603d6dc84d3850bc45496a82b8583703e"; - sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang"; - sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy"; - name = "elang"; - }; - packageRequires = [ names ]; - meta = { - homepage = "https://melpa.org/#/elang"; - license = lib.licenses.free; - }; - }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -7569,6 +7632,27 @@ license = lib.licenses.free; }; }) {}; + elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + melpaBuild { + pname = "elisp-refs"; + version = "1.1"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "refs.el"; + rev = "e309c87a91012305ecb37124a758609c64e0ca4a"; + sha256 = "0wvz5ysaj2dnqhkp5xdqsm45fxwlhym5j8rn4g0h7g7zwdi3c6c6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; + sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; + name = "elisp-refs"; + }; + packageRequires = [ dash f list-utils loop s ]; + meta = { + homepage = "https://melpa.org/#/elisp-refs"; + license = lib.licenses.free; + }; + }) {}; elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-slime-nav"; @@ -8164,12 +8248,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d3e3bace6b648f5b60d833a72a50603545102934"; - sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; + rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; + sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -8473,6 +8557,27 @@ license = lib.licenses.free; }; }) {}; + epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "epkg"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "epkg"; + rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee"; + sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; + sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; + name = "epkg"; + }; + packageRequires = [ closql dash emacs ]; + meta = { + homepage = "https://melpa.org/#/epkg"; + license = lib.licenses.free; + }; + }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -8891,22 +8996,22 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf"; - sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0"; + rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; + sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; name = "eshell-git-prompt"; }; - packageRequires = [ cl-lib dash emacs s ]; + packageRequires = [ cl-lib dash emacs ]; meta = { homepage = "https://melpa.org/#/eshell-git-prompt"; license = lib.licenses.free; @@ -8936,12 +9041,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "cc9a4b505953a9b56222896a6f973145aeb154b9"; - sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i"; + rev = "033924f138f19f22a30c1845e728691e5615fa38"; + sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -9415,22 +9520,22 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "4846518b5999892ceaf3ef143cc734685bca325f"; - sha256 = "0009443f7a1k2746qr7p06jv4ksq0w3sf22pjbm0jrnhaw0p66cx"; + rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; + sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; name = "evil-matchit"; }; - packageRequires = []; + packageRequires = [ evil ]; meta = { homepage = "https://melpa.org/#/evil-matchit"; license = lib.licenses.free; @@ -10195,12 +10300,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.2.5"; + version = "5.2.7"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6"; - sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1"; + rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729"; + sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -11951,12 +12056,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f"; - sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2"; + rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; + sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -12329,12 +12434,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -12746,6 +12851,27 @@ license = lib.licenses.free; }; }) {}; + gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "gitter"; + version = "1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitter.el"; + rev = "bd2ba457109dd5d3e4b419e3ef5cbd3b5c9498d6"; + sha256 = "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; + sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; + name = "gitter"; + }; + packageRequires = [ emacs let-alist ]; + meta = { + homepage = "https://melpa.org/#/gitter"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -13061,6 +13187,27 @@ license = lib.licenses.free; }; }) {}; + go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: + melpaBuild { + pname = "go-playground"; + version = "1.0"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "go-playground"; + rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd"; + sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; + sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6"; + name = "go-playground"; + }; + packageRequires = [ emacs go-mode gotest ]; + meta = { + homepage = "https://melpa.org/#/go-playground"; + license = lib.licenses.free; + }; + }) {}; go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-scratch"; @@ -13085,12 +13232,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede"; - sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; + rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; + sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -13274,12 +13421,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b9bcc6f44098b110772a4c947f0a233f207955c5"; - sha256 = "1x62skbqgjskrbsxqn1b377z1y0vp2ivf9k2f0g595lg2zfcycjf"; + rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41"; + sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13313,6 +13460,27 @@ license = lib.licenses.free; }; }) {}; + grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grab-x-link"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "grab-x-link"; + rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; + sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; + sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; + name = "grab-x-link"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/grab-x-link"; + license = lib.licenses.free; + }; + }) {}; gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "gradle-mode"; @@ -13454,12 +13622,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; - sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; + rev = "62cc73fee31f1bd9474027b83a249feee050271e"; + sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -13520,8 +13688,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "fe70088c54b9"; - sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; + rev = "c7e2817461c3"; + sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -13763,6 +13931,27 @@ license = lib.licenses.free; }; }) {}; + gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gxref"; + version = "0.1"; + src = fetchFromGitHub { + owner = "dedi"; + repo = "gxref"; + rev = "15723a9d910d7dd9ea18cab0336332cf988aeceb"; + sha256 = "1l5d1kh2dy3w42i8c3z63c7mzarxixxiby2g7ay2i809yxj10y1n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; + sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; + name = "gxref"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gxref"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -14101,12 +14290,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; - sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; + rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; + sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14353,12 +14542,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; - sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; + rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; + sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14875,22 +15064,43 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: + helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: + melpaBuild { + pname = "helm-notmuch"; + version = "1.0"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "helm-notmuch"; + rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf"; + sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; + sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0"; + name = "helm-notmuch"; + }; + packageRequires = [ helm notmuch ]; + meta = { + homepage = "https://melpa.org/#/helm-notmuch"; + license = lib.licenses.free; + }; + }) {}; + helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-open-github"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-open-github"; - rev = "95140bbacc66320a032d3cdd9e1c31aeb47eb83d"; - sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya"; + rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc"; + sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; name = "helm-open-github"; }; - packageRequires = [ cl-lib gh helm-core ]; + packageRequires = [ emacs gh helm-core ]; meta = { homepage = "https://melpa.org/#/helm-open-github"; license = lib.licenses.free; @@ -15148,6 +15358,27 @@ license = lib.licenses.free; }; }) {}; + helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rdefs"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "saidie"; + repo = "emacs-helm-rdefs"; + rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; + sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; + sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; + name = "helm-rdefs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rdefs"; + license = lib.licenses.free; + }; + }) {}; helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; @@ -15232,6 +15463,27 @@ license = lib.licenses.free; }; }) {}; + helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: + melpaBuild { + pname = "helm-smex"; + version = "0.2"; + src = fetchFromGitHub { + owner = "ptrv"; + repo = "helm-smex"; + rev = "7af4e4b44671f739b39584fc50c20084700701ac"; + sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; + sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj"; + name = "helm-smex"; + }; + packageRequires = [ emacs helm smex ]; + meta = { + homepage = "https://melpa.org/#/helm-smex"; + license = lib.licenses.free; + }; + }) {}; helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: melpaBuild { pname = "helm-spaces"; @@ -15718,12 +15970,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b"; - sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j"; + rev = "a23312464fc6462d559462a44cd74735e9f73421"; + sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -15862,6 +16114,27 @@ license = lib.licenses.free; }; }) {}; + htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "htmlize"; + version = "1.50"; + src = fetchFromGitHub { + owner = "hniksic"; + repo = "emacs-htmlize"; + rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; + sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; + sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; + name = "htmlize"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/htmlize"; + license = lib.licenses.free; + }; + }) {}; httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "httpcode"; @@ -15907,12 +16180,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; - sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; + rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; + sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -16705,12 +16978,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "d130ede56a1203d0aa1c8e5bca5fedbfb14e7ce8"; - sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz"; + rev = "54eb6bf6d68d71bdac63fcb2042d8e1c554b427f"; + sha256 = "0yqcl2r8kwdl99704vm8qsdzziidznp0gpyr29ipya7fl24nkfxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -16789,12 +17062,12 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "39da6a50e7f39e6ccd9aada0c20d8b6d501cb487"; - sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96"; + rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; + sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; @@ -16956,12 +17229,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; - sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; + rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c"; + sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -17269,12 +17542,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.25"; + version = "0.26"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "1ec4939d81e410c081b709505d812775bb8338e8"; - sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; + rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; + sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -17458,12 +17731,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d"; - sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf"; + rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53"; + sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -18298,12 +18571,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "0.2.6"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "54ddb8742c50a338639625183f7315278fa7369c"; - sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; + rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; + sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -18449,8 +18722,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "9a8bea502793f5467df77cfea14ea2de07bc26bc"; - sha256 = "0izym69gnz32c4y49s0amavxzjgm1pqlks7xchr5zdz7wqs7wb25"; + rev = "d722d3662b191b61310dc9bba78f9a77f512b742"; + sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -18746,12 +19019,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "8f782f58aa2fa2c805b6f488ade9e1c33fed6edb"; - sha256 = "0vmkqlgiahcc6aa0ky4jjdc5nxnn2i7qwfl6wkgy5rmq051nk4k0"; + rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; + sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -19040,12 +19313,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19194,12 +19467,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -19551,12 +19824,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "25f1de28390a0b7be493e8f168749d851784ce12"; - sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra"; + rev = "2fc9f06fdf8489a2d5661b794941abb6f863f194"; + sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; @@ -19866,7 +20139,7 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; @@ -20369,12 +20642,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; - sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; + rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; + sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -21209,12 +21482,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; - sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; + rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; + sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -21290,11 +21563,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.2"; + version = "0.23.3"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "c9ec90ae7f22d817aa0ddb5e1a0ae80715071b5e"; - sha256 = "1bhyi64qir93sd8d1c2gawc2p7d9mqfq7cn7p5hvh8bv2w3hkq14"; + rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10"; + sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -22410,12 +22683,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "c1ca137ef90e442592ce88ef16437dc7dfa9c5dd"; - sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj"; + rev = "3a96bfb57cb158ac02cfb4225512699c66f5221d"; + sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -22449,22 +22722,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e"; - sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv"; + rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; + sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs pcache projectile ]; + packageRequires = [ dash emacs projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -22714,12 +22987,12 @@ org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tracktable"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tty-tourist"; repo = "org-tracktable"; - rev = "c38a0019fdc5aac0f9b65e04c86c997fe5a32fb0"; - sha256 = "1yh4p3i0ajfnsvh057h8dpf4rqvvblmfgzj6vyn9dmcl5is1ir2q"; + rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a"; + sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable"; @@ -22910,12 +23183,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd"; - sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn"; + rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; + sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -25003,12 +25276,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "960e9f9a978386529eab9a56663c8d79654c4cce"; - sha256 = "1xmlkvrkcrwn6jnl9mxgdyclrwxsr1b7rlikmpw1qhdrwpg86vh5"; + rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; + sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26242,12 +26515,12 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f"; - sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b"; + rev = "bd2d28738368a047d5f407034f78839a7e514489"; + sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; @@ -26575,6 +26848,27 @@ license = lib.licenses.free; }; }) {}; + rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "rjsx-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "felipeochoa"; + repo = "rjsx-mode"; + rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0"; + sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; + sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; + name = "rjsx-mode"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/rjsx-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -26704,12 +26998,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "95ffd54ca9554f5df5ac4f65c49eb595c5aeb3c9"; - sha256 = "02ygv4bag4z1msaqzc6fqgmbz6lg7laihnq6zp76n35inqa9a4w8"; + rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861"; + sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -27082,11 +27376,11 @@ schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "schrute"; - version = "0.2"; + version = "0.2.2"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; - rev = "99857394886e516d5ebd63fedff200bceaef1d4d"; - sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6"; + rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; + sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; @@ -27731,12 +28025,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "9984ad77e63ae8d40e863cf1b0d8339ede986792"; - sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93"; + rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; + sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -28799,6 +29093,27 @@ license = lib.licenses.free; }; }) {}; + ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssh-deploy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "cjohansson"; + repo = "emacs-ssh-deploy"; + rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef"; + sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; + sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x"; + name = "ssh-deploy"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ssh-deploy"; + license = lib.licenses.free; + }; + }) {}; stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; @@ -31935,8 +32250,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d9ebfc6c8722"; - sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; + rev = "c8c2934f6674"; + sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -31973,12 +32288,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847"; - sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q"; + rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a"; + sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -32537,6 +32852,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "1.78"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "0c098405a3c9"; + sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -32673,22 +33007,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "3.7"; + version = "4.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "a9fc16f317cade7db85433e66c80ba784e07a975"; - sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p"; + rev = "63df2ae09a9e1d670f0694f7c15f19f9170e2407"; + sha256 = "18a0g33z70yqr066cxm9d17jwvrx8hpgp0v2c6swk05h9b4h3pb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline ]; + packageRequires = [ all-the-icons flycheck magit ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From fe727a19c10bd7ddf72a71ee573c269ac7431b27 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 15:06:15 -0600 Subject: [PATCH 166/216] rebar3: 3.1.0 -> 3.3.2 --- .../tools/build-managers/rebar3/default.nix | 68 +++++++++---------- .../rebar3/hermetic-bootstrap.patch | 46 ++++++++----- .../rebar3/hermetic-rebar3.patch | 38 +++++------ 3 files changed, 81 insertions(+), 71 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d8938e2d468..bfc6dce1e1a 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,45 +3,20 @@ tree, fetchFromGitHub, hexRegistrySnapshot }: let - version = "3.1.0"; + version = "3.3.2"; bootstrapper = ./rebar3-nix-bootstrap; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "0.19.0"; - sha256 = "1gfsy9bbhjb94c5ghff2niamn93x2x08lnklh6pp7sfr5i0gkgsv"; - }; - ssl_verify_hostname = fetchHex { - pkg = "ssl_verify_hostname"; - version = "1.0.5"; - sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj"; + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.3.0"; + sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6"; }; certifi = fetchHex { pkg = "certifi"; version = "0.4.0"; sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw"; }; - providers = fetchHex { - pkg = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.0.4"; - sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; - }; - relx = fetchHex { - pkg = "relx"; - version = "3.17.0"; - sha256 = "1xjybi93m8gj9f9z3lkc7xbg3k5cw56yl78rcz5qfirr0223sby2"; - }; cf = fetchHex { pkg = "cf"; version = "0.2.1"; @@ -49,14 +24,39 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.2.2"; - sha256 = "0kb9v4998liwyidpjkhcg1nin6djjzxcx6b313pbjicbp4r58n3p"; + version = "1.2.3"; + sha256 = "0wfpfismzi2q0nzvx9qyllch4skwmsk6yqffw8iw2v48ssbfvfhz"; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "0.21.0"; + sha256 = "0gxb011m637rca2g0vhm1q9krm3va50rz1py6zf8k92q4iv9a2p7"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.3.1"; sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934"; }; + getopt = fetchHex { + pkg = "getopt"; + version = "0.8.2"; + sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.6.0"; + sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; + }; + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.1"; + sha256 = "0pnnan9xf4r6pr34hi28zdyv501i39jwnrwk6pr9r4wabkmhb22g"; + }; + relx = fetchHex { + pkg = "relx"; + version = "3.21.1"; + sha256 = "00590aqy0rfzgsnzxqgwbmn90imxxqlzmnmapy6bq76vw2rynvb8"; + }; rebar3_hex = fetchHex { pkg = "rebar3_hex"; version = "1.12.0"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "0r4wpnpi81ha4iirv9hcif3vrgc82qd51kah7rnhvpym55wcy9ml"; + sha256 = "14nhc1bmna3b4y9qmd0lzpi0jdaw92r7ljg7vlghn297awsjgg6c"; }; inherit bootstrapper; @@ -97,7 +97,7 @@ stdenv.mkDerivation { cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters cp --no-preserve=mode -R ${relx} _build/default/lib/relx - cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname + cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex ''; diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch index 40f430a558b..fa7a18f24d2 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch @@ -1,5 +1,5 @@ diff --git a/bootstrap b/bootstrap -index 35759b0..939c838 100755 +index c36fddb..9fcb718 100755 --- a/bootstrap +++ b/bootstrap @@ -7,9 +7,11 @@ main(_) -> @@ -9,42 +9,44 @@ index 35759b0..939c838 100755 - inets:start(), - inets:start(httpc, [{profile, rebar}]), - set_httpc_options(), -+ %% Removed for hermeticity on Nix ++ %% Removed for hermeticity on Nix + %% -+ %% inets:start(), -+ %% inets:start(httpc, [{profile, rebar}]), -+ %% set_httpc_options(), - ++ %% inets:start(), ++ %% inets:start(httpc, [{profile, rebar}]), ++ %% set_httpc_options(), + %% Fetch and build deps required to build rebar3 BaseDeps = [{providers, []} -@@ -74,12 +76,12 @@ default_registry_file() -> +@@ -73,13 +75,13 @@ default_registry_file() -> + CacheDir = filename:join([Home, ".cache", "rebar3"]), filename:join([CacheDir, "hex", "default", "registry"]). - - fetch_and_compile({Name, ErlFirstFiles}, Deps) -> + +-fetch_and_compile({Name, ErlFirstFiles}, Deps) -> - case lists:keyfind(Name, 1, Deps) of - {Name, Vsn} -> - ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name); - {Name, _, Source} -> - ok = fetch(Source, Name) - end, ++fetch_and_compile({Name, ErlFirstFiles}, _Deps) -> + %% case lists:keyfind(Name, 1, Deps) of + %% {Name, Vsn} -> + %% ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name); + %% {Name, _, Source} -> + %% ok = fetch(Source, Name) + %% end, - + %% Hack: erlware_commons depends on a .script file to check if it is being built with %% rebar2 or rebar3. But since rebar3 isn't built yet it can't get the vsn with get_key. -@@ -88,63 +90,63 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) -> - +@@ -88,67 +90,67 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) -> + compile(Name, ErlFirstFiles). - + -fetch({pkg, Name, Vsn}, App) -> - Dir = filename:join([filename:absname("_build/default/lib/"), App]), - case filelib:is_dir(Dir) of - false -> -- CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs", +- CDN = "https://repo.hex.pm/tarballs", - Package = binary_to_list(<>), - Url = string:join([CDN, Package], "/"), - case request(Url) of @@ -85,7 +87,11 @@ index 35759b0..939c838 100755 - end. - -get_http_vars(Scheme) -> -- proplists:get_value(Scheme, get_rebar_config(), []). +- OS = case os:getenv(atom_to_list(Scheme)) of +- Str when is_list(Str) -> Str; +- _ -> [] +- end, +- proplists:get_value(Scheme, get_rebar_config(), OS). - -set_httpc_options() -> - set_httpc_options(https_proxy, get_http_vars(https_proxy)), @@ -101,7 +107,7 @@ index 35759b0..939c838 100755 +%% Dir = filename:join([filename:absname("_build/default/lib/"), App]), +%% case filelib:is_dir(Dir) of +%% false -> -+%% CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs", ++%% CDN = "https://repo.hex.pm/tarballs", +%% Package = binary_to_list(<>), +%% Url = string:join([CDN, Package], "/"), +%% case request(Url) of @@ -142,7 +148,11 @@ index 35759b0..939c838 100755 +%% end. + +%% get_http_vars(Scheme) -> -+%% proplists:get_value(Scheme, get_rebar_config(), []). ++%% OS = case os:getenv(atom_to_list(Scheme)) of ++%% Str when is_list(Str) -> Str; ++%% _ -> [] ++%% end, ++%% proplists:get_value(Scheme, get_rebar_config(), OS). + +%% set_httpc_options() -> +%% set_httpc_options(https_proxy, get_http_vars(https_proxy)), @@ -154,6 +164,6 @@ index 35759b0..939c838 100755 +%% set_httpc_options(Scheme, Proxy) -> +%% {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy), +%% httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar). - + compile(App, FirstFiles) -> Dir = filename:join(filename:absname("_build/default/lib/"), App), diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch index 634dda8c45a..3adfb7ee9e3 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch @@ -1,8 +1,8 @@ -diff a/src/rebar3.erl b/src/rebar3.erl -index c1a1ae4..1bf1ea0 100644 +diff --git a/src/rebar3.erl b/src/rebar3.erl +index 47dc25a..edda250 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl -@@ -294,9 +294,11 @@ start_and_load_apps(Caller) -> +@@ -304,9 +304,11 @@ start_and_load_apps(Caller) -> ensure_running(crypto, Caller), ensure_running(asn1, Caller), ensure_running(public_key, Caller), @@ -12,16 +12,16 @@ index c1a1ae4..1bf1ea0 100644 + ensure_running(ssl, Caller). +%% Removed due to the hermicity requirements of Nix +%% -+%% inets:start(), -+%% inets:start(httpc, [{profile, rebar}]). - ++%% inets:start(), ++%% inets:start(httpc, [{profile, rebar}]). + ensure_running(App, Caller) -> case application:start(App) of -diff a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl +diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl new file mode 100644 -index 0000000..d814e2a +index 0000000..8f6cc7d --- /dev/null -+++ b/src/rebar_hermicity.erl ++++ b/src/rebar_hermeticity.erl @@ -0,0 +1,42 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 et @@ -49,7 +49,7 @@ index 0000000..d814e2a +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. +%% ------------------------------------------------------------------- -+-module(rebar_hermicity). ++-module(rebar_hermeticity). + +-export([request/5]). + @@ -63,23 +63,23 @@ index 0000000..d814e2a + ?ERROR("A request is being made that violates Nix hermicity " + "This request has been stopped. Details of the request " + "are as follows:", []), -+ ?ERROR("Requesnt: ~p ~s", [Method, Url]), ++ ?ERROR("Request: ~p ~s", [Method, Url]), + erlang:halt(1). -diff a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index ec7e09d..03be343 100644 +diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl +index 5817817..2ea1703 100644 --- a/src/rebar_pkg_resource.erl +++ b/src/rebar_pkg_resource.erl -@@ -104,7 +104,7 @@ make_vsn(_) -> +@@ -107,7 +107,7 @@ make_vsn(_) -> {error, "Replacing version of type pkg not supported."}. - + request(Url, ETag) -> - case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, ++ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, [{ssl, ssl_opts(Url)}, {relaxed, true}], [{body_format, binary}], rebar) of -diff a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index 5e1e253..ea25b9e 100644 +diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl +index 75c609e..4283c23 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -52,7 +52,7 @@ do(State) -> @@ -87,7 +87,7 @@ index 5e1e253..ea25b9e 100644 {ok, Url} -> ?DEBUG("Fetching registry from ~p", [Url]), - case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermicity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, ++ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, [], [{stream, TmpFile}, {sync, true}], rebar) of {ok, saved_to_file} -> From ab9688a63adffc78ef38d45d7891a5be2459fbd5 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 15:07:31 -0600 Subject: [PATCH 167/216] rebar3: Fix typos and support name-version-tag The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta. --- .../tools/build-managers/rebar3/rebar3-nix-bootstrap | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap index 30ff235d12c..81257dd8c0c 100755 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap @@ -41,7 +41,7 @@ main(Args) -> {ok, RequiredData} = gather_required_data_from_the_environment(ArgData), do_the_bootstrap(RequiredData). -%% @doc There are two modes 'registery_only' where the register is +%% @doc There are two modes 'registry_only' where the register is %% created from hex and everything else. -spec do_the_bootstrap(#data{}) -> ok. do_the_bootstrap(RequiredData = #data{registry_only = true}) -> @@ -55,7 +55,7 @@ do_the_bootstrap(RequiredData) -> %% @doc %% Argument parsing is super simple only because we want to keep the %% dependencies minimal. For now there can be two entries on the -%% command line, "registery-only" and "debug-info" +%% command line, "registry-only" and "debug-info" -spec parse_args([string()]) -> #data{}. parse_args(Args0) -> PossibleArgs = sets:from_list(["registry-only", "debug-info"]), @@ -146,13 +146,14 @@ make_symlink(Path, TargetFile) -> %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar is doesn't +%% and returns just the app name. Why? because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(string()) -> string(). fixup_app_name(FileName) -> case string:tokens(FileName, "-") of [Name] -> Name; - [Name, _Version] -> Name + [Name, _Version] -> Name; + [Name, _Version, _Tag] -> Name end. -spec bootstrap_registry(#data{}) -> ok. From 6a86b603f9be415b09ee592ea0c29b76cd167da4 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 16:03:23 -0600 Subject: [PATCH 168/216] lfe: 1.1.1 -> 1.2.1 - Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh - Manually build proper and patch rebar.config s.t. it doesn't try to fetch it - Set checkTarget = "travis" and actually run the tests --- pkgs/development/interpreters/lfe/default.nix | 34 +++++++++++++------ .../interpreters/lfe/no-test-deps.patch | 13 +++++++ .../interpreters/lfe/setup-hook.sh | 5 --- 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/interpreters/lfe/no-test-deps.patch delete mode 100644 pkgs/development/interpreters/lfe/setup-hook.sh diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix index c7957275f9e..cafcc4c28ee 100644 --- a/pkgs/development/interpreters/lfe/default.nix +++ b/pkgs/development/interpreters/lfe/default.nix @@ -1,19 +1,33 @@ -{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash }: +{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, beamPackages }: -stdenv.mkDerivation rec { - name = "lfe-${version}"; - version = "1.1.1"; +let + inherit (beamPackages) buildRebar3 buildHex; + proper = buildHex rec { + name = "proper"; + version = "1.1.1-beta"; + sha256 = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx"; + + configurePhase = '' + ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl + ''; + }; +in +buildRebar3 rec { + name = "lfe"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rvirding"; - repo = "lfe"; + repo = name; rev = version; - sha256 = "0w1vpjqj8ni43gi84i0mcml4gfaqhmmd9s46di37cngpdw86i3bz"; + sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; }; - buildInputs = [ erlang makeWrapper ]; - - setupHook = ./setup-hook.sh; + buildInputs = [ makeWrapper ]; + beamDeps = [ proper ]; + patches = [ ./no-test-deps.patch ]; + doCheck = true; + checkTarget = "travis"; # These installPhase tricks are based on Elixir's Makefile. # TODO: Make, upload, and apply a patch. @@ -24,7 +38,7 @@ stdenv.mkDerivation rec { rm -Rf $ebindir install -m755 -d $ebindir - install -m644 ebin/* $ebindir + install -m644 _build/default/lib/lfe/ebin/* $ebindir install -m755 -d $bindir for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done diff --git a/pkgs/development/interpreters/lfe/no-test-deps.patch b/pkgs/development/interpreters/lfe/no-test-deps.patch new file mode 100644 index 00000000000..8c3faf1ff40 --- /dev/null +++ b/pkgs/development/interpreters/lfe/no-test-deps.patch @@ -0,0 +1,13 @@ +diff --git a/rebar.config b/rebar.config +index 1d5a68e..ca33be7 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -2,7 +2,7 @@ + + {erl_opts, [debug_info]}. + +-{profiles, [{test, [{deps, [proper]}]}]}. ++%% {profiles, [{test, [{deps, [proper]}]}]}. + + {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, + "bin/lfe bin/lfec" diff --git a/pkgs/development/interpreters/lfe/setup-hook.sh b/pkgs/development/interpreters/lfe/setup-hook.sh deleted file mode 100644 index 2405dcea15f..00000000000 --- a/pkgs/development/interpreters/lfe/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addLfeLibPath() { - addToSearchPath ERL_LIBS $1/lib/lfe/lib -} - -envHooks+=(addLfeLibPath) From e0b850147d10564308d7f49850ecbf7168afa7e7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:29:06 -0500 Subject: [PATCH 169/216] openafs: 1.6.17 -> 1.6.20 for CVE-2016-9772 From release notes: OPENAFS-SA-2016-003: file and directory names leak due to reuse of directory objects without zeroing the contents (12461 12462 12463 12464 12465) --- pkgs/servers/openafs-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 52a7941d093..6383ce12bc1 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.17"; + version = "1.6.20"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "16532f4951piv1g2i539233868xfs1damrnxql61gjgxpwnklhcn"; + sha256 = "0qar94k9x9dkws4clrnlw789q1ha9qjk06356s86hh78qwywc1ki"; }; nativeBuildInputs = [ autoconf automake flex yacc perl which ]; From 0683c1a35ca9513d53a7df94cabdd91f9f1cd2a1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:38:50 -0500 Subject: [PATCH 170/216] p7zip: patch for CVE-2016-9296 --- pkgs/tools/archivers/p7zip/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 7c952a8f729..c11c437fa37 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "p7zip-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; + sha256 = "0inblicg24gcbaq84n0mr6w4yc5ak65mh9wxml96wlhdf7ph2i3m"; + }) + ]; + preConfigure = '' makeFlagsArray=(DEST_HOME=$out) buildFlags=all3 From 4c5a1980198eb482e2e73c30beb8c0d13e07d246 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:46:54 -0500 Subject: [PATCH 171/216] teeworlds: 0.6.3 -> 0.6.4 for CVE-2016-9400 --- pkgs/games/teeworlds/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index ea337c208df..504353afebe 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.3"; + name = "teeworlds-0.6.4"; src = fetchurl { - url = "https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz"; - sha256 = "0yq7f3yan07sxrhz7mzwqv344nfmdc67p3dg173631w9fb1yf3j9"; + url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz"; + sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2"; }; # we always want to use system libs instead of these From 86da9839b17127c0ca474dc56a58717160bbcc6c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 20:16:05 -0500 Subject: [PATCH 172/216] xen: Patch for CVE-2016-9385, CVE-2016-9377, and CVE-2016-9378 --- pkgs/applications/virtualization/xen/4.5.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 271ab7e7fe9..e7a46a24965 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchgit, ... } @ args: +{ callPackage, fetchurl, fetchpatch, fetchgit, ... } @ args: let # Xen 4.5.5 @@ -54,7 +54,23 @@ let xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ]; + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547"; + name = "CVE-2016-9385.patch"; + sha256 = "0l5drg862708ngy49jl65vmv6iwxlm7h8b4vabnffc2496f2gbwk"; + }) + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536"; + name = "CVE-2016-9377-CVE-2016-9378-part1.patch"; + sha256 = "1dy8xvnkdvc44ywzzlswmkljjva44c0ndw7538iicr3qyf0244n4"; + }) + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537"; + name = "CVE-2016-9377-CVE-2016-9378-part2.patch"; + sha256 = "0iz36s2w6bh5h9i1a9gj1c748fq1dj90kcg2yzld1m26qx21qrr5"; + }) + ]; }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) From d71dbd733c0fde876219086bf978cd5b2abe7917 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 20:26:47 -0500 Subject: [PATCH 173/216] chromium: 54.0.2840.100 -> 55.0.2883.75 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1c71e7419a1..fa24ed9146f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1dw5difl42jch8pppk9z7ivvw0ah7azjx81allfm85ys075h0ppm"; - sha256bin64 = "1vd3ia7s7k8dkcc9sg1wmbi6x54wf7jmiavixnqb5swglczxfmxz"; - version = "55.0.2883.44"; + sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv"; + sha256bin64 = "0sb2d7vyrckkbg823rnl7y3k6q3kvmxp13lpm0ncy821cx89m89a"; + version = "55.0.2883.75"; }; dev = { - sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; - sha256bin64 = "14s185361inkqh8ykl94xhgv01z68gxqh7j6gyb4jbr0rhcsd9pl"; - version = "56.0.2906.0"; + sha256 = "1g4jy8zpmgqh9br2jcvbrnnr8fc5i4s5hvv01bs433rlcgaqk066"; + sha256bin64 = "08vzar0zshf39390xhr8l7gvzai9pxcqzwqzrmizaaqi9m5pijdr"; + version = "56.0.2924.18"; }; stable = { - sha256 = "1pw91kqqvm9nkz9i6wmm83wnqzl34q8rxw1sjcpfr4qcg15gbrz2"; - sha256bin64 = "05w9yadn7kwn0aiqd2mrg67lpk413zp6xkgwxnwni7z13j3zrw49"; - version = "54.0.2840.100"; + sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv"; + sha256bin64 = "0qfqj8067vjqklg1zm203dh6c29sbhk6w7flvi8h3z28y1pws2qw"; + version = "55.0.2883.75"; }; } From 7c29e476a76b691ca30cbbe07f75f589c11861e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Dec 2016 13:12:47 -0600 Subject: [PATCH 174/216] qt5.6/5.7: PaX compat qtwebengine * paxmark QtWebEngineProcess so it executes on PaX kernels * when building on host w/PaX apply patch to fix mksnapshot Patch taken from Gentoo[1], slightly modified to use paxctl directly. [1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch --- .../qt-5/5.6/qtwebengine/default.nix | 6 ++- .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ .../libraries/qt-5/5.7/default.nix | 2 +- .../default.nix} | 4 ++ .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ 5 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine/qtwebengine-paxmark-mksnapshot.patch rename pkgs/development/libraries/qt-5/5.7/{qtwebengine.nix => qtwebengine/default.nix} (90%) create mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 29a5349ecea..96b6cca75aa 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -11,6 +11,7 @@ , coreutils , pkgconfig, python2 +, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -60,11 +61,14 @@ qtSubmodule { ]; patches = [ ./chromium-clang-update-py.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' cat > $out/libexec/qt.conf < $out/libexec/qt.conf < Date: Wed, 7 Dec 2016 12:33:47 -0600 Subject: [PATCH 175/216] zoom-us: 2.052458.0531 -> 2.0.707090.1031, paxmark * paxmark zoom to fix execution on PaX-enabled kernels[1] * Requires moving from qt55 to qt56 * Put libs as buildInputs so that wrapQtProgram sees their paths! * Don't use bundled Qt libs. (if these should be used, we shouldn't put our own on rpath, etc.) [1] Without this, program fails to start (but doesn't exit), and the following exception is logged a few times: Dec 07 12:24:26 hostname kernel: grsec: denied RWX mmap of by /nix/store/v1i2bff9fs7w1vycv0y615phhs7hky87-zoom-us/share/.zoom-wrapped[.zoom-wrapped:23812] uid/euid:1000/1 zoom still won't run unless using a pax-fixed version of qtwebengine. ( see: https://github.com/NixOS/nixpkgs/pull/20991 ) --- .../instant-messengers/zoom-us/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5f4e0ca1ee0..4e9f00b0340 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -10,7 +10,7 @@ , libxml2 , libxslt , makeQtWrapper -, qt55 +, qt56 , sqlite , stdenv , xlibs @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; - version = "2.0.52458.0531"; + version = "2.0.70790.1031"; src = fetchurl { - url = "https://zoom.us/client/${version}/zoom_${version}_x86_64.tar.xz"; - sha256 = "16d64pn9j27v3fnh4c9i32vpkr10q1yr26w14964n0af1mv5jf7a"; + url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; + sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd"; }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ makeQtWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + buildInputs = [ alsaLib gcc.cc glib @@ -46,10 +46,12 @@ stdenv.mkDerivation rec { libuuid libxml2 libxslt - qt55.qtbase - qt55.qtdeclarative - qt55.qtscript - qt55.qtwebkit + qt56.qtbase + qt56.qtdeclarative + qt56.qtlocation + qt56.qtscript + qt56.qtwebchannel + qt56.qtwebengine sqlite xlibs.xcbutilkeysyms xorg.libX11 @@ -61,13 +63,15 @@ stdenv.mkDerivation rec { xorg.xcbutilimage zlib ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + installPhase = '' mkdir -p $out/share cp -r \ application-x-zoom.png \ audio \ imageformats \ - chrome.bmp \ config-dump.sh \ dingdong1.pcm \ dingdong.pcm \ @@ -77,13 +81,7 @@ stdenv.mkDerivation rec { platforminputcontexts \ platforms \ platformthemes \ - Qt \ - QtMultimedia \ - QtQml \ - QtQuick \ - QtQuick.2 \ - QtWebKit \ - QtWebProcess \ + leave.pcm \ ring.pcm \ ring.wav \ version.txt \ @@ -98,6 +96,7 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ $out/share/zoom + paxmark m $out/share/zoom wrapQtProgram "$out/share/zoom" mkdir -p $out/bin ln -s $out/share/zoom $out/bin/zoom-us From e8220d326433c234533332e89cdcda2880f82986 Mon Sep 17 00:00:00 2001 From: Dmytro Rets Date: Thu, 8 Dec 2016 11:50:31 +0200 Subject: [PATCH 176/216] Update broadcom URL for broadcom-sta driver. --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 5814c184e66..c548b55105d 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "broadcom-sta-${version}-${kernel.version}"; src = fetchurl { - url = "http://www.broadcom.com/docs/linux_sta/${tarball}"; + url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; sha256 = hashes."${stdenv.system}"; }; From c71aee28fe7585a954824d3d5b078c44bccde31a Mon Sep 17 00:00:00 2001 From: Protean Security Date: Thu, 8 Dec 2016 11:33:45 +0100 Subject: [PATCH 177/216] rox-filer: init at 2.11 (#20854) --- lib/maintainers.nix | 1 + pkgs/desktops/rox/rox-filer/default.nix | 77 +++++++++++++++++++ .../rox-filer-2.11-in-source-build.patch | 16 ++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 98 insertions(+) create mode 100644 pkgs/desktops/rox/rox-filer/default.nix create mode 100644 pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2a3b1090553..b56dce79820 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ ehmry = "Emery Hemingway "; eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; + eleanor = "Dejan Lukan "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; epitrochoid = "Mabry Cervin "; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix new file mode 100644 index 00000000000..e7edfd62151 --- /dev/null +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: + +let + version = "2.11"; + name = "rox-filer-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2"; + sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; + }; + + buildInputs = [ pkgconfig libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + + patches = [ + ./rox-filer-2.11-in-source-build.patch + ]; + + # go to the source directory after unpacking the sources + setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; + + # patch source with defined patches + patchFlags = "-p0"; + + # patch the main.c to disable the lookup of the APP_DIR environment variable, + # which is used to lookup the location for certain images when rox-filer + # starts; rather override the location with an absolute path to the directory + # where images are stored to prevent having to use a wrapper, which sets the + # APP_DIR environment variable prior to starting rox-filer + preConfigure = '' + sed -i -e "s:g_strdup(getenv(\"APP_DIR\")):\"$out\":" src/main.c + mkdir build + cd build + ''; + + configureScript = "../src/configure"; + + installPhase = '' + mkdir -p "$out" + cd .. + cp -av Help Messages Options.xml ROX images style.css .DirIcon "$out" + + # create the man/ directory, which will be moved from $out to share/ in the fixup phase + mkdir "$out/man/" + cp -av ../rox.1 "$out/man/" + + # the main executable + mkdir "$out/bin/" + cp -v ROX-Filer "$out/bin/rox" + + # mime types + mkdir -p "$out/ROX/MIME" + cd "$out/ROX/MIME" + ln -sv text-x-{diff,patch}.png + ln -sv application-x-font-{afm,type1}.png + ln -sv application-xml{,-dtd}.png + ln -sv application-xml{,-external-parsed-entity}.png + ln -sv application-{,rdf+}xml.png + ln -sv application-x{ml,-xbel}.png + ln -sv application-{x-shell,java}script.png + ln -sv application-x-{bzip,xz}-compressed-tar.png + ln -sv application-x-{bzip,lzma}-compressed-tar.png + ln -sv application-x-{bzip-compressed-tar,lzo}.png + ln -sv application-x-{bzip,xz}.png + ln -sv application-x-{gzip,lzma}.png + ln -sv application-{msword,rtf}.png + ''; + + meta = with stdenv.lib; { + description = "Fast, lightweight, gtk2 file manager"; + homepage = "http://rox.sourceforge.net/desktop"; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + }; +} diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch new file mode 100644 index 00000000000..11bd8004459 --- /dev/null +++ b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch @@ -0,0 +1,16 @@ +--- src/configure 2011-10-09 16:32:14.000000000 +0200 ++++ src/configure2 2016-03-20 09:26:31.640891863 +0100 +@@ -2132,13 +2132,6 @@ + + + ac_config_headers="$ac_config_headers config.h" +- +- +- if [ -f configure ]; then +- as_fn_error $? "Please run configure from the build directory (try ../AppRun --compile)" "$LINENO" 5 +- exit 1 +-fi +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 922af73fd20..e516fad6b0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16415,6 +16415,10 @@ in theme-vertex = callPackage ../misc/themes/vertex { }; + rox-filer = callPackage ../desktops/rox/rox-filer { + gtk = gtk2; + }; + xfce = xfce4-12; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); From f39d13cd3e577d546445df4bcd6cbe2905b655c1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 7 Dec 2016 04:53:55 +0100 Subject: [PATCH 178/216] grsecurity doc: describe work-around for gitlab Fixes https://github.com/NixOS/nixpkgs/issues/20959 --- nixos/modules/security/grsecurity.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 5b3e4db03a1..a7bcf4924f0 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -325,6 +325,19 @@ + + The gitlab service () + requires a variant of the ruby interpreter + built without `mprotect()` hardening, as in + + services.gitlab.packages.gitlab = pkgs.gitlab.override { + ruby = pkgs.ruby.overrideAttrs (attrs: { + postFixup = "paxmark m $out/bin/ruby"; + }); + }; + + + From 5fd4ffe00f750c5fcd37bee1acb743fc1c643b9d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 8 Dec 2016 12:22:09 +0100 Subject: [PATCH 179/216] grsecurity: 4.8.12-201612031658 -> 201612062306 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 124518c36b2..20e4ec1fd7e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,8 +87,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.8.12"; - grrev = "201612031658"; - sha256 = "06n96jk471xp7m8sf504bw9x6mk893jpymglgw037b21cbv88rrp"; + grrev = "201612062306"; + sha256 = "16ddiqx3sry07d7gy7y7rm8fxaa8v9lgih5l4dd2i39m35za11fq"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 1d5ce684a3fb93679f3bd29cbcbd12e358ea0b26 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 8 Dec 2016 10:10:25 -0200 Subject: [PATCH 180/216] xdgmenumaker: exclude darwin from platforms Travis reports hash mismatch during the darwin build, although the hash has been obtained using 'nix-prefetch-url' (on NixOS). Exclude darwin from platforms until the cause is identified. --- pkgs/applications/misc/xdgmenumaker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 0d89510644a..8155c1ca414 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { description = "Command line tool that generates XDG menus for several window managers"; homepage = https://github.com/gapan/xdgmenumaker; license = licenses.gpl2Plus; - platforms = platforms.unix; + # NOTE: exclude darwin from platforms because Travis reports hash mismatch + platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ]; }; } From 5743506c6ee1ab4f068bf13f553778e3d2147b9e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Dec 2016 14:19:19 +0100 Subject: [PATCH 181/216] aws-sdk-cpp: Use multiple outputs --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 3f5ebd9a8c1..d5d7371aebf 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; }; + # FIXME: might be nice to put different APIs in different outputs + # (e.g. libaws-cpp-sdk-s3.so in output "s3"). + outputs = [ "out" "dev" ]; + buildInputs = [ cmake curl libuuid ]; cmakeFlags = From 6a90b88d27cbd03221b8e6717b8bc225e0abee48 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 09:59:47 -0500 Subject: [PATCH 182/216] loc: 0.3.3 -> 0.3.4 --- pkgs/development/misc/loc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 9e928bdde6f..bc303429274 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "0.3.3"; + version = "0.3.4"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "e2dfe2c1452f25f58974b545292b11dc450afd3d"; - sha256 = "1kp5iawig6304gs1289aivgsq44zhnn0ykqv9ymwpvj0g12l4l8r"; + rev = "9f3590f6299a1be3560f00de7f4f8bef61a02642"; + sha256 = "0dga8prwnnmsa616jh64wzic957ff0491xghm0bjlns35ajc8lif"; }; - depsSha256 = "01jww6d4dzb5pq6vcrp3xslhxic0vp0gicsddda4adzqg1lab8c2"; + depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6"; meta = { homepage = "http://github.com/cgag/loc"; From 5e73d5d8ab2a3231cc9f9c9cf2f529e8a7a6e229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 8 Dec 2016 13:07:53 -0200 Subject: [PATCH 183/216] numix-icon-theme-square: init at 2016-11-23 (#20988) Travis reports hash mismatch during the darwin build, although the hash has been obtained using 'nix-prefetch-url' (on NixOS). Exclude darwin from platforms until the cause is identified. --- .../icons/numix-icon-theme-square/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/icons/numix-icon-theme-square/default.nix diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix new file mode 100644 index 00000000000..4485351b9c3 --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, numix-icon-theme }: + +stdenv.mkDerivation rec { + version = "2016-11-23"; + + package-name = "numix-icon-theme-square"; + + name = "${package-name}-${version}"; + + src = fetchFromGitHub { + owner = "numixproject"; + repo = package-name; + rev = "1c30eb02aea3d95c49f95c212702b56e93ac9043"; + sha256 = "1d2car4dsh1dnim9jlakm035ydqd1f115cagm6zm8gwa5w9annag"; + }; + + buildInputs = [ numix-icon-theme ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -a Numix-Square{,-Light} $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "Numix icon theme (square version)"; + homepage = https://numixproject.org; + license = licenses.gpl3; + platforms = with platforms; allBut darwin; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e516fad6b0e..130ded8d9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11908,6 +11908,8 @@ in numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; + numix-icon-theme-square = callPackage ../data/icons/numix-icon-theme-square { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; From 3a98749bd13c31c3926c00c7bce531d2b14f7c32 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:43:01 +0100 Subject: [PATCH 184/216] pari: 2.9.0 -> 2.9.1 --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 27153ea9b08..64784facfb9 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0rljznrvjgy71n4hlpgx1l1yy1qx52mly68k3c05ds21mlvzg92a"; + sha256 = "0rq7wz9df1xs4acdzzb5dapx8vs6m5py39n2wynw2qv4d2b0ylfw"; }; buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; From ed9fd96a77f10617df3802785ded0a76cc3bf9bb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:44:01 +0100 Subject: [PATCH 185/216] apache-jena: 3.1.0 -> 3.1.1 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 7360cbbceba..13001b1813f 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.1.0"; + version = "3.1.1"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "1nfb567v9s17j31l75v5gkdalmkrqba7ahz3z8gzz4kpmdzdhajk"; + sha256 = "0sxhpasc3qkj1axkccvckv8wiwcc5v6f4yri49inc3sl02pvvanp"; }; buildInputs = [ makeWrapper From d03260099f051b9b855ff3e0a43ce83bf877ffd6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:45:02 +0100 Subject: [PATCH 186/216] nilfs-utils: 2.2.5 -> 2.2.6 --- pkgs/tools/filesystems/nilfs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index d71b6332321..c5cc4f053a2 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.5"; + version = "2.2.6"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "0a5iavbjj8c255mfl968ljmj3cb217k7803cc1sdaskacwnykdq2"; + sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; From 9ad8afbf66288169ed24bbc8b1c5be5476983f50 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:46:04 +0100 Subject: [PATCH 187/216] freeipmi: 1.5.4 -> 1.5.5 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index cd8485e2573..de6c9151865 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1m8zvnyjyjap07vvc5z90nyghabbb6bjcyyc7qswj66qsmssf135"; + sha256 = "0lzzvhzbdl1cxin4xz3lirqxsjwmjr5ac0qr4g21cqsv2j6vj85f"; }; buildInputs = [ libgcrypt readline ]; From 64402bb9e0f77d33deb766440197ff5fd78de584 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:46:21 +0100 Subject: [PATCH 188/216] getmail: 4.51.0 -> 4.52.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 64bad55d88b..c3fe609f4cd 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "4.51.0"; + version = "4.52.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "1nzdjm62lrg7qbh8xz2irj9wxf2861s3ld6zd5fbcgpjy3v588mw"; + sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni"; }; doCheck = false; From 1461981190c048fecd62f681c10d663e3d960d52 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:16:30 +0100 Subject: [PATCH 189/216] harfbuzz: 1.3.3 -> 1.3.4 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9ff735ec1c0..b2edd39764c 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.3.3"; + version = "1.3.4"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9"; + sha256 = "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki"; }; outputs = [ "out" "dev" ]; From ff3fc6eef3fda0df482e89c2c9c035441dace538 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:16:41 +0100 Subject: [PATCH 190/216] librem: 0.4.7 -> 0.5.0 --- pkgs/development/libraries/librem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 5b7041601f7..5ad5f8d3848 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.4.7"; + version = "0.5.0"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "0klm6ls9w0cj66h1zxmx0ifsihlmq1bq75vbmf09d0vvw5g4y22x"; + sha256 = "1n1ajy1ccw0xw6bndad4js2pnj977s2angzs7lawadh7x5wnalbb"; }; buildInputs = [zlib openssl libre]; makeFlags = [ From 1e580945f0bc4eccd52e83094f45e8ea9c223f2f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:17:42 +0100 Subject: [PATCH 191/216] libre: 0.4.17 -> 0.5.0 --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index fe130c5203d..6ec6333a73d 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.17"; + version = "0.5.0"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1630228xbsmasbmkx3s7g4r8mzkdlzila4j2f6m2mp0996v8kq1c"; + sha256 = "18msdi5a1ssymz00w21hg6sgacb2lzx0ns31iapvk5hv6l225pd2"; }; buildInputs = [zlib openssl]; makeFlags = [ From cbd448d00900ad7c36e5509656f4cf365538c666 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:18:07 +0100 Subject: [PATCH 192/216] libreoffice-still: 5.1.5.2 -> 5.1.6.2 --- .../office/libreoffice/libreoffice-srcs-still.nix | 10 +++++----- .../office/libreoffice/still-primary-src.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index d2010d81a8a..3d2514f8414 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -595,11 +595,11 @@ md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; } { - name = "libpng-1.6.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.19.tar.gz"; - sha256 = "9f977ac8e4e3d4d5b001b32243f111eeec21bb6b59e583f2fb41fd2e48840352"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - md5name = "3121bdc77c365a87e054b9f859f421fe-libpng-1.6.19.tar.gz"; + name = "libpng-1.6.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; + sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; + md5 = "65213080dd30a9b16193d9b83adc1ee9"; + md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; } { name = "poppler-0.26.4.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 33ba558ed29..078efa0227d 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "5"; minor = "1"; - patch = "5"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; + sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 2963eff83e7..b3d69ef7f19 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1mzsz9pd2k1lpvwf7r5q90qmdp57160362cmlxaj6bxz52gr9f2i"; + sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1qqpggcanchz0qqasc5xvginrpa5rx7ahj3dw2vk7n34xaarnni6"; + sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g"; }; }; From ce2a9a8f9b5ef229c18abedda63739f3886625cc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 10:08:29 -0500 Subject: [PATCH 193/216] lean2: 2016-07-05 -> 2016-11-29 Renamed from lean since upstream renamed it as well. The lean attribute in nixpkgs will now refer to the new lean 3 version. --- .../science/logic/{lean => lean2}/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/applications/science/logic/{lean => lean2}/default.nix (61%) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean2/default.nix similarity index 61% rename from pkgs/applications/science/logic/lean/default.nix rename to pkgs/applications/science/logic/lean2/default.nix index e833b4afbbd..a938af72f58 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -2,17 +2,17 @@ , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { - name = "lean-${version}"; - version = "2016-07-05"; + name = "lean2-${version}"; + version = "2016-11-29"; src = fetchFromGitHub { owner = "leanprover"; - repo = "lean"; - rev = "cc70845332e63a1f1be21dc1f96d17269fc85909"; - sha256 = "09qz2vjw7whiggvw0cdaa4i2f49wnch2sd4r43glq181ssln27d6"; + repo = "lean2"; + rev = "a086fb334838c427bbc8f984eb44a4cbbe013a6b"; + sha256 = "0qlvhnb37amclgcyizl8bfab33b0a3jk54br9gsrik8cq76lkwwx"; }; - buildInputs = [ gmp mpfr boost cmake python gperftools ninja makeWrapper ]; + buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; enableParallelBuilding = true; preConfigure = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Automatic and interactive theorem prover"; + description = "Automatic and interactive theorem prover (version with HoTT support)"; homepage = "http://leanprover.github.io"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb18f8608e..a0b9edc6535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16747,7 +16747,7 @@ in else smlnj; }; - lean = callPackage ../applications/science/logic/lean {}; + lean2 = callPackage ../applications/science/logic/lean2 {}; leo2 = callPackage ../applications/science/logic/leo2 {}; From a2210a9efd00cee732abbeda84e795efa5bc489b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 10:29:33 -0500 Subject: [PATCH 194/216] lean: init at 2016-12-08 --- .../science/logic/lean/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/science/logic/lean/default.nix diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix new file mode 100644 index 00000000000..d1f4bc0a414 --- /dev/null +++ b/pkgs/applications/science/logic/lean/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, gperftools }: + +stdenv.mkDerivation rec { + name = "lean-${version}"; + version = "2016-12-08"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean"; + rev = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618"; + sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l"; + }; + + buildInputs = [ gmp mpfr cmake gperftools ]; + enableParallelBuilding = true; + + preConfigure = '' + cd src + ''; + + meta = with stdenv.lib; { + description = "Automatic and interactive theorem prover"; + homepage = "http://leanprover.github.io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0b9edc6535..1ca0f435208 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16747,7 +16747,9 @@ in else smlnj; }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; + lean3 = lean; leo2 = callPackage ../applications/science/logic/leo2 {}; From ece67bfa01053f9687f1491f1fcb5617c988900c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Dec 2016 17:52:56 +0100 Subject: [PATCH 195/216] diffoscope: 52 -> 63 --- pkgs/tools/misc/diffoscope/default.nix | 12 +++++++--- pkgs/tools/misc/diffoscope/ignore_links.patch | 24 +++++++------------ pkgs/tools/misc/diffoscope/locale.patch | 14 +++++++++++ 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 pkgs/tools/misc/diffoscope/locale.patch diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index c6eb7c8b018..22c9ea4872b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,24 +1,30 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz +, colordiff , enableBloat ? false }: pythonPackages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "52"; + version = "63"; namePrefix = ""; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "18nqsd51rc0rldyxnjmzn86154asianhv415llhbxpr1a6zwqis6"; + sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd"; }; patches = [ # Ignore different link counts. ./ignore_links.patch + + # Our Glibc doesn't have the C.UTF-8 locale yet + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use + # en_US.UTF-8 instead. + ./locale.patch ]; postPatch = '' @@ -31,7 +37,7 @@ pythonPackages.buildPythonApplication rec { # FIXME: move xxd into a separate package so we don't have to pull in all of vim. propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++ map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz + gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index 4e5046390fa..ceea0dc94d4 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -1,21 +1,15 @@ -From: Eelco Dolstra - -Nix deduplicates by hard-linking identical files, so it's normal for -the the number of links to a file to differ. ---- -diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py -index 7d1cd75..bd91eb0 100644 ---- a/diffoscope/comparators/directory.py -+++ b/diffoscope/comparators/directory.py -@@ -47,6 +47,7 @@ class Stat(Command): +diff -ru -x '*~' diffoscope-orig/diffoscope/comparators/directory.py diffoscope/diffoscope/comparators/directory.py +--- diffoscope-orig/diffoscope/comparators/directory.py 1970-01-01 01:00:01.000000000 +0100 ++++ diffoscope/diffoscope/comparators/directory.py 2016-12-08 17:37:55.000315157 +0100 +@@ -49,6 +49,7 @@ FILE_RE = re.compile(r'^\s*File:.*$') - DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d') - INODE_RE = re.compile(r'Inode: [0-9]+') -+ LINKS_RE = re.compile(r'Links: [0-9]+') + DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') + INODE_RE = re.compile(r'Inode: [0-9]+\s+') ++ LINKS_RE = re.compile(r'Links: [0-9]+\s+') ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') - -@@ -55,6 +56,7 @@ class Stat(Command): + +@@ -57,6 +58,7 @@ line = Stat.FILE_RE.sub('', line) line = Stat.DEVICE_RE.sub('', line) line = Stat.INODE_RE.sub('', line) diff --git a/pkgs/tools/misc/diffoscope/locale.patch b/pkgs/tools/misc/diffoscope/locale.patch new file mode 100644 index 00000000000..408d3ba2ce0 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/locale.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' diffoscope-orig/diffoscope/__init__.py diffoscope/diffoscope/__init__.py +--- diffoscope-orig/diffoscope/__init__.py 1970-01-01 01:00:01.000000000 +0100 ++++ diffoscope/diffoscope/__init__.py 2016-12-08 17:48:51.732122110 +0100 +@@ -81,8 +81,8 @@ + for var in ['LANG', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', + 'LC_MESSAGES', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', + 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']: +- os.environ[var] = 'C' +- os.environ['LC_CTYPE'] = 'C.UTF-8' ++ os.environ[var] = 'en_US' ++ os.environ['LC_CTYPE'] = 'en_US.UTF-8' + os.environ['TZ'] = 'UTC' + + From 9cca8e3f8701f0366759e54ba74ef90f031398e1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 8 Dec 2016 21:02:36 +0300 Subject: [PATCH 196/216] uwsgi service: fix for new pythonPackages --- nixos/modules/services/web-servers/uwsgi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 56f077e62a8..14596bb3add 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -29,7 +29,6 @@ let pythonPackages = pkgs.pythonPackages.override { inherit python; - self = pythonPackages; }; penv = python.buildEnv.override { From f0b9ecfa01c5de92c18724533d4a99a0e8da5076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Dec 2016 18:50:07 +0100 Subject: [PATCH 197/216] bind: fixup more openssl.dev references --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8cb96d445c8..e3f2364463b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin ln -sf $host/bin/host $dnsutils/bin - for f in "$out/lib/"*.la; do - sed -i $f -e 's|-L${openssl.dev}|-L${openssl.out}|g' + for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do + sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; From 469e5e7768cf850ac4c5a8e6df43a52f209c3b79 Mon Sep 17 00:00:00 2001 From: Peter Marheine Date: Fri, 9 Dec 2016 05:34:25 +1100 Subject: [PATCH 198/216] libdwarf: version the shared object (#20996) Upstream sets the soname, so binaries compiled against libdwarf.so will link against libdwarf.so.1 at runtime. Install libdwarf.so.1 and symlink libdwarf.so to it so both linking and runtime loading work again. --- pkgs/development/libraries/libdwarf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index eda68fc73d3..48853b63c79 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib $out/include - cp libdwarf.so $out/lib + cp libdwarf.so.1 $out/lib + ln -s libdwarf.so.1 $out/lib/libdwarf.so cp libdwarf.h dwarf.h $out/include ''; From af1202434ada715e0b714f6da8b88b15d1406003 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 8 Dec 2016 23:09:58 +0100 Subject: [PATCH 199/216] ndiswrapper: mark as broken Build fails across all our kernels. There is a new version 1.60, but it, too, fails to build. Until somebody comes along to patch around it, we might as well mark this as broken. --- pkgs/os-specific/linux/ndiswrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index eabc2840881..c22ffb60df8 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { description = "Ndis driver wrapper for the Linux kernel"; homepage = http://sourceforge.net/projects/ndiswrapper; license = "GPL"; + broken = true; }; } From 7a9400d338a2215314ab5acd3af0e3699bce9d4d Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 15 Nov 2016 21:17:45 -0500 Subject: [PATCH 200/216] qt5.6: darwin compatibility - qtbase builds on darwin - Downstream qmake and cmake build configurations supported Darwin-specific changes: Prevent `qmake -project` from adding build support files in the temp directory to the project. Shrink the temp directory used for building with qmake. The issue here is that `lndir` recreates the entire directory structure of the module we are merging into the temporary build environment. On darwin, the framework directory structures mean that this shadow directory tree is 17MB even though the file contents are all symlinks into the store. To address this, we symlink the framework directories explicitly and use `lndir` for everything else. --- .../libraries/qt-5/5.6/default.nix | 5 +- .../qt-5/5.6/qtbase/cmake-paths-darwin.patch | 384 ++++++++++++++++++ .../libraries/qt-5/5.6/qtbase/default.nix | 119 ++++-- .../libraries/qt-5/5.6/qtbase/series | 1 - .../libraries/qt-5/make-qt-wrapper-darwin.sh | 38 ++ .../libraries/qt-5/qmake-hook-darwin.sh | 42 ++ .../qt-5/qtbase-setup-hook-darwin.sh | 181 +++++++++ 7 files changed, 735 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch create mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh create mode 100644 pkgs/development/libraries/qt-5/qmake-hook-darwin.sh create mode 100644 pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 560e0ac021d..687708d98ef 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -112,13 +112,12 @@ let makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; - + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; self = makeScope pkgs.newScope addPackages; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch new file mode 100644 index 00000000000..9d42314e4cc --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch @@ -0,0 +1,384 @@ +Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE +- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF ++ set(imported_location \"${PLUGIN_LOCATION}\") + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +Index: qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf +@@ -136,28 +136,28 @@ contains(CONFIG, plugin) { + + win32 { + isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll + } else:mingw { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a + } else { # MSVC static +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib + } + } else { + mac { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } else { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } + } + cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in +Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -2,10 +2,10 @@ + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index b34540d87a5..341ebe1198b 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -9,13 +9,15 @@ , coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python2 +, darwin, libiconv # optional dependencies , cups ? null , mysql ? null, postgresql ? null # options -, mesaSupported, mesa +, mesaSupported ? (!stdenv.isDarwin) +, mesa , buildExamples ? false , buildTests ? false , developerBuild ? false @@ -35,6 +37,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -54,11 +57,11 @@ stdenv.mkDerivation { substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ --replace "@openssl@" "${openssl.out}" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace src/dbus/qdbus_symbols.cpp \ --replace "@dbus_libs@" "${dbus.lib}" @@ -66,16 +69,30 @@ stdenv.mkDerivation { substituteInPlace \ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' + '' + lib.optionalString mesaSupported '' substituteInPlace \ src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ --replace "@mesa_lib@" "${mesa.out}" substituteInPlace mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev or mesa}" + '' + lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf ''; - + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. setOutputFlags = false; preConfigure = '' @@ -104,7 +121,6 @@ stdenv.mkDerivation { ${lib.optionalString developerBuild "-developer-build"} -largefile -accessibility - -rpath -optimized-qmake -strip -no-reduce-relocations @@ -118,15 +134,6 @@ stdenv.mkDerivation { -iconv -icu -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 @@ -142,11 +149,8 @@ stdenv.mkDerivation { -system-libpng -system-libjpeg -system-harfbuzz - -system-xcb - -system-xkbcommon -system-pcre -openssl-linked - -dbus-linked -system-sqlite -${if mysql != null then "plugin" else "no"}-sql-mysql @@ -156,6 +160,27 @@ stdenv.mkDerivation { -make tools -${lib.optionalString (buildExamples == false) "no"}make examples -${lib.optionalString (buildTests == false) "no"}make tests + '' + lib.optionalString (!stdenv.isDarwin) '' + -no-rpath + -glib + -xcb + -qpa xcb + + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-xcb + -system-xkbcommon + -dbus-linked + '' + lib.optionalString stdenv.isDarwin '' + -platform macx-clang + -no-use-gold-linker + -no-fontconfig + -qt-freetype ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag @@ -164,19 +189,27 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + libxml2 libxslt openssl pcre16 sqlite zlib + + # Text rendering + harfbuzz icu # Image formats libjpeg libpng libtiff + ] + ++ lib.optional mesaSupported mesa + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev # Text rendering - fontconfig freetype harfbuzz icu - + fontconfig freetype # X11 libs xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - ++ lib.optional mesaSupported mesa; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa + DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + ]); buildInputs = [ bison flex gperf ] @@ -185,10 +218,14 @@ stdenv.mkDerivation { ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ]; + nativeBuildInputs = [ lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 postInstall = '' find "$out" -name "*.cmake" | while read file; do @@ -210,6 +247,11 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$dev" ''; + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. postFixup = '' # Don't retain build-time dependencies like gdb. @@ -218,17 +260,33 @@ stdenv.mkDerivation { # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ while read -r file; do mkdir -p "''${!outputDev}/$(dirname "$file")" mv "''${!outputLib}/$file" "''${!outputDev}/$file" done popd fi + '' + lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames_rpath() { + local flags=() + + for fn in "$@"; do + flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") + done + + for fn in "$@"; do + echo "$fn: fixing dylib" + install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" + done + } + fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" ''; inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; + setupHook = if stdenv.isDarwin + then ../../qtbase-setup-hook-darwin.sh + else ../../qtbase-setup-hook.sh; enableParallelBuilding = true; @@ -237,7 +295,6 @@ stdenv.mkDerivation { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; - } diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 44e2d904080..2196d838375 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -7,4 +7,3 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh new file mode 100644 index 00000000000..cc88d2ca35d --- /dev/null +++ b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh @@ -0,0 +1,38 @@ +wrapQtProgram() { + local prog="$1" + shift + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +_makeQtWrapperSetup() { + # cannot use addToSearchPath because these directories may not exist yet + export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" + export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" + export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" + export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share" + export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg" +} + +prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh new file mode 100644 index 00000000000..c359cb4ee6a --- /dev/null +++ b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh @@ -0,0 +1,42 @@ +qmakeConfigurePhase() { + runHook preConfigure + + qmake PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then + configurePhase=qmakeConfigurePhase +fi + +_qtModuleMultioutDevsPre() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtModuleMultioutDevsPost() { + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + if [ -d "lib" ]; then + find lib \( -name '*.a' -o -name '*.la' \) -print0 | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + fi + popd + fi +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + preFixupHooks+=(_qtModuleMultioutDevsPre) + postFixupHooks+=(_qtModuleMultioutDevsPost) +fi diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh new file mode 100644 index 00000000000..977c859e76d --- /dev/null +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -0,0 +1,181 @@ +addToSearchPathOnceWithCustomDelimiter() { + local delim="$1" + local search="$2" + local target="$3" + local dirs + local exported + IFS="$delim" read -a dirs <<< "${!search}" + local canonical + if canonical=$(readlink -e "$target"); then + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$canonical" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" + fi + fi +} + +addToSearchPathOnce() { + addToSearchPathOnceWithCustomDelimiter ':' "$@" +} + +propagateOnce() { + addToSearchPathOnceWithCustomDelimiter ' ' "$@" +} + +_qtPropagate() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +crossEnvHooks+=(_qtPropagate) + +_qtPropagateNative() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedNativeBuildInputs "$1" + break + fi + done + if [ -z "$crossConfig" ]; then + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" + fi +} + +envHooks+=(_qtPropagateNative) + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + +preFixupHooks+=(_qtMultioutDevs) + +_qtSetCMakePrefix() { + export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" +} + +_qtRmTmp() { + if [ -z "$NIX_QT_SUBMODULE" ]; then + rm -fr "$NIX_QT5_TMP" + else + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do + if [ ! -d "$NIX_QT5_TMP/$file" ]; then + rm -f "$NIX_QT5_TMP/$file" + fi + done + + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do + if [ -d "$NIX_QT5_TMP/$dir" ]; then + rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir" + fi + done + + rm "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +_qtSetQmakePath() { + export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" +} + +if [ -z "$NIX_QT5_TMP" ]; then + if [ -z "$NIX_QT_SUBMODULE" ]; then + NIX_QT5_TMP=$(pwd)/.nix_qt5 + else + NIX_QT5_TMP=$out + fi + postInstallHooks+=(_qtRmTmp) + + mkdir -p "$NIX_QT5_TMP/nix-support" + for subdir in bin include mkspecs share; do + mkdir -p "$NIX_QT5_TMP/$subdir" + echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + done + mkdir -p "$NIX_QT5_TMP/lib" + + postHooks+=(_qtSetCMakePrefix) + + ln -sf "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" + echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + + cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" + + export QMAKE="$NIX_QT5_TMP/bin/qmake" + + # Set PATH to find qmake first in a preConfigure hook + # It must run after all the envHooks! + preConfigureHooks+=(_qtSetQmakePath) +fi + +qt5LinkModuleDir() { + if [ -d "$1/$2" ]; then + @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" + find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +qt5LinkDarwinModuleLibDir() { + for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do + ln -s "$fw" "$NIX_QT5_TMP"/lib + done + for file in $(find "$1"/lib -maxdepth 1 -type f); do + ln -s "$file" "$NIX_QT5_TMP"/lib + done + for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do + mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") + @lndir@/bin/lndir -silent "$dir" "$NIX_QT5_TMP"/lib/$(basename "$dir") + done +} + +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" + +_qtLinkAllModules() { + IFS=: read -a modules <<< $NIX_QT5_MODULES + for module in ${modules[@]}; do + qt5LinkDarwinModuleLibDir "$module" + done + + IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV + for module in ${modules[@]}; do + qt5LinkModuleDir "$module" "bin" + qt5LinkModuleDir "$module" "include" + qt5LinkDarwinModuleLibDir "$module" + qt5LinkModuleDir "$module" "mkspecs" + qt5LinkModuleDir "$module" "share" + done +} + +preConfigureHooks+=(_qtLinkAllModules) + +_qtFixCMakePaths() { + find "${!outputLib}" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "${!outputLib}" \ + --subst-var-by NIX_DEV "${!outputDev}" + done +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + postInstallHooks+=(_qtFixCMakePaths) +fi + From 3a1d52ff4f818aa918f429a67bee473192e9d2f1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 1 Dec 2016 18:58:16 +0100 Subject: [PATCH 201/216] updateScript: initital work --- .../browsers/firefox-bin/default.nix | 49 ++++++- .../browsers/firefox-bin/generate_sources.rb | 48 ------- update.nix | 128 ++++++++++++++++++ 3 files changed, 176 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb create mode 100755 update.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 7a87b1df386..dd767d6984f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -38,6 +38,11 @@ , libpulseaudio , systemd , generated ? import ./sources.nix +, writeScript +, xidel +, coreutils +, gnused +, gnugrep }: assert stdenv.isLinux; @@ -62,10 +67,12 @@ let source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + name = "firefox-bin-unwrapped-${version}"; + in stdenv.mkDerivation { - name = "firefox-bin-unwrapped-${version}"; + inherit name; src = fetchurl { inherit (source) url sha512; }; @@ -165,6 +172,46 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; + passthru.updateScript = + let + version = (builtins.parseDrvName name).version; + isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version); + in + writeScript "update-firefox-bin" '' + PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin + + pushd pkgs/applications/networking/browsers/firefox-bin + + tmpfile=`mktemp` + url=http://archive.mozilla.org/pub/firefox/releases/ + version=`xidel -q $url --extract "//a" | \ + sed s"/.$//" | \ + grep "^[0-9]" | \ + sort --version-sort | \ + grep -v "funnelcake" | \ + grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ + tail -1` + shasums=`curl --silent $url$version/SHA512SUMS` + + echo "{" > $tmpfile + echo " version = \"$version\";" >> $tmpfile + echo " sources = [" >> $tmpfile + for arch in linux-x86_64 linux-i686; do + for line in `echo "$shasums" | grep $arch | grep "firefox-$version.tar.bz2$" | tr " " ":"`; do + echo " { url = \"$url$version/$arch/`echo $line | cut -d\":\" -f3`\";" >> $tmpfile + echo " locale = \"`echo $line | cut -d\":\" -f3 | sed \"s/$arch\///\" | sed \"s/\/.*//\"`\";" >> $tmpfile + echo " arch = \"$arch\";" >> $tmpfile + echo " sha512 = \"`echo $line | cut -d\":\" -f1`\";" >> $tmpfile + echo " }" >> $tmpfile + done + done + echo " ];" >> $tmpfile + echo "}" >> $tmpfile + + cat $tmpfile > ${if isBeta then "beta_" else ""}sources.nix + + popd + ''; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb deleted file mode 100644 index d049363f2cf..00000000000 --- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb +++ /dev/null @@ -1,48 +0,0 @@ -# TODO share code with thunderbird-bin/generate_sources.rb - -require "open-uri" - -version = - if ARGV.empty? - $stderr.puts("Usage: ruby generate_sources.rb > sources.nix") - exit(-1) - else - ARGV[0] - end - -base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases" - -Source = Struct.new(:hash, :arch, :locale, :filename) - -sources = open("#{base_path}/#{version}/SHA512SUMS") do |input| - input.readlines -end.select do |line| - /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line) -end.map do |line| - hash, name = line.chomp.split(/ +/) - Source.new(hash, *(name.split("/"))) -end.sort_by do |source| - [source.locale, source.arch] -end - -arches = ["linux-i686", "linux-x86_64"] - -puts(<<"EOH") -# This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command to update the file. -# -# ruby generate_sources.rb 46.0.1 > sources.nix - -{ - version = "#{version}"; - sources = [ -EOH - -sources.each do |source| - puts(%Q| { url = "#{base_path}/#{version}/#{source.arch}/#{source.locale}/firefox-#{version}.tar.bz2"; locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|) -end - -puts(<<'EOF') - ]; -} -EOF diff --git a/update.nix b/update.nix new file mode 100755 index 00000000000..e1c9886a78b --- /dev/null +++ b/update.nix @@ -0,0 +1,128 @@ +{ package ? null +, maintainer ? null +}: + +# TODO: add assert statements + +let + + pkgs = import ./default.nix { }; + + packagesWith = cond: return: set: + pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [(return name pkg)] + else if pkg.recurseForFerivations or false || pkg.recureseForRelease or false + then packagesWith cond return pkg + else [] + ); + in + if result.success then result.value + else [] + ) + set + ); + + packagesWithUpdateScriptAndMaintainer = maintainer': + let + maintainer = + if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then + builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`." + else + builtins.getAttr maintainer' pkgs.lib.maintainers; + in + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg && + (if builtins.hasAttr "maintainers" pkg.meta + then (if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer pkg.meta.maintainers + else maintainer == pkg.meta.maintainers + ) + else false + ) + ) + (name: pkg: pkg) + pkgs; + + packageByName = name: + if ! builtins.hasAttr name pkgs then + builtins.throw "Package with an attribute name `${name}` does not exists." + else if ! builtins.hasAttr "updateScript" (builtins.getAttr name pkgs) then + builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined." + else + builtins.getAttr name pkgs; + + packages = + if package != null then + [ (packageByName package) ] + else if maintainer != null then + packagesWithUpdateScriptAndMaintainer maintainer + else + builtins.throw "No arguments provided.\n\n${helpText}"; + + helpText = '' + Please run: + + % nix-shell update.nix --argstr maintainer garbas + + to run all update scripts for all packages that lists \`garbas\` as a maintainer + and have \`updateScript\` defined, or: + + % nix-shell update.nix --argstr package garbas + + to run update script for specific package. + ''; + + runUpdateScript = package: '' + echo -ne " - ${package.name}: UPDATING ..."\\r + ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log + CODE=$? + if [ "$CODE" != "0" ]; then + echo " - ${package.name}: ERROR " + echo "" + echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------" + echo "" + cat ${(builtins.parseDrvName package.name).name}.log + echo "" + echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------" + exit $CODE + else + rm ${(builtins.parseDrvName package.name).name}.log + fi + echo " - ${package.name}: DONE. " + ''; + +in pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-script"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "Not possible to update packages using \`nix-build\`" + echo "" + echo "${helpText}" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + echo "" + echo "Going to be running update for following packages:" + echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}" + echo "" + read -n1 -r -p "Press space to continue..." confirm + if [ "$confirm" = "" ]; then + echo "" + echo "Running update for:" + ${builtins.concatStringsSep "\n" (map runUpdateScript packages)} + echo "" + echo "Packages updated!" + exit 0 + else + echo "Aborting!" + exit 1 + fi + ''; +} From d295d6860965622d7e565d3edc2f29a234aa527c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 3 Dec 2016 17:43:38 +0100 Subject: [PATCH 202/216] firefox-bin: updated the updateScript with suggestions from @Mic92 also added some comments to the update script so that a new person looking at it know what is happening --- .../browsers/firefox-bin/default.nix | 50 +++++++++++++++---- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dd767d6984f..d828a5486fd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -184,6 +184,17 @@ stdenv.mkDerivation { tmpfile=`mktemp` url=http://archive.mozilla.org/pub/firefox/releases/ + + # retriving latest released version + # - extracts all links from the $url + # - removes . and .. + # - this line remove everything not starting with a number + # - this line sorts everything with semver in mind + # - we remove lines that are mentioning funnelcake + # - this line removes beta version if we are looking for final release + # versions or removes release versions if we are looking for beta + # versions + # - this line pick up latest release version=`xidel -q $url --extract "//a" | \ sed s"/.$//" | \ grep "^[0-9]" | \ @@ -191,22 +202,39 @@ stdenv.mkDerivation { grep -v "funnelcake" | \ grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ tail -1` + + # this is a list of sha512 and tarballs for both arches shasums=`curl --silent $url$version/SHA512SUMS` - echo "{" > $tmpfile - echo " version = \"$version\";" >> $tmpfile - echo " sources = [" >> $tmpfile + cat > $tmpfile <> $tmpfile - echo " locale = \"`echo $line | cut -d\":\" -f3 | sed \"s/$arch\///\" | sed \"s/\/.*//\"`\";" >> $tmpfile - echo " arch = \"$arch\";" >> $tmpfile - echo " sha512 = \"`echo $line | cut -d\":\" -f1`\";" >> $tmpfile - echo " }" >> $tmpfile + # retriving a list of all tarballs for each arch + # - only select tarballs for current arch + # - only select tarballs for current version + # - rename space with colon so that for loop doesnt + # - inteprets sha and path as 2 lines + for line in `echo "$shasums" | \ + grep $arch | \ + grep "firefox-$version.tar.bz2$" | \ + tr " " ":"`; do + # create an entry for every locale + cat >> $tmpfile <> $tmpfile - echo "}" >> $tmpfile + cat >> $tmpfile < ${if isBeta then "beta_" else ""}sources.nix From 18ee6b9a6d460c646334389498ddb4d3f9913e8e Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 8 Dec 2016 22:59:53 -0500 Subject: [PATCH 203/216] git-bz: add pycrypto dependency (#21013) --- .../version-management/git-and-tools/git-bz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index d924437c2e1..4ed9c5c0509 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/git-bz \ + --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \ --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" ''; From 0a90a534414dd0a2936e9ae4440d848fa8a8a45c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 9 Dec 2016 07:58:31 +0000 Subject: [PATCH 204/216] Fix hash for p7zip patch (seems fetchurl hash was added, while fetch-patch function is used. (cherry picked from commit 38b1bd9e729485d418f20c43c275c2856837f8cf) --- pkgs/tools/archivers/p7zip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index c11c437fa37..1af3f53ade9 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; - sha256 = "0inblicg24gcbaq84n0mr6w4yc5ak65mh9wxml96wlhdf7ph2i3m"; + sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41"; }) ]; From f3fda199fd9e316690b5ffe95caad90dad447f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Dec 2016 10:40:52 +0100 Subject: [PATCH 205/216] non: 2016-04-05 -> 2016-12-07 --- pkgs/applications/audio/non/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 9217bc285bc..a7252b9e28a 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-04-05"; + version = "2016-12-07"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "16885e69fe865495dc32d869d1454ab148b0dca6"; - sha256 = "1nwzzgcdpbqh5kjvz40yy5nmzvpp8gcr9biyhhwi68s5bsg972ss"; + rev = "754d113b0e3144a145d50bde8370ff2cae98169c"; + sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile From c94e44b0aeca532f6662585eae9bb63c4d4ff73e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 9 Dec 2016 11:26:53 +0100 Subject: [PATCH 206/216] linkFarm: prefer local build --- pkgs/build-support/trivial-builders.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index d6f390ddfb1..1529869aa33 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -108,8 +108,9 @@ rec { # Quickly create a set of symlinks to derivations. # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } - linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + - (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); + linkFarm = name: entries: runCommand name { preferLocalBuild = true; } + ("mkdir -p $out; cd $out; \n" + + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); # Print an error message if the file with the specified name and From c94454a45a7410f9fdd84896c693c1c4df5e10f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Dec 2016 11:18:22 +0100 Subject: [PATCH 207/216] nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 --- pkgs/tools/package-management/nix/default.nix | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 71938e37bfe..30c5fc6c4fd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium +{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp +, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: let - common = { name, src }: stdenv.mkDerivation rec { + common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; + version = lib.getVersion name; + + VERSION_SUFFIX = lib.optionalString fromGit suffix; outputs = [ "out" "dev" "man" "doc" ]; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = + [ perl pkgconfig ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium + ++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "1.12pre") + (aws-sdk-cpp.override { + apis = ["s3"]; + customMemoryManagement = false; + }); propagatedBuildInputs = [ boehmgc ]; @@ -28,14 +39,17 @@ let ''; configureFlags = - '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} - --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} - --disable-init-state - --enable-gc - ''; + [ "--with-store-dir=${storeDir}" + "--localstatedir=${stateDir}" + "--sysconfdir=/etc" + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--disable-init-state" + "--enable-gc" + ] + ++ lib.optional (!lib.versionAtLeast version "1.12pre") [ + "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ]; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -97,11 +111,15 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.12pre4523_3b81b26"; - src = fetchurl { - url = "http://hydra.nixos.org/build/33598573/download/4/${name}.tar.xz"; - sha256 = "0469zv09m85824w4vqj2ag0nciq51xvrvsys7bd5v4nrxihk9991"; + name = "nix-1.12${suffix}"; + suffix = "pre4911_b30d1e7"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c"; + sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm"; }; + fromGit = true; }); } From 53b5575640200a9ba716551dd5e4b879df1b06c5 Mon Sep 17 00:00:00 2001 From: Jost Novljan Date: Fri, 9 Dec 2016 12:06:07 +0100 Subject: [PATCH 208/216] chromedriver: 2.21 -> 2.25 --- pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 6a10f73cfe4..488fefe62c4 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -8,12 +8,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { product = "chromedriver_linux64"; - name = "${product}-2.21"; - version = "2.21"; + name = "${product}-2.25"; + version = "2.25"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; - sha256 = "1fhwvqjwqkfm18icacvk0312ii8hf1p03icd3isfcxp7j69qf2wg"; + sha256 = "0z6c3q73pi83iidq3n85sxhc9yikkf9rf22hnn8manrhfsg784fh"; }; buildInputs = [ unzip makeWrapper ]; From e9a5680eb7175934eef8cd0046fb77083da1ef2e Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 9 Dec 2016 10:16:17 -0200 Subject: [PATCH 209/216] roboto: 2.134 -> 2.135 --- pkgs/data/fonts/roboto/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 711cca5b164..e0d2545973b 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "roboto-${version}"; - version = "2.134"; + version = "2.135"; src = fetchurl { url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "1l033xc2n4754gwakxshh5235cnrnzy7q6zsp5zghn8ib0gdp5rb"; + sha256 = "1ndlh36bcx4mhi58sxfx6ywbib586brh6s5sk3jyji78h1i7j8zr"; }; nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/share/fonts/truetype - cp -a * $out/share/fonts/truetype/ + cp -a *.ttf $out/share/fonts/truetype/ ''; meta = { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Material Design. ''; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From a2d6e8a2eb6c7ad0d64698d912c74c426d926bad Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 9 Dec 2016 07:18:35 -0500 Subject: [PATCH 210/216] xen: Fix patch hashes I had used nix-prefetch-url, where fetchpatch doesn't support it. --- pkgs/applications/virtualization/xen/4.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index e7a46a24965..7b89fabaa1c 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -58,17 +58,17 @@ let (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547"; name = "CVE-2016-9385.patch"; - sha256 = "0l5drg862708ngy49jl65vmv6iwxlm7h8b4vabnffc2496f2gbwk"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; }) (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536"; name = "CVE-2016-9377-CVE-2016-9378-part1.patch"; - sha256 = "1dy8xvnkdvc44ywzzlswmkljjva44c0ndw7538iicr3qyf0244n4"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; }) (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537"; name = "CVE-2016-9377-CVE-2016-9378-part2.patch"; - sha256 = "0iz36s2w6bh5h9i1a9gj1c748fq1dj90kcg2yzld1m26qx21qrr5"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; }) ]; }; From e861a5f7afe894b5f807031ba8c08a509e356640 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 08:26:46 -0500 Subject: [PATCH 211/216] linux: 4.4.36 -> 4.4.37 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6d9fc79cd9f..184e420373a 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.36"; + version = "4.4.37"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gh3i7ss0wnh3irpff3j079jwyccslbzkw9zxjjp600lcc5hva9h"; + sha256 = "1pyfva1ld4yfzc0gyz3q4m7j6k88l813akp5hhszfg8m69bzn27d"; }; kernelPatches = args.kernelPatches; From bfffbb5ea65180e7fd942a468f70e7bb05fa079f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 08:27:11 -0500 Subject: [PATCH 212/216] linux: 4.8.12 -> 4.8.13 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 715af76267c..786589ca534 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.12"; + version = "4.8.13"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; + sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; }; kernelPatches = args.kernelPatches; From ca7cc96ee8153b61afdfc8ebdb14ff064e3649af Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:08:21 +0100 Subject: [PATCH 213/216] grsecurity: enable PAX_INITIFY Uses gcc plugin to detect more instances where memory used during init can be freed. --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 64722635f41..895c0ec42ef 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -22,6 +22,10 @@ PAX_PT_PAX_FLAGS y PAX_XATTR_PAX_FLAGS y PAX_EI_PAX n +PAX_INITIFY y +# initify is a fairly recent feature, enable verbose mode to aid in debugging +PAX_INITIFY_VERBOSE y + # The bts instrumentation method is compatible with binary only modules. # # Note: if platform supports SMEP, we could do without this From 9a63779d64e71c46976c4dcfe499967a6e88108d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:10:01 +0100 Subject: [PATCH 214/216] grsecurity: use upstream url as the primary source --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 20e4ec1fd7e..0e6544bd759 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -25,10 +25,13 @@ let inherit grver kver grrev; patch = fetchurl { - # When updating versions/hashes, ALWAYS use the official version; we use - # this mirror only because upstream removes sources files immediately upon - # releasing a new version ... - url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch"; + urls = [ + "https://grsecurity.net/${grbranch}/${name}.patch" + # When updating versions/hashes, ALWAYS use the official + # version; we use this mirror only because upstream removes + # source files immediately upon releasing a new version ... + "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch" + ]; inherit sha256; }; From d1a5dc0b1ca57e3c54f9e6aed9cd1ed462516045 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:10:26 +0100 Subject: [PATCH 215/216] grsecurity: 4.8.12-201612062306 -> 4.8.13-201612082118 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 715af76267c..786589ca534 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.12"; + version = "4.8.13"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; + sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0e6544bd759..3fab12b64a6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -89,9 +89,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.12"; - grrev = "201612062306"; - sha256 = "16ddiqx3sry07d7gy7y7rm8fxaa8v9lgih5l4dd2i39m35za11fq"; + { kver = "4.8.13"; + grrev = "201612082118"; + sha256 = "0cvw6sbinzlcxap8mf934ksgksgdd8w8pf8jfp82fbyiz53klfn1"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From d14586c1c1819d1b2532fb7468081380359fae1f Mon Sep 17 00:00:00 2001 From: montag451 Date: Fri, 9 Dec 2016 19:02:54 +0100 Subject: [PATCH 216/216] nautilus: 3.20.2 -> 3.20.3 (#20853) --- pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix index 467bb13a74e..5592e3bd7f8 100644 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "nautilus-3.20.2"; + name = "nautilus-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.2.tar.xz; - sha256 = "8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae"; + url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.3.tar.xz; + sha256 = "46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e"; }; }