From 7a67b4c28ba8a303dc0ec20bddeaa077df6da165 Mon Sep 17 00:00:00 2001 From: Boey Maun Suang Date: Sun, 19 Feb 2023 14:37:11 +1100 Subject: [PATCH 01/21] fftwQuad: Fix build on Darwin by forcing gcc --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab1d60a1ad31..a1427aa3483a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19618,7 +19618,11 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; - fftwQuad = fftw.override { precision = "quad-precision"; }; + # Need gcc >= 4.6.0 to build with FFTW with quad precision, but Darwin defaults to Clang + fftwQuad = fftw.override { + precision = "quad-precision"; + stdenv = gccStdenv; + }; fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; From 1023ebd4a0c06d5dc3eaeb92f98412b444eb94f5 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 2 Mar 2023 08:54:59 -0700 Subject: [PATCH 02/21] obsidian: 1.1.15 -> 1.1.16 - While here, add myself as a maintainer. - Remove @opeik per #219110. Closes #219110 --- pkgs/applications/misc/obsidian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index ba618219bc52..a7af7ff8d373 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.15"; + version = "1.1.16"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; + sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw="; }; icon = fetchurl { From 68648fa4c01e5b9f9b91cf0235652bbaec154926 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:34:01 +1100 Subject: [PATCH 03/21] darwin.apple_sdk_11_0.clang{12-15}Stdenv: init --- .../darwin/apple-sdk-11.0/default.nix | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 145c98496b49..df707e2b6e26 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -56,9 +56,32 @@ let ''; }; + mkStdenv = stdenv: + let + cc = stdenv.cc.override { + bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; + libc = packages.Libsystem; + }; + in + if stdenv.isAarch64 then stdenv + else + (overrideCC stdenv cc).override { + targetPlatform = stdenv.targetPlatform // { + darwinMinVersion = "10.12"; + darwinSdkVersion = "11.0"; + }; + }; + + stdenvs = { + stdenv = mkStdenv stdenv; + } // builtins.listToAttrs (map + (v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; }) + [ "12" "13" "14" "15" ] + ); + callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); - packages = { + packages = stdenvs // { inherit (callPackage ./apple_sdk.nix {}) frameworks libs; # TODO: this is nice to be private. is it worth the callPackage above? @@ -89,30 +112,14 @@ let inherit (pkgs) rustc cargo; }; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { - inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { + inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); xcbuild = xcodebuild; - }); - - stdenv = - let - clang = stdenv.cc.override { - bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; - libc = packages.Libsystem; - }; - in - if stdenv.isAarch64 then stdenv - else - (overrideCC stdenv clang).override { - targetPlatform = stdenv.targetPlatform // { - darwinMinVersion = "10.12"; - darwinSdkVersion = "11.0"; - }; - }; + })); }; in packages From 7a734f279523d08b5eec75a8a60d24438dbbe5cc Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:35:20 +1100 Subject: [PATCH 04/21] darwin.apple_sdk_11_0: code cleanup --- .../darwin/apple-sdk-11.0/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index df707e2b6e26..8c9e16a6ca9a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -82,25 +82,25 @@ let callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); packages = stdenvs // { - inherit (callPackage ./apple_sdk.nix {}) frameworks libs; + inherit (callPackage ./apple_sdk.nix { }) frameworks libs; # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. inherit MacOSX-SDK CLTools_Executables; - Libsystem = callPackage ./libSystem.nix {}; + Libsystem = callPackage ./libSystem.nix { }; LibsystemCross = pkgs.darwin.Libsystem; - libcharset = callPackage ./libcharset.nix {}; - libunwind = callPackage ./libunwind.nix {}; - libnetwork = callPackage ./libnetwork.nix {}; - libpm = callPackage ./libpm.nix {}; + libcharset = callPackage ./libcharset.nix { }; + libunwind = callPackage ./libunwind.nix { }; + libnetwork = callPackage ./libnetwork.nix { }; + libpm = callPackage ./libpm.nix { }; # Avoid introducing a new objc4 if stdenv already has one, to prevent # conflicting LLVM modules. - objc4 = if stdenv ? objc4 then stdenv.objc4 else callPackage ./libobjc.nix {}; + objc4 = stdenv.objc4 or (callPackage ./libobjc.nix { }); # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; - IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; @@ -115,7 +115,16 @@ let callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { - inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + inherit (prev.darwin.apple_sdk_11_0) + IOKit + Libsystem + LibsystemCross + Security + configd + libcharset + libunwind + objc4 + ; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); From b7391c695b8c29e046445cc1953c7380ae36eb66 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sat, 4 Mar 2023 10:36:28 +1100 Subject: [PATCH 05/21] signalbackup-tools: unbreak on Darwin systems --- .../signalbackup-tools/default.nix | 9 ++++++--- .../fix-build-darwin-clang14.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c3b9caf9ab4b..643bc76c332d 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }: -stdenv.mkDerivation rec { +(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; version = "20230223-1"; @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; }; + patches = [ + ./fix-build-darwin-clang14.patch + ]; + postPatch = '' patchShebangs BUILDSCRIPT_MULTIPROC.bash44 ''; @@ -36,6 +40,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch new file mode 100644 index 000000000000..564d91fe97a7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch @@ -0,0 +1,13 @@ +diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h +index e9fc3fb..a620571 100644 +--- a/signalbackup/signalbackup.h ++++ b/signalbackup/signalbackup.h +@@ -148,7 +148,7 @@ class SignalBackup + std::string pre; + std::string replacement; + std::string post; +- bool operator<(Range const &other) ++ bool operator<(Range const &other) const + { + return (start < other.start) || + (start == other.start && start + length < other.start + other.length) || From c777db77a3e0aab5f406142fadc7ad43838b8d73 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Mar 2023 12:21:27 +0100 Subject: [PATCH 06/21] element-{web,desktop}: 1.11.23 -> 1.11.24 ChangeLog web: https://github.com/vector-im/element-web/releases/tag/v1.11.24 ChangeLog desktop: https://github.com/vector-im/element-desktop/releases/tag/v1.11.24 --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index bf1458c264eb..05cfe1d87b67 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.23", - "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", - "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", - "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", - "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" + "version": "1.11.24", + "desktopSrcHash": "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I=", + "desktopYarnHash": "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97", + "webSrcHash": "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk=", + "webYarnHash": "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y" } From 50e35e9b6c8fbd2e84bf569bfb3c7dd9ab6a6329 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 01:40:37 +0200 Subject: [PATCH 07/21] obliv-c: migrate to OCaml 4.14 --- pkgs/development/compilers/obliv-c/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 3e13b9247fb9..f2eadee57937 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); + buildInputs = [ ocamlPackages.num ]; propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; @@ -19,6 +20,9 @@ stdenv.mkDerivation rec { patches = [ ./ignore-complex-float128.patch ]; + # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209 + env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'"; + preBuild = '' patchShebangs . ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..85ba768df5a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15529,8 +15529,10 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c - { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; + obliv-c = callPackage ../development/compilers/obliv-c { + stdenv = gcc10StdenvCompat; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; ocaml-ng = callPackage ./ocaml-packages.nix { }; ocaml = ocamlPackages.ocaml; From cc4169d737e092ef877cf8b8d9b940df849a7312 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:03:44 +0200 Subject: [PATCH 08/21] glsurf: migrate to OCaml 4.14 --- pkgs/applications/science/math/glsurf/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 808d89ef9636..bfc1998238e2 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ] ++ (with ocamlPackages; [ camlp4 lablgl - camlimages_4_2_4 + camlimages + num ]); postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..50c76dfb8ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20169,7 +20169,9 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { + unsafeStringSupport = true; + }); }; glui = callPackage ../development/libraries/glui {}; From 919dd0892c74a6cbca47000182909766d8380385 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sun, 5 Mar 2023 11:55:27 +1100 Subject: [PATCH 09/21] signalbackup-tools: 20230223-1 -> 20230304-3 --- .../signalbackup-tools/default.nix | 8 ++------ .../fix-build-darwin-clang14.patch | 13 ------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 643bc76c332d..3793b3a66868 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,19 +2,15 @@ (if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230223-1"; + version = "20230304-3"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; + hash = "sha256-y6ApImUkS25kUPih/hl1ngLAkeBAX+MhJ6XuiVU9aZQ="; }; - patches = [ - ./fix-build-darwin-clang14.patch - ]; - postPatch = '' patchShebangs BUILDSCRIPT_MULTIPROC.bash44 ''; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch b/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch deleted file mode 100644 index 564d91fe97a7..000000000000 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/fix-build-darwin-clang14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h -index e9fc3fb..a620571 100644 ---- a/signalbackup/signalbackup.h -+++ b/signalbackup/signalbackup.h -@@ -148,7 +148,7 @@ class SignalBackup - std::string pre; - std::string replacement; - std::string post; -- bool operator<(Range const &other) -+ bool operator<(Range const &other) const - { - return (start < other.start) || - (start == other.start && start + length < other.start + other.length) || From a56529a95f30709bb7cc4d956d1a08961cf588d1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Mar 2023 12:05:39 +0200 Subject: [PATCH 10/21] glsurf: fix runtime error --- pkgs/applications/science/math/glsurf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index bfc1998238e2..ec3bb4c795b3 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { substituteInPlace "$f" --replace "+camlp4" \ "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4" done + + # Fatal error: exception Sys_error("Mutex.unlock: Operation not permitted") + sed -i "/gl_started/d" src/draw.ml* src/main.ml ''; installPhase = '' From 877d70784585dee16fa6a758b5d719aaf607fc0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 17:44:02 +0000 Subject: [PATCH 11/21] oven-media-engine: 0.15.0 -> 0.15.1 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 6aefa4f45342..b14efeaabecf 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM="; + sha256 = "sha256-Ob+0Ak0ELyHrZfeCiACX2IHsp+6jE//iqPoW6je6GfQ="; }; sourceRoot = "source/src"; From fddd8787d374141fbbb45ed68debba11483450b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 21:17:06 +0000 Subject: [PATCH 12/21] openfortivpn: 1.19.0 -> 1.20.1 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 87b7ae1970cb..c63ae2968f5f 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HwKkgRS3Hccym78T+suFkIP5nmQDWRAwm0l/PaS1p7o="; + sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From ede665f2ef01f54831624a413030f7b6cb0ba661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 00:15:37 +0000 Subject: [PATCH 13/21] miopengemm: 5.4.2 -> 5.4.3 --- pkgs/development/libraries/miopengemm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index d363f524f199..f288cfda5456 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" From be7a05a70f46bdbb072c25535fb576198b409651 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 02:22:27 +0000 Subject: [PATCH 14/21] brev-cli: 0.6.207 -> 0.6.208 --- pkgs/development/misc/brev-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3dd4776a146d..5a0f3138bbef 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.207"; + version = "0.6.208"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w="; + sha256 = "sha256-fgbHaY0trO7MiYxhdatq81PaOIVQpSIU3cUnrIvGI2M="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; From 8fdababce4969d18f9d86664fa5dc292dd16a883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 02:41:23 +0000 Subject: [PATCH 15/21] android-udev-rules: 20230104 -> 20230303 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index aa6cb53051d8..5575ece33149 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20230104"; + version = "20230303"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-tbejLvig+eTG+DHAchWEMMydd6ePRKyfRVPp6uDhP70="; + sha256 = "sha256-ddalOVt0gLuTcwk322fNNn6WNZx1Ubsa4MgaG0Lmn2k="; }; installPhase = '' From c5d748d650139e4b86248ab80c0e490d13561191 Mon Sep 17 00:00:00 2001 From: imlonghao Date: Mon, 6 Mar 2023 10:56:45 +0800 Subject: [PATCH 16/21] bgpq4: 1.8 -> 1.9 --- pkgs/tools/networking/bgpq4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 0ec15e9c35c3..aa7d9727fb89 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o="; + sha256 = "sha256-9uFfE3rUQCYbWhtJuRQT9FHf9YeD4THkj/OCp9f1MwI="; }; nativeBuildInputs = [ From 6ea505ee4ea6a148132f7b4fd93f8d36aa1b25b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 5 Mar 2023 10:53:44 +0100 Subject: [PATCH 17/21] mesa: enable vulkan intel drivers on 32bit --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480c2d8c8584..c0252eb92336 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -51,9 +51,9 @@ "imagination-experimental" # PowerVR Rogue (currently N/A) "panfrost" # ARM Mali Midgard and up (T/G series) ] - ++ lib.optionals stdenv.isx86_64 [ - "intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 - "intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only + ++ lib.optionals stdenv.hostPlatform.isx86 [ + "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build + "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) ] else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] From cb363523dad54f575dae55d245d73018712a6f7f Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 6 Mar 2023 09:42:43 +0100 Subject: [PATCH 18/21] gitlab: 15.8.3 -> 15.8.4 (#219406) https://about.gitlab.com/releases/2023/03/02/security-release-gitlab-15-9-2-released/ --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 63d22703d284..f068e7618d08 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.8.3", - "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", + "version": "15.8.4", + "repo_hash": "sha256-8R2a934nC6n482Am7EruV3yHgxFSICuGcKgRBCy7GGI=", "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.8.3-ee", + "rev": "v15.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.8.3", - "GITLAB_PAGES_VERSION": "15.8.3", + "GITALY_SERVER_VERSION": "15.8.4", + "GITLAB_PAGES_VERSION": "15.8.4", "GITLAB_SHELL_VERSION": "14.15.0", - "GITLAB_WORKHORSE_VERSION": "15.8.3" + "GITLAB_WORKHORSE_VERSION": "15.8.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index aab5bfbd6a6f..53b290066be2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.8.3"; + version = "15.8.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; + sha256 = "sha256-att8MR94uINKOTYlj2sZLezMXZag11qP2p9T9a3Eklc="; }; vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 252be4e56313..a01d8aa221f5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.8.3"; + version = "15.8.4"; src = fetchFromGitLab { owner = data.owner; From e6c8a2f3e340cbf7dbecfd5c66baf716b212a139 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 6 Mar 2023 09:56:37 +0100 Subject: [PATCH 19/21] linuxPackages_latest.jool: fix build (#219138) --- pkgs/os-specific/linux/jool/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 9246ca679a65..2d1a44790814 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -12,6 +12,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/jool/plain/debian/patches/0001-Linux-6.2.patch?id=3708a5b6c492b7d8e9f78596e61ae8f74ec9640f"; + hash = "sha256-GkyDY6tcJp7Xd28mrDorEJHxsEowZBJP7BRAdPpsyF8="; + }) + ]; + prePatch = '' sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; From 41020c3241acbdd15e0c3e9ad947826abc8638b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Mar 2023 12:14:35 +0100 Subject: [PATCH 20/21] bind: avoid tests on aarch64-linux for now They fail on some machines repeatedly and they were only enabled around a day ago (6fa61985866). --- pkgs/servers/dns/bind/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 952ef5690201..e7e904cb94cd 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -61,7 +61,9 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isStatic; + # TODO: investigate the aarch64-linux failures; see this and linked discussions: + # https://github.com/NixOS/nixpkgs/pull/192962 + doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux); checkTarget = "unit"; checkInputs = [ cmocka From b6cc2f2979a19ec2983cef156d5d44b2fe0e545f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Mar 2023 12:25:37 +0100 Subject: [PATCH 21/21] element-desktop: electron_22 -> electron_23 (#219823) Apparently this got changed in 1.11.24[1], but wasn't mentioned in the release notes. Thank you yu-re-ka for pointing that out! [1] https://github.com/vector-im/element-desktop/commit/1462e879450c8bd386b8a4cfc910b58f9ff23c85 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bac25804dd8b..55967d9fd84d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4570,7 +4570,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_22; + electron = electron_23; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh