From 7ed15eed532a7d9cf267882d5f935f1b34a04622 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 27 May 2018 15:13:23 +0200 Subject: [PATCH 01/82] teamspeak_client: fix startup segfaults with qt5.10, downgrade to 5.9 tries to load its homegrown libqxcb.so which does not find some libs, use nixpkgs libqxcb.so instead. --- .../networking/instant-messengers/teamspeak/client.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ea2030e964b..23d2e640b4f 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { rm *.so.* *.so rm QtWebEngineProcess rm qt.conf + rm -r platforms # contains libqxcb.so # Install files. mkdir -p $out/lib/teamspeak @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ + --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19e956e7a7..61680ab0511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18133,7 +18133,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; uaskjuggler = callPackage ../applications/misc/taskjuggler { }; From 9a76a33e356c12f3bcc0720a19ef1fa6157063dd Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 28 May 2018 13:10:14 +0200 Subject: [PATCH 02/82] dotnetPackages.Boogie: use a recent NUnit --- pkgs/top-level/dotnet-packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index ca4469e9e99..ed34f798418 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -309,7 +309,17 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl"; }; - buildInputs = [ dotnetPackages.NUnitRunners ]; + # emulate `nuget restore Source/Boogie.sln` + # which installs in $srcdir/Source/packages + preBuild = '' + mkdir -p Source/packages/NUnit.2.6.3 + ln -sn ${dotnetPackages.NUnit}/lib/dotnet/NUnit Source/packages/NUnit.2.6.3/lib + ''; + + buildInputs = [ + dotnetPackages.NUnit + dotnetPackages.NUnitRunners + ]; xBuildFiles = [ "Source/Boogie.sln" ]; From c8cb9a92d4fc1cd708b32278fcaa2074433ddf33 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 28 May 2018 13:10:36 +0200 Subject: [PATCH 03/82] dotnetPackages.Boogie: 2017-01-03 -> 2018-05-28 --- pkgs/top-level/dotnet-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index ed34f798418..37d468997cf 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -299,14 +299,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Boogie = buildDotnetPackage rec { baseName = "Boogie"; - version = "2017-01-03"; + version = "2018-05-28"; name = "${baseName}-unstable-${version}"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; - rev = "5e42f0dd2891b2b85a9198052e55592a2943b7ef"; - sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl"; + rev = "fc97aac639505f46cda7904dae95c9557716d037"; + sha256 = "1hjksc5sapw1shxjwg0swja5afman8i15wnv5b6rzkqd4mg8y6nz"; }; # emulate `nuget restore Source/Boogie.sln` From 51556f640db756aed7e4b333a40d9a40af63d735 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 May 2018 14:21:30 +0200 Subject: [PATCH 04/82] FRidh as owner of update-python-libraries --- .github/CODEOWNERS | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3d4855c5cf4..a4b5c982732 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -45,10 +45,11 @@ /nixos/modules/installer/tools/nixos-option.sh @nbp # Python-related code and docs -/pkgs/top-level/python-packages.nix @FRidh -/pkgs/development/interpreters/python @FRidh -/pkgs/development/python-modules @FRidh -/doc/languages-frameworks/python.md @FRidh +/maintainers/scripts/update-python-libraries @FRidh +/pkgs/top-level/python-packages.nix @FRidh +/pkgs/development/interpreters/python @FRidh +/pkgs/development/python-modules @FRidh +/doc/languages-frameworks/python.md @FRidh # Haskell /pkgs/development/compilers/ghc @peti From a6d58c8aba49280d18e85fe8b8747b337872ed04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:36:52 -0700 Subject: [PATCH 05/82] pdd: 1.1 -> 1.2 (#40962) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pdd/versions. These checks were done: - built on NixOS - /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2/bin/.pdd-wrapped passed the binary check. - /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2/bin/pdd passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 1.2 with grep in /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2 - directory tree listing: https://gist.github.com/6e768315d72cdf1b94712a309f2f31e8 - du listing: https://gist.github.com/e6f91bfa7c9a1947b34596e2b745fb82 --- pkgs/tools/misc/pdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index d362bccb993..c075312618b 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "1nb64vdlym4najjyfxq1nprqcwgrwnqj1mml0fcg20hrgbjm4bf2"; + sha256 = "09nyzzch4jlsjfx8axqyxh9d1sw8x4g3vg5fbxz7m16994fzz75i"; }; format = "other"; From 2ba2a853904eeebee11175a728d2129cb1141ac3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:39:47 -0700 Subject: [PATCH 06/82] jackett: 0.8.997 -> 0.8.1014 (#40966) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions. These checks were done: - built on NixOS - /nix/store/wbmvjpsv9nkvgmxa1gycn2c6f6cbx60i-jackett-0.8.1014/bin/Jackett passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.8.1014 with grep in /nix/store/wbmvjpsv9nkvgmxa1gycn2c6f6cbx60i-jackett-0.8.1014 - directory tree listing: https://gist.github.com/9c12511f3c3405355ff8757dd51b9acd - du listing: https://gist.github.com/3e5688b0ab698810d090854a3ed4340a --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ef4b8239693..5a87c423f4f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.997"; + version = "0.8.1014"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w"; + sha256 = "0pvm9q8dpavkgsv180mw4y6555iixjv5s7mnmai9xzjspjpf264k"; }; buildInputs = [ makeWrapper ]; From 5f583fda04063c5fc4993ecd3596d9fc134ebe00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:40:33 -0700 Subject: [PATCH 07/82] xmrig-proxy: 2.5.2 -> 2.6.2 (#41032) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmrig-proxy/versions. These checks were done: - built on NixOS - /nix/store/q9nnn2j5k9kmfayiairp8l3mjdcz228k-xmrig-proxy-2.6.2/bin/xmrig-proxy passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.6.2 with grep in /nix/store/q9nnn2j5k9kmfayiairp8l3mjdcz228k-xmrig-proxy-2.6.2 - directory tree listing: https://gist.github.com/9498722348ccc1f87735df50817a78ac - du listing: https://gist.github.com/c7381fd089088b8620cf7e6675c96a83 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 248f629f2e9..4e1e505e035 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.5.2"; + version = "2.6.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc"; + sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh"; }; nativeBuildInputs = [ cmake ]; From e02be162f92b84db96b50bc0bd8f55786d9132d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:42:17 -0700 Subject: [PATCH 08/82] speedtest-cli: 2.0.0 -> 2.0.1 (#41041) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/speedtest-cli/versions. These checks were done: - built on NixOS - /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/.speedtest-wrapped passed the binary check. - /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/speedtest passed the binary check. - /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/.speedtest-cli-wrapped passed the binary check. - /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/speedtest-cli passed the binary check. - 4 of 4 passed binary check by having a zero exit code. - 4 of 4 passed binary check by having the new version present in output. - found 2.0.1 with grep in /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1 - directory tree listing: https://gist.github.com/8474ab8a0bcd232ed8b3f5f9bff112ee - du listing: https://gist.github.com/f130f280bd23afc5797bf84f764288c4 --- pkgs/tools/networking/speedtest-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ad3c3a806b3..ff0441c4078 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "06fini7bqf5paphp8dpck1zpmb33cdxlf4hg6xg2g9k4bdm2k26d"; + sha256 = "0d3av50qm7bahsdg0k7hp04r9ripsafn95yqcgsy5h5y9yj4rsvf"; }; meta = with stdenv.lib; { From 12b690983256eda1fa6a1183cfa51be8e252f11f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:46:32 -0700 Subject: [PATCH 09/82] girara: 0.2.9 -> 0.3.0 (#41063) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/girara/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.3.0 with grep in /nix/store/sd2h3v53hxkijrlc7xahlrjpa80vrbb7-girara-0.3.0 - directory tree listing: https://gist.github.com/9ae2cdb1a49b9bd9d21fae478768a961 - du listing: https://gist.github.com/f505b0541763899d6ef06322b8258191 --- pkgs/applications/misc/girara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index ab4159790de..43a949ded37 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.9"; + version = "0.3.0"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; - sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8"; + sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; From 4e965c62705e70abf40c36d25aead9cafea4f4a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:48:02 -0700 Subject: [PATCH 10/82] riemann: 0.3.0 -> 0.3.1 (#41044) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riemann/versions. These checks were done: - built on NixOS - /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/.riemann-wrapped passed the binary check. - /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/riemann passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.3.1 with grep in /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1 - directory tree listing: https://gist.github.com/ed9907cdc302813f2c87257f6a26628e - du listing: https://gist.github.com/b50c1c815b3cd6102e0ec8d21b9f1365 --- pkgs/servers/monitoring/riemann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index b930c1ab1f6..6eb4a3dfe9a 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c"; + sha256 = "0lc3qmwb33jjw2g64j8inqpr7krjmpjwfdmypdssvjy84acpkyal"; }; nativeBuildInputs = [ makeWrapper ]; From 1d1a81a4496c53503e3bf8541c14a3aff142fa41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:49:25 -0700 Subject: [PATCH 11/82] googler: 3.5 -> 3.6 (#41064) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/googler/versions. These checks were done: - built on NixOS - /nix/store/j4h3gxrjzx798n8qrpk6l4v2a2k3awvm-googler-3.6/bin/googler passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 3.6 with grep in /nix/store/j4h3gxrjzx798n8qrpk6l4v2a2k3awvm-googler-3.6 - directory tree listing: https://gist.github.com/bf1d55519dae4406e4f5bdbd78c44644 - du listing: https://gist.github.com/805653ac2fcc2c1c10d65d1e5298620e --- pkgs/applications/misc/googler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 3b8b08c1b66..ca6ccdcdb2a 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.5"; + version = "3.6"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa"; + sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6"; }; propagatedBuildInputs = [ python ]; From b6c1781e5897f07ed688dd5a36e4c99f567e7ee5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 05:59:12 -0700 Subject: [PATCH 12/82] wireguard: 0.0.20180519 -> 0.0.20180524 (#41031) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions. These checks were done: - built on NixOS - /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524/bin/wg passed the binary check. - /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524/bin/wg-quick passed the binary check. - 2 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.0.20180524 with grep in /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524 - directory tree listing: https://gist.github.com/52b47d18275b1b4550ccdd7bfdd16ef0 - du listing: https://gist.github.com/074aac4bf75c6a0a31e18b04cb0ffbc8 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index c43e7548364..7411aeed6d2 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180519"; + version = "0.0.20180524"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070"; + sha256 = "0h503h9hh1vl3j2daz7lm2fp4wda65iphmx8k21md6yql8f56vmi"; }; sourceRoot = "source/src/tools"; From af9d10a91b5ef0518ee12b220470735076974210 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 28 May 2018 05:59:57 -0700 Subject: [PATCH 13/82] treewide: fix derivation names --- pkgs/applications/altcoins/mist.nix | 2 +- pkgs/applications/audio/infamousPlugins/default.nix | 2 +- pkgs/applications/audio/swh-lv2/default.nix | 2 +- pkgs/applications/editors/manuskript/default.nix | 10 +++++----- pkgs/applications/editors/neovim/neovim-remote.nix | 4 ++-- pkgs/applications/editors/wxhexeditor/default.nix | 4 ++-- pkgs/applications/editors/yi/wrapper.nix | 4 ++-- pkgs/applications/graphics/exrtools/default.nix | 4 ++-- pkgs/applications/graphics/gnuclad/default.nix | 6 +++--- pkgs/applications/misc/cura/lulzbot.nix | 2 +- pkgs/applications/misc/nix-tour/default.nix | 9 ++++----- .../misc/xrandr-invert-colors/default.nix | 4 ++-- .../networking/browsers/uzbl/default.nix | 7 ++++--- .../networking/instant-messengers/coyim/default.nix | 2 +- .../instant-messengers/salut-a-toi/default.nix | 2 +- .../applications/networking/irc/weechat/default.nix | 2 +- .../science/chemistry/gwyddion/default.nix | 2 +- pkgs/applications/science/math/ripser/default.nix | 2 +- pkgs/applications/video/dvd-slideshow/default.nix | 5 +++-- pkgs/applications/video/lightworks/default.nix | 2 +- pkgs/development/compilers/eli/default.nix | 4 ++-- pkgs/development/interpreters/red/default.nix | 2 +- pkgs/development/libraries/cppcms/default.nix | 4 ++-- pkgs/development/libraries/cppdb/default.nix | 4 ++-- pkgs/development/libraries/ctpp2/default.nix | 4 ++-- pkgs/development/libraries/cxxtools/default.nix | 4 ++-- .../libraries/dleyna-connector-dbus/default.nix | 7 ++++--- pkgs/development/libraries/dleyna-core/default.nix | 5 +++-- .../libraries/dleyna-renderer/default.nix | 7 ++++--- .../development/libraries/dleyna-server/default.nix | 7 ++++--- pkgs/development/libraries/fastjson/default.nix | 2 +- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/development/libraries/tntdb/default.nix | 5 +++-- pkgs/development/libraries/tntnet/default.nix | 5 +++-- .../python-modules/htmltreediff/default.nix | 4 ++-- .../development/python-modules/moinmoin/default.nix | 2 +- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- pkgs/development/python-modules/podcats/default.nix | 5 ++--- pkgs/development/python-modules/pyxml/default.nix | 4 ++-- .../tools/ocaml/ocsigen-i18n/default.nix | 5 +++-- pkgs/misc/screensavers/physlock/default.nix | 2 +- pkgs/servers/monitoring/bosun/default.nix | 6 +++--- pkgs/tools/X11/xinput_calibrator/default.nix | 5 +++-- pkgs/tools/misc/blink1-tool/default.nix | 4 ++-- pkgs/tools/misc/docker-ls/default.nix | 4 ++-- pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++-- pkgs/tools/misc/smenu/default.nix | 4 ++-- pkgs/tools/networking/http-prompt/default.nix | 5 +++-- pkgs/tools/networking/ssldump/default.nix | 2 +- pkgs/tools/package-management/conda/default.nix | 2 +- pkgs/tools/package-management/nixops/nixops-dns.nix | 2 +- pkgs/tools/security/neopg/default.nix | 6 +++--- pkgs/tools/security/nitrokey-app/default.nix | 2 +- pkgs/tools/security/stoken/default.nix | 4 ++-- pkgs/tools/text/jumanpp/default.nix | 5 +++-- pkgs/tools/text/xml/xmloscopy/default.nix | 6 +++--- .../virtualization/xe-guest-utilities/default.nix | 13 +++++++------ pkgs/top-level/php-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 7 ++++--- 59 files changed, 131 insertions(+), 119 deletions(-) diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index d80e8b52182..c38e613fdd4 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -56,7 +56,7 @@ let }); in buildFHSUserEnv { - name = "mist-${stdenv.lib.getVersion mist}"; + inherit name; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 9fe0820e5d6..cae40929f95 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { - name = "infamousPlugins-v${version}"; + name = "infamousPlugins-${version}"; version = "0.2.04"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 26ea4614920..6fa0eb7f8f2 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "swh-lv2-v${version}"; + name = "swh-lv2-${version}"; version = "1.0.16"; src = fetchurl { diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index fc27e4a00f7..815af2103d5 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,11 +1,11 @@ { stdenv, zlib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "manuskript"; + pname = "manuskript"; version = "0.3.0"; src = fetchFromGitHub { - repo = name; + repo = pname; owner = "olivierkes"; rev = version; sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7"; @@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ - --replace sample-projects $out/share/${name}/sample-projects + --replace sample-projects $out/share/${pname}/sample-projects ''; buildPhase = ''''; installPhase = '' - mkdir -p $out/share/${name} + mkdir -p $out/share/${pname} cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out - cp -r sample-projects/ $out/share/${name} + cp -r sample-projects/ $out/share/${pname} ''; doCheck = false; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1c99429a7fe..c4d2be4c740 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,13 +4,13 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { name = "neovim-remote-${version}"; - version = "v1.8.6"; + version = "1.8.6"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; - rev = version; + rev = "v${version}"; sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l"; }; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 85d9b0546d6..5597bf0d0b3 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.24"; + version = "0.24"; src = fetchFromGitHub { repo = "wxHexEditor"; owner = "EUA"; - rev = version; + rev = "v${version}"; sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 916f296b3fc..e20c0a3cbca 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -8,8 +8,8 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation { - name = "yi-custom"; +stdenv.mkDerivation rec { + name = "yi-custom-${version}"; version = "0.0.0.1"; unpackPhase = "true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 097062a8258..7980d09fed1 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { - name = "exrtools"; + name = "exrtools-${version}"; version = "0.4"; src = fetchurl { - url = "http://scanline.ca/exrtools/${name}-${version}.tar.gz"; + url = "http://scanline.ca/exrtools/${name}.tar.gz"; sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2b391710907..b3671ead377 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "gnuclad"; + name = "gnuclad-${version}"; version = "0.2.4"; src = fetchurl { - url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz"; + url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz"; sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix index 4d13e62bdfe..341cc8ec2d0 100644 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -4,7 +4,7 @@ let py = python27Packages; in stdenv.mkDerivation rec { - name = "cura-lulzbot"; + name = "cura-lulzbot-${version}"; version = "15.02.1-1.03-5064"; src = diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 04f10de3d27..7e5a3a7840d 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchgit, electron } : stdenv.mkDerivation rec { - name = "nix-tour"; + name = "nix-tour-${version}"; + version = "0.0.1"; buildInputs = [ electron ]; - version = "v0.0.1"; - src = fetchgit { url = "https://github.com/nixcloud/tour_of_nix"; - rev = "refs/tags/${version}"; + rev = "v${version}"; sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; }; @@ -34,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index e9bb722dcab..bb3385ad016 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, libXrandr}: stdenv.mkDerivation rec { - version = "v0.01"; + version = "0.01"; name = "xrandr-invert-colors-${version}"; src = fetchurl { - url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz"; + url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; }; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 8c9f23996ed..12cf108355c 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -5,7 +5,8 @@ # but Python 2 + packages during runtime. stdenv.mkDerivation rec { - name = "uzbl-v0.9.0"; + name = "uzbl-${version}"; + version = "0.9.0"; meta = with stdenv.lib; { description = "Tiny externally controllable webkit browser"; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz"; + name = "uzbl-v${version}.tar.gz"; + url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz"; sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k"; }; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 5b70d747926..1e88456e6b2 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "coyim-${version}"; - version = "v0.3.7_1"; + version = "0.3.7_1"; goPackagePath = "github.com/twstrike/coyim"; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 9ff1799ddd2..987a7aa1be0 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "salut-a-toi"; + name = "salut-a-toi-${version}"; version = "0.6.1"; pname = "sat-${version}"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index dec933489af..0d9320c12e2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -117,7 +117,7 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in (writeScriptBin "weechat" '' + in (writeScriptBin weechat.name '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 80115f4f022..4f028e0053a 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation { - name = "gwyddion"; + name = "gwyddion-${version}"; version = "2.48"; src = fetchurl { url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index b7453ecb01d..651ad8a2c0f 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -15,7 +15,7 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation { - name = "ripser"; + name = "ripser-${version}"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 7785116a835..a329321b70c 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -28,10 +28,11 @@ let ''; in stdenv.mkDerivation rec { - name = "dvd-slideshow"; + name = "dvd-slideshow-${version}"; version = "0.8.4-2"; + src = fetchurl { - url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz"; sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5"; }; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 4d34e08529f..e3b94b69179 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -77,7 +77,7 @@ let # Lightworks expects some files in /usr/share/lightworks in buildFHSUserEnv rec { - name = "lightworks-${stdenv.lib.getVersion lightworks}"; + name = lightworks.name; targetPkgs = pkgs: [ lightworks diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 93e53aa30d1..4635c6d0a4e 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli"; + name = "eli-${version}"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 01b95adf92f..36047759baa 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-v${version}"; + name = "red-${version}"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index fcd37239e91..6dc496d0e5a 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms"; + name = "cppcms-${version}"; version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4"; }; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 07c6e1490e7..3423b29d76c 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb"; + name = "cppdb-${version}"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index bf57bab2f22..55835cdb63d 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "ctpp2"; + name = "ctpp2-${version}"; version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz"; + url = "http://ctpp.havoc.ru/download/${name}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 5dd48794f5e..77b27640fd7 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.2.1"; - name = "cxxtools"; + name = "cxxtools-${version}"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 94efa8e31d3..e3815165f6e 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { - name = "dleyna-connector-dbus"; + pname = "dleyna-connector-dbus"; + name = "${pname}-${version}"; version = "0.3.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117"; }; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 1fc65b9ac7f..11cfa31c04b 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,12 +1,13 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }: stdenv.mkDerivation rec { - name = "dleyna-core"; + pname = "dleyna-core"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq"; }; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 176b05126b2..a8ea7e8bd62 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { - name = "dleyna-renderer"; + pname = "dleyna-renderer"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0jy54aq8hgrvzchrvfzqaj4pcn0cfhafl9bv8a9p6j82yjk4pvpp"; }; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index d36e665bd85..b4885145f6e 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { - name = "dleyna-server"; + pname = "dleyna-server"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j"; }; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 6cedb4d555a..05088df5210 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "v0.99.4"; + version = "0.99.4"; name = "fastjson-${version}"; src = fetchFromGitHub { repo = "libfastjson"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 3f4f48775c1..5ccfb0d1b26 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.9.0"; - name = "libbladeRF-v${version}"; + name = "libbladeRF-${version}"; src = fetchFromGitHub { owner = "Nuand"; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 75a494cfbde..9edfcc88f16 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: stdenv.mkDerivation rec { + name = "tntdb-${version}"; version = "1.3"; - name = "tntdb"; + src = fetchurl { - url = "http://www.tntnet.org/download/tntdb-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index cd4ba34b33c..aaff759525b 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { + name = "tntnet-${version}"; version = "2.2.1"; - name = "tntnet"; + src = fetchurl { - url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; }; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index 5e839e4ada9..c2c7f4e12f4 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: buildPythonPackage rec { - version = "v0.1.2"; + version = "0.1.2"; pname = "htmltreediff"; disabled = isPy3k; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "christian-oudard"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; }; diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index 2097470d4e4..db0a5bcca2b 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { - name = "moinmoin"; + pname = "moinmoin"; version = "1.9.9"; # SyntaxError in setup.py diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 5e2ad1d5aa2..bab7cc052b9 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { - version = "v4.10.0"; + version = "4.10.0"; pname = "mt940"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65"; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index a1b8312b134..8af9e759c95 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -2,13 +2,12 @@ buildPythonPackage rec { pname = "podcats"; - version = "v0.5.0"; - name = "${pname}-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "podcats"; - rev = version; + rev = "v${version}"; sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc"; }; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 0ef91fda9e3..646308feece 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "PyXML"; version = "0.8.4"; - name = "${pname}-${pname}"; + format = "other"; src = fetchurl { - url = "mirror://sourceforge/pyxml/${name}.tar.gz"; + url = "mirror://sourceforge/pyxml/${pname}-${pname}.tar.gz"; sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; }; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 37807b245ff..75e898fdb3f 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { - name = "ocsigen-i18n"; + pname = "ocsigen-i18n"; + name = "${pname}-${version}"; version = "3.1.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec ''; src = fetchurl { - url = "https://github.com/besport/${name}/archive/${version}.tar.gz"; + url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index 14c2e178e92..9855e868886 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "11-dev"; - name = "physlock-v${version}"; + name = "physlock-${version}"; src = fetchFromGitHub { owner = "muennich"; repo = "physlock"; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index d9af026dfb6..90524483360 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "bosun"; - rev = "0.5.0"; + name = "bosun-${version}"; + version = "0.5.0"; src = fetchFromGitHub { - inherit rev; owner = "bosun-monitor"; repo = "bosun"; + rev = version; sha256 = "1qj97wiqj6awivvac1n00k0x8wdv4ambzdj4502nmmnr5rdbqq88"; }; diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 8376b2041b3..1ed15303069 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { + pname = "xinput_calibrator"; version = "0.7.5"; - name = "xinput_calibrator"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/tias/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz"; sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 9a09fba93e6..e87987aa083 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "blink1-${version}"; - version = "v1.98"; + version = "1.98"; src = fetchurl { - url = "https://github.com/todbot/blink1/archive/${version}.tar.gz"; + url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz"; sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; }; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index fdc1a868834..359b450b5fe 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { name = "docker-ls-${version}"; - version = "v0.3.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; - rev = version; + rev = "v${version}"; sha256 = "1dhadi1s3nm3r8q5a0m59fy4jdya8p7zvm22ci7ifm3mmw960xly"; }; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index d3f017171cb..670f7067765 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rsync, glibc, gawk }: stdenv.mkDerivation rec { - version = "v5.53"; + version = "5.53"; name = "profile-sync-daemon-${version}"; src = fetchurl { - url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz"; + url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; }; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 3db0ee9af26..77622ce8a1e 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "v0.9.11"; + version = "0.9.11"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; - rev = version; + rev = "v${version}"; sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d"; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 37f4f96a317..7521a9a13bc 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { + pname = "http-prompt"; version = "0.11.1"; - name = "http-prompt"; + name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; @@ -21,7 +22,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - $out/bin/${name} --version | grep -q "${version}" + $out/bin/${pname} --version | grep -q "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index dcc78560fa3..adda38c184d 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { - name = "ssldump"; + name = "ssldump-${version}"; version = "0.9b3"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 4589cfcec88..f3021b111d1 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -48,7 +48,7 @@ let ''; in buildFHSUserEnv { - name = "conda-shell"; + name = "conda-shell-${version}"; targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]); profile = '' # Add conda to PATH diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index afb0353e687..27edfa890fc 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -4,7 +4,7 @@ , fetchFromGitHub }: buildGoPackage rec { - name = "nixops-dns"; + name = "nixops-dns-${version}"; version = "1.0"; goDeps = ./deps.nix; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 10efe0e7f21..84c4a68aba0 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -11,19 +11,19 @@ , gnutls }: stdenv.mkDerivation rec { - name = "neopg"; + name = "neopg-${version}"; version = "0.0.4"; # no fetchFromGitHub, as repo contains submodules src = fetchgit { url = "https://github.com/das-labor/neopg.git"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; + buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1396e9b94c9..4407d5abbfa 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; }; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 464f6d21584..a9902fe5042 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "stoken"; - version = "v0.90"; + version = "0.90"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af"; }; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index c4af67b3b48..5eea33d13a4 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { - name = "jumanpp-${version}"; + pname = "jumanpp"; + name = "${pname}-${version}"; version = "2.0.0-rc2"; src = fetchurl { - url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; buildInputs = [ cmake protobuf ]; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 337aa61af13..9703bd1ecea 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -6,7 +6,7 @@ docbook5 }: stdenv.mkDerivation rec { name = "xmloscopy-${version}"; - version = "v0.1.2"; + version = "0.1.2"; buildInputs = [ makeWrapper @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "grahamc"; repo = "xmloscopy"; - rev = version; + rev = "v${version}"; sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; }; installPhase = '' - sed -i "s/hard to say/${version}/" ./xmloscopy + sed -i "s/hard to say/v${version}/" ./xmloscopy type -P shellcheck && shellcheck ./xmloscopy chmod +x ./xmloscopy patchShebangs ./xmloscopy diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 9c783023d66..dfb1467b54d 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { - name = "xe-guest-utilities"; + pname = "xe-guest-utilities"; + name = "${pname}-${version}"; version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; @@ -17,14 +18,14 @@ stdenv.mkDerivation (rec { buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' - tar xf "$NIX_BUILD_TOP/$name-$version/xenstore-sources.tar.bz2" + tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" ''; buildPhase = '' export CC=gcc export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' export PYTHON=python2 - cd "$NIX_BUILD_TOP/$name-$version/uclibc-sources" + cd "$NIX_BUILD_TOP/$name/uclibc-sources" for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do substituteInPlace "$file" --replace -Werror "" done @@ -39,12 +40,12 @@ stdenv.mkDerivation (rec { export LIBLEAFDIR_x86_64=lib fi for f in include libxc xenstore; do - [[ ! -d $NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f ]] && continue - make -C "$NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install + [[ ! -d $NIX_BUILD_TOP/$name/uclibc-sources/tools/$f ]] && continue + make -C "$NIX_BUILD_TOP/$name/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install done rm -r "$out"/var - cd "$NIX_BUILD_TOP/$name-$version" + cd "$NIX_BUILD_TOP/$name" install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs" install -Dm755 xe-daemon "$out/bin/xe-daemon" install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 02d9ec51b3d..ebba6a2f5ce 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -74,14 +74,14 @@ let }; php_excel = assert isPhp7; buildPecl rec { - name = "php_excel"; + name = "php_excel-${version}"; version = "1.0.2"; phpVersion = "php7"; buildInputs = [ pkgs.libxl ]; src = pkgs.fetchurl { - url = "https://github.com/iliaal/${name}/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; + url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfa9537e530..9a24175ebb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2819,9 +2819,10 @@ in { }; gnutls = buildPythonPackage rec { - name = "python-gnutls"; + pname = "python-gnutls"; + version = "3.0.0"; src = pkgs.fetchurl { - url = "mirror://pypi/p/python-gnutls/python-gnutls-3.0.0.tar.gz"; + url = "mirror://pypi/p/python-gnutls/${pname}-${version}.tar.gz"; sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc"; }; @@ -10375,7 +10376,7 @@ in { }; pybcrypt = buildPythonPackage rec { - name = "pybcrypt"; + pname = "pybcrypt"; version = "0.4"; src = pkgs.fetchurl { From e094cda74fd0e1a8f629334e8b92bf48d2dc17a6 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 28 May 2018 06:01:17 -0700 Subject: [PATCH 14/82] simgrid: 3.17 -> 3.19.1 --- pkgs/applications/science/misc/simgrid/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 522c708bf90..17a1719ba1e 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -14,18 +14,17 @@ with stdenv.lib; let optionOnOff = option: "${if option then "on" else "off"}"; - urlVersion = replaceStrings ["."] ["_"]; in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.17"; + version = "3.19.1"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; - rev = "v${urlVersion version}"; - sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; + rev = "v${version}"; + sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih"; }; nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ] From 7e30cfff780bccd454b3ae956552dce37bf749b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 06:47:00 -0700 Subject: [PATCH 15/82] memcached: 1.5.7 -> 1.5.8 (#41110) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/memcached/versions. These checks were done: - built on NixOS - /nix/store/jfhla2f3268dkbi1frd8g1d46cj6f1xm-memcached-1.5.8/bin/memcached passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.5.8 with grep in /nix/store/jfhla2f3268dkbi1frd8g1d46cj6f1xm-memcached-1.5.8 - directory tree listing: https://gist.github.com/69a417ed0d192d2c714645a464ec2ba5 - du listing: https://gist.github.com/94f5ac6323482d6fb77b7fe42d8814a9 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index e326aff0d7e..8a4159a5521 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.7"; + version = "1.5.8"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv"; + sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k"; }; buildInputs = [cyrus_sasl libevent]; From e30c7eb5ac9b175aea3720c4e6df3064616673ac Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 16:19:23 +0200 Subject: [PATCH 16/82] poppler: fix v0.61 build with clang --- pkgs/development/libraries/poppler/0.61.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 072de0f9fa0..dfa98d392a2 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + # Not sure when and how to pass it. It seems an upstream bug anyway. + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + cmakeFlags = [ (mkFlag true "XPDF_HEADERS") (mkFlag (!minimal) "GLIB") From 0b6c2cfc4d15eac58c8023e174edfb069b816a4e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 16:22:10 +0200 Subject: [PATCH 17/82] poppler: remove libintlOrEmpty from v0.61 --- pkgs/development/libraries/poppler/0.61.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index dfa98d392a2..4456cd7ff28 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; From ac404fd9e714f0e9433a7d6afe75e54cf5eb5f3d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 28 May 2018 17:28:53 +0200 Subject: [PATCH 18/82] haskellPackages: mark yarn2nix broken w/ message --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2fc5c20c337..7d308f5ab72 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -448,6 +448,9 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 + # Should not appear in nixpkgs yet (broken anyway) + yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix"; + # no haddock since this is an umbrella package. cloud-haskell = dontHaddock super.cloud-haskell; From ac23a7c459d8f6035fcadcac274ff40f1e21a7e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 11:35:20 -0400 Subject: [PATCH 19/82] =?UTF-8?q?emacs:=2025.3=20=E2=86=92=2026.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/emacs/at-fdcwd.patch | 15 --------------- pkgs/applications/editors/emacs/clean-env.patch | 4 ++-- pkgs/applications/editors/emacs/default.nix | 14 ++------------ 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch deleted file mode 100644 index 2d8099b7373..00000000000 --- a/pkgs/applications/editors/emacs/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch index f80efeeef70..7b4cb9d5266 100644 --- a/pkgs/applications/editors/emacs/clean-env.patch +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else -- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ifneq ($(PAXCTL_dumped),) $(PAXCTL_dumped) $@ endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index ba243629cc3..b82f97e445f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -26,28 +26,18 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "25.3"; + version = "26.1"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; enableParallelBuilding = true; patches = [ ./clean-env.patch - ] ++ lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - - # Backport of the fix to - # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html - # Should be removed when switching to Emacs 26.1 - (fetchurl { - url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; - sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; - }) ]; nativeBuildInputs = [ pkgconfig ] From f607f01b708aae314914b180f9207af37d28710f Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Thu, 24 May 2018 20:06:13 +1000 Subject: [PATCH 20/82] fix: connect the --bind-address arg to the cfg.apiserver.address option --- nixos/modules/services/cluster/kubernetes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 8216e686fac..50192559702 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -906,7 +906,7 @@ in { ${optionalString (cfg.etcd.keyFile != null) "--etcd-keyfile=${cfg.etcd.keyFile}"} \ --insecure-port=${toString cfg.apiserver.port} \ - --bind-address=0.0.0.0 \ + --bind-address=${toString cfg.apiserver.address} \ ${optionalString (cfg.apiserver.advertiseAddress != null) "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\ From 9424d155612c2a4452ca55ada6dad9a668326e93 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 19:11:29 +0200 Subject: [PATCH 21/82] gtk-doc: don't use pythonEnv for binaries --- .../tools/documentation/gtk-doc/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5bd989a4da8..32025edb306 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: - -let - pythonEnv = python.withPackages (ps: with ps; [ six ]); -in +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool +}: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; @@ -22,11 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome-doc-utils dblatex gettext which itstool - ]; + [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome-doc-utils dblatex gettext which itstool + ]; - configureFlags = "--disable-scrollkeeper"; + configureFlags = [ "--disable-scrollkeeper" ]; + + # Make six available for binaries, python.withPackages creates a wrapper + # but scripts are not allowed in shebangs so we link it into sys.path. + postInstall = '' + ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/ + ''; doCheck = false; # requires a lot of stuff doInstallCheck = false; # fails From a87b50bc6341c4539ee49fc6b1d14820b85a23db Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 11:42:38 -0400 Subject: [PATCH 22/82] emacs: readd version 25 --- pkgs/applications/editors/emacs/25.nix | 136 ++++++++++++++++++ .../applications/editors/emacs/at-fdcwd.patch | 15 ++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 31 +++- 4 files changed, 177 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/emacs/25.nix create mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix new file mode 100644 index 00000000000..b659e060e3b --- /dev/null +++ b/pkgs/applications/editors/emacs/25.nix @@ -0,0 +1,136 @@ +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux +, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, withX ? !stdenv.isDarwin +, withGTK2 ? false, gtk2 ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withCsrc ? true +, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null +}: + +assert (libXft != null) -> libpng != null; # probably a bug +assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise +assert withGTK2 -> withX || stdenv.isDarwin; +assert withGTK3 -> withX || stdenv.isDarwin; +assert withGTK2 -> !withGTK3 && gtk2 != null; +assert withGTK3 -> !withGTK2 && gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; + +let + toolkit = + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" + else "lucid"; +in +stdenv.mkDerivation rec { + name = "emacs-${version}${versionModifier}"; + version = "25.3"; + versionModifier = ""; + + src = fetchurl { + url = "mirror://gnu/emacs/${name}.tar.xz"; + sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + }; + + enableParallelBuilding = true; + + patches = lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + + # Backport of the fix to + # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html + # Should be removed when switching to Emacs 26.1 + (fetchurl { + url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; + sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; + + buildInputs = + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals withX + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gconf ] + ++ lib.optional (withX && withGTK2) gtk2 + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] + ++ lib.optional (stdenv.isDarwin && withX) cairo + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + + hardeningDisable = [ "format" ]; + + configureFlags = [ "--with-modules" ] ++ + (if stdenv.isDarwin + then [ "--with-ns" "--disable-ns-self-contained" ] + else if withX + then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]) + ++ lib.optional withXwidgets "--with-xwidgets"; + + preConfigure = lib.optionalString srcRepo '' + ./autogen.sh + '' + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done + ''; + + installTargets = "tags install"; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el + + rm -rf $out/var + rm -rf $out/share/emacs/${version}/site-lisp + '' + lib.optionalString withCsrc '' + for srcdir in src lisp lwlib ; do + dstdir=$out/share/emacs/${version}/$srcdir + mkdir -p $dstdir + find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; + cp $srcdir/TAGS $dstdir + echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el + done + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv nextstep/Emacs.app $out/Applications + ''; + + meta = with stdenv.lib; { + description = "The extensible, customizable GNU text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + platforms = platforms.all; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch new file mode 100644 index 00000000000..2d8099b7373 --- /dev/null +++ b/pkgs/applications/editors/emacs/at-fdcwd.patch @@ -0,0 +1,15 @@ +diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h +index 84ede3e..8e8f42e 100644 +--- a/lib/careadlinkat.h ++++ b/lib/careadlinkat.h +@@ -23,6 +23,10 @@ + #include + #include + ++#ifndef AT_FDCWD ++#define AT_FDCWD -2 ++#endif ++ + struct allocator; + + /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 35a16699d43..5724adf16ad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -78,6 +78,7 @@ mapAliases (rec { double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 + emacsMelpa = emacs25PackagesNg; # for backward compatibility enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972052dab5e..4831d3fb919 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15382,12 +15382,29 @@ with pkgs; elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs25; - emacsPackages = emacs25Packages; - emacsPackagesNg = emacs25PackagesNg; - emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacs = emacs26; + emacsPackages = emacs26Packages; + emacsPackagesNg = emacs26PackagesNg; - emacs25 = callPackage ../applications/editors/emacs { + emacs26 = callPackage ../applications/editors/emacs { + # use override to enable additional features + libXaw = xorg.libXaw; + Xaw3d = null; + gconf = null; + alsaLib = null; + imagemagick = null; + acl = null; + gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + }; + + emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + withX = false; + withGTK2 = false; + withGTK3 = false; + })); + + emacs25 = callPackage ../applications/editors/emacs/25.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -15556,6 +15573,7 @@ with pkgs; }; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; + emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; @@ -15579,8 +15597,9 @@ with pkgs; }; emacs25PackagesNg = emacsPackagesNgGen emacs25; - emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; + emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; inherit (gnome3) empathy; From aa2160e1b62bdc6795c465e68301ec8684540b24 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 13:33:08 -0400 Subject: [PATCH 23/82] =?UTF-8?q?emacs26:=20add=20some=20tweaks=20from=20j?= =?UTF-8?q?wiegley=E2=80=99s=20overlay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit original src: https://github.com/jwiegley/nix-config/blob/f85c560bf8165fecbbd6a28bc2ba0ebbafeb3cf3/overlays/10-emacs.nix --- pkgs/applications/editors/emacs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b82f97e445f..67afdb24cd4 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation rec { ./clean-env.patch ]; + postPatch = lib.optionalString srcRepo '' + rm -fr .git + ''; + + CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; + nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; From 382c20912ede5e0da7c3e0addd803762ef68f48c Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 28 May 2018 19:57:10 +0200 Subject: [PATCH 24/82] wireshark-gtk: fix build didn't build (assertion failure) after 48a1345eaa1c modified the overrides. --- 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 4831d3fb919..a71a4c88726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15833,7 +15833,7 @@ with pkgs; wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = wireshark.override { withGtk = true; }; + wireshark-gtk = wireshark.override { withGtk = true; withQt = false; }; wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; fbida = callPackage ../applications/graphics/fbida { }; From 463b9c9ea3c4b0bed69f6fc4128771942113a5a4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 28 May 2018 20:04:06 +0200 Subject: [PATCH 25/82] php71: 7.1.17 -> 7.1.18 (#41145) Changelog: http://www.php.net/ChangeLog-7.php#7.1.18 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 0e161b0e3f7..a669d71036a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.17"; - sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971"; + version = "7.1.18"; + sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq"; }; php72 = generic { From 85016ec3d15648f6468dda1ee872dbc828d44f1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 11:11:21 -0700 Subject: [PATCH 26/82] adapta-gtk-theme: 3.93.1.16 -> 3.93.1.18 (#41124) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - directory tree listing: https://gist.github.com/60eadc1cf0cabf6d0def6a21d1d21c5d - du listing: https://gist.github.com/afad29a6d76aa88ae6df876a0d28f599 --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index d696a43b3bc..372efec785d 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.1.16"; + version = "3.93.1.18"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx"; + sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw"; }; preferLocalBuild = true; From 8f43bb4e239e9dfbfbab64a49f8dff3a3f348b8d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 28 May 2018 10:32:16 -0500 Subject: [PATCH 27/82] noto-fonts: separate package for unusual weights Noto provides a large number of unusual font weights so that the complete package of fonts is more than 300 MB in size. Most of these weights are moved into noto-fonts-extra; noto-fonts retains the ordinary weights and styles. See also: #31543 --- pkgs/data/fonts/noto-fonts/default.nix | 91 +++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 52 insertions(+), 41 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index e2336c51255..33435c98267 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,47 +1,59 @@ { stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: -rec { - # 18MB - noto-fonts = let version = "2017-10-24-phase3-second-cleanup"; in fetchzip { - name = "noto-fonts-${version}"; - - url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip"; - postFetch = '' - unzip $downloadedFile - - mkdir -p $out/share/fonts/noto - cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto - # Also copy unhinted & alpha fonts for better glyph coverage, - # if they don't have a hinted version - # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) - cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto - cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto - ''; - sha256 = "013l816cq9svdji266sccscm9sf9pfn472gq9lnqkzlwaxx9qrrl"; - - meta = with stdenv.lib; { - inherit version; - description = "Beautiful and free fonts for many languages"; - homepage = https://www.google.com/get/noto/; - longDescription = - '' - When text is rendered by a computer, sometimes characters are displayed as - “tofu”. They are little boxes to indicate your device doesn’t have a font to - display the text. - - Google has been developing a font family called Noto, which aims to support all - languages with a harmonious look and feel. Noto is Google’s answer to tofu. The - name noto is to convey the idea that Google’s goal is to see “no more tofu”. - Noto has multiple styles and weights, and freely available to all. - - This package also includes the Arimo, Cousine, and Tinos fonts. +let + mkNoto = { name, weights, sha256, }: + let version = "2017-10-24-phase3-second-cleanup"; in + fetchzip { + name = "${name}-${version}"; + inherit sha256; + url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip"; + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/noto + # Also copy unhinted & alpha fonts for better glyph coverage, + # if they don't have a hinted version + # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) + for ttf in noto-fonts-*/{hinted,unhinted,alpha}/*-${weights}.ttf + do + cp -n "$ttf" -t "$out/share/fonts/noto" + done ''; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 ]; + meta = with stdenv.lib; { + inherit version; + description = "Beautiful and free fonts for many languages"; + homepage = https://www.google.com/get/noto/; + longDescription = + '' + When text is rendered by a computer, sometimes characters are + displayed as “tofu”. They are little boxes to indicate your device + doesn’t have a font to display the text. + + Google has been developing a font family called Noto, which aims to + support all languages with a harmonious look and feel. Noto is + Google’s answer to tofu. The name noto is to convey the idea that + Google’s goal is to see “no more tofu”. Noto has multiple styles and + weights, and freely available to all. + + This package also includes the Arimo, Cousine, and Tinos fonts. + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 ]; + }; }; +in + +rec { + noto-fonts = mkNoto { + name = "noto-fonts"; + weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; + sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb"; + }; + noto-fonts-extra = mkNoto { + name = "noto-fonts-extra"; + weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; + sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc"; }; - # 89MB noto-fonts-cjk = let version = "1.004"; in fetchzip { name = "noto-fonts-cjk-${version}"; @@ -74,7 +86,6 @@ rec { maintainers = with maintainers; [ mathnerd314 ]; }; }; - # 12MB noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation { name = "noto-fonts-emoji-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a67e23404a4..6c14c69da82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14516,7 +14516,7 @@ with pkgs; nafees = callPackage ../data/fonts/nafees { }; inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji; + noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; From 08c97e8d71a29d2c9cabf5a2c741eba1e0c0edea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 11:22:35 -0700 Subject: [PATCH 28/82] arangodb: 3.3.8 -> 3.3.9 (#41070) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions. These checks were done: - built on NixOS - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/foxx-manager passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangobench passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangodump passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangoexport passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangoimp passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangorestore passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangosh passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangovpack passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-dfdb passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-init-database passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-secure-installation passed the binary check. - /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangod passed the binary check. - 12 of 12 passed binary check by having a zero exit code. - 0 of 12 passed binary check by having the new version present in output. - found 3.3.9 with grep in /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9 - directory tree listing: https://gist.github.com/96b6a91c373183de511e8a58e77045c0 - du listing: https://gist.github.com/58d43e913a2d38280efe4ba36494fddb --- pkgs/servers/nosql/arangodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index b1003687a04..5d1723274cb 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.8"; + version = "3.3.9"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "07qz5fv4w00hs31hmx099vlzlv0x5i10b5i4h8r0bkprih8k3vg3"; + sha256 = "1zr9byxlqd7s3rnmvdgv85mmk5xxjz0va1pj2gn6y28k569prcbs"; }; buildInputs = [ From c1d72c6af1dfc06e6688b05bd2ef4bcfe2913a17 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Mon, 28 May 2018 21:26:37 +0300 Subject: [PATCH 29/82] avocode: 2.26.1 -> 2.26.4 (#41131) --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index c1e2da20e54..89a728f1a99 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "2.26.1"; + version = "2.26.4"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8"; + sha256 = "0qbir023zyd53ly6y8zcm3kbhbhjjpclcgp9d0mqb5lc9zajxv12"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ From 50f46e060f88df6b1f73d80862eacaa3daa89a08 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 20:21:45 +0200 Subject: [PATCH 30/82] gdk-pixbuf: fixup library install_names on darwin Meson tries to use rpaths but we don't use those in the darwin stdenv. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f1e73a77bea..d14e625d436 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 gtk-doc gobjectIntrospection makeWrapper - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; From 52dedc9c813a3e9c20f6eeb65f19a774a660f08d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 28 May 2018 14:40:56 -0400 Subject: [PATCH 31/82] linux: 4.17-rc6 -> 4.17-rc7 --- 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 e61e9a354de..4794685a755 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc6"; - modDirVersion = "4.17.0-rc6"; + version = "4.17-rc7"; + modDirVersion = "4.17.0-rc7"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8"; + sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr"; }; # Should the testing kernels ever be built on Hydra? From d58691d38f76739fe275230242a4a46dfb3b9a06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 12:04:12 -0700 Subject: [PATCH 32/82] jruby: 9.1.17.0 -> 9.2.0.0 (#41115) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jruby/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/rake had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ast had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jgem had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jirb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jirb_swing had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/gem had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ri had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/irb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/testrb had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/rdoc had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jrubyc had a zero exit code or showed the expected version - /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jruby passed the binary check. - /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jruby.bash passed the binary check. - /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ruby passed the binary check. - /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/.jruby-wrapped passed the binary check. - /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/.jruby.bash-wrapped passed the binary check. - 5 of 16 passed binary check by having a zero exit code. - 0 of 16 passed binary check by having the new version present in output. - found 9.2.0.0 with grep in /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0 - directory tree listing: https://gist.github.com/4fecc39e96054dd41278b1d505cdb498 - du listing: https://gist.github.com/6382ad0545e74f9ff62a410b61801232 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 050d5accd2c..c67fae936ce 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.17.0"; + version = "9.2.0.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka"; + sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2"; }; buildInputs = [ makeWrapper ]; From 5427a1a3831ac7f6a08a2c7c73406af3dbfa49f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 May 2018 12:07:28 -0700 Subject: [PATCH 33/82] mcelog: 157 -> 158 (#41112) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mcelog/versions. These checks were done: - built on NixOS - /nix/store/1fqizqnwbm6d0m3bfhf07ifi974lf462-mcelog-158/bin/mcelog passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 158 with grep in /nix/store/1fqizqnwbm6d0m3bfhf07ifi974lf462-mcelog-158 - directory tree listing: https://gist.github.com/9d64a5e08433a1d54e003d1331d5dcb4 - du listing: https://gist.github.com/58a6326ee54553f647aebedff6e4e46d --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 4ebc1c00f7a..18e90f85b44 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "157"; + version = "158"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1965axyfizv2jg412a4wrrghgswwvvgymk7mbwaraw3xl9p21wgv"; + sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp"; }; postPatch = '' From de897baceae1783e50bb47d7bdd3396b36c58cdd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 28 May 2018 15:27:53 -0400 Subject: [PATCH 34/82] celf: init at 2013-07-25 (#41141) --- .../science/logic/celf/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/science/logic/celf/default.nix diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix new file mode 100644 index 00000000000..669cd46cd2e --- /dev/null +++ b/pkgs/applications/science/logic/celf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, smlnj }: + +stdenv.mkDerivation rec { + pname = "celf"; + pversion = "2013-07-25"; + name = "${pname}-${pversion}"; + + src = fetchFromGitHub { + owner = "clf"; + repo = pname; + rev = "d61d95900ab316468ae850fa34a2fe9488bc5b59"; + sha256 = "0slrwcxglp0sdbp6wr65cdkl5wcap2i0fqxbwqfi1q3cpb6ph6hq"; + }; + + buildInputs = [ smlnj ]; + + # (can also build with MLton) + buildPhase = '' + export SMLNJ_HOME=${smlnj} + sml < main-export.sml + ''; + + installPhase = '' + mkdir -p $out/bin + cp .heap* $out/bin/ + ./.mkexec ${smlnj}/bin/sml $out/bin celf + ''; + + meta = with stdenv.lib; { + description = "Linear logic programming system"; + homepage = http://github.com/clf/celf; + license = licenses.gpl3; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a71a4c88726..88df3cd265a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20265,6 +20265,12 @@ with pkgs; tptp = callPackage ../applications/science/logic/tptp {}; + celf = callPackage ../applications/science/logic/celf { + smlnj = if stdenv.isDarwin + then smlnjBootstrap + else smlnj; + }; + twelf = callPackage ../applications/science/logic/twelf { smlnj = if stdenv.isDarwin then smlnjBootstrap From 9317c05cb388190b1764e520722b7f526ff4cd5e Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Mon, 28 May 2018 15:44:56 -0400 Subject: [PATCH 35/82] minergate-cli: init at 8.2 (#41143) --- .../misc/minergate-cli/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/minergate-cli/default.nix diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix new file mode 100644 index 00000000000..6aa7eea3d7e --- /dev/null +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, dpkg, makeWrapper, openssl }: + +stdenv.mkDerivation rec { + version = "8.2"; + name = "minergate-cli-${version}"; + src = fetchurl { + url = "https://minergate.com/download/ubuntu-cli"; + sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + pgm=$out/opt/minergate-cli/minergate-cli + + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + patchelf --set-interpreter "$interpreter" $pgm + + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + + rm $out/usr/bin/minergate-cli + mkdir -p $out/bin + ln -s $pgm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minergate CPU/GPU console client mining software"; + homepage = https://www.minergate.com/; + license = licenses.unfree; + maintainers = with maintainers; [ bfortz ]; + platforms = [ "x86_64-linux" ]; +}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88df3cd265a..63906d3de3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3370,6 +3370,8 @@ with pkgs; minergate = callPackage ../applications/misc/minergate { }; + minergate-cli = callPackage ../applications/misc/minergate-cli { }; + minidlna = callPackage ../tools/networking/minidlna { }; minisign = callPackage ../tools/security/minisign { }; From e8c5d867a1403a7cbaee94d96644db0ac5c4ec57 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 28 May 2018 12:48:16 -0700 Subject: [PATCH 36/82] use https for default Hackage homepage --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 349f19c9680..a1b92595c78 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -35,7 +35,7 @@ in , enableStaticLibraries ? !hostPlatform.isWindows , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] -, homepage ? "http://hackage.haskell.org/package/${pname}" +, homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile , hydraPlatforms ? null , hyperlinkSource ? true From c5a088bf2b1b03081d64c5a2949e79d8f50e357f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 28 May 2018 16:05:05 -0400 Subject: [PATCH 37/82] spl, zfs: 0.7.8 -> 0.7.9, unstable to latest (#41093) --- pkgs/os-specific/linux/spl/default.nix | 12 ++++++------ ...prefix-0.7.8.patch => install_prefix-0.7.9.patch} | 12 ------------ pkgs/os-specific/linux/zfs/default.nix | 10 +++++----- 3 files changed, 11 insertions(+), 23 deletions(-) rename pkgs/os-specific/linux/spl/{install_prefix-0.7.8.patch => install_prefix-0.7.9.patch} (92%) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 7c37d18c868..778f00d2a95 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -62,15 +62,15 @@ in assert kernel != null; { splStable = common { - version = "0.7.8"; - sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi"; - patches = [ ./install_prefix-0.7.8.patch ]; + version = "0.7.9"; + sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + patches = [ ./install_prefix-0.7.9.patch ]; }; splUnstable = common { - version = "2018-04-10"; - rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8"; - sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri"; + version = "2018-05-07"; + rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602"; + sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; patches = [ ./install_prefix.patch ]; }; diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch similarity index 92% rename from pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch rename to pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch index dc91392bd2f..114ca123147 100644 --- a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch +++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch @@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644 +kerneldir = @prefix@/libexec/spl/include/sys/fs kernel_HEADERS = $(KERNEL_H) endif -diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am -index 63d9af3..de1aa18 100644 ---- a/include/sys/sysevent/Makefile.am -+++ b/include/sys/sysevent/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -+kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bdc43a092f7..b28a5c6416d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -156,9 +156,9 @@ in { incompatibleKernelVersion = "4.16"; # this package should point to the latest release. - version = "0.7.8"; + version = "0.7.9"; - sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix"; + sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n"; extraPatches = [ (fetchpatch { @@ -175,10 +175,10 @@ in { incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-04-10"; + version = "2018-05-22"; - rev = "74df0c5e251a920a1966a011c16f960cd7ba562e"; - sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4"; + rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20"; + sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0"; isUnstable = true; extraPatches = [ From 2c933ce2ac32c1fcd5c888cdcdb45f9ac555ba1b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 May 2018 20:19:34 +0000 Subject: [PATCH 38/82] Transporter: init at 1.3.3 (#41127) * Transporter: init at 1.3.3 * Transporter: clarify description --- .../networking/transporter/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/networking/transporter/default.nix diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix new file mode 100644 index 00000000000..141c40f3b84 --- /dev/null +++ b/pkgs/applications/networking/transporter/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, granite +, vala_0_40 +, gnome3 +, libxml2 +, gettext +, gobjectIntrospection +, appstream-glib +, desktop-file-utils +, magic-wormhole +, wrapGAppsHook }: + +let + pname = "Transporter"; + version = "1.3.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bleakgrey"; + repo = pname; + rev = version; + sha256 = "19zb2yqmyyhk5vgh6p278b76shlq0r8ykk1ks8zzr187nr5lf5k1"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobjectIntrospection # For setup hook + libxml2 + meson + ninja + pkgconfig + vala_0_40 + wrapGAppsHook + ]; + + buildInputs = with gnome3; [ + defaultIconTheme # If I omit this there's no icons in KDE + glib + granite + gsettings_desktop_schemas + gtk3 + libgee + magic-wormhole + ]; + + prePatch = '' + # The paths were hardcoded + substituteInPlace ./src/WormholeInterface.vala \ + --replace /bin/wormhole ${magic-wormhole}/bin/wormhole + ''; + + postPatch = '' + chmod +x ./meson/post_install.py + patchShebangs ./meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Simple magic-wormhole client"; + homepage = https://github.com/bleakgrey/Transporter; + license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63906d3de3b..8faed4d5b51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5327,6 +5327,8 @@ with pkgs; translate-shell = callPackage ../applications/misc/translate-shell { }; + transporter = callPackage ../applications/networking/transporter { }; + trash-cli = callPackage ../tools/misc/trash-cli { }; trickle = callPackage ../tools/networking/trickle {}; From 3cb60362b7b0f9df61eef8e4ca21d59bf65da689 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2018 22:25:46 +0200 Subject: [PATCH 39/82] python-osc: add missing run-time dependency --- 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 9a24175ebb7..c8402e184b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9117,7 +9117,7 @@ in { sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh"; }; buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper - propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; + propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml lxml ]; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc install -D -m444 osc.fish $out/etc/fish/completions/osc.fish From 29f75982a675d8395777150a281648d9d53b5704 Mon Sep 17 00:00:00 2001 From: Nathaniel McCallum Date: Mon, 28 May 2018 16:24:22 -0400 Subject: [PATCH 40/82] nixos.modules.tasks.swraid: add raid10 module to initrd --- nixos/modules/tasks/swraid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index d6cb1c96ef4..1b142fb8fd3 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -6,7 +6,7 @@ services.udev.packages = [ pkgs.mdadm ]; - boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ]; + boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ]; boot.initrd.extraUdevRulesCommands = '' cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ From 98a4fbf85744e7b6cbe8083c8ebee239b65c7b64 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 28 May 2018 22:53:19 +0200 Subject: [PATCH 41/82] libgdiplus: fix build was broken after b22cc53db147cdbfe84ffbc344143bf1e8c1e515 --- pkgs/development/libraries/libgdiplus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index d3a21ee7fa2..79f49c629b8 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; + hardeningDisable = [ "format" ]; + buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif From 5509528c2c166c2b2d40b0191e06de7dd5ae8b49 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 May 2018 23:33:00 +0200 Subject: [PATCH 42/82] ocamlPackages.opam-file-format: init at 2.0.0-rc2 (#41164) --- .../opam-file-format/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/opam-file-format/default.nix diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix new file mode 100644 index 00000000000..1dec7e36e1c --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib }: + +stdenv.mkDerivation rec { + version = "2.0.0-rc2"; + name = "ocaml${ocaml.version}-opam-file-format-${version}"; + + src = fetchFromGitHub { + owner = "ocaml"; + repo = "opam-file-format"; + rev = "${version}"; + sha256 = "05g0pikmifmfkwyws5x82fglgsz3d317yfn6nrz7zmpn22cirvir"; + }; + + buildInputs = [ ocaml findlib ]; + + installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + + meta = { + description = "Parser and printer for the opam file syntax"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c0961a6a579..ef7e6f4c588 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -519,6 +519,8 @@ let omd = callPackage ../development/ocaml-modules/omd { }; + opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otr = callPackage ../development/ocaml-modules/otr { }; From 25be6fdb0e4b1bf416a2c00f012710739d68400b Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Mon, 28 May 2018 23:48:32 +0200 Subject: [PATCH 43/82] tbb: update 2018_U1 -> 2018_U3 (#41134) --- pkgs/development/libraries/tbb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 182fbb35d49..59765adf7a8 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U1"; + version = "2018_U3"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; + sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006"; }; makeFlags = concatStringsSep " " ( From 4200c9c87985be29a7207b806d550c5eee7cf8bd Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 23:55:39 +0200 Subject: [PATCH 44/82] gdk-pixbuf: fix binary @rpath reference on darwin --- pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d14e625d436..f9acc721cc3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -82,6 +82,11 @@ stdenv.mkDerivation rec { $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; + # The fixDarwinDylibNames hook doesn't patch binaries. + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer + ''; + # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; From a7e0fb6ffcae252bdd0c85928f179c74c3492a89 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 29 May 2018 00:21:33 +0200 Subject: [PATCH 45/82] wireshark: 2.4.6 -> 2.4.7 (#41175) See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for release information --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 8c745a4aa3f..f3afeced8f6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.6"; + version = "2.4.7"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf"; + sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy"; }; cmakeFlags = [ From bf3e3f72877ecd9041834bfb9fde65af605245b7 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 28 May 2018 18:55:32 -0400 Subject: [PATCH 46/82] man-pagess: set low priority for man-pages package (#41121) if a package comes with its own man page, prefer it --- pkgs/data/documentation/man-pages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index d050a15cb79..244e00ec70a 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; platforms = with platforms; unix; + priority = 30; # if a package comes with its own man page, prefer it }; } From 11b799db8bebb617fa5332112ff4a06b01f62723 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 29 May 2018 01:05:58 +0200 Subject: [PATCH 47/82] gdk-pixbuf: also patch binaries in dev output for darwin --- pkgs/development/libraries/gdk-pixbuf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f9acc721cc3..d2e3fe5e8ca 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation rec { # The fixDarwinDylibNames hook doesn't patch binaries. preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer + install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$dev/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer + install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $dev/bin/gdk-pixbuf-thumbnailer ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). From 8baaa433b6775f480fcd25e36dc8b00ed03e0757 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 29 May 2018 08:46:39 +0200 Subject: [PATCH 48/82] gdk-pixbuf: patch all darwin binaries --- pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d2e3fe5e8ca..6c97b806f20 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -84,8 +84,9 @@ stdenv.mkDerivation rec { # The fixDarwinDylibNames hook doesn't patch binaries. preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$dev/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer - install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $dev/bin/gdk-pixbuf-thumbnailer + for f in $out/bin/* $dev/bin/*; do + install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f + done ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). From 725de314efc0f0fa118e69d1c05295b107a31353 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 17 Apr 2018 08:26:39 +0000 Subject: [PATCH 49/82] tree-wide: random cleanups --- pkgs/development/libraries/enchant/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index 7363a023935..c51475ecc2a 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -4,16 +4,17 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "1.6.0"; pname = "enchant"; - + src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"; }; - + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [aspell glib hunspell hspell]; - + buildInputs = [ aspell glib hunspell hspell ]; + meta = { + description = "Generic spell checking library"; homepage = http://www.abisource.com/enchant; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34ecad0c1d1..bc3dde1d1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9263,7 +9263,7 @@ with pkgs; qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;}; + qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; }; qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; From 3d53d140703c1b4f65be9b69a93f90affc9d2279 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:08:06 +0000 Subject: [PATCH 50/82] tinyxml: disable format hardening, else tests will fail --- pkgs/development/libraries/tinyxml/2.6.2.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index cc374345c2e..2ec9c57e241 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -21,8 +21,11 @@ in stdenv.mkDerivation { # Use CC, CXX, and LD from environment ./2.6.2-cxx.patch ]; + preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}"; + hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; From edc59b47150bcf61fffe21ee16791ff34e6cb734 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:08:35 +0000 Subject: [PATCH 51/82] linuxPackages.perf: disable format hardening, else tests will fail --- pkgs/os-specific/linux/kernel/perf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index bbef2bd19ae..c58851bb03e 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation { makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags; + hardeningDisable = [ "format" ]; + # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt From 430da809af2e3d5f5cc59f202f4b6e5c66d571f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:10:57 +0000 Subject: [PATCH 52/82] perlPackages.GD: disable format hardening to fix some tests One test still fails :( --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 41a3e709862..b89b8403dd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6462,10 +6462,9 @@ let self = _self // overrides; _self = with self; { patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; + hardeningDisable = [ "format" ]; - # tests fail - doCheck = false; + doCheck = false; # fails 1 out of 13 tests makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; From e102dc716d6b6a08779a2aac4d1137152b0d4a25 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Tue, 15 May 2018 00:00:00 +0000 Subject: [PATCH 53/82] a52dec: disable tests on i686 before squashing was: "disable pic hardening on i686, else tests will fail" --- pkgs/development/libraries/a52dec/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 0bfe3a88e9f..183400c7786 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; }; + # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 + # which can also be fixed with + # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + # but it's better to disable tests than loose ASLR on i686 + doCheck = !stdenv.isi686; + meta = { description = "ATSC A/52 stream decoder"; homepage = http://liba52.sourceforge.net/; From ee5660e7f61338462e1f8a8684a6df77431a54d1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:02:23 +0000 Subject: [PATCH 54/82] haskell.compiler.ghc802: disable format hardening, else tests will fail --- pkgs/development/compilers/ghc/8.0.2.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 63e3899671d..4aa9f3fc81c 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -162,6 +162,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + hardeningDisable = [ "format" ]; + postInstall = '' for bin in "$out"/lib/${name}/bin/*; do isELF "$bin" || continue From 29757f379025a507f45a4cda12fc882b730d8053 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 29 May 2018 07:34:59 +0000 Subject: [PATCH 55/82] haskell.compiler.ghc842: disable format hardening --- pkgs/development/compilers/ghc/8.4.2.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index aa78480e332..a2c1a751bc3 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -172,6 +172,8 @@ stdenv.mkDerivation rec { checkTarget = "test"; + hardeningDisable = [ "format" ]; + postInstall = '' for bin in "$out"/lib/${name}/bin/*; do isELF "$bin" || continue From e933798469dd970a06ddaece4160e7e9429109b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:00:00 +0200 Subject: [PATCH 56/82] glib-networking: fix patch url --- pkgs/development/libraries/glib-networking/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index c3bcb3aa1c4..e0bbae69c4f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ # Use GNUTLS system trust for certificates (fetchpatch { - url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df; + url = https://gitlab.gnome.org/GNOME/glib-networking/commit/f1c8feee014007cc913b71357acb609f8d1200df.patch; sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i"; }) ]; From ccd064450c2900b768513b1d1b28396eefd800e3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:01:30 +0200 Subject: [PATCH 57/82] gdk-pixbuf: fix git urls --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6c97b806f20..ae84b1a1701 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; # }; src = fetchgit { - url = https://git.gnome.org/browse/gdk-pixbuf; + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git; rev = version; sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Add missing test file bug753605-atsize.jpg (fetchpatch { - url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7; + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch; sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; }) From 86270fc19e8dce35bbb81507f0b8c9647a82abf2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:11:02 +0200 Subject: [PATCH 58/82] gnome2.gtksourceview: fix patch url --- pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 99a45d0a769..caf06753239 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; - url = "https://git.gnome.org/browse/gtksourceview/patch/?id=e88357c5f210a8796104505c090fb6a04c213902"; + url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7"; }) (fetchpatch { name = "update-to-gtk-mac-integration-2.0-api.patch"; - url = "https://git.gnome.org/browse/gtksourceview/patch/?id=ab46e552e1d0dae73f72adac8d578e40bdadaf95"; + url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/ab46e552e1d0dae73f72adac8d578e40bdadaf95.patch"; sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj"; }) ]; From c087482770ded639d9a7369977f662eea0d15747 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:13:36 +0200 Subject: [PATCH 59/82] gnome3.nemiver: fix patch url --- pkgs/desktops/gnome-3/devtools/nemiver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 19853b19fca..4cd5cce272d 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./bool_slot.patch ./safe_ptr.patch (fetchpatch { - url = "https://git.gnome.org/browse/nemiver/patch/src/persp/dbgperspective/nmv-dbg-perspective.cc?id=262cf9657f9c2727a816972b348692adcc666008"; + url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; From adcfd39bb98aac06effcc59106e1df46997c8f73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:23:49 +0200 Subject: [PATCH 60/82] gnome3.libcroco: fix patch url --- pkgs/desktops/gnome-3/core/libcroco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 7df5165d238..f5ecf088a87 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "CVE-2017-7960.patch"; - url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394"; + url = https://gitlab.gnome.org/GNOME/libcroco/commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394.patch; sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; }) (fetchpatch { name = "CVE-2017-7961.patch"; - url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7"; + url = https://gitlab.gnome.org/GNOME/libcroco/commit/9ad72875e9f08e4c519ef63d44cdbd94aa9504f7.patch; sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; }) ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME CSS2 parsing and manipulation toolkit"; - homepage = https://git.gnome.org/browse/libcroco; + homepage = https://gitlab.gnome.org/GNOME/libcroco; license = licenses.lgpl2; platforms = platforms.unix; }; From f59f7c7efa2c1bda05521bf3f752c937a1ec8e5e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:25:00 +0200 Subject: [PATCH 61/82] gnome-desktop-testing: update URL --- pkgs/development/tools/gnome-desktop-testing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 788310d5fe9..70b426dc594 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "gnome-desktop-testing-${version}"; src = fetchgit { - url = https://git.gnome.org/browse/gnome-desktop-testing; + url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; rev = "v${version}"; sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc"; }; From 75e3729032bb64ffabc396a0502cfed3736582d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:26:03 +0200 Subject: [PATCH 62/82] dia: update url --- pkgs/applications/graphics/dia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 73362588a57..ef63cb97a73 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.97.3.20170622"; src = fetchgit { - url = git://git.gnome.org/dia; + url = https://gitlab.gnome.org/GNOME/dia.git; rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; From 2790b30af83e4203ead5786301be8119021556ce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:31:23 +0200 Subject: [PATCH 63/82] libhttpseverywhere: update url --- pkgs/development/libraries/libhttpseverywhere/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 332dd8444eb..91e8e2d50f1 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = https://git.gnome.org/browse/libhttpseverywhere; + homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; From 76e928d914aee0a5a6eed9cc3c3c7354fe315faf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:33:23 +0200 Subject: [PATCH 64/82] planner: update url --- pkgs/applications/office/planner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index b82531ea034..358bfc38077 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { name = "planner-${version}"; src = fetchgit { - url = "https://git.gnome.org/browse/planner"; + url = https://gitlab.gnome.org/GNOME/planner.git; rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6"; sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd"; }; From 89c20aa46c63b88d78b9287d4870aa5be8d25544 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 10:57:50 +0200 Subject: [PATCH 65/82] gnome2.vte: fix patch url --- pkgs/desktops/gnome-2/desktop/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 80c77d9b291..c7ed90905ac 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -18,12 +18,12 @@ in stdenv.mkDerivation rec { # fixed in upstream version 0.32.2 (fetchpatch{ name = "CVE-2012-2738-1.patch"; - url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e; + url = https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch; sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; }) (fetchpatch{ name = "CVE-2012-2738-2.patch"; - url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74; + url = https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch; sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; }) ]; From 2af5b6eadda12680129f68da89cc5b25f013be9a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 29 May 2018 17:54:18 +0800 Subject: [PATCH 66/82] umockdev: fix build --- .../libraries/umockdev/default.nix | 24 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 0f727a9be47..1ff71fa1811 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc +{ stdenv, fetchFromGitHub, autoreconfHook, libtool , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { @@ -6,21 +6,27 @@ stdenv.mkDerivation rec { version = "0.11.3"; src = fetchFromGitHub { - owner = "martinpitt"; - repo = "umockdev"; - rev = version; - sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik"; + owner = "martinpitt"; + repo = "umockdev"; + rev = version; + sha256 = "1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik"; }; - buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ]; + # autoreconfHook complains if we try to build the documentation + postPatch = '' + echo 'EXTRA_DIST =' > docs/gtk-doc.make + ''; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + buildInputs = [ glib systemd libgudev ]; + + nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; - maintainers = [ maintainers.ndowens ]; + maintainers = with maintainers; [ ndowens ]; platforms = with platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc3dde1d1d6..4e08ed71e88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11796,7 +11796,9 @@ with pkgs; uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; - umockdev = callPackage ../development/libraries/umockdev { }; + umockdev = callPackage ../development/libraries/umockdev { + vala = vala_0_40; + }; unibilium = callPackage ../development/libraries/unibilium { }; From e89414ff699ddd0689a696db7889b6e5654c847d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 11:11:40 +0000 Subject: [PATCH 67/82] vsqlite: fix build Probably broken by 1d6a14e24a65d41e30c824d1e339a372060d171a. --- pkgs/development/libraries/vsqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index bfb07c2df33..d9a9564e6de 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, sqlite }: +{ stdenv, fetchurl, boost, sqlite, zlib }: stdenv.mkDerivation rec { name = "vsqlite-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; - buildInputs = [ boost sqlite ]; + buildInputs = [ boost sqlite zlib ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.in \ From f5ef39039c73ced747a277d7d397be12f4f286e2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 May 2018 13:54:28 +0200 Subject: [PATCH 68/82] qgit: 2.7 -> 2.8 --- .../version-management/git-and-tools/qgit/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 188e5a4faaf..0a88fbd0929 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, cmake, qtbase }: +{ stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { - name = "qgit-2.7"; + name = "qgit-2.8"; - src = fetchgit { - url = "http://repo.or.cz/qgit4/redivivus.git"; + src = fetchFromGitHub { + owner = "tibirna"; + repo = "qgit"; rev = name; - sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a"; + sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f"; }; buildInputs = [ qtbase ]; From 50c82704a8b0c412adc633c95672f863b6c05281 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 12:00:05 +0000 Subject: [PATCH 69/82] qt5.qtlocation: enable parallel building It was fixed in [1] which is part of 5.9.2, 5.10.0. [1] https://github.com/qt/qtlocation/commit/3ac051c4549575634cecc706175b019f4ed4c3bf#diff-b820e0828543b1da522ff0ab3dac6c75 --- pkgs/development/libraries/qt-5/modules/qtlocation.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index e8952e29cba..0eee684a53f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -4,8 +4,6 @@ qtModule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - # Linking with -lclipper fails with parallel build enabled - enableParallelBuilding = false; qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature From 5ac2382487f2611df8b7c7d2b92111962b417527 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 08:35:04 +0000 Subject: [PATCH 70/82] mirrors: remove obsolete mysql mirror It does not contain any of the versions currently in Nixpkgs. --- pkgs/build-support/fetchurl/mirrors.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index b0d3f373a46..cc015f9d604 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -368,7 +368,6 @@ rec { # MySQL mirrors mysql = [ - http://mysql.mirrors.pair.com/Downloads/ http://cdn.mysql.com/Downloads/ ]; From 4b975f0fb941066ce1a8ab7ec7489e8924149a5f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 08:36:21 +0000 Subject: [PATCH 71/82] mysql55: 5.5.58 -> 5.5.60 mysql-test-run.pl.1 no longer exists. Do not install and immediately delete mysql-test and sql-bench. --- pkgs/servers/sql/mysql/5.5.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 29d25b77afc..15f82a90208 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.58"; + version = "5.5.60"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv"; + sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3"; }; patches = if stdenv.isCygwin then [ @@ -47,6 +47,8 @@ self = stdenv.mkDerivation rec { "-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_SQLBENCHDIR=" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 @@ -57,8 +59,7 @@ self = stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 + rm -r $out/data "$out"/lib/*.a ''; passthru = { From 303a17a939e7c00b6fc69993afed1e971e8a07e0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 09:40:45 +0000 Subject: [PATCH 72/82] mysql57: 5.7.20 -> 5.7.22 Do not SKIP_BUILD_RPATH to let libmysql_api_test run during the build. There is no WITH_UNITTEST, but there is WITH_UNIT_TESTS. Do not install and immediately delete mysql-test. There is no "basedir=" in mysql_install_db. --- pkgs/servers/sql/mysql/5.7.x.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 15e8569fd09..4017f5946a4 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.20"; + version = "5.7.22"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk"; + sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -26,14 +26,14 @@ self = stdenv.mkDerivation rec { outputs = [ "out" "static" ]; cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. "-DWITH_SSL=yes" "-DWITH_EMBEDDED_SERVER=yes" - "-DWITH_UNITTEST=no" + "-DWITH_UNIT_TESTS=no" "-DWITH_ZLIB=yes" "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" "-DWITH_FEDERATED_STORAGE_ENGINE=yes" - "-DCMAKE_VERBOSE_MAKEFILE=yes" "-DHAVE_IPV6=yes" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -45,6 +45,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_DOCREADMEDIR=share/mysql" "-DINSTALL_SUPPORTFILESDIR=share/mysql" "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share/mysql" ]; @@ -53,13 +54,10 @@ self = stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' - sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in ''; postInstall = '' - sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - install -vD $out/lib/*.a -t $static/lib - rm -r $out/mysql-test - rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a + moveToOutput "lib/*.a" $static ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} ''; From 11bf5db639e43e4399ed5bda292e866d929d447f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 29 May 2018 15:36:19 +0200 Subject: [PATCH 73/82] inkscape: fix build --- pkgs/applications/graphics/inkscape/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index de4849e2162..ae3de349412 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { rm "$out/share/icons/hicolor/icon-theme.cache" ''; + # 0.92.3 complains about an invalid conversion from const char * to char * + NIX_CFLAGS_COMPILE = " -fpermissive "; + meta = with lib; { license = "GPL"; homepage = https://www.inkscape.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0106586d03..fe4e0cc91f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16413,6 +16413,7 @@ with pkgs; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; + poppler = poppler_0_61; }; inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { }; From 1ac4be3052c7e78ed07cd6fc8e6150fec4c1db48 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 14:28:41 +0200 Subject: [PATCH 74/82] signal-desktop: use top-level gtk --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8258fa315db..b9c1c2a1db0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, atk, cairo, pango, gdk_pixbuf, glib, freetype, +{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev @@ -16,7 +16,7 @@ let gdk_pixbuf glib gnome3.gconf - gnome3.gtk2 + gtk2 pango libX11 libXScrnSaver From 6045fb6945d59776498e5529d2cd73edb8f95a7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 14:29:13 +0200 Subject: [PATCH 75/82] franz: use top-level gtk --- .../networking/instant-messengers/franz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 12b4bb54cfc..db3cafb355f 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook -, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 , gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver ]) ++ [ - gnome3.gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; From 59f86ab48d44e22dd0411093b2f55f9a969f7b53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 May 2018 14:31:35 +0200 Subject: [PATCH 76/82] gnome3: remove gtk2 from the attribute set --- pkgs/desktops/gnome-3/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 422dedbce85..d0c6558a611 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -52,7 +52,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 + inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; @@ -421,7 +421,6 @@ let gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 gnome-tweak-tool = gnome-tweaks; # added 2018-03-21 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libgames-support = libgnome-games-support; # added 2018-03-14 libgnome_keyring = libgnome-keyring; # added 2018-02-25 inherit (pkgs) rarian; # added 2018-04-25 From 06f1ae59713db2bd50647652677b5061d913b281 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 14:11:13 +0000 Subject: [PATCH 77/82] ccl: fix build after #28029 https://github.com/Clozure/ccl/blob/15d7e26377efa27eeb7086960f090f8c8ab5330e/lisp-kernel/linuxx8664/Makefile#L29 --- pkgs/development/compilers/ccl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index f3a4ff74aa0..9570b0eead8 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "Clozure Common Lisp"; homepage = https://ccl.clozure.com/; From 83c98f3656f42a1dda415bfaf8b4a9ac2412694c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 14:16:06 +0000 Subject: [PATCH 78/82] cmake_2_8: fix build after #28029 --- pkgs/development/tools/build-managers/cmake/2.8.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index e014276cd67..f6da92fe621 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; + hardeningDisable = [ "format" ]; + meta = { homepage = https://cmake.org; description = "Cross-Platform Makefile Generator"; From 2c92213cd2bb38bcf1a74169f5f615f93df8c49c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 14:19:39 +0000 Subject: [PATCH 79/82] dadadodo: fix build after #28029 --- pkgs/tools/text/dadadodo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 4a146accffc..dea8e15b540 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp dadadodo $out/bin ''; + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "Markov chain-based text generator"; homepage = http://www.jwz.org/dadadodo; From 1e97008bb8c3d736f197211c3c6563bd9a022124 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 15:06:38 +0000 Subject: [PATCH 80/82] luaPackages.mpack: fix build after #28029 --- pkgs/top-level/lua-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 41debeefc89..311bb1eb63f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -759,6 +759,8 @@ let "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}" ]; + hardeningDisable = [ "fortify" ]; + meta = with stdenv.lib; { description = "Lua bindings for libmpack"; homepage = "https://github.com/libmpack/libmpack-lua"; From e27df9e35e194521187fb7b9ecd36ade99ac5605 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 15:08:39 +0000 Subject: [PATCH 81/82] p0f: fix build after #28029 --- pkgs/tools/security/p0f/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 0b6a9644424..11e1f14baf9 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { cp ./tools/p0f-sendsyn6 $out/sbin ''; + hardeningDisable = [ "format" ]; + meta = { description = "Passive network reconnaissance and fingerprinting tool"; homepage = "http://lcamtuf.coredump.cx/p0f3/"; From 198c91de8510d3966dde7cd3fe25eb9143219dcc Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 15:10:00 +0000 Subject: [PATCH 82/82] pacparser: fix build after #28029 --- pkgs/tools/networking/pacparser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index 54b3cf8fd81..fbb17308f90 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { cd src ''; + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "A library to parse proxy auto-config (PAC) files"; homepage = http://pacparser.manugarg.com/;