From 5d07c39b149797c710ff09abda3ad90da231d53e Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 3 Nov 2022 12:00:00 +0000 Subject: [PATCH 01/25] nixos/power-management: fix deadlock with post-resume.{target,service} Fixes a deadlock where post-resume.target has After=post-resume.service and post-resume.service runs systemctl try-restart post-resume.target the systemctl call cannot complete if post-resume.target was already queued at that time. --- nixos/modules/config/power-management.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index a4e8028cfbe9..e7fd02920e0d 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -94,7 +94,7 @@ in after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ]; script = '' - /run/current-system/systemd/bin/systemctl try-restart post-resume.target + /run/current-system/systemd/bin/systemctl try-restart --no-block post-resume.target ${cfg.resumeCommands} ${cfg.powerUpCommands} ''; From 661ee45c0c3214a184ee11f87a82dcb2ae89b13a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 00:13:35 +0000 Subject: [PATCH 02/25] icinga2: 2.13.5 -> 2.13.6 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 32d9ac270a1b..1ffbe6004b8c 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.5"; + version = "2.13.6"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-XVA3VIGmj3mXfx2eIJ5X4hfjRrnZaAHYMPRyy9+9QGc="; + sha256 = "sha256-Zrq+pw1dZyKVxpbsXeEPU3hLqcaYj/0wqB9HmYXnd0Y="; }; patches = [ From c35b5503f4da5ceeb12ba4370703e18575229f22 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Wed, 9 Nov 2022 04:00:17 +0100 Subject: [PATCH 03/25] dsview: 1.1.2 -> 1.2.1 --- .../science/electronics/dsview/default.nix | 28 ++++------------- .../science/electronics/dsview/install.patch | 30 ++++++++++++------- .../electronics/dsview/libsigrok4dsl.nix | 28 ----------------- .../dsview/libsigrokdecode4dsl.nix | 27 ----------------- .../science/electronics/dsview/qt515.patch | 13 -------- pkgs/top-level/all-packages.nix | 4 --- 6 files changed, 24 insertions(+), 106 deletions(-) delete mode 100644 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix delete mode 100644 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix delete mode 100644 pkgs/applications/science/electronics/dsview/qt515.patch diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index eb8246a584d3..c8d5fc5dde74 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,47 +1,29 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, cmake -, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl -, libsigrokdecode4dsl, python3, fetchpatch +, libzip, boost, fftw, qtbase, libusb1 +, python3, fetchpatch }: mkDerivation rec { pname = "dsview"; - version = "1.12"; + version = "1.2.1"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; + sha256 = "sha256-TE2yfzv2h77GLMkmoVGXmzs7J0l/N+n1eYxyrtnrnGU="; }; - sourceRoot = "source/DSView"; - patches = [ # Fix absolute install paths ./install.patch - - # Fix buld with Qt5.15 already merged upstream for future release - # Using local file instead of content of commit #33e3d896a47 because - # sourceRoot make it unappliable - ./qt515.patch - - # Change from upstream master that removes extern-C scopes which - # cause failures with modern glib. This can likely be removed if - # there is an upstream release >1.12 - (fetchpatch { - name = "fix-extern-c.patch"; - url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch"; - sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY="; - stripLen = 2; - extraPrefix = ""; - }) ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip python3 ]; diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch index 75c3e9628656..9fd9133e2795 100644 --- a/pkgs/applications/science/electronics/dsview/install.patch +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -1,15 +1,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1c33e1..208a184 100644 +index eb9be42..220817c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -427,8 +427,8 @@ - install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) - install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) - install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) --install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) --install(FILES DSView.desktop DESTINATION /usr/share/applications/) -+install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) -+install(FILES DSView.desktop DESTINATION share/applications/) +@@ -662,16 +662,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/app + install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) - #=============================================================================== - #= Packaging (handled by CPack) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") +- install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) +- +- if(IS_DIRECTORY /usr/lib/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +- elseif(IS_DIRECTORY /lib/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules) +- elseif(IS_DIRECTORY /etc/udev/rules.d) +- install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules) +- endif() +- ++ install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) ++ install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules) + endif() + + install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25) diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix deleted file mode 100644 index c33bfd408b92..000000000000 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, pkg-config, autoreconfHook, -glib, libzip, libserialport, check, libusb1, libftdi, -systemd, alsa-lib, dsview -}: - -stdenv.mkDerivation { - inherit (dsview) version src; - - pname = "libsigrok4dsl"; - - postUnpack = '' - export sourceRoot=$sourceRoot/libsigrok4DSL - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ - glib libzip libserialport libusb1 libftdi systemd check alsa-lib - ]; - - meta = with lib; { - description = "A fork of the sigrok library for usage with DSView"; - homepage = "https://www.dreamsourcelab.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; - }; -} diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix deleted file mode 100644 index 09eed4a67c57..000000000000 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, pkg-config, autoreconfHook, -glib, check, python3, dsview -}: - -stdenv.mkDerivation { - inherit (dsview) version src; - - pname = "libsigrokdecode4dsl"; - - postUnpack = '' - export sourceRoot=$sourceRoot/libsigrokdecode4DSL - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ - python3 glib check - ]; - - meta = with lib; { - description = "A fork of the sigrokdecode library for usage with DSView"; - homepage = "https://www.dreamsourcelab.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; - }; -} diff --git a/pkgs/applications/science/electronics/dsview/qt515.patch b/pkgs/applications/science/electronics/dsview/qt515.patch deleted file mode 100644 index 552f2062ec57..000000000000 --- a/pkgs/applications/science/electronics/dsview/qt515.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp -index 921d3db..16cdce9 100755 ---- a/pv/view/viewport.cpp -+++ b/pv/view/viewport.cpp -@@ -37,7 +37,7 @@ - - #include - #include -- -+#include - - #include - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6555457e87a9..66ba1d9a5608 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16820,10 +16820,6 @@ with pkgs; python3 = python38; }; - # special forks used for dsview - libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; - libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; - sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; cli11 = callPackage ../development/tools/misc/cli11 { }; From a705b9411cb71bc64e264662f9dad063e110c2c3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Nov 2022 19:48:46 +0300 Subject: [PATCH 04/25] =?UTF-8?q?sic:=201.2=20=E2=86=92=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/irc/sic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 705fc12510db..d5a0737403a8 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sic"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; - sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; + hash = "sha256-MEePqz68dfLrXQjLtbL+3K9IkRbnWi3XGX4+nHM9ZdI="; }; makeFlags = [ "CC:=$(CC)" ]; From 8e4f5036eea2e694efc65d758d0b820b6b0dc18f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Nov 2022 17:27:18 +0100 Subject: [PATCH 05/25] CONTRIBUTING: Reference release notes in package bumps This change improves the recommendation for good commit messages to include release notes on package bumps. Including the release notes increases the likelihood that they will be taken into consideration during review. Having them included in the review is important to be able to judge whether changes made during a version bump are sensible, sufficient or complete. The burden of retrieving the release notes for arbitrary package bumps should not rest on the relatively small group of reviewers. Signed-off-by: Martin Weinelt --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c4bea0ae252..d8540782b91b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ See the nixpkgs manual for more details on [standard meta-attributes](https://ni In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. -For package version upgrades and such a one-line commit message is usually sufficient. +Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message. ## Rebasing between branches (i.e. from master to staging) From 0dd4e5e12b0b76169e8bec8963c9e996779126e2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Nov 2022 17:15:32 +0100 Subject: [PATCH 06/25] jenkins: 2.361.3 -> 2.361.4 https://www.jenkins.io/changelog-stable//#v2.361.4 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index e73587ece3c9..2cc9e26d052e 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.361.3"; + version = "2.361.4"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-85y40J/RfHLcCWURzlDyRfwwBNECKqr2BCGlNvdAybk="; + hash = "sha256-s4/iGK+1RHsMmm+jCNerdirFpY3YmqaLc1BnrWw3wXs="; }; nativeBuildInputs = [ makeWrapper ]; From 4a599be7758b743b2ba2c87e2ac2f46b3e68e620 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 15 Nov 2022 12:21:54 -0500 Subject: [PATCH 07/25] lunatic: 0.10.1 -> 0.12.0 --- pkgs/development/interpreters/lunatic/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index c33429279779..b056b7a133b4 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,19 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.10.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MQ10WwvUdqU4w9uA4H1+VRM29HXVtLMwfGvbM6VqS90="; + sha256 = "sha256-7fxccufM5tunbutABEtsa6++OLTsS72oA219zvf+KN8="; }; - cargoSha256 = "sha256-tNYA3YruI7VENmLbd3rmZr7BkqHp1HNOfzPTkIiixqA="; - - nativeBuildInputs = [ cmake ]; + cargoSha256 = "sha256-sHSQUvHTwyqMrGmwpblqpS4HfFiWGb+70a1uloDu2wY="; buildInputs = lib.optional stdenv.isDarwin Security; From 626e0a13a32644d711b9a2899a9818b976a62199 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 31 Oct 2022 11:28:55 +0100 Subject: [PATCH 08/25] git-credential-keepassxc: init at 0.10.1 --- .../git-credential-keepassxc/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix new file mode 100644 index 000000000000..0e5ba28eebaa --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-credential-keepassxc/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, DiskArbitration +, Foundation +}: + +rustPlatform.buildRustPackage rec { + pname = "git-credential-keepassxc"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Frederick888"; + repo = "git-credential-keepassxc"; + rev = "v${version}"; + hash = "sha256-zVE3RQlh0SEV4iavz40YhR+MP31oLCvG54H8gqXwL/k="; + }; + + cargoHash = "sha256-H75SGbT//02I+umttnPM5BwtFkDVNxEYLf84oULEuEk="; + + buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + + meta = with lib; { + description = "Helper that allows Git (and shell scripts) to use KeePassXC as credential store"; + longDescription = '' + git-credential-keepassxc is a Git credential helper that allows Git + (and shell scripts) to get/store logins from/to KeePassXC. + It communicates with KeePassXC using keepassxc-protocol which is + originally designed for browser extensions. + ''; + homepage = "https://github.com/Frederick888/git-credential-keepassxc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b113c58f381c..89ff12e5d233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6995,6 +6995,10 @@ with pkgs; git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { }; + git-credential-keepassxc = callPackage ../applications/version-management/git-and-tools/git-credential-keepassxc { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; + git-crecord = callPackage ../applications/version-management/git-crecord { }; git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { }; From dc6a5f24fe9333578f7d93c9609e1898e5dfc469 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 15 Nov 2022 22:25:56 -0500 Subject: [PATCH 09/25] ruff: 0.0.121 -> 0.0.122 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index d578399b66a3..373ec511a3f3 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.121"; + version = "0.0.122"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vplpsobc3LFkgJsyXGT0jel8nT6begotEvYGQESiMFI="; + sha256 = "sha256-+CQOQcA7JLHsl6ieDpIEzUdeMBsGyP686mWaYgyweH4="; }; - cargoSha256 = "sha256-gtITHmB9Qd417yWqKcfidjUjAuVz1GNmbX0aL0Bl7jQ="; + cargoSha256 = "sha256-ZxJ7ErGdsI1dZIeUVdYBD4IF0nHHnIJGUXn+rtSBLLY="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4d68c2f0ba402642584f17c6b5fe478d32087c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 16 Nov 2022 11:20:50 +0100 Subject: [PATCH 10/25] remove dead `make-symlinks` builder Introduced in 5808ac7148850a79d9ff59e37368bdd13f187adf, never used again after b06335a835ac8b7bc40c77e0089e8e8556bac3cc. --- pkgs/build-support/make-symlinks/builder.sh | 9 --------- pkgs/build-support/make-symlinks/default.nix | 7 ------- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/build-support/make-symlinks/builder.sh delete mode 100644 pkgs/build-support/make-symlinks/default.nix diff --git a/pkgs/build-support/make-symlinks/builder.sh b/pkgs/build-support/make-symlinks/builder.sh deleted file mode 100644 index 70f1d2ca1b25..000000000000 --- a/pkgs/build-support/make-symlinks/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -mkdir $out -for file in $files -do - subdir=`dirname $file` - mkdir -p $out/$subdir - ln -s $dir/$file $out/$file -done diff --git a/pkgs/build-support/make-symlinks/default.nix b/pkgs/build-support/make-symlinks/default.nix deleted file mode 100644 index 30584aceb9f8..000000000000 --- a/pkgs/build-support/make-symlinks/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{name ? "", stdenv, dir, files}: - -stdenv.mkDerivation { - inherit dir files; - name = if name == "" then dir.name else name; - builder = ./builder.sh; -} From dcfe88be5c7e5552d26bb6468fe6ba8f81d98c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 15:51:14 +0000 Subject: [PATCH 11/25] oh-my-posh: 12.13.0 -> 12.13.3 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index aed704a161d3..bd7d3effe1e9 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.13.0"; + version = "12.13.3"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bGg0UqqplJpsJ2xOHmu6y8ixGxdDkWwZyRrgzrNBlIY="; + sha256 = "sha256-1H3BlKxTthyVXEaLISruZDFIeXEAaeZjGp597clPeLs="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; From a8d318b5728fbb038bc097688b9140874c3f60cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Wed, 16 Nov 2022 18:57:27 +0100 Subject: [PATCH 12/25] vscode-extensions.matangover.mypy: init at 0.2.2 --- .../applications/editors/vscode/extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b9142c400a87..d2ce7f1e028e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1668,6 +1668,16 @@ let }; }; + matangover.mypy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mypy"; + publisher = "matangover"; + version = "0.2.2"; + sha256 = "sha256-eaiR30HjPCpOLUKQqiQ2Oqj+XY+JNnV47bM5KD2Mouk="; + }; + meta.license = lib.licenses.mit; + }; + mattn.lisp = buildVscodeMarketplaceExtension { mktplcRef = { name = "lisp"; From 7cef955fab4c08130d36634e7e2e89bdecddad62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Wed, 16 Nov 2022 19:04:12 +0100 Subject: [PATCH 13/25] vscode-extensions.thenuprojectcontributors.vscode-nushell-lang: init at 0.7.0 --- .../applications/editors/vscode/extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d2ce7f1e028e..c08a77b6f0a2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2608,6 +2608,16 @@ let }; }; + thenuprojectcontributors.vscode-nushell-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-nushell-lang"; + publisher = "thenuprojectcontributors"; + version = "0.7.0"; + sha256 = "sha256-+AGJkFx/uzgQzuRnRBZ44xGNQ6a/QWt7SNiQgwPTZxo="; + }; + meta.license = lib.licenses.mit; + }; + tiehuis.zig = buildVscodeMarketplaceExtension { mktplcRef = { name = "zig"; From 5df86d63053f0c95d06693dcbdbe27b64131a72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Wed, 16 Nov 2022 19:11:29 +0100 Subject: [PATCH 14/25] vscode-extensions.bmalehorn.vscode-fish: init at 1.0.31 --- .../applications/editors/vscode/extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c08a77b6f0a2..3b0ba9efddfb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -537,6 +537,16 @@ let }; }; + bmalehorn.vscode-fish = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-fish"; + publisher = "bmalehorn"; + version = "1.0.31"; + sha256 = "sha256-jDWW43ozUPIzhK/qQ+a+JSNdDHrjvgosyGe8kzBX6xM="; + }; + meta.license = lib.licenses.mit; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; From 80e1bfb0347f04b14d8f0c28e4f1dad66d8b7e9c Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 6 Nov 2022 13:19:11 -0600 Subject: [PATCH 15/25] zfp: 0.5.5 -> 1.0.0, fix issues Remove examples as they have some common executable names likely to cause conflicts, there is no way to properly install them, and they are not particularly useful. Remove now-unnecessary installation hacks. Disable the long tests as they are just bigger versions of the short tests and end up being pretty slow. Build CUDA kernels for all GPUs to avoid issues at runtime. --- pkgs/tools/compression/zfp/default.nix | 30 +++++++++++--------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 0b337f613366..1b943b3e41ab 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -1,7 +1,6 @@ { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv, targetPlatform , enableCfp ? true , enableCuda ? false -, enableExamples ? true , enableFortran ? builtins.elem targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true @@ -9,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zfp"; - version = "0.5.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "zfp"; rev = version; - sha256 = "19ycflz35qsrzfcvxdyy0mgbykfghfi9y5v684jb4awjp7nf562c"; + sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ="; }; nativeBuildInputs = [ cmake ]; @@ -25,27 +24,24 @@ stdenv.mkDerivation rec { ++ lib.optional enableOpenMP llvmPackages.openmp ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]); + # compile CUDA code for all extant GPUs so the binary will work with any GPU + # and driver combination. to be ultimately solved upstream: + # https://github.com/LLNL/zfp/issues/178 + # NB: not in cmakeFlags due to https://github.com/NixOS/nixpkgs/issues/114044 + preConfigure = lib.optionalString enableCuda '' + cmakeFlagsArray+=( + "-DCMAKE_CUDA_FLAGS=-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_87,code=sm_87 -gencode=arch=compute_86,code=compute_86" + ) + ''; + cmakeFlags = [ - # More tests not enabled by default - ''-DZFP_BINARY_DIR=${placeholder "out"}'' - ''-DZFP_BUILD_TESTING_LARGE=ON'' - ] - ++ lib.optionals targetPlatform.isDarwin [ - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - ] - ++ lib.optional enableCfp "-DBUILD_CFP=ON" + ] ++ lib.optional enableCfp "-DBUILD_CFP=ON" ++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON" - ++ lib.optional enableExamples "-DBUILD_EXAMPLES=ON" ++ lib.optional enableFortran "-DBUILD_ZFORP=ON" ++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON" ++ lib.optional enablePython "-DBUILD_ZFPY=ON" ++ ([ "-DBUILD_UTILITIES=${if enableUtilities then "ON" else "OFF"}" ]); - preCheck = lib.optional targetPlatform.isDarwin '' - export DYLD_LIBRARY_PATH="$out/lib:$DYLD_LIBRARY_PATH" - ''; - doCheck = true; meta = with lib; { From 2fcfc5f3c136467d4154399cd7af500e702b5d06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 18:44:00 +0000 Subject: [PATCH 16/25] picom: 9.1 -> 10 --- pkgs/applications/window-managers/picom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index b5a524a38b49..86329782255d 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "9.1"; + version = "10"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA="; + sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg="; fetchSubmodules = true; }; From a29510ba1a8d4f347d6ebabe850626a61fade2ea Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:58:01 -0500 Subject: [PATCH 17/25] duckdb: 0.5.1 -> 0.6.0 --- pkgs/development/libraries/duckdb/default.nix | 20 ++++++-- .../libraries/duckdb/version.patch | 47 +++++++++++-------- .../python-modules/duckdb/default.nix | 14 ++++-- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 4aa3317cb242..654c58ba694d 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -17,15 +17,17 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-qzDQFS2ogQ6hqTCddHnttWF365007Labnn4BmHB219k="; + sha256 = "sha256-XCEX2VCynbMUP5xsxWq8PlHnfrBfES5c2fuu2jhM+tI="; }; + patches = [ ./version.patch ]; + postPatch = '' substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" ''; @@ -42,6 +44,7 @@ stdenv.mkDerivation rec { "-DBUILD_TPCE=ON" "-DBUILD_TPCH_EXTENSION=ON" "-DBUILD_VISUALIZER_EXTENSION=ON" + "-DBUILD_INET_EXTENSION=ON" "-DJDBC_DRIVER=${enableFeature withJdbc}" ]; @@ -56,13 +59,20 @@ stdenv.mkDerivation rec { installCheckPhase = let excludes = map (pattern: "exclude:'${pattern}'") [ - "*test_slow" - "Test file buffers for reading/writing to file" - "[test_slow]" + "[s3]" + "Test closing database during long running query" "test/common/test_cast_hugeint.test" "test/sql/copy/csv/test_csv_remote.test" "test/sql/copy/parquet/test_parquet_remote.test" "test/sql/copy/parquet/test_parquet_remote_foreign_files.test" + "test/sql/storage/compression/chimp/chimp_read.test" + "test/sql/storage/compression/chimp/chimp_read_float.test" + "test/sql/storage/compression/patas/patas_compression_ratio.test_coverage" + "test/sql/storage/compression/patas/patas_read.test" + # these are only hidden if no filters are passed in + "[!hide]" + # this test apparently never terminates + "test/sql/copy/csv/auto/test_csv_auto.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch index 1f5491eac23c..1f52fdb3b935 100644 --- a/pkgs/development/libraries/duckdb/version.patch +++ b/pkgs/development/libraries/duckdb/version.patch @@ -1,27 +1,34 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92c097228..5f51929f6 100644 +index 349af6acf7..7ffec0b4cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -157,45 +157,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") +@@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") set(SUN TRUE) endif() --execute_process( -- COMMAND git log -1 --format=%h -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE GIT_RESULT -- OUTPUT_VARIABLE GIT_COMMIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND git describe --tags --abbrev=0 -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_LAST_TAG -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND git describe --tags --long -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_ITERATION -- OUTPUT_STRIP_TRAILING_WHITESPACE) +-find_package(Git) +-if(Git_FOUND) +- if (NOT DEFINED GIT_COMMIT_HASH) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} log -1 --format=%h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE GIT_RESULT +- OUTPUT_VARIABLE GIT_COMMIT_HASH +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- endif() +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_LAST_TAG +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --tags --long +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_ITERATION +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-else() +- message("Git NOT FOUND") +-endif() - -if(GIT_RESULT EQUAL "0") - string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}") @@ -47,5 +54,5 @@ index 92c097228..5f51929f6 100644 -endif() +set(DUCKDB_VERSION "@DUCKDB_VERSION@") - option(AMALGAMATION_BUILD - "Build from the amalgamation files, rather than from the normal sources." + message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") + diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index c61dfc9f4da4..b41bc431f168 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,13 +13,19 @@ }: buildPythonPackage rec { - pname = "duckdb"; - inherit (duckdb) version src patches; + inherit (duckdb) pname version src patches; format = "setuptools"; - preConfigure = '' + # we can't use sourceRoot otherwise patches don't apply, because the patches + # apply to the C++ library + postPatch = '' cd tools/pythonpkg - substituteInPlace setup.py --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" + + # 1. let nix control build cores + # 2. unconstrain setuptools_scm version + substituteInPlace setup.py \ + --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \ + --replace "setuptools_scm<7.0.0" "setuptools_scm" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6785dae7483bfd5ef3596ddee74726fa541cb850 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 16 Nov 2022 20:07:23 +0000 Subject: [PATCH 18/25] nixos/picom: remove experimentalBackends option Removed by upstream in the recent v10 release. --- nixos/modules/services/x11/picom.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index d42cf1d7412f..56b55709e47f 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -47,6 +47,9 @@ in { since picom v6 and was subsequently removed by upstream. See https://github.com/yshui/picom/commit/bcbc410 '') + (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] '' + This option was removed by upstream since picom v10. + '') ]; options.services.picom = { @@ -58,14 +61,6 @@ in { ''; }; - experimentalBackends = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to use the unstable new reimplementation of the backends. - ''; - }; - fade = mkOption { type = types.bool; default = false; @@ -306,8 +301,7 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}" - + (optionalString cfg.experimentalBackends " --experimental-backends"); + ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; RestartSec = 3; Restart = "always"; }; From eb8b2d71428eb6ad5c7b9a56fe28b01ce434894c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 16 Nov 2022 20:12:28 +0000 Subject: [PATCH 19/25] nixos/docs: document picom module changes --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 100ce3b1a2f2..1c5af094f446 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1464,6 +1464,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ are under programs.firefox. + + + The option + services.picom.experimentalBackends was + removed since it is now the default and the option will cause + picom to quit instead. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a69c35acf45e..0fdd9277a8c5 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -447,4 +447,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - A NixOS module for Firefox has been added which allows preferences and [policies](https://github.com/mozilla/policy-templates/blob/master/README.md) to be set. This also allows extensions to be installed via the `ExtensionSettings` policy. The new options are under `programs.firefox`. +- The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead. + From bd9a5606b4773948e699b6fe98622dfe69a2a7b1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Nov 2022 21:42:43 +0000 Subject: [PATCH 20/25] linux: 5.10.154 -> 5.10.155 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index a5b3ac3cfb9b..4e55c5c7dbe3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.154"; + version = "5.10.155"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6"; + sha256 = "1wyla96qsdf50n7qjj4hdf36bj56whv7gc9mgw9bvrsqdi92gc7i"; }; } // (args.argsOverride or {})) From 63adc7fafe7dfbfdc96754ebe65bdb6cf3a65ec8 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Nov 2022 21:42:49 +0000 Subject: [PATCH 21/25] linux: 5.15.78 -> 5.15.79 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index d2f2a87e61a8..a602ac51d91d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.78"; + version = "5.15.79"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d"; + sha256 = "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb"; }; } // (args.argsOverride or { })) From 4dabd9c39b217ed2798ca9780ce27afd5bf738e3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Nov 2022 21:42:54 +0000 Subject: [PATCH 22/25] linux: 6.0.8 -> 6.0.9 --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index f2b7806ca300..709c0599dc07 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.8"; + version = "6.0.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0mx2bxgnxm3vz688268939xw90jqci7xn992kfpny74mjqwzir0d"; + sha256 = "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531"; }; } // (args.argsOverride or { })) From 684ffc109ebf4f611cc2b91a37a39541eff4c166 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Nov 2022 12:37:22 +1000 Subject: [PATCH 23/25] cri-o: refactor wrapper --- pkgs/applications/virtualization/cri-o/wrapper.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index a984db037d46..b220c8e29cbf 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -3,7 +3,6 @@ , makeWrapper , lib , extraPackages ? [] -, cri-o , runc # Default container runtime , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor @@ -12,8 +11,6 @@ }: let - cri-o = cri-o-unwrapped; - binPath = lib.makeBinPath ([ runc crun @@ -22,13 +19,13 @@ let iptables ] ++ extraPackages); -in runCommand cri-o.name { - name = "${cri-o.pname}-wrapper-${cri-o.version}"; - inherit (cri-o) pname version passthru; +in runCommand cri-o-unwrapped.name { + name = "${cri-o-unwrapped.pname}-wrapper-${cri-o-unwrapped.version}"; + inherit (cri-o-unwrapped) pname version passthru; preferLocalBuild = true; - meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + meta = builtins.removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" @@ -40,7 +37,7 @@ in runCommand cri-o.name { ]; } '' - ln -s ${cri-o.man} $man + ln -s ${cri-o-unwrapped.man} $man mkdir -p $out/bin ln -s ${cri-o-unwrapped}/share $out/share From a0c079f6521934632ec023a9f1a72855c452ea19 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Nov 2022 12:37:23 +1000 Subject: [PATCH 24/25] podman: refactor wrapper --- .../virtualization/podman/wrapper.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index b0b3c4abd916..d0131eacdd37 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -5,7 +5,6 @@ , lib , stdenv , extraPackages ? [] -, podman # Docker compat , runc # Default container runtime , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor @@ -23,8 +22,6 @@ # adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests let - podman = podman-unwrapped; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ runc @@ -38,24 +35,24 @@ let ] ++ extraPackages); helpersBin = symlinkJoin { - name = "${podman.pname}-helper-binary-wrapper-${podman.version}"; + name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}"; # this only works for some binaries, others may need to be be added to `binPath` or in the modules paths = [ gvproxy ] ++ lib.optionals stdenv.isLinux [ catatonit # added here for the pause image and also set in `containersConf` for `init_path` - podman.rootlessport + podman-unwrapped.rootlessport ]; }; -in runCommand podman.name { - name = "${podman.pname}-wrapper-${podman.version}"; - inherit (podman) pname version passthru; +in runCommand podman-unwrapped.name { + name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}"; + inherit (podman-unwrapped) pname version passthru; preferLocalBuild = true; - meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; + meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" @@ -67,7 +64,7 @@ in runCommand podman.name { ]; } '' - ln -s ${podman.man} $man + ln -s ${podman-unwrapped.man} $man mkdir -p $out/bin ln -s ${podman-unwrapped}/etc $out/etc From 1d6f6c0ec656835191a2970b360fb3558c522f76 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Nov 2022 12:37:23 +1000 Subject: [PATCH 25/25] buildah: refactor wrapper - also move `preferLocalBuild` out of let..in --- pkgs/development/tools/buildah/wrapper.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 858a422a3405..aa14a01b8644 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -4,7 +4,6 @@ , lib , stdenv , extraPackages ? [] -, buildah , runc # Default container runtime , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor @@ -15,10 +14,6 @@ }: let - buildah = buildah-unwrapped; - - preferLocalBuild = true; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ runc @@ -30,11 +25,13 @@ let iptables ] ++ extraPackages); -in runCommand buildah.name { - name = "${buildah.pname}-wrapper-${buildah.version}"; - inherit (buildah) pname version; +in runCommand buildah-unwrapped.name { + name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; + inherit (buildah-unwrapped) pname version; - meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ]; + preferLocalBuild = true; + + meta = builtins.removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" @@ -46,7 +43,7 @@ in runCommand buildah.name { ]; } '' - ln -s ${buildah.man} $man + ln -s ${buildah-unwrapped.man} $man mkdir -p $out/bin ln -s ${buildah-unwrapped}/share $out/share