From 9bba594437ff872a8be05379106c656a5e7ebbcb Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Sun, 20 Feb 2022 18:00:08 +0000 Subject: [PATCH 01/32] Dart: Add support for aarch64-darwin --- pkgs/development/interpreters/dart/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 366b7df3edd4..0891bfd2d8ff 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -13,6 +13,10 @@ version = "2.15.1"; in { + "${version}-aarch64-darwin" = fetchurl { + url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip"; + sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE="; + }; "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I="; @@ -47,6 +51,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath + '' + lib.optionalString(stdenv.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; @@ -63,7 +68,7 @@ stdenv.mkDerivation { with C-style syntax. It offers compilation to JavaScript, interfaces, mixins, abstract classes, reified generics, and optional typing. ''; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; license = licenses.bsd3; }; } From 3a9fb1ab8db27ae20baddeede8a4eccd1e705551 Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Mon, 28 Mar 2022 15:55:24 +0100 Subject: [PATCH 02/32] Fix SUNDIALS for macOS M1 --- pkgs/development/libraries/sundials/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 75c238a430c4..0b3dff1ebd83 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -59,6 +59,19 @@ stdenv.mkDerivation rec { )] ; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + # + # build error: + # + # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + # ^ + # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + doCheck = true; checkTarget = "test"; From 99f387e462b16d38069168750e5dfbfa1211df55 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 10 Mar 2022 13:36:30 +0100 Subject: [PATCH 03/32] desktopToDarwinBundle: Fixup Exec The "Exec" key in desktop items sometimes has one of the `%f`, `%F`, `%u` and `%U` suffixes, which specify whether the command takes a file, multiple files or a generalized URL or URLs. Darwin application bundles do no understand this syntax so we do the next best thing, which is simply dropping it. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index d54af90b6888..b4d1b7a6bc05 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -176,7 +176,7 @@ convertDesktopFile() { local -r file=$1 local -r sharePath=$(dirname "$(dirname "$file")") local -r name=$(getDesktopParam "${file}" "^Name") - local -r exec=$(getDesktopParam "${file}" "Exec") + local -r exec=$(getDesktopParam "${file}" "Exec" | sed -e 's/ %[fFuU]$//') local -r iconName=$(getDesktopParam "${file}" "^Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") From b52a9621412ab6b2b12885f3875a7a956d4ab46a Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 11 Mar 2022 20:56:44 +0100 Subject: [PATCH 04/32] desktopToDarwinBundle: Complete field code removal Checked the desktop entry spec, there's other field codes than `%[fFuU]` and those can in fact occur more than once, hence dropping '$' and adding `/g`. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b4d1b7a6bc05..0bc454ecc909 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -176,7 +176,8 @@ convertDesktopFile() { local -r file=$1 local -r sharePath=$(dirname "$(dirname "$file")") local -r name=$(getDesktopParam "${file}" "^Name") - local -r exec=$(getDesktopParam "${file}" "Exec" | sed -e 's/ %[fFuU]$//') + local -r exec=$(getDesktopParam "${file}" "Exec" \ + | sed -e 's/ %[fFuUick]//g') local -r iconName=$(getDesktopParam "${file}" "^Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") From 7ef15c96dc6180295d46efb0a0a4f1dd5b0b687a Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 11 Mar 2022 21:52:28 +0100 Subject: [PATCH 05/32] desktopToDarwinBundle: Add X-macOS-Exec and log editing Exec Co-authored-by: milahu --- .../setup-hooks/desktop-to-darwin-bundle.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 0bc454ecc909..5bd71764c617 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -176,8 +176,16 @@ convertDesktopFile() { local -r file=$1 local -r sharePath=$(dirname "$(dirname "$file")") local -r name=$(getDesktopParam "${file}" "^Name") - local -r exec=$(getDesktopParam "${file}" "Exec" \ - | sed -e 's/ %[fFuUick]//g') + local -r macOSExec=$(getDesktopParam "${file}" "X-macOS-Exec") + if [[ "$macOSExec" ]]; then + local -r exec="$macOSExec" + else + local -r execRaw=$(getDesktopParam "${file}" "Exec") + local -r exec="${execRaw// %[fFuUick]}" + if [[ "$exec" != "$execRaw" ]]; then + echo "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." + fi + fi local -r iconName=$(getDesktopParam "${file}" "^Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") From 30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 31 Mar 2022 12:45:33 +0200 Subject: [PATCH 06/32] desktopToDarwinBundle: Change empty directory test `ls -1 "$iconsdir/"*` listed the source directory for me when the glob had no matches. Switching to `-A` circumvents this problem and has the added advantage that it cannot run into argument list length limits. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5bd71764c617..b1364db06107 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -163,7 +163,7 @@ convertIconTheme() { } iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") - if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then + if [[ -n "$(ls -A1 "$iconsdir")" ]]; then icnsutil compose --toc "$out/${iconName}.icns" "$iconsdir/"* else echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." From 4a749a89c453551e107567cdf5d80165383b537f Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 30 Mar 2022 20:36:23 +0200 Subject: [PATCH 07/32] desktopToDarwinBundle: Implement %k Exec field code --- .../setup-hooks/desktop-to-darwin-bundle.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b1364db06107..7ce6c5c82b73 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -171,6 +171,17 @@ convertIconTheme() { fi } +processExecFieldCodes() { + local -r file=$1 + local -r execRaw=$(getDesktopParam "${file}" "Exec") + local -r execNoK="${execRaw/\%k/${file}}" + local -r exec="${execNoK// %[fFuUic]}" + if [[ "$exec" != "$execRaw" ]]; then + echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." + fi + echo "$exec" +} + # For a given .desktop file, generate a darwin '.app' bundle for it. convertDesktopFile() { local -r file=$1 @@ -180,11 +191,7 @@ convertDesktopFile() { if [[ "$macOSExec" ]]; then local -r exec="$macOSExec" else - local -r execRaw=$(getDesktopParam "${file}" "Exec") - local -r exec="${execRaw// %[fFuUick]}" - if [[ "$exec" != "$execRaw" ]]; then - echo "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." - fi + local -r exec=$(processExecFieldCodes "${file}") fi local -r iconName=$(getDesktopParam "${file}" "^Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") From 4dc94e1489fd7045e4b898996cecfbf28ed87ab3 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 31 Mar 2022 13:00:11 +0200 Subject: [PATCH 08/32] desktopToDarwinBundle: Implement %c Exec field code --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 7ce6c5c82b73..5b8a4d0e90fb 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -175,7 +175,8 @@ processExecFieldCodes() { local -r file=$1 local -r execRaw=$(getDesktopParam "${file}" "Exec") local -r execNoK="${execRaw/\%k/${file}}" - local -r exec="${execNoK// %[fFuUic]}" + local -r execNoKC="${execNoK/\%c/$(getDesktopParam "${file}" "Name")}" + local -r exec="${execNoKC// %[fFuUi]}" if [[ "$exec" != "$execRaw" ]]; then echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." fi From 196f989ae88a13210720cb08d53a57c5c05481a0 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 31 Mar 2022 13:44:15 +0200 Subject: [PATCH 09/32] desktopToDarwinBundle: Implement %i Exec field code --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5b8a4d0e90fb..92c790e9907f 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -176,7 +176,9 @@ processExecFieldCodes() { local -r execRaw=$(getDesktopParam "${file}" "Exec") local -r execNoK="${execRaw/\%k/${file}}" local -r execNoKC="${execNoK/\%c/$(getDesktopParam "${file}" "Name")}" - local -r exec="${execNoKC// %[fFuUi]}" + local -r icon=$(getDesktopParam "${file}" "Icon") + local -r execNoKCI="${execNoKC/\%i/${icon:+--icon }${icon}}" + local -r exec="${execNoKCI// %[fFuU]}" if [[ "$exec" != "$execRaw" ]]; then echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." fi From f31d9457551315abad6174c08646e39e09f8db70 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 31 Mar 2022 14:04:52 +0200 Subject: [PATCH 10/32] desktopToDarwinBundle: Implement %f and %u Exec field codes `%f` and `%u` are used to signal the program only accepts a single file or URI argument. I do not believe there's a way to signal this information to macOS but it is possible the program really won't work if multiple files are passed and it's possible the relative position of `%i`, `%c` or `%k` matters. So we replace `%f` or `%u` with `$1`. That way we only pass one file in the (possibly significant) position of the field code. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 92c790e9907f..b181ec1dc63e 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -178,7 +178,8 @@ processExecFieldCodes() { local -r execNoKC="${execNoK/\%c/$(getDesktopParam "${file}" "Name")}" local -r icon=$(getDesktopParam "${file}" "Icon") local -r execNoKCI="${execNoKC/\%i/${icon:+--icon }${icon}}" - local -r exec="${execNoKCI// %[fFuU]}" + local -r execNoKCIfu="${execNoKCI/\%[fu]/\$1}" + local -r exec="${execNoKCIfu// %[FU]}" if [[ "$exec" != "$execRaw" ]]; then echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." fi From 261b73652131421cd562873191060b02b56db1fe Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 31 Mar 2022 15:27:39 +0200 Subject: [PATCH 11/32] desktopToDarwinBundle: Implement %F and %U Exec field codes Similar to the implementation of the `%f` and `%u` field codes. In this case the amount of arguments passed poses no problem but the position could, at least in theory. This finishes the implementation of all the non-deprecated field codes. As a part of that, repetitions of field codes are left alone. Originally all field codes were removed. Now we replace only the first occurence. This is correct for at least `%f`, `%u`, `%F` and `%U` because at most one of them is permitted. Shortcomings: 1. We replace `%[cfFikuU]` patterns one at a time. This means if the right field code appears as part of the rest of the `Exec` field or in a field code that was substituted earlier. 2. If any field code is repeated, only the first occurence is substituted. --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b181ec1dc63e..72c1b973666e 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -179,7 +179,7 @@ processExecFieldCodes() { local -r icon=$(getDesktopParam "${file}" "Icon") local -r execNoKCI="${execNoKC/\%i/${icon:+--icon }${icon}}" local -r execNoKCIfu="${execNoKCI/\%[fu]/\$1}" - local -r exec="${execNoKCIfu// %[FU]}" + local -r exec="${execNoKCIfu/\%[FU]/\$@}" if [[ "$exec" != "$execRaw" ]]; then echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'." fi From ce8dab1b441e7d0b147c6338e2e874f04418fa50 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 13 Apr 2022 06:33:02 +0000 Subject: [PATCH 12/32] luajit: 2.0.5-2021-10-02, 2.1.0-2021-10-27 -> 2.0.5-2022-03-13, 2.1.0-2022-04-05 * switch to SRI hashes --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- pkgs/development/interpreters/luajit/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 5516bf002cd9..f2fc16963cad 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-10-02"; - rev = "d3294fa63b344173db68dd612c6d3801631e28d4"; + version = "2.0.5-2022-03-13"; + rev = "93a65d3cc263aef2d2feb3d7ff2206aca3bee17e"; isStable = true; - sha256 = "0ja6x7bv3iqnf6m8xk6qp1dgan2b7mys0ff86dw671fqqrfw28fn"; + hash = "sha256-Gp7OdfxBGkW59zxWUml2ugPABLUv2SezMiDblA/FZ7g="; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 4898999281d0..507bc40fcf6a 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-10-27"; - rev = "b4b2dce9fc3ffaaaede39b36d06415311e2aa516"; + version = "2.1.0-2022-04-05"; + rev = "5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e"; isStable = false; - sha256 = "185s071aa0yffz8npgdxj7l98cs987vddb2l5pzfcdqfj41gn55q"; + hash = "sha256-Q+34hJDgyCqmtThHbxR16Nn7zhq4Ql142No2rO57HL0="; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 4e2931aa7688..480e34244134 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -4,7 +4,7 @@ , buildPackages , name ? "luajit-${version}" , isStable -, sha256 +, hash , rev , version , extraMeta ? { } @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - inherit sha256 rev; + inherit hash rev; }; luaversion = "5.1"; From f5b1bd166aac6c8d3a2e85eaa8dffa3f3504dce0 Mon Sep 17 00:00:00 2001 From: roblabla Date: Fri, 15 Apr 2022 17:26:21 +0200 Subject: [PATCH 13/32] wimlib: Fix build on darwin. Wimlib works just fine on darwin, but two adjustments need to be made: - Tests need to be disabled, as they rely on glibc-isms (such as lgetattr). - cdrkit and syslinux dependencies are dropped, as those binaries are linux-only. --- pkgs/tools/archivers/wimlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index bb8c6b8952fd..79840f9588ad 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-MvzJ6bFEt8sdtMhuEEyngoPNwiXhP+grJzZgWGrv4yM="; }; - preBuild = '' + preBuild = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace programs/mkwinpeimg.in \ --replace '/usr/lib/syslinux' "${syslinux}/share/syslinux" ''; postInstall = let - path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; + path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux ]); in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : ${path} done ''; - doCheck = true; + doCheck = (!stdenv.isDarwin); preCheck = '' patchShebangs tests From 0a60a12fae59593332fa6883d2d4b1e51c48c2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 17 Apr 2022 14:00:02 +0100 Subject: [PATCH 14/32] nixos/amdgpu-pro: Add support for systemd stage 1 --- nixos/modules/hardware/video/amdgpu-pro.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index d784befc9b88..299a30b0629b 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -51,9 +51,10 @@ in (isYes "KALLSYMS_ALL") ]; - boot.initrd.extraUdevRulesCommands = '' + boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.systemd.enable) '' cp -v ${package}/etc/udev/rules.d/*.rules $out/ ''; + boot.initrd.services.udev.packages = [ package ]; environment.systemPackages = [ package.vulkan ] ++ From 0cb205e35513d8d9a0e5b5cf8a25886ad9d724f4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Apr 2022 11:53:25 +0100 Subject: [PATCH 15/32] xorg.xf86videointel: 2019-12-09 -> 2021-01-15 This is the exactly same version shipped on Arch Linux: https://github.com/archlinux/svntogit-packages/blob/92eee4f35300f0017dbb5e2c7b3ba3d75c729d40/trunk/PKGBUILD#L7 Also Debian: https://packages.debian.org/sid/xserver-xorg-video-intel Probably some other distros too. --- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c210070b8ac4..d58a3c929aaa 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -828,14 +828,14 @@ self: super: xf86videointel = super.xf86videointel.overrideAttrs (attrs: { # the update script only works with released tarballs :-/ - name = "xf86-video-intel-2019-12-09"; + name = "xf86-video-intel-2021-01-15"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; group = "xorg"; owner = "driver"; repo = "xf86-video-intel"; - rev = "f66d39544bb8339130c96d282a80f87ca1606caf"; - sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl"; + rev = "31486f40f8e8f8923ca0799aea84b58799754564"; + sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM="; }; buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; From 0f316e5553561774a795f6ec69949ab70bd93a8f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 19 Apr 2022 12:10:22 +0200 Subject: [PATCH 16/32] emacsWrapper: fix mishandling of empty package list The native compiler of emacs does not handle empty files well. This arose in https://github.com/NixOS/nixpkgs/pull/168954 . --- pkgs/build-support/emacs/wrapper.nix | 7 +++++++ pkgs/build-support/emacs/wrapper.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 207908fb606f..2bf8eaf2d7ad 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -144,6 +144,7 @@ runCommand find $pkg -name "*-autoloads.el" \ -exec echo \(load \"{}\" \'noerror \'nomessage\) \; >> $siteAutoloads done + echo "(provide 'nix-generated-autoload)" >> $siteAutoloads siteStart="$out/share/emacs/site-lisp/site-start.el" siteStartByteCompiled="$siteStart"c @@ -196,12 +197,18 @@ runCommand # Wrap emacs and friends so they find our site-start.el before the original. for prog in $emacs/bin/*; do # */ local progname=$(basename "$prog") + local autoloadExpression="" rm -f "$out/bin/$progname" + if [[ $progname == emacs ]]; then + # progs other than "emacs" do not understand the `-l` switches + autoloadExpression="-l cl-loaddefs -l nix-generated-autoload" + fi substitute ${./wrapper.sh} $out/bin/$progname \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var autoloadExpression \ --subst-var prog chmod +x $out/bin/$progname done diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index 6c5a5aee2a8f..16da2a9f6495 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -44,4 +44,4 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@ export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ -exec @prog@ -l cl-loaddefs -l nix-generated-autoload "$@" +exec @prog@ @autoloadExpression@ "$@" From 834faa24b416c549c2b6da70024f7a9b13d8a835 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 19 Apr 2022 21:35:04 +0200 Subject: [PATCH 17/32] =?UTF-8?q?coqPackages.Verdi:=2020210524=20=E2=86=92?= =?UTF-8?q?=2020211026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/Verdi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 2701cf6f04c4..4d76331fb99a 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -6,10 +6,13 @@ with lib; mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.7" "8.15"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } { case = "8.6"; out = "20181102"; } ] null; + release."20211026".rev = "064cc4fb2347453bf695776ed820ffb5fbc1d804"; + release."20211026".sha256 = "sha256:13xrcyzay5sjszf5lg4s44wl9nrcz22n6gi4h95pkpj0ni5clinx"; release."20210524".rev = "54597d8ac7ab7dd4dae683f651237644bf77701e"; release."20210524".sha256 = "sha256:05wb0km2jkhvi8807glxk9fi1kll4lwisiyzkxhqvymz4x6v8xqv"; release."20200131".rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0"; From 551b703fd1df586f68282ca4fa7735b2c9945a16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Apr 2022 22:20:08 +0200 Subject: [PATCH 18/32] python3Packages.pyvesync: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index c0800c3a8cc4..45404c107fb1 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7eGsRy8S6IZQ+UVNN8SoS7tBIYLlujSFr2qFldaxtJE="; + sha256 = "sha256-SsSzwuJvDbQ1AzF+q5bjOnFaR6M2UFixtlmk6sgjKOg="; }; propagatedBuildInputs = [ From 85020dcbda5ec9697e0906cb8e011006fd8573e2 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 19 Apr 2022 23:20:59 +0900 Subject: [PATCH 19/32] qtmultimedia: restrict libpulseaudio to linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libpulseaudio doesn't currently build on darwin after a recent upgrade (#160097). When looking closely at the darwin build, it appeared that it wasn't being used at all. ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt512.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt514.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt515.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no --- pkgs/development/libraries/qt-5/modules/qtmultimedia.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index baf5c30e73c4..41a7eb6776c3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -15,8 +15,9 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ lib.optional (stdenv.isLinux) alsa-lib + buildInputs = [ gstreamer gst-plugins-base ] + # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; From 088112c89714e6daf490cb3877773e83c6fbdea2 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 19 Apr 2022 18:50:21 -0400 Subject: [PATCH 20/32] acpilight: set mainProgram = "xbacklight" --- pkgs/misc/acpilight/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index d6fead938a45..91bb87829131 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ smakarov ]; platforms = platforms.linux; + mainProgram = "xbacklight"; }; } From f394cc6c547f1162dac673f0fba11eca75022a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 19 Apr 2022 00:52:02 -0500 Subject: [PATCH 21/32] =?UTF-8?q?aws-sdk-cpp:=201.9.150=20=E2=86=92=201.9.?= =?UTF-8?q?238?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/aws-sdk-cpp/default.nix | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 769cc2d3bd29..3cd846c87a13 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, openssl +, s2n-tls +, zlib , aws-crt-cpp -, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums -, CoreAudio, AudioToolbox +, aws-c-cal +, aws-c-common +, aws-c-event-stream +, aws-c-io +, aws-checksums +, CoreAudio +, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -18,16 +30,31 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.150"; + version = "1.9.238"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="; + sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; }; postPatch = '' + # Missing includes for GCC11 + sed '5i#include ' -i \ + aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ + aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ + aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ + aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ + aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ + aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ + aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ + aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ + aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ + aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ + aws-cpp-sdk-transfer-tests/TransferTests.cpp # Flaky on Hydra rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build @@ -82,12 +109,6 @@ stdenv.mkDerivation rec { patches = [ ./cmake-dirs.patch - - # fix cmake config - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; - sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; - }) ]; # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. From 16e781187a61a84a5ff90ff9769ebf1acd28f31d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Apr 2022 01:14:06 +0000 Subject: [PATCH 22/32] cfripper: 1.8.0 -> 1.9.0 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 1c6caf18a8e8..3e3d67cb6458 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-x6QfS3DdJMpVKOLrz3EvYzIU72GzLdEePfpE9siEmCo="; + hash = "sha256-wep1hGYq0UUHeEL674N6cvGg9u9FqGqS0XCUZYUZGzs="; }; propagatedBuildInputs = with python3.pkgs; [ From 3469e707e19f73027230e654dd80a8ae21f407f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Apr 2022 02:17:41 +0000 Subject: [PATCH 23/32] python310Packages.pycfmodel: 0.19.0 -> 0.19.1 --- pkgs/development/python-modules/pycfmodel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 2dca6e47654f..9aa41214bfcf 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-u1XuUW5OFl5NDP11nd6HK17NBXjqvzLFp2jUmecWP8E="; + hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork="; }; propagatedBuildInputs = [ From 74ccb557e2210285ec870d7f5d7b83cf1267c0d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Apr 2022 02:47:30 +0000 Subject: [PATCH 24/32] python310Packages.pex: 2.1.80 -> 2.1.81 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 69a1b01f063d..f6b6162634f0 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.80"; + version = "2.1.81"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m9HMvLoFpg5aUoNknLdF7X++XEk9j70+qaid627uYvs="; + hash = "sha256-EW7kOUTzLjmBVKcdRrcdx+AAMSp1hw2LJ/mHMuKViLE="; }; nativeBuildInputs = [ From 2e52d5c892e03a9f9d61d2479b10c908d9bdec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Wed, 20 Apr 2022 08:02:15 +0200 Subject: [PATCH 25/32] naproche: 0.1.0.0 -> 2022-04-19 This fixes the build with GHC 9 --- pkgs/applications/science/logic/naproche/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index 5e286a9b57e3..047ed73262ee 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "0.1.0.0"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "d39cea85ace04d5b3775fde9972a33886799bfe6"; - sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf"; + rev = "2514c04e715395b7a839e11b63046eafb9c6a1da"; + sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm"; }; isExecutable = true; From ab0788c8f5c2109de29b3be5858fc32a9332a36d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 19 Apr 2022 16:58:59 -0300 Subject: [PATCH 26/32] ocamlPackages.flex: init unstable-2020-09-12 --- .../ocaml-modules/flex/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/flex/default.nix diff --git a/pkgs/development/ocaml-modules/flex/default.nix b/pkgs/development/ocaml-modules/flex/default.nix new file mode 100644 index 000000000000..c9db2440e01c --- /dev/null +++ b/pkgs/development/ocaml-modules/flex/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage, fetchFromGitHub, lib, reason }: + +buildDunePackage rec { + pname = "flex"; + version = "unstable-2020-09-12"; + + src = fetchFromGitHub { + owner = "jordwalke"; + repo = "flex"; + rev = "6ff12fe4f96749ffd3c0ea3d9962742767937b4a"; + sha256 = "sha256-GomTOdlU5ZwElKK8CM4DEMr51YDIrFKmTxUCGMLL3c4="; + }; + + nativeBuildInputs = [ reason ]; + + meta = with lib; { + description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port"; + homepage = "https://github.com/jordwalke/flex"; + maintainers = with maintainers; [ superherointj ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 65a3383017ab..ffac10e17603 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -427,6 +427,8 @@ let inherit (pkgs) flac; }; + flex = callPackage ../development/ocaml-modules/flex { }; + fmt = callPackage ../development/ocaml-modules/fmt { }; fontconfig = callPackage ../development/ocaml-modules/fontconfig { From dca08f645d6632449f5a5a1e329296a87033503f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Wed, 20 Apr 2022 09:56:35 +0200 Subject: [PATCH 27/32] naproche: add to release-haskell.nix This will ensure maintainers get notified on haskell updates --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4eb8d040a7da..0937a86a22cf 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -195,6 +195,7 @@ let madlang matterhorn mueval + naproche neuron-notes niv nix-delegate From 30943ab97bb29bfd55c3972dddddb9cd26bf5591 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 20 Apr 2022 09:36:18 +0200 Subject: [PATCH 28/32] unifont: 14.0.02 -> 14.0.03 --- pkgs/data/fonts/unifont/default.nix | 10 ++++------ pkgs/data/fonts/unifont_upper/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 6de709344b12..808d96ce446d 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,18 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "14.0.02"; + version = "14.0.03"; ttf = fetchurl { - # Unfortunately the 14.0.02 TTF file is not available on the GNU mirror. - # Restore this for next version: "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - url = "https://unifoundry.com/pub/unifont/${pname}-${version}/font-builds/${pname}-${version}.ttf"; - sha256 = "1c8rdk3xg6j8lrzxddd73jppfgpk253jdkch63rr7n2d7ljp9gc3"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; + sha256 = "1qyc7nqyhjnarwgpkah52qv7hr0yfzak7084ilrj7z0nii4f5y57"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "0hcl1zihm91xwvh5ds01sybgs0j8zsrrhn4wlz5j6ji99rh797jr"; + sha256 = "1sgvxpr4ydjnbk70j0lpgxz5x851lmrmxjb5x8lsz0i2hm32jdbc"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 92e274fe8ff7..84a1742b8439 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "14.0.02"; + version = "14.0.03"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "0p1c2kkg20jqddy828yj6sxfwgv8k5gxwmg0cybalrjb0s09kcs8"; + sha256 = "1lwx7syb9ij4dlqiiybp6xgvar2sszxphvaqh64vivzj9gp0g0ai"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; From 3540cc8d16870c2a39f4254152e9be1cb2214473 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 20 Apr 2022 09:13:06 +0200 Subject: [PATCH 29/32] ocamlPackages.hacl-star-raw: fix aarch64-darwin --- pkgs/development/ocaml-modules/hacl-star/raw.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 58fa1eb00212..07e4d99344f7 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { minimalOCamlVersion = "4.08"; + # strictoverflow is disabled because it breaks aarch64-darwin + hardeningDisable = [ "strictoverflow" ]; + postPatch = '' patchShebangs ./ ''; From 27245956af1f03ceb5be370c8218e2bbdd6c32ea Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 20 Apr 2022 09:57:07 +0200 Subject: [PATCH 30/32] trash-cli: 0.21.10.24 -> 0.22.4.16 --- pkgs/tools/misc/trash-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 5cbda62e51b4..6535590e8649 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.10.24"; + version = "0.22.4.16"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "01is32lk6prwhajvlmgn3xs4fcpmiqivizcqkj9k80jx6mqjifzs"; + sha256 = "0j8iwr6cdc24gp5raxrq5483d7sfsyi8sy947w4hr2sc4j738dg5"; }; propagatedBuildInputs = [ python3Packages.psutil ]; From 7383ec7045c66d11cf48dad2afee8d6920e568aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Apr 2022 11:09:46 +0200 Subject: [PATCH 31/32] python3Packages.setupmeta: add missing input --- pkgs/development/python-modules/setupmeta/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index c42565082cfd..d24c8263e9a1 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, six }: buildPythonPackage rec { @@ -36,6 +37,7 @@ buildPythonPackage rec { mock pep440 pytestCheckHook + six ]; preCheck = '' @@ -45,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # Tests want to scan site-packages "test_check_dependencies" + "test_clean" "test_scenario" "test_git_versioning" ]; From a7e62c21c1fbb36588e06dadd252f3fced6dbda2 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 20 Apr 2022 09:24:51 +0200 Subject: [PATCH 32/32] ocamlPackages.pure-splitmix: init at 0.3 --- .../ocaml-modules/pure-splitmix/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/pure-splitmix/default.nix diff --git a/pkgs/development/ocaml-modules/pure-splitmix/default.nix b/pkgs/development/ocaml-modules/pure-splitmix/default.nix new file mode 100644 index 000000000000..228f8ad8c488 --- /dev/null +++ b/pkgs/development/ocaml-modules/pure-splitmix/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "pure-splitmix"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Lysxia"; + repo = pname; + rev = version; + sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU="; + }; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Lysxia/pure-splitmix"; + description = "Purely functional splittable PRNG"; + license = licenses.mit; + maintainers = [ maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ffac10e17603..4601739d4fef 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1112,6 +1112,8 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; + pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { }; + resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; repr = callPackage ../development/ocaml-modules/repr { };