From cc5d2810357d4882b22154aad92f1581076c6b1f Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 5 Jul 2018 23:49:08 +0200 Subject: [PATCH 01/72] lua-packages: define lua53Packages Set up lua packages for the v5.3.x interpreter. Blacklist the set of lua-packages (luabitop, luaexpat, luazip, luasqlite3) whose compilation fails against 5.3.4. The rest are at least building. Signed-off-by: Philipp Gesang --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/lua-packages.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7084b0a5fd2..36ca2cf6f966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7308,6 +7308,7 @@ with pkgs; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + lua53Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_3; }); luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luaPackages = lua52Packages; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 311bb1eb63f0..8f109c0fcb7d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -83,6 +83,8 @@ let buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx"; + disabled = isLua53; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace 10.4 10.5 ''; @@ -220,7 +222,7 @@ let EXPAT_INC="-I${expat.dev}/include"); ''; - disabled = isLuaJIT; + disabled = isLua53 || isLuaJIT; meta = with stdenv.lib; { description = "SAX XML parser based on the Expat library"; @@ -500,7 +502,7 @@ let patches = [ ../development/lua-modules/zip.patch ]; # Does not currently work under Lua 5.2 or LuaJIT. - disabled = isLua52 || isLuaJIT; + disabled = isLua52 || isLua53 || isLuaJIT; meta = with stdenv.lib; { description = "Lua library to read files stored inside zip files"; @@ -621,6 +623,8 @@ let sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b"; }; + disabled = isLua53; + buildInputs = [ sqlite ]; patches = [ ../development/lua-modules/luasql.patch ]; From 0b30f6940682234311fd87859009f5e030bf03aa Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Fri, 6 Jul 2018 00:06:48 +0200 Subject: [PATCH 02/72] lua-packages: update lpeg 0.12 -> 1.0.1 Signed-off-by: Philipp Gesang --- pkgs/top-level/lua-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 8f109c0fcb7d..9ef63bdd512e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -15,6 +15,7 @@ let isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; + isLua53 = lua.luaversion == "5.3"; isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; platformString = @@ -640,11 +641,11 @@ let lpeg = buildLuaPackage rec { name = "lpeg-${version}"; - version = "0.12"; + version = "1.0.1"; src = fetchurl { url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; - sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; + sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b"; }; preBuild = '' From 0de0ce58939932aee786679a86d08b5227732fab Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 8 Jul 2018 15:59:57 +0000 Subject: [PATCH 03/72] substitute(): --subst-var was silently coercing to "" if the variable does not exist. --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 87465df1482a..19dbdf8848e0 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -661,6 +661,10 @@ substituteStream() { echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 return 1 fi + if [ -z ${!varName+x} ]; then + echo "substituteStream(): ERROR: variable \$$varName is unset" >&2 + return 1 + fi pattern="@$varName@" replacement="${!varName}" ;; From 2c21a970e9e31d553405e59915c4519e5a9710c3 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 11 Jul 2018 07:30:28 +0200 Subject: [PATCH 04/72] lua5_3: update interpreter version 5.3.4 -> 5.3.5 Update to the most recent version of the 5.3 series that was released yesterday. Signed-off-by: Philipp Gesang --- pkgs/development/interpreters/lua-5/5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 5a4893db0637..85a9f8093bf4 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; - version = "${luaversion}.4"; + version = "${luaversion}.5"; src = fetchurl { url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; + sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; }; buildInputs = [ readline ]; From 2badf9a6f88e5620f428b55f3bdedfe041ebf76c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 30 Mar 2018 00:01:00 +0000 Subject: [PATCH 05/72] libffi: simplify using `checkInputs` --- pkgs/development/libraries/libffi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1c7c0715e75b..c35448066eea 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false +{ stdenv, fetchurl, fetchpatch , buildPlatform, hostPlatform, autoreconfHook +, doCheck ? true, dejagnu }: stdenv.mkDerivation rec { @@ -40,8 +41,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "info" ]; - buildInputs = stdenv.lib.optional doCheck dejagnu; - nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; configureFlags = [ @@ -54,6 +53,8 @@ stdenv.mkDerivation rec { NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} ''; + checkInputs = [ dejagnu ]; + inherit doCheck; dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. From acbee90e2becd4aa90412094df55c7a629da1435 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 30 Mar 2018 00:01:53 +0000 Subject: [PATCH 06/72] pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- pkgs/top-level/python-packages.nix | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index d5ee59ac2d92..83e369ec0fcd 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; }; - checkInputs = [ pytest pytest_xdist flaky mock ]; propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; + checkInputs = [ pytest pytest_xdist flaky mock ]; inherit doCheck; # https://github.com/DRMacIver/hypothesis/issues/300 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de4966ec9539..fd62c3adb949 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,11 +1923,8 @@ in { pytest = self.pytest_36; pytest_36 = callPackage ../development/python-modules/pytest { - hypothesis = self.hypothesis.override { - # hypothesis requires pytest that causes dependency cycle - doCheck = false; - pytest = null; - }; + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; }; # Needed for celery From 429d9988a3397e69505dbc432c758728cf0483a1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 20:23:32 -0500 Subject: [PATCH 07/72] utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9ec6c22d32a5..5290c398b2f0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,14 +5,14 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.32"; - patchVersion = ""; + patchVersion = "1"; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc"; + sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6"; }; patches = [ From 583bd3aeb657101379afb88f42a0ebaafc67ff9a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 20:34:12 -0500 Subject: [PATCH 08/72] busybox: 1.29.0 -> 1.29.1 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 06a2d4301596..e9f5f127dd39 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.0"; + name = "busybox-1.29.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8"; + sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From d6a9a93a6243ee42cf63b7c8dfcfb6fb1f0a9c9c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Jul 2018 21:00:30 -0500 Subject: [PATCH 09/72] bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ff99f7a7cbf6..f72ec76cc649 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.1-P2"; in +let version = "9.12.2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd"; + sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 6075fa8d0c71549821d2a110b84b834048a880a8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 13 Jul 2018 12:14:03 -0500 Subject: [PATCH 10/72] curl: 7.60.0 -> 7.61.0 --- pkgs/tools/networking/curl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 2ebae0b0c17f..06798bdcc281 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.60.0"; + name = "curl-7.61.0"; src = fetchurl { urls = [ - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" "https://curl.haxx.se/download/${name}.tar.bz2" + "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9"; + sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From a96380527f5fdf4ae9db48d19f8db188f5569fe4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 25 May 2018 23:51:04 +0000 Subject: [PATCH 11/72] mdds: fix tests --- pkgs/development/libraries/mdds/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 90d86ea9165c..43fee9ccead8 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, boost }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + checkInputs = [ boost ]; + meta = { inherit version; homepage = https://gitlab.com/mdds/mdds; From a3aedd137260f7ec67831c725e12fa80a940e1da Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 29 May 2018 02:32:26 +0000 Subject: [PATCH 12/72] git: disable checks as tests are run in installcheck --- .../version-management/git-and-tools/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 522a6fcd6a12..cb8d6a09503f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -238,6 +238,7 @@ EOF ## InstallCheck + doCheck = false; doInstallCheck = true; installCheckTarget = "test"; From 4d93021846cd04619c280d6fc9753ffc2c480514 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:26:31 +0000 Subject: [PATCH 13/72] libcommuni: disable checks as tests are run in installcheck --- pkgs/development/libraries/libcommuni/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 0788236b6017..f247c48821f7 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { # The tests fail on darwin because of install_name if they run # before the frameworks are installed. + doCheck = false; doInstallCheck = true; installCheckTarget = "check"; From 33a6533c120c113bca304816a09d8832b829fa44 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:05:51 +0000 Subject: [PATCH 14/72] gvfs: make tests run, but disable --- pkgs/development/libraries/gvfs/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 4f3bc64b5d40..7ac5b8756335 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -4,7 +4,7 @@ , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata +, libsecret, libgdata, python3 # Remove when switching back to meson , autoreconfHook, lzma, bzip2 }: @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; }; + postPatch = '' + patchShebangs test test-driver + ''; + # Uncomment when switching back to meson # postPatch = '' # chmod +x meson_post_install.py # patchShebangs requires executable file @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + checkInputs = [ python3 ]; + doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" + doInstallCheck = doCheck; + preFixup = '' for f in $out/libexec/*; do wrapProgram $f \ From d9c1aa465a8431685767ce57724de492376d2b52 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:34:04 +0000 Subject: [PATCH 15/72] librdf: make tests run, but disable --- pkgs/development/libraries/librdf/rasqal.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 07f560fe2724..124fd0178182 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: +{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }: stdenv.mkDerivation rec { name = "rasqal-0.9.33"; @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { postInstall = "rm -rvf $out/share/gtk-doc"; + checkInputs = [ perl ]; + doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..." + doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)" + meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = http://librdf.org/rasqal; From 02acff883991e6a1275a04c9838e72bcc5b17120 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 16 Jul 2018 16:34:34 +0000 Subject: [PATCH 16/72] neon, neon_0_29: make tests run, but disable --- pkgs/development/libraries/neon/0.29.nix | 5 ++++- pkgs/development/libraries/neon/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 10 ++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index e393d50bf9d2..dbde83c2d94b 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 2351e3b0800b..9c2a3265491a 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, pkgconfig +{ stdenv, fetchurl, libxml2, pkgconfig, perl , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; + checkInputs = [ perl ]; + doCheck = false; # fails, needs the net + meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e815305b539e..0c86f1ed12b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11068,15 +11068,9 @@ with pkgs; neardal = callPackage ../development/libraries/neardal { }; - neon = callPackage ../development/libraries/neon { - compressionSupport = true; - sslSupport = true; - }; + neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - compressionSupport = true; - sslSupport = true; - }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { }; nettle = callPackage ../development/libraries/nettle { }; From f7a6ea6fa6265304d6a94b9607d611da4d25bbb2 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 13 May 2018 01:06:49 +0000 Subject: [PATCH 17/72] ilmbase: disable tests on i686. Spooky! --- pkgs/development/libraries/ilmbase/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 956a8667be5f..156b4f72749a 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { patches = [ ./bootstrap.patch ]; + # fails 1 out of 1 tests with + # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" + # at least on i686. spooky! + doCheck = stdenv.isx86_64; + meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; From 589d05cd09bda981e22283315bbdf0649917b704 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 29 May 2018 02:32:55 +0000 Subject: [PATCH 18/72] ruby: disable tests --- pkgs/development/interpreters/ruby/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 89d394c87569..bd27041ba2d2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -135,6 +135,11 @@ let ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; + # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips" + # mostly TZ- and patch-related tests + # TZ- failures are caused by nix sandboxing, I didn't investigate others + doCheck = false; + preInstall = '' # Ruby installs gems here itself now. mkdir -pv "$out/${passthru.gemPath}" From 3d1a59a0b5a1b04747f5f57b9df34c465bd5a6d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Jul 2018 08:39:39 -0700 Subject: [PATCH 19/72] pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0ee17ffcc38b..1762b98984f7 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.6.0"; # with database from 2018-06-29 + name = "pciutils-3.6.1"; # with database from 2018-06-29 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j"; + sha256 = "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w"; }; nativeBuildInputs = [ pkgconfig ]; From 06de6dc71b6d676884d0d0baaa7d9f1475c41bce Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 18 Jul 2018 09:41:21 -0500 Subject: [PATCH 20/72] mesa: more include fixes mostly from void-linux (thanks!) --- pkgs/development/libraries/mesa/default.nix | 2 +- .../libraries/mesa/missing-include.patch | 11 ---- .../libraries/mesa/missing-includes.patch | 55 +++++++++++++++++++ 3 files changed, 56 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/missing-include.patch create mode 100644 pkgs/development/libraries/mesa/missing-includes.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9c0bf29d4908..62a31161d64f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -92,7 +92,7 @@ let self = stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch deleted file mode 100644 index dd3e6bb64af8..000000000000 --- a/pkgs/development/libraries/mesa/missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch new file mode 100644 index 000000000000..feb6ffe428c0 --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -0,0 +1,55 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include ++ + #define MAXTHREADS 1 + + struct threadpool { +--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include + #include + #else +--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include "util/u_atomic.h" + #include "util/list.h" + +--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +@@ -28,6 +28,8 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include ++ + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h" From 488d42b0d255bba147885b13d18385254abd3797 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 17 Jul 2018 22:51:26 -0500 Subject: [PATCH 21/72] npth: 1.5 -> 1.6 minor bump --- pkgs/development/libraries/npth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 203be8b6907b..c02998184fc5 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.5"; + name = "npth-1.6"; src = fetchurl { url = "mirror://gnupg/npth/${name}.tar.bz2"; - sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; + sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk"; }; doCheck = true; From 75162b1045b0bfdb9399de2db712b376d586ef4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:29:02 +0200 Subject: [PATCH 22/72] geoclue: drop --- .../development/libraries/geoclue/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/geoclue/default.nix diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix deleted file mode 100644 index bf0af502d017..000000000000 --- a/pkgs/development/libraries/geoclue/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib-networking }: - -stdenv.mkDerivation rec { - name = "geoclue-0.12.0"; - src = fetchurl { - url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz"; - sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - - propagatedBuildInputs = [dbus glib dbus-glib]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - sed -e '/-Werror/d' -i configure - ''; - - meta = with stdenv.lib; { - description = "Geolocation framework and some data providers"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl2; - }; - - passthru = { - updateInfo = { - downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/"; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 644f5d821e68..a7451517a9f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9232,8 +9232,6 @@ with pkgs; gtk = self.gtk2; }; - geoclue = callPackage ../development/libraries/geoclue {}; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { From 919a507cb2bcff3f449dbef57082e24c1a32827e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:30:10 +0200 Subject: [PATCH 23/72] geoclue2: move to default.nix --- pkgs/development/libraries/geoclue/{2.0.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/geoclue/{2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/default.nix similarity index 100% rename from pkgs/development/libraries/geoclue/2.0.nix rename to pkgs/development/libraries/geoclue/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7451517a9f0..1a55c07e88e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9232,7 +9232,7 @@ with pkgs; gtk = self.gtk2; }; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; + geoclue2 = callPackage ../development/libraries/geoclue {}; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; From a6dab86ada516b09096a77ff24b3b3291e80ef50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:44:15 +0200 Subject: [PATCH 24/72] =?UTF-8?q?geoclue2:=202.4.8=20=E2=86=92=202.4.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/geoclue/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index eb7a6d6aaf21..2588d7f3d547 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,48 +1,54 @@ -{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip -, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf +, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +, withDemoAgent ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-2.4.8"; + name = "geoclue-${version}"; + version = "2.4.10"; src = fetchurl { - url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; + url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook gobjectIntrospection + pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib json-glib libsoup geoip - dbus dbus-glib avahi - ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + buildInputs = [ + glib json-glib libsoup avahi + ] ++ optionals withDemoAgent [ + libnotify gdk_pixbuf + ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; + propagatedBuildInputs = [ glib glib-networking ]; - preConfigure = '' - substituteInPlace configure --replace "-Werror" "" - ''; - - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++ - optionals stdenv.isDarwin [ - "--disable-silent-rules" - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--disable-nmea-source" ]; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--enable-introspection" + "--enable-gtk-doc" + "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}" + ] ++ optionals stdenv.isDarwin [ + "--disable-silent-rules" + "--disable-3g-source" + "--disable-cdma-source" + "--disable-modem-gps-source" + "--disable-nmea-source" + ]; + # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 postInstall = '' sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - homepage = https://freedesktop.org/wiki/Software/GeoClue/; + homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; maintainers = with maintainers; [ raskin garbas ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; From ce408e8e75707f6e09ee0bd839127b8de3a1db45 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 10 Jul 2018 21:14:42 -0500 Subject: [PATCH 25/72] boost167: Add lockfree next_prior patch --- pkgs/development/libraries/boost/1.67.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 8b9e7ccca7f1..150272df6ca3 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,8 +1,14 @@ -{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args: +{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.67_0"; + patches = [ (fetchpatch { + url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch"; + sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; + stripLen = 1; + })]; + src = fetchurl { url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_66_0.html From 93c34c76163610ce60c4f0bc9278034205a01ddb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 15 Jul 2018 10:33:23 +0200 Subject: [PATCH 26/72] stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. --- .../interpreters/python/cpython/2.7/boot.nix | 2 +- pkgs/stdenv/darwin/default.nix | 36 +++++++++++++------ pkgs/top-level/all-packages.nix | 7 ---- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 79aa85def3c1..66f358e4b95b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, CF, configd, coreutils }: +{ stdenv, fetchurl, configd, CF, coreutils }: with stdenv.lib; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 366be3915802..b7b3640a9535 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -188,7 +188,18 @@ in rec { }; stage1 = prevStage: let - persistent = _: super: { python = super.python.override { configd = null; }; }; + persistent = self: super: with prevStage; { + cmake = super.cmake.override { + majorVersion = "3.9"; # FIXME: update ApplicationServices patch + isBootstrap = true; + useSharedLibraries = false; + }; + + python = super.callPackage ../../development/interpreters/python/cpython/2.7/boot.nix { + CF = null; # use CoreFoundation from bootstrap-tools + configd = null; + }; + }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraNativeBuildInputs = []; @@ -239,6 +250,9 @@ in rec { openssh sqlite sed serf openldap db cyrus-sasl expat apr-util findfreetype libssh curl cmake autoconf automake libtool cpio; + # Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds. + libxml2 = super.libxml2.override { pythonSupport = false; }; + llvmPackages_5 = super.llvmPackages_5 // (let libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) libcxx libcxxabi; @@ -281,6 +295,15 @@ in rec { ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; + # Hack to make sure we don't link ncurses in bootstrap tools. The proper + # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, + # quite a sledgehammer just to get the C runtime. + gettext = super.gettext.overrideAttrs (drv: { + configureFlags = drv.configureFlags ++ [ + "--disable-curses" + ]; + }); + llvmPackages_5 = super.llvmPackages_5 // (let tools = super.llvmPackages_5.tools.extend (llvmSelf: _: { inherit (llvmPackages_5) llvm clang-unwrapped; @@ -303,16 +326,7 @@ in rec { extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - overrides = lib.composeExtensions persistent (self: super: { - # Hack to make sure we don't link ncurses in bootstrap tools. The proper - # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, - # quite a sledgehammer just to get the C runtime. - gettext = super.gettext.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - "--disable-curses" - ]; - }); - }); + overrides = persistent; }; stdenvDarwin = prevStage: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8c41b9975da..507080514acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6873,13 +6873,6 @@ with pkgs; inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.isDarwin && hostPlatform == buildPlatform) { - cmake = buildPackages.cmake.override { - isBootstrap = true; - majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found - }; - libxml2 = libxml2.override { pythonSupport = false; }; - python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); From 1e41fc8ded01e5b6c6281df1f3aa400f91ae92ad Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 13:55:21 -0400 Subject: [PATCH 27/72] dejavu-fonts: supports everything the .ttf file is cross platform. --- pkgs/data/fonts/dejavu-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 251654e2d58d..fa877ea6ed53 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -20,7 +20,7 @@ let # See http://dejavu-fonts.org/wiki/License for details license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; full-ttf = stdenv.mkDerivation { From 92daacc9b041cf8aff5c03857b9d9d9f46052df5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 13:56:15 -0400 Subject: [PATCH 28/72] libxml2: support all platforms Mingw/Windows support works out of the box. --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8a3d7abdfa57..ce696bca11b8 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; license = lib.licenses.mit; - platforms = lib.platforms.unix; + platforms = lib.platforms.all; maintainers = [ lib.maintainers.eelco ]; }; } From ef087554d0fad9f8e20d9c071976ce0fd273d37a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 13:57:16 -0400 Subject: [PATCH 29/72] libxslt: runs on all platforms Mingw/Windows support works out of the box. --- pkgs/development/libraries/libxslt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1bb90ee195da..a6cba9867695 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; maintainers = [ maintainers.eelco ]; }; } From 1061ab1ccfd3b943885f88cf8f49b95be3a744c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 22 Jul 2018 00:12:54 +0900 Subject: [PATCH 30/72] todiff: 0.5.0 -> 0.6.1 --- pkgs/applications/misc/todiff/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 6af7fae34972..148d6b042f7b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { name = "todiff-${version}"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Ekleog"; repo = "todiff"; rev = version; - sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk"; + sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp"; + cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr"; + + checkPhase = "cargo test --features=integration_tests"; meta = with stdenv.lib; { description = "Human-readable diff for todo.txt files"; From 9882d5635c77353cda6e569e1b97a778dcc50c48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 08:39:53 -0700 Subject: [PATCH 31/72] tlaplusToolbox: 1.5.6 -> 1.5.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tla-toolbox/versions. --- pkgs/applications/science/logic/tlaplus/toolbox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 5ce359dea0ec..342d91cf5825 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -3,7 +3,7 @@ }: let - version = "1.5.6"; + version = "1.5.7"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -24,7 +24,7 @@ in stdenv.mkDerivation { name = "tla-toolbox-${version}"; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9"; + sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; }; buildInputs = [ makeWrapper ]; From 2bf47aa2b8f8afb3e1a9dda71bbaea1d05202627 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 21 Jul 2018 17:45:08 +0200 Subject: [PATCH 32/72] orgit: add git to native build inputs --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 3d4321586515..e8e69dcfbb30 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -151,6 +151,13 @@ self: # missing OCaml ocp-indent = markBroken super.ocp-indent; + orgit = + (super.orgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # upstream issue: missing dependency org-readme = markBroken super.org-readme; From 83cfb086547b6152387f64bb3cacad99fe882135 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 08:55:50 -0700 Subject: [PATCH 33/72] tiled: 1.1.5 -> 1.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tiled/versions. --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index b23db38e0f45..982e189583ea 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v"; + sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 564e733a520f81ccdeccf7ceb2113594df532772 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 09:12:39 -0700 Subject: [PATCH 34/72] wireshark-gtk: 2.6.1 -> 2.6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireshark-gtk/versions. --- 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 ef1dade4dddd..dbd6a93d68fa 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.6.1"; + version = "2.6.2"; 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 = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"; + sha256 = "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9"; }; cmakeFlags = [ From 6c7e93c54ace3a7c6b6e8b53d2b9060e7fa38d42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 10:14:49 -0700 Subject: [PATCH 35/72] sidplayfp: 1.4.3 -> 1.4.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sidplayfp/versions. --- pkgs/applications/audio/sidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 2495759593cf..b857c5b68358 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libsidplayfp }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "sidplayfp-${version}"; src = fetchurl { url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz"; - sha256 = "04gqhxs4w0riabp1svgcs6gsxdmbfmrs4kaqr5lifvxjvv03vzsn"; + sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; }; nativeBuildInputs = [ pkgconfig ]; From c04fb0a9c55aca2b4b24c252dbe62909e8036f87 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Jul 2018 16:31:05 +0000 Subject: [PATCH 36/72] far2l: 2018-02-27 -> 2018-07-19 --- .../far2l/add-nix-syntax-highlighting.patch | 158 ------------------ pkgs/applications/misc/far2l/default.nix | 22 ++- 2 files changed, 14 insertions(+), 166 deletions(-) delete mode 100644 pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch deleted file mode 100644 index a50070c4eadd..000000000000 --- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc -new file mode 100644 -index 0000000..1bd9bb5 ---- /dev/null -+++ b/colorer/configs/base/hrc/nix.hrc -@@ -0,0 +1,132 @@ -+ -+ -+ -+ -+ -+ -+ -+ Nix -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc -index 11e493b..2a67263 100644 ---- a/colorer/configs/base/hrc/proto.hrc -+++ b/colorer/configs/base/hrc/proto.hrc -@@ -156,6 +156,14 @@ - - /\.(w?lua)$/i - -+ -+ -+ /\.(nix)$/i -+ -+ -+ -+ -+ - - - /\.(rb|rbw|ruby|rake)$/i diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index d8a0c53d9e1a..3cdd4fb0bfe9 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: with stdenv.lib; stdenv.mkDerivation rec { - rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a"; - build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}"; + build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; - rev = rev; - sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b"; + rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; + sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; @@ -19,10 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 glib pcre ] ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - patches = [ ./add-nix-syntax-highlighting.patch ]; - postPatch = optionalString stdenv.isLinux '' - substituteInPlace far2l/bootstrap/open.sh \ + substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' '' + optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ @@ -44,6 +41,15 @@ stdenv.mkDerivation rec { --replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' + + ( cd colorer/configs/base + patch -p2 < ${ fetchpatch { + name = "nix-language-highlighting.patch"; + url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; + sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; + } + } + ) ''; installPhase = '' From 7ffed91faf7ae50573e08690d3f1963d827575a5 Mon Sep 17 00:00:00 2001 From: Oyren Date: Sat, 21 Jul 2018 20:20:12 +0200 Subject: [PATCH 37/72] write_stylus: add desktop icon (#43864) --- .../applications/graphics/write_stylus/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 231a9799b59f..9fd464f46204 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "Write"; exec = "Write"; - comment = "a word processor for hadwriting"; + comment = "A word processor for handwriting"; + icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; categories = "Office;Graphics"; @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { url = "http://www.styluslabs.com/write/write${version}.tar.gz"; sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; }; + + # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon + # license: Free for commercial use + icon = fetchurl { + url = "https://oyra.eu/write/icon.tar.gz"; + sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8"; + }; + sourceRoot = "."; dontBuild = true; @@ -26,6 +35,9 @@ stdenv.mkDerivation rec { # symlink the binary to bin/ ln -s $out/Write/Write $out/bin/Write + # untar icons + tar -xzf ${icon} *.tar.gz -C $out/ + mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; From 0262431889319d92ffd926cee79e00b00d85219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Jul 2018 20:46:42 +0200 Subject: [PATCH 38/72] Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7. Patching should no longer be needed with 3.6.1. --- pkgs/tools/system/pciutils/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index db4376affba1..1762b98984f7 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -22,16 +22,6 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; - # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path). - # This is documented to be equivalent, see `man 3 canonicalize_file_name`. - # Fixes w/musl. - # Upstream PR: https://github.com/pciutils/pciutils/pull/6 - postPatch = '' - substituteInPlace lib/sysfs.c \ - --replace "canonicalize_file_name(path)" \ - "realpath(path, NULL)" - ''; - # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; From ec67dfb40aac25ac813fec0867f879394c849f9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 12:23:19 -0700 Subject: [PATCH 39/72] powershell: 6.0.2 -> 6.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/powershell/versions. --- pkgs/shells/powershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a053884bb885..3b711f6d863f 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf" - else if stdenv.isLinux then "000mmv5iblnmwydfdvg5izli3vpb6l14xy4qy3smcikpf0h87fhl" + else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.2"; + version = "6.0.3"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; From 668047ca55f17dd932e815e73bb567346e412e5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 12:28:41 -0700 Subject: [PATCH 40/72] picard-tools: 2.18.9 -> 2.18.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions. --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index eea889cb4ab7..a08a54c94ecd 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.9"; + version = "2.18.10"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0mmyzw75szjycncrgilj1kly3ldawqndxy59059qc8ddbiwn1zky"; + sha256 = "1px5ar6iizm4czpc66hyyafandw6g9x9s1abj8klc78alvihciw4"; }; buildInputs = [ jre makeWrapper ]; From f1349908a60a5684457b6c3a729900386d342a74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 12:33:09 -0700 Subject: [PATCH 41/72] peru: 1.1.3 -> 1.1.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/peru/versions. --- pkgs/applications/version-management/peru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 3ac52a5c4403..225dd367609f 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; rev = "${version}"; - sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727"; + sha256 = "0mzmi797f2h2wy36q4ab701ixl5zy4m0pp1wp9abwdfg2y6qhmnk"; }; propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; From 420a813b93e1af08229def08688a0d61e3ed8448 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 13:02:09 -0700 Subject: [PATCH 42/72] passExtensions.pass-import: 2.2 -> 2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pass-import/versions. --- pkgs/tools/security/pass/extensions/import.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 9e69cf376210..0ee775bfbe8b 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation rec { name = "pass-import-${version}"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-import"; rev = "v${version}"; - sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq"; + sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv"; }; nativeBuildInputs = [ makeWrapper ]; From e975814b19ba8cb8052a60f18de2ee4aebe1190b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 13:12:12 -0700 Subject: [PATCH 43/72] ocamlPackages.utop: 2.1.0 -> 2.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utop/versions. --- pkgs/development/tools/ocaml/utop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 74f450a9e3ac..1341e071842b 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -7,12 +7,12 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y"; + sha256 = "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4"; }; nativeBuildInputs = [ makeWrapper ]; From 8ef4bf669caf56fb9139bb4c7aaef2336a5c8472 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 13:24:45 -0700 Subject: [PATCH 44/72] ola: 0.10.6 -> 0.10.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ola/versions. --- pkgs/applications/misc/ola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 9e460bf2611a..792cff818655 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63"; + sha256 = "18krwrw7w1qzwih8gnmv7r4sah5ppvq7ax65r7l5yjxn3ihwp2kf"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; From 24596d7a4a4b07bd9ce3ad748b8dabf5957003c5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 21 Jul 2018 16:22:17 +0300 Subject: [PATCH 45/72] binutils-wrapper: Try to avoid adding unnecessary -L flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar --- pkgs/build-support/bintools-wrapper/setup-hook.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 025f6aa6e7aa..f65b792485a0 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -20,7 +20,13 @@ bintoolsWrapper_addLDVars () { fi if [[ -d "$1/lib" ]]; then - export NIX_${role_pre}LDFLAGS+=" -L$1/lib" + # Don't add the /lib directory if it actually doesn't contain any libraries. For instance, + # Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or + # $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary + # directories and bloats the size of the environment variable space. + if [[ -n "$(echo $1/lib/lib*)" ]]; then + export NIX_${role_pre}LDFLAGS+=" -L$1/lib" + fi fi } From 7f6ebfe84d17498cddca146a28c46df3a91cdfeb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 13:32:42 -0700 Subject: [PATCH 46/72] opencollada: 1.6.62 -> 1.6.63 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opencollada/versions. --- pkgs/development/libraries/opencollada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index fb1199367037..a0a39980d45d 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.62"; + version = "1.6.63"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r"; + sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1"; }; nativeBuildInputs = [ pkgconfig ]; From 0e0f49438e8fd40e3f0d03517ea5edaa144e69f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 13:44:41 -0700 Subject: [PATCH 47/72] owncloud-client: 2.4.1 -> 2.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/owncloud-client/versions. --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 17c5cc86fa6b..d5966845a0b7 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23"; + sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5"; }; patches = [ ./find-sql.patch ]; From 3530c39b97ac4b587279933c404b64b7d69014f9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 21:14:28 -0400 Subject: [PATCH 48/72] ncurses: add windows configure flags these two flags are needed for windows support to work - sp-funcs - term-driver --- pkgs/development/libraries/ncurses/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cf478837b86d..042c09fd8644 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -34,7 +34,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional unicode "--enable-widec" ++ lib.optional enableStatic "--enable-static" ++ lib.optional (!withCxx) "--without-cxx" - ++ lib.optional (abiVersion == "5") "--with-abi-version=5"; + ++ lib.optional (abiVersion == "5") "--with-abi-version=5" + ++ lib.optionals hostPlatform.isWindows [ + "--enable-sp-funcs" + "--enable-term-driver" + ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; From 522b61a069b1a856df23c558f780216b38aa5ed9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 21:49:53 -0400 Subject: [PATCH 49/72] openssl: work with mingw32 --- pkgs/development/libraries/openssl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0251de77d03e..47467ce4edec 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -45,7 +45,9 @@ let if hostPlatform == buildPlatform then "./config" else if hostPlatform.isMinGW - then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}" + then "./Configure mingw${optionalString + (hostPlatform.parsed.cpu.bits != 32) + (toString hostPlatform.parsed.cpu.bits)}" else if hostPlatform.isLinux then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}" else if hostPlatform.isiOS From 53cb8dc09e56591fba8db76d3187a99e492f8d56 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 22:00:58 -0400 Subject: [PATCH 50/72] windows.libgnurx: init --- pkgs/os-specific/windows/libgnurx/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/os-specific/windows/libgnurx/default.nix diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix new file mode 100644 index 000000000000..f50a0d9f503e --- /dev/null +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl }: + +let + version = "2.5.1"; +in stdenv.mkDerivation rec { + name = "libgnurx-${version}"; + src = fetchurl { + url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; + sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d2d5aaa565..de255678ca29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14546,6 +14546,8 @@ with pkgs; }; wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; + + libgnurx = callPackage ../os-specific/windows/libgnurx { }; }; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; From 09fed91ec8e084c4cdfd9e2363d65e8bb7c48091 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 22:02:00 -0400 Subject: [PATCH 51/72] file: build on windows --- pkgs/tools/misc/file/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index aeb43d7c1151..485f46d03144 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, zlib }: +{ stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { name = "file-${version}"; @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; + makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file" + else null; meta = with stdenv.lib; { homepage = http://darwinsys.com/file; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de255678ca29..5c0e1ddb26e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2387,7 +2387,9 @@ with pkgs; figlet = callPackage ../tools/misc/figlet { }; - file = callPackage ../tools/misc/file { }; + file = callPackage ../tools/misc/file { + inherit (windows) libgnurx; + }; filegive = callPackage ../tools/networking/filegive { }; From b98b4eac71cfb0ccedc6d909fd58058bc1cb85e7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 20 Jul 2018 22:43:55 -0400 Subject: [PATCH 52/72] tests: add some cross tests --- pkgs/test/cross/default.nix | 80 +++++++++++++++++++++++++++++++++++++ pkgs/test/default.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/test/cross/default.nix diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix new file mode 100644 index 000000000000..6f41447ca76a --- /dev/null +++ b/pkgs/test/cross/default.nix @@ -0,0 +1,80 @@ +{ pkgs, pkgsCross, lib }: + +let + + emulators = { + mingw32 = "WINEDEBUG=-all ${pkgs.winePackages.minimal}/bin/wine"; + mingwW64 = "WINEDEBUG=-all ${pkgs.wineWowPackages.minimal}/bin/wine"; + # TODO: add some qemu-based emulaltors here + }; + + getExecutable = pkgs: pkgFun: exec: + "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}"; + + compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let + pkgName = (pkgFun hostPkgs).name; + args' = lib.concatStringsSep " " args; + in pkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { + nativeBuildInputs = [ pkgs.dos2unix ]; + } '' + HOME=$(pwd) + mkdir -p $out + + # We need to remove whitespace, unfortunately + # Windows programs use \r but Unix programs use \n + + # find expected value natively + ${getExecutable hostPkgs pkgFun exec} ${args'} \ + | dos2unix > $out/expected + + # run emulator to get actual value + ${emulator} ${getExecutable crossPkgs pkgFun exec} ${args'} \ + | dos2unix > $out/actual + + if [ "$(cat $out/actual)" != "$(cat $out/expected)" ]; then + echo "${pkgName} did not output expected value:" + cat $out/expected + echo "instead it output:" + cat $out/actual + exit 1 + else + echo "${pkgName} test passed" + echo "both produced output:" + cat $out/actual + fi + ''; + +in + +lib.mapAttrs (name: emulator: let + crossPkgs = pkgsCross.${name}; + + # Apply some transformation on windows to get dlls in the right + # place. Unfortunately mingw doesn’t seem to be able to do linking + # properly. + platformFun = pkg: if crossPkgs.hostPlatform.isWindows then + pkgs.buildEnv { + name = "${pkg.name}-winlinks"; + paths = [pkg] ++ pkg.buildInputs; + } else pkg; +in { + + hello = compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/hello"; + pkgFun = pkgs: pkgs.hello; + }; + + file = compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/file"; + args = [ + "${pkgs.file}/share/man/man1/file.1.gz" + "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf" + ]; + pkgFun = pkgs: platformFun pkgs.file; + }; + +}) emulators diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 38f6cb8e564e..d2e8e1c7314b 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -23,4 +23,6 @@ with pkgs; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; macOSSierraShared = callPackage ./macos-sierra-shared {}; + + cross = callPackage ./cross {}; } From bc4c0c4f4d5e6ec52a8001443c3fe6ce00220697 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 21 Jul 2018 17:09:21 -0400 Subject: [PATCH 53/72] pythonPackages.plaid-python: 2.3.0 -> 2.3.3 (#43905) --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 3676c676cc60..afbb5e2b567c 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.3"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97"; + sha256 = "0jblc0bvzcns1dmsax6n0cvdg8867hm7snvdxa2l7v305h6gssjw"; }; checkInputs = [ pytest ]; From 4c1eb7fbe6cc2275b7aaa5091ace442115ae8602 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 14:18:00 -0700 Subject: [PATCH 54/72] neovim-unwrapped: 0.3.0 -> 0.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neovim-unwrapped/versions. --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f47688b82802..3d9822a92a7f 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -11,13 +11,13 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "10c8y309fdwvr3d9n6vm1f2c0k6pzicnhc64l2dvbw1lnabp04vv"; + sha256 = "19jy9nr2ffscli6wsysqkdvqvh7sgkkwhzkw3yypfrvg4pj9rl56"; }; enableParallelBuilding = true; From dc9018dfa29a7df50e4ad51c60db5bf2e5cd980b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 21 Jul 2018 17:36:22 -0400 Subject: [PATCH 55/72] libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. --- pkgs/development/libraries/libffi/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index c35448066eea..6f1aeefa6758 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, fetchpatch , buildPlatform, hostPlatform, autoreconfHook -, doCheck ? true, dejagnu + +# libffi is used in darwin stdenv +# we cannot run checks within it +, doCheck ? !stdenv.isDarwin, dejagnu }: stdenv.mkDerivation rec { From 983abe10e2faaeea42dfc811043621fb65cd8b0b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Jul 2018 21:20:01 +0000 Subject: [PATCH 56/72] "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook --- pkgs/applications/editors/geany/default.nix | 8 ++------ pkgs/applications/graphics/dia/default.nix | 10 ++-------- pkgs/applications/graphics/glabels/default.nix | 5 ++--- pkgs/applications/graphics/inkscape/default.nix | 10 ++++------ .../networking/newsreaders/liferea/default.nix | 5 ++--- .../networking/p2p/transmission/default.nix | 9 +++------ pkgs/applications/office/gnucash/2.4.nix | 5 ++--- pkgs/applications/office/gnucash/2.6.nix | 6 ++---- pkgs/applications/video/handbrake/default.nix | 7 +------ pkgs/desktops/xfce/applications/orage.nix | 5 +---- pkgs/desktops/xfce/applications/xfce4-notifyd.nix | 5 ++--- pkgs/desktops/xfce/core/thunar-build.nix | 5 ++--- pkgs/desktops/xfce/core/thunar-volman.nix | 5 ++--- .../xfce/panel-plugins/xfce4-battery-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-clipman-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-cpufreq-plugin.nix | 6 ++---- .../xfce/panel-plugins/xfce4-cpugraph-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-netload-plugin.nix | 5 ++--- .../xfce/panel-plugins/xfce4-pulseaudio-plugin.nix | 6 ++---- .../xfce/panel-plugins/xfce4-weather-plugin.nix | 6 ++---- pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 5 ++--- pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix | 6 ++---- 22 files changed, 45 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 799f58e5b68c..ed77e6f4b471 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool libintl ]; - buildInputs = [ gtk2 which file ]; + buildInputs = [ gtk2 which file hicolor-icon-theme ]; doCheck = true; @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs ."; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { description = "Small and lightweight IDE"; longDescription = '' diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index ef63cb97a735..949dce7132be 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, +libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] + libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 2d4fa882dd61..c9d758e7bab8 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig, which, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { barcode gtk3 gtk-doc gnome3.yelp-tools gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool - + hicolor-icon-theme ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" wrapProgram "$out/bin/glabels-3" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 639f1928f8a4..935af0cfc88c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,7 +2,7 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme }: let @@ -44,15 +44,13 @@ stdenv.mkDerivation rec { libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + libvisio libcdr libexif potrace hicolor-icon-theme ]; enableParallelBuilding = true; - postInstall = '' - # Make sure PyXML modules can be found at run-time. - rm -f "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Make sure PyXML modules can be found at run-time. + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 74d59c05ec91..a82891a8f35f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib-networking +, gobjectIntrospection, glib-networking, hicolor-icon-theme }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection - librsvg glib-networking libnotify + librsvg glib-networking libnotify hicolor-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); @@ -28,7 +28,6 @@ in stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d8fc1d840d2b..8627ccb70ffd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib +, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux , enableDaemon ? true @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; + ++ optionals stdenv.isLinux [ inotify-tools ] + ++ optionals enableGTK3 [ hicolor-icon-theme ]; postPatch = '' substituteInPlace ./configure \ @@ -39,10 +40,6 @@ stdenv.mkDerivation rec { ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; - preFixup = optionalString enableGTK3 '' - rm "$out/share/icons/hicolor/icon-theme.cache" - ''; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix index 252c6d878d0c..b4e962ce3fcf 100644 --- a/pkgs/applications/office/gnucash/2.4.nix +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gconf ]; @@ -49,8 +50,6 @@ stdenv.mkDerivation rec { --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; # The following settings fix failures in the test suite. It's not required otherwise. diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 4d85374ee9a6..471d2d757d96 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -3,7 +3,7 @@ , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers -, pango, gdk_pixbuf +, pango, gdk_pixbuf, hicolor-icon-theme }: /* @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libxml2 libxslt glibcLocales gettext swig enchant bzip2 isocodes # glib, gtk... - glib gtk2 goffice webkit + glib gtk2 goffice webkit hicolor-icon-theme # gnome... dconf gconf libgnomecanvas gsettings-desktop-schemas # financial @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; # The following settings fix failures in the test suite. It's not required otherwise. diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 0d0ac0a2e947..b0c0251b97cf 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev - libgudev + libgudev hicolor-icon-theme ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ++ lib.optional useFdk fdk_aac; @@ -82,11 +82,6 @@ stdenv.mkDerivation rec { cd build ''; - # icon-theme.cache belongs in the icon theme, not in individual packages - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for converting video files and ripping DVDs"; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 2c99bad8156b..72d8e682c862 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata -, libnotify, popt, xfce -}: +, libnotify, popt, xfce, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -35,8 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; - meta = { homepage = http://www.xfce.org/projects/; description = "A simple calendar application with reminders"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index a0856b6a6d7b..19ecff290933 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libnotify -, gtk , libxfce4util, libxfce4ui, xfconf }: +, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; + buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache # to be able to run the daemon we need it in PATH ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin ''; diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index 5f8cc71de851..0b606ee5fdd7 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook +, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { intltool gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4-panel + hicolor-icon-theme ]; # TODO: optionality? enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index a3b8a619f174..39214ca57b1f 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, xfconf, udev, libgudev, libnotify }: +, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "thunar-volman"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util - xfconf libnotify + xfconf libnotify hicolor-icon-theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index c64e8770d256..6399aa3cc20d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 236c71c66d56..cb32d5676437 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index 0a309c433e95..07838f8fe7c9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "CPU Freq load plugin for Xfce panel"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index c5487198f97e..8048a8570298 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index a843f0223c4e..e82669cc1a35 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix index 1b963237c02c..6f6f5699b6e9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf -, gtk3, libpulseaudio +, gtk3, libpulseaudio, hicolor-icon-theme , withKeybinder ? true, keybinder3 , withLibnotify ? true, libnotify }: @@ -21,12 +21,10 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ] + buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ] ++ optional withKeybinder keybinder3 ++ optional withLibnotify libnotify; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Adjust the audio volume of the PulseAudio sound system"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 03f062532ead..15cd526d6def 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4-panel }: +libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,12 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel ]; + xfce4-panel hicolor-icon-theme ]; enableParallelBuilding = true; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Weather plugin for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 9783e6c9228f..dd1fd4636689 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -2,7 +2,7 @@ , gtk , thunarx-2-dev , exo, libxfce4util, libxfce4ui -, xfconf, udev, libnotify +, xfconf, udev, libnotify, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { xfce4-dev-tools thunarx-2-dev exo gtk libxfce4util libxfce4ui - xfconf udev libnotify + xfconf udev libnotify hicolor-icon-theme ]; preConfigure = '' @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { pushd $out/libexec/thunar-archive-plugin > /dev/null ln -s ./file-roller.tap org.gnome.FileRoller.tap popd > /dev/null - rm $out/share/icons/hicolor/icon-theme.cache ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index d44281d052d1..8f8e96d594fa 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunarx-2-dev, python2 +, thunarx-2-dev, python2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk - thunarx-2-dev python2 + thunarx-2-dev python2 hicolor-icon-theme ]; configurePhase = "python2 waf configure --prefix=$out"; @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { python2 waf install ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - enableParallelBuilding = true; meta = with stdenv.lib; { From 0cf09556ebdfe5f393ee1f2033aacd9169853894 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 18 Jul 2018 02:57:55 +0200 Subject: [PATCH 57/72] why3: 0.88.3 -> 1.0.0 --- pkgs/applications/science/logic/why3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 202d52f0cc0e..1ccc365498ce 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.88.3"; + version = "1.0.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz; - sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy"; + url = https://gforge.inria.fr/frs/download.php/file/37604/why3-1.0.0.tar.gz; + sha256 = "18h00diw1c051v7ya0lv09ns5630qi9savwffx0652mcc4b4qpxn"; }; buildInputs = (with ocamlPackages; [ - ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++ + ocaml findlib num lablgtk ocamlgraph zarith menhir ]) ++ stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [ coq coq.camlp5 ]; From a651155e4956c056a4a0da4cc4bd553dda025e93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 17:47:11 -0700 Subject: [PATCH 58/72] graylog: 2.4.5 -> 2.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/graylog/versions. --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 60e7f273a338..bcc4674ac0f0 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "2.4.5"; + version = "2.4.6"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0yb8r7f64s1m83dqw64yakxmlyn7d3kdi2rd9mpw3rnz4kqcarly"; + sha256 = "07bm5zz6b58ig082l6rwvvryh7svkv8nxp0d6izjka5f7x6g9ypw"; }; dontBuild = true; From a7a3526f71e8e8f44258213f186d7d51557ec4f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 17:57:51 -0700 Subject: [PATCH 59/72] gtkwave: 3.3.91 -> 3.3.92 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions. --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 3583c3dbd19c..d4cf7f5ea907 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.91"; + version = "3.3.92"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942"; + sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak"; }; nativeBuildInputs = [ pkgconfig ]; From b49dada76c24bdd44f0593e80c3e8466c0ceab8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 18:31:47 -0700 Subject: [PATCH 60/72] feh: 2.27 -> 2.27.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/feh/versions. --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 4ec4b76ac047..91d5d2f14678 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.27"; + version = "2.27.1"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0kn6cka9m76697i495npd60ad64jnfnzv5z6znzyr0vlxx2nhcmg"; + sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf"; }; outputs = [ "out" "man" "doc" ]; From 7968bf49352807ead99c1d6e568767a4e2855c3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 18:56:13 -0700 Subject: [PATCH 61/72] focuswriter: 1.6.14 -> 1.6.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions. --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 997a4bd253c0..706f2f015b12 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1n8ni4bnw5vs7jx28v8r1vk69g2m1q5h9s6xpf8c0bxbcwwg2m5i"; + sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 22 Jul 2018 02:03:24 +0000 Subject: [PATCH 62/72] treewide: fix build with disallowed aliases (#43872) fixes build with disallowed aliases --- lib/strings.nix | 2 +- maintainers/scripts/nix-generate-from-cpan.nix | 2 +- .../display-managers/lightdm-greeters/gtk.nix | 4 ++-- pkgs/applications/audio/abcde/default.nix | 4 ++-- pkgs/applications/audio/lollypop/default.nix | 4 ++-- pkgs/applications/graphics/shutter/default.nix | 4 ++-- pkgs/applications/misc/yarssr/default.nix | 2 +- .../networking/browsers/eolie/default.nix | 2 +- .../feedreaders/feedreader/default.nix | 4 ++-- .../remote/citrix-receiver/default.nix | 2 +- .../networking/transporter/default.nix | 4 ++-- .../office/libreoffice/default.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- .../git-and-tools/default.nix | 5 ++--- .../window-managers/i3/default.nix | 2 +- .../gnome-3/games/gnome-mines/default.nix | 4 ++-- .../gnome-3/games/gnome-nibbles/default.nix | 4 ++-- .../gnome-3/games/gnome-robots/default.nix | 4 ++-- .../xfce/thunar-plugins/archive/default.nix | 4 ++-- .../xfce/thunar-plugins/dropbox/default.nix | 4 ++-- pkgs/desktops/xfce4-13/orage/default.nix | 6 +++--- .../haskell-modules/hackage-packages.nix | 6 +++--- pkgs/development/libraries/flatpak/default.nix | 2 +- .../libraries/libguestfs/default.nix | 4 ++-- pkgs/development/tools/misc/hydra/default.nix | 3 +-- pkgs/development/web/postman/default.nix | 2 +- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/servers/foswiki/default.nix | 2 +- pkgs/servers/mail/dkimproxy/default.nix | 4 ++-- pkgs/servers/mail/dspam/default.nix | 4 ++-- .../monitoring/fusion-inventory/default.nix | 2 +- pkgs/servers/monitoring/longview/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 10 +++++----- pkgs/servers/openxpki/default.nix | 12 ++++++------ pkgs/servers/slimserver/default.nix | 4 ++-- pkgs/tools/misc/arp-scan/default.nix | 2 +- pkgs/tools/misc/lbdb/default.nix | 4 ++-- pkgs/tools/misc/pipelight/default.nix | 5 ++--- pkgs/tools/networking/smbldaptools/default.nix | 4 ++-- pkgs/tools/networking/smokeping/default.nix | 4 ++-- .../appimage-run/default.nix | 2 +- pkgs/tools/security/john/default.nix | 4 ++-- pkgs/tools/security/signing-party/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 2 -- pkgs/tools/typesetting/biber/default.nix | 4 ++-- .../virtualization/linode-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 18 +++++++++--------- pkgs/top-level/perl-packages.nix | 1 - 48 files changed, 91 insertions(+), 97 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index e09ec42bfea2..7cd09a109396 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -121,7 +121,7 @@ rec { Example: pkgs = import { } - makePerlPath [ pkgs.perlPackages.NetSMTP ] + makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 82d9ad6077a2..ec406ac1a703 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; buildInputs = with perlPackages; [ - makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly Log4Perl + makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 385f20b7e066..cfa38f175dd3 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-standard; - defaultText = "pkgs.gnome3.gnome-themes-standard"; + default = pkgs.gnome3.gnome-themes-extra; + defaultText = "pkgs.gnome3.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 04ee72edc36e..7f2080c6fd63 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 , lame, flac, glyr -, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID +, perl, MusicBrainz, MusicBrainzDiscID , makeWrapper }: let version = "2.8.1"; @@ -35,7 +35,7 @@ in buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; + propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; installFlags = [ "sysconfdir=$(out)/etc" ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 1c58f4f79cd9..dc59ba6e01ab 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -2,7 +2,7 @@ , appstream-glib, desktop-file-utils, gobjectIntrospection , python36Packages, gnome3, glib, gst_all_1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "0.9.521"; name = "lollypop-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib ] ++ (with gnome3; [ - gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 1f41253b6994..a409060afdc6 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -7,9 +7,9 @@ let [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext - ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON + ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS - CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 2c569b7d6816..a8ff981400a9 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -16,7 +16,7 @@ let ClassSingleton URI AnyEvent AnyEventHTTP - CommonSense + commonsense FileSlurp JSON Guard diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 5de6c0d882a3..8d7f4e6cc703 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ - glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret + glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret ]) ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-ugly gstreamer ]); diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 505afd25d04f..d2991c3ba1c9 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -24,8 +24,8 @@ in stdenv.mkDerivation { buildInputs = [ curl glib json-glib libnotify libsecret sqlite ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts - gsettings_desktop_schemas + gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + gsettings-desktop-schemas ]) ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 489de974aaaf..c4e73f3f2fa9 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -247,7 +247,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index 141c40f3b84e..d084461a9b2d 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { defaultIconTheme # If I omit this there's no icons in KDE glib granite - gsettings_desktop_schemas + gsettings-desktop-schemas gtk3 libgee magic-wormhole @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { substituteInPlace ./src/WormholeInterface.vala \ --replace /bin/wormhole ${magic-wormhole}/bin/wormhole ''; - + postPatch = '' chmod +x ./meson/post_install.py patchShebangs ./meson/post_install.py diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 43258282ac06..7125343dee67 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext -, CompressZlib, zlib, libjpeg, expat, freetype, libwpd +, IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis @@ -251,7 +251,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig + IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 7a2538e4bcd6..5958a5aa79e4 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, freetype, libwpd +, IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, carlito @@ -248,7 +248,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig + IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index ba5486dc0158..c82a8d8ecc52 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,10 +10,9 @@ let sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ - perlPackages.NetSMTP perlPackages.NetSMTPSSL + perlPackages.libnet perlPackages.NetSMTPSSL perlPackages.IOSocketSSL perlPackages.NetSSLeay - perlPackages.MIMEBase64 perlPackages.AuthenSASL - perlPackages.DigestHMAC + perlPackages.AuthenSASL perlPackages.DigestHMAC ]; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 74c3c71dbf7c..513fe06df8f6 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + perlPackages.ExtUtilsPkgConfig perlPackages.InlineC xorgserver xvfb_run ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 55dad369c108..33672054a373 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2, libgames-support, libgee }: +, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobjectIntrospection for finding vapi files nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ]; + buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ]; postPatch = '' chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 302d8fb21010..7390108953f7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool -, libxml2, libgee, libgames-support }: +, libxml2, libgee, libgnome-games-support }: stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme - libgee libgames-support + libgee libgnome-games-support ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index e07e3c141522..9a81c88206df 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support , libgee}: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.defaultIconTheme libgames-support libgee + libxml2 gnome3.defaultIconTheme libgnome-games-support libgee ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 9783e6c9228f..e9c55618c60f 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools , gtk -, thunarx-2-dev +, thunar-bare , exo, libxfce4util, libxfce4ui , xfconf, udev, libnotify }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xfce4-dev-tools - thunarx-2-dev + thunar-bare exo gtk libxfce4util libxfce4ui xfconf udev libnotify ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index d44281d052d1..6b9aac4a8ccd 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunarx-2-dev, python2 +, thunar-bare, python2 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk - thunarx-2-dev python2 + thunar-bare python2 ]; configurePhase = "python2 waf configure --prefix=$out"; diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 3857846ea82d..c44b32c2edda 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null -, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: +{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify +, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -13,7 +13,7 @@ mkXfceDerivation rec { version = "4.12.1"; sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; - buildInputs = [ dbus_glib gtk2 libical libnotify popt ] + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; patches = [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 853557821713..ff62e2eba3b2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -207831,7 +207831,7 @@ self: { }) {}; "udev" = callPackage - ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }: + ({ mkDerivation, base, bytestring, udev, posix-paths, unix }: mkDerivation { pname = "udev"; version = "0.1.0.0"; @@ -207839,12 +207839,12 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; - libraryPkgconfigDepends = [ libudev ]; + libraryPkgconfigDepends = [ udev ]; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libudev;}; + }) {inherit (pkgs) udev;}; "udp-conduit" = callPackage ({ mkDerivation, base, chunked-data, conduit-combinators diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b8b55d6a8742..e769cb505134 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,7 +5,7 @@ let version = "0.99.3"; - desktop_schemas = gnome3.gsettings_desktop_schemas; + desktop_schemas = gnome3.gsettings-desktop-schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7569f2613bbd..555828bfaf6a 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong + systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ++ stdenv.lib.optional javaSupport jdk; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf516b16f4b4..f4f72491970c 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -22,7 +22,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -52,7 +52,6 @@ let SetScalar Starman SysHostnameLong - TestMore TextDiff TextTable XMLSimple diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index cbe7d3da8aa6..6c3509d632f2 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pkgs.alsaLib pkgs.cairo pkgs.cups - pkgs.dbus_daemon.lib + pkgs.dbus.daemon.lib pkgs.expat pkgs.gdk_pixbuf pkgs.glib diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index b3746a50c777..a0ed5aaf210c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -8,7 +8,7 @@ let libpulseaudio alsaLib openalSoft - libva1-full + libva1 libvdpau vulkan-loader gcc.cc diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 5bfeef6f1fc1..542322d0e621 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ # minimum requirements from INSTALL.html#System_Requirements AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 - DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree + EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree IOSocketIP IOSocketSSL JSON LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt LWP URI perlPackages.version diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index 9abf95fb6d60..2912ce4cfcaa 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }: +{ stdenv, perl, fetchurl, Error, MailDKIM, MIMETools, NetServer }: let pkg = "dkimproxy"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ perl ]; - propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ]; + propagatedBuildInputs = [ Error MailDKIM MIMETools NetServer ]; meta = with stdenv.lib; { description = "SMTP-proxy that signs and/or verifies emails"; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index b63390bb2474..8fa7719a722b 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper , gawk, gnused, gnugrep, coreutils, which -, perl, NetSMTP +, perl, libnet , withMySQL ? false, zlib, mysql57 , withPgSQL ? false, postgresql , withSQLite ? false, sqlite @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { rm -rf $out/var wrapProgram $out/bin/dspam_notify \ - --set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}" + --set PERL5LIB "${lib.makePerlPath [ libnet ]}" # Install SQL scripts mkdir -p $out/share/dspam/sql diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 96eaa5ef0cc4..d9e8ccf1454f 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -49,7 +49,7 @@ buildPerlPackage rec { IOSocketSSL IPCRun JSON - LWPProtocolhttps + LWPProtocolHttps ModuleInstall NetSNMP TestCompile diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index dcc6f6f16b7f..45e380379d2f 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl makeWrapper glibc ] ++ (with perlPackages; [ - LWPUserAgent + LWP LWPProtocolHttps MozillaCA CryptSSLeay diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 62fc3c6f8f55..8bf9da22e728 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; }; - buildInputs = [ + buildInputs = [ makeWrapper which coreutils @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { perlPackages.NetCIDR perlPackages.NetSSLeay perlPackages.NetServer - perlPackages.Log4Perl + perlPackages.LogLog4perl perlPackages.IOSocketInet6 perlPackages.Socket6 perlPackages.URI @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { perlPackages.NetServer perlPackages.ListMoreUtils perlPackages.TimeHiRes - perlPackages.LWPUserAgent + perlPackages.LWP perlPackages.DBDPg python ruby @@ -116,9 +116,9 @@ stdenv.mkDerivation rec { esac wrapProgram "$file" \ --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ - Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip + LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool + ListMoreUtils TimeHiRes DBDPg LWP rrdtool ]}" done ''; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 111c2f02b996..1a41cd97aaf0 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -14,19 +14,19 @@ buildPerlPackage { buildInputs = [ perl openssl gettext python34Packages.sphinx ]; propagatedBuildInputs = with perlPackages; [ # dependencies from Makefile.PL - libintlperl ConfigVersioned LWP TestSimple ClassAccessorChained IOSocketSSL ClassStd + libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10 DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt - IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address - Moose NetAddrIP NetDNS NetIP NetLDAP NetHTTP NetServer NetSSLeay ParamsValidate PathClass + IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address + Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] ++ stdenv.lib.optionals extraDependencies1 [ # dependencies from parsing through core/server ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5 - DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser - ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket + Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser + ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket Storable XSLoader ] ++ stdenv.lib.optionals extraDependencies2 [ # dependencies taken from Debian @@ -38,7 +38,7 @@ buildPerlPackage { AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber - DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall + DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index c9bf8393afc7..523292f6b0f4 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -45,8 +45,8 @@ buildPerlPackage rec { perlPackages.IOSocketSSL perlPackages.IOString perlPackages.JSONXSVersionOneAndTwo - perlPackages.Log4Perl - perlPackages.LWPUserAgent + perlPackages.LogLog4perl + perlPackages.LWP perlPackages.NetHTTP perlPackages.ProcBackground perlPackages.SubName diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index e1068c248b34..4f683beb06ff 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { perlModules = with perlPackages; [ HTTPDate HTTPMessage - LWPUserAgent + LWP URI ]; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 1f52d83f1201..d5194f42d0b7 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] + buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg @@ -36,7 +36,7 @@ stdenv.mkDerivation { postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + "${AuthenSASL}/${perl.libPrefix}" + ":${ConvertASN1}/${perl.libPrefix}" - + ":${NetLDAP}/${perl.libPrefix}"; + + ":${perlldap}/${perl.libPrefix}"; meta = { homepage = http://www.spinnaker.de/lbdb/; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index c320f8ef5f6a..abbd64cb62fd 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging - }: +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wine-staging }: let - wine_custom = wineStaging; + wine_custom = wine-staging; mozillaPluginPath = "/lib/mozilla/plugins"; diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index be7b8f5824e7..81f8361fa2a6 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}: +{stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}: let version = "0.9.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz"; }; - buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ]; + buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ]; preConfigure = '' export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl" diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index cca6d630fc13..87e0a788383c 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fping, rrdtool, FCGI, CGI , CGIFast, ConfigGrammar, DigestHMAC, NetTelnet , NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS -, NetLDAP +, perlldap }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH - NetSNMP LWP IOTty fping perl NetDNS NetLDAP ]; + NetSNMP LWP IOTty fping perl NetDNS perlldap ]; postInstall = '' mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi ''; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index f673ba5f2d6b..a7fb8da99669 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -62,7 +62,7 @@ buildFHSUserEnv { libcap SDL2 libusb1 - libudev + udev dbus-glib libav atk diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 862b4a0df6e2..cb545570f51f 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py - (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong MIMEBase64 # For pass_gen.pl - NetLDAP ]); # For sha-dump.pl + (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl + perlldap ]); # For sha-dump.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index fc7639b1d5a7..14848df3f3ad 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/caff --set PERL5LIB \ ${with perlPackages; stdenv.lib.makePerlPath ([ - TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ] + TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 42befa2ce26b..dbc16cf7a453 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -18,10 +18,8 @@ stdenv.mkDerivation rec { perl DBI DBDSQLite - Digest DigestMD5 HTMLTagset - MIMEBase64 # == MIMEQuotedPrint TimeDate # == DateParse HTMLTemplate # IO::Socket::Socks is not in nixpkgs diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 8fd04194124b..c9280c102b70 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -2,7 +2,7 @@ , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple , DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder -, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor , TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey @@ -22,7 +22,7 @@ buildPerlModule rec { autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian - ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 63b79cbc8d67..12852265c406 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -14,7 +14,7 @@ buildPerlPackage rec { buildInputs = [ makeWrapper ]; propagatedBuildInputs = with perlPackages; [ JSON - LWPUserAgent + LWP MozillaCA TryTiny WebServiceLinode diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2912dada4e99..9853c6f9caf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,7 +1567,7 @@ with pkgs; autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian - ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey @@ -5103,7 +5103,7 @@ with pkgs; }; smbldaptools = callPackage ../tools/networking/smbldaptools { - inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1; + inherit (perlPackages) perlldap CryptSmbHash DigestSHA1; }; smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; @@ -10265,7 +10265,7 @@ with pkgs; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs = callPackage ../development/libraries/libguestfs { - inherit (perlPackages) libintlperl GetoptLong SysVirt; + inherit (perlPackages) libintl_perl GetoptLong SysVirt; appliance = libguestfs-appliance; }; @@ -11308,7 +11308,7 @@ with pkgs; pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; - wineStaging = pkgsi686Linux.wineStaging; + wine-staging = pkgsi686Linux.wine-staging; }; pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; @@ -12698,14 +12698,14 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; dkimproxy = callPackage ../servers/mail/dkimproxy { - inherit (perlPackages) Error MailDKIM MIMEtools NetServer; + inherit (perlPackages) Error MailDKIM MIMETools NetServer; }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dspam = callPackage ../servers/mail/dspam { - inherit (perlPackages) NetSMTP; + inherit (perlPackages) libnet; }; etcd = callPackage ../servers/etcd { }; @@ -15081,7 +15081,7 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; abcde = callPackage ../applications/audio/abcde { - inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + inherit (perlPackages) MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; }; @@ -16999,7 +16999,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; libreoffice-args = { - inherit (perlPackages) ArchiveZip CompressZlib; + inherit (perlPackages) ArchiveZip IOCompress; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; @@ -21564,7 +21564,7 @@ with pkgs; inherit fping rrdtool; inherit (perlPackages) FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet - NetOpenSSH NetSNMP LWP IOTty perl NetDNS NetLDAP; + NetOpenSSH NetSNMP LWP IOTty perl NetDNS perlldap; }; snapraid = callPackage ../tools/filesystems/snapraid { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 255ea6d4ffda..be1da88caaee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10983,7 +10983,6 @@ let self = _self // overrides; _self = with self; { patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkgconfig ]; - #buildInputs = [ TestMore TestPod ]; propagatedBuildInputs = [ pkgs.libdiscid ]; }; From 0d8076b99cce5c6638abeb28153c42f698e1bc18 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 21 Jul 2018 22:08:53 -0400 Subject: [PATCH 63/72] Revert "Revert "release: disallow aliases"" This reverts commit d68322504a53d72eae29dca959936f544f54672a. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5553c4d5265e..f1b487d98c14 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -16,7 +16,7 @@ # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; From bead12c2f639e917a99ca810e9fc0288d7ee7331 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 19:22:50 -0700 Subject: [PATCH 64/72] facter: 3.11.2 -> 3.11.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/facter/versions. --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index a88cca41fa63..c603d7c1c958 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { - sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1"; + sha256 = "1lkbcg6vlyrahgqhyp2a9jb91az1w4wgxiirfnyr9wzk2bbmmz7n"; rev = version; repo = "facter"; owner = "puppetlabs"; From 979f10f70474af32e62ea807ae077333a139267d Mon Sep 17 00:00:00 2001 From: Jonathan Curran Date: Sat, 21 Jul 2018 20:47:30 -0600 Subject: [PATCH 65/72] rustracer: 2.0.12 -> 2.0.14 --- pkgs/development/tools/rust/racer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 77ab75d1446c..7be1a9777c02 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "racer-${version}"; - version = "2.0.12"; + version = "2.0.14"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = version; - sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945"; + sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif"; }; - cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j"; + cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk"; # rustup is required for test buildInputs = [ makeWrapper rustup ]; From 35425daec26094990384ff8dba959e6f8125c279 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 19:48:12 -0700 Subject: [PATCH 66/72] cutemaze: 1.2.3 -> 1.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cutemaze/versions. --- pkgs/games/cutemaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 2570ccb51dcd..c77e0c8b4850 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cutemaze-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; - sha256 = "1gczg8bki9d2kkkkrac5wi4vnjdynv8xjw2qxn9lx1jfkm8fk1qk"; + sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl"; }; nativeBuildInputs = [ qmake qttools ]; From d0ad9db017082367e5c919054c8e8f80d8e59581 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 20:12:45 -0700 Subject: [PATCH 67/72] capstone: 3.0.4 -> 3.0.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/capstone/versions. --- pkgs/development/libraries/capstone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 64e3690eb3e6..3014041133f0 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; + sha256 = "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci"; }; configurePhase = '' patchShebangs make.sh ''; From 7225c2acd063709c85a9a5e9924a5ddea6cc4b65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 20:25:39 -0700 Subject: [PATCH 68/72] acpid: 2.0.29 -> 2.0.30 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpid/versions. --- pkgs/os-specific/linux/acpid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index ad763d2ee298..7f62b0463a8e 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "acpid-2.0.29"; + name = "acpid-2.0.30"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q"; + sha256 = "1jzl7hiaspr5xkmsrbl69bib8cs3dp6bq5ix58fbskpnsdi7pdr8"; }; nativeBuildInputs = [ autoreconfHook ]; From 3380369f41e92030880edeebbfbf672da5d888f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 20:51:27 -0700 Subject: [PATCH 69/72] acme-sh: 2.7.8 -> 2.7.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acme.sh/versions. --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 00d8bdd3ef4c..4bdc9f096cf6 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }: stdenv.mkDerivation rec { name = "acme.sh-${version}"; - version = "2.7.8"; + version = "2.7.9"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0zm64z7av63xi7yjhljab2i8q1vx4q1mpcmcm58jm6k4babalxrf"; + sha256 = "1fp1sifhm4in0cqmc8i0zms7fqxw0rgfi1rkkm496d3068a4a51x"; }; nativeBuildInputs = [ makeWrapper ]; From 58e4b0e545fd6c762bd8e75084b789011fda3f2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Jul 2018 20:53:21 -0700 Subject: [PATCH 70/72] batctl: 2018.1 -> 2018.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/batctl/versions. --- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 61d0eb9bdb0c..3b95907a7893 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.1"; + ver = "2018.2"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7"; + sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z"; }; nativeBuildInputs = [ pkgconfig ]; From b21994d4ac9c2c8d372bf011668401ee31972c0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 09:17:36 +0200 Subject: [PATCH 71/72] python.pkgs.z3: provide bindings for z3 package, fixes #42603 --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1c0ac374896..efa6c20be706 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17943,6 +17943,10 @@ EOF qasm2image = callPackage ../development/python-modules/qasm2image { }; simpy = callPackage ../development/python-modules/simpy { }; + + z3 = (toPythonModule (pkgs.z3.override { + inherit python; + })).python; }); in fix' (extends overrides packages) From 610485faa7f8c043482c4a9c030938ed315557e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 09:45:26 +0200 Subject: [PATCH 72/72] python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. --- pkgs/development/python-modules/pytest/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index b5a8cc252b97..1c0ceef83657 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock +, atomicwrites, mock, writeText }: buildPythonPackage rec { version = "3.6.2"; @@ -27,6 +27,11 @@ buildPythonPackage rec { runHook postCheck ''; + # Don't create .pytest-cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + export PYTEST_ADDOPTS="-p no:cacheprovider" + ''; + meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix;