diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index e5cb6f5816e32..7325c85dbd4c6 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , kactivities @@ -10,28 +9,15 @@ mkDerivation rec { pname = "KSmoothDock"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "dangvd"; repo = "ksmoothdock"; rev = "v${version}"; - sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam"; + sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; }; - patches = [ - # Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch"; - sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4"; - }) - # Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123 - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch"; - sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kactivities qtbase ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 39ce5d3a7ea53..27358c3ef5907 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,24 +1,17 @@ { lib, fetchurl, fetchpatch }: rec { - version = "3.2.3"; + version = "3.2.4"; 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 = "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y"; + sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE="; }; 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 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; + sha256 = "sha256-cKWXWQr2xhzz0F1mNCn/n2D/4k5E+cc6TNxp69wTIqQ="; }; - extraPatches = [ - (fetchpatch { - name = "CVE-2020-14387.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd"; - sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x"; - }) - ]; meta = with lib; { description = "Fast incremental file transfer utility"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index dc3e8b25e70a7..29016bc14af23 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc; - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" - ++ base.extraPatches; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl @@ -49,15 +48,7 @@ stdenv.mkDerivation rec { # disable the included zlib explicitly as it otherwise still compiles and # links them even. "--with-included-zlib=no" - ] - # Work around issue with cross-compilation: - # configure.sh: error: cannot run test program while cross compiling - # Remove once 3.2.4 or more recent is released. - # The following PR should fix the cross-compilation issue. - # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. - # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" - ; + ]; passthru.tests = { inherit (nixosTests) rsyncd; }; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index e55f7fc1fba61..bb83a9e3cd4e5 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; - patches = base.extraPatches; - postPatch = '' substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync ''; diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index b8fe0aa804726..5ceb37b411c1f 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -2,6 +2,7 @@ , lib , mkDerivation , fetchFromGitLab +, fetchpatch , wafHook , pkg-config , cmake @@ -34,7 +35,14 @@ mkDerivation rec { sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss="; }; - patches = [ ./qt5.patch ]; + patches = [ + (fetchpatch { + name = "fix-kdelibs4support.patch"; + url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch"; + sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo="; + }) + ./qt5.patch + ]; postPatch = '' echo "${lib.getDev qtwebengine}" diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch index 6d41babdff47e..c5d5f3f1306f5 100644 --- a/pkgs/applications/office/semantik/qt5.patch +++ b/pkgs/applications/office/semantik/qt5.patch @@ -40,14 +40,14 @@ diff --color -ur a/wscript b/wscript if not os.path.exists(specpath): raise ValueError('No spec path, cannot build') -@@ -196,17 +220,28 @@ +@@ -196,17 +220,29 @@ conf.env.append_value('INCLUDES_KDECORE', specpath) - libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets', - 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui', - 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore', -- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi'] +- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore'] + libs = { + 'KF5KIOCore': '@KF5KIOCore_dev@', + 'KF5Auth': '@KF5Auth_dev@', @@ -61,6 +61,7 @@ diff --color -ur a/wscript b/wscript + 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@', + 'KF5I18n': '@KF5I18n_dev@', + 'KF5SonnetUi': '@KF5SonnetUi_dev@', ++ 'KF5AuthCore': '@KF5Auth_dev@', + } - for lib in libs: @@ -73,6 +74,6 @@ diff --color -ur a/wscript b/wscript - p = '%s/qt_%s.pri' % (path, name) + p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name) + print("[log] path :",path,", name : ",name) - for line in Utils.readf(p).splitlines(): - lst = line.strip().split(' = ') - if lst[0].endswith('.name'): + try: + code = Utils.readf(p) + except EnvironmentError: 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 c09de9968511a..6e33c013dc92f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.36.0"; + version = "2.36.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-r16/wWWEZPXQ1For/YhMk1+2B6EMwCHZW8gHeIYcwdM="; + sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 4c2a13da015ef..b5adae03df2db 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -128,6 +128,8 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; + enableParallelBuilding = true; + unpackPhase = '' src=$PWD ''; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ac6257220fd11..35d714f9b41e1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -162,6 +162,7 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; + enableParallelBuilding = true; unpackPhase = '' src=$PWD diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix index 402f0071a5332..9371b77023626 100644 --- a/pkgs/build-support/expand-response-params/default.nix +++ b/pkgs/build-support/expand-response-params/default.nix @@ -3,6 +3,8 @@ stdenv.mkDerivation { name = "expand-response-params"; src = ./expand-response-params.c; + strictDeps = true; + enableParallelBuilding = true; # Work around "stdenv-darwin-boot-2 is not allowed to refer to path # /nix/store/...-expand-response-params.c" unpackPhase = '' diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 32cc416cc891a..6dd8a685aee0c 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -14,6 +14,7 @@ let mirrorsFile = buildPackages.stdenvNoCC.mkDerivation ({ name = "mirrors-list"; + strictDeps = true; builder = ./write-mirror-list.sh; preferLocalBuild = true; } // mirrors); diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 03f6fe53b544e..8dd9704aa4b4a 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -14,6 +14,8 @@ in stdenvNoCC.mkDerivation { name = "nuke-references"; + strictDeps = true; + enableParallelBuilding = true; dontUnpack = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index aa8f57ffb04df..312d2fe02610a 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { pname = targetPrefix + pkg-config.pname + "-wrapper"; inherit (pkg-config) version; + enableParallelBuilding = true; + preferLocalBuild = true; shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; @@ -44,6 +46,7 @@ stdenv.mkDerivation { inherit pkg-config; }; + strictDeps = true; dontBuild = true; dontConfigure = true; @@ -80,8 +83,6 @@ stdenv.mkDerivation { ln -s ${pkg-config}/share $out/share ''; - strictDeps = true; - wrapperName = "PKG_CONFIG_WRAPPER"; setupHooks = [ diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 57c439fc0eb5d..1e04c9b0e293d 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -68,8 +68,10 @@ rec { # extra arguments to pass to stdenv.mkDerivation , name # name of the resulting derivation + # TODO(@Artturin): enable strictDeps always }: buildCommand: stdenv.mkDerivation ({ + enableParallelBuilding = true; inherit buildCommand name; passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or []); @@ -527,6 +529,7 @@ rec { runCommand name (substitutions // { inherit meta; + strictDeps = true; }) ('' mkdir -p $out/nix-support diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index cab93d737c348..6f90669b81921 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,10 +2,10 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20211124"; + version = "20220520"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-4mM/ZeGd91e1AklGHFK5UB4llg9IgCo9DKcM0iXcBls="; + sha256 = "sha256-LSrfNb4fUJEGSPJ+StlAbTE9LbOPDrRJLKTDSkuyoZQ="; }; installPhase = '' diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 799f80917268b..3c2d30b813ba0 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -32,7 +32,6 @@ , mesa , meson , gnome-settings-daemon -, libxcvt , xorgserver , python3 , wrapGAppsHook @@ -100,8 +99,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook - libxcvt - xorgserver + xorgserver # for cvt command ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index a99da4e983623..c30ca2b457611 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -33,7 +33,6 @@ , mesa , meson , gnome-settings-daemon -, libxcvt , xorgserver , python3 , wrapGAppsHook @@ -96,8 +95,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook - libxcvt - xorgserver + xorgserver # for cvt command ]; buildInputs = [ diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 2c673b7dd4ed7..a2c0d3d16b91f 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-KZ5VrzDxVpGwFdjc+OyuckEkElaeWy7OIDYXU6RW8vk="; }; + strictDeps = true; # perl is used for testing go vet nativeBuildInputs = [ perl which pkg-config procps ]; buildInputs = [ cacert pcre ] diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 48ca47321cdca..6f6e690e35452 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LETQPqLDQJITerkZumAvLCYaA40I60aFKKPzoo5WZ+I="; }; + strictDeps = true; # perl is used for testing go vet nativeBuildInputs = [ perl which pkg-config procps ]; buildInputs = [ cacert pcre ] diff --git a/pkgs/development/compilers/rust/1_60.nix b/pkgs/development/compilers/rust/1_61.nix similarity index 56% rename from pkgs/development/compilers/rust/1_60.nix rename to pkgs/development/compilers/rust/1_61.nix index 16f8512952d41..7726c2db10ea2 100644 --- a/pkgs/development/compilers/rust/1_60.nix +++ b/pkgs/development/compilers/rust/1_61.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.60.0"; - rustcSha256 = "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0"; + rustcVersion = "1.61.0"; + rustcSha256 = "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.59.0"; + bootstrapVersion = "1.60.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec"; - x86_64-unknown-linux-gnu = "0c1c2da3fa26372e5178123aa5bb0fdcd4933fbad9bfb268ffbd71807182ecae"; - x86_64-unknown-linux-musl = "c0ae76fa4bb0f1c85b86b9f7637db0fddf5084ce4c8f86c4d4acc3c41813201f"; - arm-unknown-linux-gnueabihf = "f934ddd8533d5df922e3397a5d30404930c5992c6c91c72d3e1475e2978e8793"; - armv7-unknown-linux-gnueabihf = "acb0f793c517de927b17e1c85135f6d58ae7430a8bd094a92009bcf0d4bbb8eb"; - aarch64-unknown-linux-gnu = "ab5da30a3de5433e26cbc74c56b9d97b569769fc2e456fc54378adc8baaee4f0"; - aarch64-unknown-linux-musl = "a3f8afdf23c98e6d25bf3b4bfcf5e9a4712f4c425f3754500931232d946204a9"; - x86_64-apple-darwin = "d82204f536af0c7bfd2ea2213dc46b99911860cfc5517f7321244412ae96f159"; - aarch64-apple-darwin = "5449ae915982967bae97746ce8bea30844f9ab40b4ee4da392b9997e0e7b2926"; - powerpc64le-unknown-linux-gnu = "6892a706ea8118344a4f4624b57a99460a784b5b30cccd9df430c33008d341f3"; - riscv64gc-unknown-linux-gnu = "e0cb22c2383d73b3928c17a630ae8d37f6787ddcea7871c9b3e21fd4560226b2"; - mips64el-unknown-linux-gnuabi64 = "2e2c404741b1dd02b5d73361f187568a91a8531997ade41bd855eca3972e2a5b"; + i686-unknown-linux-gnu = "2a635269dc9ad8f7bbdf168cdf120e1ec803d36adc832c0804f38e0acc3e2357"; + x86_64-unknown-linux-gnu = "b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5"; + x86_64-unknown-linux-musl = "f0feefcb1985c5c894ad9b0f44e6f09900b31c0eb5f49827da9f37d332a63894"; + arm-unknown-linux-gnueabihf = "161b2b97d4512080350cc6656b0765ebae870335e86c2896bed08b32c66fbdf4"; + armv7-unknown-linux-gnueabihf = "f2d76e9458949675bab8fcae44f600d30d91f62bf93c127b6b1fe3130e67d5d9"; + aarch64-unknown-linux-gnu = "99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c"; + aarch64-unknown-linux-musl = "fe7e9bad8beea84973f7ffa39879929de4ac8afad872650fb0af6b068f05faa6"; + x86_64-apple-darwin = "0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c"; + aarch64-apple-darwin = "b532672c278c25683ca63d78e82bae829eea1a32308e844954fb66cfe34ad222"; + powerpc64le-unknown-linux-gnu = "80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de"; + riscv64gc-unknown-linux-gnu = "9cc7c6804bcbbecb9c35232035fc488dbcc8487606cc6be3da553cc446bf0fcd"; + mips64el-unknown-linux-gnuabi64 = "d413681c22511259f7cd15414a00050cf151d46ac0f9282e765faeb86688deac"; }; - selectRustPackage = pkgs: pkgs.rust_1_60; + selectRustPackage = pkgs: pkgs.rust_1_61; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8dc2b4c02bbf0..546160ba5e371 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -104,5 +104,5 @@ in rec { sha256 = "xRi4Hf3agtHN9Yaz+bIyMWLLlr08taLANlDOoCXZH7k="; }; - vala = vala_0_54; + vala = vala_0_56; } diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5d6e8e0250763..f14c69811430e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -27,6 +27,7 @@ let inherit sha256; }; + strictDeps = true; # TODO: Add a "dev" output containing the header files. outputs = [ "out" "man" "devdoc" ] ++ optional crossCompiling "mini"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index dccaeeb0e733e..1218f2eb24e04 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -101,8 +101,6 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; - strictDeps = true; - nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook pkg-config @@ -183,7 +181,8 @@ in with passthru; stdenv.mkDerivation { pname = "python3"; inherit version; - inherit buildInputs nativeBuildInputs; + inherit nativeBuildInputs; + buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs src = fetchurl { url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; @@ -462,7 +461,7 @@ in with passthru; stdenv.mkDerivation { preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # Ensure patch-shebangs uses shebangs of host interpreter. - export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH + export PATH=${lib.makeBinPath [ "$out" ]}:$PATH ''; # Add CPython specific setup-hook that configures distutils.sysconfig to diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d9ade27def64d..d411c374bd11a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -124,10 +124,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "12"; + patch = "13"; suffix = ""; }; - sha256 = "sha256-LNlLIGcOQVnG2atX+R2/JVuX2MGhRR0cNfTsGWit+XE="; + sha256 = "sha256-ElsMWY8eFdKqZUBug/eS330XHN84wWgDsUmZQxajCA8="; }; python310 = { sourceVersion = { @@ -231,6 +231,8 @@ in { enableLTO = false; mimetypesSupport = false; } // sources.python39)).overrideAttrs(old: { + # TODO(@Artturin): Add this to the main cpython expr + strictDeps = true; pname = "python3-minimal"; meta = old.meta // { maintainers = []; diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix index b66bd1cc5f69b..29ce079317f03 100644 --- a/pkgs/development/interpreters/python/setup-hook.nix +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -5,6 +5,7 @@ sitePackages: let hook = ./setup-hook.sh; in runCommand "python-setup-hook.sh" { + strictDeps = true; inherit sitePackages; } '' cp ${hook} hook.sh diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 0112748695ee6..15289570d4772 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -59,11 +59,11 @@ with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.20"; + version = "2.0.22"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY="; + sha256 = "sha256-/ny/MSeILj/HJZp1oMtYViAnLFF0XThSq53YeWBpfy4="; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index da20ac59ec97a..f20abe0bfc35f 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; }; + strictDeps = true; + outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; + enableParallelBuilding = true; + configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8c7cba42eb2a1..9d94fe0c44ece 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "freetype"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-71wzaqzBoHn/kmLWMI1sKgZt1NKpBTAcSt2ps1Q5kDM="; + sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 4b58da1539d5d..2fc89a968f88c 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -134,6 +134,14 @@ stdenv.mkDerivation ({ url = "https://patchwork.sourceware.org/project/glibc/patch/20220314175316.3239120-2-sam@gentoo.org/raw/"; sha256 = "sq0BoPqXHQ69Vq4zJobCspe4XRfnAiuac/wqzVQJESc="; }) + + /* Patch pending upstream inclusion to fix string.h syntax for older gcc. + Needed to unbreak gnat bootstrap against old gcc in nixpkgs: + https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/ */ + (fetchurl { + url = "https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/raw/"; + sha256 = "x3/eO1EHJXBIrH2WXHRRD1swtWv+btFVjvMt5tj/wDA="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -204,6 +212,7 @@ stdenv.mkDerivation ({ # out as the first output is an exception exclusive to glibc outputs = [ "out" "bin" "dev" "static" ]; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix index 7c4f3f63bf1c9..04b0dc00a894e 100644 --- a/pkgs/development/libraries/glibc/info.nix +++ b/pkgs/development/libraries/glibc/info.nix @@ -7,7 +7,7 @@ callPackage ./common.nix {} { configureFlags = [ "--enable-add-ons" ]; - buildInputs = [ texinfo perl ]; + extraNativeBuildInputs = [ texinfo perl ]; buildPhase = "make info"; diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/development/libraries/glibc/mtrace.nix index fed24aff27966..4dbcb19af2a48 100644 --- a/pkgs/development/libraries/glibc/mtrace.nix +++ b/pkgs/development/libraries/glibc/mtrace.nix @@ -8,7 +8,7 @@ # `glibc` needs to be overridden here because it's still needed to `./configure` the source in order # to have a build environment where we can call the needed make target. -glibc.overrideAttrs ({ meta ? {}, ... }: { +glibc.overrideAttrs (oldAttrs: { pname = "glibc-mtrace"; buildPhase = '' @@ -25,14 +25,16 @@ glibc.overrideAttrs ({ meta ? {}, ... }: { mv malloc/mtrace $out/bin/ ''; - # Perl interpreter used for `mtrace`. - buildInputs = [ perl ]; + # Perl checked during configure + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ perl ]; + # Perl shebang used for `mtrace`. + buildInputs = oldAttrs.buildInputs ++ [ perl ]; # Reset a few things declared by `pkgs.glibc`. outputs = [ "out" ]; separateDebugInfo = false; - meta = meta // { + meta = oldAttrs.meta // { description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; }; }) diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index af4f15a151f0f..9d8a1c03accd6 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -28,6 +28,7 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 75b13b6b7ef1b..26a53e1573546 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -18,17 +18,20 @@ , pythonSupport ? false , swig2 ? null , python ? null +# only for passthru.tests +, libsForQt5 +, python3 }: let inherit (stdenv.hostPlatform) system; in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "1xb9k88rrafdi0n95nzx0d6bz7hcn9b44hciqbigrqkvxc6gblsf"; + hash = "sha256-cR6r9d1mG5sEvp7cms4qe8Ax9r2dN6do0C0O/e8Qj18="; }; patches = [ @@ -106,9 +109,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + python = python3.pkgs.gpgme; + qt = libsForQt5.qgpgme; + }; + meta = with lib; { homepage = "https://gnupg.org/software/gpgme/index.html"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-${version}"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${version}"; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -118,6 +126,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index a2b4aed108bcc..f3f3f0c108a18 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,7 +1,7 @@ { lib , stdenv , substituteAll -, fetchzip +, fetchurl , pkg-config , gettext , docbook-xsl-nons @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.33-2022-03-11"; + version = "3.24.34"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; - src = fetchzip { - url = "https://gitlab.gnome.org/GNOME/gtk/-/archive/9d1d2f0a6643570274121fc1473e46a6edc2e32d/gtk-9d1d2f0a6643570274121fc1473e46a6edc2e32d.tar.gz"; - sha256 = "sha256-+K1Kp3Sklrj/Ly0pSktfQwfcrIKpbf05NQbMDhWJZNI="; + src = fetchurl { + url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; + sha256 = "sha256-28afkN3IIbjRRB8AN03B2kMjour6kHjmHtvl7u+oUuw="; }; patches = [ @@ -213,6 +213,9 @@ stdenv.mkDerivation rec { wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done + '' + lib.optionalString stdenv.isDarwin '' + # a comment created a cycle between outputs + sed '/^# ModulesPath =/d' -i "$out"/lib/gtk-*/*/immodules.cache ''; passthru = { diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index 0a8c89d88ad30..039d7138278b5 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { inherit patches; + strictDeps = true; buildInputs = [ gmp ]; inherit configureFlags; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 50a0489529ec3..7b9931877f07f 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.93/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.94/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index 8d3e89935f8b7..c7dde83bf6110 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,9 +1,26 @@ -{ mkDerivation, lib, extra-cmake-modules, python3 }: +{ mkDerivation, python3, qtbase }: mkDerivation { pname = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; - postFixup = '' - moveToOutput bin $bin + nativeBuildInputs = [ python3.pkgs.setuptools qtbase ]; + + buildInputs = with python3.pkgs; [ jinja2 pyyaml requests ]; + + postPatch = '' + sed -i -e 's|"doxy\w\+", ||g' setup.py + ''; + + buildPhase = '' + runHook preBuild + ${python3.interpreter} setup.py build + runHook postBuild ''; + + installPhase = '' + runHook preInstall + ${python3.interpreter} setup.py install --prefix="$out" + runHook postInstall + ''; + + outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index d3575717592d7..98f7e178fb646 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,13 +1,13 @@ { mkDerivation , extra-cmake-modules -, qtbase, qtx11extras, wayland +, qtbase, qtx11extras, wayland, plasma-wayland-protocols }: mkDerivation { pname = "kguiaddons"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras wayland ]; + buildInputs = [ qtx11extras wayland plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 457ae06bb650b..1fbd8f7edeb37 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/attica-5.93.0.tar.xz"; - sha256 = "1qcj0n00ma6lyhbdk5dx2a1iwjqwzkbqvrwdhv8hgsqvj44q1hc1"; - name = "attica-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/attica-5.94.0.tar.xz"; + sha256 = "0rgg5n7m0bw5ir6k5bvq4r9k1s05xas42bdsh0h8352pvackcagn"; + name = "attica-5.94.0.tar.xz"; }; }; baloo = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/baloo-5.93.0.tar.xz"; - sha256 = "1kfmmsinpnsh169dw8ycl9cavw4n7pfwx4davgfx12nvzmlibl95"; - name = "baloo-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/baloo-5.94.0.tar.xz"; + sha256 = "0fi7p586322h8x0f83x98kxkfs5klvv8h9d8sr3jmhq3b0p1ii4x"; + name = "baloo-5.94.0.tar.xz"; }; }; bluez-qt = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/bluez-qt-5.93.0.tar.xz"; - sha256 = "091n2bcvzczn28zkry5yxfrg0zpx78y2la3rhdybb4bplgm88pdb"; - name = "bluez-qt-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/bluez-qt-5.94.0.tar.xz"; + sha256 = "0ch6rkifx7vrgljz73vvaah09mw17jpb7i7yl2z7lwjy17mnyxvy"; + name = "bluez-qt-5.94.0.tar.xz"; }; }; breeze-icons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/breeze-icons-5.93.0.tar.xz"; - sha256 = "1rh39pgyhz73lly7n9sp1z16z6isw2bbx284d2ilb9lanjkdyrs3"; - name = "breeze-icons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/breeze-icons-5.94.0.tar.xz"; + sha256 = "1fx3nfzn4ky8cy91d9ywhpmv09az6hw6j1jc63585fjd6z93y2ry"; + name = "breeze-icons-5.94.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/extra-cmake-modules-5.93.0.tar.xz"; - sha256 = "088b93ahiw00msn20iibp8642p2vy5zd8wb99vvwayv425xylg89"; - name = "extra-cmake-modules-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/extra-cmake-modules-5.94.0.tar.xz"; + sha256 = "0yfjg3bci0yj6bwgs2sg34jyw51rz4mi207wfnkcz65rwa68lm13"; + name = "extra-cmake-modules-5.94.0.tar.xz"; }; }; frameworkintegration = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/frameworkintegration-5.93.0.tar.xz"; - sha256 = "19m2i09r7hzqj8dkmxdkj7lh5jilm332i7177aadm6v7xv4m8vhm"; - name = "frameworkintegration-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/frameworkintegration-5.94.0.tar.xz"; + sha256 = "19psnjxs19xbf7fvhmpd8wq400wsh74iyqarwxd7chnjz3msnr4s"; + name = "frameworkintegration-5.94.0.tar.xz"; }; }; kactivities = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kactivities-5.93.0.tar.xz"; - sha256 = "0hv8y6i03ib89ivmpfg4ifypnnia73la6ljp5frs3fykh91j0szb"; - name = "kactivities-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kactivities-5.94.0.tar.xz"; + sha256 = "1pss8h7w3yhdaz1p0a3w6nk3qyr734r5p1m1nfxskcmf7nx5xpaj"; + name = "kactivities-5.94.0.tar.xz"; }; }; kactivities-stats = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kactivities-stats-5.93.0.tar.xz"; - sha256 = "1a03xznriszw12jd0a2c7snilzd23nbgglx096isw1cf49r9h1pi"; - name = "kactivities-stats-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kactivities-stats-5.94.0.tar.xz"; + sha256 = "0h13xwlgpfz7kbwg7fjcjdm8mvh04y84jaa3327k83w3kl87vzl3"; + name = "kactivities-stats-5.94.0.tar.xz"; }; }; kapidox = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kapidox-5.93.0.tar.xz"; - sha256 = "0nqxz2jg51kyis07k2jqk4ni1wly6zx8mv81lgqfhb9l6mm34a22"; - name = "kapidox-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kapidox-5.94.0.tar.xz"; + sha256 = "0xsmwm35jfz7nzxzjs0aa86hhy0l71y9l2xmx2d1gqxz742m59qw"; + name = "kapidox-5.94.0.tar.xz"; }; }; karchive = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/karchive-5.93.0.tar.xz"; - sha256 = "1yy7jibbjpi67d6aihz5kcq4ynq8c9j9ds5rz2vp00l682l2dqv1"; - name = "karchive-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/karchive-5.94.0.tar.xz"; + sha256 = "1r71apql80gzgknqqflsvmksm4mr6bqlmkpviqb9qr3s8fjqgkam"; + name = "karchive-5.94.0.tar.xz"; }; }; kauth = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kauth-5.93.0.tar.xz"; - sha256 = "0v6s79n9bd75dzncz9rmp449j82945gralmcycsihqyzpxw00n1l"; - name = "kauth-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kauth-5.94.0.tar.xz"; + sha256 = "0na1svylmkzk2vd3pmg9scfgyvbv1lsfz9bkhbw5vym8d6nx1zlw"; + name = "kauth-5.94.0.tar.xz"; }; }; kbookmarks = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kbookmarks-5.93.0.tar.xz"; - sha256 = "0gw6zl87xhm3k2qdmd6993xyj8i0y2z5yvlwsnq91glrzyazgvry"; - name = "kbookmarks-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kbookmarks-5.94.0.tar.xz"; + sha256 = "0z2ibxrpap40wbabgls8jbyrr11v32ml7l5b0gasp6vfdymrkjwc"; + name = "kbookmarks-5.94.0.tar.xz"; }; }; kcalendarcore = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcalendarcore-5.93.0.tar.xz"; - sha256 = "0gqxbj3i0w3kfyyd6n9n3dxgmx2nwfh578srxnmy1z1r2wabq28n"; - name = "kcalendarcore-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcalendarcore-5.94.0.tar.xz"; + sha256 = "0aq4gkbj2vf6j7636jac1bs0pzdcqvra9m22ny4vhkr1x3i1marv"; + name = "kcalendarcore-5.94.0.tar.xz"; }; }; kcmutils = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcmutils-5.93.0.tar.xz"; - sha256 = "0v8dsfrbba1pv8vrisr3pbyw8yanfl95i5jxqbbrzmpznxwgji8l"; - name = "kcmutils-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcmutils-5.94.0.tar.xz"; + sha256 = "029ksln66n1g993zp4vfh2bmg8ws1cy2r89fhbj25jydj1lyz33r"; + name = "kcmutils-5.94.0.tar.xz"; }; }; kcodecs = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcodecs-5.93.0.tar.xz"; - sha256 = "12r8n8sq5yav62viddhgm1bjlxv1a0jrndmr1a52y55kma5mrz0f"; - name = "kcodecs-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcodecs-5.94.0.tar.xz"; + sha256 = "1yg7p18z4fac4k4gprncw2v4nv547431dpi6lc2ry98x3kxykh5w"; + name = "kcodecs-5.94.0.tar.xz"; }; }; kcompletion = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcompletion-5.93.0.tar.xz"; - sha256 = "177vx3ck4yyc38b3kd4m5sm55hj15ybiwx2jm2f62nw7x1ar733z"; - name = "kcompletion-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcompletion-5.94.0.tar.xz"; + sha256 = "193fz8xpmlcyrhmlllzprd0r8pq1b70dikrf1hmkbghbcm0kvl8s"; + name = "kcompletion-5.94.0.tar.xz"; }; }; kconfig = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kconfig-5.93.0.tar.xz"; - sha256 = "0vn009nvg3s540avq88fjr267j22lvjnmm6n5p11g442shh7r1bi"; - name = "kconfig-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kconfig-5.94.0.tar.xz"; + sha256 = "1mxk3jlixxamki6gl46i1ndlkqyad88yl0707c44znbhy0292vcf"; + name = "kconfig-5.94.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kconfigwidgets-5.93.0.tar.xz"; - sha256 = "1fr4kwkvx5jz9xb3qvk84sh6ma2x5n852xc7ypb6vbby47rf066v"; - name = "kconfigwidgets-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kconfigwidgets-5.94.0.tar.xz"; + sha256 = "025m5zw060jclar73gw9j8jmqzyk0y9wgdgrcw70yjzlgximy19m"; + name = "kconfigwidgets-5.94.0.tar.xz"; }; }; kcontacts = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcontacts-5.93.0.tar.xz"; - sha256 = "0xacc3yi169hdgf1x82rxb72nnzccmhspmz4v6493afgdin8qz2x"; - name = "kcontacts-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcontacts-5.94.0.tar.xz"; + sha256 = "1y2jc9b2k7mmhv8z2bpc45dhnj9njarrk9k8y6f28w5jv7gigwzp"; + name = "kcontacts-5.94.0.tar.xz"; }; }; kcoreaddons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcoreaddons-5.93.0.tar.xz"; - sha256 = "0hzhvf2mf53pyhfbfg4pczb20k3l0hv6y2kp0vfkmskxz652f2lj"; - name = "kcoreaddons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcoreaddons-5.94.0.tar.xz"; + sha256 = "02qirq0hwz5233yfxsp0fp0ww0l8gyv86x5ybaqsjshd0z7bc42w"; + name = "kcoreaddons-5.94.0.tar.xz"; }; }; kcrash = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kcrash-5.93.0.tar.xz"; - sha256 = "1midk5b5bmlv4qkjjn2wllmcwmdv0q33jad9yhp7aasbjb3ddy1g"; - name = "kcrash-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kcrash-5.94.0.tar.xz"; + sha256 = "1x9wy1qzcyyyk6hsii39hy6yvrffvw62d6lfdjdnxbf2m0n7kis8"; + name = "kcrash-5.94.0.tar.xz"; }; }; kdav = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdav-5.93.0.tar.xz"; - sha256 = "0s5d6h4p496y6fhrcm1gb10y15bsa0sidsljhh7v58gh400x9lx7"; - name = "kdav-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdav-5.94.0.tar.xz"; + sha256 = "0gjv6dbsl25805ks3a4y8z5dcwx48wcy4s87bnp137q0w731w8cb"; + name = "kdav-5.94.0.tar.xz"; }; }; kdbusaddons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdbusaddons-5.93.0.tar.xz"; - sha256 = "1n9ah83a0hg7vr5qamf1amvs1wwk2gjm9x4zhkqpmfb53r878b6c"; - name = "kdbusaddons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdbusaddons-5.94.0.tar.xz"; + sha256 = "1s6syhzqy0l5v31r94rzbzqygpwsz6ym7dlxggmg3mnagh8k058a"; + name = "kdbusaddons-5.94.0.tar.xz"; }; }; kdeclarative = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdeclarative-5.93.0.tar.xz"; - sha256 = "0rsh68nqjy5lk8v2irvaj53qrhp726f9rlj2gkc8k3dajg3lba88"; - name = "kdeclarative-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdeclarative-5.94.0.tar.xz"; + sha256 = "023bvl93ia8nwl3swr98n71gz4xwsq87v29kj8ng950rcyknr6gj"; + name = "kdeclarative-5.94.0.tar.xz"; }; }; kded = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kded-5.93.0.tar.xz"; - sha256 = "1psrh4vqa25k4lpmd7rx1bkc4nzci8rciax15kxgijnc444k34hr"; - name = "kded-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kded-5.94.0.tar.xz"; + sha256 = "1igk8in16i29jckqyf5dqn83h2hx727d8n35j7jq2ky6x2in2k9g"; + name = "kded-5.94.0.tar.xz"; }; }; kdelibs4support = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kdelibs4support-5.93.0.tar.xz"; - sha256 = "0z1p0wmj2y318r5d8wgab2p4c2yi3vyrlkzj60lw3avbrj01sgka"; - name = "kdelibs4support-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kdelibs4support-5.94.0.tar.xz"; + sha256 = "0cv0lzcgyny2xravgdsbpjz5j5jlp7202dk077nxblv60yqfn9np"; + name = "kdelibs4support-5.94.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kdesignerplugin-5.93.0.tar.xz"; - sha256 = "1bwaca721dzydwrky64p7h4z0bigvajpb7wg5mj8k2ym3vyb96pi"; - name = "kdesignerplugin-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kdesignerplugin-5.94.0.tar.xz"; + sha256 = "00walz1w0mx1jqx7yx76qyig5k1n39mh6xmq4qg317rsgzj53l3b"; + name = "kdesignerplugin-5.94.0.tar.xz"; }; }; kdesu = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdesu-5.93.0.tar.xz"; - sha256 = "1gwd2gc98s0v8mlj7iqr1l7wljdx9rmzpcvaa75f5w2ri6d9s0kz"; - name = "kdesu-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdesu-5.94.0.tar.xz"; + sha256 = "1qfwm4l30iy4gy4df8gf7i8mg11szv2c4s60jgfqqk5bxcil6jch"; + name = "kdesu-5.94.0.tar.xz"; }; }; kdewebkit = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kdewebkit-5.93.0.tar.xz"; - sha256 = "0m9gzm8a4gl1ycz2l7x8g61461x4n7vhph248bblsgbnc1b9pzm2"; - name = "kdewebkit-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kdewebkit-5.94.0.tar.xz"; + sha256 = "0n8df6y84hd4b3iwfjxk7h06avigq3vgcksi8jh8kjvwwvl77jlv"; + name = "kdewebkit-5.94.0.tar.xz"; }; }; kdnssd = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdnssd-5.93.0.tar.xz"; - sha256 = "0fwh5wzx1bp9ndhd8l1gjp61maw47jnzd1i9pfjpx1mm2i7kd5yw"; - name = "kdnssd-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdnssd-5.94.0.tar.xz"; + sha256 = "0qs8jr506aq9i39p8smjsiswjh5zspap3dsvmh7bhayrhgzs5sr8"; + name = "kdnssd-5.94.0.tar.xz"; }; }; kdoctools = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kdoctools-5.93.0.tar.xz"; - sha256 = "0p2xnq83c7v5llh3i4a379l68qbrjccw99959swnfdn5a7qkzs15"; - name = "kdoctools-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kdoctools-5.94.0.tar.xz"; + sha256 = "1x6j7h1lg4bbr1jjb8nl4jsl0v9lcc5h4hg3svkk9rn5x3zn2kpm"; + name = "kdoctools-5.94.0.tar.xz"; }; }; kemoticons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kemoticons-5.93.0.tar.xz"; - sha256 = "0474bb6h9s3ks3z8pankr7zxpjha1n88bapxm01z2p4kfkrkvjl3"; - name = "kemoticons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kemoticons-5.94.0.tar.xz"; + sha256 = "00hkwg63pqz7m10sybcyknn246nr7np62hxg2iayf5x0fmfv2zgs"; + name = "kemoticons-5.94.0.tar.xz"; }; }; kfilemetadata = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kfilemetadata-5.93.0.tar.xz"; - sha256 = "05m8fvk6j0zdg6x64hy8bslqhdrx4jh8l8rnbpjgcs7hlmqw059h"; - name = "kfilemetadata-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kfilemetadata-5.94.0.tar.xz"; + sha256 = "1rkp95bx4yvg6qia2lq4vmmlnc3s9lvy7yfw149k77il60d3nmvz"; + name = "kfilemetadata-5.94.0.tar.xz"; }; }; kglobalaccel = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kglobalaccel-5.93.0.tar.xz"; - sha256 = "04mpjzpfyrviyva3mrgxamsnkhglz48vfp65k4nn7ir9n3rbh1n8"; - name = "kglobalaccel-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kglobalaccel-5.94.0.tar.xz"; + sha256 = "1s9md2iz03xhxpx4sacygqqcqqys6z9aa0xjvqy9gl3jd88h0jx3"; + name = "kglobalaccel-5.94.0.tar.xz"; }; }; kguiaddons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kguiaddons-5.93.0.tar.xz"; - sha256 = "02pl99a7dbxc3hmpp0l76x4v4l3yv1pzsm61hv5spl8b2j967wi7"; - name = "kguiaddons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kguiaddons-5.94.0.tar.xz"; + sha256 = "0wrqjxqnrngn85wga4prxyl2jr6wvp4vsxxa5v1wndwd4skq4cgj"; + name = "kguiaddons-5.94.0.tar.xz"; }; }; kholidays = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kholidays-5.93.0.tar.xz"; - sha256 = "0hdq0ikwr4dd1il3lszkh0ygkvddfy3ld02d5hxyf7jh4fw1yjhd"; - name = "kholidays-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kholidays-5.94.0.tar.xz"; + sha256 = "0p85i8l157616an8p1iaydzy575wh47qn3cfq7imhxlxki9kadz5"; + name = "kholidays-5.94.0.tar.xz"; }; }; khtml = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/khtml-5.93.0.tar.xz"; - sha256 = "0jv1hqpidlfsvvcfvxvvkzyba48cw7l27ixxwac8n96p5rsvdgri"; - name = "khtml-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/khtml-5.94.0.tar.xz"; + sha256 = "0ycvzqj1xdjbwwgqp97siljxbk5fig8ijrydjcnirg1g98l2mgcq"; + name = "khtml-5.94.0.tar.xz"; }; }; ki18n = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/ki18n-5.93.0.tar.xz"; - sha256 = "0fbk4gjwvzd7vw4m9mngywagdk2aq66v5bz1vw98dwbms4058w62"; - name = "ki18n-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/ki18n-5.94.0.tar.xz"; + sha256 = "0jll112q4wrcjrd8wmspf95a0a1aqxkhv1390i9yhw1m6hr86nhc"; + name = "ki18n-5.94.0.tar.xz"; }; }; kiconthemes = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kiconthemes-5.93.0.tar.xz"; - sha256 = "1d72k0ssnqwkkzk3jfnx1n0w1h7xvf2a50dx9j5j46jg9yrwbxvm"; - name = "kiconthemes-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kiconthemes-5.94.0.tar.xz"; + sha256 = "14s9h6mk3f4qg97bj0d3b6j7x80jhnlb4kdx9bpp9jvwrlfxhwnr"; + name = "kiconthemes-5.94.0.tar.xz"; }; }; kidletime = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kidletime-5.93.0.tar.xz"; - sha256 = "1ndpnyyfx3ym5gdbin96g0qmdpl36il0z9jvmqpbdbpsw7gib4sd"; - name = "kidletime-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kidletime-5.94.0.tar.xz"; + sha256 = "1s73nk23js4ly679pq5c4lbry8sgvh0dzf5fyrn8dj6fbda3s756"; + name = "kidletime-5.94.0.tar.xz"; }; }; kimageformats = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kimageformats-5.93.0.tar.xz"; - sha256 = "1l67vlfqwiqj9pvda054wa0wshzjh2wrc174w1wmkybswnfyvc0m"; - name = "kimageformats-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kimageformats-5.94.0.tar.xz"; + sha256 = "0m2ffzlgjl4sz1plf1lpsxvkni1nr93rq8kab2frbj8x15n652di"; + name = "kimageformats-5.94.0.tar.xz"; }; }; kinit = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kinit-5.93.0.tar.xz"; - sha256 = "16743hyyycld1mdpa1hkhjmsr1f5pq3skiyq9rx3n5ihbfys6dnv"; - name = "kinit-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kinit-5.94.0.tar.xz"; + sha256 = "0qdw3qz9zbp3i19zgal8wffwiylib3d3ydmfih7dqdx8rq4zk67f"; + name = "kinit-5.94.0.tar.xz"; }; }; kio = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kio-5.93.0.tar.xz"; - sha256 = "0i2cbngyy3malcl9sv5bj8di6cgq1m17qjn88y8fpjayzfya946j"; - name = "kio-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kio-5.94.0.tar.xz"; + sha256 = "16yhj3wh57gc0azqq01ssqzg0nqa6f904p68jl6p6ifq967bzh45"; + name = "kio-5.94.0.tar.xz"; }; }; kirigami2 = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kirigami2-5.93.0.tar.xz"; - sha256 = "13xb8zfnxcps64v74scn76n8hsccirc9hin9knp12q3pxcjaihm7"; - name = "kirigami2-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kirigami2-5.94.0.tar.xz"; + sha256 = "0fcf8ah4vh7arb3iavpk0psy81agyj6vfg8s9sgk7ssz6aipvwnp"; + name = "kirigami2-5.94.0.tar.xz"; }; }; kitemmodels = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kitemmodels-5.93.0.tar.xz"; - sha256 = "0ns8y2lw74lydnnys081z8qlz9dyim7f1ay5aayg2dxcja5r3fav"; - name = "kitemmodels-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kitemmodels-5.94.0.tar.xz"; + sha256 = "12ag11m7sf23h9nd41jvpws7cakzwicvawckdx1vmch2fnwz4pvh"; + name = "kitemmodels-5.94.0.tar.xz"; }; }; kitemviews = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kitemviews-5.93.0.tar.xz"; - sha256 = "1gsswmqpv61byzwkzldgx829a6llpcz8fnb8dz62hnvr7gn1vw4k"; - name = "kitemviews-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kitemviews-5.94.0.tar.xz"; + sha256 = "0bmm71lm59spxwc0hrw1yd7m0a8qs55yydijld57zq4wf55k6xav"; + name = "kitemviews-5.94.0.tar.xz"; }; }; kjobwidgets = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kjobwidgets-5.93.0.tar.xz"; - sha256 = "1yrrghkdqym0sq19pww57fz44bhp2jvb45xk3hmb79bggms9ni32"; - name = "kjobwidgets-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kjobwidgets-5.94.0.tar.xz"; + sha256 = "01xh880avavzbbrk65y6gsn011w6pbsk7ian753az1i8m3y4akq1"; + name = "kjobwidgets-5.94.0.tar.xz"; }; }; kjs = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kjs-5.93.0.tar.xz"; - sha256 = "0hh9z6xjqx0nxxpif4gmhjddls6cp37zngjxi565cx97kkg03al5"; - name = "kjs-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kjs-5.94.0.tar.xz"; + sha256 = "06rw7gch4hw2kib4v9p5zzlkz8n3wjifdrxhwywcqy5rvsi18gpr"; + name = "kjs-5.94.0.tar.xz"; }; }; kjsembed = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kjsembed-5.93.0.tar.xz"; - sha256 = "096lh47xr4xjkdg4dnpkj1qflfz5zfqhkj9wazmjd41z1fzx6mgs"; - name = "kjsembed-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kjsembed-5.94.0.tar.xz"; + sha256 = "0bpnvvz0gc8j5ywljhc8i5ws6f6inds710xwxvp9ymqgkm3kgkpk"; + name = "kjsembed-5.94.0.tar.xz"; }; }; kmediaplayer = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kmediaplayer-5.93.0.tar.xz"; - sha256 = "02l3fhg73hqzgr5pin74zl6q7lv2y3pr49w128hsz8zyn2ssza5d"; - name = "kmediaplayer-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kmediaplayer-5.94.0.tar.xz"; + sha256 = "1310v2krzgxz7ghcws83p47hrlap7qxpnc38l5y3j7g21kgzdw8b"; + name = "kmediaplayer-5.94.0.tar.xz"; }; }; knewstuff = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/knewstuff-5.93.0.tar.xz"; - sha256 = "0nappdgg7lw8grhkb5bndnvkcc54gvvhf47zyrhmzh04dki4ip1a"; - name = "knewstuff-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/knewstuff-5.94.0.tar.xz"; + sha256 = "0vrkj2p9pqp49ph0rpy45dawli3j4mbcncw3x45d8rmbk57h3kda"; + name = "knewstuff-5.94.0.tar.xz"; }; }; knotifications = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/knotifications-5.93.0.tar.xz"; - sha256 = "0jysjrkpjayqlkazaf1xg4r7rr2kiph0zdx32bidg0aqwlgin6gy"; - name = "knotifications-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/knotifications-5.94.0.tar.xz"; + sha256 = "1gs39fvk0rylrlxsvym8pb58c8106fqbvrx3bp3rdw355giirmf8"; + name = "knotifications-5.94.0.tar.xz"; }; }; knotifyconfig = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/knotifyconfig-5.93.0.tar.xz"; - sha256 = "1k8rcrcfxzjrdvi5khlvj1mrslmby217n06dclclam8mcdkf37fc"; - name = "knotifyconfig-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/knotifyconfig-5.94.0.tar.xz"; + sha256 = "0449pb1j2m3jxafvv53qyrma309g3xm3q7fxxlpqxaw2fjd9i1db"; + name = "knotifyconfig-5.94.0.tar.xz"; }; }; kpackage = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kpackage-5.93.0.tar.xz"; - sha256 = "1kf55v26fbqh4whd5chvnl8j54jhlqx2i4wxj6wldxqwxpbfrrld"; - name = "kpackage-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kpackage-5.94.0.tar.xz"; + sha256 = "057lpas5d9m43rshp36p2dmrwpk14saa5n7jg5l0zcf940lrqk2d"; + name = "kpackage-5.94.0.tar.xz"; }; }; kparts = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kparts-5.93.0.tar.xz"; - sha256 = "0x8nrnxrh34bipp0pvr0qx86r9ysrrmjv92gj192y6n79ikfk268"; - name = "kparts-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kparts-5.94.0.tar.xz"; + sha256 = "1fkbs0gfcg6ps5az0anf03w961xm9vmq0pd8br7yip4p387i5985"; + name = "kparts-5.94.0.tar.xz"; }; }; kpeople = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kpeople-5.93.0.tar.xz"; - sha256 = "0wgk96xyhig8psh3byic5qqp2g58krb1il0nnbbvsapsh9ljdqfk"; - name = "kpeople-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kpeople-5.94.0.tar.xz"; + sha256 = "0x2jdb9x1fss95bzra51dz902q8h78qgq4j5j4c3agi2ihvvlzi1"; + name = "kpeople-5.94.0.tar.xz"; }; }; kplotting = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kplotting-5.93.0.tar.xz"; - sha256 = "0vd2nsb60kbk8iy8via5rvizdbwbch86madnzxcm5x8k89linvaq"; - name = "kplotting-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kplotting-5.94.0.tar.xz"; + sha256 = "1ah6fsskdnkh6m2nyjm64rxqfyxgg6jj0ydcqivq1m81hrhnsgbq"; + name = "kplotting-5.94.0.tar.xz"; }; }; kpty = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kpty-5.93.0.tar.xz"; - sha256 = "04pc94v4r8066dzic8a5q5clmcn36vf99d1k5zrq5c4ypx6ia19a"; - name = "kpty-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kpty-5.94.0.tar.xz"; + sha256 = "1jj6aw0zlbw5mljv2q990m62y381aqjih7pvqnjsdk2licqn16jn"; + name = "kpty-5.94.0.tar.xz"; }; }; kquickcharts = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kquickcharts-5.93.0.tar.xz"; - sha256 = "0j580h8gysdqmsyzhx40arrkszbzkb9fa3byyazqbmyihk26ld14"; - name = "kquickcharts-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kquickcharts-5.94.0.tar.xz"; + sha256 = "0a4mxb7wkqjq3iclhxnb7pkikb7yj2y4lyb080cni2wknjyzlr9h"; + name = "kquickcharts-5.94.0.tar.xz"; }; }; kross = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kross-5.93.0.tar.xz"; - sha256 = "1hqsanjk8n786qbr47pxpwvfpwfd1l6152bqac21f6vk70jgv9ib"; - name = "kross-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kross-5.94.0.tar.xz"; + sha256 = "0j9dchgldl0z2xi25r82fcflvqp05njgscpqjzmddpih4nyjas8x"; + name = "kross-5.94.0.tar.xz"; }; }; krunner = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/krunner-5.93.0.tar.xz"; - sha256 = "14f993x6s2y6s3bcjqp9q6f5hhiz31ij4bnqwbsqfpa1klbbkiid"; - name = "krunner-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/krunner-5.94.0.tar.xz"; + sha256 = "1lfbnwhk74b42cs5vnlx36mrrlnj9s2qqnca5zggk10837dbrc1j"; + name = "krunner-5.94.0.tar.xz"; }; }; kservice = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kservice-5.93.0.tar.xz"; - sha256 = "0cblwvrjwis8w45a6wnjgns6c78xn2lamzss3hqhx2gv6zw95ks6"; - name = "kservice-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kservice-5.94.0.tar.xz"; + sha256 = "0civwkm4wknrh30674lw2mag46m0jdpzjabfpqf0n1m4q1gi1b8s"; + name = "kservice-5.94.0.tar.xz"; }; }; ktexteditor = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/ktexteditor-5.93.0.tar.xz"; - sha256 = "1hyn5gkbc246rbv5rxaz190c5fa2j87ndjw0jz7sjbfdhaw3gx3s"; - name = "ktexteditor-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/ktexteditor-5.94.0.tar.xz"; + sha256 = "1dmkw5am89pjzazs2s9f1yv5lni0aa3hxr6w46w8lwbx2sbrjbfq"; + name = "ktexteditor-5.94.0.tar.xz"; }; }; ktextwidgets = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/ktextwidgets-5.93.0.tar.xz"; - sha256 = "05f2nzgqpprri8zh2da9hj36zif0bv2dwvdxxf2z8dfv564mhzz2"; - name = "ktextwidgets-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/ktextwidgets-5.94.0.tar.xz"; + sha256 = "0rnqkqwq9zffxh6swpd5riyir21rpdbm5mf1cqy4qvsjrgdfxz24"; + name = "ktextwidgets-5.94.0.tar.xz"; }; }; kunitconversion = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kunitconversion-5.93.0.tar.xz"; - sha256 = "1j1gl1ahpqafdwlq4bcwc1xv3q59489jyjgr4wkv7lljxmmgpblv"; - name = "kunitconversion-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kunitconversion-5.94.0.tar.xz"; + sha256 = "0jc0lffaz1wq26a251vgk6c16lqfqdkb81p789016ifv4kqz1bg4"; + name = "kunitconversion-5.94.0.tar.xz"; }; }; kwallet = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kwallet-5.93.0.tar.xz"; - sha256 = "1syx1zi7q14lf1xn8wqkgi475aaydahn2y3v9x2hn9gvgr3zcmpd"; - name = "kwallet-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kwallet-5.94.0.tar.xz"; + sha256 = "0ciabsayzy2r1aknwgns7s9759y2kfrxwmzycwxm9rsffm16ndh1"; + name = "kwallet-5.94.0.tar.xz"; }; }; kwayland = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kwayland-5.93.0.tar.xz"; - sha256 = "1gks1an0c9yp047jwdik6lg1w5gbjwz9mzzdl2aih30wmmrs4j0n"; - name = "kwayland-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kwayland-5.94.0.tar.xz"; + sha256 = "0di6rax4mdismqa4fzx30rj5y2ds211b7kwir6cff76qnkhxi95j"; + name = "kwayland-5.94.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kwidgetsaddons-5.93.0.tar.xz"; - sha256 = "045489l353jz52rl346lwazyc4xqd3whn628zn5ybakgiiyy2dcw"; - name = "kwidgetsaddons-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kwidgetsaddons-5.94.0.tar.xz"; + sha256 = "0cix00d2dbbb3l523xri4is4xvbf3bn6vg10yyjrhqjxqqayv3k7"; + name = "kwidgetsaddons-5.94.0.tar.xz"; }; }; kwindowsystem = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kwindowsystem-5.93.0.tar.xz"; - sha256 = "18g4xccvq56i9sz4rcwf8nkhwclcbvzi0vj9xniqfx0s9lx25jwp"; - name = "kwindowsystem-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kwindowsystem-5.94.0.tar.xz"; + sha256 = "0y1wlhm3ng2pb970hvgsyv6gn3irrkw5y9nmvzx28gxcx7abgssj"; + name = "kwindowsystem-5.94.0.tar.xz"; }; }; kxmlgui = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/kxmlgui-5.93.0.tar.xz"; - sha256 = "16dhykbn9z0wyh95ihmfr6lf2ff7xycx253fnsfd035cbzcnbfkl"; - name = "kxmlgui-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/kxmlgui-5.94.0.tar.xz"; + sha256 = "1mlxc4wdqnh77g7j0hxrg9jfrdjk9sh3bahp10r17l8fzwq1g8s3"; + name = "kxmlgui-5.94.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/portingAids/kxmlrpcclient-5.93.0.tar.xz"; - sha256 = "0v1p94ngq6cvw42rf6qfkl45rdcj0v3zjsfnwrgdjq2nkzzimd0c"; - name = "kxmlrpcclient-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/portingAids/kxmlrpcclient-5.94.0.tar.xz"; + sha256 = "10hz8nijhih0n3z83n3khy2hdflsjq8i4q0y9jjpqp1d0b5rbb35"; + name = "kxmlrpcclient-5.94.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/modemmanager-qt-5.93.0.tar.xz"; - sha256 = "1a3718kkx288c8ysf3fc5kd51zzw8i7x7sh7x86rsjsj6rlxxv9s"; - name = "modemmanager-qt-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/modemmanager-qt-5.94.0.tar.xz"; + sha256 = "1wmz27713kh2i2m227008f412dcf65nvnnax60hrg2nkp8vdqa3r"; + name = "modemmanager-qt-5.94.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/networkmanager-qt-5.93.0.tar.xz"; - sha256 = "0q59xg00pxhva75rncwizjca7fjq7h7ib9hyyn14c28iv3i8qn5q"; - name = "networkmanager-qt-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/networkmanager-qt-5.94.0.tar.xz"; + sha256 = "00k5k1xv53hf24k9w3sd5am64zz5zph3fx63q6xpf3pz371qq80j"; + name = "networkmanager-qt-5.94.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/oxygen-icons5-5.93.0.tar.xz"; - sha256 = "019h6my69cq32rlmnxkpnzix6m5r78rpzpn518snbrivvi23ykkk"; - name = "oxygen-icons5-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/oxygen-icons5-5.94.0.tar.xz"; + sha256 = "1l6izhrqqvf5vh2ib8zf1fjh5d9i9ri5jg9x3k1wi0xp7yy9sg90"; + name = "oxygen-icons5-5.94.0.tar.xz"; }; }; plasma-framework = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/plasma-framework-5.93.0.tar.xz"; - sha256 = "08n3nnbds4smd0jdqidlshp10n643x25issnqbkxza1fxa3wd8nl"; - name = "plasma-framework-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/plasma-framework-5.94.0.tar.xz"; + sha256 = "0apd2n453yk8ifv6zq6845rwsacm1vpw9xwv26a221k1gfggpsvc"; + name = "plasma-framework-5.94.0.tar.xz"; }; }; prison = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/prison-5.93.0.tar.xz"; - sha256 = "0mpvhbxxsnanf41cclhdbadw14979qbh3a7rf5mkq9ng49kdwhqz"; - name = "prison-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/prison-5.94.0.tar.xz"; + sha256 = "1jyi0vd5msj7cf2jv21ibpp8lkn5yvd5wv3rbnkdnqwzamw7jq4r"; + name = "prison-5.94.0.tar.xz"; }; }; purpose = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/purpose-5.93.0.tar.xz"; - sha256 = "1i1cx5s6mdrfvabvqkllycv5lmck73mwwck1hlhpxcnrqp3w02yw"; - name = "purpose-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/purpose-5.94.0.tar.xz"; + sha256 = "1axk852xpiz1a67b5zh08r01zr6x15k0sd7np9564s9agybzzbbk"; + name = "purpose-5.94.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/qqc2-desktop-style-5.93.0.tar.xz"; - sha256 = "1a597chr7awbmg2d64gylg1v9rsih33j6xyvp8r3bqi9ln2w07hn"; - name = "qqc2-desktop-style-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/qqc2-desktop-style-5.94.0.tar.xz"; + sha256 = "0j3y1vnqv12lz33vrif6fb5nc3sk5z52fsw77i12xhlkpq6j258b"; + name = "qqc2-desktop-style-5.94.0.tar.xz"; }; }; solid = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/solid-5.93.0.tar.xz"; - sha256 = "1skb1lzib230crrhzbgzl0lch51a0bcrgq1jnpn3yy888vwz7vr2"; - name = "solid-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/solid-5.94.0.tar.xz"; + sha256 = "01qiz8l12jw9rd085swx2kbbjaci6lnqx323a6g4nskbwc0x93lx"; + name = "solid-5.94.0.tar.xz"; }; }; sonnet = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/sonnet-5.93.0.tar.xz"; - sha256 = "170d460vhm42vi21prjg5792h34flcbb2j5wx3r3pr6ybsj6n51w"; - name = "sonnet-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/sonnet-5.94.0.tar.xz"; + sha256 = "0k27nxk20i4r9sa6gy56r4s7dnn51igbyvzz3nwvcswdfij0lmwc"; + name = "sonnet-5.94.0.tar.xz"; }; }; syndication = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/syndication-5.93.0.tar.xz"; - sha256 = "08ysirymi5j6as8syvx3rxc7yh12ylwxz1a7yh6ifq370wv4xw9m"; - name = "syndication-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/syndication-5.94.0.tar.xz"; + sha256 = "0nv88hhdy8r42ghm2r0pskshihjqc46zx8x61rk5x3c9skj153j5"; + name = "syndication-5.94.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/syntax-highlighting-5.93.0.tar.xz"; - sha256 = "06vixhzmmqvbgmzsrhgx0ncfxm80crp3gpy7axscjardjbw53nzb"; - name = "syntax-highlighting-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/syntax-highlighting-5.94.0.tar.xz"; + sha256 = "19p5vn6rrhqlhzjs73zagzzdbcrj5jl37n7x35lq6m83llr171yg"; + name = "syntax-highlighting-5.94.0.tar.xz"; }; }; threadweaver = { - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.93/threadweaver-5.93.0.tar.xz"; - sha256 = "11gi0rfd02zjnn8fizhwzgxbaz0jw8m7jhrba56vqbh5fv9bf3bc"; - name = "threadweaver-5.93.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.94/threadweaver-5.94.0.tar.xz"; + sha256 = "1ig1m00bpil0qixa3kshd8smijyasr7svps97d1pwfy5c8d47n47"; + name = "threadweaver-5.94.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 47cd849f92c54..6d894da17d0e6 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ./preprocessor-warnings.patch ]; + enableParallelBuilding = true; + doCheck = true; configureFlags = [] @@ -33,6 +35,7 @@ stdenv.mkDerivation rec { # on Darwin, so disable NLS for now. ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; + strictDeps = true; nativeBuildInputs = if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] # Need to regenerate configure script with newer version in order to pass diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 125beae01efd9..7387a4a1f0628 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -23,8 +23,11 @@ stdenv.mkDerivation rec { patches = []; + strictDeps = true; outputs = [ "out" "dev" "man" "info" ]; + enableParallelBuilding = true; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/development/libraries/libfreeaptx/default.nix index 618b74258a4f6..648b6fac0dfc2 100644 --- a/pkgs/development/libraries/libfreeaptx/default.nix +++ b/pkgs/development/libraries/libfreeaptx/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; }; - postPatch = if stdenv.isDarwin then '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace '-soname' '-install_name' \ --replace 'lib$(NAME).so' 'lib$(NAME).dylib' - '' else null; + ''; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = if stdenv.isDarwin then '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 - '' else null; + ''; meta = with lib; { description = "Free Implementation of Audio Processing Technology codec (aptX)"; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 5be5ecfd82e43..a6481970ef27e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; + enableParallelBuilding = true; + setupHooks = [ ../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index d8294f56adc35..02809486863fb 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -16,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; }; + strictDeps = true; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + enableParallelBuilding = true; + # The above patch causes the documentation to be regenerated, so the # documentation tools are required. nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 2dede1f976d22..8421a25030704 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; }; + strictDeps = true; + enableParallelBuilding = true; + buildInputs = [ gmp mpfr ]; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a1dde0bdb794c..fe097b6c66772 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.54.1"; + version = "2.54.3"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1VV++9zEFaQYDhEWt/c2y3EbJT0RDZX6huyDD3ACZiU="; + sha256 = "ZhWPLvRt3iYAJoRsTaEC5KndTlKTAQ8wlJxswm3W7+g="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 9779ad6b9e5fe..a96baf0d9f3e0 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "libtermkey"; - version = "0.22"; src = fetchzip { @@ -10,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg"; }; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; nativeBuildInputs = [ libtool pkg-config ]; buildInputs = [ ncurses unibilium ]; + strictDeps = true; + meta = with lib; { description = "Terminal keypress reading library"; homepage = "http://www.leonerd.org.uk/code/libtermkey"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6b455d992b8c1..410447a783214 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -83,6 +83,16 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.patch"; sha256 = "0i61kkjaixdn2p933lpma9s6i0772vhxjxxcwyqagw96lmszrcm7"; }) + (fetchpatch { + name = "CVE-2022-1354.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/87f580f39011109b3bb5f6eca13fac543a542798.patch"; + sha256 = "0171c662xiv3295x4wsq6qq0v90js51j54vsl7wm043kjkrp1fsb"; + }) + (fetchpatch { + name = "CVE-2022-1355.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/c1ae29f9ebacd29b7c3e0c7db671af7db3584bc2.patch"; + sha256 = "1y75c72s41pl39d5zr5pmkiyfrancllv8fbl10zvc67pg3qjq4v8"; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 01b302abd68ed..7da2c46fafe23 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" "doc" ]; + strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; configureFlags = [ diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index d5f84455f8369..68b3b86a9eec2 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -10,11 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; - # Fix installation of Python bindings - patches = [ (fetchpatch { - url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; - sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; - }) ]; + patches = [ + # Fix installation of Python bindings + (fetchpatch { + url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; + sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; + }) + + # Add a workaround for linux-headers-5.18 until upstream adapts: + # https://sourceforge.net/p/lirc/git/merge-requests/45/ + ./linux-headers-5.18.patch + ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/pkgs/development/libraries/lirc/linux-headers-5.18.patch new file mode 100644 index 0000000000000..733c423b7a837 --- /dev/null +++ b/pkgs/development/libraries/lirc/linux-headers-5.18.patch @@ -0,0 +1,35 @@ +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -110,6 +110,17 @@ int clock_gettime(int clk_id, struct timespec *t){ + #endif + #define WHITE_SPACE " \t" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_SET_REC_FILTER ++# define LIRC_CAN_SET_REC_FILTER 0x08000000 ++#endif ++ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif ++ + static const logchannel_t logchannel = LOG_APP; + + /** How long we sleep while waiting for busy write sockets. */ +--- a/tools/lirc-lsplugins.cpp ++++ b/tools/lirc-lsplugins.cpp +@@ -21,6 +21,12 @@ + #include "config.h" + #include "lirc_private.h" + ++/* Defines removed in linux-headers-5.18: ++ https://sourceforge.net/p/lirc/git/merge-requests/45/ ++ */ ++#ifndef LIRC_CAN_NOTIFY_DECODE ++# define LIRC_CAN_NOTIFY_DECODE 0x01000000 ++#endif + + #define USAGE \ + "\nSynopsis:\n" \ diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 49b850eae65b3..d89df53907bef 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { make build-shared ''; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9b5a3e877f9a5..8954eae19b469 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,7 +34,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.0.2"; + version = "22.0.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -48,7 +48,7 @@ self = 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 = "11b8mcplvis7nadcwi1jf3529i2za2q1bkb7609q0rnfvihaakyz"; + sha256 = "1m0y8wgy48hmcidsr7sbk5hcw3v0qr8359fd2x34fvl2z9c1z5y7"; }; # TODO: diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index fc7eeeab94206..bf1625cf2f9f4 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "info" ]; + strictDeps = true; # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2740b95986c9f..72d64854238f3 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,18 +11,16 @@ }: stdenv.mkDerivation rec { - # Note the revision needs to be adjusted. - version = "6.3"; + ver = "6.3"; + # We pick fresh intermediate release to get a fix for CVE-2022-29458 + # which was fixed in 20220416 patchset. + patchver = "20220507"; + version = "${ver}-p${patchver}"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; - # We cannot use fetchFromGitHub (which calls fetchzip) - # because we need to be able to use fetchurlBoot. - src = let - # Note the version needs to be adjusted. - rev = "v${version}"; - in fetchurl { - url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz"; - sha256 = "1mawdjhzl2na2j0dylwc37f5w95rhgyvlwnfhww5rz2r7fgkvayv"; + src = fetchurl { + url = "https://invisible-island.net/archives/ncurses/current/ncurses-${ver}-${patchver}.tgz"; + sha256 = "02y4n4my5qqhw3fdhdjv1zc9xpyglzlzmzjwq2zcwbwv738255ja"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 1a8eb93ce3d41..9fec80aa56eaf 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.33"; + version = "4.34"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1mwklrsx05ga30crr9xi6nl4d49d5mzx2x533bxw4l0fpqay6gmj"; + sha256 = "177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy"; }; patches = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ajs124 hexa ]; platforms = platforms.all; license = licenses.mpl20; }; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 0c57b4cd5cf15..221272a45bc50 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.39"; + version = "10.40"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA="; + hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg="; }; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 082702ec46f78..7db287e5a44ff 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-t0/6yWnvBn5HGA50imejoYFrcVf/TqYg7UQy9Ztw8B8="; + sha256 = "sha256-CE4mhcqmHZTG/obc4AayJHTXu0s0xMuWvXY7l+MF+tY="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index c3da951ca523e..ba5f959ea4412 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -116,6 +116,9 @@ stdenv.mkDerivation { sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in + + # https://bugs.gentoo.org/803470 + sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' patchShebangs ./bin '' + ( diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index f5fd4f82bae28..332b2deddf783 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: stdenv.mkDerivation rec { - pname = "unibilium-unstable"; - - version = "20190811"; + pname = "unibilium"; + version = "2.1.1"; src = fetchFromGitHub { owner = "neovim"; repo = "unibilium"; - rev = "92d929fabaf94ea4feb48149bbc3bbea77c4fab0"; - sha256 = "1l8p3fpdymba62x1f5d990v72z3m5f5g2yf505g0rlf2ysc5r1di"; + rev = "v${version}"; + sha256 = "sha256-A/WECvma7u/Mmecvzi0cP168dt4v+zwC8CiFBkqWezA="; }; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; + makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; + + strictDeps = true; - nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ libtool ncurses ]; + nativeBuildInputs = [ pkg-config perl libtool ]; + buildInputs = [ ncurses ]; meta = with lib; { description = "A very basic terminfo library"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 9b9938746caf6..6681be3c34c03 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (rec { ./fix-configure-issue-cross.patch ]; + strictDeps = true; outputs = [ "out" "dev" ] ++ lib.optional splitStaticOutput "static"; setOutputFlags = false; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 6de9685715d70..9ff63c14e5188 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -5,6 +5,10 @@ , outputs ? [ "out" "devdoc" ] , src ? null +# enabling or disabling does nothing for perl packages so set it explicitly +# to false to not change hashes when enableParallelBuildingByDefault is enabled +, enableParallelBuilding ? false + , doCheck ? true , checkTarget ? "test" @@ -51,7 +55,7 @@ lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is depre fullperl = buildPerl; - inherit outputs src doCheck checkTarget; + inherit outputs src doCheck checkTarget enableParallelBuilding; inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; meta = defaultMeta // (attrs.meta or { }); diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index ce7566deb30d0..bb7525d8859a0 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,26 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, - m2r, setuptools-scm, six, attrs }: +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, m2r +, pytest-benchmark +, pytestCheckHook +, setuptools-scm +, six +}: -buildPythonPackage rec { +let automat = buildPythonPackage rec { version = "20.2.0"; - pname = "Automat"; + pname = "automat"; src = fetchPypi { - inherit pname version; + pname = "Automat"; + inherit version; sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; }; - buildInputs = [ m2r setuptools-scm ]; - propagatedBuildInputs = [ six attrs ]; + nativeBuildInputs = [ + m2r + setuptools-scm + ]; - # Some tests require twisetd, but twisted requires Automat to build. - # this creates a circular dependency. + propagatedBuildInputs = [ + six + attrs + ]; + + checkInputs = [ + pytest-benchmark + pytestCheckHook + ]; + + # escape infinite recursion with twisted doCheck = false; + passthru.tests = { + check = automat.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; -} +}; in automat diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index f1cee8c5ffa08..25f2533ad7d9b 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , substituteAll @@ -26,8 +27,8 @@ buildPythonPackage rec { patches = lib.optional withGdal (substituteAll { src = ./django_3_set_geos_gdal_lib.patch; - geos = geos; - gdal = gdal; + inherit geos; + inherit gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; }); @@ -40,6 +41,8 @@ buildPythonPackage rec { # too complicated to setup doCheck = false; + pythonImportsCheck = [ "django" ]; + meta = with lib; { description = "A high-level Python Web framework"; homepage = "https://www.djangoproject.com/"; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index b79ba4b7db2ec..55123163dbf58 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, click +, twisted +}: -buildPythonPackage rec { +let incremental = buildPythonPackage rec { pname = "incremental"; version = "21.3.0"; @@ -9,10 +14,31 @@ buildPythonPackage rec { sha256 = "02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57"; }; + propagatedBuildInputs = [ + click + ]; + + # escape infinite recursion with twisted + doCheck = false; + + checkInputs = [ + twisted + ]; + + checkPhase = '' + trial incremental + ''; + + passthru.tests = { + check = incremental.overridePythonAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ "incremental" ]; + meta = with lib; { - homepage = "https://github.com/twisted/treq"; + homepage = "https://github.com/twisted/incremental"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; -} +}; in incremental diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 54ad2eaf724f9..dad1d4499ef73 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -90,6 +90,10 @@ buildPythonPackage rec { "test_comparison_invalid" # AssertionError: Regex pattern '"quotechar" must be string, not int' "python-kwargs2" + # Tests for rounding errors and fails if we have better precision + # than expected, e.g. on amd64 with FMA or on arm64 + # https://github.com/pandas-dev/pandas/issues/38921 + "test_rolling_var_numerical_issues" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index bdf2b65cb5079..56cd8fee7f932 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -6,11 +6,14 @@ , fetchPypi , postgresql , openssl +, sphinxHook +, sphinx-better-theme }: buildPythonPackage rec { pname = "psycopg2"; version = "2.9.3"; + outputs = [ "out" "doc" ]; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 @@ -23,6 +26,8 @@ buildPythonPackage rec { nativeBuildInputs = [ postgresql + sphinxHook + sphinx-better-theme ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -32,6 +37,8 @@ buildPythonPackage rec { # requires setting up a postgresql database doCheck = false; + sphinxRoot = "doc/src"; + meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; homepage = "https://www.psycopg.org"; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 765ef5ba7d5a0..805f3cf6e9a3b 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rich"; - version = "12.4.1"; + version = "12.4.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6fr5mtZwXdZihoHEjF1jJxOLH3ajPX1tF2N/ZCV9g50="; + sha256 = "sha256-DW6cKJ5bXZdHGzgbYzTS+ryjy71dU9Lcy+egMXL30F8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 82f91561f3c61..59011ef1d640d 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,75 +1,158 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchPypi , python -, zope_interface -, incremental +, appdirs +, attrs , automat +, bcrypt , constantly +, contextvars +, cryptography +, git +, glibcLocales +, h2 , hyperlink +, idna +, incremental +, priority +, pyasn1 , pyhamcrest -, attrs +, pynacl , pyopenssl +, pyserial , service-identity , setuptools -, idna , typing-extensions -, pyasn1 -, cryptography -, appdirs -, bcrypt -, pynacl -, pyserial -, h2 -, priority -, contextvars +, zope_interface + + # for passthru.tests +, cassandra-driver +, klein +, magic-wormhole +, scrapy +, treq +, txaio +, txamqp +, txrequests +, txtorcon +, thrift +, nixosTests }: + buildPythonPackage rec { - pname = "Twisted"; + pname = "twisted"; version = "22.4.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; - format = "setuptools"; - src = fetchPypi { - inherit pname version; + pname = "Twisted"; + inherit version; extension = "tar.gz"; sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; + propagatedBuildInputs = [ + attrs + automat + constantly + hyperlink + incremental + setuptools + typing-extensions + zope_interface + ]; - passthru.optional-dependencies = rec { - tls = [ pyopenssl service-identity idna ]; - conch = [ pyasn1 cryptography appdirs bcrypt ]; - conch_nacl = conch ++ [ pynacl ]; - serial = [ pyserial ]; - http2 = [ h2 priority ]; - contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; - }; + postPatch = '' + echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py - # Patch t.p._inotify to point to libc. Without this, - # twisted.python.runtime.platform.supportsINotify() == False - postPatch = lib.optionalString stdenv.isLinux '' + echo 'PTYProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'PTYProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + + echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + + echo 'FileObserverTests.test_getTimezoneOffsetEastOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py + echo 'FileObserverTests.test_getTimezoneOffsetWestOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py + echo 'FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime.skip = "tuple differs, values not"'>> src/twisted/test/test_log.py + + echo 'MulticastTests.test_joinLeave.skip = "No such device"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_loopback.skip = "No such device"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py + + echo 'DomishExpatStreamTests.test_namespaceWithWhitespace.skip = "syntax error: line 1, column 0"'>> src/twisted/words/test/test_domish.py + + # not packaged + substituteInPlace src/twisted/test/test_failure.py \ + --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" + '' + lib.optionalString stdenv.isLinux '' + echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + echo 'UNIXTestsBuilder_PollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + + # Patch t.p._inotify to point to libc. Without this, + # twisted.python.runtime.platform.supportsINotify() == False substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" ''; - # Generate Twisted's plug-in cache. Twisted users must do it as well. See + # Generate Twisted's plug-in cache. Twisted users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for details. postFixup = '' $out/bin/twistd --help > /dev/null ''; + checkInputs = [ + git + glibcLocales + pyhamcrest + ] + ++ passthru.optional-dependencies.conch + ++ passthru.optional-dependencies.tls; + checkPhase = '' - ${python.interpreter} -m unittest discover -s src/twisted/test + export SOURCE_DATE_EPOCH=315532800 + export PATH=$out/bin:$PATH + # race conditions when running in paralell + ${python.interpreter} -m twisted.trial twisted ''; - # Tests require network - doCheck = false; + + passthru = { + optional-dependencies = rec { + conch = [ appdirs bcrypt cryptography pyasn1 ]; + conch_nacl = conch ++ [ pynacl ]; + contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; + http2 = [ h2 priority ]; + serial = [ pyserial ]; + tls = [ idna pyopenssl service-identity ]; + }; + + tests = { + inherit + cassandra-driver + klein + magic-wormhole + scrapy + treq + txaio + txamqp + txrequests + txtorcon + thrift; + inherit (nixosTests) buildbot matrix-synapse; + }; + }; meta = with lib; { homepage = "https://github.com/twisted/twisted"; @@ -79,6 +162,6 @@ buildPythonPackage rec { and licensed under the MIT license. ''; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 987347c869510..1baa1c86f6248 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.1.0"; + version = "5.3.0"; disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004"; + sha256 = "sha256-q5OHd7OsA3IjHuZUp/ahN4flh7HKJo2Kp+b7aEbkd9A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index fa29eae2db678..6f631045f00cc 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-3V40SG8aSD/3vnMAzBa01rJGkJh4d8MnjXl1NNZzjwI="; }; + patches = [ + # Fix checks on Musl. + # https://bugs.kde.org/show_bug.cgi?id=453929 + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=148912"; + sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I="; + }) + ]; + outputs = [ "out" "dev" "man" "doc" ]; hardeningDisable = [ "pie" "stackprotector" ]; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index b53adfd0be06a..bde9db89434c1 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0="; }; + strictDeps = true; + enableParallelBuilding = true; + buildInputs = [ xz ]; meta = with lib; { diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 63302c8ed94b6..1fcb819bd4b72 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ./2.71-fix-race.patch ]; + strictDeps = true; nativeBuildInputs = [ m4 perl texinfo ]; buildInputs = [ m4 ]; postBuild = " diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 89a5b4879004a..65d6185f50c07 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"; }; + strictDeps = true; nativeBuildInputs = [ autoconf perl ]; buildInputs = [ autoconf ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 88b6d3a705e87..279e0da7155f9 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation { outputs = [ "out" "info" "man" ]; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 7d860528022ec..34df06ad0f4cd 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; }; + strictDeps = true; + enableParallelBuilding = true; + doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ] diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 05c6586971768..c432aaa82e12d 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { strictDeps = true; + enableParallelBuilding = true; + nativeBuildInputs = [ gettext perlPackages.perl perlPackages.LocaleGettext ]; buildInputs = [ perlPackages.LocaleGettext libintl ]; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 3d15752fc0a63..813cc71938f29 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' ''; + strictDeps = true; nativeBuildInputs = [ autoconf automake help2man m4 perl ]; propagatedBuildInputs = [ m4 file ]; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 03e3d003ad1e8..d51af9ca33273 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -14,8 +14,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w="; }; + strictDeps = true; setupHook = [ ./setup-hook.sh ]; + enableParallelBuilding = true; + # fails 8 out of 24 tests, problems when loading libc.so.6 doCheck = stdenv.name == "stdenv-linux"; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index b0b3115700fb5..70370e421261b 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "man" "doc" ]; + strictDeps = true; # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 26732657eb9f5..e5814e9bda4c2 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,6 +1,6 @@ { version, sha256, patches ? [] }: -{ lib, stdenv, buildPackages, fetchurl, perl, xz, gettext +{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -33,13 +33,15 @@ stdenv.mkDerivation { NATIVE_TOOLS_CFLAGS = if crossBuildTools then "-I${getDev buildPackages.ncurses}/include" else null; NATIVE_TOOLS_LDFLAGS = if crossBuildTools then "-L${getLib buildPackages.ncurses}/lib" else null; + strictDeps = true; + enableParallelBuilding = true; + # We need a native compiler to build perl XS extensions # when cross-compiling. depsBuildBuild = [ buildPackages.stdenv.cc perl ]; - buildInputs = [ xz.bin ] + buildInputs = [ xz.bin bash libintl ] ++ optionals stdenv.isSunOS [ libiconv gawk ] - ++ optionals stdenv.isDarwin [ gettext ] ++ optional interactive ncurses; configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 3d2daba239a33..f9a3b17cd7cbd 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { # Otherwise tests fail due to incorrect unicode symbol oconversion. configurePlatforms = [ "build" "host" ]; + # there's a /bin/sh shebang in bin/yacc which when no strictDeps is patched with the build stdenv shell + # however when cross-compiling it would still be patched with the build stdenv shell which would be wrong + # cannot add bash to buildInputs due to infinite recursion + strictDeps = stdenv.hostPlatform != stdenv.buildPlatform; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index af43c55072c33..c30833937be87 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , removeReferencesTo , zlib @@ -26,19 +27,32 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.4.2"; src = fetchurl (if stdenv.isDarwin then { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; } else { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-xzOfdfjU8t7FDGczQaRfwGtohbttQ2bWv1mk5sEK4Xg="; + sha256 = "sha256-8DzLQLCH0eMJQKQOAUHcu6Jj85l0wg658lIQZsnGyQg="; }); outputs = [ "out" "lib" "dev" "man" ]; - patches = lib.optional (version == "2.2.6") ./0001-TargetConditionals.patch; + patches = lib.optionals (version == "2.2.6") [ + ./0001-TargetConditionals.patch + (fetchpatch { + name = "CVE-2022-26691.patch"; + url = "https://github.com/OpenPrinting/cups/commit/de4f8c196106033e4c372dce3e91b9d42b0b9444.patch"; + sha256 = "sha256-IKOtV7bCS6PstwK6YqnYRYTeH562jWwkley86p+6Of8="; + excludes = [ "CHANGES.md" ]; + }) + (fetchpatch { + name = "CVE-2022-26691-fix-comment.patch"; + url = "https://github.com/OpenPrinting/cups/commit/411b6136f450a583ee08c3880fa09dbe837eb3f1.patch"; + sha256 = "sha256-dVopmr34c9N5H2ZZz52rXVnHQBuDTNo8M40x9455+jQ="; + }) + ]; postPatch = '' substituteInPlace cups/testfile.c \ diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index aa9f4e3763b85..d4d438e78a00e 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -14,6 +14,9 @@ let ARCH = stdenvNoCC.hostPlatform.linuxArch; + strictDeps = true; + enableParallelBuilding = true; + # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 0411bae2060c7..a0b390b756da6 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,5 +1,7 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkg-config +{ stdenv, lib, fetchzip, autoconf, automake, docbook_xml_dtd_42 +, docbook_xml_dtd_43, docbook_xsl, gtk-doc, libtool, pkg-config , libxslt, xz, zstd, elf-header +, withDevdoc ? stdenv.hostPlatform == stdenv.buildPlatform , withStatic ? stdenv.hostPlatform.isStatic }: @@ -11,21 +13,35 @@ in stdenv.mkDerivation rec { pname = "kmod"; version = "29"; - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"; + # autogen.sh is missing from the release tarball, + # and we need to run it to regenerate gtk_doc.make, + # because the version in the release tarball is broken. + # Possibly this will be fixed in kmod 30? + # https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/.gitignore?id=61a93a043aa52ad62a11ba940d4ba93cb3254e78 + src = fetchzip { + url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/snapshot/kmod-${version}.tar.gz"; + sha256 = "sha256-7O5VdBd8rBZdIERPE+2zkjj5POvSurwlV2EpWmkFUD0="; }; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; - nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; + nativeBuildInputs = [ + autoconf automake docbook_xsl libtool libxslt pkg-config + + docbook_xml_dtd_42 # for the man pages + ] ++ lib.optionals withDevdoc [ docbook_xml_dtd_43 gtk-doc ]; buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; + preConfigure = '' + ./autogen.sh + ''; + configureFlags = [ "--sysconfdir=/etc" "--with-xz" "--with-zstd" "--with-modulesdirs=${modulesDirs}" + (lib.enableFeature withDevdoc "gtk-doc") ] ++ lib.optional withStatic "--enable-static"; patches = [ ./module-dir.patch ] diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 73f1e9fbdeec5..0cca51feab306 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.15"; - sha256 = "17n9xl01by7dcbjwjnr6b4rrkp2frz8hwnjl59svsyp13sjq6llk"; + version = "2.03.16"; + sha256 = "sha256-5mHs4VtdiNir45pMHh2y9D4YlvAZlIu5iw4V13doB4Y="; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index dad537a1564dd..5007895c006df 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -340,11 +340,12 @@ stdenv.mkDerivation { exit 1 fi '' - # Finally patch shebangs that might need patching. - # Should no longer be necessary with v251. - # https://github.com/systemd/systemd/pull/21749 + # Finally, patch shebangs in scripts used at build time. This must not patch + # scripts that will end up in the output, to avoid build platform references + # when cross-compiling. + '' - patchShebangs . + shopt -s extglob + patchShebangs tools test src/!(rpm) ''; outputs = [ "out" "man" "dev" ]; @@ -603,11 +604,6 @@ stdenv.mkDerivation { ${lib.concatStringsSep "\n" (lib.flatten (map mkSubstitute binaryReplacements))} ${lib.concatMapStringsSep "\n" mkEnsureSubstituted binaryReplacements} - - for dir in tools src/resolve test src/test src/shared; do - patchShebangs $dir - done - substituteInPlace src/libsystemd/sd-journal/catalog.c \ --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ ''; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0b11138ec237f..fa07f437d7b84 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3100,17 +3100,17 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { pname = "xorg-server"; - version = "21.1.3"; + version = "1.20.14"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz"; - sha256 = "1rgbrld7spg7plkv3c3bbnlnszpflk5z1mqbjrmi2ymlnvasmmk1"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz"; + sha256 = "0sx18vsxr0dg9z7b9ph1gz6q4pmxc1n6b4sbb7i47578kc5vgiaw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto openssl libX11 libXau libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile ]; + buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3b670f6b64e01..7d6efc32a6115 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -653,7 +653,7 @@ self: super: in attrs // (let version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ libxcvt xtrans ]; + commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ zlib libGL libGLU dbus xorgproto @@ -690,6 +690,14 @@ self: super: # # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch + + # Fix e.g. xorg.xf86videovmware with libdrm 2.4.108 + # TODO: remove with xorgserver >= 1.21 + (fetchpatch { + name = "stdbool.patch"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff"; + sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy"; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3a0cce1ee0521..dbab8a4774f11 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz +mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 64c21fa105d42..712d1b001c1ae 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -162,7 +162,9 @@ in # stage1. ${localSystem.libc} = self.stdenv.mkDerivation { pname = "bootstrap-stage0-${localSystem.libc}"; + strictDeps = true; version = "bootstrap"; + enableParallelBuilding = true; buildCommand = '' mkdir -p $out ln -s ${bootstrapTools}/lib $out/lib @@ -267,8 +269,10 @@ in # apparently the interpreter needs to match libc, too. bintools = self.stdenvNoCC.mkDerivation { inherit (prevStage.bintools.bintools) name; + enableParallelBuilding = true; dontUnpack = true; dontBuild = true; + strictDeps = true; # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index cd262875a76be..3dd3632711c3d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; patches = [ diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 8304c34af8971..75a58d011cef8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; + strictDeps = true; outputs = [ "bin" "dev" "out" "man" "doc" ]; configureFlags = lib.optional enableStatic "--disable-shared"; + enableParallelBuilding = true; doCheck = true; preCheck = '' diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 924ac901f6a8c..5798ec569185a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -19,6 +19,8 @@ , xorg , ApplicationServices , python3 +, fltk +, exiv2 , withXorg ? true }: @@ -27,14 +29,14 @@ let in stdenv.mkDerivation { pname = "graphviz"; - version = "2.50.0"; + version = "3.0.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; # use rev as tags have disappeared before - rev = "ca43e4c6a217650447e2928c2e9cb493c73ebd7d"; - sha256 = "1psfgr8y4hh9yyzl04f7xbqb2y9k1xbja051j6b06q9dx7bmkmky"; + rev = "24cf7232bb8728823466e0ef536862013893e567"; + sha256 = "sha256-qqrpCJ9WP8wadupp4YRJMMaSCeFIDuFDQvEOpbG/wGM="; }; nativeBuildInputs = [ @@ -88,11 +90,16 @@ stdenv.mkDerivation { postFixup = optionalString withXorg '' substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty substituteInPlace $out/bin/vimdot \ - --replace /usr/bin/vi '$(command -v vi)' \ - --replace /usr/bin/vim '$(command -v vim)' \ + --replace '"/usr/bin/vi"' '"$(command -v vi)"' \ + --replace '"/usr/bin/vim"' '"$(command -v vim)"' \ --replace /usr/bin/vimdot $out/bin/vimdot \ ''; + passthru.tests = { + inherit (python3.pkgs) pygraphviz; + inherit fltk exiv2; + }; + meta = with lib; { homepage = "https://graphviz.org"; description = "Graph visualization tools"; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index da60a80f77fca..b7ee796795391 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -22,22 +22,13 @@ with lib; stdenv.mkDerivation (rec { pname = "coreutils${optionalString (!minimal) "-full"}"; - version = "9.0"; + version = "9.1"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84="; + sha256 = "sha256:08q4b0w7mwfxbqjs712l6wrwl2ijs7k50kssgbryg9wbsw8g98b1"; }; - patches = [ - ./fix-chmod-exit-code.patch - # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 - ./disable-seek-hole.patch - # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52330 - # This patch can be dropped, once we upgrade to the next coreutils version after 9.0 - ./fix-arm64-macos.patch - ]; - postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh @@ -86,7 +77,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin ++ optionals stdenv.hostPlatform.isCygwin [ texinfo ]; # due to patch - configureFlags = [ "--with-packager=https://NixOS.org" ] + configureFlags = [ "--with-packager=https://nixos.org" ] ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional withOpenssl "--with-openssl" @@ -126,6 +117,10 @@ stdenv.mkDerivation (rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1"; + NIX_CFLAGS_COMPILE = [] + # Work around a bogus warning in conjunction with musl. + ++ optional stdenv.hostPlatform.isMusl "-Wno-error" + ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"; # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. @@ -154,11 +149,6 @@ stdenv.mkDerivation (rec { license = licenses.gpl3Plus; platforms = platforms.unix ++ platforms.windows; priority = 10; - maintainers = [ maintainers.eelco maintainers.das_j ]; + maintainers = [ maintainers.das_j ]; }; -} // optionalAttrs stdenv.hostPlatform.isMusl { - # Work around a bogus warning in conjunction with musl. - NIX_CFLAGS_COMPILE = "-Wno-error"; -} // lib.optionalAttrs stdenv.hostPlatform.isAndroid { - NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; }) diff --git a/pkgs/tools/misc/coreutils/disable-seek-hole.patch b/pkgs/tools/misc/coreutils/disable-seek-hole.patch deleted file mode 100644 index 89503287980d4..0000000000000 --- a/pkgs/tools/misc/coreutils/disable-seek-hole.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/copy.c b/src/copy.c -index cb9018f93..2a4ccc061 100644 ---- a/src/copy.c -+++ b/src/copy.c -@@ -502,7 +502,7 @@ write_zeros (int fd, off_t n_bytes) - return true; - } - --#ifdef SEEK_HOLE -+#if 0 - /* Perform an efficient extent copy, if possible. This avoids - the overhead of detecting holes in hole-introducing/preserving - copy, and thus makes copying sparse files much more efficient. -@@ -1095,7 +1095,7 @@ infer_scantype (int fd, struct stat const *sb, - && ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE)) - return PLAIN_SCANTYPE; - --#ifdef SEEK_HOLE -+#if 0 - scan_inference->ext_start = lseek (fd, 0, SEEK_DATA); - if (0 <= scan_inference->ext_start) - return LSEEK_SCANTYPE; -@@ -1377,7 +1377,7 @@ copy_reg (char const *src_name, char const *dst_name, - off_t n_read; - bool wrote_hole_at_eof = false; - if (! ( --#ifdef SEEK_HOLE -+#if 0 - scantype == LSEEK_SCANTYPE - ? lseek_copy (source_desc, dest_desc, buf, buf_size, hole_size, - scan_inference.ext_start, src_open_sb.st_size, -diff --git a/tests/seek-data-capable b/tests/seek-data-capable -index cc6372214..6e7a9ec1e 100644 ---- a/tests/seek-data-capable -+++ b/tests/seek-data-capable -@@ -1,5 +1,7 @@ - import sys, os, errno, platform - -+sys.exit(1) -+ - # Pass an _empty_ file - if len(sys.argv) != 2: - sys.exit(1) diff --git a/pkgs/tools/misc/coreutils/fix-arm64-macos.patch b/pkgs/tools/misc/coreutils/fix-arm64-macos.patch deleted file mode 100644 index d8880b23dcbfc..0000000000000 --- a/pkgs/tools/misc/coreutils/fix-arm64-macos.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/src/uname.c b/src/uname.c -index ae9b8e29d..e84fc477a 100644 ---- a/src/uname.c -+++ b/src/uname.c -@@ -27,7 +27,7 @@ - # include - #endif - --#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__ -+#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__ && ! defined __APPLE__ - # if HAVE_SYS_PARAM_H - # include /* needed for OpenBSD 3.0 */ - # endif -@@ -44,11 +44,6 @@ - # endif - #endif - --#ifdef __APPLE__ --# include --# include --#endif -- - #include "system.h" - #include "die.h" - #include "error.h" -@@ -167,6 +162,24 @@ print_element (char const *element) - fputs (element, stdout); - } - -+/* Print ELEMENT, preceded by a space if something has already been -+ printed. But if the environment variable ENVVAR is set, print its -+ value instead of ELEMENT. */ -+ -+static void -+print_element_env (char const *element, char const *envvar) -+{ -+#ifdef __APPLE__ -+ if (envvar) -+ { -+ char const *val = getenv (envvar); -+ if (val) -+ element = val; -+ } -+#endif -+ print_element (element); -+} -+ - - /* Set all the option flags according to the switches specified. - Return the mask indicating which elements to print. */ -@@ -287,26 +300,36 @@ main (int argc, char **argv) - die (EXIT_FAILURE, errno, _("cannot get system name")); - - if (toprint & PRINT_KERNEL_NAME) -- print_element (name.sysname); -+ print_element_env (name.sysname, "UNAME_SYSNAME"); - if (toprint & PRINT_NODENAME) -- print_element (name.nodename); -+ print_element_env (name.nodename, "UNAME_NODENAME"); - if (toprint & PRINT_KERNEL_RELEASE) -- print_element (name.release); -+ print_element_env (name.release, "UNAME_RELEASE"); - if (toprint & PRINT_KERNEL_VERSION) -- print_element (name.version); -+ print_element_env (name.version, "UNAME_VERSION"); - if (toprint & PRINT_MACHINE) -- print_element (name.machine); -+ print_element_env (name.machine, "UNAME_MACHINE"); - } - - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; -+#ifdef __APPLE__ -+# if defined __arm__ || defined __arm64__ -+ element = "arm"; -+# elif defined __i386__ || defined __x86_64__ -+ element = "i386"; -+# elif defined __ppc__ || defined __ppc64__ -+ element = "powerpc"; -+# endif -+#endif - #if HAVE_SYSINFO && defined SI_ARCHITECTURE -- { -- static char processor[257]; -- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -- element = processor; -- } -+ if (element == unknown) -+ { -+ static char processor[257]; -+ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+ element = processor; -+ } - #endif - #ifdef UNAME_PROCESSOR - if (element == unknown) -@@ -316,26 +339,6 @@ main (int argc, char **argv) - static int mib[] = { CTL_HW, UNAME_PROCESSOR }; - if (sysctl (mib, 2, processor, &s, 0, 0) >= 0) - element = processor; -- --# ifdef __APPLE__ -- /* This kludge works around a bug in Mac OS X. */ -- if (element == unknown) -- { -- cpu_type_t cputype; -- size_t cs = sizeof cputype; -- NXArchInfo const *ai; -- if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0 -- && (ai = NXGetArchInfoFromCpuType (cputype, -- CPU_SUBTYPE_MULTIPLE)) -- != NULL) -- element = ai->name; -- -- /* Hack "safely" around the ppc vs. powerpc return value. */ -- if (cputype == CPU_TYPE_POWERPC -- && STRNCMP_LIT (element, "ppc") == 0) -- element = "powerpc"; -- } --# endif - } - #endif - if (! (toprint == UINT_MAX && element == unknown)) diff --git a/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch b/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch deleted file mode 100644 index a966c3bda9179..0000000000000 --- a/pkgs/tools/misc/coreutils/fix-chmod-exit-code.patch +++ /dev/null @@ -1,108 +0,0 @@ -From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Fri, 24 Sep 2021 20:57:41 +0100 -Subject: [PATCH] chmod: fix exit status when ignoring symlinks - -* src/chmod.c: Reorder enum so CH_NOT_APPLIED -can be treated as a non error. -* tests/chmod/ignore-symlink.sh: A new test. -* tests/local.mk: Reference the new test. -* NEWS: Mention the bug fix. -Fixes https://bugs.gnu.org/50784 ---- - NEWS | 6 ++++++ - src/chmod.c | 4 ++-- - tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++ - tests/local.mk | 1 + - 4 files changed, 40 insertions(+), 2 deletions(-) - create mode 100755 tests/chmod/ignore-symlink.sh - -diff --git a/NEWS b/NEWS -index a1470a7d7..1cb3c28a1 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug fixes -+ -+ chmod -R no longer exits with error status when encountering symlinks. -+ All files would be processed correctly, but the exit status was incorrect. -+ [bug introduced in coreutils-9.0] -+ - - * Noteworthy changes in release 9.0 (2021-09-24) [stable] - -diff --git a/src/chmod.c b/src/chmod.c -index 37b04f500..57ac47f33 100644 ---- a/src/chmod.c -+++ b/src/chmod.c -@@ -44,8 +44,8 @@ struct change_status - enum - { - CH_NO_STAT, -- CH_NOT_APPLIED, - CH_FAILED, -+ CH_NOT_APPLIED, - CH_NO_CHANGE_REQUESTED, - CH_SUCCEEDED - } -@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent) - if ( ! recurse) - fts_set (fts, ent, FTS_SKIP); - -- return CH_NO_CHANGE_REQUESTED <= ch.status; -+ return CH_NOT_APPLIED <= ch.status; - } - - /* Recursively change the modes of the specified FILES (the last entry -diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh -new file mode 100755 -index 000000000..5ce3de816 ---- /dev/null -+++ b/tests/chmod/ignore-symlink.sh -@@ -0,0 +1,31 @@ -+#!/bin/sh -+# Test for proper exit code of chmod on a processed symlink. -+ -+# Copyright (C) 2021 Free Software Foundation, Inc. -+ -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+ -+# This program 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 General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+ -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+print_ver_ chmod -+ -+mkdir dir || framework_failure_ -+touch dir/f || framework_failure_ -+ln -s f dir/l || framework_failure_ -+ -+# This operation ignores symlinks but should succeed. -+chmod u+w -R dir 2> out || fail=1 -+ -+compare /dev/null out || fail=1 -+ -+Exit $fail -diff --git a/tests/local.mk b/tests/local.mk -index 228d0e368..b5b893fb7 100644 ---- a/tests/local.mk -+++ b/tests/local.mk -@@ -456,6 +456,7 @@ all_tests = \ - tests/chmod/c-option.sh \ - tests/chmod/equal-x.sh \ - tests/chmod/equals.sh \ -+ tests/chmod/ignore-symlink.sh \ - tests/chmod/inaccessible.sh \ - tests/chmod/octal.sh \ - tests/chmod/setgid.sh \ diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index f2f66beffea28..6454bb4eac284 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8="; }; + strictDeps = true; + enableParallelBuilding = true; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix index c9cb7e98bc02e..787ab84e70000 100644 --- a/pkgs/tools/misc/pls/default.nix +++ b/pkgs/tools/misc/pls/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pls"; - version = "4.0.3"; + version = "5.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dhruvkb"; repo = "pls"; rev = version; - sha256 = "sha256-cVTIWSOx3FwF3QPak3eIIIgQ1O9JF5e5ILpcHQ4qI6k="; + sha256 = "sha256-9AY/xZhjowBRHRDevov677Ov4uJWxbVdB789KxA1dXQ="; }; nativeBuildInputs = [ python3.pkgs.poetry-core ]; diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index de823f98596a7..aecf68e8c7fa1 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; }; + strictDeps = true; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468a..fcf3fe31b142e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13693,18 +13693,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_60 = callPackage ../development/compilers/rust/1_60.nix { + rust_1_61 = callPackage ../development/compilers/rust/1_61.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_60; + rust = rust_1_61; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; - rustPackages_1_60 = rust_1_60.packages.stable; - rustPackages = rustPackages_1_60; + rustPackages_1_61 = rust_1_61.packages.stable; + rustPackages = rustPackages_1_61; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -18859,7 +18859,7 @@ with pkgs; glibcIconv = libc: let inherit (libc) pname version; libcDev = lib.getDev libc; - in runCommand "${pname}-iconv-${version}" {} '' + in runCommand "${pname}-iconv-${version}" { strictDeps = true; } '' mkdir -p $out/include ln -sv ${libcDev}/include/iconv.h $out/include ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 408c00fdb2184..64acfb6ba9ebe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12395,6 +12395,7 @@ let LocaleGettext = buildPerlPackage { pname = "gettext"; version = "1.07"; + strictDeps = true; buildInputs = [ pkgs.gettext ]; src = fetchurl { url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz";