From b7a0f37c0df3b1519572fe4dc5af2024565cbd67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 May 2018 08:03:17 -0700 Subject: [PATCH 1/6] byacc: 20170709 -> 20180510 (#40499) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/byacc/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 20180510 with grep in /nix/store/z8i5f145zpz750hvcbjlncy8kqak8zv2-byacc-20180510 - directory tree listing: https://gist.github.com/328d2b1900cfb911e7567cabf95d80c3 - du listing: https://gist.github.com/cc161fe31193017387ae25b64829aaf2 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 612196cba77a..2f8c97ff2711 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20170709"; + version = "20180510"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7"; + sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h"; }; doCheck = true; From 1de744647f3d7acdc855236023340d02e9fbfa45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Mon, 14 May 2018 17:11:44 +0200 Subject: [PATCH 2/6] sublime3: 3170 -> 3176 (#40494) --- pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 98cfc03c3d26..8ab7c8144079 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,14 +5,14 @@ let in rec { sublime3-dev = common { - buildVersion = "3170"; - x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; - x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; } {}; sublime3 = common { - buildVersion = "3170"; - x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; - x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; } {}; } From 2abd5916a7cf4ca49586472f35373a620c2ff485 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 May 2018 08:13:57 -0700 Subject: [PATCH 3/6] fstrm: 0.3.2 -> 0.4.0 (#40489) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fstrm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin/bin/fstrm_capture --version’ and found version 0.4.0 - found 0.4.0 with grep in /nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin - directory tree listing: https://gist.github.com/5cc213160a9ec091c9e767b95bfe2cdd - du listing: https://gist.github.com/c4b1f58631938c0cad031ac2dc920011 --- pkgs/development/libraries/fstrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 9c4bf00347c4..372cb50d05cf 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fstrm-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2"; + sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny"; }; outputs = [ "bin" "out" "dev" ]; From 4edfc0e93d679a809a0db0c953096726fcb97a28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 14 May 2018 08:21:22 -0700 Subject: [PATCH 4/6] ccnet: 6.1.7 -> 6.1.8 (#40495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ccnet/versions. These checks were done: - built on NixOS - ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet -h’ got 0 exit code - ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet --help’ got 0 exit code - found 6.1.8 with grep in /nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8 - directory tree listing: https://gist.github.com/275cfa6377f77e502dcc0309bb683687 - du listing: https://gist.github.com/f2f22837494355a9bf385b8432a4b210 --- pkgs/tools/networking/ccnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 408fd0f8c8fe..6fac4a282d01 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { - version = "6.1.7"; - seafileVersion = "6.1.7"; + version = "6.1.8"; + seafileVersion = "6.1.8"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r"; + sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; From efde5fefb3a55d3aeebf69332d7d1223e4432413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= Date: Mon, 14 May 2018 17:37:53 +0100 Subject: [PATCH 5/6] nixos: stumpwm: switch from package marked as broken to working quicklisp package (#40501) --- nixos/modules/services/x11/window-managers/stumpwm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index 3d3f2e0028c0..27a17178476a 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "stumpwm"; start = '' - ${pkgs.stumpwm}/bin/stumpwm & + ${pkgs.lispPackages.stumpwm}/bin/stumpwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.stumpwm ]; + environment.systemPackages = [ pkgs.lispPackages.stumpwm ]; }; } From 3a9654bfe29ebd987b7426faa25f00af1fab02c5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 14 May 2018 13:13:11 -0400 Subject: [PATCH 6/6] gcc: Simplify this old Hurd condition Steps towards getting rid of crossConfig. --- pkgs/development/compilers/gcc/4.5/default.nix | 7 +------ pkgs/development/compilers/gcc/4.8/default.nix | 6 +----- pkgs/development/compilers/gcc/4.9/default.nix | 6 +----- pkgs/development/compilers/gcc/5/default.nix | 6 +----- pkgs/development/compilers/gcc/6/default.nix | 6 +----- pkgs/development/compilers/gcc/7/default.nix | 6 +----- pkgs/development/compilers/gcc/snapshot/default.nix | 6 +----- 7 files changed, 7 insertions(+), 36 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 36b48b880211..70fbefb898e8 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -151,12 +151,7 @@ stdenv.mkDerivation ({ ; postPatch = - if (stdenv.system == "i586-pc-gnu" - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu" - && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index dea8b912b272..1fcad756eec1 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -193,11 +193,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 343d820fa236..009f28dc66b1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -188,11 +188,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0d9565de0a77..a695b6819a1a 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -204,11 +204,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 29f2bad7eac1..c5ca1060894b 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -204,11 +204,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e75e22efce1f..9a0da5dbf6eb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -204,11 +204,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 609d418693d7..fcfc8f15f132 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -183,11 +183,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; postPatch = - if (hostPlatform.isHurd - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) + if targetPlatform.isHurd then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string.