From 0b2f4fd3ec0b7e56f3a287d8d84fd6fbb0eb90a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 14:57:40 +0000 Subject: [PATCH 001/411] mopidy-mpris: 3.0.1 -> 3.0.2 --- pkgs/applications/audio/mopidy/mpris.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 16fbfab380ba..1c6d841a34e4 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-mpris"; - version = "3.0.1"; + version = "3.0.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-MPRIS"; - sha256 = "0qk46aq5r92qgkldzl41x09naww1gv92l4c4hknyl7yymyvm9lr2"; + sha256 = "0mmdaikw00f43gzjdbvlcvzff6yppm7v8mv012r79adzd992q9y0"; }; propagatedBuildInputs = [ @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; license = licenses.asl20; maintainers = [ maintainers.nickhu ]; From c36cf877f17ce8cf547f921c3a65d9aad46c85bb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Jul 2020 15:46:24 -0500 Subject: [PATCH 002/411] darwin.xcode: add hash for 11.3.1 --- pkgs/os-specific/darwin/xcode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 1144232fba21..be9162fd7b65 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -53,5 +53,6 @@ in lib.makeExtensible (self: { xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; + xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}"; }) From 39c536c8db4e0982f89b67a194cd36ba9f4fbdd5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Jul 2020 10:30:19 -0500 Subject: [PATCH 003/411] darwin.libtapi: update, fix installTargets --- pkgs/os-specific/darwin/libtapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 182d1db3bfd5..983499ccdbcd 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "tpoechtrager"; repo = "apple-libtapi"; - rev = "cd9885b97fdff92cc41e886bba4a404c42fdf71b"; - sha256 = "1a19h39a48agvnmal99n9j1fjadiqwib7hfzmn342wmgh9z3vk0g"; + rev = "3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48"; + sha256 = "1zb10p6xkls8x7wsdwgy9c0v16z97rfkgidii9ffq5rfczgvrhjh"; }; nativeBuildInputs = [ cmake python3 ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildFlags = [ "libtapi" ]; - installTarget = "install-libtapi"; + installTargets = [ "install-libtapi" "install-tapi-headers"]; meta = with lib; { license = licenses.apsl20; From 3c6bd61560d042ce1e366989b92b615dfa1dffb3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Jul 2020 15:48:39 -0500 Subject: [PATCH 004/411] darwin.cctools: 927.0.2 -> 949.0.1 Needed for iOS 13 support --- pkgs/os-specific/darwin/cctools/port.nix | 144 +++++++++++------------ 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0c25f225291e..64f1490a7a79 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -17,92 +17,90 @@ in # Non-Darwin alternatives assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; -let - baseParams = rec { - name = "${targetPrefix}cctools-port"; - version = "927.0.2"; +stdenv.mkDerivation { + pname = "${targetPrefix}cctools-port"; + version = "949.0.1"; - src = fetchFromGitHub { - owner = "tpoechtrager"; - repo = "cctools-port"; - rev = "8239a5211bcf07d6b9d359782e1a889ec1d7cce5"; - sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; - }; + src = fetchFromGitHub { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "43f32a4c61b5ba7fde011e816136c550b1b3146f"; + sha256 = "10yc5smiczzm62q6ijqccc58bwmfhc897f3bwa5i9j98csqsjj0k"; + }; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; - buildInputs = [ libuuid ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] - ++ stdenv.lib.optional enableTapiSupport libtapi; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; + buildInputs = [ libuuid ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] + ++ stdenv.lib.optional enableTapiSupport libtapi; - patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; + patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; - __propagatedImpureHostDeps = [ - # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them - "/usr/lib/libobjc.A.dylib" - "/usr/lib/libobjc.dylib" + __propagatedImpureHostDeps = [ + # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them + "/usr/lib/libobjc.A.dylib" + "/usr/lib/libobjc.dylib" + ]; + + enableParallelBuilding = true; + + # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configureFlags = [ "--disable-clang-as" ] + ++ stdenv.lib.optionals enableTapiSupport [ + "--enable-tapi-support" + "--with-libtapi=${libtapi}" ]; - enableParallelBuilding = true; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace cctools/Makefile.am --replace libobjc2 "" + '' + '' + sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp - # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; - configureFlags = [ "--disable-clang-as" ] - ++ stdenv.lib.optionals enableTapiSupport [ - "--enable-tapi-support" - "--with-libtapi=${libtapi}" - ]; + # FIXME: there are far more absolute path references that I don't want to fix right now + substituteInPlace cctools/configure.ac \ + --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \ + --replace "-L/usr/local/lib" "" \ - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cctools/Makefile.am --replace libobjc2 "" - '' + '' - sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp + substituteInPlace cctools/include/Makefile \ + --replace "/bin/" "" - # FIXME: there are far more absolute path references that I don't want to fix right now - substituteInPlace cctools/configure.ac \ - --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \ - --replace "-L/usr/local/lib" "" \ + patchShebangs tools + sed -i -e 's/which/type -P/' tools/*.sh - substituteInPlace cctools/include/Makefile \ - --replace "/bin/" "" + # Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157 + cat > cctools/include/unistd.h < cctools/include/unistd.h < Date: Tue, 21 Jul 2020 10:34:57 -0500 Subject: [PATCH 005/411] systems/examples.nix: update to iOS 13 new apps need iOS 13, so we should try to use that here --- lib/systems/examples.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 19b3790ecbe0..3b32130f388a 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -170,8 +170,8 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "12.4"; - xcodeVer = "10.3"; + sdkVer = "13.2"; + xcodeVer = "11.3.1"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -180,8 +180,8 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "12.4"; - xcodeVer = "10.3"; + sdkVer = "13.2"; + xcodeVer = "11.3.1"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -190,8 +190,8 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "12.4"; - xcodeVer = "10.3"; + sdkVer = "13.2"; + xcodeVer = "11.3.1"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; @@ -200,8 +200,8 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "12.4"; - xcodeVer = "10.3"; + sdkVer = "13.2"; + xcodeVer = "11.3.1"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; From 753e80125fd071f6d4cd3ea9988c3c4da86f6cba Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Jul 2020 21:58:51 -0500 Subject: [PATCH 006/411] darwin/xcode: default to 11.3.1 --- pkgs/os-specific/darwin/xcode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index be9162fd7b65..34e3b2dfeeae 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -54,5 +54,5 @@ in lib.makeExtensible (self: { xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "11.3.1")}"; }) From 95eabdfd5f6197c83e9e5f53ddb65dbbea3c13fd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 22 Jul 2020 10:54:11 -0500 Subject: [PATCH 007/411] xcode/sdk-pkgs.nix: set -platform_version in addition to -miphoneos-version-min MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The App Store looks at LC_VERSION_MIN_IPHONEOS to verify you have a new enough SDK version. This is not just the minimum version, but also the sdk version used. When the linker can’t figure it out, it tries to infer it from the sdk path[1]. When no sdk version is found, it defaults to just using the -miphoneos-version-min value[2]. So, to make sure we don’t rely on inference (which doesn’t work in the current directory structure), we have to specify -platform_version. [1]: https://github.com/tpoechtrager/cctools-port/blob/43f32a4c61b5ba7fde011e816136c550b1b3146f/cctools/ld64/src/ld/Options.cpp#L5355-L5376 [2]: https://github.com/tpoechtrager/cctools-port/blob/43f32a4c61b5ba7fde011e816136c550b1b3146f/cctools/ld64/src/ld/ld.hpp#L58 --- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index e8302a82555f..45e1f1eab4fa 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -12,7 +12,7 @@ let -minSdkVersion = "9.0"; +minSdkVersion = targetPlatform.minSdkVersion or "9.0"; iosPlatformArch = { parsed, ... }: { armv7a = "armv7"; @@ -37,6 +37,10 @@ rec { bintools = binutils-unwrapped; extraBuildCommands = '' echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags ''; }; From b418d4c6a4a3b34e317327ff7e80ab7a8fc1c02a Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 26 Jul 2020 17:27:15 +0900 Subject: [PATCH 008/411] libtapi: fix build, install phase and install name installTarget looks like a typo for installTargets. This causes a lot of llvm and clang to be built and installed. Clang is not intended to be an external dependency. The source bundle includes llvm and clang. Adding include paths and building clangBasic first is sufficient to use the internal clang components. --- pkgs/os-specific/darwin/libtapi/default.nix | 28 ++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 182d1db3bfd5..8d710b45b265 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, clang_6 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation { name = "libtapi-1000.10.8"; @@ -9,22 +9,32 @@ stdenv.mkDerivation { sha256 = "1a19h39a48agvnmal99n9j1fjadiqwib7hfzmn342wmgh9z3vk0g"; }; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ clang_6.cc ]; + sourceRoot = "source/src/llvm"; - preConfigure = '' - cd src/llvm - ''; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]; - buildFlags = [ "libtapi" ]; + # fixes: fatal error: 'clang/Basic/Diagnostic.h' file not found + # adapted from upstream + # https://github.com/tpoechtrager/apple-libtapi/blob/3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48/build.sh#L58-L60 + preConfigure = '' + INCLUDE_FIX="-I $PWD/projects/clang/include" + INCLUDE_FIX+=" -I $PWD/build/projects/clang/include" - installTarget = "install-libtapi"; + cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="$INCLUDE_FIX") + ''; + + buildFlags = [ "clangBasic" "libtapi" ]; + + installTargets = [ "install-libtapi" "install-tapi-headers" ]; + + postInstall = '' + install_name_tool -id $out/lib/libtapi.dylib $out/lib/libtapi.dylib + ''; meta = with lib; { license = licenses.apsl20; maintainers = with maintainers; [ matthewbauer ]; }; - } From 630f5d30df4256991b2e72658eedeb954f7559f6 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 25 Jul 2020 15:26:54 +0900 Subject: [PATCH 009/411] stdenv/darwin: enable tapi support in cctools --- pkgs/os-specific/darwin/libtapi/default.nix | 6 +++++- pkgs/stdenv/darwin/default.nix | 11 ++--------- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 ++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 8d710b45b265..3252efb42363 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, ncurses }: stdenv.mkDerivation { name = "libtapi-1000.10.8"; @@ -13,6 +13,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 ]; + # ncurses is required here to avoid a reference to bootstrap-tools, which is + # not allowed for the stdenv. + buildInputs = [ ncurses ]; + cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]; # fixes: fatal error: 'clang/Basic/Diagnostic.h' file not found diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9de6ef63bfea..3f06dec10af8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -198,12 +198,6 @@ in rec { python3 = super.python3Minimal; ninja = super.ninja.override { buildDocs = false; }; - - darwin = super.darwin // { - cctools = super.darwin.cctools.override { - enableTapiSupport = false; - }; - }; }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; @@ -305,7 +299,7 @@ in rec { persistent = self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash python3 - ncurses libffi zlib gmp pcre gnugrep + ncurses libffi zlib gmp pcre gnugrep cmake coreutils findutils diffutils patchutils ninja libxml2; # Hack to make sure we don't link ncurses in bootstrap tools. The proper @@ -330,7 +324,6 @@ in rec { darwin = super.darwin // rec { inherit (darwin) dyld Libsystem libiconv locale; - cctools = super.darwin.cctools.override { enableTapiSupport = false; }; CF = super.darwin.CF.override { inherit libxml2; python3 = prevStage.python3; @@ -419,7 +412,7 @@ in rec { curl.out openssl.out libssh2.out nghttp2.lib libkrb5 cc.expand-response-params libxml2.out ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale + dyld Libsystem CF cctools ICU libiconv locale libtapi ]); overrides = lib.composeExtensions persistent (self: super: { diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index a299879693c8..31e129639376 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -100,6 +100,8 @@ in rec { cp ${cctools_}/bin/$i $out/bin done + cp -d ${darwin.libtapi}/lib/libtapi* $out/lib + cp -rd ${pkgs.darwin.CF}/Library $out chmod -R u+w $out From b935375becd5334720cf375d7a5773f4e343ea8e Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 2 Sep 2020 17:04:41 +0200 Subject: [PATCH 010/411] gts: Fix cross compilation gts generate binaries during the build process that are used during the build process. When building cross-platform, these binaries are not executable as they are built with for the target platform instead of the host platform. The boostrap build introduced here will first build gts natively and then cross-platform, using the native binaries in the cross-build. --- pkgs/development/libraries/gts/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index adf914369cf5..48bdfc9b5e1b 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib }: +{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib, buildPackages }: stdenv.mkDerivation rec { @@ -12,12 +12,26 @@ stdenv.mkDerivation rec { sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ + pkgconfig + autoreconfHook + glib # required to satisfy AM_PATH_GLIB_2_0 + ]; buildInputs = [ gettext ]; propagatedBuildInputs = [ glib ]; doCheck = false; # fails with "permission denied" + preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + pushd src + make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init + mv predicates_init predicates_init_build + make clean + popd + + substituteInPlace src/Makefile --replace "./predicates_init" "./predicates_init_build" + ''; + meta = { homepage = "http://gts.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2Plus; From b1700a73361284c6c0132e6caf5e0345223f3010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 3 Sep 2020 09:13:19 +0200 Subject: [PATCH 011/411] stdenv: unset SDKROOT on Darwin The Rust `cc` crate started running `xcrun` when SDKROOT is defined: https://github.com/alexcrichton/cc-rs/commit/a970b0ab0beecec1d9c589d2e6aa5f3ad1bd3f9b Consequently, building crates that use newer versions of the `cc` crate fail, because xcrun is not available in pure build environments. --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9de6ef63bfea..341b1f4b29c3 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -34,7 +34,7 @@ in rec { export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} export NIX_IGNORE_LD_THROUGH_GCC=1 - export SDKROOT= + unset SDKROOT export MACOSX_DEPLOYMENT_TARGET=${macosVersionMin} From 43eae86de2f0f08cac4cc8c8f0e73f928bf97ad4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 5 Sep 2020 13:16:04 +0200 Subject: [PATCH 012/411] libfido2: 1.4.0 -> 1.5.0 --- pkgs/development/libraries/libfido2/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index b062b10732e2..48b457b09ded 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0v1a3n0qljmrp8y9pmnmbsdsy79l3z84qmhyjx50xdsbgnz1z4md"; + sha256 = "08iizxq3w8mpkwfrfpl59csffc20yz8x398bl3kf23rrr4izk42r"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -22,14 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; - patches = [ - # make build reproducible - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/e79f7d7996e70d6b2ae9826fce81d61659cab4f6.patch"; - sha256 = "0jwg69f95qqf0ym24q1ka50d3d3338cyw4fdfzpw4sab0shiaq9v"; - }) - ]; - cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DUSE_HIDAPI=1" From 8e4e38cdcdc5f2be6875e6506d0789e9e5411ea6 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 2 Sep 2020 23:25:10 +0100 Subject: [PATCH 013/411] octave: Fix libtool framework link failure on Darwin This fix moves linker flags of the form `-framework foo` from dependency_libs to inherited_linker_flags, since libtool doesn't understand them. See #96977 for details. Fixes #96977 --- .../libraries/qt-5/hooks/fix-qmake-libtool.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh b/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh index 5acaeb824466..6aaeda052d70 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh @@ -5,8 +5,19 @@ fixQmakeLibtool() { if [ -d "$1" ]; then find "$1" -name '*.la' | while read la; do + set +e + framework_libs=$(grep '^dependency_libs' "$la" | grep -Eo -- '-framework +\w+' | tr '\n' ' ') + set -e sed -i "$la" \ - -e '/^dependency_libs/ s,\(/[^ ]\+\)/lib\([^/ ]\+\)\.so,-L\1 -l\2,g' + -e '/^dependency_libs/ s,\(/[^ ]\+\)/lib\([^/ ]\+\)\.so,-L\1 -l\2,g' \ + -e '/^dependency_libs/ s,-framework \+\w\+,,g' + if [ ! -z "$framework_libs" ]; then + if grep '^inherited_linker_flags=' $la >/dev/null; then + sed -i "$la" -e "s/^\(inherited_linker_flags='[^']*\)/\1 $framework_libs/" + else + echo "inherited_linker_flags='$framework_libs'" >> "$la" + fi + fi done fi } From 749a260edd4b29c446a02b8bee5cdb44a3bf4a95 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 15:20:05 +0000 Subject: [PATCH 014/411] bmake: 20200710 -> 20200902 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 219bd6e30e3b..9bda4cde0449 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200710"; + version = "20200902"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "0v5paqdc0wnqlw4dy45mnydkmabsky33nvd7viwd2ygg351zqf35"; + sha256 = "1v1v81llsiy8qbpy38nml1x08dhrihwh040pqgwbwb9zy1108b08"; }; nativeBuildInputs = [ getopt ]; From f03235e5289d2217544bd1a70c2a27433800b6d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 15:27:20 +0000 Subject: [PATCH 015/411] cimg: 2.9.1 -> 2.9.2 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 312f927767dd..c50838bc0d52 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3"; + sha256 = "01hvjlxclbmrzqb8qz1h2sdkpybpg14q81na8kfi94w3bkkkmzzf"; }; installPhase = '' From 90c5f2f9537cde699424943e2b63036ca50a479e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Sep 2020 04:20:00 +0000 Subject: [PATCH 016/411] libuv: 1.38.1 -> 1.39.0 --- pkgs/development/libraries/libuv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index cf73a64f6752..1314eab16426 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.38.1"; + version = "1.39.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0cvabjhi53qw94zyjkqamx0c607ayydfb4f3djx2gj8ab2p7s29n"; + sha256 = "1r9xs9is5rgid5ylbprvf88lqjrmvky86q9h8iqlq7rcrv24x6kl"; }; postPatch = let @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; - homepage = "https://github.com/libuv/libuv"; + homepage = "https://libuv.org/"; + changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; From 204eb76c7eadc2dc90ecdbf24b7d2b30391d6340 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Sep 2020 19:00:00 -0500 Subject: [PATCH 017/411] nodejs-14_x: 14.9.0 -> 14.10.0 https://github.com/nodejs/node/releases/tag/v14.10.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 549f29db2fec..f68cefadd617 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.9.0"; - sha256 = "1xkfivr0qci50ksg66szyasdlbiwh2j7ia4n6qc5csih2nvzcbh1"; + version = "14.10.0"; + sha256 = "00f7p2l3wpj12r6bxz7l6cxkipwl6in4qlzxrzkk0z81k32ph6s3"; } From 682465a45ad7bc91336ca60418796f4fce922b44 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 7 Sep 2020 13:41:52 +0000 Subject: [PATCH 018/411] perlPackages: make it easier for the parser --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d89bcdf43102..b7cf56f23abc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,7 +7,7 @@ { config , stdenv, buildPackages, pkgs -, fetchurl, fetchpatch, fetchFromGitHub +, fetchurl, fetchgit, fetchpatch, fetchFromGitHub , perl, overrides, buildPerl, shortenPerlShebang }: @@ -10821,7 +10821,7 @@ let ListBinarySearch = buildPerlPackage { pname = "List-BinarySearch"; version = "0.25"; - src = pkgs.fetchurl { + src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz"; sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8"; }; @@ -17126,8 +17126,7 @@ let }; perlPreHook = "export LD=$CC"; preCheck = "rm t/core_audiospec.t"; - buildInputs = [ AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ] - ++ (with pkgs; [ SDL SDL_gfx SDL_mixer SDL_image SDL_ttf SDL_Pango SDL_net ] ); + buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ FileShareDir TieSimple ]; meta = { description = "SDL bindings to Perl"; @@ -18381,7 +18380,7 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; version = "6.3.0"; - src = assert version == pkgs.libvirt.version; pkgs.fetchgit { + src = assert version == pkgs.libvirt.version; fetchgit { url = "git://libvirt.org/libvirt-perl.git"; rev = "v${version}"; sha256 = "0m75g0kf2dmllx5c1wxzszm1zakiqjighcsjbgq66674pvqf5mk7"; From 4faa3e3dcd0accf0a45d285eafc39ef0667920f1 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 4 Sep 2020 08:51:35 +0000 Subject: [PATCH 019/411] perl: remove obsolete patch --- .../development/interpreters/perl/default.nix | 3 +- .../interpreters/perl/no-sys-dirs-5.26.patch | 250 ------------------ 2 files changed, 1 insertion(+), 252 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 7fad936260c3..f5d8f804a0f8 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -36,8 +36,7 @@ let patches = [ # Do not look in /usr etc. for dependencies. - (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch - else if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch + (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch else ./no-sys-dirs-5.31.patch) ] ++ optional (versionOlder version "5.29.6") diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch deleted file mode 100644 index ad65d1339f36..000000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 -+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 -@@ -106,15 +106,7 @@ - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1337,8 +1329,7 @@ - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1349,17 +1340,12 @@ - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1391,8 +1377,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2446,7 +2430,6 @@ - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4936,7 +4919,7 @@ - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8600,13 +8583,8 @@ - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19900,9 +19878,10 @@ - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -Only in perl-5.20.0/: Configure.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL ---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -126,11 +126,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i -- # might be using, say, Intel's icc -- ) { -+ } elsif (0) { - # When cross-compiling we may store a path for gcc's "sysroot" option: - my $sysroot = $Config{sysroot} || ''; - # Some Linuxes have weird errno.hs which generate -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh ---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 -+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 -@@ -119,21 +119,21 @@ - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh ---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 -@@ -150,25 +150,6 @@ - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -178,32 +159,6 @@ - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - if ${sh:-/bin/sh} -c exit; then - echo '' - echo 'You appear to have a working bash. Good.' -@@ -367,33 +322,6 @@ - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 From 748562dbbc2ef4d2f73af7167e7789a97486b1fc Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:39 +0000 Subject: [PATCH 020/411] [cpan2nix] perlPackages.Apprainbarf: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7cf56f23abc..0bdc3ecfe0c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16734,7 +16734,7 @@ let }; Apprainbarf = buildPerlModule { - pname = "Apprainbarf"; + pname = "App-rainbarf"; version = "1.4"; src = fetchurl { url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; From 20086b9dc21c116582feff774d1ebd80c2994147 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:40 +0000 Subject: [PATCH 021/411] [cpan2nix] perlPackages.ArchiveTar: 2.36 -> 2.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0bdc3ecfe0c8..c12c72134769 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -766,10 +766,10 @@ let ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "2.36"; + version = "2.38"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.36.tar.gz; - sha256 = "16ba52e0babe54f8c4deb11b103a46186763173607d59649130d0fffdd36968e"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.38.tar.gz"; + sha256 = "c5e48f53514288185830ced93bf3e16fbdf5cddce97ded1d1d8a9b0a21ea287b"; }; meta = { description = "Manipulates TAR archives"; From 1abac6f116cc529dbf7408f5ec76a06f3a65bab9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:40 +0000 Subject: [PATCH 022/411] [cpan2nix] perlPackages.BCOW: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c12c72134769..7831ac818b29 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1110,7 +1110,7 @@ let pname = "B-COW"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz"; sha256 = "0lazb25jzhdha4dmrkdxn1pw1crc6iqzspvcq315p944xmsvgbzw"; }; meta = { From dda3b15aa4e787eec17a47a48586795727a9cf37 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:41 +0000 Subject: [PATCH 023/411] [cpan2nix] perlPackages.BusinessISSN: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7831ac818b29..bc3aea685f62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1341,7 +1341,7 @@ let pname = "Business-ISSN"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz"; sha256 = "97ecab15d24d11e2852bf0b28f84c8798bd38402a0a69e17be0e6689b272715e"; }; meta = { From 2359908adca8022f48a2f2b9d9b2b38160a416af Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:41 +0000 Subject: [PATCH 024/411] [cpan2nix] perlPackages.CDDBFile: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bc3aea685f62..a733b4628b8e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2222,7 +2222,7 @@ let pname = "CDDB-File"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMTM/CDDB-File-1.05.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMTM/CDDB-File-1.05.tar.gz"; sha256 = "1jf7xhd4w9iwabhz2wajh6fid3nyvkid9q5gdhyff52w86f45rpb"; }; meta = { From 553f6d720b1972c7556af3c1e49465e493108d70 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:42 +0000 Subject: [PATCH 025/411] [cpan2nix] perlPackages.CGIMinimal: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a733b4628b8e..e4205c9506ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2330,7 +2330,7 @@ let pname = "CGI-Minimal"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz"; sha256 = "b94d50821b02611da6ee5423193145078c4dbb282f2b162a4b0d58094997bc47"; }; meta = { From 9bde06f43d09e24d37c3e0099f24aab0950d1208 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:42 +0000 Subject: [PATCH 026/411] [cpan2nix] perlPackages.CPANPerlReleases: 5.20200607 -> 5.20200820 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4205c9506ea..8b824a63633b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3654,10 +3654,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20200607"; + version = "5.20200820"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200607.tar.gz; - sha256 = "0x09ghg5s69kajpw19qs8bhdzma900ipry4zizi37qcdby3kadf1"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200820.tar.gz"; + sha256 = "07vsbsxygdbv0nk9389ng3jdsl1d3yk1z54xdci1gpy0lghbij70"; }; meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; From d7b3beccdbbfac1340bf564bec71e3210042742c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:43 +0000 Subject: [PATCH 027/411] [cpan2nix] perlPackages.CacheFastMmap: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b824a63633b..bfe04bb37118 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1380,7 +1380,7 @@ let pname = "Cache-FastMmap"; version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz"; sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm"; }; }; From 546e3562efb68ef0f0879c43cc7c1c176732550a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:43 +0000 Subject: [PATCH 028/411] [cpan2nix] perlPackages.CacheMemcachedFast: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfe04bb37118..253762b6c69b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1415,7 +1415,7 @@ let pname = "Cache-Memcached-Fast"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz"; sha256 = "16m0xafidycrlcvbv3zmbr5pzvqyqyr2qb0khpry99nc4bcld3jy"; }; meta = { From e2109f3362ddd28e87617375c7dda6cf9845d1a5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:44 +0000 Subject: [PATCH 029/411] [cpan2nix] perlPackages.CatalystManual: 5.9010 -> 5.9011 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 253762b6c69b..bd9f33eb8611 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1751,10 +1751,10 @@ let CatalystManual = buildPerlPackage { pname = "Catalyst-Manual"; - version = "5.9010"; + version = "5.9011"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz"; - sha256 = "1xg2m6d76xl0a76vq0v4yv25458d6df00k5xq1ab2z8mzvwbm4ah"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9011.tar.gz"; + sha256 = "0g61za6844ya0lk0bpvw43sj0jd553aks3hqw21hbh03b6b377mk"; }; meta = { description = "The Catalyst developer's manual"; From e673255b97ef2c884d8cac30127eccdcf618fdc8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:46 +0000 Subject: [PATCH 030/411] [cpan2nix] perlPackages.ClassLoader: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd9f33eb8611..90b7771cc9c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2696,7 +2696,7 @@ let pname = "Class-Loader"; version = "2.03"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VI/VIPUL/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/V/VI/VIPUL/Class-Loader-2.03.tar.gz"; sha256 = "4fef2076ead60423454ff1f4e82859a9a9b9942b5fb8eee0c98b9c63c9f2b8e7"; }; meta = { From fc8b8d42f1b7813809c46d7db490373b58e95a69 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:48 +0000 Subject: [PATCH 031/411] [cpan2nix] perlPackages.ClassTiny: 1.006 -> 1.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 90b7771cc9c3..fb389d9c3ef4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2796,10 +2796,10 @@ let ClassTiny = buildPerlPackage { pname = "Class-Tiny"; - version = "1.006"; + version = "1.008"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz"; - sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.008.tar.gz"; + sha256 = "05anh4hn8va46xwbdx7rqxnhb8i1lingb614lywzr89gj5iql1gf"; }; meta = { description = "Minimalist class construction"; From 9844e86a36e5ff120dba153a05cd363a3102b4a5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:48 +0000 Subject: [PATCH 032/411] [cpan2nix] perlPackages.commonsense: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb389d9c3ef4..6a60d65a8ecb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3009,7 +3009,7 @@ let pname = "common-sense"; version = "3.75"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz"; sha256 = "0zhfp8f0czg69ycwn7r6ayg6idm5kyh2ai06g5s6s07kli61qsm8"; }; meta = { From ec7fec2ea159d5b1c8e6de4c998720828957ee7a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:48 +0000 Subject: [PATCH 033/411] [cpan2nix] perlPackages.CompressBzip2: 2.27 -> 2.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a60d65a8ecb..1925d9137bd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3020,10 +3020,10 @@ let CompressBzip2 = buildPerlPackage { pname = "Compress-Bzip2"; - version = "2.27"; + version = "2.28"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.27.tar.gz; - sha256 = "a284c506ac8ef5b02136a15814271dcba10400b5ce818359cf3325ccde7bb3d3"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.28.tar.gz"; + sha256 = "859f835c3f5c998810d8b2a6f9e282ff99d6cb66ccfa55cae7e66dafb035116e"; }; meta = { description = "Interface to Bzip2 compression library"; From 4251c90799a58a06934f2a71c098909d5a688b8b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:48 +0000 Subject: [PATCH 034/411] [cpan2nix] perlPackages.CompressRawBzip2: 2.093 -> 2.096 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1925d9137bd2..9f57a27295fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3033,10 +3033,10 @@ let CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.093"; + version = "2.096"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.093.tar.gz"; - sha256 = "1sb6sazwyxaan26laclbkbnr57mkm1yx7c5l6d0045pw3q9q6mi9"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.096.tar.gz"; + sha256 = "1glcjnbqksaviwyrprh9i4dybsb12kzfy0bx932l0xya9riyfr55"; }; # Don't build a private copy of bzip2. From 7cf9165c9927511a8f5581a6b8c7132ac522e862 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:48 +0000 Subject: [PATCH 035/411] [cpan2nix] perlPackages.CompressRawZlib: 2.093 -> 2.096 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f57a27295fb..9d967c86d357 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3052,11 +3052,11 @@ let CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.093"; + version = "2.096"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.093.tar.gz"; - sha256 = "1x794dz83888c26lmls81rvvnhk3j91cwh407f6p65aazaa73v5m"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.096.tar.gz"; + sha256 = "04jrqvqsa2c655idw7skv5rhb9vx9997h4n9if5p99srq4hblk6d"; }; preConfigure = '' From 05b209347e31036fa0289d3076c39f82a6860536 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:50 +0000 Subject: [PATCH 036/411] [cpan2nix] perlPackages.ConvertBencode: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9d967c86d357..d47974da0459 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3402,7 +3402,7 @@ let pname = "Convert-Bencode"; version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/O/OR/ORCLEV/Convert-Bencode-1.03.tar.gz"; sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6"; }; meta = { From 35feff044834e3112a8cf97665c3afd43c2aa88c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:50 +0000 Subject: [PATCH 037/411] [cpan2nix] perlPackages.ConvertUU: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d47974da0459..b39dee99847b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3430,7 +3430,7 @@ let pname = "Convert-UU"; version = "0.5201"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/A/AN/ANDK/Convert-UU-0.5201.tar.gz"; sha256 = "92329ce1c32b5952c48e1223db018c8c58ceafef03bfa0fd4817cd89c355a3bd"; }; meta = { From 4cd56b33da5b50b0af7d05882d39e09e5e60ba07 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:51 +0000 Subject: [PATCH 038/411] [cpan2nix] perlPackages.CryptECB: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b39dee99847b..f0a012bc8784 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3812,7 +3812,7 @@ let pname = "Crypt-ECB"; version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz; + url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz"; sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa"; }; meta = with stdenv.lib; { From d353a83f76897e51f62b4ff66b8583b44e66d6ad Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:55 +0000 Subject: [PATCH 039/411] [cpan2nix] perlPackages.CryptX: 0.068 -> 0.069 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0a012bc8784..eeaea2b535ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4296,10 +4296,10 @@ let CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.068"; + version = "0.069"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.068.tar.gz; - sha256 = "b1806a1fa4d4b8c9265f44ac706eb0b05107d644edb24ffea1b507168e88fd59"; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.069.tar.gz"; + sha256 = "b5503a35046a973174234a823dba63403b080957c4a370d60d66aa7c7587d850"; }; meta = { description = "Crypto toolkit"; From ca992b49568228eeb94ea3d79309a38677f35ece Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:57 +0000 Subject: [PATCH 040/411] [cpan2nix] perlPackages.DBI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eeaea2b535ec..a647e547a530 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5530,7 +5530,7 @@ let pname = "DBI"; version = "1.643"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz"; sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' From 359e88fe75b9f202f703231d859965155ee73ca9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:57 +0000 Subject: [PATCH 041/411] [cpan2nix] perlPackages.DataDumper: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a647e547a530..01f4fba83b75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4358,18 +4358,7 @@ let }; }; - DataDumper = buildPerlPackage { - pname = "Data-Dumper"; - version = "2.173"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz"; - sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; - }; - outputs = [ "out" ]; - meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + DataDumper = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; From 84f47dfcf54ab6239ba7b4f2573d381fed22989e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:58 +0000 Subject: [PATCH 042/411] [cpan2nix] perlPackages.DataSerializer: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 01f4fba83b75..0212974b5d3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4611,7 +4611,7 @@ let pname = "Data-Serializer"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.65.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.65.tar.gz"; sha256 = "048zjy8valnil8yawa3vrxr005rz95gpfwvmy2jq0g830195l58j"; }; meta = { From f2c97a29d20300502c37d177de703c880dac3b44 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:09:59 +0000 Subject: [PATCH 043/411] [cpan2nix] perlPackages.DataUUID: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0212974b5d3b..09422023eac4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4743,7 +4743,7 @@ let pname = "Data-UUID"; version = "1.226"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz"; sha256 = "0lv4k4ibxwkw7zz9hw97s34za9nvjxb4kbmgmx5sj4fll3zmfg89"; }; }; From e6d723a7ad16a9cec9431d7560c2669f99ec22d3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:00 +0000 Subject: [PATCH 044/411] [cpan2nix] perlPackages.DevelHide: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 09422023eac4..658bebd4dcef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5882,7 +5882,7 @@ let pname = "Devel-Hide"; version = "0.0013"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz"; sha256 = "1jvyy3yasiwyjsn9ay9sja3ch4wcjc4wk5l22vjsclq29z7vphvg"; }; }; From c516324d11637567f3c9943dc6d6fa7393cdb764 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:00 +0000 Subject: [PATCH 045/411] [cpan2nix] perlPackages.DevelLeak: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 658bebd4dcef..0944be5bb049 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5250,7 +5250,7 @@ let pname = "Devel-Leak"; version = "0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NI-S/Devel-Leak-${version}.tar.gz"; + url = "mirror://cpan/authors/id/N/NI/NI-S/Devel-Leak-0.03.tar.gz"; sha256 = "0lkj2xwc3lhxv7scl43r8kfmls4am0b98sqf5vmf7d72257w6hkg"; }; meta = { From 4369000b9bc609bb9e9a587c0763a7eb8756a1b6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:00 +0000 Subject: [PATCH 046/411] [cpan2nix] perlPackages.DevelPPPort: 3.58 -> 3.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0944be5bb049..5528c9ce90d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5291,10 +5291,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.58"; + version = "3.60"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.58.tar.gz; - sha256 = "531ff79f9e74962df2dba7b2e526b8a5208cfb6bcdc01d85732fda8c1fde0c00"; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.60.tar.gz"; + sha256 = "0c7f36d2c63e1bbe4fd9670f3b093a207175068764884b9d67ea27aed6c07ea6"; }; meta = { description = "Perl/Pollution/Portability"; From d94acfbe81ea065da92b79a1b34a1bbe6e38dbf8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:01 +0000 Subject: [PATCH 047/411] [cpan2nix] perlPackages.DeviceSerialPort: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5528c9ce90d5..a67e17ba2c48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17199,7 +17199,7 @@ let pname = "Device-SerialPort"; version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/COOK/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz"; sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk"; }; meta = with stdenv.lib; { From 57205eef2185096f37aab6cab6337a5bcf3e9d96 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:04 +0000 Subject: [PATCH 048/411] [cpan2nix] perlPackages.Encode: 3.06 -> 3.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a67e17ba2c48..dd6336716bee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6754,10 +6754,10 @@ let Encode = buildPerlPackage { pname = "Encode"; - version = "3.06"; + version = "3.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.06.tar.gz; - sha256 = "5b2dcd6861287880584e63b2e518840d483aa38da70194cf64d9957282851eea"; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.07.tar.gz"; + sha256 = "34a4ec9b574b7a6c6132c4ab3ded490fd600bc7ce382124aeda58bb1e112910f"; }; meta = { description = "Character encodings in Perl"; From aad36a8bf0c1812f3721abc75608a8453a569a24 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:06 +0000 Subject: [PATCH 049/411] [cpan2nix] perlPackages.ExporterTiny: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd6336716bee..13ade46487bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7031,7 +7031,7 @@ let pname = "Exporter-Tiny"; version = "1.002002"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz"; sha256 = "00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101"; }; meta = { From 4bc37ddf0aa075d9e1fe6436b8921ebc0d51c33b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:09 +0000 Subject: [PATCH 050/411] [cpan2nix] perlPackages.ExtUtilsMakeMaker: 7.44 -> 7.46 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13ade46487bb..4bf1a6f37a23 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7198,10 +7198,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.44"; + version = "7.46"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.44.tar.gz"; - sha256 = "52a18f8271250faf5f3527499dd2b78d3b4fd3b064408d0cfdda9a3538887188"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.46.tar.gz"; + sha256 = "8f4a107565392d0f36c99c849a3bfe7126ba58148a4dca334c139add0dd0d328"; }; meta = { description = "Create a module Makefile"; From 71696c1e7a44b78605f0f0f855c2d0eac586941c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:10 +0000 Subject: [PATCH 051/411] [cpan2nix] perlPackages.ExtUtilsInstall: 2.14 -> 2.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4bf1a6f37a23..aa6436da31b0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7157,10 +7157,10 @@ let ExtUtilsInstall = buildPerlPackage { pname = "ExtUtils-Install"; - version = "2.14"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz"; - sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.16.tar.gz"; + sha256 = "9b6cd0aa3585ce45b6faf6de490a561d51d530dc7922888989febf067c0632dc"; }; meta = { description = "Install files from here to there"; From b31a28515c1411ee9dc9ab9fafc3305fb8766d2f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:11 +0000 Subject: [PATCH 052/411] [cpan2nix] perlPackages.ExtUtilsManifest: removed built-in --- pkgs/top-level/perl-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa6436da31b0..8c249b71f0e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7223,14 +7223,7 @@ let }; }; - ExtUtilsManifest = buildPerlPackage { - pname = "ExtUtils-Manifest"; - version = "1.72"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz"; - sha256 = "0pml5pfdk34nj9fa8m4f0qp1rh1yv0d54xagvxzjvvwq9w3q14kr"; - }; - }; + ExtUtilsManifest = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 ExtUtilsPkgConfig = buildPerlPackage { pname = "ExtUtils-PkgConfig"; From e22f30adb910d6ac33e754014e0981cd052db743 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:13 +0000 Subject: [PATCH 053/411] [cpan2nix] perlPackages.FilePath: 2.16 -> 2.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c249b71f0e8..c06e031d4454 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7738,10 +7738,10 @@ let FilePath = buildPerlPackage { pname = "File-Path"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz"; - sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05"; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.17.tar.gz"; + sha256 = "8c506dfd69a70fdd5f1212fe58fbc53620a89a8293e2ac6860570f868269fb31"; }; meta = { description = "Create or remove directory trees"; From 5632d451caf7f79a93b21e2627ade4340482c8a9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:14 +0000 Subject: [PATCH 054/411] [cpan2nix] perlPackages.FileSlurp: 9999.30 -> 9999.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c06e031d4454..0f1c878b025f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7890,10 +7890,10 @@ let FileSlurp = buildPerlPackage { pname = "File-Slurp"; - version = "9999.30"; + version = "9999.32"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.30.tar.gz; - sha256 = "0irpx72dk27d7c4cjr08dq4bwwbmq8gsr39hxd44widrn0yicdra"; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.32.tar.gz"; + sha256 = "1c655gxs0pjm5yd50rcx4rbq1lr77p4a6x6xg4xbwhlx5acj2g2c"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; From f19bd546bc93b79dd77820a1e2b4f29b53a1260a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:14 +0000 Subject: [PATCH 055/411] [cpan2nix] perlPackages.FileTemp: removed built-in --- pkgs/top-level/perl-packages.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f1c878b025f..d870d431f6e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7942,19 +7942,7 @@ let }; }; - FileTemp = buildPerlPackage { - pname = "File-Temp"; - version = "0.2309"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz"; - sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; - }; - meta = { - description = "return name and handle of a temporary file safely"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/Perl-Toolchain-Gang/File-Temp"; - }; - }; + FileTemp = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 FileTouch = buildPerlPackage { pname = "File-Touch"; From 62820544c94f940b424459bc915a74e7357c003f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:16 +0000 Subject: [PATCH 056/411] [cpan2nix] perlPackages.Filter: 1.59 -> 1.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d870d431f6e1..4d4966a82020 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8016,10 +8016,10 @@ let Filter = buildPerlPackage { pname = "Filter"; - version = "1.59"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz"; - sha256 = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.60.tar.gz"; + sha256 = "e11ef2f2ee8727b7f666fd249a3226f768e6eadfd51d9cdb49b3c3f1a35464f9"; }; meta = { description = "Source Filters"; From 078881a43a480af000d70219a108c7d439ad0bfa Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:17 +0000 Subject: [PATCH 057/411] [cpan2nix] perlPackages.GetoptLong: 2.51 -> 2.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d4966a82020..54c04e595eab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8262,10 +8262,10 @@ let GetoptLong = buildPerlPackage { pname = "Getopt-Long"; - version = "2.51"; + version = "2.52"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz"; - sha256 = "0r659i6rkz8zkfgdccbn29zmd4bk9lcdc4y20ng6w2glqaa3pd10"; + url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.52.tar.gz"; + sha256 = "1yh5fykxrw68pvdvhvjh3wfs7a1s29xqwm5fxw2mqg9mfg1sgiwx"; }; }; From 865b5f88b9a2a909f4a1ee167511fb7db951748d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:17 +0000 Subject: [PATCH 058/411] [cpan2nix] perlPackages.GitAutofixup: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54c04e595eab..483c859ae3fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8313,7 +8313,7 @@ let pname = "App-Git-Autofixup"; version = "0.002007"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.002007.tar.gz"; sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6"; }; meta = { From 66b776d560bd689b4a11fdb16fb63b12a339be9a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:23 +0000 Subject: [PATCH 059/411] [cpan2nix] perlPackages.IOTee: 0.65 -> 0.66 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 483c859ae3fc..2b174b9f795a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9947,10 +9947,10 @@ let IOTee = buildPerlPackage { pname = "IO-Tee"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz"; - sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; + url = "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.66.tar.gz"; + sha256 = "1q2jhp02rywrbyhvl2lv6qp70dcv5cfalrx3cc4c7y8nclhfg71d"; }; }; From 96109ff492fce66f532846a4a235bfe4deb0899a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:24 +0000 Subject: [PATCH 060/411] [cpan2nix] perlPackages.IPCSysV: 2.07 -> 2.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b174b9f795a..00b857c5b02d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10055,10 +10055,10 @@ let IPCSysV = buildPerlPackage { pname = "IPC-SysV"; - version = "2.07"; + version = "2.08"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz"; - sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; + url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.08.tar.gz"; + sha256 = "1b89bf3a2564f578bd9cd17659ac53e064c28ef7dd80e3cb5efef4ba6126ea4f"; }; meta = { description = "System V IPC constants and system calls"; From 30fe1867a0920f3a6323f839d87c297ab14ebb9a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:24 +0000 Subject: [PATCH 061/411] [cpan2nix] perlPackages.IPCSystemSimple: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00b857c5b02d..d290773bc45f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10044,7 +10044,7 @@ let pname = "IPC-System-Simple"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz"; sha256 = "22e6f5222b505ee513058fdca35ab7a1eab80539b98e5ca4a923a70a8ae9ba9e"; }; meta = { From ea8bc61d9b67bcb5a8ac367853f9c9920479f4f5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:26 +0000 Subject: [PATCH 062/411] [cpan2nix] perlPackages.Imager: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d290773bc45f..0efe1991c592 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9582,7 +9582,7 @@ let pname = "Imager"; version = "1.012"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz"; sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; From 6f27be4bfc90d576be03709000049a586f421484 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:27 +0000 Subject: [PATCH 063/411] [cpan2nix] perlPackages.Importer: 0.025 -> 0.026 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0efe1991c592..4dd2083abb0f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9665,10 +9665,10 @@ let Importer = buildPerlPackage { pname = "Importer"; - version = "0.025"; + version = "0.026"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz"; - sha256 = "0745138c487d74033d0cbeb36f06595036dc7e688f1a5dbec9cc2fa799e13946"; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.026.tar.gz"; + sha256 = "e08fa84e13cb998b7a897fc8ec9c3459fcc1716aff25cc343e36ef875891b0ef"; }; meta = { description = "Alternative but compatible interface to modules that export symbols"; From 2c68f8d5ba1b8107afe0a98493deab525567e006 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:27 +0000 Subject: [PATCH 064/411] [cpan2nix] perlPackages.JSONPP: 4.04 -> 4.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4dd2083abb0f..a03c312f66d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10275,10 +10275,10 @@ let JSONPP = buildPerlPackage { pname = "JSON-PP"; - version = "4.04"; + version = "4.05"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz"; - sha256 = "0smna2b8h9jlzlbfb64i31vabyqyjs3iwhng0f0byjxrsxb1qcc1"; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.05.tar.gz"; + sha256 = "1kphifz5zzyjnn4s9d8dynvinm76bbsf1b7a7bs48kfgpjkbr8nm"; }; meta = { description = "JSON::XS compatible pure-Perl module"; From 976eec9f58696542ab48ec04b9c1819471ac15be Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:27 +0000 Subject: [PATCH 065/411] [cpan2nix] perlPackages.JSONParse: 0.56 -> 0.57 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a03c312f66d7..afd6a58dea85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10301,10 +10301,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.56"; + version = "0.57"; src = fetchurl { - url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.56.tar.gz; - sha256 = "1d8ir74sgf8kw1a7459ghdhh92kzrzaysapjbw1sb859sfsirkqw"; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.57.tar.gz"; + sha256 = "1rqaqpgh068kqj11srw874m5ph5qkaz77ib5fi4hrc402d2qxa45"; }; meta = { description = "Read JSON into a Perl variable"; From a58ed2e7ac06c914dc7159cfd017f6b044d7c193 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:32 +0000 Subject: [PATCH 066/411] [cpan2nix] perlPackages.LogLog4perl: 1.49 -> 1.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index afd6a58dea85..f40e36831fed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11200,10 +11200,10 @@ let LogLog4perl = buildPerlPackage { pname = "Log-Log4perl"; - version = "1.49"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz"; - sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.52.tar.gz"; + sha256 = "be1cbc318f0c7c40b3062127994691d14a05881f268bbd2611e789b4fdd306b1"; }; meta = { homepage = "https://mschilli.github.io/log4perl/"; From 80287fad96c7d27f67c5079841a881a65121a647 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:32 +0000 Subject: [PATCH 067/411] [cpan2nix] perlPackages.LogJournald: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f40e36831fed..21a9001652ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11248,7 +11248,7 @@ let pname = "Log-Journald"; version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-${version}.tar.gz"; + url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; sha256 = "55992cf9a1e1fb833f428300525bfa7cf7ed46b83ec414f82a091789b37d08a3"; }; buildInputs = [ pkgs.pkgconfig pkgs.systemd ]; From 51253e78c89e90730ba275d3f9bd7415402d2700 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:33 +0000 Subject: [PATCH 068/411] [cpan2nix] perlPackages.MCE: 1.872 -> 1.874 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 21a9001652ca..3dca26fa18bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11186,10 +11186,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.872"; + version = "1.874"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.872.tar.gz; - sha256 = "0ydih6w1di5fppcr2s9lxbyf8av7ksgqg0mirrw5mfcr92924p90"; + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz"; + sha256 = "1l6khsmwzfr88xb81kdvmdskxgz3pm4yz2ybxkbml4bmhh0y62fq"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; From da208cd416f8bf9af26a318a51cec6036e2efe2f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:33 +0000 Subject: [PATCH 069/411] [cpan2nix] perlPackages.MP3Info: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3dca26fa18bd..7fc8a667c65f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13979,7 +13979,7 @@ let pname = "MP3-Info"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMERELO/MP3-Info-1.26.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMERELO/MP3-Info-1.26.tar.gz"; sha256 = "1rwbrsdw6y6jgcjvrlji6fbcvwl4wlka3mkhlw12a7s2683k8qjp"; }; meta = { From f559bc87316af2da302b447260659e351ad4766a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:34 +0000 Subject: [PATCH 070/411] [cpan2nix] perlPackages.MP3Tag: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7fc8a667c65f..3ad78cfad185 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13992,11 +13992,11 @@ let pname = "MP3-Tag"; version = "1.15"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip"; sha256 = "1lanbwv97sfsb7h4vsg1v0dv3yghpz01nf3rzl4a9p3ycgs4ib5a"; }; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ CompressZlib ExtUtilsMakeMaker ]; + postPatch = '' substituteInPlace Makefile.PL --replace "'PL_FILES'" "#'PL_FILES'" ''; From 3569f9f665f0f9f725a086ccd63c7c712bf3f8e0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:35 +0000 Subject: [PATCH 071/411] [cpan2nix] perlPackages.MathBigInt: 1.999816 -> 1.999818 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ad78cfad185..d6232e182602 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11701,10 +11701,10 @@ let MathBigInt = buildPerlPackage { pname = "Math-BigInt"; - version = "1.999816"; + version = "1.999818"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz"; - sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999818.tar.gz"; + sha256 = "b27634356ce2af9b7c0123ac8395a89a32fb15aeae82fcd39de8156cad278c15"; }; meta = { description = "Arbitrary size integer/float math package"; From 04c6c1b24182e39ff10d968b6321062de3acd175 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:35 +0000 Subject: [PATCH 072/411] [cpan2nix] perlPackages.MathBigIntLite: 0.18 -> 0.19 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d6232e182602..7022b3796fc0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11728,12 +11728,12 @@ let MathBigIntLite = buildPerlPackage { pname = "Math-BigInt-Lite"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz"; - sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4"; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; + sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih"; }; - propagatedBuildInputs = [ MathBigInt ]; + meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; From a1083ea3f4ae217fed2511f9b255f320fe949c08 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:35 +0000 Subject: [PATCH 073/411] [cpan2nix] perlPackages.MathBigRat: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7022b3796fc0..89fb1ad41b2a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11739,18 +11739,7 @@ let }; }; - MathBigRat = buildPerlPackage { - pname = "Math-BigRat"; - version = "0.2614"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz"; - sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; - }; - meta = { - description = "Arbitrary big rational numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + MathBigRat = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 MathClipper = buildPerlModule { pname = "Math-Clipper"; From 2fdfce36dd555af4be88af116479c81c00e91cad Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:37 +0000 Subject: [PATCH 074/411] [cpan2nix] perlPackages.MathPari: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89fb1ad41b2a..cfab482a9b55 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11844,7 +11844,7 @@ let preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; makeMakerFlags = "pari_tgz=pari-${pariversion}.tgz"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/${pname}-${version}.zip"; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip"; sha256 = "dc38955a9690be6bafa8de2526212377c3ec9fe8da5ec02263a9caf94b58bb91"; }; meta = { From 3c07fec3915b58cf1515a570e31339fcb0ac1df6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:38 +0000 Subject: [PATCH 075/411] [cpan2nix] perlPackages.ModernPerl: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cfab482a9b55..962a2b84c2ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12383,7 +12383,7 @@ let version = "1.20200211"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz"; sha256 = "da1c83cee84fab9edb9e31d7f7abac43e1337b2e66015191ec4b6da59298c480"; }; meta = { From a44c9564a22f62564daf4f42691adcbd0b7ff443 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:41 +0000 Subject: [PATCH 076/411] [cpan2nix] perlPackages.MozillaCA: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 962a2b84c2ff..310d8649c261 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14031,7 +14031,7 @@ let pname = "Mozilla-CA"; version = "20200520"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz"; sha256 = "b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726"; }; From ce63d770ae859d124a34b10d59f81fe145a49ea8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:43 +0000 Subject: [PATCH 077/411] [cpan2nix] perlPackages.NetOpenSSH: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 310d8649c261..c2b340b3b2d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15102,7 +15102,7 @@ let pname = "Net-OpenSSH"; version = "0.79"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz"; sha256 = "4210fa64b50820f91ab4b6c0e02a579543fc071e73fbdec0f476447ca11172cc"; }; meta = { From 5e57f415a93583dcfe3ced5b6e8d971ac2e37527 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:43 +0000 Subject: [PATCH 078/411] [cpan2nix] perlPackages.NetPing: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2b340b3b2d0..df12ab86bafa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14585,7 +14585,7 @@ let pname = "Net-Ping"; version = "2.73"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz"; sha256 = "a5fbeafd3e65778364bead8800ae6a06d468ed68208619b5d4c1debd4d197cf2"; }; meta = { From fba03563cec4d1e9b14b831d4e84f4505c835be9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:43 +0000 Subject: [PATCH 079/411] [cpan2nix] perlPackages.NetSFTPForeign: 1.90 -> 1.91 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df12ab86bafa..ca128aaf78c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14655,10 +14655,10 @@ let NetSFTPForeign = buildPerlPackage { pname = "Net-SFTP-Foreign"; - version = "1.90"; + version = "1.91"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz"; - sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.91.tar.gz"; + sha256 = "b7395081314f26f3b93c857d65e9c80a04a63709df698583f22a360ffce7e178"; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' From 649980f4a384e08ccb348c569430e449d446d844 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:44 +0000 Subject: [PATCH 080/411] [cpan2nix] perlPackages.NetSNPP: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ca128aaf78c2..589644c382c4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14728,10 +14728,10 @@ let pname = "Net-SNPP"; version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBEYA/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/T/TO/TOBEYA/Net-SNPP-1.17.tar.gz"; sha256 = "06b851d64596625e866359fb017dd0d08973e0ebc50c323f4a1d50ecdd868e76"; }; - propagatedBuildInputs = [ libnet ]; + doCheck = false; meta = { description = "Simple Network Pager Protocol Client"; From 2866e77f27f1e8f6096da6431cd22881674473b1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:47 +0000 Subject: [PATCH 081/411] [cpan2nix] perlPackages.OggVorbisHeaderPurePerl: 1.0 -> 1.04 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 589644c382c4..7e3eb299ae9f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14996,12 +14996,12 @@ let OggVorbisHeaderPurePerl = buildPerlPackage { pname = "Ogg-Vorbis-Header-PurePerl"; - version = "1.0"; + version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANIEL/Ogg-Vorbis-Header-PurePerl-1.0.tar.gz; - sha256 = "0kjqswnwhp7yf7czvhggdyp2pgg5wa58b4jwpn8j3km7h2ll8pmy"; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Ogg-Vorbis-Header-PurePerl-1.04.tar.gz"; + sha256 = "04xcjbpkp6mc57f1626871xy3aqnmp8nr21hfsazih8mzklld5sg"; }; - buildInputs = [ TestMore ]; + # The testing mechanism is erorrneous upstream. See http://matrix.cpantesters.org/?dist=Ogg-Vorbis-Header-PurePerl+1.0 doCheck = false; meta = { From e77af0eed2776d50cfe1f0c04dfc9abcbb6330b5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:50 +0000 Subject: [PATCH 082/411] [cpan2nix] perlPackages.Parent: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e3eb299ae9f..03d6d02a37bf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15353,7 +15353,7 @@ let pname = "parent"; version = "0.238"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz"; sha256 = "1lfjqjxsvgpsn6ycah4z0qygkykj4v8ca3cdki61k2p2ygg8zx9q"; }; }; From 0562cbc8e5240d1f353aacc08361fa598471b30f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:51 +0000 Subject: [PATCH 083/411] [cpan2nix] perlPackages.PathTiny: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03d6d02a37bf..ed9f1e2ca659 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15512,7 +15512,7 @@ let pname = "Path-Tiny"; version = "0.114"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz"; sha256 = "cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1"; }; meta = { From d6c1745e1c39b01ce16e825b6b0c62a3b0aec277 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:52 +0000 Subject: [PATCH 084/411] [cpan2nix] perlPackages.PerlIOLayers: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed9f1e2ca659..4020fc09b339 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15662,7 +15662,7 @@ let pname = "PerlIO-Layers"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz"; sha256 = "1psaq3kwlk7g9rxvgsacfjk2mh6cscqf4xl7ggfkzfrnz91aabal"; }; meta = { From 94208c210c2c9da4b4e8758769f0ab6afd5d7637 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:53 +0000 Subject: [PATCH 085/411] [cpan2nix] perlPackages.Perlosnames: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4020fc09b339..46f9eb74a6c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15622,7 +15622,7 @@ let pname = "Perl-osnames"; version = "0.122"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.122.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.122.tar.gz"; sha256 = "7075939d747e375178d00348d00c52ff9db2cebb18bae7473dcb09df825118a0"; }; meta = { From a62933222dfad13c4ff34b5770f496cf62d153aa Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:53 +0000 Subject: [PATCH 086/411] [cpan2nix] perlPackages.PkgConfig: 0.23026 -> 0.24026 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46f9eb74a6c7..d25de2d2fa7e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15808,10 +15808,10 @@ let PkgConfig = buildPerlPackage { pname = "PkgConfig"; - version = "0.23026"; + version = "0.24026"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz"; - sha256 = "56c8ad9015af3799b99a21b8790997723406acf479f35d13fe9bf632db2d5c26"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.24026.tar.gz"; + sha256 = "345d44562802ddf3da70faf817e2d1884808166d00480fcce6d7b92005d91aee"; }; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; From 39934af21ce2ebc40b23bb6a44413987990c7715 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:10:58 +0000 Subject: [PATCH 087/411] [cpan2nix] perlPackages.RegexpGrammars: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d25de2d2fa7e..8a868ad7a9cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16819,7 +16819,7 @@ let pname = "Regexp-Grammars"; version = "1.057"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz"; sha256 = "af53c19818461cd701aeb57c49dffdb463edc4bf8f658d9ea4e6d534ac177041"; }; meta = { From aa9eac7b68ada05ab4f46a10d13b0c4de0b34f7e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:00 +0000 Subject: [PATCH 088/411] [cpan2nix] perlPackages.SafeHole: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a868ad7a9cf..30d38f16f10e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18145,7 +18145,7 @@ let pname = "Safe-Hole"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz"; sha256 = "01gc2lfli282dj6a2pkpxb0vmpyavs323cbdw15gxi06pn5nxxgl"; }; meta = { From b3a3309d9ed8c6e04b2bc86f6ed2320ef81135f1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:01 +0000 Subject: [PATCH 089/411] [cpan2nix] perlPackages.ScalarListUtils: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30d38f16f10e..3ddce92ea7b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17022,7 +17022,7 @@ let pname = "Scalar-List-Utils"; version = "1.55"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz"; sha256 = "4d2bdc1c72a7bc4d69d6a5cc85bc7566497c3b183c6175b832784329d58feb4b"; }; meta = { From 5d60b70b305ac2bea7ff5fc7db813971492063d5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:04 +0000 Subject: [PATCH 090/411] [cpan2nix] perlPackages.StatisticsChiSquare: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ddce92ea7b6..0189ba51c343 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17638,7 +17638,7 @@ let pname = "Statistics-ChiSquare"; version = "1.0000"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Statistics-ChiSquare-1.0000.tar.gz"; sha256 = "255a5a38336d048ddb9077222691e000984e907aae09a4ea695a9cfd49a1ddd0"; }; meta = { From 0a4235c7a6105f6ca2701d004c8d23aa845feb66 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:04 +0000 Subject: [PATCH 091/411] [cpan2nix] perlPackages.Storable: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0189ba51c343..c21046704bec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17681,17 +17681,7 @@ let propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; }; - Storable = buildPerlPackage { - pname = "Storable"; - version = "3.15"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz"; - sha256 = "fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da"; - }; - meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + Storable = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 StreamBuffered = buildPerlPackage { pname = "Stream-Buffered"; From 4222bfbc33e39e2ca08981d9a4f3180f10a4eac8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:08 +0000 Subject: [PATCH 092/411] [cpan2nix] perlPackages.SysMmap: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c21046704bec..b8aa5331552b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18227,7 +18227,7 @@ let pname = "Sys-Mmap"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz"; sha256 = "1kz22l7sh2mibliixyshc9958bqlkzsb13agcibp7azii4ncw80q"; }; meta = with stdenv.lib; { From c2d8c134139c44bfae3a1c6ae672f1b769bd95c0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:11 +0000 Subject: [PATCH 093/411] [cpan2nix] perlPackages.TestDeep: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b8aa5331552b..409ab6f92df8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19035,7 +19035,7 @@ let pname = "Test-Deep"; version = "1.130"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz"; sha256 = "0mkw18q5agr30djxr1y68rcfw8aq20ws872hmv88f9gnynag8r20"; }; meta = { From e128b8dc6fafc860b34ff6656726b258e956e08b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:13 +0000 Subject: [PATCH 094/411] [cpan2nix] perlPackages.TestMemoryGrowth: 0.03 -> 0.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 409ab6f92df8..d24d48052ded 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19395,10 +19395,10 @@ let TestMemoryGrowth = buildPerlModule { pname = "Test-MemoryGrowth"; - version = "0.03"; + version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-MemoryGrowth-0.03.tar.gz; - sha256 = "0z6lmalhq3k3p303qahs0ijp6sarf3ij88m39yhzizzf9abapvsz"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-MemoryGrowth-0.04.tar.gz"; + sha256 = "1l1f7mwjyfgfbhad13p4wgavnb3mdjs6v3xr2m0rxm5ba8kqard0"; }; meta = { description = "assert that code does not cause growth in memory usage"; From 050320b68924096e5c0774fdb940d265de08b403 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:15 +0000 Subject: [PATCH 095/411] [cpan2nix] perlPackages.TestRequires: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d24d48052ded..5a79b12daae0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19754,7 +19754,7 @@ let pname = "Test-Requires"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.11.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.11.tar.gz"; sha256 = "03q49vi09b4n31kpnmq4v2dga5ja438a8f1wgkgwvvlpjmadx22b"; }; meta = { From 5604e290bb7e4c79ce4e4f9b5209f7dbd4a6e614 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:18 +0000 Subject: [PATCH 096/411] [cpan2nix] perlPackages.TestSimple13: 1.302175 -> 1.302177 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5a79b12daae0..391aed96dce5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19979,10 +19979,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302175"; + version = "1.302177"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302175.tar.gz; - sha256 = "c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49"; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302177.tar.gz"; + sha256 = "9fbf263096d893d7f8e0dcb0ea0dfe8d62b973b86e6360f43b54080bd2974554"; }; meta = { description = "Basic utilities for writing tests"; From 9b2e9e53c9f2afe9bfbb80af6d4ae5db3bd4b683 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:18 +0000 Subject: [PATCH 097/411] [cpan2nix] perlPackages.TestTempDirTiny: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 391aed96dce5..5dae98590e12 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20053,7 +20053,7 @@ let license = with stdenv.lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; }; - propagatedBuildInputs = [ FileTemp ]; + }; TestTCP = buildPerlPackage { From f002615d7b4b320a41258d85398ebefdac61ca94 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:19 +0000 Subject: [PATCH 098/411] [cpan2nix] perlPackages.Testutf8: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5dae98590e12..f23183301cb7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20790,7 +20790,7 @@ let pname = "Test-utf8"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz"; sha256 = "df82f09c5940830b25a49f1c8162fa24d371e602880edef8d9a4d4bfd66b8bd7"; }; meta = { From fcc72589d1fae2e107ed19f18a9a2d96d0b65cf4 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:20 +0000 Subject: [PATCH 099/411] [cpan2nix] perlPackages.TextAligner: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f23183301cb7..3943679ead44 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20247,7 +20247,7 @@ let pname = "Text-Aligner"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.16.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.16.tar.gz"; sha256 = "09ap457vrlqvw2544j907fbb5crs08hd7sy4syipzxc6wny7v1aw"; }; meta = { From e2fec5867d8f6b1891b808c0940fd4bd67021e6c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:20 +0000 Subject: [PATCH 100/411] [cpan2nix] perlPackages.TextCSV_XS: 1.43 -> 1.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3943679ead44..da1a16e57c00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20368,10 +20368,10 @@ let TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.43"; + version = "1.44"; src = fetchurl { - url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.43.tgz; - sha256 = "cd94538e8ae9388d9e9e5527630f38f4d2b766e30310d283f0f9c692b94230bb"; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.44.tgz"; + sha256 = "c4812ddca8e2654736c44bc2ce60b27a428a1bc4d5364b0ed1fad3609c8f9bc4"; }; meta = { description = "Comma-Separated Values manipulation routines"; From 605f9ba9de53f77567bf7e688f6fc5c7dd6efd2a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:24 +0000 Subject: [PATCH 101/411] [cpan2nix] perlPackages.ThreadQueue: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da1a16e57c00..8bbaedb18a78 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20884,18 +20884,7 @@ let }; }; - ThreadQueue = buildPerlPackage { - pname = "Thread-Queue"; - version = "3.13"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz"; - sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; - }; - meta = { - description = "Thread-safe queues"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ThreadQueue = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 Throwable = buildPerlPackage { pname = "Throwable"; From cd5dd89ea424421e0026c0340d9d027e9b724e51 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:26 +0000 Subject: [PATCH 102/411] [cpan2nix] perlPackages.TimeDate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8bbaedb18a78..6a8ca151eb7b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21071,7 +21071,7 @@ let pname = "TimeDate"; version = "2.33"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz"; sha256 = "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0"; }; }; From b27f198df7d163270b08290c4befa2c3af6c8fb1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:29 +0000 Subject: [PATCH 103/411] [cpan2nix] perlPackages.Tk: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a8ca151eb7b..1efd2aee606e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21209,7 +21209,7 @@ let pname = "Tk"; version = "804.035"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz"; sha256 = "4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; From 36736dcb805818b0c5ac6c12ba4a994b3e7326fb Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:31 +0000 Subject: [PATCH 104/411] [cpan2nix] perlPackages.Version: 0.9924 -> 0.9927 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1efd2aee606e..1afed7ad71e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21633,10 +21633,10 @@ let Version = buildPerlPackage { pname = "version"; - version = "0.9924"; + version = "0.9927"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz"; - sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b"; + url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9927.tar.gz"; + sha256 = "a78cb8d9ecbfea200ac18bed9e6e72c8efd60e6ebeb47ee142c3c5c635a88d06"; }; meta = { description = "Structured version objects"; From 147c149b6279d9de86c06dad62844cbe40e562c7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:33 +0000 Subject: [PATCH 105/411] [cpan2nix] perlPackages.YAMLLibYAML: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1afed7ad71e1..7211b29a017c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22380,7 +22380,7 @@ let pname = "YAML-LibYAML"; version = "0.82"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz"; sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02"; }; }; From bf715ed24f37bf6e992df64eeaa566ff89e6114b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:35 +0000 Subject: [PATCH 106/411] [cpan2nix] perlPackages.bignum: removed built-in --- pkgs/top-level/perl-packages.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7211b29a017c..050f6e7d898e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1188,19 +1188,7 @@ let }; }; - bignum = buildPerlPackage { - pname = "bignum"; - version = "0.51"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz"; - sha256 = "8ac0f6efe0b6f24804690e53908bdc5346613667f1c0590d8cf808ec090e9c47"; - }; - meta = { - description = "Transparent BigNumber support for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - propagatedBuildInputs = [ MathBigInt ]; - }; + bignum = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 BitVector = buildPerlPackage { pname = "Bit-Vector"; From 12f3a1f5d33d70b25cbaa32e62b2a80551b2c247 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:39 +0000 Subject: [PATCH 107/411] [cpan2nix] perlPackages.threadsshared: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 050f6e7d898e..3a91fd9584d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20859,18 +20859,7 @@ let buildInputs = [ TestDifferences ]; }; - threadsshared = buildPerlPackage { - pname = "threads-shared"; - version = "1.59"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz"; - sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; - }; - meta = { - description = "Perl extension for sharing data structures between threads"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + threadsshared = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 ThreadQueue = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 From 308fb486f8275cd25f25d14c0e4368e805dedee7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:39 +0000 Subject: [PATCH 108/411] [cpan2nix] perlPackages.vidir: 0.042 -> 0.050 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a91fd9584d7..6b2c5f1978cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21623,10 +21623,10 @@ let vidir = buildPerlPackage { pname = "App-vidir"; - version = "0.042"; + version = "0.050"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.042.tar.gz"; - sha256 = "18xkln3xajysxk0jwfyhavnifrsz38zv81s1gfb1w0xkwky3cla3"; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.050.tar.gz"; + sha256 = "1xa3vabbkxaqa8pnyl0dblr1m4g2229m1fzl8c9q74f06i00hikh"; }; outputs = [ "out" ]; meta = { From 99dbca953a8d04b948f8d479496dea8a1f7f5a3b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:43 +0000 Subject: [PATCH 109/411] [cpan2nix] perlPackages.Clone: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b2c5f1978cf..babcb4c864a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2928,7 +2928,7 @@ let pname = "Clone"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz"; sha256 = "1rm9g68fklni63jdkrlgqq6yfj95fm33p2bq90p475gsi8sfxdnb"; }; meta = { From 5ced83f9f4d818238428779b88030ecbd407a4ad Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:44 +0000 Subject: [PATCH 110/411] [cpan2nix] perlPackages.ConfigIniFiles: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index babcb4c864a9..c5df56ef6632 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3177,7 +3177,7 @@ let pname = "Config-IniFiles"; version = "3.000003"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz"; sha256 = "3c457b65d98e5ff40bdb9cf814b0d5983eb0c53fb8696bda3ba035ad2acd6802"; }; propagatedBuildInputs = [ IOStringy ]; From abde10d6a573dc2bad3bb160adaa21f31155ea97 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:45 +0000 Subject: [PATCH 111/411] [cpan2nix] perlPackages.DBDPg: 3.12.3 -> 3.14.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5df56ef6632..28ea060afcc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5445,11 +5445,11 @@ let DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.12.3"; + version = "3.14.2"; src = fetchurl { - url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.12.3.tar.gz; - sha256 = "0rrlg2rwgkpcx67qf7081g7mj2shpqhj2iyxrq5fixf32nb0ad4v"; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.14.2.tar.gz"; + sha256 = "0kcfqq7g3832wiix0sbyvlc885qghjrp2ah3akn7h2lnb22fjwy9"; }; buildInputs = [ pkgs.postgresql ]; From 53c26926c7759c50f299648dd76e638ac254c1e9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:46 +0000 Subject: [PATCH 112/411] [cpan2nix] perlPackages.DBDSQLite: 1.64 -> 1.66 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 28ea060afcc8..70373c51beec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5359,11 +5359,11 @@ let DBDSQLite = buildPerlPackage { pname = "DBD-SQLite"; - version = "1.64"; + version = "1.66"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz"; - sha256 = "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl"; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz"; + sha256 = "1zljln5nh61gj3k22a1fv2vhx5l83waizmarwkh77hk6kzzmvrw9"; }; propagatedBuildInputs = [ DBI ]; From d5eb803eb8ae9563afa7cfceb4cffa0907f5d6a6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:47 +0000 Subject: [PATCH 113/411] [cpan2nix] perlPackages.EmailMIMEContentType: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70373c51beec..e3262d66c9a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6619,7 +6619,7 @@ let pname = "Email-MIME-ContentType"; version = "1.024"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz"; sha256 = "42d164ac7ff4dc2ea848e710fe21fa85509a3bcbb91ed2d356e4aba951ed8835"; }; meta = { From 29ff0d0df2cde8f2c6a9f4647aade0358ee4aff5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:48 +0000 Subject: [PATCH 114/411] [cpan2nix] perlPackages.ExtUtilsF77: 1.23 -> 1.24 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e3262d66c9a8..246864414e3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7118,16 +7118,17 @@ let ExtUtilsF77 = buildPerlPackage rec { pname = "ExtUtils-F77"; - version = "1.23"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KG/KGB/${pname}-${version}.tar.gz"; - sha256 = "634715969c1650be815b3f11c151444e8793ebd6b6d92ce8654d56d6f893a6a9"; + url = "mirror://cpan/authors/id/K/KG/KGB/ExtUtils-F77-1.24.tar.gz"; + sha256 = "355878a4a7f901eb18d21f9e21be8c8bfc6aaf9665d34b241bc1d43e32c5b730"; }; - buildInputs = [ FileWhich pkgs.gfortran ]; + buildInputs = [ pkgs.gfortran ]; meta = { description = "A simple interface to F77 libs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ FileWhich ]; }; ExtUtilsHelpers = buildPerlPackage { From 44d5149d5fe651d7f2b74ef5d667a504a5aa97d9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:50 +0000 Subject: [PATCH 115/411] [cpan2nix] perlPackages.FileUtil: 4.161950 -> 4.201720 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 246864414e3b..a4495534f8cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7963,10 +7963,10 @@ let FileUtil = buildPerlModule { pname = "File-Util"; - version = "4.161950"; + version = "4.201720"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz"; - sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; + url = "mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.201720.tar.gz"; + sha256 = "d4491021850d5c5cbd702c7e4744858079841d2fa93f1c2d09ddc9a7863608df"; }; buildInputs = [ TestNoWarnings ]; meta = { From a9a97009b7c59345e1f63f307fd12fbcef772782 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:51 +0000 Subject: [PATCH 116/411] [cpan2nix] perlPackages.HTTPDate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a4495534f8cb..f623fad009b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9322,7 +9322,7 @@ let description = "Date conversion routines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ TimeDate TimeLocal ]; + propagatedBuildInputs = [ TimeDate ]; }; HTTPEntityParser = buildPerlModule { From 0ef578ece29563752994d6aa7708a160ca762d7d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:53 +0000 Subject: [PATCH 117/411] [cpan2nix] perlPackages.JSONMaybeXS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f623fad009b9..8b8a0d8e5214 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10252,7 +10252,7 @@ let pname = "JSON-MaybeXS"; version = "1.004002"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz"; sha256 = "1dbpdlrk4pjwbn3wzawwsj57jqzdvi01h4kqpknwbl1n7gf2z3iv"; }; meta = { From 331492a7ee4f66b332ba72c8d50f899e1e1b7133 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:54 +0000 Subject: [PATCH 118/411] [cpan2nix] perlPackages.ListCompare: 0.53 -> 0.55 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b8a0d8e5214..27cd7b514620 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10788,12 +10788,12 @@ let ListCompare = buildPerlPackage { pname = "List-Compare"; - version = "0.53"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz"; - sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.55.tar.gz"; + sha256 = "cc719479836579d52b02bc328ed80a98f679df043a99b5710ab2c191669eb837"; }; - buildInputs = [ IOCaptureOutput ]; + buildInputs = [ CaptureTiny ]; meta = { homepage = "http://thenceforward.net/perl/modules/List-Compare/"; description = "Compare elements of two or more lists"; From 5d6f6ed3827656098228f550682e5e8d205334e7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:57 +0000 Subject: [PATCH 119/411] [cpan2nix] perlPackages.ModuleScanDeps: 1.27 -> 1.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 27cd7b514620..a2bdf1252b16 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12729,10 +12729,10 @@ let ModuleScanDeps = buildPerlPackage { pname = "Module-ScanDeps"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz"; - sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.29.tar.gz"; + sha256 = "0kl8p0006j52vq4bd59fyv7pm3yyv0h7pwaalrkn4brs6n8wxc7f"; }; buildInputs = [ TestRequires ]; meta = { From 37c292cc38a4e2005c5cbcbde41981ebc0d7a331 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:57 +0000 Subject: [PATCH 120/411] [cpan2nix] perlPackages.MojoliciousPluginWebpack: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a2bdf1252b16..ab5982fa3d7d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12918,10 +12918,10 @@ let MojoliciousPluginWebpack = buildPerlPackage { pname = "Mojolicious-Plugin-Webpack"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.12.tar.gz"; - sha256 = "2a0856e68446fc22b46692d9a6737f78467654f31e58ad1935e708bddf806d2c"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.13.tar.gz"; + sha256 = "7848c0698e1b52909c71add638f7523f5affdfb8133b4ddb6f23a3bca485e761"; }; propagatedBuildInputs = [ Mojolicious ]; meta = { From 00b822ef21f3906ddad0c540857c2264bcbfda39 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:11:59 +0000 Subject: [PATCH 121/411] [cpan2nix] perlPackages.NetDNS: 1.24 -> 1.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ab5982fa3d7d..6fd847548b51 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14336,10 +14336,10 @@ let NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.24.tar.gz; - sha256 = "11a6c2ba6cb1c6640f01c9bbf2036bcbe3974232e9b939ab94985230c92cde63"; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.26.tar.gz"; + sha256 = "eabaecd0fdb3e6adef8c9e016e8509319f19caa8c76836253f7db72bafe56498"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From cf7401aec76a665101743ed821af811ce2fe7230 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:02 +0000 Subject: [PATCH 122/411] [cpan2nix] perlPackages.SearchXapian: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fd847548b51..b4169e5f3346 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17086,7 +17086,7 @@ let pname = "Search-Xapian"; version = "1.2.25.2"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-${version}.tar.gz"; + url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.2.tar.gz"; sha256 = "0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"; }; patches = [ @@ -17097,7 +17097,7 @@ let stripLen = 1; }) ]; - buildInputs = [ pkgs.xapian ExtUtilsMakeMaker DevelLeak ]; + buildInputs = [ pkgs.xapian DevelLeak ]; meta = { description = "Perl XS frontend to the Xapian C++ search library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 01c3ea02d1e3524d2f587abbff97b3bef8cb3528 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:03 +0000 Subject: [PATCH 123/411] [cpan2nix] perlPackages.TestCompile: v2.4.0 -> v2.4.1 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4169e5f3346..6b5d676bd417 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18966,10 +18966,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.0.tar.gz; - sha256 = "eff7e320527d7a33d9b27443871c1e9d5dbeb11408fb9843c56496f67b99ad78"; + url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.1.tar.gz"; + sha256 = "56a7a3459db5de0f92419029cf1b4d51c44dd02d4690cff3c4eedf666f6d8d46"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { From d8eaf805c3a5db75a340303293dbeb40d6504e12 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:05 +0000 Subject: [PATCH 124/411] [cpan2nix] perlPackages.TextTable: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b5d676bd417..8e2bcd182b36 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20666,7 +20666,7 @@ let pname = "Text-Table"; version = "1.134"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz"; sha256 = "02yigisvgshpgfyqwj0xad4jg473cd80a6c210nb5h5p32dl5kxs"; }; propagatedBuildInputs = [ TextAligner ]; From 22d5704e363e5022363ba09ac859e7d959d7d351 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:07 +0000 Subject: [PATCH 125/411] [cpan2nix] perlPackages.ack: v3.3.1 -> v3.4.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e2bcd182b36..fff7eb20ab00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -91,11 +91,11 @@ let ack = buildPerlPackage { pname = "ack"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.3.1.tar.gz"; - sha256 = "12fm9zplyqndji52nb3b5d91z22g8gr61r1k153kjq84kw264fxf"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.4.0.tar.gz"; + sha256 = "0l3bkac2kl1nl5pwmh5b4plyr7wdzf1h501gwkga2ag1p6wxdkvf"; }; outputs = ["out" "man"]; From a0323d8da7f11752a083056e78cbe01138c0c40d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:11 +0000 Subject: [PATCH 126/411] [cpan2nix] perlPackages.IOCompress: 2.093 -> 2.096 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fff7eb20ab00..2f96fa978ea1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9751,10 +9751,10 @@ let IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.093"; + version = "2.096"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.093.tar.gz"; - sha256 = "5f8f5d06913f16c16759cc4e06749692208b8947910ffedd2c00a74ed0d60ba2"; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.096.tar.gz"; + sha256 = "9d219fd5df4b490b5d2f847921e3cb1c3392758fa0bae9b05a8992b3620ba572"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { From 8413e5b1f165ab3b62900f79e43c3c502048b8f9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:15 +0000 Subject: [PATCH 127/411] [cpan2nix] perlPackages.EV: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f96fa978ea1..63e826841e9f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6917,7 +6917,7 @@ let pname = "EV"; version = "4.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz"; sha256 = "4aee8391b88113b42187f91fd49245fdc8e9b193a15ac202f519caae2aa8ea35"; }; buildInputs = [ CanaryStability ]; From 7607daaaf2d057b46a1da2d5b1137d2825e56351 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:15 +0000 Subject: [PATCH 128/411] [cpan2nix] perlPackages.ExtUtilsCppGuess: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 63e826841e9f..7deba3d15de6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7101,7 +7101,7 @@ let }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; - buildInputs = [ ExtUtilsCBuilder ModuleBuild ]; + buildInputs = [ ModuleBuild ]; }; ExtUtilsDepends = buildPerlPackage { From 07f545a8c80523327543271a36c1b0f61fdf5157 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:17 +0000 Subject: [PATCH 129/411] [cpan2nix] perlPackages.GD: 2.71 -> 2.72 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7deba3d15de6..66b3b519c719 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8154,10 +8154,10 @@ let GD = buildPerlPackage { pname = "GD"; - version = "2.71"; + version = "2.72"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz"; - sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.72.tar.gz"; + sha256 = "014ik1rng6cnjfgdarkyy5m6wl4pdzc2b445m27krfn3zh9hgl31"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; From 80409218db2855c3794da60f3b4f537addf8bb0f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:18 +0000 Subject: [PATCH 130/411] [cpan2nix] perlPackages.Glib: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66b3b519c719..e7dda69707ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8361,7 +8361,7 @@ let pname = "Glib"; version = "1.3293"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz"; sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; From 985e91fadc298954c3f27647a843e8a78f61be58 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:18 +0000 Subject: [PATCH 131/411] [cpan2nix] perlPackages.HTTPTinyish: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7dda69707ac..5a5457b6fd48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9541,10 +9541,10 @@ let HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.16.tar.gz; - sha256 = "1a3318b89987c2aa5dd18990a109e8af63049f87e4e1a9357583beed1c3bfbda"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.17.tar.gz"; + sha256 = "47bd111e474566d733c41870e2374c81689db5e0b5a43adc48adb665d89fb067"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { From e410529bdf54779b51738c18772bbe5abfe67660 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:18 +0000 Subject: [PATCH 132/411] [cpan2nix] perlPackages.IOPager: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5a5457b6fd48..c9dbc2a5a6a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9836,7 +9836,7 @@ let version = "1.03"; pname = "IO-Pager"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz; + url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz"; sha256 = "13mmykrb391584wkw907zrmy4hg1fa9hj3zw58whdq5bjc66r1mc"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests From 8aa291968cce8951d2a8db660b4178a858e8fe10 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:19 +0000 Subject: [PATCH 133/411] [cpan2nix] perlPackages.IOSocketSSL: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9dbc2a5a6a3..f404c2f2fb6a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9884,7 +9884,7 @@ let pname = "IO-Socket-SSL"; version = "2.068"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz; + url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz"; sha256 = "4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; From 2532d579dd0b95fb9c3276eaa633f4e0852daf85 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:19 +0000 Subject: [PATCH 134/411] [cpan2nix] perlPackages.Inline: 0.83 -> 0.86 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f404c2f2fb6a..d9fe850407d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10108,10 +10108,10 @@ let Inline = buildPerlPackage { pname = "Inline"; - version = "0.83"; + version = "0.86"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz"; - sha256 = "171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239"; + url = "mirror://cpan/authors/id/I/IN/INGY/Inline-0.86.tar.gz"; + sha256 = "510a7de2d011b0db80b0874e8c0f7390010991000ae135cff7474df1e6d51e3a"; }; buildInputs = [ TestWarn ]; meta = { From 1ae0cf37e7588c129ec1012ba9e9558c09b5c715 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:20 +0000 Subject: [PATCH 135/411] [cpan2nix] perlPackages.ModuleCompile: 0.37 -> 0.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d9fe850407d0..c53131a32f7b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12483,10 +12483,10 @@ let ModuleCompile = buildPerlPackage rec { pname = "Module-Compile"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${pname}-${version}.tar.gz"; - sha256 = "18e6c4c4d2d5e39c21dde60a64424eed547e1d234ecc73a35278ea08161a8078"; + url = "mirror://cpan/authors/id/I/IN/INGY/Module-Compile-0.38.tar.gz"; + sha256 = "8090cfbb61123437eefec3e3bed86005d1f7c5a529fb6fda2ebebc6564b9aa10"; }; propagatedBuildInputs = [ CaptureTiny DigestSHA1 ]; meta = { From e958f15b25464510322b7c341c8e3165c74651ea Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:21 +0000 Subject: [PATCH 136/411] [cpan2nix] perlPackages.NetIPv6Addr: 0.96 -> 1.01 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c53131a32f7b..7de72f612b91 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14520,12 +14520,12 @@ let NetIPv6Addr = buildPerlPackage { pname = "Net-IPv6Addr"; - version = "0.96"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-0.96.tar.gz"; - sha256 = "1y6dpv3gafvjcw9c5ldxminykz6aggwqdj6l93h9w2hncz8fa0iv"; + url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-1.01.tar.gz"; + sha256 = "008blh52k8g3syfk4dlmg7wclhdmksqkb5vk2qaxjpxmzq1pzqi7"; }; - propagatedBuildInputs = [ MathBase85 MathBigInt NetIPv4Addr ]; + propagatedBuildInputs = [ MathBase85 NetIPv4Addr ]; meta = { description = "Check and manipulate IPv6 addresses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From efdb71061e89723dccfe916b3897a250388c3311 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:23 +0000 Subject: [PATCH 137/411] [cpan2nix] perlPackages.StringInterpolate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7de72f612b91..a06ce8ac3c5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17793,7 +17793,7 @@ let pname = "String-Interpolate"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz"; sha256 = "15fwbpz3jdpdgmz794iw9hz2caxrnrw9pdwprxxkanpm92cdhaf7"; }; meta = with stdenv.lib; { From 1ed4b78fc1c62e3b070c6722fe63f66aba5c5a63 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:28 +0000 Subject: [PATCH 138/411] [cpan2nix] perlPackages.AnyEventHTTP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a06ce8ac3c5a..ef26a82b4b95 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -364,7 +364,7 @@ let pname = "AnyEvent-HTTP"; version = "2.25"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.25.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.25.tar.gz"; sha256 = "5cfa53416124176f6f4cd32b00ea8ca79a2d5df51258683989cd04fe86e25013"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; From ef7502a3af8c723a100ada3b5e17dcb6d4a39b67 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:31 +0000 Subject: [PATCH 139/411] [cpan2nix] perlPackages.CryptJWT: 0.028 -> 0.029 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef26a82b4b95..8b8880febca7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3831,10 +3831,10 @@ let CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.028"; + version = "0.029"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.028.tar.gz; - sha256 = "af819a620fa9b2d0432f718fecc3e4d8458d04b932f27fcb6217e0f39027e633"; + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.029.tar.gz"; + sha256 = "0fccff29065a0098eef151deeb33c12c0d68e16a1cb4e7465b26ebbd4c18cd2f"; }; propagatedBuildInputs = [ CryptX JSON ]; meta = { From be8f96f083b7bb67f85dd26e975997c0ba1778f2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:31 +0000 Subject: [PATCH 140/411] [cpan2nix] perlPackages.CryptRandom: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b8880febca7..58cc68cd4f17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3886,7 +3886,7 @@ let pname = "Crypt-Random"; version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VI/VIPUL/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.52.tar.gz"; sha256 = "a93c06de409e6f2eb2e9868ea6d4e653d99f2f7900b2c1831e1f65ace0c4ef84"; }; propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; From f5a601a24bb37a01ab6bd56bd1a1d99ce3f08470 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:32 +0000 Subject: [PATCH 141/411] [cpan2nix] perlPackages.DevelCheckOS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 58cc68cd4f17..73d998dffb4b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5228,7 +5228,7 @@ let pname = "Devel-CheckOS"; version = "1.83"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz"; sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972"; }; propagatedBuildInputs = [ FileFindRule ]; From 35a18224000d8d6d6d3000d9ed5f4910046c5cca Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:32 +0000 Subject: [PATCH 142/411] [cpan2nix] perlPackages.DevelPatchPerl: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73d998dffb4b..03c2b60581bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5252,7 +5252,7 @@ let pname = "Devel-PatchPerl"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz"; sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; From fdd6e23fccc6baa6de793b9877c93611bf3e349f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:34 +0000 Subject: [PATCH 143/411] [cpan2nix] perlPackages.MathPrimeUtil: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03c2b60581bd..ab3c3877ca98 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11867,6 +11867,7 @@ let license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; + buildInputs = [ TestWarn ]; }; MathPrimeUtilGMP = buildPerlPackage { From daf9154068641c23a161c4ff023b9a858c77b643 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:35 +0000 Subject: [PATCH 144/411] [cpan2nix] perlPackages.MojoliciousPluginAssetPack: 2.08 -> 2.09 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ab3c3877ca98..30b908f5bdab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12839,12 +12839,12 @@ let MojoliciousPluginAssetPack = buildPerlPackage { pname = "Mojolicious-Plugin-AssetPack"; - version = "2.08"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.08.tar.gz"; - sha256 = "585d9e056258b00590da109b4d5ee573fa3eb2248425247aebbfedac5a157152"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.09.tar.gz"; + sha256 = "7d3277748fb05221085a7632dd1c152e8b41c5519fd3984a0380404221e0686d"; }; - propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious JavaScriptMinifierXS CSSMinifierXS ]; + propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ]; meta = { homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack"; description = "Compress and convert css, less, sass, javascript and coffeescript files"; From 895bb1a43a94dfb0b9d3309c139e9119389087ec Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:37 +0000 Subject: [PATCH 145/411] [cpan2nix] perlPackages.POE: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30b908f5bdab..98e72eb1245a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16014,7 +16014,7 @@ let pname = "POE"; version = "1.368"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz"; sha256 = "08g1vzxamqg0gmkirdcx7fycq3pwv9vbajc30qwqpm1n3rvdrcdp"; }; # N.B. removing TestPodLinkCheck from buildInputs because tests requiring From dce87ace965cd15a36a9ff25d677957204442b27 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:38 +0000 Subject: [PATCH 146/411] [cpan2nix] perlPackages.TestWarnings: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98e72eb1245a..ff0019f96087 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20131,7 +20131,7 @@ let pname = "Test-Warnings"; version = "0.030"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz"; sha256 = "89a4947ddf1564ae01122275584433d7f6c4370370bcf3768922d796956ae24f"; }; buildInputs = [ CPANMetaCheck PadWalker ]; From 67734d158ad93222e2422c323587578b38125767 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:41 +0000 Subject: [PATCH 147/411] [cpan2nix] perlPackages.YAMLPP: 0.022 -> 0.025 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff0019f96087..30a346584339 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22366,10 +22366,10 @@ let YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.022"; + version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.022.tar.gz; - sha256 = "1hf7kpnzais4inhvh3azr0r9886lsqr8xjb81nik0idlgpl8rzh2"; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.025.tar.gz"; + sha256 = "1v579a874b98l8kj0sk2qk8ydcgqlzlrvcs2yc77s1xnxay15b0m"; }; buildInputs = [ TestDeep TestWarn ]; meta = { From 0d6aaaa4f43437e16d0f6e9265c61ca4540af4bd Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:42 +0000 Subject: [PATCH 148/411] [cpan2nix] perlPackages.CGISimple: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30a346584339..9b6ce732874c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2355,7 +2355,7 @@ let pname = "CGI-Simple"; version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz"; sha256 = "0zpl7sa8jvv3zba2vcxf3qsrjk7kk2vcznfdpmxydw06x8vczrp5"; }; propagatedBuildInputs = [ IOStringy ]; From 71ed4d830483f9ffc58a131ca0a7aaf6f65fd35d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:43 +0000 Subject: [PATCH 149/411] [cpan2nix] perlPackages.Coro: 6.55 -> 6.57 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b6ce732874c..e9ec943c8334 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3497,10 +3497,10 @@ let Coro = buildPerlPackage { pname = "Coro"; - version = "6.55"; + version = "6.57"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz"; - sha256 = "0c4ams0lqxlh9nwp2l3gd0if35dw0m3774pfl16dmz3hf419rms3"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"; + sha256 = "1ihl2zaiafr2k5jzj46j44j8vxqs23fqcsahypmi23jl6f0f8a0r"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; From 3fe95b6d0fa553f748ea81afbbec2859e8442c5a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:44 +0000 Subject: [PATCH 150/411] [cpan2nix] perlPackages.MailAuthenticationResults: 1.20200331.1 -> 1.20200824.1 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9ec943c8334..237438d9cebf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11433,10 +11433,10 @@ let MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; - version = "1.20200331.1"; + version = "1.20200824.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200331.1.tar.gz; - sha256 = "0qpairi9gmwinws4ay46pjnckib6217k0ig604ppkmjzilwjvf2c"; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200824.1.tar.gz"; + sha256 = "16hyl631yk1d5g3jns0n4mkjawlzqnf003brnk6qc3mbkziaifik"; }; buildInputs = [ TestException ]; meta = { From 5dd908732e58ace3fcba667949843d6295f9f54f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:45 +0000 Subject: [PATCH 151/411] [cpan2nix] perlPackages.NetDNSResolverMock: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 237438d9cebf..aed2b89b0e2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14354,7 +14354,7 @@ let pname = "Net-DNS-Resolver-Mock"; version = "1.20200215"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz"; sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy"; }; propagatedBuildInputs = [ NetDNS ]; From 6da25c5c1faeb77079ca92e1a67db573fe84ef5a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:47 +0000 Subject: [PATCH 152/411] [cpan2nix] perlPackages.TestFatal: 0.014 -> 0.016 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aed2b89b0e2e..cea29e9f7172 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19129,10 +19129,10 @@ let TestFatal = buildPerlPackage { pname = "Test-Fatal"; - version = "0.014"; + version = "0.016"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz"; - sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.016.tar.gz"; + sha256 = "7283d430f2ba2030b8cd979ae3039d3f1b2ec3dde1a11ca6ae09f992a66f788f"; }; propagatedBuildInputs = [ TryTiny ]; meta = { From 8b0db1ff34c584500db8ff79c80f8bee9c089fbe Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:48 +0000 Subject: [PATCH 153/411] [cpan2nix] perlPackages.TypeTiny: 1.010002 -> 1.010006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cea29e9f7172..5605abfc5cd8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21283,10 +21283,10 @@ let TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.010002"; + version = "1.010006"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010002.tar.gz; - sha256 = "2ea6ea2d8b2b3bb1b94f0309fa5064d57e7734c8bb14e99218e655dc1647073a"; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010006.tar.gz"; + sha256 = "f1568e3f0bf103e65faadc1804c6184fe29bf52559e7ff3c12f4dad437befd82"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { From 57e1050e9d2b59cd7394abb00eae330315cb2518 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:48 +0000 Subject: [PATCH 154/411] [cpan2nix] perlPackages.AuthenKrb5: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5605abfc5cd8..0d85cafd658c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -857,11 +857,12 @@ let sha256 = "0kgpl0x1qxq1p2ccxy8qqkrvqba2gq6aq6p931qnz9812nxh0yyp"; }; perlPreHook = "export LD=$CC"; - propagatedBuildInputs = [ pkgs.libkrb5 DevelChecklib FileWhich PkgConfig ]; + propagatedBuildInputs = [ pkgs.libkrb5 ]; meta = { description = "XS bindings for Kerberos 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ DevelChecklib FileWhich PkgConfig ]; }; AuthenKrb5Admin = buildPerlPackage rec { From bb483b0202604e6d511de3f5a2ad71ca75ee72cb Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:51 +0000 Subject: [PATCH 155/411] [cpan2nix] perlPackages.HashMerge: 0.300 -> 0.302 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d85cafd658c..fcf4f325d98f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8770,10 +8770,10 @@ let HashMerge = buildPerlPackage { pname = "Hash-Merge"; - version = "0.300"; + version = "0.302"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz"; - sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; + url = "mirror://cpan/authors/id/H/HE/HERMES/Hash-Merge-0.302.tar.gz"; + sha256 = "0i46agids6pk445gfck80f8z7q3pjvkp0ip1vmhqnq1rcpvj41df"; }; propagatedBuildInputs = [ CloneChoose ]; meta = { From c60f2b6f04a0e5f2a3017571d2b51127522fc8c3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:51 +0000 Subject: [PATCH 156/411] [cpan2nix] perlPackages.MetricsAny: 0.05 -> 0.06 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fcf4f325d98f..23e9395c5f76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12129,10 +12129,10 @@ let MetricsAny = buildPerlModule { pname = "Metrics-Any"; - version = "0.05"; + version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.05.tar.gz; - sha256 = "1xg7y8szbfwmh72y8l1w0rz4jrd66hisl6hh3hyq31f52cs6hwvr"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.06.tar.gz"; + sha256 = "0dwqzd40f6isb2sxn7lymsp0ism7s4xwfhb2ilavnxx2x3w9sllw"; }; buildInputs = [ TestFatal ]; meta = { From 4cda5e228cac10785a8c3fbb241d739b6dd19518 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:52 +0000 Subject: [PATCH 157/411] [cpan2nix] perlPackages.StructDumb: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23e9395c5f76..42b5537f4c5c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17935,7 +17935,7 @@ let pname = "Struct-Dumb"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz"; sha256 = "0wvzcpil9xc2wkibq3sj8i5bgq4iadx2k7hfqb8jm5p66g271kjj"; }; buildInputs = [ TestFatal ]; From 86f81a524a346c37a3b675dd6f56e03abbe82320 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:53 +0000 Subject: [PATCH 158/411] [cpan2nix] perlPackages.TestTrailingSpace: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42b5537f4c5c..88123b7d3594 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20091,7 +20091,7 @@ let pname = "Test-TrailingSpace"; version = "0.0600"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz"; sha256 = "f09d263adec06700a43a24e29f5484cf6d2939914c607dec51590f4bb8fa5a11"; }; propagatedBuildInputs = [ FileFindObjectRule ]; From 8745b3d5c9fccee59a0345806f7ea25867547037 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:53 +0000 Subject: [PATCH 159/411] [cpan2nix] perlPackages.TextTemplate: 1.58 -> 1.59 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88123b7d3594..c1aeb4854004 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20690,10 +20690,10 @@ let TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.58"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz"; - sha256 = "0c465757782c4bfb9b17335307a8286771fd36ea04d259bc454ac63355f2a287"; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.59.tar.gz"; + sha256 = "1dd2c788c05303ed9a970e1881109642151fa93e02c7a80d4c70608276bab1ee"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; From 88b752ec6c08c264a8886a4d9ac5e0947139ef00 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:54 +0000 Subject: [PATCH 160/411] [cpan2nix] perlPackages.AuthenKrb5Admin: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1aeb4854004..ccb0d6c74d3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -869,7 +869,7 @@ let pname = "Authen-Krb5-Admin"; version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SJ/SJQUINNEY/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/S/SJ/SJQUINNEY/Authen-Krb5-Admin-0.17.tar.gz"; sha256 = "5dd49cacd983efd61a8c3f1a56571bb73785eb155908b5d7bec97eed78df0c54"; }; propagatedBuildInputs = [ pkgs.krb5Full.dev AuthenKrb5 ]; From 8f96306bfeec914134931624e916181208f9233c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:56 +0000 Subject: [PATCH 161/411] [cpan2nix] perlPackages.FileLibMagic: 1.22 -> 1.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ccb0d6c74d3d..efa6ac9ef8ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7628,10 +7628,10 @@ let FileLibMagic = buildPerlPackage { pname = "File-LibMagic"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.22.tar.gz; - sha256 = "93639bd076849e93a020fea1507f0a2b3467b8792eb5c306f2aacbbfb4d080d6"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.23.tar.gz"; + sha256 = "52e6b1dc7cb2d87a4cdf439ba145e0b9e8cf28cc26a48a3cf9977c83463967ee"; }; buildInputs = [ pkgs.file ConfigAutoConf TestFatal ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; From 4d1070aa867a246ad1b4b7e960a606e3158dddec Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:12:58 +0000 Subject: [PATCH 162/411] [cpan2nix] perlPackages.Gtk3: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index efa6ac9ef8ef..07c224ff95f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8706,7 +8706,7 @@ let pname = "Gtk3"; version = "0.037"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz"; sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; From 833e0a2e7edf2337f929e2eb0d2f73da31411c6b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:01 +0000 Subject: [PATCH 163/411] [cpan2nix] perlPackages.TestMetricsAny: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07c224ff95f6..02177f620020 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19401,7 +19401,7 @@ let pname = "Test-Metrics-Any"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Metrics-Any-0.01.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Metrics-Any-0.01.tar.gz"; sha256 = "0s744lv997g1wr4i4vg1d7zpzjfw334hdy45215jf6xj9s6wh1i5"; }; propagatedBuildInputs = [ MetricsAny ]; From bd11cafde641f643bec3fc8818863d978d8a4ad7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:01 +0000 Subject: [PATCH 164/411] [cpan2nix] perlPackages.TestMockModule: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02177f620020..5ede1d607c6d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19445,7 +19445,7 @@ let pname = "Test-MockModule"; version = "0.173.0"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz"; sha256 = "0hnv2ziyasrri58ys93j5qyyzgxw3jx5hvjhd72nsp4vqq6lhg6s"; }; propagatedBuildInputs = [ SUPER ]; From 20d6f868b4e9d06064d3a30fd98cec2f29d9aed2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:02 +0000 Subject: [PATCH 165/411] [cpan2nix] perlPackages.ArchiveZip: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ede1d607c6d..761e772859c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -794,7 +794,7 @@ let pname = "Archive-Zip"; version = "1.68"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz"; sha256 = "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq"; }; buildInputs = [ TestMockModule ]; From 24040a0c9e2c489aa47f64cac561672098d847a7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:03 +0000 Subject: [PATCH 166/411] [cpan2nix] perlPackages.Dotenv: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 761e772859c1..cc3fb7ddb2ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6466,7 +6466,7 @@ let sha256 = "04c7a7cc4511617d7a70c4ca410d10707dc496248cdad20240ae242223212454"; }; buildInputs = [ TestCPANMeta TestPod TestPodCoverage ]; - propagatedBuildInputs = [ PathTiny PodParser ]; + propagatedBuildInputs = [ PathTiny ]; meta = { description = "Support for C in Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f0850630d411b5441c13b38270d02162e6b63bfa Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:04 +0000 Subject: [PATCH 167/411] [cpan2nix] perlPackages.Future: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cc3fb7ddb2ce..05b2768f4b3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8128,7 +8128,7 @@ let pname = "Future"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz"; sha256 = "1h5609wd1m774h8brgm5vinz6pfmdszp2ms6ybxlyhs0p5msp36f"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; From 928d598bd39312f83ce418d9a4f23ef2107df2b9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:04 +0000 Subject: [PATCH 168/411] [cpan2nix] perlPackages.Gtk3SimpleList: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05b2768f4b3c..578b630709b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8720,7 +8720,7 @@ let pname = "Gtk3-SimpleList"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz; + url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz"; sha256 = "1158mnr2ldq02098hqbkwfv64d83zl3a8scll9s09g7k1c86ai0x"; }; meta = { From 263acf2712beb350fcba54647dc1691f6a7542cb Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:05 +0000 Subject: [PATCH 169/411] [cpan2nix] perlPackages.MailMessage: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 578b630709b6..303d7b01cc90 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11490,7 +11490,7 @@ let pname = "Mail-Message"; version = "3.009"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz"; sha256 = "06ngjxnw0r5s6fnwc6qd2710p5v28ssgjkghkw8nqy2glacczlir"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; From 5ddddb19a7e055c3a6efc364af7dd3c84c177e9c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:07 +0000 Subject: [PATCH 170/411] [cpan2nix] perlPackages.PDFAPI2: 2.037 -> 2.038 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 303d7b01cc90..2b561648c775 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15569,10 +15569,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.037"; + version = "2.038"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.037.tar.gz; - sha256 = "142803d1886d2a2919d374fb6c25681630aa26740e3f8023337f996fa6c6297e"; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz"; + sha256 = "7447c4749b02a784f525d3c7ece99d34b0a10475db65096f6316748dd2f9bd09"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; From 830999b956ef9de5137542508aa01f5664fff7cc Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:07 +0000 Subject: [PATCH 171/411] [cpan2nix] perlPackages.POSIXstrftimeCompiler: 0.42 -> 0.44 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b561648c775..feb56711d8fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16669,10 +16669,10 @@ let POSIXstrftimeCompiler = buildPerlModule { pname = "POSIX-strftime-Compiler"; - version = "0.42"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz"; - sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.44.tar.gz"; + sha256 = "dfd3c97398dcfe51c8236b85e3dc28035667b76531f7aa0a6535f3aa5405b35a"; }; # We cannot change timezones on the fly. prePatch = "rm t/04_tzset.t"; @@ -16681,6 +16681,7 @@ let description = "GNU C library compatible strftime for loggers and servers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny ]; }; Apprainbarf = buildPerlModule { From 66a680907e6ba595739e195c596935b78dc240b6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:09 +0000 Subject: [PATCH 172/411] [cpan2nix] perlPackages.StringUtil: 1.26 -> 1.31 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index feb56711d8fa..6b49ed3f23ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17917,17 +17917,17 @@ let StringUtil = buildPerlModule { pname = "String-Util"; - version = "1.26"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz"; - sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; + url = "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.31.tar.gz"; + sha256 = "0vfjvy04y71f8jsjg0yll28wqlpgn7gbkcrb0i72k0qcliz9mg7v"; }; meta = { description = "String::Util -- String processing utilities"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ NumberMisc ]; - buildInputs = [ TestToolbox ]; + + buildInputs = [ ModuleBuildTiny ]; }; strip-nondeterminism = callPackage ../development/perl-modules/strip-nondeterminism { }; From 8b1eb810374e3964b5abb0254a9c15c310ba110b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:10 +0000 Subject: [PATCH 173/411] [cpan2nix] perlPackages.Test2Suite: 0.000130 -> 0.000135 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b49ed3f23ee..4e7ede01bb8f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18788,10 +18788,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000130"; + version = "0.000135"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000130.tar.gz; - sha256 = "d462cb95024c0735fc0fdb22f92fda4f852bf85d92d89bd95e4fa212730d534a"; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000135.tar.gz"; + sha256 = "1d0ac9e1e363c70ffecfe155e2cf917c610c671f65aa1cdb2425a3a6caeae21b"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From 1f910522db8de56f4287f0c2f4f4a6d9bc87ceac Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:10 +0000 Subject: [PATCH 174/411] [cpan2nix] perlPackages.XSObjectMagic: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e7ede01bb8f..47f3253d7089 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22292,7 +22292,7 @@ let pname = "XS-Object-Magic"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/XS-Object-Magic-0.05.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/XS-Object-Magic-0.05.tar.gz"; sha256 = "0njyy4y0zax4zz55y82dlm9cly1pld1lcxb281s12bp9rrhf9j9x"; }; buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ]; From 44bb32e0dcee1d47adc35f52c91e129a632b1980 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:11 +0000 Subject: [PATCH 175/411] [cpan2nix] perlPackages.CPANPLUS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47f3253d7089..6056c6f00d95 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3659,7 +3659,7 @@ let pname = "CPANPLUS"; version = "0.9908"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz"; sha256 = "1m4xas67fax947kahvg4jsnsr2r1i58c5g3f1bixh7krgnsarxjq"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; From 10ac630de687d044a259335a3e23b40ac8f428a1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:12 +0000 Subject: [PATCH 176/411] [cpan2nix] perlPackages.FFICheckLib: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6056c6f00d95..01c651c7fb17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7334,7 +7334,7 @@ let pname = "FFI-CheckLib"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz"; sha256 = "0x1dk4hlhvcbgwivf345phbqz0v5hawxxnby21h8bkagq93jfi4d"; }; buildInputs = [ Test2Suite ]; From 768453dbfeec324b997fbd592bcd6909afe7db2b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:12 +0000 Subject: [PATCH 177/411] [cpan2nix] perlPackages.LinguaStem: 0.84 -> 2.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 01c651c7fb17..8f0de9ce6c79 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10609,10 +10609,10 @@ let LinguaStem = buildPerlModule { pname = "Lingua-Stem"; - version = "0.84"; + version = "2.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz"; - sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-2.30.tar.gz"; + sha256 = "0wx1sa3y3l1a09zxqlfysxlc0x8cwjin3ivh849shv2xy2a3x27q"; }; doCheck = false; propagatedBuildInputs = [ LinguaPTStemmer LinguaStemFr LinguaStemIt LinguaStemRu LinguaStemSnowballDa SnowballNorwegian SnowballSwedish TextGerman ]; From d6606ed82c99e5f7c450e7ec43a9ddde3382b67e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:12 +0000 Subject: [PATCH 178/411] [cpan2nix] perlPackages.MailTransport: 3.004 -> 3.005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f0de9ce6c79..1a7da919050c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11617,10 +11617,10 @@ let MailTransport = buildPerlPackage { pname = "Mail-Transport"; - version = "3.004"; + version = "3.005"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz"; - sha256 = "049xsjxfn00v5znmrg7vgyafy5wzxxa901hq2g083s0pyq4mlcfg"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.005.tar.gz"; + sha256 = "18wna71iyrgn63l7samacvnx2a5ydpcffkg313c8a4jwf0zvkp6h"; }; propagatedBuildInputs = [ MailMessage ]; meta = { From 83a9660150b2644fd68d78ce087d7a1bd580004c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:14 +0000 Subject: [PATCH 179/411] [cpan2nix] perlPackages.Pegex: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a7da919050c..b246897b7633 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15586,7 +15586,7 @@ let pname = "Pegex"; version = "0.75"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz"; sha256 = "4dc8d335de80b25247cdb3f946f0d10d9ba0b3c34b0ed7d00316fd068fd05edc"; }; buildInputs = [ TestPod TieIxHash ]; From b68c3cf54045ae059c5d4f0557ff5072efa2392e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:14 +0000 Subject: [PATCH 180/411] [cpan2nix] perlPackages.SerealDecoder: 4.014 -> 4.018 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b246897b7633..c0d9cf0a007b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17109,12 +17109,12 @@ let SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; - version = "4.014"; + version = "4.018"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.014.tar.gz; - sha256 = "0ph5k99ssm5anwsdjal7sw96pjs65lirfanfsw8gh6k40w0w6f44"; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.018.tar.gz"; + sha256 = "0wfdixpm3p94mnng474l0nh9mjiy8q8hbrbh2af4vwn2hmazr91f"; }; - buildInputs = [ TestDeep TestDifferences TestLongString TestMemoryGrowth TestWarn ]; + buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = ''ls''; meta = { homepage = "https://github.com/Sereal/Sereal"; From 6b2a48cef9a40078408dbd9d929e32edf00966b3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:24 +0000 Subject: [PATCH 181/411] [cpan2nix] perlPackages.DateManip: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0d9cf0a007b..79002eb4d615 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4833,7 +4833,7 @@ let pname = "Date-Manip"; version = "6.82"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz"; sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work From 340f23f171b13875263881b637d6924dcc5045d7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:24 +0000 Subject: [PATCH 182/411] [cpan2nix] perlPackages.FileMap: 0.66 -> 0.67 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79002eb4d615..073ab5002376 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7681,10 +7681,10 @@ let FileMap = buildPerlModule { pname = "File-Map"; - version = "0.66"; + version = "0.67"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.66.tar.gz; - sha256 = "12d540v47jscjizcry2ir5vpp5q797vmd3gn9p91brqdbk5swfz7"; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz"; + sha256 = "1hpv4aprgypjxjx1kzbjnf6r29a98rw7mndlinixzk62vyz5sy0j"; }; propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; buildInputs = [ TestFatal TestWarnings ]; From 9ce32901d8c229fb9fe11b3f156782bb343b645e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:25 +0000 Subject: [PATCH 183/411] [cpan2nix] perlPackages.IPCRun: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 073ab5002376..71f415079725 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10000,7 +10000,7 @@ let pname = "IPC-Run"; version = "20200505.0"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz"; sha256 = "00f9wjvhn55zbk3n9il76xvsqy7ddk60lg6phg2rkpx0gwhvyvl1"; }; doCheck = false; /* attempts a network connection to localhost */ From 509f40e82eb492f5ea848841b2fe8a85fd61fc41 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:25 +0000 Subject: [PATCH 184/411] [cpan2nix] perlPackages.LocaleCodes: 3.64 -> 3.65 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71f415079725..23d285ea676d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10859,10 +10859,10 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.64"; + version = "3.65"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.64.tar.gz; - sha256 = "4ed9ef810b68cbb3417e28b34606c1b73c205ce2128535e53b4c9bf612c3e861"; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.65.tar.gz"; + sha256 = "8e0a3f5f9a5f9ec027dcfc6e21ad414b10e3a5c0826b3f9ea498e1a79881cd5d"; }; meta = { description = "A distribution of modules to handle locale codes"; From 97e0f36c9d5e4676e1fac33009494994b8b481b2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:27 +0000 Subject: [PATCH 185/411] [cpan2nix] perlPackages.SerealEncoder: 4.014 -> 4.018 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23d285ea676d..9f017ee341b0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17126,10 +17126,10 @@ let SerealEncoder = buildPerlPackage { pname = "Sereal-Encoder"; - version = "4.014"; + version = "4.018"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.014.tar.gz; - sha256 = "0044pkjkdg8y0ljmfj0bx68wf7jpfyy98kxi4z36kxarz2hcf462"; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.018.tar.gz"; + sha256 = "0z9dbkr8ggjqb5g1sikxhy1a359bg08gs3vfg9icqm6xx4gjsv6p"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { From ba891da36c820d0918fdfaabaa746ee63da37288 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:28 +0000 Subject: [PATCH 186/411] [cpan2nix] perlPackages.Test2PluginNoWarnings: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f017ee341b0..5df2ffdf6a27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18774,16 +18774,17 @@ let Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz"; - sha256 = "122rcksn4qg0f99ap9ppmkvk0fvxcqa9jlqmq7wlk3q0ajylr4cy"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.09.tar.gz"; + sha256 = "0x7vy9r5gyxqg3qy966frj8ywkckkv7mc83xy4mkdvrf0h0dhgdy"; }; buildInputs = [ IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; }; + propagatedBuildInputs = [ TestSimple13 ]; }; Test2Suite = buildPerlPackage { From 79b85f1b484abb89681ff2c6bf0d688740ac2cdf Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:28 +0000 Subject: [PATCH 187/411] [cpan2nix] perlPackages.DBDCSV: 0.54 -> 0.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5df2ffdf6a27..948b500027fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5339,10 +5339,10 @@ let DBDCSV = buildPerlPackage { pname = "DBD-CSV"; - version = "0.54"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz"; - sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be"; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.55.tgz"; + sha256 = "4670028e46df9a3c2791740445e8a4c82840b6667cee5dd796bc5a6ad9266ddb"; }; propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; }; From cf981fd42f4a9d42fbc4da265c8d850b863494f0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:29 +0000 Subject: [PATCH 188/411] [cpan2nix] perlPackages.EmailMIME: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 948b500027fb..62f7ad93c880 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6589,7 +6589,7 @@ let pname = "Email-MIME"; version = "1.949"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz"; sha256 = "3b0adf6bb413cfe51d75f8ba79aca80deafc98dc1179aa7b2d7a79aff5a6ab9c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; From fa929b813d1299c1a3f466b1fcef0cb30ceaa6a1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:29 +0000 Subject: [PATCH 189/411] [cpan2nix] perlPackages.FileBOM: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62f7ad93c880..1cb835ecef47 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7401,7 +7401,7 @@ let pname = "File-BOM"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.18.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.18.tar.gz"; sha256 = "28edc43fcb118e11bc458c9ae889d56d388c1d9bc29997b00b1dffd8573823a3"; }; buildInputs = [ TestException ]; From 73cfcba6b6ab237596bc38c3b029d6c9b27546d1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:30 +0000 Subject: [PATCH 190/411] [cpan2nix] perlPackages.ModuleSignature: 0.83 -> 0.87 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1cb835ecef47..a58241c00edb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12745,10 +12745,10 @@ let ModuleSignature = buildPerlPackage { pname = "Module-Signature"; - version = "0.83"; + version = "0.87"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz"; - sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb"; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.87.tar.gz"; + sha256 = "214e8055c50fec371a95743520fe26940004e76169063b2b44ec90a0d45d6982"; }; buildInputs = [ IPCRun ]; meta = { From 639f4807342f359db9ab013e4a426337cef633e1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:30 +0000 Subject: [PATCH 191/411] [cpan2nix] perlPackages.Moo: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a58241c00edb..a8a95d6c4cd6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13066,7 +13066,7 @@ let pname = "Moo"; version = "2.004000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz"; sha256 = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834"; }; buildInputs = [ TestFatal ]; From 3ed6d3043793082396a71e4040fb2bb19ae4b457 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:32 +0000 Subject: [PATCH 192/411] [cpan2nix] perlPackages.IOAsync: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8a95d6c4cd6..96b1ab970460 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9712,7 +9712,7 @@ let pname = "IO-Async"; version = "0.77"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz"; sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri"; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox From 0735831306b2ee38ba29d0376e7b39436af4f7f9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:32 +0000 Subject: [PATCH 193/411] [cpan2nix] perlPackages.ListAllUtils: 0.16 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96b1ab970460..f6b922f98777 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10766,10 +10766,10 @@ let ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.16.tar.gz; - sha256 = "559b3aa911c73003a3a1ebd860d3b16e171137de8203d86be63a2390364c63dd"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.18.tar.gz"; + sha256 = "b7c4bf80090b281c4a1560c76a1a819094c3a1294302f77afb8c60ca4862ecf9"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { From af31d4e866a1463b67710251efafbb607198b04d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:34 +0000 Subject: [PATCH 194/411] [cpan2nix] perlPackages.Sereal: 4.014 -> 4.018 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f6b922f98777..1dbb5666a5ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17142,10 +17142,10 @@ let Sereal = buildPerlPackage { pname = "Sereal"; - version = "4.014"; + version = "4.018"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.014.tar.gz; - sha256 = "02qpl3x6sh0xfby38gr80dndkah9m5r0xhk7d4a24i9hqljjaing"; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.018.tar.gz"; + sha256 = "0pqygrl88jp2w73jd9cw4k22fhvh5vcwqbiwl9wpxm67ql95cwwa"; }; buildInputs = [ TestDeep TestLongString TestMemoryGrowth TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; From a0f6919fd1ad821fdbf78f52c267f36c68ac6b63 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:34 +0000 Subject: [PATCH 195/411] [cpan2nix] perlPackages.TestMost: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1dbb5666a5ac..6543d49471c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19539,7 +19539,7 @@ let pname = "Test-Most"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz"; sha256 = "1isg8z6by113zn08l044w6k04y5m5bnns3rqmks8rwdr3qa70csk"; }; propagatedBuildInputs = [ ExceptionClass ]; From 3ecf8ecc6eab6a8b561c3c4d5237fd85ccc8f62f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:36 +0000 Subject: [PATCH 196/411] [cpan2nix] perlPackages.DBIxSearchBuilder: 1.67 -> 1.68 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6543d49471c5..2f710cc9535b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5736,10 +5736,10 @@ let DBIxSearchBuilder = buildPerlPackage { pname = "DBIx-SearchBuilder"; - version = "1.67"; + version = "1.68"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz"; - sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; + url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.68.tar.gz"; + sha256 = "be197c0f83c426996f77d22126f3103f958fc4bd1791c6962b793cc2779601f8"; }; buildInputs = [ DBDSQLite ]; propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBIxDBSchema Want capitalization ]; From 0e99187570549c282c24b7ad3a14198410c8dc24 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:37 +0000 Subject: [PATCH 197/411] [cpan2nix] perlPackages.HTTPMessage: 6.24 -> 6.25 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f710cc9535b..bfd76b0f7578 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9393,13 +9393,13 @@ let HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.24"; + version = "6.25"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.24.tar.gz; - sha256 = "554a1acf2daa401091f7012f5cb82d04d281db43fbd8f39a1fcbb7ed56dde16d"; + url = "mirror://cpan/authors/id/E/ET/ETHER/HTTP-Message-6.25.tar.gz"; + sha256 = "21f46502e87d57f43b7a38f81916464b079f5d50fe529458391c0ad529e0075a"; }; buildInputs = [ TryTiny ]; - propagatedBuildInputs = [ Clone Encode EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; From c3002f41a41a98a07f9cb7336b9d94852d3c691e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:37 +0000 Subject: [PATCH 198/411] [cpan2nix] perlPackages.MooXStrictConstructor: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfd76b0f7578..05c5c6ae5d74 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13175,7 +13175,7 @@ let pname = "MooX-StrictConstructor"; version = "0.011"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz"; sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s"; }; propagatedBuildInputs = [ Moo strictures ]; From e9f7e3a97350133bdcd699ef44fbbf9d5678968b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:38 +0000 Subject: [PATCH 199/411] [cpan2nix] perlPackages.PPIxRegexp: 0.072 -> 0.074 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05c5c6ae5d74..351298a6838c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16096,10 +16096,10 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.072"; + version = "0.074"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.072.tar.gz; - sha256 = "84a050b3b65c98a4b95f9df94fa0d8db9a931b000bb6e2946f0f8874cc2bac5c"; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.074.tar.gz"; + sha256 = "c4c02ef32d5357ac3f81c8cb6d7da5f1c9e9bea2f47f1476c847efac276d109f"; }; propagatedBuildInputs = [ PPI ]; meta = { From 630c864a37fa3e5a4c5e9ce56d817cb847aae36f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:41 +0000 Subject: [PATCH 200/411] [cpan2nix] perlPackages.MailBox: 3.008 -> 3.009 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 351298a6838c..d8eb320924e7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11457,11 +11457,11 @@ let }; MailBox = buildPerlPackage { - version = "3.008"; + version = "3.009"; pname = "Mail-Box"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz"; - sha256 = "15yjq3ap1ch0k0pqa1zag50rqrjfqzf7cka1w41macxibna506mm"; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.009.tar.gz"; + sha256 = "0rcig7mzp8c5r4dxnynjaryyv4claljraxl44gn1kj8l1rmj31ci"; }; doCheck = false; From c803242ddeb756ee99bae9ae003dd829b98e572c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:42 +0000 Subject: [PATCH 201/411] [cpan2nix] perlPackages.MojoliciousPluginStatus: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d8eb320924e7..35c3ab558203 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12890,10 +12890,10 @@ let pname = "Mojolicious-Plugin-Status"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz"; sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn"; }; - propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap FileTemp Mojolicious ]; + propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap Mojolicious ]; meta = { homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; From 69ff8550d5992056d31f94b9621c878e3e7a3058 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:43 +0000 Subject: [PATCH 202/411] [cpan2nix] perlPackages.PerlPrereqScannerNotQuiteLite: 0.9911 -> 0.9913 dependencies: perlPackages.URIcpan: init at 1.007 --- pkgs/top-level/perl-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35c3ab558203..d4b7b52cc677 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16317,12 +16317,12 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9911"; + version = "0.9913"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9911.tar.gz; - sha256 = "1h8sv5df7736sr7vasl6hkcvqlsqz9y61wiky6bvqa7fnlfhcyp0"; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9913.tar.gz"; + sha256 = "13alrwwh36wsqn0gliwdpp2a9kymjk8gx30gfkqw0f29w72ry3cp"; }; - propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; + propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie URIcpan ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; meta = { description = "a tool to scan your Perl code for its prerequisites"; @@ -21572,6 +21572,21 @@ let }; }; + URIcpan = buildPerlPackage { + pname = "URI-cpan"; + version = "1.007"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/URI-cpan-1.007.tar.gz"; + sha256 = "1lsjw7m9c3vyq1h9pqzngww18yq23mn4jxv9d7i4a2ifcsa16nhj"; + }; + propagatedBuildInputs = [ CPANDistnameInfo URI ]; + meta = { + description = "URLs that refer to things on the CPAN"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/rjbs/URI-cpan"; + }; + }; + URIws = buildPerlPackage { pname = "URI-ws"; version = "0.03"; From efd396a550a21f65c7616a4120aa9accbea6006f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:43 +0000 Subject: [PATCH 203/411] [cpan2nix] perlPackages.Specio: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4b7b52cc677..536cb5e9a30b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17403,7 +17403,7 @@ let pname = "Specio"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz"; sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; From 90c19050d6c259d515c0a3effcd42ac3ab7edf87 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:44 +0000 Subject: [PATCH 204/411] [cpan2nix] perlPackages.ConfigGitLike: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 536cb5e9a30b..571da52f366f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3118,7 +3118,7 @@ let pname = "Config-GitLike"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.18.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.18.tar.gz"; sha256 = "f7ae7440f3adab5b9ff9aa57216d84fd4a681009b9584e32da42f8bb71e332c5"; }; buildInputs = [ TestException ]; From 6fcccf671d5d706d26fe84b9e56bd0d602c04ecd Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:44 +0000 Subject: [PATCH 205/411] [cpan2nix] perlPackages.DataMessagePack: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 571da52f366f..7db8a85eb4a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4489,10 +4489,10 @@ let pname = "Data-MessagePack"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz"; sha256 = "8fa0ed0101d04e661821a7b78e8d62ce3e19b299275bbfed178e2ba8912663ea"; }; - buildInputs = [ DevelPPPort ModuleBuildXSUtil TestRequires ]; + buildInputs = [ ModuleBuildXSUtil TestRequires ]; meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; From 04d38a283924dc8e1df314cbb54640d06daf4495 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:45 +0000 Subject: [PATCH 206/411] [cpan2nix] perlPackages.HTMLParser: 3.72 -> 3.75 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7db8a85eb4a3..4735c81b64df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9043,12 +9043,12 @@ let HTMLParser = buildPerlPackage { pname = "HTML-Parser"; - version = "3.72"; + version = "3.75"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz"; - sha256 = "12v05ywlnsi9lc17z32k9jxx3sj1viy7y1wpl7n4az76v7hwfa7c"; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/HTML-Parser-3.75.tar.gz"; + sha256 = "1ack2799azfciyiw3vccq126gaxrbz2927i0hm4gaynzm0jmwsxc"; }; - propagatedBuildInputs = [ HTMLTagset ]; + propagatedBuildInputs = [ HTMLTagset HTTPMessage ]; meta = { description = "HTML parser class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 7561832c7e40e06af13570a3eee56745ab13ebd8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:47 +0000 Subject: [PATCH 207/411] [cpan2nix] perlPackages.AlienBuild: 2.26 -> 2.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4735c81b64df..a8c3e095b036 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -162,10 +162,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "2.26"; + version = "2.29"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.26.tar.gz; - sha256 = "0wfgfj6rvscqs3ixpybgrdmmnpxvf194iwbnl89jkqc25ipmc15i"; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.29.tar.gz"; + sha256 = "0wx1czv14dhfkd9nwa3y2g2gy8fx041hdmckhkhb1ly46ral4d4f"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; From 5fc5121cb11d80e33fd09d169a8e4d9212d611d3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:47 +0000 Subject: [PATCH 208/411] [cpan2nix] perlPackages.AltCryptRSABigInt: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8c3e095b036..b3a814a5d43a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -310,7 +310,7 @@ let url = "mirror://cpan/authors/id/D/DA/DANAJ/Alt-Crypt-RSA-BigInt-0.06.tar.gz"; sha256 = "76f434cab36999cdf09811345bb39d6b7cbed7e085b02338328c7f46e08b38f3"; }; - propagatedBuildInputs = [ ClassLoader ConvertASCIIArmour CryptBlowfish CryptCBC DataBuffer DigestMD2 MathBigIntGMP MathPrimeUtil MathPrimeUtilGMP SortVersions TieEncryptedHash ]; + propagatedBuildInputs = [ ClassLoader ConvertASCIIArmour DataBuffer DigestMD2 MathBigIntGMP MathPrimeUtil SortVersions TieEncryptedHash ]; meta = { homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt"; description = "RSA public-key cryptosystem, using Math::BigInt"; From 8c995501c82a1ea52bdeac3839cb6157b4b92bca Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:48 +0000 Subject: [PATCH 209/411] [cpan2nix] perlPackages.GetoptLongDescriptive: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3a814a5d43a..46ec39fbb7d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8263,7 +8263,7 @@ let pname = "Getopt-Long-Descriptive"; version = "0.105"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz"; sha256 = "a71cdbcf4043588b26a42a13d151c243f6eccf38e8fc0b18ffb5b53651ab8c15"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; From 35841a4ca0209971daa4a63ac32387f1a98904de Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:48 +0000 Subject: [PATCH 210/411] [cpan2nix] perlPackages.HTMLForm: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46ec39fbb7d8..6b50c5cfcccf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8911,10 +8911,10 @@ let pname = "HTML-Form"; version = "6.07"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz"; sha256 = "09v29cdzwjm139c67y1np3kvx2ymg3s8n723qc0ma07lmxz8rakx"; }; - propagatedBuildInputs = [ HTMLParser HTTPMessage ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Class that represents an HTML form element"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 4fead49e072a63f5363997ad3cf20674dd244a1d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:49 +0000 Subject: [PATCH 211/411] [cpan2nix] perlPackages.HTMLRewriteAttributes: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b50c5cfcccf..9bee9a9c8a6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9089,7 +9089,7 @@ let url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz"; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; }; - propagatedBuildInputs = [ HTMLParser URI ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Concise attribute rewriting"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 14f8f59d77d29a13259dcaffa3348042a3cc25d5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:50 +0000 Subject: [PATCH 212/411] [cpan2nix] perlPackages.MailDKIM: 1.20200513.1 -> 1.20200907 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9bee9a9c8a6b..629009f23682 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11502,10 +11502,10 @@ let MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "1.20200513.1"; + version = "1.20200907"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200513.1.tar.gz; - sha256 = "1gbnzxns4gy02lrgfmzdvr7bc0kxgxiq850mdj2y7k75nnv28iak"; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200907.tar.gz"; + sha256 = "1x8v4pa0447c1xqri1jn96i8vlyjpl6jmz63nb1vifbp16yi3zxb"; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system From fe44d7ef728c4f8170e4bf5648b9d98ee97dd41e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:50 +0000 Subject: [PATCH 213/411] [cpan2nix] perlPackages.NetPrometheus: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 629009f23682..95725b8a2b1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14602,7 +14602,7 @@ let pname = "Net-Prometheus"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz"; sha256 = "0skjkz6q68y8g9blm7i03k4wprac3djq15akmlv1kmgag3i0ky12"; }; propagatedBuildInputs = [ RefUtil StructDumb URI ]; From cdc086776297376a8a724ae54804ec2eef22e22c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:53 +0000 Subject: [PATCH 214/411] [cpan2nix] perlPackages.SubHandlesVia: 0.013 -> 0.014 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95725b8a2b1a..90b71fc056f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18007,10 +18007,10 @@ let SubHandlesVia = buildPerlPackage { pname = "Sub-HandlesVia"; - version = "0.013"; + version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.013.tar.gz; - sha256 = "1q5lqjnqw29ywkiv0iqidc88ydqp1cywrgfd8mi7yarksc296a3l"; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.014.tar.gz"; + sha256 = "0mhwnh3966gr10hxnbsdq2ccsha958divcfhwn2yia3q06j6bk4d"; }; propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; buildInputs = [ TestFatal TestRequires ]; From 4fdd8e8e7c7a87f858638d77045396ba444b92d3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:56 +0000 Subject: [PATCH 215/411] [cpan2nix] perlPackages.podlinkcheck: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 90b71fc056f9..8e2cc39d8f82 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16502,7 +16502,7 @@ let url = "mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz"; sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; - propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; + propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun PodParser constant-defer libintl_perl ]; meta = { homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html"; description = "Check POD L<> link references"; From a97e31562fe363cb4a499fc55fe950e72ac593da Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:56 +0000 Subject: [PATCH 216/411] [cpan2nix] perlPackages.CGI: 4.49 -> 4.50 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e2cc39d8f82..47199f175a85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2223,10 +2223,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.49"; + version = "4.50"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.49.tar.gz; - sha256 = "dd5e9ce69c6e6ed9b42f0a0daeaead1c6caad3fbba2b2a4977b076bc29556b5e"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.50.tar.gz"; + sha256 = "d8c7a2143352842a9b4962c314ee7e0385273c8b9d8314dcbd04a09c008eef46"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; From fdee66ca750fce50d0f6f5f10d85efa50cb65146 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:57 +0000 Subject: [PATCH 217/411] [cpan2nix] perlPackages.JSONValidator: 4.00 -> 4.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47199f175a85..0c4f41e1a5f2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10304,10 +10304,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "4.00"; + version = "4.02"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.00.tar.gz"; - sha256 = "09p6n5ahsa13fmxb01siz9hcmyswgb05ac2njbhzim6cnx9d6cwj"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.02.tar.gz"; + sha256 = "0ix6k7b7sawbfqsjfj2w9symfr6d7jvpjqc6c6ag8b5my8k932sy"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; From ba3700d32a24866369f4f23cc3a8000e09f7068b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:58 +0000 Subject: [PATCH 218/411] [cpan2nix] perlPackages.Redis: 1.996 -> 1.998 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c4f41e1a5f2..40064f454cf8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16745,10 +16745,10 @@ let Redis = buildPerlModule { pname = "Redis"; - version = "1.996"; + version = "1.998"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.996.tar.gz; - sha256 = "5c196d56a4d771abb2042fd52f252096497fc86f35910581e0956b5710ea74b6"; + url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.998.tar.gz"; + sha256 = "59f3bb176c3a7a54cb3779497b89a7bae1fb217565c68711d585fc1f09d79c87"; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; From a4e4a84fd667874fc2a4dc8fcd0261fb97072bc1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:59 +0000 Subject: [PATCH 219/411] [cpan2nix] perlPackages.Clipboard: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40064f454cf8..27abc929789d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2909,14 +2909,14 @@ let pname = "Clipboard"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz"; sha256 = "886ae43dc8538f9bfc4e07fdbcf09b7fbd6ee59c31f364618c859de14953c58a"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ CGI URI ]; + propagatedBuildInputs = [ CGI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. From ab6136ab4f2bee0c305f7ec2b23a4b7f269bb0db Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:13:59 +0000 Subject: [PATCH 220/411] [cpan2nix] perlPackages.DBDMariaDB: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 27abc929789d..5c03d1c3bd4a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5398,7 +5398,7 @@ let url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz"; sha256 = "068l4ybja5mmy89lwgzl9c1xs37f4fgvf7j7n8k4f78dg8rjp5zm"; }; - buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep ]; + buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; meta = { homepage = "https://github.com/gooddata/DBD-MariaDB"; From 1014c3b3b33e51e1d626161d55d6f42b6a51b962 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:00 +0000 Subject: [PATCH 221/411] [cpan2nix] perlPackages.MojoliciousPluginOpenAPI: 3.33 -> 3.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5c03d1c3bd4a..c3c6a3b363bf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12872,10 +12872,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "3.33"; + version = "3.35"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.33.tar.gz"; - sha256 = "0lccvanc3cici83j6fx7gg3wdcsvgv8d7hzd06r0q1mp8329sbv4"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.35.tar.gz"; + sha256 = "1zw51qdlmrqbg758w2dnrs9qraqj0nv9jqrjygdn4d6661fran11"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { From 784fc27cfe5a74ddfd31983542b87a11fe3f160c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:00 +0000 Subject: [PATCH 222/411] [cpan2nix] perlPackages.PPIxQuoteLike: 0.011 -> 0.012 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3c6a3b363bf..fe790e2caeef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16082,10 +16082,10 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.011"; + version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.011.tar.gz; - sha256 = "0yi0rx8nf3pz1g5d9z7mi6pzbd4y2kqj61vsgmyllk6rfyjcgmsf"; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.012.tar.gz"; + sha256 = "0g69wgj3libxf03q2sp7wcs6m42yps38fi8ndwlz5saqxnwpdz27"; }; propagatedBuildInputs = [ PPI Readonly ]; meta = { From 61f924a88708805cd8ae7dde4be8a5c488ced2b0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:00 +0000 Subject: [PATCH 223/411] [cpan2nix] perlPackages.AlienLibxml2: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe790e2caeef..b316c746ac14 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -194,7 +194,7 @@ let pname = "Alien-Libxml2"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz"; sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n"; }; propagatedBuildInputs = [ AlienBuild ]; From ebb6594fe85258dcedf5128108e117023e587b66 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:00 +0000 Subject: [PATCH 224/411] [cpan2nix] perlPackages.CGIEmulatePSGI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b316c746ac14..9829dd0fe417 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2269,7 +2269,7 @@ let sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ CGI HTTPMessage ]; + propagatedBuildInputs = [ CGI ]; meta = { homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi"; description = "PSGI adapter for CGI"; From 52e06fa0b21a37ae880d2a03f156021ec2e86bcf Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:01 +0000 Subject: [PATCH 225/411] [cpan2nix] perlPackages.GamesSolitaireVerify: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9829dd0fe417..9e4d356c0afc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8142,7 +8142,7 @@ let pname = "Games-Solitaire-Verify"; version = "0.2403"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2403.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2403.tar.gz"; sha256 = "e5ab475c82ba1cb088ad28f423ca514d46944d6ae3c3eb55e9636e9e7f1dc893"; }; buildInputs = [ DirManifest TestDifferences ]; From 1fa8d24d49eca0fb7c66c97ab94a551dc3e6b9ce Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:02 +0000 Subject: [PATCH 226/411] [cpan2nix] perlPackages.MooXlate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9e4d356c0afc..374177b15bd9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13318,7 +13318,7 @@ let pname = "MooX-late"; version = "0.100"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz"; sha256 = "2ae5b1e3da5abc0e4006278ecbcfa8fa7c224ea5529a6a688acbb229c09e6a5f"; }; buildInputs = [ TestFatal TestRequires ]; From e484a89740166857d5564e6ec3300fbf16933e64 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:02 +0000 Subject: [PATCH 227/411] [cpan2nix] perlPackages.OpenAPIClient: 0.24 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 374177b15bd9..240d90e1a2c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15029,10 +15029,10 @@ let OpenAPIClient = buildPerlPackage rec { pname = "OpenAPI-Client"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz"; - sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.25.tar.gz"; + sha256 = "bc6be443c9c44348899fd595e080abe53760ae7561d63615a2f9b9f0a943336c"; }; propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { From db6af384f39e5e203e754e822ee691e4a939d1b8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:03 +0000 Subject: [PATCH 228/411] [cpan2nix] perlPackages.HTMLFormatTextWithLinks: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 240d90e1a2c3..7dfb793b3df1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8943,7 +8943,7 @@ let url = "mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz"; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; }; - propagatedBuildInputs = [ HTMLFormatter URI ]; + propagatedBuildInputs = [ HTMLFormatter ]; meta = { description = "HTML to text conversion with links as footnotes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 416142f10cded36334e9b6a0908c9453bf079088 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:03 +0000 Subject: [PATCH 229/411] [cpan2nix] perlPackages.SQLAbstract: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7dfb793b3df1..4d789850ce5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17471,7 +17471,7 @@ let pname = "SQL-Abstract"; version = "1.87"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz"; sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a"; }; buildInputs = [ TestDeep TestException TestWarn ]; From 5c0f2156023a1c941026cfd23eca4855b7fe17bc Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:04 +0000 Subject: [PATCH 230/411] [cpan2nix] perlPackages.LWP: 6.45 -> 6.47 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d789850ce5e..934c9730dedb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11268,10 +11268,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.45"; + version = "6.47"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.45.tar.gz; - sha256 = "4391cec148d83c32482350c8ee1bc88f1b42d33921584b83017eba1591a42954"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.47.tar.gz"; + sha256 = "3029d6efc2099c4175bf976d0db7fbab9771ada631010c809cb4664230898f53"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) From 1824efb72398b701e018c5a992d020da625e9e56 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:04 +0000 Subject: [PATCH 231/411] [cpan2nix] perlPackages.Mouse: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 934c9730dedb..b522f48f097f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13994,10 +13994,10 @@ let pname = "Mouse"; version = "2.5.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz"; sha256 = "1vijm8wkyws1jhnqmx104585q3srw9z1crcpy1zlcfhm8qww53ff"; }; - buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; + buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; From 27dbaa3db0e14b35d421ab6cbc2100809d29b328 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:05 +0000 Subject: [PATCH 232/411] [cpan2nix] perlPackages.NetFreeDB: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b522f48f097f..63277a870136 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14426,11 +14426,11 @@ let pname = "Net-FreeDB"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSHULTZ/Net-FreeDB-0.10.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSHULTZ/Net-FreeDB-0.10.tar.gz"; sha256 = "11dfi14qnzsnmr71cygir85zfj15n08b7d5g0i4cj5pb70if2hzp"; }; - buildInputs = [ TestMost TestDeep TestWarn TestException TestDifferences ]; - propagatedBuildInputs = [ CDDBFile Moo libnet ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; + propagatedBuildInputs = [ CDDBFile Moo ]; meta = { description = "Perl interface to freedb server(s)"; license = with stdenv.lib.licenses; [ artistic1 ]; From d3d24254623eaba188e4006623b7842fc703415a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:05 +0000 Subject: [PATCH 233/411] [cpan2nix] perlPackages.TemplateToolkit: 3.008 -> 3.009 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 63277a870136..07f7ccfed278 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18503,10 +18503,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.008"; + version = "3.009"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.008.tar.gz; - sha256 = "14m6kl9zrs6ycr440an7zswrmcimv2747qq0r87inwznprl0yh2j"; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"; + sha256 = "1dpmy62x1yshf7kwslj85sc8bcgw1m30dh0szmfrp99pysxj7bfn"; }; doCheck = !stdenv.isDarwin; meta = { From c234fce0e95a856bfabdb20b71f0d8be1d116bc5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:05 +0000 Subject: [PATCH 234/411] [cpan2nix] perlPackages.Alienpatch: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07f7ccfed278..13cc759ee6f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -292,7 +292,7 @@ let pname = "Alien-patch"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-patch-0.15.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-patch-0.15.tar.gz"; sha256 = "1l00mq56596wn09nn7fv552j2aa7sgh46bvx5xlncsnrn8jp5mpy"; }; propagatedBuildInputs = [ AlienBuild ]; From e4e7e22ce0d046c4432e513c3d4b919384eccdad Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:09 +0000 Subject: [PATCH 235/411] [cpan2nix] perlPackages.XMLParser: 2.44 -> 2.46 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13cc759ee6f3..7e0a1d0a4a7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22065,10 +22065,10 @@ let XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.44"; + version = "2.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; - sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; + url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz"; + sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' From dda8f02907d81316a285c03287179819fa28e7a4 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:09 +0000 Subject: [PATCH 236/411] [cpan2nix] perlPackages.Alienm4: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e0a1d0a4a7f..df26e5b94b16 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -277,11 +277,11 @@ let pname = "Alien-m4"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz"; sha256 = "1xnh8qa99dcvqcqzbpy0s5jrxvn7wa5ydz3lfd56n358l5jfzns9"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI pkgs.gnum4 ]; + buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Find or build GNU m4"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From efd7541f89590629fbca0fd01167c3dd993adc30 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:11 +0000 Subject: [PATCH 237/411] [cpan2nix] perlPackages.XMLLibXML: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df26e5b94b16..2cf0160046a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22009,7 +22009,7 @@ let pname = "XML-LibXML"; version = "2.0205"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz"; sha256 = "0y12bcpnxzn8vs9zglaaxkw0kgrgmljxrxdf1cnijgxi2hkh099s"; }; SKIP_SAX_INSTALL = 1; From d9eac3de2a05b9f3281f17ab35e71d6b9be3ae0d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:13 +0000 Subject: [PATCH 238/411] [cpan2nix] perlPackages.HTTPEntityParser: 0.22 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2cf0160046a3..dd1ac854ce19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9328,10 +9328,10 @@ let HTTPEntityParser = buildPerlModule { pname = "HTTP-Entity-Parser"; - version = "0.22"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.22.tar.gz"; - sha256 = "1j6nxs0nmx160ip0xw9gb3l19ii8pz9x1ay1y15q7rmllbr1rzlk"; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.24.tar.gz"; + sha256 = "04p6y5234857wb0k024rx3928lx3q9pj5mr3mi0r5jshf740z3pn"; }; propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; buildInputs = [ HTTPMessage ModuleBuildTiny ]; From ad3233999478b64182774e9bed8b37b336b0bde6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:14 +0000 Subject: [PATCH 239/411] [cpan2nix] perlPackages.MojoPg: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd1ac854ce19..2428e85ed3f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13019,7 +13019,7 @@ let pname = "Mojo-Pg"; version = "4.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz"; sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992"; }; propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; From cdf9dccc6bedeedd47756ddd6a7f67646aff4596 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:17 +0000 Subject: [PATCH 240/411] [cpan2nix] perlPackages.ApacheAuthCookie: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2428e85ed3f0..2f4e13efa181 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -426,7 +426,7 @@ let pname = "Apache-AuthCookie"; version = "3.30"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz"; sha256 = "1f71b94d3d55a950a4b32dae4e90f6e76c8157508a7e2aee50621b179aadb1fb"; }; buildInputs = [ ApacheTest ]; From 2bfb4d2105d860189d0b0ebfe938fa55d241fb77 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:17 +0000 Subject: [PATCH 241/411] [cpan2nix] perlPackages.LWPProtocolHttps: 6.07 -> 6.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f4e13efa181..f9c7f1493336 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11331,10 +11331,10 @@ let LWPProtocolHttps = buildPerlPackage { pname = "LWP-Protocol-https"; - version = "6.07"; + version = "6.09"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz"; - sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.09.tar.gz"; + sha256 = "14pm785cgyrnppks6ccasb2vkqifh0a8fz36nmnhc2v926jy3kqn"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ IOSocketSSL LWP ]; From c977c79f410a8757ce6a9c938ea6c12d0e65b2c3 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:18 +0000 Subject: [PATCH 242/411] [cpan2nix] perlPackages.AlienGMP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f9c7f1493336..8772f5e86699 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -179,7 +179,7 @@ let pname = "Alien-GMP"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz"; sha256 = "199x24pl6jnqshgnl066lhdf2fkqa6l1fml9g3qn5grmwn7d8309"; }; propagatedBuildInputs = [ AlienBuild ]; From 558d17bdcdedd698b007aa5858ea206a8a280157 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:18 +0000 Subject: [PATCH 243/411] [cpan2nix] perlPackages.DevelDeclare: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8772f5e86699..13bdb823e223 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5817,7 +5817,7 @@ let pname = "Devel-Declare"; version = "0.006022"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz"; sha256 = "72f29ca35646a593be98311ffddb72033ae1e8a9d8254c62aa248bd6260e596e"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; From 18f6b2b6d7af4b00d9d4fb7f7937a40bc382a1b2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:20 +0000 Subject: [PATCH 244/411] [cpan2nix] perlPackages.SystemCommand: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13bdb823e223..d809c52cc96b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18307,7 +18307,7 @@ let pname = "System-Command"; version = "1.121"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz"; sha256 = "43de5ecd20c1da46e8a6f4fceab29e04697a2890a99bf6a91b3ca004a468a241"; }; propagatedBuildInputs = [ IPCRun ]; From ce15ea3842c4b4847d08afc968a76ab6868d92d9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:23 +0000 Subject: [PATCH 245/411] [cpan2nix] perlPackages.CPANMini: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d809c52cc96b..f38b366a6553 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3546,7 +3546,7 @@ let sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ FileHomeDir LWP LWPProtocolHttps URI ]; + propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/minicpan ''; From 510c4d866a9e73ce04c02cf05d8117152991a953 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:26 +0000 Subject: [PATCH 246/411] [cpan2nix] perlPackages.GnuPGInterface: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f38b366a6553..bfca26e179ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8463,7 +8463,7 @@ let pname = "GnuPG-Interface"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz"; sha256 = "97e9c809491a061b2e99fb4e50c7bf74eb42e1deb11c64b081b21b4dbe6aec2f"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; From 76ac4be3b47697f16a014db4f4c658b625abb157 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:27 +0000 Subject: [PATCH 247/411] [cpan2nix] perlPackages.SQLTranslator: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfca26e179ce..8ac87105cccf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17528,7 +17528,7 @@ let pname = "SQL-Translator"; version = "1.61"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz"; sha256 = "840e3c77cd48b47e1343c79ae8ef4fca46d036356d143d33528900740416dfe8"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; From b849ce8f4d9fa8289cae8ec6951534d902674d7b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:28 +0000 Subject: [PATCH 248/411] [cpan2nix] perlPackages.HTMLMason: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ac87105cccf..1ee6d0f06b7e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9015,7 +9015,7 @@ let pname = "HTML-Mason"; version = "1.59"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz"; sha256 = "95bed2a6c488370046aa314be4b592bd65a6522f8845da8b36a6aff9a8b439d0"; }; buildInputs = [ TestDeep ]; From 73a0a3aeb540023c1517609debecd49e60a83d9b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:29 +0000 Subject: [PATCH 249/411] [cpan2nix] perlPackages.CryptSSLeay: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1ee6d0f06b7e..bf0735ecc21b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4213,7 +4213,7 @@ let makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; buildInputs = [ PathClass ]; - propagatedBuildInputs = [ LWPProtocolHttps BytesRandomSecure ]; + propagatedBuildInputs = [ BytesRandomSecure LWPProtocolHttps ]; }; CSSDOM = buildPerlPackage { From 582d13d5a6307f821d785c44da43a4464a627a49 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:31 +0000 Subject: [PATCH 250/411] [cpan2nix] perlPackages.WWWMechanize: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf0735ecc21b..5ab121a7cd86 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21737,7 +21737,7 @@ let pname = "WWW-Mechanize"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz"; sha256 = "0j5bzn9jwb8rclif776gax57jxxn108swmajiqi2cpjbmlwng0ki"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; From 749175428331930892e3558385995fd288e99ed7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:32 +0000 Subject: [PATCH 251/411] [cpan2nix] perlPackages.MojoSQLite: 3.003 -> 3.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ab121a7cd86..1a6213fb68f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12952,10 +12952,10 @@ let MojoSQLite = buildPerlModule { pname = "Mojo-SQLite"; - version = "3.003"; + version = "3.004"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.003.tar.gz"; - sha256 = "d96c00dcf45e2becc8e8181df074853d42616f2a660703455d0e0a2741478092"; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.004.tar.gz"; + sha256 = "d9ca9c1f3e8183611638e318b88ad3c0f8ab7e65f6ac72e48bffe51aea03b983"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ]; From a2fdae6eec5f80bda82c611813b97eb92bd00b41 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:41 +0000 Subject: [PATCH 252/411] [cpan2nix] perlPackages.DateTimeTimeZone: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a6213fb68f7..e441537160fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5131,7 +5131,7 @@ let pname = "DateTime-TimeZone"; version = "2.39"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz"; sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca"; }; buildInputs = [ TestFatal TestRequires ]; From b8beb562d6d2cbf3380c6878c2fb9a00ee2ffdde Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:41 +0000 Subject: [PATCH 253/411] [cpan2nix] perlPackages.LogDispatch: 2.69 -> 2.70 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e441537160fe..5b3a17b420c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11096,10 +11096,10 @@ let LogDispatch = buildPerlPackage { pname = "Log-Dispatch"; - version = "2.69"; + version = "2.70"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.69.tar.gz"; - sha256 = "0xsjb0j3dzs8ym8jbgi29kia4pz5vl8jzkmpxxrhhqjc1h54qqjq"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.70.tar.gz"; + sha256 = "089z5723lwa8jhl57xa5b901xmvj8kgz60rid33a7lv74k2irnd3"; }; propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; meta = { From 05ac40f3013c90450cb584a2bcedeb3a4f77cd3a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:43 +0000 Subject: [PATCH 254/411] [cpan2nix] perlPackages.Appperlbrew: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b3a17b420c6..55a9737914b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -605,7 +605,7 @@ let sha256 = "08aj77i7bh4nhilz16axp4zfv0zg66za2c4i0rcwfg3qxgxbcrzs"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; - propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; doCheck = false; From d0f367dfdfe59b5df484f3b17002584a6907dc55 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:43 +0000 Subject: [PATCH 255/411] [cpan2nix] perlPackages.CGICompile: 0.24 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55a9737914b7..3da36bd2de7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2238,10 +2238,10 @@ let CGICompile = buildPerlModule { pname = "CGI-Compile"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz"; - sha256 = "1zyz35hmflgm9jibi0mkni7n13lg5wwfvkavpzqgyza6kgzp515j"; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.25.tar.gz"; + sha256 = "198f94r9xjxgn0hvwy5f93xfa8jlw7d9v3v8z7qbh7mxvzp78jzl"; }; propagatedBuildInputs = [ Filepushd SubName ]; buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; From c56c3c054f969e390ce4117cf545ab42787b0d94 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:45 +0000 Subject: [PATCH 256/411] [cpan2nix] perlPackages.Mojomysql: 1.19 -> 1.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3da36bd2de7f..9a5f80938fbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12969,10 +12969,10 @@ let Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.19"; + version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.19.tar.gz; - sha256 = "8695494db239e6bbec67cc686e15a60a3424b9f71af5e9936729dfd2be8a3530"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.20.tar.gz"; + sha256 = "efc0927d3b479b71b4d1e6b476c2b81e01404134cc5d919ac902207e0a219c67"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; buildInputs = [ TestDeep ]; From 1406f84928882f5e3bef1ea66ba5fa0f970eea7d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:45 +0000 Subject: [PATCH 257/411] [cpan2nix] perlPackages.ModuleCPANTSAnalyse: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a5f80938fbf..cd50b44f8e12 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12505,7 +12505,7 @@ let url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; From 7d74211e99e483710c3698f8ee780ed6cbeb19f9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:46 +0000 Subject: [PATCH 258/411] [cpan2nix] perlPackages.MetaCPANClient: 2.026000 -> 2.028000 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cd50b44f8e12..d8aef7402aab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12090,10 +12090,10 @@ let MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.026000"; + version = "2.028000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.026000.tar.gz"; - sha256 = "ee711619d59655dac1bd2e4b894ffeb3171bd73b1ed38ba4b7b07d3690f94465"; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz"; + sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a"; }; # Most tests are online, so we only include offline tests @@ -12103,8 +12103,8 @@ let '"t/00-report-prereqs.t t/api/_get.t t/api/_get_or_search.t t/api/_search.t t/entity.t t/request.t t/resultset.t"' ''; - buildInputs = [ LWPProtocolhttps TestFatal TestNeeds ]; - propagatedBuildInputs = [ IOSocketSSL JSONMaybeXS Moo NetSSLeay RefUtil SafeIsa TypeTiny URI ]; + buildInputs = [ LWPProtocolHttps TestFatal TestNeeds ]; + propagatedBuildInputs = [ IOSocketSSL JSONMaybeXS Moo RefUtil SafeIsa TypeTiny URI ]; meta = { homepage = "https://github.com/metacpan/metacpan-client"; description = "A comprehensive, DWIM-featured client to the MetaCPAN API"; From 29f9fd5bcf614b9306e9ce49a477bbef846213d0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:46 +0000 Subject: [PATCH 259/411] [cpan2nix] perlPackages.CPANUploader: 0.103014 -> 0.103015 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d8aef7402aab..caea60afbd90 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3672,10 +3672,10 @@ let CPANUploader = buildPerlPackage { pname = "CPAN-Uploader"; - version = "0.103014"; + version = "0.103015"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz; - sha256 = "1pi15yj06yyzx6xzhhclfhnbssrrpj27ncya2bh21mxnjmy52kqy"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103015.tar.gz"; + sha256 = "1idvkxqzc53hjs808gc6z6873bg4gn6zz499df0wppi56vz7w24f"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { From cdecc6f0f8215d4547ac8da98046b3096f1c5f79 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:50 +0000 Subject: [PATCH 260/411] [cpan2nix] perlPackages.W3CLinkChecker: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index caea60afbd90..9d8ce52977f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21692,7 +21692,7 @@ let sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; - propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP NetIP TermReadKey ]; + propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP LocaleCodes NetIP TermReadKey ]; meta = { homepage = "https://validator.w3.org/checklink"; description = "A tool to check links and anchors in Web pages or full Web sites"; From 4a3a8c58fcae9319261e3aad3410a773a8aa0159 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:51 +0000 Subject: [PATCH 261/411] [cpan2nix] perlPackages.LogDispatchouli: 2.019 -> 2.022 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9d8ce52977f0..38f5df664224 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11220,10 +11220,10 @@ let LogDispatchouli = buildPerlPackage { pname = "Log-Dispatchouli"; - version = "2.019"; + version = "2.022"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz"; - sha256 = "fe8890c553c8f72b8b55633067270862c34db2ab8ff1cf8db0855f0427c23442"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.022.tar.gz"; + sha256 = "2a2a4176adafb85a1eb9c9dc389052919e8c2c9df99aaba538c06b8da964a5df"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; From 932973502c50f4d5b01c928a9fc066f570b360f5 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:51 +0000 Subject: [PATCH 262/411] [cpan2nix] perlPackages.TestPerlTidy: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38f5df664224..1df34b6e90f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19654,7 +19654,7 @@ let pname = "Test-PerlTidy"; version = "20200412"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz"; sha256 = "905240447edb1930192000db659556cbf5ad5710f4376bb0a5abcd8716a4592c"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; From 731ca9e91c6ecfc1c878be577075a033d5936d37 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:51 +0000 Subject: [PATCH 263/411] [cpan2nix] perlPackages.DateTimeLocale: 1.25 -> 1.28 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1df34b6e90f6..25e2d2555dc6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5100,12 +5100,12 @@ let DateTimeLocale = buildPerlPackage { pname = "DateTime-Locale"; - version = "1.25"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz"; - sha256 = "aa79746bd488b32aa4dbccccd05f1e5505642be013d8064a5d6f8a76a3c45d0b"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.28.tar.gz"; + sha256 = "6c604d8c5c9c2739b78e0538a402283b82b1df419e60bef20b04843e4584bade"; }; - buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; + buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple PathTiny Test2PluginNoWarnings Test2Suite TestFileShareDir ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Localization support for DateTime.pm"; From 365e402bd138179e238af5b4e8cff98e47ab647f Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:52 +0000 Subject: [PATCH 264/411] [cpan2nix] perlPackages.CryptOpenPGP: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25e2d2555dc6..6fbb52223280 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4071,7 +4071,7 @@ let ../development/perl-modules/crypt-openpgp-remove-impure-keygen-tests.patch ]; buildInputs = [ TestException ]; - propagatedBuildInputs = [ AltCryptRSABigInt CryptBlowfish CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish DataBuffer FileHomeDir LWP TermReadKey URI BytesRandomSecure ]; + propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' @@ -4084,6 +4084,7 @@ let license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; + doCheck = false; /* test fails with 'No random source available!' */ }; CryptOpenSSLAES = buildPerlPackage { From f59e3928cbe40176404ac38ca52391542dc5c0f7 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:53 +0000 Subject: [PATCH 265/411] [cpan2nix] perlPackages.AppClusterSSH: 4.15 -> 4.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fbb52223280..d702b6c69fe2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -502,10 +502,10 @@ let AppClusterSSH = buildPerlModule { pname = "App-ClusterSSH"; - version = "4.15"; + version = "4.16"; src = fetchurl { - url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.15.tar.gz; - sha256 = "1apk4yi9wfxrvspsfxr74jl1zr5z56ghknnmx8k5648zga1mn9z1"; + url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.16.tar.gz"; + sha256 = "0y2mzprv47ff4sig2fkvd10jwz2h4x6srncbvx528mk8c2mvhz0v"; }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; From d08eb0bbb13fd3e6fa7785dc9e486bc4f8d4a391 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:53 +0000 Subject: [PATCH 266/411] [cpan2nix] perlPackages.DateTime: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d702b6c69fe2..d610242f29b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4864,7 +4864,7 @@ let pname = "DateTime"; version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz"; sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; From dba49a316c57a2351c870816935e6489787f1cfe Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:54 +0000 Subject: [PATCH 267/411] [cpan2nix] perlPackages.DateTimeFormatStrptime: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d610242f29b1..5cfc59772a30 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5060,7 +5060,7 @@ let pname = "DateTime-Format-Strptime"; version = "1.77"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz"; sha256 = "2fa43c838ecf5356f221a91a41c81dba22e7860c5474b4a61723259898173e4a"; }; buildInputs = [ TestFatal TestWarnings ]; From d61ab730bbbfd03ac62739326db7f96293c35552 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:54 +0000 Subject: [PATCH 268/411] [cpan2nix] perlPackages.CodeTidyAll: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5cfc59772a30..b04414b11c17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2969,7 +2969,7 @@ let pname = "Code-TidyAll"; version = "0.78"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz"; sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; From d80d5ee8c4958457bdab2592566ea91f03cac3ec Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:55 +0000 Subject: [PATCH 269/411] [cpan2nix] perlPackages.DateTimeFormatBuilder: 0.82 -> 0.83 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b04414b11c17..dc5b9a820158 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4915,10 +4915,10 @@ let DateTimeFormatBuilder = buildPerlPackage { pname = "DateTime-Format-Builder"; - version = "0.82"; + version = "0.83"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz"; - sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.83.tar.gz"; + sha256 = "61ffb23d85b3ca1786b2da3289e99b57e0625fe0e49db02a6dc0cb62c689e2f2"; }; propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { From 81c549ae0676900eb243adc9bdad428c4808d0d6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:56 +0000 Subject: [PATCH 270/411] [cpan2nix] perlPackages.DateTimeFormatISO8601: 0.08 -> 0.14 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dc5b9a820158..06dd83b4409d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4984,18 +4984,19 @@ let }; }; - DateTimeFormatISO8601 = buildPerlModule { + DateTimeFormatISO8601 = buildPerlPackage { pname = "DateTime-Format-ISO8601"; - version = "0.08"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz"; - sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.14.tar.gz"; + sha256 = "1ssy41d7g1kgrdlhnz1vr7rhxspmnhzx1hkdmrf11ca293kq7r47"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ Test2Suite ]; }; DateTimeFormatMail = buildPerlPackage { From 6247fb9b2caab873c9507b52d1130c9610ac6430 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:14:57 +0000 Subject: [PATCH 271/411] [cpan2nix] perlPackages.AnyEventRabbitMQ: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 06dd83b4409d..dfc5dee2309c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -388,7 +388,7 @@ let pname = "AnyEvent-RabbitMQ"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.22.tar.gz; + url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.22.tar.gz"; sha256 = "98c52a1fe700710f3e5bc55a38b25de625e9b2e8341d278dcf9e1b3f3d19acee"; }; buildInputs = [ FileShareDirInstall TestException ]; From f1d61b92c37460cb8025c0549d733aa2d97e3106 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:02 +0000 Subject: [PATCH 272/411] [cpan2nix] perlPackages.Moose: 2.2012 -> 2.2013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dfc5dee2309c..afebf8ad43c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13081,10 +13081,10 @@ let Moose = buildPerlPackage { pname = "Moose"; - version = "2.2012"; + version = "2.2013"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz"; - sha256 = "46bbe47a9d16379c355b3a263214eb69bf0edca6a0ef75499a012236f5153569"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2013.tar.gz"; + sha256 = "df74dc78088921178edf72d827017d6c92737c986659f2dadc533ae24675e77c"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ]; From 80f509be0a38e4e19d73999278463dea3d4c465d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:02 +0000 Subject: [PATCH 273/411] [cpan2nix] perlPackages.DateTimeFormatNatural: 1.09 -> 1.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index afebf8ad43c2..2d7be4548832 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5015,10 +5015,10 @@ let DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.09"; + version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.09.tar.gz; - sha256 = "0mxhzib3wq408mqa8wgdlvxxjrmv2fn07ydbpyx6qny1867kczbc"; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.10.tar.gz"; + sha256 = "0ahia58vs5f8ymskain1a6vl6b4fhkar1cmakq5q92zzhvmgx6z1"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; From e34c4f704c7b8dd459fb9136ca8beaeb7d8de7f2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:07 +0000 Subject: [PATCH 274/411] [cpan2nix] perlPackages.LaTeXML: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d7be4548832..4a74d208d9ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10377,7 +10377,7 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; }; - propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent TextUnidecode URI XMLLibXML XMLLibXSLT shortenPerlShebang ]; + propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; doCheck = false; # epub test fails postInstall = '' shortenPerlShebang $out/bin/latexml From 99a847f965c04f092c78a4a67c9f0b46e94a7907 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:10 +0000 Subject: [PATCH 275/411] [cpan2nix] perlPackages.DataVisitor: 0.30 -> 0.31 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a74d208d9ce..5eeb9e10f39c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4799,13 +4799,13 @@ let DataVisitor = buildPerlPackage { pname = "Data-Visitor"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz"; - sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Visitor-0.31.tar.gz"; + sha256 = "0vjcsc2hbhml1w126673z31z9rr0hxz64f5rvk7drlmwicr6kc9b"; }; - buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ Moose TaskWeaken TieToObject namespaceclean ]; + buildInputs = [ TestNeeds ]; + propagatedBuildInputs = [ Moose TieToObject namespaceclean ]; }; DateCalc = buildPerlPackage { From 8105b2b2930ab881a6862d18f6d1c940effa7ddd Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:12 +0000 Subject: [PATCH 276/411] [cpan2nix] perlPackages.MooseXMethodAttributes: 0.31 -> 0.32 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5eeb9e10f39c..4b435a0f576a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13597,13 +13597,13 @@ let MooseXMethodAttributes = buildPerlPackage { pname = "MooseX-MethodAttributes"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz"; - sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.32.tar.gz"; + sha256 = "0yqrihv609j2q0hrmpmvgpn0mnxc0z3ws39cqhwxvlmpfijqhcyb"; }; - buildInputs = [ MooseXRoleParameterized TestFatal TestRequires ]; - propagatedBuildInputs = [ MooseXTypes ]; + buildInputs = [ MooseXRoleParameterized TestFatal TestNeeds ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = "https://github.com/karenetheridge/moosex-methodattributes"; description = "Code attribute introspection"; From 5094d1e1148515b6bcb629648af007edbbda6cc4 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:22 +0000 Subject: [PATCH 277/411] [cpan2nix] perlPackages.TestPodLinkCheck: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b435a0f576a..e2f00061bacf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19697,7 +19697,7 @@ let sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; buildInputs = [ ModuleBuildTiny TestPod ]; - propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck PodParser ]; + propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ]; meta = { description = "Tests POD for invalid links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 81e4c11b2d1bd6eb4187b7ab3a669aee6075ba72 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:26 +0000 Subject: [PATCH 278/411] [cpan2nix] perlPackages.RTClientREST: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e2f00061bacf..bae35a4d676c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16988,7 +16988,7 @@ let pname = "RT-Client-REST"; version = "0.60"; src = fetchurl { - url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz; + url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz"; sha256 = "0e6f2da3d96903491b43b19c61221cbeea88414264f907312f277daaf144248b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; From fe88718dafec05483ef23cd7cba50d2c78af05b2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:36 +0000 Subject: [PATCH 279/411] [cpan2nix] perlPackages.AppSqitch: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bae35a4d676c..3a5f917f6423 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -634,11 +634,11 @@ let version = "1.1.0"; pname = "App-Sqitch"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz"; sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab"; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = "https://sqitch.org/"; From f60631cdd3d53e09fd13f34e2ee9688f2d64cd58 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:41 +0000 Subject: [PATCH 280/411] [cpan2nix] perlPackages.TestFakeHTTPD: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a5f917f6423..0f61446081ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19118,10 +19118,10 @@ let TestFakeHTTPD = buildPerlModule { pname = "Test-Fake-HTTPD"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz"; - sha256 = "1jkflkcjzrdvnlxff1xqfhfdcpsmvvjqzayl7hk3whavsxdrf9yh"; + url = "mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.09.tar.gz"; + sha256 = "07iddzxkgxk0ym2gz3scmrw9gmnk755qwksmpvlj42d9cyq9rxql"; }; propagatedBuildInputs = [ HTTPDaemon Plack ]; buildInputs = [ LWP ModuleBuildTiny TestException TestSharedFork TestTCP TestUseAllModules ]; From 5a87bc693b886f05c7816006d9e0856e7685b318 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:41 +0000 Subject: [PATCH 281/411] [cpan2nix] perlPackages.DBIxClassHelpers: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f61446081ad..6894675e0460 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5653,7 +5653,7 @@ let pname = "DBIx-Class-Helpers"; version = "2.036000"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.036000.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.036000.tar.gz"; sha256 = "b7b8b4891a983c034ef0b45f4112404a0a40550c4e217daeb7a22ca16861efdb"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; From 38e476c4fbced399bd4201deeb280f4acb48faa2 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:42 +0000 Subject: [PATCH 282/411] [cpan2nix] perlPackages.LWPUserAgentDNSHosts: 0.13 -> 0.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6894675e0460..b93d0de7dd61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11364,10 +11364,10 @@ let LWPUserAgentDNSHosts = buildPerlModule { pname = "LWP-UserAgent-DNS-Hosts"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz"; - sha256 = "0piwcsb0m1xpzxbakhr9zq45a9hq3rx7s55lrjg66nd4x5n7xs5y"; + url = "mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.14.tar.gz"; + sha256 = "07w741r98synwnrh9hkv47wr67arhr2bmnvb6s5zqvq87x27jscr"; }; propagatedBuildInputs = [ LWP ScopeGuard ]; buildInputs = [ ModuleBuildTiny TestFakeHTTPD TestSharedFork TestTCP TestUseAllModules ]; From b6e23efa571ff90383dd91cf97f691109513bcb9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:43 +0000 Subject: [PATCH 283/411] [cpan2nix] perlPackages.PlackMiddlewareDebug: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b93d0de7dd61..fe0f1e3daa6d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15880,7 +15880,7 @@ let pname = "Plack-Middleware-Debug"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.18.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.18.tar.gz"; sha256 = "192ef79e521c90c6eff6f4149ad2e4bfc911d2c95df78935855e90d659e9ac9a"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; From 52df8d9ab5204aa8fd4ad89caf3acc8ca97b1093 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:43 +0000 Subject: [PATCH 284/411] [cpan2nix] perlPackages.TestLWPUserAgent: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe0f1e3daa6d..7dfe22fe0518 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19314,7 +19314,7 @@ let pname = "Test-LWP-UserAgent"; version = "0.034"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz"; sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp"; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; From e32a6ebafed1e48ff799cea040b1ddc3afe4d179 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:50 +0000 Subject: [PATCH 285/411] [cpan2nix] perlPackages.HTMLFormFu: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7dfe22fe0518..91bcad8d6e8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8974,7 +8974,7 @@ let sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; }; buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; - propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; + propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon TaskWeaken YAMLLibYAML ]; meta = { description = "HTML Form Creation, Rendering and Validation Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 1a49a6c9f137f15e20cc9ac7e5020148a0d130b9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:51 +0000 Subject: [PATCH 286/411] [cpan2nix] perlPackages.Connector: 1.28 -> 1.32 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91bcad8d6e8b..8109c68ea702 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3315,12 +3315,12 @@ let Connector = buildPerlPackage { pname = "Connector"; - version = "1.28"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.28.tar.gz"; - sha256 = "0cd1575bab80e78294aa79809904f40d2f534d99b78e0161454f037625c6bf7d"; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.32.tar.gz"; + sha256 = "c108ce559fa48faf95d01eb6bae9c14ecef49386f89c4aa2c2ce5edf9fd0ca14"; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; + buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. From a3ef28c97d43f9b9384f596f80285d58c52301c8 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:57 +0000 Subject: [PATCH 287/411] [cpan2nix] perlPackages.DistZilla: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8109c68ea702..427f6d13fcf6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6123,7 +6123,7 @@ let pname = "Dist-Zilla"; version = "6.015"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz"; sha256 = "06w9mdk46y4n2dshkx6laphkqk08wfw6bqpsa5q2yb4lky0yb212"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; From d69b75655b0f598c763ea631490b51d045babaa6 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:58 +0000 Subject: [PATCH 288/411] [cpan2nix] perlPackages.CatalystPluginConfigLoader: 0.34 -> 0.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 427f6d13fcf6..91efb8205a09 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1882,10 +1882,10 @@ let CatalystPluginConfigLoader = buildPerlPackage { pname = "Catalyst-Plugin-ConfigLoader"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz"; - sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-ConfigLoader-0.35.tar.gz"; + sha256 = "0w8r3bbxqnlykvra6sx3sh3wh8ylkj914xg5ql6nw11ddy56jaly"; }; propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; }; From 3211e78797947d3582daff2131b2c559e6bad23a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:15:58 +0000 Subject: [PATCH 289/411] [cpan2nix] perlPackages.CatalystPluginStaticSimple: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91efb8205a09..ddc55d923fb9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2031,7 +2031,7 @@ let sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; - propagatedBuildInputs = [ CatalystRuntime MIMETypes ]; + propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ]; meta = { description = "Make serving static pages painless"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f728bea688227536a73b382ec1a2afb8be2854d0 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:02 +0000 Subject: [PATCH 290/411] [cpan2nix] perlPackages.CatalystViewTT: 0.44 -> 0.45 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ddc55d923fb9..39c87723cb99 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2096,10 +2096,10 @@ let CatalystViewTT = buildPerlPackage { pname = "Catalyst-View-TT"; - version = "0.44"; + version = "0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz"; - sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-TT-0.45.tar.gz"; + sha256 = "0jzgpkgq5pwq82zlb0nykdyk40dfpsyn9ilz91d0wpixgi9i5pr8"; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { From 72bb7033229d2b61d5bfeb61b966c85cec4b6e05 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:05 +0000 Subject: [PATCH 291/411] [cpan2nix] perlPackages.CatalystPluginSessionStateCookie: 0.17 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39c87723cb99..56da22a82a37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1962,10 +1962,10 @@ let CatalystPluginSessionStateCookie = buildPerlPackage { pname = "Catalyst-Plugin-Session-State-Cookie"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz"; - sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-Session-State-Cookie-0.18.tar.gz"; + sha256 = "1skvw3i9wv02kz1bz937zh7wfxvhf54i8zppln3ly6bcp6rcgcg9"; }; propagatedBuildInputs = [ CatalystPluginSession ]; }; From c2d5757906b40e8fd04a03662be2847379626030 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:06 +0000 Subject: [PATCH 292/411] [cpan2nix] perlPackages.DistZillaPluginTestPodLinkCheck: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56da22a82a37..881f27d21e48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6382,6 +6382,7 @@ let description = "Add release tests for POD links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestPodLinkCheck ]; }; DistZillaPluginTestPortability = buildPerlModule { From 39685a0525a7549b10e679cbc3c4c5d7ccbb1a9d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:14 +0000 Subject: [PATCH 293/411] [cpan2nix] perlPackages.CatalystXScriptServerStarman: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 881f27d21e48..c9f483c882f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2155,7 +2155,7 @@ let ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch ]; buildInputs = [ TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystRuntime Starman PodParser ]; + propagatedBuildInputs = [ CatalystRuntime MooseXTypes PodParser Starman ]; meta = { description = "Replace the development server with Starman"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 86d6c6826f76b9092c277b330d68f1e7a06c6992 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:14 +0000 Subject: [PATCH 294/411] [cpan2nix] perlPackages.CatalystDevel: 1.40 -> 1.41 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9f483c882f4..d500150a0f58 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1710,10 +1710,10 @@ let CatalystDevel = buildPerlPackage { pname = "Catalyst-Devel"; - version = "1.40"; + version = "1.41"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Devel-1.40.tar.gz; - sha256 = "8c5f064b01fa58dce395ae46f33a0d37c4cb03472dde7c5076b6df1f99e116bb"; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Devel-1.41.tar.gz"; + sha256 = "9a4a7ab9266aed8b11f399e9859b7ff42615de1d6c7ee76505ed0cae0fce0ae5"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; From 25f2fde9134b5a7d9a3893f4fb044f2575fa89b9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:17 +0000 Subject: [PATCH 295/411] [cpan2nix] perlPackages.Catmandu: 1.2012 -> 1.2013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d500150a0f58..9443e74ae285 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2179,10 +2179,10 @@ let Catmandu = buildPerlModule { pname = "Catmandu"; - version = "1.2012"; + version = "1.2013"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2012.tar.gz; - sha256 = "1dn5bqfg9vswwmvpgfziirqbjlm3gzswhknnmvg07igv1jcrk3d0"; + url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2013.tar.gz"; + sha256 = "0sh4qqjh53rhqcpbvq3pyg0k1ybs8qxivhc1an6w5hjar2bihwiq"; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; From 40fee55bae78358bd1b04dc6b42c20bdb5d8799a Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Sep 2020 09:16:19 +0000 Subject: [PATCH 296/411] [cpan2nix] perlPackages.NetAmazonS3: 0.89 -> 0.91 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9443e74ae285..ccce5be70d9e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14210,13 +14210,13 @@ let NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.89"; + version = "0.91"; src = fetchurl { - url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.89.tar.gz; - sha256 = "466b4d02b5b17790f1df22df92b22a3879423b3b33317388f0975a13e74b4eea"; + url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.91.tar.gz"; + sha256 = "9779f8dea7155b6f96549b4817ca55ee5c6d6e1b0ee872d8d0de8ff13205caff"; }; - buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; + buildInputs = [ TestDeep TestException TestLWPUserAgent TestMockTime TestWarnings ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SafeIsa SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5481e02ebad0425488697f15c21eb8dca28cb5d3 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 7 Sep 2020 15:37:24 +0000 Subject: [PATCH 297/411] undo efc70eb6d7c3755ca7b6e6293439463f2c80b032 --- ...01-HACK-Assumes-Expat-paths-are-good.patch | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch index f66ed0dfe019..add6d9df3b7f 100644 --- a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -16,30 +16,28 @@ diff --git a/Makefile.PL b/Makefile.PL index 505d1df..fc38b76 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -28,12 +28,18 @@ foreach (@ARGV) { +@@ -29,12 +29,17 @@ foreach (@ARGV) { @ARGV = @replacement_args; unless ( -- check_lib( # fill in what you prompted the user for here -- lib => [qw(expat)], -- header => ['expat.h'], -- incpath => $expat_incpath, -- ($expat_libpath? -- (libpath => $expat_libpath):()), -- )) { -+ #check_lib( # fill in what you prompted the user for here -+ # lib => [qw(expat)], -+ # header => ['expat.h'], -+ # incpath => $expat_incpath, -+ # ($expat_libpath? -+ # (libpath => $expat_libpath):()), -+ #) -+ # The check_lib implementation fails horribly with cross-compilation. -+ # We are giving known good paths to expat. -+ # And in all cases, the previous behaviour of not actually failing -+ # seemed to work just fine :/. -+ false -+ ) { +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), +- ) ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false + ) { warn <<'Expat_Not_Installed;'; -- From 725a65545ece5d948c002af2c61ab35877c8f9fc Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 7 Sep 2020 18:49:47 +0000 Subject: [PATCH 298/411] perlPackages: group aliases --- pkgs/top-level/perl-packages.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ccce5be70d9e..2d765d5081df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1189,8 +1189,6 @@ let }; }; - bignum = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - BitVector = buildPerlPackage { pname = "Bit-Vector"; version = "7.4"; @@ -4348,8 +4346,6 @@ let }; }; - DataDumper = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; version = "2.023"; @@ -7216,8 +7212,6 @@ let }; }; - ExtUtilsManifest = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - ExtUtilsPkgConfig = buildPerlPackage { pname = "ExtUtils-PkgConfig"; version = "1.16"; @@ -7935,8 +7929,6 @@ let }; }; - FileTemp = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - FileTouch = buildPerlPackage { pname = "File-Touch"; version = "0.11"; @@ -11732,8 +11724,6 @@ let }; }; - MathBigRat = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - MathClipper = buildPerlModule { pname = "Math-Clipper"; version = "1.29"; @@ -17676,8 +17666,6 @@ let propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; }; - Storable = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - StreamBuffered = buildPerlPackage { pname = "Stream-Buffered"; version = "0.03"; @@ -20867,10 +20855,6 @@ let buildInputs = [ TestDifferences ]; }; - threadsshared = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - - ThreadQueue = null; # part of Perl 5.30.3, 5.32.0, 5.33.1 - Throwable = buildPerlPackage { pname = "Throwable"; version = "0.200013"; @@ -22467,6 +22451,15 @@ let UnicodeCollate = null; # part of Perl 5.28 ModuleCoreList = null; # part of Perl 5.28.2 + bignum = null; # part of Perl 5.30.3 + DataDumper = null; # part of Perl 5.30.3 + ExtUtilsManifest = null; # part of Perl 5.30.3 + FileTemp = null; # part of Perl 5.30.3 + MathBigRat = null; # part of Perl 5.30.3 + Storable = null; # part of Perl 5.30.3 + threadsshared = null; # part of Perl 5.30.3 + ThreadQueue = null; # part of Perl 5.30.3 + ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox; CommonSense = self.commonsense; # For backwards compatibility. From 5796715bb707bf88738f04a531925d13ee4cf6e7 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Mon, 20 Jul 2020 17:46:08 -0400 Subject: [PATCH 299/411] Accept $TMP, $TMPDIR, $TEMP, and $TEMPDIR paths in purity check --- pkgs/build-support/wrapper-common/utils.bash | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index ce569ac2b8c4..d164982b4345 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -69,9 +69,13 @@ badPath() { # directory (including the build directory). test \ "$p" != "/dev/null" -a \ - "${p#${NIX_STORE}}" = "$p" -a \ - "${p#${TMP:-/tmp}}" = "$p" -a \ - "${p#${NIX_BUILD_TOP}}" = "$p" + "${p#${NIX_STORE}}" = "$p" -a \ + "${p#${NIX_BUILD_TOP}}" = "$p" -a \ + "${p#/tmp}" = "$p" -a \ + "${p#${TMP:-/tmp}}" = "$p" -a \ + "${p#${TMPDIR:-/tmp}}" = "$p" -a \ + "${p#${TEMP:-/tmp}}" = "$p" -a \ + "${p#${TEMPDIR:-/tmp}}" = "$p" } expandResponseParams() { From e6f5583c6e0d8ea529ace71a1e1d146819a7aa9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 09:17:07 +0000 Subject: [PATCH 300/411] at-spi2-core: 2.36.0 -> 2.36.1 --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 32667bf66e0f..2c959434f01d 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.36.0"; + version = "2.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"; + sha256 = "0m3crrdbc9vdn9dr4lssdwrjmm8z5wxs2qhhnbkh1w5vkn87nhcp"; }; outputs = [ "out" "dev" ]; From c6033d8154f8edc97608651aedc5eb8333120dbe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Sep 2020 18:00:00 -0500 Subject: [PATCH 301/411] nodejs-14_x: 14.10.0 -> 14.10.1 https://github.com/nodejs/node/releases/tag/v14.10.1 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index f68cefadd617..7eeed0a27e68 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.10.0"; - sha256 = "00f7p2l3wpj12r6bxz7l6cxkipwl6in4qlzxrzkk0z81k32ph6s3"; + version = "14.10.1"; + sha256 = "1dymx9j3g6wbbdmw6083yg49ydxwfl2fgy9i8jxpngnskvwq4lrb"; } From d489e70a08686275490a42b896f38c56f9bd920f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:06:02 -0500 Subject: [PATCH 302/411] kconfigwidgets: install plugin in .out --- .../libraries/kde-frameworks/kconfigwidgets/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 3d7c7cdedefa..dcbdf6eb5f61 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -12,4 +12,7 @@ mkDerivation { patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; outputBin = "dev"; + postInstall = '' + moveToOutput ''${qtPluginPrefix:?}/designer/kconfigwidgets5widgets.so "$out" + ''; } From 6c5e621badbb8b89eb186201fc3f53b7bad09689 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 10 Sep 2020 15:12:51 +0200 Subject: [PATCH 303/411] systemd: 246 -> 246.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This bumps systemd to the latest stable maintenance release. - dc2e82af33 core: create per-user inaccessible node from the service manager - 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host - 2239965c29 coredump: don't convert s → µs twice - 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release - 9678a3daf6 varlink: do not parse invalid messages twice - 4e516dcbc1 userdbctl: add forgotten --output mode in help - aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords - 5933d77afe doc: cross link sd_listen_fd() docs a bit - 97fdde3239 Rework how we cache mtime to figure out if units changed - 0500968241 core: always try to reload not-found unit - 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts - 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache() - 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling - 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction - a1ba0fbef6 homed: fix log message to honor real homework path - d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901) - e42f9add21 analyze: fix error handling in one case - 4804ce1488 units: add missing usb-gadget.target - 5ad4e68c37 man: extend on the usec/sec discrepancy - 2fb612371d login/logind: Include sys/stat.h for struct stat usage - 5e884e7ee0 partition/makefs: Include missing sys/file.h header - 7bbc3807da network: dhcp6: logs only new address - 2056429e0f Don't run test-repart when loop devices are not available - dcbea51c5a man: clarify that several networkctl commands takes device names - 16e4cfcc82 networkctl: label command does not take any argument - 2352921244 missing: Add new Linux capability - 8b29c4a4f9 tty-ask-pw-agent: properly propagate error - f7ce2e9839 tty-ask-pw-agent: the message string might not be set - 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly - e1ce367d73 add "list" verb to autocompleted commands - 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl - a4236a2764 path: Improve $PATH search directory case - b7cef386bd path: Skip directories when finalising $PATH search - 122945f315 rules: don't install 80-drivers.rules when kmod is disabled - 42fab2d454 zsh: correct journalctl command completion parsing - ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :( - ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units - d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too - 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN - 6d802dd596 man: drop reference to long gone .busname unit type - a29656804b man: fix a fix of a typo in systemd.service example - 21ce0f5b33 network: can: Fix CAN initialization - cab5cde8c9 man: update autogenerated dbus api lists - 0d8000522b man: fix invalid tag place - ea94f218be man: add conditionals to more man pages - ef91325349 meson: add ENABLE_ANALYZE conditional - 83f7c0a7ec core: add missing conditions/asserts to unit file parsing - 716718155d analyze: rework condition testing - 5c4c7581bc sd-bus: fix error handling on readv() - 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties - 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names - 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env - 496a71f444 man: Fix typo in systemd-tmpfiles - 6c5d216ad8 homework: downgrade chattr failure log message - 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy - a21eaa2a3a homework: correct error passed into log message - 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place - 84e1ab74d2 homed: downgrade quota message in containers - 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls - 29854a5437 NEWS: clarify two points - 4cb4fb82f7 meson: add min version for libfdisk - 76331f86f6 load-fragment: fix grammar in error messages - 1e53c2d70f Fix function description in logind man page - 669066564d network: do not fail if UseMTU=yes on DHCP lease lost - a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc - 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha - 7875daf52b network: wait for previous address removal before configuring static addresses - 120064b4a1 network: only process non-error message - f44ec1de15 test: accept that char device 0/0 can now be created witout privileges - 946e4c43bb tools/make-man-index: fix purpose text that contains tags - dae0586e91 test-fs-util: skip encrypted path test if we get EACCES - 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat - fde6520d46 namespace: fix minor memory leak - 208ba581f4 man: fix incorrectly placed full stop - 6c81d57828 man: fix typo - 53a8d2588e bless-boot: add missing verb to --help - 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully - ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields - 972391ac39 fix typo in systemctl help - 443aacfcda man: clarify that LogNamespace= is for system services only - 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity - f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf' - dda6fec1df man: describe that changing Storage= does not move existing data - 2bbd33e476 core: reset bus error before reuse - b81504a3c7 nspawn: Fix incorrect usage of putenv - cb263973ac man: fix typo in systemd.service - 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename --- ...its-for-uninitialised-encrypted-devic.patch | 4 ++-- ...Don-t-try-to-unmount-nix-or-nix-store.patch | 4 ++-- .../systemd/0003-Fix-NixOS-containers.patch | 6 +++--- ...0004-Look-for-fsck-in-the-right-place.patch | 4 ++-- ...-some-NixOS-specific-unit-directories.patch | 4 ++-- ...of-a-useless-message-in-user-sessions.patch | 6 +++--- ...ed-timedated-disable-methods-that-cha.patch | 4 ++-- .../linux/systemd/0008-Fix-hwdb-paths.patch | 4 ++-- ...ge-usr-share-zoneinfo-to-etc-zoneinfo.patch | 10 +++++----- ...ocalectl-use-etc-X11-xkb-for-list-x11.patch | 4 ++-- ...ate-statedir-and-don-t-touch-prefixdi.patch | 8 ++++---- ...-configuration-into-out-share-factory.patch | 18 +++++++++--------- ...d-environment-when-calling-generators.patch | 8 ++++---- ...14-add-rootprefix-to-lookup-dir-paths.patch | 4 ++-- ...n-execute-scripts-in-etc-systemd-syst.patch | 4 ++-- ...xecute-scripts-in-etc-systemd-system-.patch | 6 +++--- ...es.service-Update-ConditionFileNotEmp.patch | 4 ++-- ...d-placeholder-for-DEFAULT_PATH_NORMAL.patch | 4 ++-- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 390e7f9f09b3..1f75fc63ffe7 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001 +From 46c8ccfeb61253cd3dff5f34013670c7e3366ef5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices @@ -28,5 +28,5 @@ index 1c60eec587..b2486da130 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 9bb69092ca4e..7c025cbb7d79 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001 +From 139c420de62e078182eaf48b541c4b912d445fd9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644 || path_equal(path, "/usr") #endif -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 5ee54f39b741..1f0b8aaf38b3 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001 +From a889dbe796cd72425f38dec3d2aaab44a914ac60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,7 +10,7 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 3b9493f232..0117a9939d 100644 +index 43712565c2..07f294c78a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) { @@ -30,5 +30,5 @@ index 3b9493f232..0117a9939d 100644 } else { -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index cdef28ad68ed..f9e7bc9d8766 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001 +From 5098b1aad07356e04fcd12f2c77ea4fd17460411 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place @@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644 cmdline[i++] = "-T"; -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 95dd17531ab2..91d6fbf41d62 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001 +From b46f1b20e990f01af4bdf3dd6fef45f5b4a5993e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories @@ -120,5 +120,5 @@ index 8424837824..b1c541bc52 100644 systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 3e519e7fe73d..8021472ea339 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001 +From 4c9f9d192182f1051dba1c547e182e7c8f549b0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,7 +13,7 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 2c09def06f..c70540e1a3 100644 +index 1bda568560..5b44970763 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) { @@ -27,5 +27,5 @@ index 2c09def06f..c70540e1a3 100644 /* A unit we need to run is gone. Sniff. Let's stop this. */ r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index b63a051ae075..6c24821c2a0d 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001 +From 539f3af04963a6826d2b2d0ba2095af99a7a6294 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that @@ -104,5 +104,5 @@ index c467b85477..3e78b2f575 100644 if (r < 0) return r; -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 63bd03fcf38e..7b17c3bcb2ba 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001 +From 5c2a1a6d33f7cdbcb8ddcc70b91ba4c7f3c383b3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths @@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644 _public_ int sd_hwdb_new(sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index dcdc0cd7ea01..e0fab399febf 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001 +From a8ccba372d865429b578e72fd104a693b96101b3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -66,10 +66,10 @@ index 15cc1b8851..d0abde5933 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index a3f442518e..feff49e280 100644 +index c9fc8dd5cd..44fc04dc88 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -459,7 +459,7 @@ static int process_timezone(void) { +@@ -460,7 +460,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,7 +79,7 @@ index a3f442518e..feff49e280 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0117a9939d..d86445b40f 100644 +index 07f294c78a..cf86d1f494 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u @@ -128,5 +128,5 @@ index 3e78b2f575..de5477a08f 100644 return -ENOMEM; -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 50c2a1174dfb..44ed04d9e7ea 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001 +From 84a2d35d4e75295edf7e190a94dfaf65db4973b6 Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* @@ -23,5 +23,5 @@ index e0664de826..c521f33a2a 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 8ad310984ed7..e5d4f1701ba5 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001 +From 81ee9b5cd46f78de139c39e2a18f39e658c60169 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index dbbddb68e2..bbeb23223d 100644 +index ba9e7afe53..2ef9d4d770 100644 --- a/meson.build +++ b/meson.build -@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2', +@@ -3371,9 +3371,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) @@ -22,5 +22,5 @@ index dbbddb68e2..bbeb23223d 100644 check_help = find_program('tools/check-help.sh') -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 0844f85763b3..d1961d32f9fb 100644 --- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001 +From 7dbe84b7c43669dccd90db8ac33c38a70e6b6914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -44,7 +44,7 @@ index 5c77387a26..6404bc01ba 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index bbeb23223d..1a9c56fad2 100644 +index 2ef9d4d770..ae7acbd769 100644 --- a/meson.build +++ b/meson.build @@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') @@ -57,7 +57,7 @@ index bbeb23223d..1a9c56fad2 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2653,7 +2656,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,7 +66,7 @@ index bbeb23223d..1a9c56fad2 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2767,7 +2770,7 @@ executable( +@@ -2769,7 +2772,7 @@ executable( install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', @@ -75,7 +75,7 @@ index bbeb23223d..1a9c56fad2 100644 public_programs += executable( 'systemd-sysctl', -@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1 +@@ -3103,7 +3106,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -84,7 +84,7 @@ index bbeb23223d..1a9c56fad2 100644 endif public_programs += executable( -@@ -3352,7 +3355,7 @@ install_subdir('factory/etc', +@@ -3354,7 +3357,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', @@ -297,10 +297,10 @@ index 0a9582d8b9..3c56ca7d83 100644 + mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build -index aa2ed115ea..12e2925226 100644 +index 275daad3f4..491abd8eef 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', +@@ -324,7 +324,7 @@ install_data('user-.slice.d/10-defaults.conf', meson.add_install_script(meson_make_symlink, join_paths(pkgsysconfdir, 'user'), @@ -310,5 +310,5 @@ index aa2ed115ea..12e2925226 100644 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index a15220fd3f93..8df92b3e14f9 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001 +From 4cbc82570aa8671d260c37df58688cc07106e4b6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 41e0d73736..d02de06f09 100644 +index 6b7908fc6c..dff265c76f 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) { +@@ -4098,9 +4098,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index 41e0d73736..d02de06f09 100644 finish: -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index dca7b5591d29..bb7a9f9474f1 100644 --- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From d8b93ef32f3b95a6ce6548a8ad1504a485ffbe81 Mon Sep 17 00:00:00 2001 +From 1f39dba787e07d0a6944416ec172ee5d7cc86acd Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 1bd9e23d25c2..86ab43c19085 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From b3bc0aa899c51d19edfb53af2b00dde64123ab06 Mon Sep 17 00:00:00 2001 +From f7c462d37063b0077345395f54377c39d1ef0590 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -23,5 +23,5 @@ index 06c9710c6e..dadcc3117d 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index d99c7ecc96c1..8d20b3723af0 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 2679210f4ce804713bf1d244ac0fb8ac7b9b1e5f Mon Sep 17 00:00:00 2001 +From ff7cfe2d112eb166cd1937c3cc8c25491e508313 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 7029352ca5..6d9c636872 100644 +index 600e9c23c0..66ef1a99e1 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -182,6 +182,7 @@ static int execute(char **modes, char **states) { @@ -22,5 +22,5 @@ index 7029352ca5..6d9c636872 100644 }; -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index f45e4edd8e84..6dc33fd0341a 100644 --- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From 561b0cc9a1faed5729d6f701304a65c2968394ec Mon Sep 17 00:00:00 2001 +From 600ac2dd3fc15c5717fcdf8f37899fdabf97268c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644 [Service] Type=oneshot -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index a964aeede76b..bf011f701ec6 100644 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 0d9d7c03054babdbd1fa5f6f266b56e8c96e9ba5 Mon Sep 17 00:00:00 2001 +From 42419ff4dc7a36607189f8d3765aa836d5c5eaf9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.27.0 +2.28.0 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 54060b156f26..02b2a2d51688 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ }: let - version = "246"; + version = "246.4"; in stdenv.mkDerivation { inherit version; pname = "systemd"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; + sha256 = "0ns12w55yv680p4l7f2i9il7scdph7hips68d9k8cyvxk2w9xg0x"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a From f72d7dcf777af3007a1f91916251d56904ec0af9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:06:25 -0500 Subject: [PATCH 304/411] mariadb-connector-c: separate .dev output --- .../sql/mariadb/connector-c/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index fb41890d4328..8c71514dfba7 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { inherit sha256; }; + outputs = [ "out" "dev" ]; + cmakeFlags = [ "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DWITH_CURL=ON" @@ -25,6 +27,12 @@ stdenv.mkDerivation { "-DWITH_MYSQLCOMPAT=ON" ]; + postPatch = '' + substituteInPlace mariadb_config/mariadb_config.c.in \ + --replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@' "$dev/include" \ + --replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@' "$out/lib/mariadb" + ''; + # The cmake setup-hook uses $out/lib by default, this is not the case here. preConfigure = optionalString stdenv.isDarwin '' cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") @@ -36,12 +44,16 @@ stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = '' + moveToOutput bin/mariadb_config "$dev" + ''; + postFixup = '' - ln -sv mariadb_config $out/bin/mysql_config + ln -sv mariadb_config $dev/bin/mysql_config ln -sv mariadb $out/lib/mysql - ln -sv mariadb $out/include/mysql - ln -sv mariadb_version.h $out/include/mariadb/mysql_version.h - ln -sv libmariadb.pc $out/lib/pkgconfig/mysqlclient.pc + ln -sv mariadb $dev/include/mysql + ln -sv mariadb_version.h $dev/include/mariadb/mysql_version.h + ln -sv libmariadb.pc $dev/lib/pkgconfig/mysqlclient.pc ''; meta = { From 26265555f517948ba406776c9235cca32af4f62e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 09:52:46 -0500 Subject: [PATCH 305/411] mailutils: fix build with multiple mariadb outputs --- pkgs/tools/networking/mailutils/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 9cf5f91cd6d9..adcd2f1dc131 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { */Makefile{.in,.am} sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac sed -i 's/0\.18/0.19/' configure.ac - sed -i -e 's:mysql/mysql.h:mysql.h:' \ - -e 's:mysql/errmsg.h:errmsg.h:' \ - sql/mysql.c ''; nativeBuildInputs = [ From de938ee3f56818dab5e7f57c9430d3c4c248dcf5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 13:15:18 -0500 Subject: [PATCH 306/411] gdal: fix path to mysql_config --- pkgs/development/libraries/gdal/2.4.0.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index 201bec30e222..d3505679e4d0 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${libmysqlclient}/bin/mysql_config" + "--with-mysql=${getDev libmysqlclient}/bin/mysql_config" "--with-geotiff=${libgeotiff.dev}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 72135f1a62d4..1295a1002328 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config - "--with-mysql=${libmysqlclient}/bin/mysql_config" + "--with-mysql=${getDev libmysqlclient}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" From b750697c1f537e90476aff0378f1b75add84e497 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 13:27:35 -0500 Subject: [PATCH 307/411] glpk: do not hard code include path for libmysqlclient --- pkgs/development/libraries/glpk/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 8c5a50c43d18..124e03baee19 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , fetchpatch +, libmysqlclient # Excerpt from glpk's INSTALL file: # This feature allows the exact simplex solver to use the GNU MP # bignum library. If it is disabled, the exact simplex solver uses the @@ -21,9 +22,11 @@ stdenv.mkDerivation rec { sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; - buildInputs = stdenv.lib.optionals withGmp [ - gmp - ]; + buildInputs = + [ libmysqlclient + ] ++ stdenv.lib.optionals withGmp [ + gmp + ]; configureFlags = stdenv.lib.optionals withGmp [ "--with-gmp" @@ -47,6 +50,13 @@ stdenv.mkDerivation rec { }) ]; + postPatch = + # Do not hardcode the include path for libmysqlclient. + '' + substituteInPlace configure \ + --replace '-I/usr/include/mysql' '$(mysql_config --include)' + ''; + doCheck = true; meta = { From c7d0b34a1230c17396ef5c29d8cb520801ea2204 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 14:06:31 -0500 Subject: [PATCH 308/411] kea: fix path to mysql_config --- pkgs/tools/networking/kea/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 386a3ae280aa..1637827f66ea 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan2, log4cplus , boost, python3, postgresql, libmysqlclient, gmp, bzip2 }: +let inherit (stdenv) lib; in + stdenv.mkDerivation rec { pname = "kea"; version = "1.5.0-P1"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-pgsql=${postgresql}/bin/pg_config" - "--with-mysql=${libmysqlclient}/bin/mysql_config" + "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 106616102dc4facc2daad35de7a393b963316d67 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 14:17:23 -0500 Subject: [PATCH 309/411] grass: fix libmysqlclient include path --- pkgs/applications/gis/grass/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 420f57bb93fe..c1b7841dc58a 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -3,6 +3,8 @@ , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: +let inherit (stdenv) lib; in + stdenv.mkDerivation rec { name = "grass"; version = "7.6.1"; @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it "--with-mysql" - "--with-mysql-includes=${libmysqlclient}/include/mysql" + "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" From 3510a5f13c9f1da9564dd42771148b7d50e6aade Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 14:17:41 -0500 Subject: [PATCH 310/411] libdbi-drivers: fix libmysqlclient include path --- pkgs/development/libraries/libdbi-drivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index d321d7d650a8..871c9f971675 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (libmysqlclient != null) [ "--with-mysql" - "--with-mysql-incdir=${libmysqlclient}/include/mysql" + "--with-mysql-incdir=${getDev libmysqlclient}/include/mysql" "--with-mysql-libdir=${libmysqlclient}/lib/mysql" ] ++ optionals (sqlite != null) [ "--with-sqlite3" From 52c9fbc8354fb079dfb9d61a33899f0a14c68966 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Sep 2020 15:52:27 -0500 Subject: [PATCH 311/411] luadbi-mysql: fix libmysqlclient include path --- pkgs/development/lua-modules/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 6416d59a71e2..8e77c1902471 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -169,7 +169,7 @@ with super; luadbi-mysql = super.luadbi-mysql.override({ extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR="${pkgs.libmysqlclient}/include/mysql"; + MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql"; MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; }; buildInputs = [ From 951ec9287a7176cb3395bc546f59210cc50340e2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Sep 2020 05:59:38 -0500 Subject: [PATCH 312/411] mydumper: set MYSQL_INCLUDE_DIR --- pkgs/tools/backup/mydumper/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 88a727629903..611e543ca6ce 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , glib, zlib, pcre, libmysqlclient, libressl }: +let inherit (stdenv.lib) getDev; in + stdenv.mkDerivation rec { version = "0.9.5"; pname = "mydumper"; @@ -16,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib zlib pcre libmysqlclient libressl ]; + cmakeFlags = [ "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" ]; + meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; homepage = "https://github.com/maxbube/mydumper"; From 9bbe7a06fd285ff874f1f279600d50845fe30110 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Sep 2020 06:02:54 -0500 Subject: [PATCH 313/411] opendbx: set libmysqlclient include path --- pkgs/development/libraries/opendbx/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 16ec6a5c1103..954e6cc6b663 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: +let inherit (stdenv.lib) getDev; in + stdenv.mkDerivation rec { name = "opendbx-1.4.6"; @@ -9,7 +11,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${libmysqlclient}/include/mysql" + export CPPFLAGS="-I${getDev libmysqlclient}/include/mysql" export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; From 7ac43898feffccfd8cdb176a8f6d0268fbc80e1b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Sep 2020 06:09:52 -0500 Subject: [PATCH 314/411] pmacct: set path to mysql_config --- pkgs/tools/networking/pmacct/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index ffecbfcaf425..2bb6f373727d 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -19,7 +19,7 @@ assert withSQLite -> sqlite != null; assert withPgSQL -> postgresql != null; assert withMysql -> libmysqlclient != null; -let inherit (stdenv.lib) optional; in +let inherit (stdenv.lib) getDev optional optionalString; in stdenv.mkDerivation rec { version = "1.7.5"; @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { ++ optional withPgSQL postgresql ++ optional withMysql [ libmysqlclient zlib ]; + MYSQL_CONFIG = + optionalString withMysql "${getDev libmysqlclient}/bin/mysql_config"; + configureFlags = [ "--with-pcap-includes=${libpcap}/include" ] ++ optional withJansson "--enable-jansson" From f41b7f74d86ffe6b89773c999457966d4431911f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Sep 2020 06:25:56 -0500 Subject: [PATCH 315/411] communi: qmakeFlags --- .../networking/irc/communi/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 6cb6f2c2ef67..f3a840e23d0f 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -19,16 +19,17 @@ stdenv.mkDerivation rec { preConfigure = '' export QMAKEFEATURES=${libcommuni}/features - qmakeFlags="$qmakeFlags \ - COMMUNI_INSTALL_PREFIX=$out \ - COMMUNI_INSTALL_BINS=$out/bin \ - COMMUNI_INSTALL_PLUGINS=$out/lib/communi/plugins \ - COMMUNI_INSTALL_ICONS=$out/share/icons/hicolor \ - COMMUNI_INSTALL_DESKTOP=$out/share/applications \ - COMMUNI_INSTALL_THEMES=$out/share/communi/themes - " ''; + qmakeFlags = [ + "COMMUNI_INSTALL_PREFIX=${placeholder "out"}" + "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" + "COMMUNI_INSTALL_PLUGINS=${placeholder "out"}/lib/communi/plugins" + "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" + "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" + "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" + ]; + postInstall = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" From 34cd8d44c7f86e25702769eb985a170532294596 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Sep 2020 14:53:06 +0200 Subject: [PATCH 316/411] libva: 2.8.0 -> 2.9.0 (#97831) --- pkgs/development/libraries/libva/default.nix | 5 ++--- pkgs/development/libraries/libva/utils.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7f690f0997b0..d3578283737a 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,14 +7,13 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.8.0"; # Also update the hash for libva-utils! + version = "2.9.0"; # Also update the hash for libva-utils! - # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "190cq173jzp5rkrczi8gzbwa0y3xk253v4wd205a5ilfngm7srns"; + sha256 = "17m8k8fn41vzi1lzh9idf2mn4x73bwlkw60kl5zj396kpw4n1z1r"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 5b9f4cdd8aa3..71a1d085d121 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb"; + sha256 = "1xylc940ffhqay9lyy48872cfw61ziky8dw21vm69psngfz3zs9n"; }; nativeBuildInputs = [ meson ninja pkg-config ]; From fbc5093649b17b65a5db6caa252f7d3aa99f94d0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 19 Aug 2019 16:05:44 +0200 Subject: [PATCH 317/411] hooks: add moveSystemdUserUnitsHook This hook moves systemd user service file from `lib/systemd/user` to `share/systemd/user`. This is to allow systemd to find the user services when installed into a user profile. The `lib/systemd/user` path does not work since `lib` is not in `XDG_DATA_DIRS`. --- doc/stdenv/stdenv.xml | 13 ++++++++++ nixos/modules/config/system-path.nix | 1 + .../setup-hooks/move-systemd-user-units.sh | 25 +++++++++++++++++++ pkgs/stdenv/generic/default.nix | 5 +++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 pkgs/build-support/setup-hooks/move-systemd-user-units.sh diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index f97c2a145af5..e85e2ccb0ec4 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1834,6 +1834,19 @@ addEnvHooks "$hostOffset" myBashFunction + + + move-systemd-user-units.sh + + + + This setup hook moves any systemd user units installed in the lib + subdirectory into share. In addition, a link is provided from share to + lib for compatibility. This is needed for systemd to find user services + when installed into the user profile. + + + set-source-date-epoch-to-latest.sh diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 67305e8499cb..c46937f80081 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -142,6 +142,7 @@ in "/share/kservices5" "/share/kservicetypes5" "/share/kxmlgui5" + "/share/systemd" ]; system.path = pkgs.buildEnv { diff --git a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh new file mode 100755 index 000000000000..5963d87c7515 --- /dev/null +++ b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# This setup hook, for each output, moves everything in +# $output/lib/systemd/user to $output/share/systemd/user, and replaces +# $output/lib/systemd/user with a symlink to +# $output/share/systemd/user. + +fixupOutputHooks+=(_moveSystemdUserUnits) + +_moveSystemdUserUnits() { + if [ "${dontMoveSystemdUserUnits:-0}" = 1 ]; then return; fi + if [ ! -e "${prefix:?}/lib/systemd/user" ]; then return; fi + local source="$prefix/lib/systemd/user" + local target="$prefix/share/systemd/user" + echo "moving $source/* to $target" + mkdir -p "$target" + ( + shopt -s dotglob + for i in "$source"/*; do + mv "$i" "$target" + done + ) + rmdir "$source" + ln -s "$target" "$source" +} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b57989786904..eeddb584a3d5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -61,7 +61,10 @@ let ] # FIXME this on Darwin; see # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 - ++ lib.optional hostPlatform.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh + ++ lib.optionals hostPlatform.isLinux [ + ../../build-support/setup-hooks/audit-tmpdir.sh + ../../build-support/setup-hooks/move-systemd-user-units.sh + ] ++ [ ../../build-support/setup-hooks/multiple-outputs.sh ../../build-support/setup-hooks/move-sbin.sh From 30286ebcc178aec1fb3797ba3ec88cf75feb282b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Aug 2020 11:25:08 +0200 Subject: [PATCH 318/411] glibc: 2.31 -> 2.32 ChangeLog: https://sourceware.org/pipermail/libc-announce/2020/000029.html Patches removed: * `rpcgen-path.patch` is obsolete as the support for SunOS RPC has been removed in 2.32[1]. * The vulnerabilities CVE-2020-1752[2] & CVE-2020-10029[3] are fixed in `glibc-2.32`[4][5], thus applying those manually isn't necessary anymore. I also added myself as second maintainer as I'm quite regularly doing `glibc`-related stuff in `nixpkgs`, so let's make this situation official. [1] https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commit;h=5500cdba4018ddbda7909bc7f4f9718610b43cf0 [2] https://nvd.nist.gov/vuln/detail/CVE-2020-1752 [3] https://nvd.nist.gov/vuln/detail/CVE-2020-10029 [4] Commit 9333498794cde1d5cca518badf79533a24114b6f (CVE-2020-1752) [5] Commit ddc650e9b3dc916eab417ce9f79e67337b05035c (CVE-2020-10029) --- .../libraries/glibc/2.30-cve-2020-1752.patch | 62 --------------- .../libraries/glibc/2.31-cve-2020-10029.patch | 79 ------------------- pkgs/development/libraries/glibc/common.nix | 19 ++--- 3 files changed, 6 insertions(+), 154 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch delete mode 100644 pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch diff --git a/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch b/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch deleted file mode 100644 index 75d874b93d09..000000000000 --- a/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Andreas Schwab -Date: Wed, 19 Feb 2020 16:21:46 +0000 (+0100) -Subject: Fix use-after-free in glob when expanding ~user (bug 25414) -X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=da97c6b88eb03fb834e92964b0895c2ac8d61f63;hp=dd34bce38c822b67fcc42e73969bf6699d6874b6 - -Fix use-after-free in glob when expanding ~user (bug 25414) - -The value of `end_name' points into the value of `dirname', thus don't -deallocate the latter before the last use of the former. - -(cherry picked from commit ddc650e9b3dc916eab417ce9f79e67337b05035c) ---- - -diff --git a/posix/glob.c b/posix/glob.c -index e73e35c510..c6cbd0eb43 100644 ---- a/posix/glob.c -+++ b/posix/glob.c -@@ -827,31 +827,32 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), - { - size_t home_len = strlen (p->pw_dir); - size_t rest_len = end_name == NULL ? 0 : strlen (end_name); -- char *d; -+ char *d, *newp; -+ bool use_alloca = glob_use_alloca (alloca_used, -+ home_len + rest_len + 1); - -- if (__glibc_unlikely (malloc_dirname)) -- free (dirname); -- malloc_dirname = 0; -- -- if (glob_use_alloca (alloca_used, home_len + rest_len + 1)) -- dirname = alloca_account (home_len + rest_len + 1, -- alloca_used); -+ if (use_alloca) -+ newp = alloca_account (home_len + rest_len + 1, alloca_used); - else - { -- dirname = malloc (home_len + rest_len + 1); -- if (dirname == NULL) -+ newp = malloc (home_len + rest_len + 1); -+ if (newp == NULL) - { - scratch_buffer_free (&pwtmpbuf); - retval = GLOB_NOSPACE; - goto out; - } -- malloc_dirname = 1; - } -- d = mempcpy (dirname, p->pw_dir, home_len); -+ d = mempcpy (newp, p->pw_dir, home_len); - if (end_name != NULL) - d = mempcpy (d, end_name, rest_len); - *d = '\0'; - -+ if (__glibc_unlikely (malloc_dirname)) -+ free (dirname); -+ dirname = newp; -+ malloc_dirname = !use_alloca; -+ - dirlen = home_len + rest_len; - dirname_modified = 1; - } diff --git a/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch b/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch deleted file mode 100644 index 8334398e8912..000000000000 --- a/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile -index 995e90d6da..318628aed6 100644 ---- a/sysdeps/ieee754/ldbl-96/Makefile -+++ b/sysdeps/ieee754/ldbl-96/Makefile -@@ -17,5 +17,6 @@ - # . - - ifeq ($(subdir),math) --tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 -+tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo -+CFLAGS-test-sinl-pseudo.c += -fstack-protector-all - endif -diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c -index 5f742321ae..bcdf20179f 100644 ---- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c -+++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c -@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) - return 0; - } - -+ if ((i0 & 0x80000000) == 0) -+ { -+ /* Pseudo-zero and unnormal representations are not valid -+ representations of long double. We need to avoid stack -+ corruption in __kernel_rem_pio2, which expects input in a -+ particular normal form, but those representations do not need -+ to be consistently handled like any particular floating-point -+ value. */ -+ y[1] = y[0] = __builtin_nanl (""); -+ return 0; -+ } -+ - /* Split the 64 bits of the mantissa into three 24-bit integers - stored in a double array. */ - exp = j0 - 23; ---- /dev/null -+++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c -@@ -0,0 +1,41 @@ -+/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). -+ Copyright (C) 2020 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#include -+#include -+#include -+ -+static int -+do_test (void) -+{ -+ for (int i = 0; i < 64; i++) -+ { -+ uint64_t sig = i == 63 ? 0 : 1ULL << i; -+ long double ld; -+ SET_LDOUBLE_WORDS (ld, 0x4141, -+ sig >> 32, sig & 0xffffffffULL); -+ /* The requirement is that no stack overflow occurs when the -+ pseudo-zero or unnormal goes through range reduction. */ -+ volatile long double ldr; -+ ldr = sinl (ld); -+ (void) ldr; -+ } -+ return 0; -+} -+ -+#include diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 0b2f34c7b765..3de840d4e3c6 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -41,9 +41,9 @@ } @ args: let - version = "2.31"; + version = "2.32"; patchSuffix = ""; - sha256 = "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"; + sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,9 +59,6 @@ stdenv.mkDerivation ({ patches = [ - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -113,8 +110,6 @@ stdenv.mkDerivation ({ }) ./fix-x64-abi.patch - ./2.30-cve-2020-1752.patch - ./2.31-cve-2020-10029.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -146,8 +141,6 @@ stdenv.mkDerivation ({ configureFlags = [ "-C" "--enable-add-ons" - "--enable-obsolete-nsl" - "--enable-obsolete-rpc" "--sysconfdir=/etc" "--enable-stackguard-randomization" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") @@ -226,7 +219,7 @@ stdenv.mkDerivation ({ doCheck = false; # fails - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/libc/"; description = "The GNU C Library"; @@ -239,10 +232,10 @@ stdenv.mkDerivation ({ most systems with the Linux kernel. ''; - license = lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ eelco ma27 ]; + platforms = platforms.linux; } // meta; } From 08bc71284367bf3490b0d97792dc0bc27a059ef2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Aug 2020 21:47:53 +0200 Subject: [PATCH 319/411] dateutils: fix build w/glibc-2.32 --- pkgs/tools/misc/dateutils/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index f56cee49ecf5..eae2241c3b4e 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, tzdata }: +{ stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { version = "0.4.7"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9"; }; + patches = [ + (fetchpatch { + url = "https://bitbucket.org/hroptatyr/dateutils/commits/6813ed94534f2311fbe9164748919e39d60b0190/raw"; + sha256 = "1zs3iizb172ha56g03rr8kzd8zx6qypiqsc11jw758mliwxk5rgc"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ tzdata ]; # needed for datezone enableParallelBuilding = true; From 5f5ff556234c0ec57636272fe81d950550316e7c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Aug 2020 21:48:12 +0200 Subject: [PATCH 320/411] super: fix build w/glibc-2.32 --- ...s-to-dropped-sys_nerr-sys_errlist-fo.patch | 51 +++++++++++++++++++ pkgs/tools/security/super/default.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch diff --git a/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch b/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch new file mode 100644 index 000000000000..048486caafd7 --- /dev/null +++ b/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch @@ -0,0 +1,51 @@ +From 86e37c1c09c23924c4e055a3d4b8c79f19cd0599 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 10 Aug 2020 21:33:39 +0200 +Subject: [PATCH] Remove references to dropped `sys_nerr` & `sys_errlist` for + `glibc-2.32` compat + +According to the release-notes[1], `strerror(3)` should be used. This is +already the case, however the source tries to be backwards-compatible by +supporting `sys_nerr` & `sys_errlist` which breaks compilation +unfortunately. + +Simply using `strerror` fixes the problems. + +[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html +--- + utils.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/utils.c b/utils.c +index 3ec70b6..430f027 100644 +--- a/utils.c ++++ b/utils.c +@@ -2003,7 +2003,6 @@ int n; + + #ifdef HAVE_SYS_ERRLIST + extern char *sys_errlist[]; +- extern int sys_nerr; + #endif + + /* +@@ -2019,16 +2018,7 @@ int errnum; + sprintf(buf, "Error %d", errnum); + return buf; + #else +- if (errnum < 0 || errnum > sys_nerr) { +- sprintf(buf, "Error %d (!)", errnum); +- return buf; +- } else { +-#ifdef HAVE_STRERROR +- return strerror(errnum); +-#else +- return sys_errlist[errnum]; +-#endif +- } ++ return strerror(errnum); + #endif + } + +-- +2.25.4 + diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 070517310696..79a7cd839e5b 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { ''; patches = [ + ./0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch (fetchpatch { name = "CVE-2014-0470.patch"; url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; From 7f02eca8cc62cf87112d62ed89ebd455c11e2e32 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Aug 2020 22:26:45 +0200 Subject: [PATCH 321/411] tcpkali: fix build w/glibc-2.32 --- pkgs/applications/networking/tcpkali/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index a71425422383..fae3bde72f02 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf"; }; + postPatch = '' + sed -ie '/sys\/sysctl\.h/d' src/tcpkali_syslimits.c + ''; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison]; meta = { From 883bdf8070d413ae1b11d7af797db934b4eb9e29 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 11:34:09 +0200 Subject: [PATCH 322/411] xawtv: fix build w/glibc-2.32 Also emailed the patch to the maintainer. --- .../xawtv/0001-Fix-build-for-glibc-2.32.patch | 63 +++++++++++++++++++ pkgs/applications/video/xawtv/default.nix | 4 ++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch diff --git a/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch new file mode 100644 index 000000000000..227559f1f91c --- /dev/null +++ b/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch @@ -0,0 +1,63 @@ +From 009c426ab37ef7f8d9d8e30f45096225203d694a Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 11 Aug 2020 11:27:21 +0200 +Subject: [PATCH] Fix build for glibc-2.32 + +The `sys_siglist`-array has been removed. Instead, `strsignal` should be +used. +--- + console/fbtools.c | 2 +- + console/record.c | 2 +- + x11/rootv.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/console/fbtools.c b/console/fbtools.c +index 9f876df..07739ff 100644 +--- a/console/fbtools.c ++++ b/console/fbtools.c +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } +diff --git a/console/record.c b/console/record.c +index 685221b..90f0c85 100644 +--- a/console/record.c ++++ b/console/record.c +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + +diff --git a/x11/rootv.c b/x11/rootv.c +index 60a8406..4bf458b 100644 +--- a/x11/rootv.c ++++ b/x11/rootv.c +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); +-- +2.25.4 + diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index a82ea0444073..ee2f811cb4a1 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; + patches = [ + ./0001-Fix-build-for-glibc-2.32.patch + ]; + buildInputs = [ ncurses libjpeg From c60a09b49847db3724616eeb0558905c8ff4b3d2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 12:08:34 +0200 Subject: [PATCH 323/411] chipmunk: 7.0.1 -> 7.0.3, fix build w/glibc-2.32 --- pkgs/development/libraries/chipmunk/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 017dc1fd9c26..7618476d62a0 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,20 +1,27 @@ { stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto -, libXi, libXmu +, libXi, libXmu, fetchpatch, libXrandr }: stdenv.mkDerivation rec { pname = "chipmunk"; majorVersion = "7"; - version = "${majorVersion}.0.1"; + version = "${majorVersion}.0.3"; src = fetchurl { url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "0q4jwv1icz8spcjkp0v3bnygi6hq2zmnsgcxkwm8i2bxfxjb8m7y"; + sha256 = "06j9cfxsyrrnyvl7hsf55ac5mgff939mmijliampphlizyg0r2q4"; }; + patches = [ + (fetchpatch { + url = "https://github.com/slembcke/Chipmunk2D/commit/9a051e6fb970c7afe09ce2d564c163b81df050a8.patch"; + sha256 = "0ps8bjba1k544vcdx5w0qk7gcjq94yfigxf67j50s63yf70k2n70"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu ]; + [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; postInstall = '' mkdir -p $out/bin From 4ba59baf97c3d57df76d90dc028d1ccd86e5ec12 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 13:02:04 +0200 Subject: [PATCH 324/411] cernlib: fix build w/glibc-2.32 --- ...her-than-sys_errlist-to-fix-compilat.patch | 94 +++++++++++++++++++ .../libraries/physics/cernlib/default.nix | 2 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch diff --git a/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch b/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch new file mode 100644 index 000000000000..bc8c77f913c6 --- /dev/null +++ b/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch @@ -0,0 +1,94 @@ +From a69607c511b6da94cde477283b129cbc9cfdd5a3 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 11 Aug 2020 12:32:06 +0200 +Subject: [PATCH] Use `strerror` rather than `sys_errlist` to fix compilation + w/glibc-2.32 + +To quote the release-notes[1]: + + All programs should use + strerror or strerror_r instead. + +[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html +--- + 2006/src/packlib/cspack/sysreq/serror.c | 10 +--------- + 2006/src/packlib/cspack/sysreq/socket.c | 2 +- + 2006/src/packlib/kernlib/kernbit/z268/systems.c | 4 ++-- + 2006/src/pawlib/paw/piafs/piafc.c | 5 +---- + 4 files changed, 5 insertions(+), 16 deletions(-) + +diff --git a/2006/src/packlib/cspack/sysreq/serror.c b/2006/src/packlib/cspack/sysreq/serror.c +index 3667c42a..c560e499 100644 +--- a/2006/src/packlib/cspack/sysreq/serror.c ++++ b/2006/src/packlib/cspack/sysreq/serror.c +@@ -176,15 +176,7 @@ int n; + } + else { + #if !defined(vms) +- if ((n>0) && (n Date: Tue, 11 Aug 2020 13:22:22 +0200 Subject: [PATCH 325/411] rpcsvc-proto: init at 1.4.2 --- pkgs/tools/misc/rpcsvc-proto/default.nix | 29 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/rpcsvc-proto/default.nix diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix new file mode 100644 index 000000000000..6406b6b20e2c --- /dev/null +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "rpcsvc-proto"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "thkukuk"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/thkukuk/rpcsvc-proto"; + description = "This package contains rpcsvc proto.x files from glibc, which are missing in libtirpc"; + longDescription = '' + The RPC-API has been removed from glibc. The 2.32-release-notes + (https://sourceware.org/pipermail/libc-announce/2020/000029.html) recommend to use + `libtirpc` and this package instead. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d9790fca8e..0475cdf59ea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16649,6 +16649,8 @@ in rpcbind = callPackage ../servers/rpcbind { }; + rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; + libmysqlclient = libmysqlclient_3_1; libmysqlclient_3_1 = mariadb-connector-c_3_1; mariadb-connector-c = mariadb-connector-c_3_1; From 1897ff96d36c4d75073bc02201d58a97bdcc8d2b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 13:12:58 +0200 Subject: [PATCH 326/411] mysql*: fix build w/glibc-2.32 --- pkgs/servers/sql/mysql/5.7.x.nix | 8 +++++--- pkgs/servers/sql/mysql/8.0.x.nix | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 6636c099e832..8b489816a50a 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl -, cctools, CoreServices, developer_cmds }: +, cctools, CoreServices, developer_cmds +, libtirpc, rpcsvc-proto +}: # Note: zlib is not required; MySQL can use an internal zlib. @@ -19,9 +21,9 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison pkgconfig ]; + nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ]; - buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] + buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; outputs = [ "out" "static" ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 3c1d1f6645c6..299302b27de0 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bison, cmake, pkgconfig , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib -, numactl, perl, cctools, CoreServices, developer_cmds +, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto }: let @@ -18,12 +18,12 @@ self = stdenv.mkDerivation rec { ./libutils.patch ]; - nativeBuildInputs = [ bison cmake pkgconfig ]; + nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ]; buildInputs = [ boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib ] ++ lib.optionals stdenv.isLinux [ - numactl + numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds ]; From 7a94f9baa98cd49bfc926e196d2c5b0add8cc9a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 14:57:57 +0200 Subject: [PATCH 327/411] memcached: fix build w/glibc-2.32 --- pkgs/servers/memcached/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 58276ff8632d..b6c6031f1509 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-error"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] + ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error"; meta = with stdenv.lib; { description = "A distributed memory object caching system"; From e6e6412b78be8b78bb1581a1a46949f8b7886c85 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 18:59:53 +0200 Subject: [PATCH 328/411] conntrack-tools: fix build w/glibc-2.32 --- pkgs/os-specific/linux/conntrack-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 80785015e766..43306e51166b 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -1,6 +1,8 @@ { fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout -, libnetfilter_cthelper, systemd }: +, libnetfilter_cthelper, systemd +, libtirpc +}: stdenv.mkDerivation rec { pname = "conntrack-tools"; @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue - libnetfilter_cttimeout libnetfilter_cthelper systemd + libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc ]; nativeBuildInputs = [ flex bison pkgconfig ]; From b13de839728c37bb2d19e195a56c541dd280f3cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 19:06:08 +0200 Subject: [PATCH 329/411] ace: 6.5.7 -> 6.5.10, fix build w/glibc-2.32 --- pkgs/development/libraries/ace/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 372cfbeffff3..b2a31edd0b63 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "6.5.7"; + version = "6.5.10"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0hvd7y3hs8r3r7qbllfaqrva3jrx5razcnwlws822k66v4r10cbx"; + sha256 = "1qnq63r9cnaaqb5yrbb7apr7kjl6x31wfclizplri3lj4rwl7plh"; }; enableParallelBuilding = true; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ perl ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-security" + ]; + patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; From 4f0b106aee47e185ccc4cf0ae14705c59e466c9a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 19:27:41 +0200 Subject: [PATCH 330/411] libtirpc: 1.2.6 -> 1.2.7-rc4 --- pkgs/development/libraries/ti-rpc/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index db434a5e62ed..3d163ef6ded6 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,21 +1,19 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.2.6"; + pname = "libtirpc"; + version = "1.2.7-rc4"; src = fetchurl { - url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22"; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=5ca4ca92f629d9d83e83544b9239abaaacf0a527;sf=tgz"; + sha256 = "0w26yf9bwkpqj52sqd3n250dg9jlqnr8bjv0kc4fl5hkrv8akj8i"; + name = "${pname}-${version}.tar.gz"; }; outputs = [ "out" "dev" ]; postPatch = '' sed '1i#include ' -i src/xdr_sizeof.c - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace tirpc/rpc/types.h \ - --replace '#if defined __APPLE_CC__ || defined __FreeBSD__' \ - '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__' ''; KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; From 0841c6a1d972a127c84bffc1cce22e824373b914 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 20:32:32 +0200 Subject: [PATCH 331/411] libchop: fix build w/glibc-2.32 --- ...ion-when-using-libtirpc-rather-than-.patch | 41 +++++++++++++++++++ .../development/libraries/libchop/default.nix | 11 +++-- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch diff --git a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch new file mode 100644 index 000000000000..f5a016f63ac3 --- /dev/null +++ b/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch @@ -0,0 +1,41 @@ +From 86fd3be1d31d2e7c09603aa3a8966537ac01bb07 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 11 Aug 2020 20:30:16 +0200 +Subject: [PATCH] Fix RPC compilation when using libtirpc rather than glibc + +--- + src/block-server.c | 3 +++ + utils/chop-block-server.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/block-server.c b/src/block-server.c +index 3f97417..29b299e 100644 +--- a/src/block-server.c ++++ b/src/block-server.c +@@ -18,6 +18,9 @@ + + /* Server-side stubs. */ + ++#include ++#include ++#include + #include + #include + +diff --git a/utils/chop-block-server.c b/utils/chop-block-server.c +index a2076c0..9462f5d 100644 +--- a/utils/chop-block-server.c ++++ b/utils/chop-block-server.c +@@ -19,6 +19,9 @@ + store, e.g. a GDBM block store, and serves it remotely. A lot of code is + borrowed from `chop-archiver.c'. */ + ++#include ++#include ++#include + #include + + #include +-- +2.25.4 + diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 190f122ecfa7..d2040b72311c 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, zlib, bzip2, libgcrypt , gdbm, gperf, tdb, gnutls, db, libuuid -, lzo, pkgconfig, guile +, lzo, pkgconfig, guile, rpcsvc-proto, libtirpc }: stdenv.mkDerivation rec { @@ -11,16 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; }; - patches = [ ./gets-undeclared.patch ./size_t.patch ]; + patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ]; - nativeBuildInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkgconfig gperf rpcsvc-proto ]; + + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; buildInputs = [ zlib bzip2 lzo libgcrypt gdbm db tdb gnutls libuuid - guile + guile libtirpc ]; doCheck = false; From 5e68d203f3f8abf8f928fb6788487b83e3a0e8ec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 21:21:21 +0200 Subject: [PATCH 332/411] opencv2: mark as broken Current release is 4.x and the 2.x-series doesn't seem to be supported anymore for a while. --- pkgs/development/libraries/opencv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d71c210fb6f6..0749ec9e7f30 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; + broken = true; }; } From f5a2dd0811607acffa0c53917a4821d2c800bc78 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 21:22:08 +0200 Subject: [PATCH 333/411] nx-libs: fix build w/glibc-2.32 --- pkgs/tools/X11/nx-libs/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index ceb2534e07aa..c08a2fd21855 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,5 +1,7 @@ -{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo, - libpng, libtool, libxml2, pkgconfig, which, xorg }: +{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +, libpng, libtool, libxml2, pkgconfig, which, xorg +, libtirpc +}: stdenv.mkDerivation rec { pname = "nx-libs"; version = "3.5.99.24"; @@ -15,7 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil xorg.libXcomposite xorg.libXdamage xorg.libXdmcp xorg.libXext xorg.libXfont2 xorg.libXinerama xorg.libXpm xorg.libXrandr xorg.libXtst xorg.pixman - xorg.xkbcomp xorg.xkeyboardconfig ]; + xorg.xkbcomp xorg.xkeyboardconfig libtirpc + ]; + + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; enableParallelBuilding = true; From 9ca70aba9316fb98aef01e8eab423f9847ed5202 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 22:33:36 +0200 Subject: [PATCH 334/411] trickle: fix build w/glibc-2.32 --- pkgs/tools/networking/trickle/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index f97d3c857621..fc32d34ad316 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent }: +{ stdenv, fetchurl, libevent, libtirpc }: stdenv.mkDerivation rec { name = "trickle-1.07"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; - buildInputs = [ libevent ]; + buildInputs = [ libevent libtirpc ]; preConfigure = '' sed -i 's|libevent.a|libevent.so|' configure @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sed -i '/#define in_addr_t/ s:^://:' config.h ''; - LDFLAGS = "-levent"; + NIX_LDFLAGS = [ "-levent" "-ltirpc" ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; configureFlags = [ "--with-libevent" ]; From 59637a44746f1423e3c5728da15c2a64ff30408e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 10:59:19 +0200 Subject: [PATCH 335/411] nfstrace: fix build w/glibc-2.32 --- pkgs/tools/networking/nfstrace/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 88510b9b8876..2cb819caee98 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, fetchpatch, json_c, libpcap, ncurses, stdenv }: +{ cmake, fetchFromGitHub, fetchpatch, json_c, libpcap, ncurses, stdenv, libtirpc }: stdenv.mkDerivation rec { pname = "nfstrace"; @@ -23,13 +23,14 @@ stdenv.mkDerivation rec { --replace "-Wno-braced-scalar-init" "" ''; - buildInputs = [ json_c libpcap ncurses ]; + buildInputs = [ json_c libpcap ncurses libtirpc ]; nativeBuildInputs = [ cmake ]; # To build with GCC 8+ it needs: CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers"; # CMake can't find json_c without: - NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" ]; + NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; doCheck = false; # requires network access From 0efbea1da8c3812c22498c5ff44e59f7d20c8fea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 11:07:33 +0200 Subject: [PATCH 336/411] nfs-utils: 2.4.1 -> 2.5.1, fix build w/glibc-2.32 --- pkgs/os-specific/linux/nfs-utils/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 719ded4d70fa..81ec7e5a661e 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests +, python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: @@ -10,18 +10,18 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5"; + sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g"; }; # libnfsidmap is built together with nfs-utils from the same source, # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap - ] - ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; + "--with-rpcgen=${rpcsvc-proto}/bin/rpcgen" + ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { From 92eae6a36d18135b5e35ae8ae02c5275cbf0cac3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 11:12:19 +0200 Subject: [PATCH 337/411] snort: 2.9.16 -> 2.9.16.1, fix build w/glibc-2.32 --- .../networking/ids/snort/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 49f7bbfd8120..03db9eece485 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,16 +1,20 @@ -{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: +{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper +, libtirpc +}: stdenv.mkDerivation rec { - version = "2.9.16"; + version = "2.9.16.1"; pname = "snort"; - + src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "1mxspk0060f62xp631w589b9ryb21qygn020az3dw2fsy7nxi24n"; + sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73"; }; - - buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison ]; + + buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; enableParallelBuilding = true; From 23e870d828f1e4337c119d9448335bfe94148031 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 22:34:20 +0200 Subject: [PATCH 338/411] nvidia-texture-tools: fix build w/glibc-2.32 --- .../libraries/nvidia-texture-tools/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index f9b745e882f3..a2bdbc798eb0 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "nvidia-texture-tools"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3"; }; + patches = [ + (fetchpatch { + url = "https://github.com/castano/nvidia-texture-tools/commit/6474f2593428d89ec152da2502aa136ababe66ca.patch"; + sha256 = "0akbkvm55hiv58jx71h9hj173rbnqlb5a430y9azjiix7zga42vd"; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" "lib" ]; From 73277d313e626fc07e80fd4806efdc88655b6c89 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 22:50:23 +0200 Subject: [PATCH 339/411] dbench: fix build w/glibc-2.32 --- pkgs/development/tools/misc/dbench/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index ad46534fcfaa..49fb1efbd4a9 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, popt, zlib }: +{ stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: stdenv.mkDerivation { name = "dbench-2013-01-01"; @@ -9,7 +9,10 @@ stdenv.mkDerivation { sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; }; - buildInputs = [ autoconf popt zlib ]; + nativeBuildInputs = [ autoconf rpcsvc-proto ]; + buildInputs = [ popt zlib libtirpc ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; patches = [ # patch has been also sent upstream and might be included in future versions From 0258849e616c96973e158f959ad3e9c836e7bc9b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 23:24:15 +0200 Subject: [PATCH 340/411] samba: fix build w/glibc-2.32 --- pkgs/servers/samba/4.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7ed1a72de0e4..9c06dec2f4b1 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -24,6 +24,7 @@ , libtasn1 , tdb , cmocka +, rpcsvc-proto , nixosTests , enableLDAP ? false, openldap @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_45 cmocka + rpcsvc-proto ] ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames From bafe7eb14db7e0bf16dfe1e4356ecb4de59cf0b5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Aug 2020 16:09:09 +0200 Subject: [PATCH 341/411] zfs: fix build w/gibc-2.32 --- pkgs/os-specific/linux/zfs/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 27e26b13a533..14854396c8aa 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,6 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, sysstat, sudo +, pkgconfig # Kernel dependencies , kernel ? null @@ -94,17 +95,14 @@ let substituteInPlace ./cmd/vdev_id/vdev_id \ --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - '' + optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace config/user-libtirpc.m4 \ - --replace /usr/include/tirpc ${libtirpc}/include/tirpc ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); - buildInputs = optionals buildUser [ zlib libuuid attr ] + ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) + ++ optional buildUser pkgconfig; + buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] ++ optional buildUser openssl - ++ optional (buildUser && enablePython) python3 - ++ optional stdenv.hostPlatform.isMusl libtirpc; + ++ optional (buildUser && enablePython) python3; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -113,6 +111,7 @@ let configureFlags = [ "--with-config=${configFile}" + "--with-tirpc=1" (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" From 8984fc299466c12faf9c04201ab622b9689dcc15 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Aug 2020 16:20:28 +0200 Subject: [PATCH 342/411] xfitter: fix build w/glibc-2.32 --- pkgs/applications/science/physics/xfitter/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index b992851e40a8..cbb097350c71 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx, mela, root5, qcdnum, which }: +{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx +, mela, root5, qcdnum, which, libtirpc +}: stdenv.mkDerivation rec { pname = "xfitter"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] + [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum libtirpc ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml ; @@ -47,6 +49,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + meta = with stdenv.lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; From 9dbd6a782a7668218e81d848f495fdf3d24fd6a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Aug 2020 16:25:01 +0200 Subject: [PATCH 343/411] libdap: mark as broken Requires an sunrpc-lib like `libtirpc` (latest `glibc` dropped support for it), however it requires symbols like `xdr_uint` that don't exist in `libtirpc`. --- pkgs/development/libraries/libdap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index bc05e774cd86..a643c25f0bfd 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; + broken = true; }; } From e0030dff157b8fe7ef8057c67b16cec8c59f2a9b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Aug 2020 23:54:24 +0200 Subject: [PATCH 344/411] glusterfs: fix build w/glibc-2.32 --- pkgs/tools/filesystems/glusterfs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 44880638e65d..e7028ec12494 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -2,7 +2,7 @@ autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc + rsync, glibc, rpcsvc-proto, libtirpc }: let s = @@ -24,7 +24,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper utillinux + acl sqlite liburcu attr makeWrapper utillinux libtirpc (python3.withPackages (pkgs: [ pkgs.flask pkgs.prettytable @@ -100,6 +100,8 @@ stdenv.mkDerivation ''--localstatedir=/var'' ]; + nativeBuildInputs = [ rpcsvc-proto ]; + makeFlags = [ "DESTDIR=$(out)" ]; enableParallelBuilding = true; From f883a5deec7257c912cf6591c5b12fa0792cd9fd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 16 Aug 2020 14:29:23 +0200 Subject: [PATCH 345/411] hfsprogs: fix build w/glibc-2.32 --- pkgs/tools/filesystems/hfsprogs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index 2032ca1c1e75..e08835fc35d6 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + sed -ie '/sys\/sysctl.h/d' newfs_hfs.tproj/makehfs.c + ''; + sourceRoot = "diskdev_cmds-" + version; patches = [ "../debian/patches/*.patch" ]; From 81cf1908827b3921931bee827825ec1175daa406 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 16 Aug 2020 15:12:48 +0200 Subject: [PATCH 346/411] sherpa: fix build w/glibc-2.32 --- pkgs/applications/science/physics/sherpa/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index a672272e9e62..93e402ec3ceb 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; + postPatch = '' + sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C + ''; + buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; From 24fd6016405bdda1406ed644db5be16b7f597f35 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 19:50:54 +0200 Subject: [PATCH 347/411] libvirt: fix build w/glibc-2.32 --- .../0001-Fix-build-with-libtirpc.patch | 106 ++++++++++++++++++ .../development/libraries/libvirt/default.nix | 12 +- 2 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch diff --git a/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch b/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch new file mode 100644 index 000000000000..2039126e889d --- /dev/null +++ b/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch @@ -0,0 +1,106 @@ +From a9ce1217742d542a5ae4b154b6f55342aace374e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 17 Aug 2020 19:35:44 +0200 +Subject: [PATCH] Fix build with libtirpc + +Derived from https://github.com/libvirt/libvirt/commit/d7147b3797380de2d159ce6324536f3e1f2d97e3.patch +--- + libvirt.spec.in | 4 +++- + src/Makefile.am | 2 +- + src/admin/Makefile.inc.am | 1 + + src/locking/Makefile.inc.am | 2 ++ + src/logging/Makefile.inc.am | 1 + + src/remote/Makefile.inc.am | 1 + + 6 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/libvirt.spec.in b/libvirt.spec.in +index 6abf97d..71fc4e6 100644 +--- a/libvirt.spec.in ++++ b/libvirt.spec.in +@@ -405,11 +405,13 @@ BuildRequires: wireshark-devel >= 2.4.0 + BuildRequires: libssh-devel >= 0.7.0 + %endif + ++# On RHEL-7 rpcgen is still part of glibc-common package + %if 0%{?fedora} || 0%{?rhel} > 7 + BuildRequires: rpcgen +-BuildRequires: libtirpc-devel + %endif + ++BuildRequires: libtirpc-devel ++ + %if %{with_firewalld_zone} + BuildRequires: firewalld-filesystem + %endif +diff --git a/src/Makefile.am b/src/Makefile.am +index 12dd6b8..8d0d4e1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -439,7 +439,7 @@ libvirt_la_LDFLAGS += -Wl,-flat_namespace + endif WITH_MACOS + libvirt_la_LDFLAGS += $(NULL) + libvirt_la_LIBADD += \ +- $(DRIVER_MODULES_LIBS) ++ $(DRIVER_MODULES_LIBS) $(XDR_LIBS) + libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) + # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we + # lose automake's automatic dependencies on an appropriate subset of +diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am +index 0a9717a..8556a3b 100644 +--- a/src/admin/Makefile.inc.am ++++ b/src/admin/Makefile.inc.am +@@ -72,6 +72,7 @@ libvirt_admin_la_LDFLAGS = \ + + libvirt_admin_la_LIBADD = \ + libvirt.la \ ++ $(XDR_LIBS) \ + $(CAPNG_LIBS) \ + $(YAJL_LIBS) \ + $(DEVMAPPER_LIBS) \ +diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am +index d1bf49c..ab01d8e 100644 +--- a/src/locking/Makefile.inc.am ++++ b/src/locking/Makefile.inc.am +@@ -120,6 +120,7 @@ lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) + lockd_la_LIBADD = \ + libvirt.la \ + $(GLIB_LIBS) \ ++ $(XDR_LIBS) \ + $(NULL) + augeas_DATA += locking/libvirt_lockd.aug + if WITH_DTRACE_PROBES +@@ -161,6 +162,7 @@ virtlockd_CFLAGS = \ + virtlockd_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ ++ $(XDR_LIBS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) + virtlockd_LDADD = \ +diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am +index dc09cfe..4be3376 100644 +--- a/src/logging/Makefile.inc.am ++++ b/src/logging/Makefile.inc.am +@@ -99,6 +99,7 @@ virtlogd_CFLAGS = \ + virtlogd_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ ++ $(XDR_LIBS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) + virtlogd_LDADD = \ +diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am +index 1b1be83..8a40c96 100644 +--- a/src/remote/Makefile.inc.am ++++ b/src/remote/Makefile.inc.am +@@ -69,6 +69,7 @@ REMOTE_DAEMON_LD_ADD = \ + $(LIBXML_LIBS) \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ ++ $(XDR_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(NULL) +-- +2.25.4 + diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 27f345a9c834..d8501a5b0809 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -33,10 +33,15 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ]; + patches = [ + ./0001-Fix-build-with-libtirpc.patch + ]; + + nativeBuildInputs = [ makeWrapper pkgconfig docutils rpcsvc-proto ] + ++ optionals (!buildFromTarball) [ autoreconfHook ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus libtirpc ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted @@ -80,6 +85,7 @@ in stdenv.mkDerivation rec { "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy" + "CFLAGS=-I${libtirpc.dev}/include/tirpc" "--with-attr" "--with-apparmor" "--with-secdriver-apparmor" From a76e699250c815fadb2320fd95f8d35a33cf6aa8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:07:17 +0200 Subject: [PATCH 348/411] gsimplecal: fix build w/glibc-2.32 --- pkgs/applications/misc/gsimplecal/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index e83e349b21c1..158a7fc8fc62 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1sa05ifjp41xipfspk5n6l3wzpzmp3i45q88l01p4l6k6drsq336"; }; + postPatch = '' + sed -ie '/sys\/sysctl.h/d' src/Unique.cpp + ''; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; From 5a3dd6b2d05861d16544f3d0cfd65c5c5bc0c4c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:16:13 +0200 Subject: [PATCH 349/411] irrlicht: fix build w/glibc-2.32 --- pkgs/development/libraries/irrlicht/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index efb4c2022c4e..84e7fae60450 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { src = common.src; + postPatch = '' + sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp + ''; + preConfigure = '' cd source/Irrlicht ''; From 9ad913dd6fd4ad138a71e43ab4c742a673b84ea1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Aug 2020 13:31:15 +0200 Subject: [PATCH 350/411] swift: fix build w/glibc-2.32 --- pkgs/development/compilers/swift/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index c4144532c583..2cabacadd756 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -245,6 +245,10 @@ stdenv.mkDerivation { --replace usr "$PREFIX" substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" + substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c \ + --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD" + substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c \ + --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD" ''; configurePhase = '' From 120653bd50e593eace28d3d9761cd3555c02d8cc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Aug 2020 14:22:42 +0200 Subject: [PATCH 351/411] tacacsplus: fix build w/glibc-2.32 --- pkgs/servers/tacacsplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/servers/tacacsplus/default.nix index 5010838cbe0d..296b79f0a444 100644 --- a/pkgs/servers/tacacsplus/default.nix +++ b/pkgs/servers/tacacsplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl }: +{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl, libnsl }: stdenv.mkDerivation rec { pname = "tacacsplus"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison ]; - buildInputs = [ tcp_wrappers perl ]; + buildInputs = [ tcp_wrappers perl libnsl ]; meta = with stdenv.lib; { description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices"; From 1ceec4a7dc7ffb0e516c36ebc7857b8483d0f8ab Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Aug 2020 14:27:42 +0200 Subject: [PATCH 352/411] dsniff: fix build w/glibc-2.32 --- pkgs/tools/networking/dsniff/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 50de41b921c0..7d8cf97f46d8 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl }: +{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl +, rpcsvc-proto, libtirpc, libnsl +}: let /* dsniff's build system unconditionnaly wants static libraries and does not @@ -52,9 +54,10 @@ in stdenv.mkDerivation { name = "dsniff.tar.gz"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ glib pcap ]; - NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl"; + nativeBuildInputs = [ autoreconfHook rpcsvc-proto ]; + buildInputs = [ glib pcap libtirpc libnsl ]; + NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl -ltirpc"; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; postPatch = '' for patch in debian/patches/*.patch; do patch < $patch From 0079133e4248a855f6247854220e385ef62cd3be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Aug 2020 14:39:49 +0200 Subject: [PATCH 353/411] grpc: fix build w/glibc-2.32 --- pkgs/development/libraries/grpc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index b5d4db8b4198..e7d1aa4bf92b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf +, gflags, abseil-cpp, libnsl +}: stdenv.mkDerivation rec { version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" From b20ac1c4c3b49343421856f00956c3e56fa11817 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Aug 2020 14:55:40 +0200 Subject: [PATCH 354/411] libguestfs: fix build w/glibc-2.32 --- pkgs/development/libraries/libguestfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 234e1164893e..7e8ec956bb23 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -3,6 +3,7 @@ , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, xen, libapparmor, jansson , getopt, perlPackages, ocamlPackages +, libtirpc , appliance ? null , javaSupport ? false, jdk ? null }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex db numactl xen libapparmor getopt perlPackages.ModuleBuild + libtirpc ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ stdenv.lib.optional javaSupport jdk; From 7cb40527942164bc5b5cc7593a4c8828a417ae00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 19:30:52 +0200 Subject: [PATCH 355/411] ntirpc: fix build w/glibc-2.32 --- pkgs/development/libraries/ntirpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 40f8d55462da..6654cc563d1a 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, krb5, liburcu , libtirpc +, krb5, liburcu , libtirpc, libnsl } : stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ krb5 liburcu ]; + buildInputs = [ krb5 liburcu libnsl ]; postInstall = '' mkdir -p $out/etc From 453add53dc2828e6bf2cd7510a8518862f1b03dd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 19:36:46 +0200 Subject: [PATCH 356/411] xinetd: fix build w/glibc-2.32 --- pkgs/servers/xinetd/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index ebe927a85d87..0ecd65ce6faf 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, fetchpatch, stdenv, libtirpc }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { }) ]; + buildInputs = [ libtirpc ]; + + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; From 698461394c6ffdaf0b1f0142ba800c5ba8a4ef8b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 23:30:36 +0200 Subject: [PATCH 357/411] libvirt_5_9_0: fix build w/glibc-2.32 --- pkgs/development/libraries/libvirt/5.9.0.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index 514cf24f66eb..722c4a53b8fa 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -33,10 +33,10 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ @@ -76,6 +76,7 @@ in stdenv.mkDerivation rec { "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy" + "CFLAGS=-I${libtirpc.dev}/include/tirpc" "--with-attr" "--with-apparmor" "--with-secdriver-apparmor" From 25e60944c6b6c1527cebd4fe11428cf3f438b9dd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 23:34:20 +0200 Subject: [PATCH 358/411] python3Packages.python-engineio: fix build w/glibc-2.32 Also had to wrap `__nss_files_fopen` in `libredirect` as this is the way now `nss` uses to retrieve file-databases[1]. [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=299210c1fa67e2dfb564475986fce11cd33db9ad;hp=469c03907b116c37c98d8ad7a9edac2bdbf3e934 --- pkgs/build-support/libredirect/libredirect.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index e7f74c736ab0..c8d6956a6bfe 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -121,6 +121,13 @@ FILE * fopen(const char * path, const char * mode) return fopen_real(rewrite(path, buf), mode); } +FILE * __nss_files_fopen(const char * path) +{ + FILE * (*__nss_files_fopen_real) (const char *) = dlsym(RTLD_NEXT, "__nss_files_fopen"); + char buf[PATH_MAX]; + return __nss_files_fopen_real(rewrite(path, buf)); +} + FILE * fopen64(const char * path, const char * mode) { FILE * (*fopen64_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen64"); From 6705f79d4232c7726b7e738798db146e6176051c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2020 08:21:41 +0200 Subject: [PATCH 359/411] Re-revert "Merge #97847 python27Packages.anytree: fix build" Moved to staging. This reverts commit 97e2ca34472734d24b0468c95340fb13a532e1a7. --- .../python-modules/anytree/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 6b25952493be..c11833ba5793 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,13 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , substituteAll -, fetchpatch -, nose , six , withGraphviz ? true , graphviz , fontconfig +# Tests +, pytestCheckHook +, nose }: buildPythonPackage rec { @@ -26,10 +28,6 @@ buildPythonPackage rec { }) ]; - checkInputs = [ - nose - ]; - propagatedBuildInputs = [ six ]; @@ -42,13 +40,13 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkPhase = '' - runHook preCheck + checkInputs = [ pytestCheckHook nose ]; - nosetests - - runHook postCheck - ''; + pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ + # Use enums, which aren't available pre-python3.4 + "--ignore=tests/test_resolver.py" + "--ignore=tests/test_search.py" + ]; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; From f292a27f442d10de4827800d064a3a8c64d05cee Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 6 Sep 2020 22:57:54 +0200 Subject: [PATCH 360/411] nixos/dbus: always use socket activates user session This removes the `services.dbus.socketActivated` and `services.xserver.startDbusSession` options. Instead the user D-Bus session is always socket activated. --- nixos/doc/manual/release-notes/rl-2103.xml | 10 +++++++++- nixos/modules/services/system/dbus.nix | 16 +++++++--------- .../services/x11/display-managers/default.nix | 7 ------- nixos/modules/services/x11/xserver.nix | 11 +++-------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index eccf2b69dad9..c05d74ee728e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -59,7 +59,15 @@ - + + If the services.dbus module is enabled, then + the user D-Bus session is now always socket activated. The + associated options services.dbus.socketActivated + and services.xserver.startDbusSession have + therefore been removed and you will receive a warning if + they are present in your configuration. This change makes the + user D-Bus session available also for non-graphical logins. + diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 4a60fec1ca80..d9dd26f0f189 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -19,6 +19,12 @@ in { + imports = [ + (mkRemovedOptionModule + [ "services" "dbus" "socketActivated" ] + "The user D-Bus session is now always socket activated and this option can safely be removed.") + ]; + ###### interface options = { @@ -51,14 +57,6 @@ in pkg/share/dbus-1/services ''; }; - - socketActivated = mkOption { - type = types.bool; - default = false; - description = '' - Make the user instance socket activated. - ''; - }; }; }; @@ -108,7 +106,7 @@ in reloadIfChanged = true; restartTriggers = [ configDir ]; }; - sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; + sockets.dbus.wantedBy = [ "sockets.target" ]; }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 08ce8edd6612..568aeaceef75 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -37,13 +37,6 @@ let . /etc/profile cd "$HOME" - ${optionalString cfg.startDbusSession '' - if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - /run/current-system/systemd/bin/systemctl --user start dbus.socket - export `/run/current-system/systemd/bin/systemctl --user show-environment | grep '^DBUS_SESSION_BUS_ADDRESS'` - fi - ''} - ${optionalString cfg.displayManager.job.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then export _DID_SYSTEMD_CAT=1 diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 400173745d3f..914063842c9d 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -151,6 +151,9 @@ in ./desktop-managers/default.nix (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] "See the 16.09 release notes for more information.") + (mkRemovedOptionModule + [ "services" "xserver" "startDbusSession" ] + "The user D-Bus session is now always socket activated and this option can safely be removed.") ]; @@ -296,14 +299,6 @@ in description = "DPI resolution to use for X server."; }; - startDbusSession = mkOption { - type = types.bool; - default = true; - description = '' - Whether to start a new DBus session when you log in with dbus-launch. - ''; - }; - updateDbusEnvironment = mkOption { type = types.bool; default = false; From 3bfdbea8819989c610ef30ae1e0acf7739a74807 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 14 Sep 2020 19:08:21 +0200 Subject: [PATCH 361/411] bash-completion: disable tests Unfortunately, they're very flaky. Let's disable them for now. --- pkgs/shells/bash/bash-completion/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 8463b1750d16..eeb175a5e789 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - doCheck = !stdenv.isDarwin; + # tests are super flaky unfortunately, and regularily break. + # let's disable them for now. + doCheck = false; checkInputs = [ # perl is assumed by perldoc completion perl From 6b1c8e80363a1299ebdfb69e1a2978fcf7998f8b Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Mon, 14 Sep 2020 18:31:00 -0400 Subject: [PATCH 362/411] Revert "git: enable zsh completion" This reverts commit 35b403bf127d0f32e2dfd7b425e4901c000f558a. --- .../version-management/git-and-tools/git/default.nix | 6 ------ 1 file changed, 6 deletions(-) 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 b0042b2ee9e9..7e40366142a9 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -155,12 +155,6 @@ stdenv.mkDerivation { ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ - mkdir -p $out/share/zsh/site-functions - ln -s $out/share/git/contrib/completion/git-completion.zsh $out/share/zsh/site-functions/_git - - # Patch the zsh completion script so it can find the Bash completion script. - sed -i -e "/locations=(/a \${"\t\t"}'$out/share/git/contrib/completion/git-completion.bash'" \ - $out/share/git/contrib/completion/git-completion.zsh # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ From c70cd7355de44c99f271e0015eb881fbb93dc118 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 15 Sep 2020 18:00:00 -0500 Subject: [PATCH 363/411] nodejs-14_x: 14.10.1 -> 14.11.0 https://github.com/nodejs/node/releases/tag/v14.11.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7eeed0a27e68..9c6c8bcdc0aa 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.10.1"; - sha256 = "1dymx9j3g6wbbdmw6083yg49ydxwfl2fgy9i8jxpngnskvwq4lrb"; + version = "14.11.0"; + sha256 = "1sq5j9fpcj0sb9062fik35chkc3lgdbwj56fcza186qsfzrf9iji"; } From 6343fb95c6c8db6504689caebfd9957165c96102 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 17 Sep 2020 14:24:33 +0200 Subject: [PATCH 364/411] mesa: 20.1.7 -> 20.1.8 (#98154) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cf452fded14e..afa8353681df 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.7"; + version = "20.1.8"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad"; + sha256 = "0qdrk74fsd6il6xpiqfd5s6yj4jmy4a6zhfclg2sxjppjha3a8fz"; }; prePatch = "patchShebangs ."; From 87a69dafa38addf24c9e1cba9115ebcb33791136 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 11 Sep 2020 21:17:00 +0200 Subject: [PATCH 365/411] =?UTF-8?q?meson:=200.55.1=20=E2=86=92=200.55.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/build-managers/meson/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aa11ba7638bb..8421fb7d70a0 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,21 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.55.1"; + version = "0.55.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA="; + sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb"; }; patches = [ - # Meson 0.55.0 incorrectly considers skipped tests as failures, - # which makes some packages like gjs fail to build. - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/7db49db67d4aa7582cf46feb7157235e66aa95b1.diff"; - sha256 = "1chq52sgk24afdlswssr8n8p6fa2wz8rjlxvkjhpqg1kg3qnqc9p"; - }) - # Upstream insists on not allowing bindir and other dir options # outside of prefix for some reason: # https://github.com/mesonbuild/meson/issues/2561 From 80d90e69fef396bc7981f0dc499aabdfa33d69c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Sep 2020 08:23:45 +0200 Subject: [PATCH 366/411] nss: 3.56 -> 3.57 Release notes seem "boring": https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.57_release_notes My understanding is that this version will be needed in Firefox 82 released in one month from now: https://wiki.mozilla.org/NSS:Release_Versions --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e378cd5554cf..e9ca475802d6 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.56"; + version = "3.57"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq"; + sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 0cc9dd7c16ea3db534274225617c22160eca4311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Sep 2020 08:26:34 +0200 Subject: [PATCH 367/411] nspr: 4.28 -> 4.29 I found nothing like release notes. It certainly is a companion version for nss 3.57 (parent commit). Firefox appears to be OK. --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index d9b7ff13d1a1..e8893bc2040d 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.28"; in +let version = "4.29"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3"; + sha256 = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582"; }; patches = [ From 160f9124310268ef8151d2cb2dca1b1b601488ad Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Tue, 22 Sep 2020 12:17:12 +0200 Subject: [PATCH 368/411] libvorbis: 1.3.6 -> 1.3.7 New release contains various security fixes. Among others for: * CVE-2017-14160 * CVE-2018-10392 * CVE-2018-10393 --- .../libraries/libvorbis/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 28c5536d626d..2a9f97cf67f5 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,28 +1,15 @@ -{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: +{ stdenv, fetchurl, libogg, pkgconfig }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.6"; + name = "libvorbis-1.3.7"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g"; + sha256 = "0jwmf87x5sdis64rbv0l87mdpah1rbilkkxszipbzg128f9w8g5k"; }; outputs = [ "out" "dev" "doc" ]; - patches = [ - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch"; - sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj"; - name = "CVE-2017-14160+CVE-2018-10393.patch"; - }) - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff"; - sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; - name = "CVE-2018-10392.patch"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg ]; From 7a8fd8de93b10e31f9653e5b6ae247384f161f2e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 16:26:12 -0400 Subject: [PATCH 369/411] pythonPackages.Mako: cleanup meta * Update homepage to HTTPS * Add changelog --- pkgs/development/python-modules/Mako/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 375a02968646..ecf8ae29759b 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -25,11 +25,12 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = { + meta = with lib; { description = "Super-fast templating language"; - homepage = "http://www.makotemplates.org"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ domenkozar ]; + homepage = "https://www.makotemplates.org/"; + changelog = "https://docs.makotemplates.org/en/latest/changelog.html"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ domenkozar ]; }; } From c24b9331e038e49199abf887e966bd0c6b7b96a0 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Sun, 20 Sep 2020 16:27:14 -0400 Subject: [PATCH 370/411] pythonPackages.Mako: convert to pytestCheckHook * Expands testing by disabling only known failing tests on pypy. * Update issue links to GitHub repo. --- .../python-modules/Mako/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index ecf8ae29759b..c129e411a473 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -1,11 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, python -, markupsafe -, nose -, mock , isPyPy +, markupsafe +, mock +, pytestCheckHook }: buildPythonPackage rec { @@ -17,13 +16,18 @@ buildPythonPackage rec { sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"; }; - checkInputs = [ markupsafe nose mock ]; propagatedBuildInputs = [ markupsafe ]; + checkInputs = [ pytestCheckHook markupsafe mock ]; - doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + disabledTests = lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ]; meta = with lib; { description = "Super-fast templating language"; From 6afb5823e1da6ceb48b68d6ceec6891072f662c8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 22 Sep 2020 22:00:52 +0200 Subject: [PATCH 371/411] python3Packages.cryptography: 3.1 -> 3.1.1 --- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index d122c42e846d..426f6af7aa61 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.1"; # Also update the hash in vectors.nix + version = "3.1.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "021yccbqr446zh1c9l8yj79h9bgbd1cwv0ppj168w9y67i3rlh16"; + sha256 = "0z81q4d1nangw3r0v5f41mfl4d9r04qnbayl5ll5v5jpcfhwd7wx"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 99f3b6f8974f..c7b244ff0417 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10hixzqf2ppw8j61f6p04rgnq8ra6pjml68330s5af8df8xbqq16"; + sha256 = "1xp2j79c1y8qj4b97ygx451gzp8l4cp830hnvg3zw8j134bcaaam"; }; # No tests included From 2c72c5ab7553cfd916305e2f23f3d2d8390876d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 23 Sep 2020 04:20:00 +0000 Subject: [PATCH 372/411] nodejs-14_x: 14.11.0 -> 14.12.0 https://github.com/nodejs/node/releases/tag/v14.12.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 9c6c8bcdc0aa..a5f800339c85 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.11.0"; - sha256 = "1sq5j9fpcj0sb9062fik35chkc3lgdbwj56fcza186qsfzrf9iji"; + version = "14.12.0"; + sha256 = "0c2mv208akyk10pmjfilxbdpi2gpb5zlb4h903lgqmr229kmnd3c"; } From 2363e6eb9c7f0413b52e4a6101984bdb7cadcb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2020 10:34:00 +0200 Subject: [PATCH 373/411] gnutls: 3.6.14 -> 3.6.15 Security: on-wire alert could cause NULL pointer dereference. https://lists.gnupg.org/pipermail/gnutls-help/2020-September/004669.html --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index f75d107718da..2436fc4afcb2 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.14"; + version = "3.6.15"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n"; + sha256 = "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From b837bd4305144d04bdbb796507aa57691976336d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 1 Sep 2020 09:07:15 +0200 Subject: [PATCH 374/411] rust: 1.45.2 -> 1.46.0 This adds the rust toolchain 1.46.0: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1460-2020-08-27 Because rustc-1.46.0 enables static PIE by default for `x86_64-unknown-linux-musl` this release will suffer from: https://github.com/NixOS/nixpkgs/issues/94228 So this commit doesn't remove the 1.45.2 release. This commit also specifies the right LLVM packages to use for each rust release. --- pkgs/development/compilers/rust/1_44.nix | 2 +- pkgs/development/compilers/rust/1_45.nix | 2 +- pkgs/development/compilers/rust/1_46.nix | 44 +++++++++++++++++++++ pkgs/development/compilers/rust/default.nix | 10 ++--- pkgs/top-level/all-packages.nix | 17 +++++++- 5 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/compilers/rust/1_46.nix diff --git a/pkgs/development/compilers/rust/1_44.nix b/pkgs/development/compilers/rust/1_44.nix index 9fc268d152b1..fca6a677ddab 100644 --- a/pkgs/development/compilers/rust/1_44.nix +++ b/pkgs/development/compilers/rust/1_44.nix @@ -11,7 +11,7 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages_5 +, llvmPackages , pkgsBuildTarget, pkgsBuildBuild } @ args: diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index 1a634d3f51ed..41c380174aef 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -11,7 +11,7 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages_5 +, llvmPackages , pkgsBuildTarget, pkgsBuildBuild } @ args: diff --git a/pkgs/development/compilers/rust/1_46.nix b/pkgs/development/compilers/rust/1_46.nix new file mode 100644 index 000000000000..04954a043bf8 --- /dev/null +++ b/pkgs/development/compilers/rust/1_46.nix @@ -0,0 +1,44 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob//.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages +, pkgsBuildTarget, pkgsBuildBuild +} @ args: + +import ./default.nix { + rustcVersion = "1.46.0"; + rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.45.2"; + + # fetch hashes by running `print-hashes.sh 1.45.2` + bootstrapHashes = { + i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936"; + x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643"; + arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60"; + armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531"; + aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30"; + x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_46; + + rustcPatches = [ + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index d08b63dd643f..9545b851815f 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -10,7 +10,7 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages_5 +, llvmPackages , pkgsBuildTarget, pkgsBuildBuild }: rec { toRustTarget = platform: with platform.parsed; let @@ -80,10 +80,10 @@ # Use boot package set to break cycle rustPlatform = bootRustPlatform; } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { - stdenv = llvmPackages_5.stdenv; - pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; }; - pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; }; - pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages_5.stdenv; }; + stdenv = llvmPackages.stdenv; + pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; }; + pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; }; + pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages.stdenv; }; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; cargo = self.callPackage ./cargo.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d48edaa19aa..747228403a8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9635,15 +9635,28 @@ in rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + llvmPackages = llvmPackages_9; }; + # Because rustc-1.46.0 enables static PIE by default for + # `x86_64-unknown-linux-musl` this release will suffer from: + # + # https://github.com/NixOS/nixpkgs/issues/94228 + # + # So this commit doesn't remove the 1.45.2 release. rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + llvmPackages = llvmPackages_10; }; - rust = rust_1_45; + rust_1_46 = callPackage ../development/compilers/rust/1_46.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + llvmPackages = llvmPackages_10; + }; + rust = rust_1_46; rustPackages_1_44 = rust_1_44.packages.stable; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages = rustPackages_1_45; + rustPackages_1_46 = rust_1_46.packages.stable; + rustPackages = rustPackages_1_46; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; From c01133316f7bac9d45c8afa2f4778b6cd76d1015 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 23 Sep 2020 16:29:30 +0200 Subject: [PATCH 375/411] rust: remove 1.44.1 since firefox and thunderbird build with 1.46 --- pkgs/development/compilers/rust/1_44.nix | 42 ------------------------ pkgs/top-level/all-packages.nix | 11 ++----- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/compilers/rust/1_44.nix diff --git a/pkgs/development/compilers/rust/1_44.nix b/pkgs/development/compilers/rust/1_44.nix deleted file mode 100644 index fca6a677ddab..000000000000 --- a/pkgs/development/compilers/rust/1_44.nix +++ /dev/null @@ -1,42 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild -} @ args: - -import ./default.nix { - rustcVersion = "1.44.1"; - rustcSha256 = "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.43.1"; - - # fetch hashes by running `print-hashes.sh 1.44.1` - bootstrapHashes = { - i686-unknown-linux-gnu = "0626fa8a6a2387021413d740543f7496656d81115e2284e4ef73217128398990"; - x86_64-unknown-linux-gnu = "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505"; - arm-unknown-linux-gnueabihf = "16b9c4861565a195323d144fd0f54c0ae794ee3d2a867682f8aedbdacaad5a6c"; - armv7-unknown-linux-gnueabihf = "0c32a5958a358a031e6ca52074cfd45256688dc334db315199f5dbbf7562e5b1"; - aarch64-unknown-linux-gnu = "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb"; - x86_64-apple-darwin = "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_44; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 747228403a8b..944f84161bed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9633,10 +9633,6 @@ in inherit (darwin) apple_sdk; }; - rust_1_44 = callPackage ../development/compilers/rust/1_44.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = llvmPackages_9; - }; # Because rustc-1.46.0 enables static PIE by default for # `x86_64-unknown-linux-musl` this release will suffer from: # @@ -9653,7 +9649,6 @@ in }; rust = rust_1_46; - rustPackages_1_44 = rust_1_44.packages.stable; rustPackages_1_45 = rust_1_45.packages.stable; rustPackages_1_46 = rust_1_46.packages.stable; rustPackages = rustPackages_1_46; @@ -20709,7 +20704,7 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = pkgs.newScope { - inherit (rustPackages_1_44) cargo rustc; + inherit (rustPackages) cargo rustc; libpng = libpng_apng; python = python2; gnused = gnused_422; @@ -23584,7 +23579,7 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages_1_44) cargo rustc; + inherit (rustPackages) cargo rustc; libpng = libpng_apng; icu = icu67; libvpx = libvpx_1_8; @@ -23592,7 +23587,7 @@ in }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { - inherit (rustPackages_1_44) cargo rustc; + inherit (rustPackages) cargo rustc; libpng = libpng_apng; nss = nss_3_44; gtk3Support = true; From 82a14b856955e227c448675070d0b168107e3777 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 14:44:20 -0700 Subject: [PATCH 376/411] c-blosc: 1.20.0 -> 1.20.1 (#98677) --- pkgs/development/libraries/c-blosc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 59daf15d416b..8f7cee75e92a 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1rhv9na9cdp2j81a981s2y69c7m9apdiylf9j51dij0lm1m0ljdr"; + sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; }; buildInputs = [ cmake ]; From 9015f06673d9c2c549bfe1e0cf9f6d0fe0c1bd75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 06:00:55 +0000 Subject: [PATCH 377/411] numactl: 2.0.13 -> 2.0.14 --- pkgs/os-specific/linux/numactl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 8505fbc750f3..6e16ecabba2d 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numactl"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "08xj0n27qh0ly8hjallnx774gicz15nfq0yyxz8zhgy6pq8l33vv"; + sha256 = "0hahpdp5xqy9cbg251bdxqkml341djn2h856g435h4ngz63sr9fs"; }; nativeBuildInputs = [ autoreconfHook ]; From 4ab0c622586c69dd29ca58252fd2ef3cff51def8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 06:07:19 +0000 Subject: [PATCH 378/411] bison: 3.7.1 -> 3.7.2 --- pkgs/development/tools/parsing/bison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index ca422f931da0..70fd733e1ee5 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "04vx6sah3bnr3a5n9knw306sb3y41pjfl7k9ihbsimghkj1m5n8x"; + sha256 = "111ax2imnydvrpcys5ami8ixn0a50m7a5pims7cbyysi8h8djp21"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; From 7c411b372977b3f6d8547345fe55d4742a3f27db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Sep 2020 11:41:23 +0200 Subject: [PATCH 379/411] python38: 3.8.5 -> 3.8.6 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 94422518b255..cfd7d2478cfa 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -94,10 +94,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "5"; + patch = "6"; suffix = ""; }; - sha256 = "1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073"; + sha256 = "qeC3nSeqBW65zOjWOkJ7X5urFGXe4/lC3P2yWoL0q4o="; inherit (darwin) configd; inherit passthruFun; }; From 1f424f11ea2f3c8fe4828b3e32972690e65a9d9c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 13 Sep 2020 18:29:47 +0200 Subject: [PATCH 380/411] systemd: 246.4 -> 246.5 Update to latest stable version. Changes: d0f0f048ec sd-path: use ROOTPREFIX without suffixed slash e662cf6d51 hashmap: make sure to initialize shared hash key atomically da310c6b45 socket: downgrade log warnings about inability to set socket buffer sizes ab6fcd9135 core: fix securebits setting 4f6925484d capability-util: add new function for raising setpcap 771436884d network: do not add prefix to RA if radv is not configured fb2afc5f30 man: document the random delay of persistent timers b2006ddc8f test-network: add test for ENOBUFS issue #17012 8758580ef5 backlight: do not claim that ID_BACKLIGHT_CLAMP= property is not set 57fc184a6c fs-util,tmpfiles: fix error handling of fchmod_opath() db0f031e70 bootctl: don't accidentally propagate errors in "bootctl status" 3e2c806681 ethtool-util: don't pass error value that isn't used to log_syntax b671730edb network: don't fail on various config parse errors 0ad86030c5 man: document that sd_bus_message_close_container() may only be called at end of container f3da018017 cryptsetup: Fix null pointer dereference (#16987) 6f65eaf9c2 core: fix set keep caps for ambient capabilities 08338a234e core: fix comments on ambient capabilities f0e6d9876d network: make log_link_error() or friends return void 35766dc61b core: make log_unit_error() or friends return void 3ed10b2ee8 core/slice: explicitly specify return value 2f6406914b udev: do not discard const qualifier 07671aa4cc sd-device: make log_device_error() or friends return void d4bea73972 udev: explicitly specify return value 7db399be1e udev: return negative errno for invalid EVDEV_ABS_XXX= property 8c8d188e85 udev: make log_rule_error() or friends return void 4921375fd3 socket: fix copy/paste error 0f7fd97749 udev: warn if failed to set buffer size for device monitor fc763d38d8 network: increase receive buffer size for device monitor 3bf7797f1f network: do not start device monitor if /sys is read-only ebc0729c6a network: honor the buffer size specified in networkd.socket ef3d2e178b core/socket: use fd_set_{rcv,snd}buf() 5dd4cc4b10 sd-device-monitor: use fd_set_rcvbuf() fe9b92e566 util: introduce fd_set_{snd,rcv}buf() 4dcae66688 util: try to set with SO_{RCV,SND}BUFFORCE when requested size is larger than the kernel limit 4b6b523946 util: refuse to set too large value for socket buffer size b4be8edb45 network: ignore error on increasing netlink receive buffer size 5ce47fb491 tree-wide: if get_block_device() returns zero devno, check for it in all cases 8ea6ec18e7 btrfs: if BTRFS_IOC_DEV_INFO returns /dev/root generate a friendly error message e1ff4947d2 basic/log: make log_{info,warning,...} return void 8019995e9a tree-wide: correct cases where return log_{error,warning} is used without value 932f4c3e8b test-execute/exec-dynamicuser-statedir.service: fix quoting 16b9426f70 man: fix quickhelp listing in sysusers.d(5) bde903d9e9 network: fix NDisc handling for the case when multiple routers exist c965063b64 network: expose route_{hash,compare}_func() 6d24a40669 network: expose address_{hash,compare}_func() 054838a2e0 util: expose in6_addr_{hash,compare}_func() 58bd4a70de network: fixes gateway assignment through DHCPv4 8ad5382fe3 bash-completion: resolvectl: support 'log-level' command a98bd75072 resolvectl: add 'log-level' to help message 78262fe807 core/socket: we may get ENOTCONN from socket_instantiate_service() fecb3f00c4 homed: remember the secret even when the for_state is FIXATING_FOR_ACQUIRE --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 02b2a2d51688..0b526f360169 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ }: let - version = "246.4"; + version = "246.5"; in stdenv.mkDerivation { inherit version; pname = "systemd"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "0ns12w55yv680p4l7f2i9il7scdph7hips68d9k8cyvxk2w9xg0x"; + sha256 = "0nwchkk1f69pla68v52fzlc0zvwrgw74ri8imx2rcd6b68cwcwwm"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a From 30ddfe6b953a00c483b1781dd3664cd67318678e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 14 Sep 2020 20:13:44 +0200 Subject: [PATCH 381/411] Revert "nixos/systemd-boot: Temporarily ignore errors" This reverts commit b32701bc5404ae37cfa01429962588b833913d7d. That fix has been included upstream in 246.5. --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 65c7b825f855..97e824fe629c 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -200,9 +200,7 @@ def main(): else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] - # Ideally this should use check_output as well, but as a temporary - # work-around for #97433 we ignore any errors. - sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout + sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) # See status_binaries() in systemd bootctl.c for code which generates this m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", From 249b6f6b83177605a366c71177e38acf037b1bbe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 27 Sep 2020 16:45:07 +0200 Subject: [PATCH 382/411] systemd: 246.5 -> 246.6 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0b526f360169..bf789970c127 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ }: let - version = "246.5"; + version = "246.6"; in stdenv.mkDerivation { inherit version; pname = "systemd"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "0nwchkk1f69pla68v52fzlc0zvwrgw74ri8imx2rcd6b68cwcwwm"; + sha256 = "1yhj2jlighqqpw1xk9q52f3pncjn47ipi224k35d6syb94q2b988"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a From d5b0c8bcdf594111b096480287364e0140157355 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 26 Sep 2020 18:19:31 +0200 Subject: [PATCH 383/411] libvirt: 6.3.0 -> 6.6.0 Also upgrades `python3Packages.libvirt` and patches the `rpcgen` tool from Apple's `developer_cmds` package. --- .../0001-Fix-build-with-libtirpc.patch | 106 ------------------ .../development/libraries/libvirt/default.nix | 24 ++-- .../python-modules/libvirt/default.nix | 4 +- .../developer_cmds/default.nix | 13 ++- .../rpcgen-support-hyper-and-quad-types.patch | 66 +++++++++++ 5 files changed, 92 insertions(+), 121 deletions(-) delete mode 100644 pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch create mode 100644 pkgs/os-specific/darwin/apple-source-releases/developer_cmds/rpcgen-support-hyper-and-quad-types.patch diff --git a/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch b/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch deleted file mode 100644 index 2039126e889d..000000000000 --- a/pkgs/development/libraries/libvirt/0001-Fix-build-with-libtirpc.patch +++ /dev/null @@ -1,106 +0,0 @@ -From a9ce1217742d542a5ae4b154b6f55342aace374e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Mon, 17 Aug 2020 19:35:44 +0200 -Subject: [PATCH] Fix build with libtirpc - -Derived from https://github.com/libvirt/libvirt/commit/d7147b3797380de2d159ce6324536f3e1f2d97e3.patch ---- - libvirt.spec.in | 4 +++- - src/Makefile.am | 2 +- - src/admin/Makefile.inc.am | 1 + - src/locking/Makefile.inc.am | 2 ++ - src/logging/Makefile.inc.am | 1 + - src/remote/Makefile.inc.am | 1 + - 6 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/libvirt.spec.in b/libvirt.spec.in -index 6abf97d..71fc4e6 100644 ---- a/libvirt.spec.in -+++ b/libvirt.spec.in -@@ -405,11 +405,13 @@ BuildRequires: wireshark-devel >= 2.4.0 - BuildRequires: libssh-devel >= 0.7.0 - %endif - -+# On RHEL-7 rpcgen is still part of glibc-common package - %if 0%{?fedora} || 0%{?rhel} > 7 - BuildRequires: rpcgen --BuildRequires: libtirpc-devel - %endif - -+BuildRequires: libtirpc-devel -+ - %if %{with_firewalld_zone} - BuildRequires: firewalld-filesystem - %endif -diff --git a/src/Makefile.am b/src/Makefile.am -index 12dd6b8..8d0d4e1 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -439,7 +439,7 @@ libvirt_la_LDFLAGS += -Wl,-flat_namespace - endif WITH_MACOS - libvirt_la_LDFLAGS += $(NULL) - libvirt_la_LIBADD += \ -- $(DRIVER_MODULES_LIBS) -+ $(DRIVER_MODULES_LIBS) $(XDR_LIBS) - libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) - # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we - # lose automake's automatic dependencies on an appropriate subset of -diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am -index 0a9717a..8556a3b 100644 ---- a/src/admin/Makefile.inc.am -+++ b/src/admin/Makefile.inc.am -@@ -72,6 +72,7 @@ libvirt_admin_la_LDFLAGS = \ - - libvirt_admin_la_LIBADD = \ - libvirt.la \ -+ $(XDR_LIBS) \ - $(CAPNG_LIBS) \ - $(YAJL_LIBS) \ - $(DEVMAPPER_LIBS) \ -diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am -index d1bf49c..ab01d8e 100644 ---- a/src/locking/Makefile.inc.am -+++ b/src/locking/Makefile.inc.am -@@ -120,6 +120,7 @@ lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) - lockd_la_LIBADD = \ - libvirt.la \ - $(GLIB_LIBS) \ -+ $(XDR_LIBS) \ - $(NULL) - augeas_DATA += locking/libvirt_lockd.aug - if WITH_DTRACE_PROBES -@@ -161,6 +162,7 @@ virtlockd_CFLAGS = \ - virtlockd_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ -+ $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - virtlockd_LDADD = \ -diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am -index dc09cfe..4be3376 100644 ---- a/src/logging/Makefile.inc.am -+++ b/src/logging/Makefile.inc.am -@@ -99,6 +99,7 @@ virtlogd_CFLAGS = \ - virtlogd_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ -+ $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - virtlogd_LDADD = \ -diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am -index 1b1be83..8a40c96 100644 ---- a/src/remote/Makefile.inc.am -+++ b/src/remote/Makefile.inc.am -@@ -69,6 +69,7 @@ REMOTE_DAEMON_LD_ADD = \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ -+ $(XDR_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) --- -2.25.4 - diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index d8501a5b0809..814b82b07dde 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph @@ -17,34 +17,38 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.3.0"; + version = "6.6.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1xcng497hs1gary3pz3fp590a4r1kqs4d0d8k5p370j0scw981kl"; + sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl"; } else fetchgit { url = "git://libvirt.org/libvirt.git"; rev = "v${version}"; - sha256 = "129b3p72jlb40dsidak3nvpssv75xx2v99y63gzp5k074fp8y8x4"; + sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn"; fetchSubmodules = true; }; - patches = [ - ./0001-Fix-build-with-libtirpc.patch + nativeBuildInputs = [ + makeWrapper pkgconfig docutils + ] ++ optionals (!buildFromTarball) [ + autoreconfHook + ] ++ optional (!stdenv.isDarwin) [ + rpcsvc-proto + ] ++ optionals stdenv.isDarwin [ + darwin.developer_cmds # needed for rpcgen ]; - nativeBuildInputs = [ makeWrapper pkgconfig docutils rpcsvc-proto ] - ++ optionals (!buildFromTarball) [ autoreconfHook ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus libtirpc + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl attr parted + libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen ] ++ optionals enableIscsi [ diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 7b1601a4122f..fd9127c8a693 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "6.3.0"; + version = "6.6.0"; src = assert version == libvirt.version; fetchgit { url = "git://libvirt.org/libvirt-python.git"; rev = "v${version}"; - sha256 = "088cksq59jxkkzbvmwl8jw9v2k3zibwksl7j57yb51bxaa2sa1cx"; + sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index 21971ea2e284..cfd13b1b0498 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,11 +1,18 @@ -{ stdenv, appleDerivation, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook, llvmPackages }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - patchPhase = '' + patches = [ + # The following copied from + # https://github.com/Homebrew/homebrew-core/commit/712ed3e948868e17f96b7e59972b5f45d4faf688 + # is needed to build libvirt. + ./rpcgen-support-hyper-and-quad-types.patch + ]; + + postPatch = '' substituteInPlace rpcgen/rpc_main.c \ - --replace "/usr/bin/cpp" "${stdenv.cc}/bin/cpp" + --replace "/usr/bin/cpp" "${llvmPackages.clang-unwrapped}/bin/clang-cpp" ''; # temporary install phase until xcodebuild has "install" support diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/rpcgen-support-hyper-and-quad-types.patch b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/rpcgen-support-hyper-and-quad-types.patch new file mode 100644 index 000000000000..481cf0f3e055 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/rpcgen-support-hyper-and-quad-types.patch @@ -0,0 +1,66 @@ +diff --git a/rpcgen/rpc_parse.c b/rpcgen/rpc_parse.c +index 52edc9f..db0c1f1 100644 +--- a/rpcgen/rpc_parse.c ++++ b/rpcgen/rpc_parse.c +@@ -580,6 +580,10 @@ get_type(prefixp, typep, dkind) + *typep = "long"; + (void) peekscan(TOK_INT, &tok); + break; ++ case TOK_HYPER: ++ *typep = "int64_t"; ++ (void) peekscan(TOK_INT, &tok); ++ break; + case TOK_VOID: + if (dkind != DEF_UNION && dkind != DEF_PROGRAM) { + error("voids allowed only inside union and program definitions with one argument"); +@@ -592,6 +596,7 @@ get_type(prefixp, typep, dkind) + case TOK_INT: + case TOK_FLOAT: + case TOK_DOUBLE: ++ case TOK_QUAD: + case TOK_BOOL: + *typep = tok.str; + break; +@@ -622,6 +627,11 @@ unsigned_dec(typep) + *typep = "u_long"; + (void) peekscan(TOK_INT, &tok); + break; ++ case TOK_HYPER: ++ get_token(&tok); ++ *typep = "u_int64_t"; ++ (void) peekscan(TOK_INT, &tok); ++ break; + case TOK_INT: + get_token(&tok); + *typep = "u_int"; +diff --git a/rpcgen/rpc_scan.c b/rpcgen/rpc_scan.c +index a8df441..4130107 100644 +--- a/rpcgen/rpc_scan.c ++++ b/rpcgen/rpc_scan.c +@@ -419,8 +419,10 @@ static token symbols[] = { + {TOK_UNSIGNED, "unsigned"}, + {TOK_SHORT, "short"}, + {TOK_LONG, "long"}, ++ {TOK_HYPER, "hyper"}, + {TOK_FLOAT, "float"}, + {TOK_DOUBLE, "double"}, ++ {TOK_QUAD, "quadruple"}, + {TOK_STRING, "string"}, + {TOK_PROGRAM, "program"}, + {TOK_VERSION, "version"}, +diff --git a/rpcgen/rpc_scan.h b/rpcgen/rpc_scan.h +index bac2be4..e4c57c8 100644 +--- a/rpcgen/rpc_scan.h ++++ b/rpcgen/rpc_scan.h +@@ -66,9 +66,11 @@ enum tok_kind { + TOK_INT, + TOK_SHORT, + TOK_LONG, ++ TOK_HYPER, + TOK_UNSIGNED, + TOK_FLOAT, + TOK_DOUBLE, ++ TOK_QUAD, + TOK_OPAQUE, + TOK_CHAR, + TOK_STRING, \ No newline at end of file From 4606528fcbad11587c5e30abf8fd50d884526631 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 29 Sep 2020 09:45:13 +0200 Subject: [PATCH 384/411] libvirt: update homepage to https URL --- pkgs/development/libraries/libvirt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 814b82b07dde..4af71876179d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = { - homepage = "http://libvirt.org/"; + homepage = "https://libvirt.org/"; repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent From de15287183a2b6b930b7354c7e589f57310debee Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 29 Sep 2020 09:58:48 +0200 Subject: [PATCH 385/411] libvirt: update autoconf 1.70 comment to 2.70 --- pkgs/development/libraries/libvirt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4af71876179d..c045585bc366 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { dontAddDisableDepTrack = true; configureFlags = [ - "--with-runstatedir=/run" # TODO: remove when autoconf 1.70 is released + "--with-runstatedir=/run" # TODO: remove when autoconf 2.70 is released "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" From 8d995c440de231b1f78f7ad96a296639584ad8ff Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 29 Sep 2020 10:03:36 +0200 Subject: [PATCH 386/411] libvirt: remove -fno-stack-protector because it builds without it --- pkgs/development/libraries/libvirt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c045585bc366..b8edf1168a28 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -134,8 +134,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - meta = { homepage = "https://libvirt.org/"; repositories.git = "git://libvirt.org/libvirt.git"; From 3acb90e7dd30752f34aa916a3f475d42cf1070d4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 29 Sep 2020 10:09:09 +0200 Subject: [PATCH 387/411] libvirt: update source URLs to https --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b8edf1168a28..c89679ed6fa6 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -22,12 +22,12 @@ in stdenv.mkDerivation rec { src = if buildFromTarball then fetchurl { - url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; + url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl"; } else fetchgit { - url = "git://libvirt.org/libvirt.git"; + url = "https://libvirt.org/git/libvirt.git"; rev = "v${version}"; sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn"; fetchSubmodules = true; From f2de9ca370c018d05428d9b0438ade8116ec81db Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 29 Sep 2020 06:36:56 -0700 Subject: [PATCH 388/411] xorg.xkeyboardconfig: build man pages --- pkgs/servers/x11/xorg/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 80112755e6df..018b44a663dd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, + mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -469,7 +469,7 @@ self: super: }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ]; configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; From af8409fc0a7bfe21241d18185f7b3e0523e703c0 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 1 Oct 2020 10:55:56 +0200 Subject: [PATCH 389/411] libvirt: fetch sources from gitlab That seems to be the official repository now. --- pkgs/development/libraries/libvirt/default.nix | 2 +- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c89679ed6fa6..642baba43767 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { } else fetchgit { - url = "https://libvirt.org/git/libvirt.git"; + url = "https://gitlab.com/libvirt/libvirt.git"; rev = "v${version}"; sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn"; fetchSubmodules = true; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index fd9127c8a693..e84dd1fbc24a 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "6.6.0"; src = assert version == libvirt.version; fetchgit { - url = "git://libvirt.org/libvirt-python.git"; + url = "https://gitlab.com/libvirt/libvirt-python.git"; rev = "v${version}"; sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v"; }; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "http://www.libvirt.org/"; + homepage = "https://libvirt.org/python.html"; description = "libvirt Python bindings"; license = licenses.lgpl2; maintainers = [ maintainers.fpletz ]; From 934cd8c322459cbb373d6b82eeff91c37870bafe Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 1 Oct 2020 11:53:47 +0200 Subject: [PATCH 390/411] perlPackages.SysVirt: remove assert version == pkgs.libvirt.version SysVirt-6.3.0 should build correctly against libvirt-6.6.0 and also libvirt-6.7.0 since their were no API changes. Also note that because of this there's no SysVirt-6.6.0 release. So this removes the `assert version == pkgs.libvirt.version` protection. --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d7abe0ecd30a..e1f6a4ef2de2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18419,8 +18419,8 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; version = "6.3.0"; - src = assert version == pkgs.libvirt.version; fetchgit { - url = "git://libvirt.org/libvirt-perl.git"; + src = fetchgit { + url = "https://gitlab.com/libvirt/libvirt-perl.git"; rev = "v${version}"; sha256 = "0m75g0kf2dmllx5c1wxzszm1zakiqjighcsjbgq66674pvqf5mk7"; }; From 54de740a87a301fb4f98bd45728a1132bbb1574b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 1 Oct 2020 12:28:29 +0200 Subject: [PATCH 391/411] perlPackages.SysVirt: fetch source from CPAN Co-authored-by: Stig P --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e1f6a4ef2de2..42789c9c710d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18419,10 +18419,9 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; version = "6.3.0"; - src = fetchgit { - url = "https://gitlab.com/libvirt/libvirt-perl.git"; - rev = "v${version}"; - sha256 = "0m75g0kf2dmllx5c1wxzszm1zakiqjighcsjbgq66674pvqf5mk7"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v6.3.0.tar.gz"; + sha256 = "6333fe3c554322fec5a3e1890b08a4ea4f39b0fbb506b3592688a5785a488f39"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From e366ad9684cad681069df4e243b346e4b2cd4352 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 1 Oct 2020 12:45:47 +0200 Subject: [PATCH 392/411] python3Packages.libvirt: fetch source using fetchFromGitLab --- pkgs/development/python-modules/libvirt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index e84dd1fbc24a..4c0e730f7d57 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -1,11 +1,12 @@ -{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: +{ stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }: buildPythonPackage rec { pname = "libvirt"; version = "6.6.0"; - src = assert version == libvirt.version; fetchgit { - url = "https://gitlab.com/libvirt/libvirt-python.git"; + src = assert version == libvirt.version; fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt-python"; rev = "v${version}"; sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v"; }; From e991a1ea1f28b26b41cc5ad596ddbfc3750d5427 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Oct 2020 17:58:27 +0200 Subject: [PATCH 393/411] mesa: 20.1.8 -> 20.1.9 (#99291) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index afa8353681df..9fda8091ce47 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.8"; + version = "20.1.9"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0qdrk74fsd6il6xpiqfd5s6yj4jmy4a6zhfclg2sxjppjha3a8fz"; + sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"; }; prePatch = "patchShebangs ."; From 721402352cab18d94b4eb6021f6a21735ca8f9d7 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Mon, 28 Sep 2020 17:25:45 +0100 Subject: [PATCH 394/411] dbus: build manpages from xml The `docbook_xml_dtd_44` and `docbook-xsl-nons` bits are necessary to prevent `xmlto` from trying to use the network during the build. --- pkgs/development/libraries/dbus/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 3598d8d938e0..376fe9f64eec 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -10,6 +10,9 @@ , libSM ? null , x11Support ? (stdenv.isLinux || stdenv.isDarwin) , dbus +, docbook_xml_dtd_44 +, docbook-xsl-nons +, xmlto }: assert @@ -43,10 +46,13 @@ stdenv.mkDerivation rec { --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' ''; - outputs = [ "out" "dev" "lib" "doc" ]; + outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ pkgconfig + docbook_xml_dtd_44 + docbook-xsl-nons + xmlto ]; propagatedBuildInputs = [ @@ -63,6 +69,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-user-session" + "--enable-xml-docs" "--libexecdir=${placeholder ''out''}/libexec" "--datadir=/etc" "--localstatedir=/var" From 79c01c835e4884dc6ffe0997a7c8738895a15cb5 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Mon, 28 Sep 2020 21:44:42 -0700 Subject: [PATCH 395/411] rsync: 3.1.3 -> 3.2.3 Add zstd, lz4, openssl and xxHash as optional dependencies, to support more compression formats. --- pkgs/applications/networking/sync/rsync/base.nix | 6 +++--- .../networking/sync/rsync/default.nix | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index a0522dfe8202..da00b4cbc2ee 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: rec { - version = "3.1.3"; + version = "3.2.3"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"; + sha256 = "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y"; }; upstreamPatchTarball = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; + sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 4045c1f0fc51..cc80ddf94548 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,9 +1,17 @@ { stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null +, enableLZ4 ? true, lz4 ? null +, enableOpenSSL ? true, openssl ? null +, enableXXHash ? true, xxHash ? null +, enableZstd ? true, zstd ? null , enableCopyDevicesPatch ? false }: assert enableACLs -> acl != null; +assert enableLZ4 -> lz4 != null; +assert enableOpenSSL -> openssl != null; +assert enableXXHash -> xxHash != null; +assert enableZstd -> zstd != null; let base = import ./base.nix { inherit stdenv fetchurl; }; @@ -18,7 +26,12 @@ stdenv.mkDerivation rec { srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; - buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl; + buildInputs = [libiconv zlib popt] + ++ stdenv.lib.optional enableACLs acl + ++ stdenv.lib.optional enableZstd zstd + ++ stdenv.lib.optional enableLZ4 lz4 + ++ stdenv.lib.optional enableOpenSSL openssl + ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; configureFlags = ["--with-nobody-group=nogroup"]; From fcaa2045a3ec39db0cb53772fce656758e13d6e1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Oct 2020 14:18:22 +0200 Subject: [PATCH 396/411] libde265: 1.0.6 -> 1.0.7 --- pkgs/development/libraries/libde265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 7c136dd7805d..9d88a61ad10f 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp"; + sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From d544b64c7db02a7c8855247f8598cae10dc10e89 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Oct 2020 14:18:35 +0200 Subject: [PATCH 397/411] libheif: 1.8.0 -> 1.9.1 --- pkgs/development/libraries/libheif/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index fd527eb415b9..4a5f6ab3bd88 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, + libjpeg, libaom }: stdenv.mkDerivation rec { pname = "libheif"; - version = "1.8.0"; + version = "1.9.1"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,11 +11,12 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "15az44qdqp2vncdfv1bzdl30977kvqxcb2bhx4x3q6vcxnm1xfgg"; + sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libde265 x265 libpng libjpeg ]; + buildInputs = [ libde265 x265 libpng libjpeg libaom ]; + # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config enableParallelBuilding = true; From 4e384ddc113f25aa00f96c96368cb8382981ddc7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 4 Oct 2020 06:34:13 -0500 Subject: [PATCH 398/411] systemd: show CanMultiSession again --- ...9-revert-get-rid-of-seat_can_multi_session.patch | 13 +++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch diff --git a/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch b/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch new file mode 100644 index 000000000000..6ed82a42e700 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch @@ -0,0 +1,13 @@ +diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c +index a91765205c..742aeb1064 100644 +--- a/src/login/logind-seat-dbus.c ++++ b/src/login/logind-seat-dbus.c +@@ -451,7 +451,7 @@ static const sd_bus_vtable seat_vtable[] = { + + SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), +- SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN), ++ SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0), diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 02b2a2d51688..10578bee7df8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -54,6 +54,7 @@ in stdenv.mkDerivation { ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0019-revert-get-rid-of-seat_can_multi_session.patch ]; postPatch = '' From 7902256cfd1aeec4867e9f3f2fe30b05f6c151b1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 20 Sep 2020 11:18:35 -0700 Subject: [PATCH 399/411] openblas: enable multiple outputs --- pkgs/development/libraries/science/math/openblas/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 89d88bdf564a..73a4ed09ade8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -100,6 +100,9 @@ in stdenv.mkDerivation rec { pname = "openblas"; version = "0.3.10"; + + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; From e389e24efc4687788fe2362646fff429c37db726 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 6 Sep 2020 15:57:52 +0200 Subject: [PATCH 400/411] texinfo: Depend on gettext on Darwin texinfo version 6.7 requires libintl.h which on Linux is provided by the libc. On Darwin, this lib is provided by gettext instead. --- pkgs/development/tools/misc/texinfo/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index f0f4c269fae7..057e52615ac7 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, buildPackages, fetchurl, perl, xz +{ stdenv, buildPackages, fetchurl, perl, xz, gettext # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -39,6 +39,7 @@ stdenv.mkDerivation { buildInputs = [ xz.bin ] ++ optionals stdenv.isSunOS [ libiconv gawk ] + ++ optionals stdenv.isDarwin [ gettext ] ++ optional interactive ncurses; configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] From 578b2b92dedac1f12f157e7ff4e80c7ee0235f08 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 7 Sep 2020 18:22:36 +0200 Subject: [PATCH 401/411] Revert "texinfo: revert to version 6.5 on Darwin" This reverts commit b23940e51467515d96c226b292d13aa21cf8ae71. --- pkgs/development/tools/misc/texinfo/6.5.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix deleted file mode 100644 index 34596f306581..000000000000 --- a/pkgs/development/tools/misc/texinfo/6.5.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "6.5"; - sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c341af956822..c2b36b63a3a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11706,10 +11706,8 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; - # Temporarily use older version on Darwin until it works. - texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; + texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } ); From 13eb51b092e48fb343affc431942ef88716a6be6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Sep 2020 04:20:00 +0000 Subject: [PATCH 402/411] libuv: 1.39.0 -> 1.40.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 1314eab16426..fa661446b9a1 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.39.0"; + version = "1.40.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1r9xs9is5rgid5ylbprvf88lqjrmvky86q9h8iqlq7rcrv24x6kl"; + sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg"; }; postPatch = let From 9702f49ec63f8420938bb0750c46d95b56efdfd9 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 30 Sep 2020 12:44:00 +0000 Subject: [PATCH 403/411] libjpeg: 2.0.4 -> 2.0.5 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5 --- .../libraries/libjpeg-turbo/default.nix | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 36838341fe21..2a25a565a8fc 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,30 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake, nasm, enableStatic ? false, enableShared ? true }: stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.4"; + version = "2.0.5"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; + src = fetchFromGitHub { + owner = "libjpeg-turbo"; + repo = "libjpeg-turbo"; + rev = version; + sha256 = "0p32yivybxdicm01qa9h1vj91apygzxpvnklrjmbx8z9z2l3qxc9"; }; patches = - [ - # Fixes race in tests that causes "jpegtran-shared-icc" to fail - # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425 - (fetchpatch { - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; - sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; - }) - - (fetchpatch { - name = "cve-2020-13790.patch"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff"; - sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb"; - }) - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; @@ -41,7 +29,7 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with stdenv.lib; { - homepage = "http://libjpeg-turbo.virtualgl.org/"; + homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses maintainers = with maintainers; [ vcunat colemickens ]; From c604bac07dca84e9bc1fce54fd533ef78793d9dc Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 29 Sep 2020 11:27:53 +0100 Subject: [PATCH 404/411] gnugrep: 3.4 -> 3.5 See https://lists.gnu.org/archive/html/info-gnu/2020-09/msg00009.html for release announcement --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index f7e3cd42a9b2..19ef3aacc6b2 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -5,7 +5,7 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let version = "3.4"; in +let version = "3.5"; in stdenv.mkDerivation { pname = "gnugrep"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"; + sha256 = "0jm4hynsqf32rw1j3kv239wzg47qm6glqh6841ar9ay20xvwfamq"; }; # Perl is needed for testing From 17d4902614c6e097f208be0f7cff8bc5a4af23e1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 27 Sep 2020 02:45:34 +0000 Subject: [PATCH 405/411] shadow: 4.8 -> 4.8.1 https://nvd.nist.gov/vuln/detail/CVE-2019-19882 --- pkgs/os-specific/linux/shadow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index fbcecf05f188..7399ac90586c 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.8"; + version = "4.8.1"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; rev = version; - sha256 = "05a636dqxip09l5jjrrs30lvwq6xkhjrdgjbbj3bg6b6z7hc67qk"; + sha256 = "13407r6qwss00504qy740jghb2dzd561la7dhp47rg8w3g8jarpn"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; From f509a0f04f7b016c44ee95e9412cfcc934c4954b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Sep 2020 18:10:13 +0000 Subject: [PATCH 406/411] cryptsetup: 2.3.3 -> 2.3.4 --- pkgs/os-specific/linux/cryptsetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index caa22b4df3ec..aa5c124ea600 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.3.3"; + version = "2.3.4"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; - sha256 = "1pw2bq4nv2z3xyycckxkbp7dp9kkp2n6bspna3plryg277z4zjiv"; + sha256 = "0wrpz2fzbsszmsgxxbssxjgylpyiindh24z8g13m2fxmjsxyw5lx"; }; # Disable 4 test cases that fail in a sandbox From b90105fa1032ca0b78d0276119b3fb0f8e36ce9c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 16 Sep 2020 14:49:16 +0800 Subject: [PATCH 407/411] keyutils: 1.6.1 -> 1.6.3 --- pkgs/os-specific/linux/keyutils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 553b0b87f414..fb06f942e482 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "keyutils"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "0mzmw8c7gqmqaxm3sa0xki8ycjla47xxhqg0yh17pl00d7ydqw9w"; + sha256 = "sha256-ph1XBhNq5MBb1I+GGGvP29iN2L1RB+Phlckkz8Gzm7Q="; }; patches = [ @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; + enableParallelBuilding = true; + installFlags = [ "ETCDIR=$(out)/etc" "BINDIR=$(out)/bin" From c1a0aa7eb73f86b0224a57671752673befe08953 Mon Sep 17 00:00:00 2001 From: Titouan Date: Wed, 16 Sep 2020 11:59:49 +0200 Subject: [PATCH 408/411] x265: 3.2 -> 3.4 --- pkgs/development/libraries/x265/default.nix | 29 ++++++++------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 48ed6cf46802..714e31521ecf 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl +{ stdenv, fetchFromBitbucket, cmake, nasm, numactl , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) , werrorSupport ? false # Warnings as errors @@ -23,31 +23,23 @@ let (mkFlag werrorSupport "WARNINGS_AS_ERRORS") ]; - version = "3.2"; + version = "3.4"; - src = fetchurl { - urls = [ - "https://get.videolan.org/x265/x265_${version}.tar.gz" - "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" - ]; - sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n"; + src = fetchFromBitbucket { + owner = "multicoreware"; + repo = "x265_git"; + rev = "${version}"; + sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; - patches = [ - # Fix build on ARM (#406) - (fetchpatch { - url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch"; - sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v"; - }) - ]; - buildLib = has12Bit: stdenv.mkDerivation rec { name = "libx265-${if has12Bit then "12" else "10"}-${version}"; - inherit src patches; + inherit src; enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake + sed -i 's/0.0/${version}/g' source/cmake/version.cmake ''; cmakeLibFlags = [ @@ -72,12 +64,13 @@ in stdenv.mkDerivation rec { pname = "x265"; - inherit version src patches; + inherit version src; enableParallelBuilding = true; postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake + sed -i 's/0.0/${version}/g' source/cmake/version.cmake ''; cmakeFlags = [ From 93e135517ac50fd122f2cd0252bcb00487cfeb34 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Oct 2020 22:18:41 -0700 Subject: [PATCH 409/411] Revert "Revert "texinfo: revert to version 6.5 on Darwin"" This reverts commit 578b2b92dedac1f12f157e7ff4e80c7ee0235f08 --- pkgs/development/tools/misc/texinfo/6.5.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix new file mode 100644 index 000000000000..34596f306581 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "6.5"; + sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4152d176a001..7ea0bbb91a33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11687,8 +11687,10 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; + texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; - texinfo = texinfo6; + # Temporarily use older version on Darwin until it works. + texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } ); From 4e435e6f99d70ead6331944e16e9ef6d6f9e2792 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Oct 2020 22:20:43 -0700 Subject: [PATCH 410/411] texinfo: default to texinfo6.7 on darwin --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ea0bbb91a33..d07da20332c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11687,10 +11687,9 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; + texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; - # Temporarily use older version on Darwin until it works. - texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; + texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } ); From 548649c00cfe5e2d02bcb9370382316ac64bc675 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Oct 2020 22:36:15 -0700 Subject: [PATCH 411/411] snort: fix whitespace to make the CI happy --- pkgs/applications/networking/ids/snort/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index a03b22a02b28..7529e233e137 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" ''; - + meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = "https://www.snort.org";