From c6ce4bc05172e47b36b5c4a4e410834f9c91b904 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 13:03:17 +0000 Subject: [PATCH 01/20] plexRaw: 1.32.6.7557-1cf77d501 -> 1.32.7.7621-871adbd44 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6ef9287004fd..93cd01950d6b 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.6.7557-1cf77d501"; + version = "1.32.7.7621-871adbd44"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0ym2s425084l5lzpw9j1aqw2nc6f4l5vzizvpj1gicf4yp2dyk91"; + sha256 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1jqgglyzlfzq5saa21338vn2v3x25vl24x1w17j5wq30ca7nmzdr"; + sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf"; }; outputs = [ "out" "basedb" ]; From ed55f94d309897fb163f7c329d64e88893babfe6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 9 Nov 2023 13:06:34 +0800 Subject: [PATCH 02/20] webrtc-audio-processing_1: fix build on Darwin --- .../libraries/webrtc-audio-processing/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 2c1e15bfbef3..b0f9ce53e72e 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitLab +{ lib +, stdenv +, fetchFromGitLab , darwin , abseil-cpp , meson @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; From d5deee3aa2df0c874c602acae18909d005cb8730 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 9 Nov 2023 10:47:38 +0100 Subject: [PATCH 03/20] eigenpy: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 24abaebf7bb5..316c88a3267c 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-mUwckBelFVRCXp3hspB8WRFFaLVyRsfp6XbqU8HeHvw="; + hash = "sha256-U2EXh6Foz/TH+vSrimrn2hDPTA++GLFLM7vnMXdq+rc="; }; strictDeps = true; From 600db6a868011b2bdad30a80e09e564843d343e7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 9 Nov 2023 13:23:26 +0100 Subject: [PATCH 04/20] eigenpy: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 316c88a3267c..354f7b01af4e 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-U2EXh6Foz/TH+vSrimrn2hDPTA++GLFLM7vnMXdq+rc="; + hash = "sha256-8UuJA96pkXXRKDzQTjoz7w8TQrS5+nfLdsT0j9/oqz0="; }; strictDeps = true; From 795db47a188c5794b4b9192e66623dbb8a767579 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:33:52 +0100 Subject: [PATCH 05/20] dnf5: 5.1.6 -> 5.1.7 --- pkgs/tools/package-management/dnf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 7f0160c2081c..1810ea201543 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-yIv29mwCBk2H1HjJr2IYm/1eZU379jTNEuTuaoIu4TA="; + hash = "sha256-SXgl4YFWl1A3N2/IkDftvBl6Rwhnymxe8AqqaekGHTc="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; From e60844a8135f644da05e551392943dcc8fd0e596 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:36:17 +0100 Subject: [PATCH 06/20] dnf5: add katexochen as maintainer --- pkgs/tools/package-management/dnf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 1810ea201543..97c9ba29b6a7 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rpm-software-management/dnf5"; changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with lib.maintainers; [ malt3 ]; + maintainers = with lib.maintainers; [ malt3 katexochen ]; mainProgram = "dnf5"; platforms = platforms.linux ++ platforms.darwin; }; From d335849f83b876b64ac55c99138480b63ddfac15 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Nov 2023 19:00:13 +0100 Subject: [PATCH 07/20] apfelgrid: Switch homepage to https --- pkgs/development/libraries/physics/apfelgrid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 33ca03267270..92b6ae003fca 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = "http://nhartland.github.io/APFELgrid/"; + homepage = "https://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; From fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 9 Nov 2023 19:00:28 +0100 Subject: [PATCH 08/20] root5: Fix build with Python 3.11 Was broken since the Python update from https://github.com/NixOS/nixpkgs/pull/251878 This should fix the apfelgrid and applgrid builds, not tested yet --- pkgs/applications/science/misc/root/5.nix | 3 +++ .../science/misc/root/root5-python311-fix.patch | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/science/misc/root/root5-python311-fix.patch diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 4a8411cd34f9..2d830e3d1016 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; }) + # Backport Python 3.11 fix to v5 from v6.26 + # https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc + ./root5-python311-fix.patch ]; # https://github.com/root-project/root/issues/13216 diff --git a/pkgs/applications/science/misc/root/root5-python311-fix.patch b/pkgs/applications/science/misc/root/root5-python311-fix.patch new file mode 100644 index 000000000000..3005b3a73f9b --- /dev/null +++ b/pkgs/applications/science/misc/root/root5-python311-fix.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/pyroot/src/MethodProxy.cxx b/bindings/pyroot/src/MethodProxy.cxx +--- a/bindings/pyroot/src/MethodProxy.cxx ++++ b/bindings/pyroot/src/MethodProxy.cxx +@@ -4,10 +4,10 @@ + // Bindings + #include "PyROOT.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 +-#include "code.h" // from Python +-#else ++#if PY_VERSION_HEX < 0x02050000 + #include "compile.h" // from Python ++#elif PY_VERSION_HEX < 0x030b0000 ++#include "code.h" // from Python + #endif + #ifndef CO_NOFREE + // python2.2 does not have CO_NOFREE defined From 6bc590d724e3d8b8b5c86d7661c78e2c217a27c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 18:40:01 +0000 Subject: [PATCH 09/20] python311Packages.timetagger: 23.9.2 -> 23.11.2 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index e41158d8c167..04c14fe5f068 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.9.2"; + version = "23.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pg4lKRsgi4SZrKYnVmMfU5hzJriRqVa3InYW9emFLy8="; + hash = "sha256-PPB/BTZLuHmbKmUIe5gZMAwV+TUDqXBYg6fKsokTotg="; }; propagatedBuildInputs = [ From b43bffdd5dc0018672ce7137dc5244d69d24a8db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 19:56:20 +0000 Subject: [PATCH 10/20] qpwgraph: 0.5.3 -> 0.6.0 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 645ba0e16862..44a285c7b65a 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; + sha256 = "sha256-wJ+vUw16yBBFjMdJogF1nkLnAh3o2ndN9+0png8ZVJ4="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From 66d8916ae87d806947d3c0e043733769644d1469 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 9 Nov 2023 21:07:09 +0100 Subject: [PATCH 11/20] oauth2l: init at 1.3.0 --- pkgs/by-name/oa/oauth2l/package.nix | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/oa/oauth2l/package.nix diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix new file mode 100644 index 000000000000..612575d2b266 --- /dev/null +++ b/pkgs/by-name/oa/oauth2l/package.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "oauth2l"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "oauth2l"; + rev = "v${version}"; + hash = "sha256-bL1bys/CBo/P9VfWc/FB8JHW/aBwC521V8DB1sFBIAA="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = "export HOME=$(mktemp -d)"; + + # tests fail on linux for some reason + doCheck = stdenv.isDarwin; + + meta = with lib; { + description = "Simple CLI for interacting with Google API authentication"; + homepage = "https://github.com/google/oauth2l"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "oauth2l"; + }; +} From fb2a8bdf99042dd200b4bd0d930c8cca0d28f08c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 23 Oct 2023 15:38:36 +0200 Subject: [PATCH 12/20] tomb: format with nixpkgs-fmt --- pkgs/os-specific/linux/tomb/default.nix | 30 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index af04476aa1d0..5043d9e06551 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,5 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, gettext +, zsh +, pinentry +, cryptsetup +, gnupg +, util-linux +, e2fsprogs +, sudo }: stdenv.mkDerivation rec { @@ -7,9 +17,9 @@ stdenv.mkDerivation rec { version = "2.9"; src = fetchFromGitHub { - owner = "dyne"; - repo = "Tomb"; - rev = "v${version}"; + owner = "dyne"; + repo = "Tomb"; + rev = "v${version}"; sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; }; @@ -27,18 +37,18 @@ stdenv.mkDerivation rec { installCheckPhase = "$out/bin/tomb -h"; installPhase = '' - install -Dm755 tomb $out/bin/tomb + install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs gettext gnupg pinentry util-linux ]} ''; meta = with lib; { description = "File encryption on GNU/Linux"; - homepage = "https://www.dyne.org/software/tomb/"; - license = licenses.gpl3; + homepage = "https://www.dyne.org/software/tomb/"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 9481b1fe8f013a8639697ef4ccbef0309d7cf916 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 23 Oct 2023 15:39:36 +0200 Subject: [PATCH 13/20] tomb: 2.9 -> 2.10 https://github.com/dyne/Tomb/blob/master/ChangeLog.md#210 https://github.com/dyne/Tomb/compare/v2.9...v2.10 --- pkgs/os-specific/linux/tomb/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 5043d9e06551..485f4288cfaa 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,29 +1,34 @@ { stdenv , lib , fetchFromGitHub +, substituteAll , makeWrapper +, getent , gettext , zsh , pinentry , cryptsetup , gnupg +, libargon2 +, lsof , util-linux , e2fsprogs -, sudo +, testers +, nix-update-script }: stdenv.mkDerivation rec { pname = "tomb"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; - rev = "v${version}"; - sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; + rev = "refs/tags/v${version}"; + hash = "sha256-lLxQJX0P6b6lbXEcrq45EsX9iKiayZ9XkhqgMfpN3/w="; }; - buildInputs = [ sudo zsh pinentry ]; + buildInputs = [ zsh pinentry ]; nativeBuildInputs = [ makeWrapper ]; @@ -33,20 +38,18 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - doInstallCheck = true; - installCheckPhase = "$out/bin/tomb -h"; - installPhase = '' install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs gettext gnupg pinentry util-linux ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} ''; meta = with lib; { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; + changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; From 7f18b54727837b6af22cb7d806980f89f57b1155 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 18 Oct 2023 02:55:08 +0200 Subject: [PATCH 14/20] tomb: add passthru.updateScript --- pkgs/os-specific/linux/tomb/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 485f4288cfaa..f501b2ba5a31 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -13,7 +13,6 @@ , lsof , util-linux , e2fsprogs -, testers , nix-update-script }: @@ -46,11 +45,16 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; + mainProgram = "tomb"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; From 42ad64f5d1eefc7e8aeb664dbcb8833377f7870a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 18 Oct 2023 02:56:12 +0200 Subject: [PATCH 15/20] tomb: add anthonyroussel to maintainers --- pkgs/os-specific/linux/tomb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index f501b2ba5a31..5fff28c3f276 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; license = licenses.gpl3; mainProgram = "tomb"; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg anthonyroussel ]; platforms = platforms.linux; }; } From 99c8b3b70a3d0989dfcd7dcf31e6b344af4f7085 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 27 Oct 2023 21:15:01 +0200 Subject: [PATCH 16/20] tomb: add all required dependencies with wrapProgram --- pkgs/os-specific/linux/tomb/default.nix | 28 ++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 5fff28c3f276..4fad6e7547ea 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -3,16 +3,20 @@ , fetchFromGitHub , substituteAll , makeWrapper +, zsh +, coreutils +, cryptsetup +, e2fsprogs +, file +, gawk , getent , gettext -, zsh -, pinentry -, cryptsetup +, gnugrep , gnupg , libargon2 , lsof +, pinentry , util-linux -, e2fsprogs , nix-update-script }: @@ -42,7 +46,21 @@ stdenv.mkDerivation rec { install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup e2fsprogs getent gettext gnupg libargon2 lsof pinentry util-linux ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils + cryptsetup + e2fsprogs + file + gawk + getent + gettext + gnugrep + gnupg + libargon2 + lsof + pinentry + util-linux + ]} ''; passthru = { From db4c847f869761e50042264d86230fbb1b000d58 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 10 Nov 2023 00:06:46 +0100 Subject: [PATCH 17/20] tomb: fix meta.license --- pkgs/os-specific/linux/tomb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 4fad6e7547ea..9c97377cfe04 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "File encryption on GNU/Linux"; homepage = "https://www.dyne.org/software/tomb/"; changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; - license = licenses.gpl3; + license = licenses.gpl3Only; mainProgram = "tomb"; maintainers = with maintainers; [ peterhoeg anthonyroussel ]; platforms = platforms.linux; From b0206f9bf9c61bad5050ae22702c3ceed9f781d0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 10 Nov 2023 03:30:39 +0100 Subject: [PATCH 18/20] nixos/sudo: enable by default The default was accidentally changed to false in #262790 --- nixos/modules/security/sudo.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 4e4f186758e9..ff912dec5073 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -41,9 +41,15 @@ in ''; }; - enable = mkEnableOption (mdDoc '' - the {command}`sudo` command, which allows non-root users to execute commands as root. - ''); + enable = mkOption { + type = types.bool; + default = true; + description = + lib.mdDoc '' + Whether to enable the {command}`sudo` command, which + allows non-root users to execute commands as root. + ''; + }; package = mkPackageOption pkgs "sudo" { }; From 6d475b6d95d1b4bd402b97a0087b1734ea65781f Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 10 Nov 2023 03:32:26 +0100 Subject: [PATCH 19/20] nixos/tests/sudo: check that sudo is enabled by default --- nixos/tests/sudo.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 1b177391488d..1fe478f0bff1 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -21,7 +21,8 @@ in }; security.sudo = { - enable = true; + # Explicitly _not_ defining 'enable = true;' here, to check that sudo is enabled by default + wheelNeedsPassword = false; extraConfig = '' From f3565a2c088883636f198550eac349ed82c6a2b3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 9 Nov 2023 21:04:55 +0100 Subject: [PATCH 20/20] rustus: 0.7.4 -> 0.7.6 https://github.com/s3rius/rustus/releases/tag/0.7.6 --- pkgs/servers/networking/rustus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/servers/networking/rustus/default.nix index b399c3b84177..651ed424fc5f 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/servers/networking/rustus/default.nix @@ -10,7 +10,7 @@ let pname = "rustus"; - version = "0.7.4"; + version = "0.7.6"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "s3rius"; repo = pname; rev = version; - hash = "sha256-RmtkGemFGqvDYd+om/2o4Ki3NWKjJ4/cJ0z40J+L+SY="; + hash = "sha256-osxdqwNUONCScFarpQV48C7CR1DVR/mCttaglqiAKPo="; }; - cargoHash = "sha256-Ayki+hJTyaITOZhiyY8X6d5tR3+CLHZe94zJ9d/Kn4I="; + cargoHash = "sha256-M0mJ+9VznzHDmdKAsT3YamyG/P0JF8oPeVHaX44NWM4="; env.OPENSSL_NO_VENDOR = 1;