From e691cae38e954f8d90ae63f732f18fb3f387f81d Mon Sep 17 00:00:00 2001 From: laalsaas Date: Mon, 31 Oct 2022 17:07:15 +0100 Subject: [PATCH 01/63] gitignore: add emacs "swap files" --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e2df971a5289..b1018d44b833 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ ,* .*.swp .*.swo +.\#* +\#*\# .idea/ .vscode/ outputs/ From 19f7b566a1e94513a44f009e4d16cfcb76002d86 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Sat, 12 Nov 2022 14:14:21 +0100 Subject: [PATCH 02/63] streamdeck-ui: add option to select the package --- nixos/modules/programs/streamdeck-ui.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/streamdeck-ui.nix b/nixos/modules/programs/streamdeck-ui.nix index e933b899c55e..113d1d49e151 100644 --- a/nixos/modules/programs/streamdeck-ui.nix +++ b/nixos/modules/programs/streamdeck-ui.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.programs.streamdeck-ui; -in { +in +{ options.programs.streamdeck-ui = { enable = mkEnableOption (lib.mdDoc "streamdeck-ui"); @@ -13,15 +14,20 @@ in { type = types.bool; description = lib.mdDoc "Whether streamdeck-ui should be started automatically."; }; + + package = mkPackageOption pkgs "streamdeck-ui" { + default = [ "streamdeck-ui" ]; + }; + }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - streamdeck-ui - (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = streamdeck-ui; })) + cfg.package + (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = cfg.package; })) ]; - services.udev.packages = with pkgs; [ streamdeck-ui ]; + services.udev.packages = [ cfg.package ]; }; meta.maintainers = with maintainers; [ majiir ]; From 41d11e36244bbd39027095601aaed1e372c4f75c Mon Sep 17 00:00:00 2001 From: Subhrajyoti Sen Date: Wed, 16 Nov 2022 22:41:12 +0000 Subject: [PATCH 03/63] maestro: 1.11.3 -> 1.15.0 --- pkgs/development/mobile/maestro/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 1c3e6f1a8f3c..5f3764652192 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.11.3"; + version = "1.15.0"; src = fetchurl { - url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro-${version}.zip"; - sha256 = "0hjsrwp6d1k68p0qhn7v9689ihy06ssnfpi8dj61jw6r64c234m4"; + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; + sha256 = "1rv9481pffd27ksqdm6z809sa1c5cslxvq53bw04iqgwvhdjzm2m"; }; dontUnpack = true; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out unzip $src -d $out - mv $out/maestro-$version/* $out - rm -rf $out/maestro-$version + mv $out/maestro/* $out + rm -rf $out/maestro ''; postFixup = '' From 685837d634ce9d1c1be20c8c644fb5654cf9f325 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 4 Dec 2022 03:26:05 +0300 Subject: [PATCH 04/63] =?UTF-8?q?guile-gcrypt:=200.3.0=20=E2=86=92=200.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/guile-modules/guile-gcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 7c7e11e3d2b1..6b1af4048a7c 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "guile-gcrypt"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitea { domain = "notabug.org"; owner = "cwebber"; repo = "guile-gcrypt"; rev = "v${version}"; - sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; + hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; }; nativeBuildInputs = [ From 0111e9547e857021a3cdab7ac5ba85707cccd654 Mon Sep 17 00:00:00 2001 From: Jacob Greenleaf Date: Thu, 27 Oct 2022 19:57:28 -0700 Subject: [PATCH 05/63] nixos/borgbackup: Add option for inhibiting sleep Adds a new option for backup jobs `inhibitsSleep` which prevents the system from going to sleep while a backup is in progress. Uses `systemd-inhibit`, which holds a "lock" that prevents the system from sleeping while the process it invokes is running. This did require wrapping the existing backup script using `writeShellScript` so that it could be run by `systemd-inhibit`. --- .../from_md/release-notes/rl-2305.section.xml | 8 ++++++ .../manual/release-notes/rl-2305.section.md | 2 ++ nixos/modules/services/backup/borgbackup.nix | 25 ++++++++++++++++--- nixos/tests/borgbackup.nix | 20 +++++++++++++++ 4 files changed, 51 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 757a719bfefd..a7ae088d0303 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -44,6 +44,14 @@ instead. + + + borgbackup module now has an option for + inhibiting system sleep while backups are running, defaulting + to off (not inhibiting sleep), available as + services.borgbackup.jobs.<name>.inhibitsSleep. + + The EC2 image module no longer fetches instance metadata in diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 1b105fdd1f3f..34220141cca1 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -22,6 +22,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead. +- `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). + - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 7b29eb41e72a..1d582c7da1c1 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -19,7 +19,8 @@ let concatStringsSep " " (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); - mkBackupScript = cfg: '' + mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" ('' + set -e on_exit() { exitStatus=$? @@ -61,7 +62,7 @@ let ${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"} $extraPruneArgs ${cfg.postPrune} - ''; + ''); mkPassEnv = cfg: with cfg.encryption; if passCommand != null then @@ -73,12 +74,19 @@ let mkBackupService = name: cfg: let userHome = config.users.users.${cfg.user}.home; - in nameValuePair "borgbackup-job-${name}" { + backupJobName = "borgbackup-job-${name}"; + backupScript = mkBackupScript backupJobName cfg; + in nameValuePair backupJobName { description = "BorgBackup job ${name}"; path = with pkgs; [ borgbackup openssh ]; - script = mkBackupScript cfg; + script = "exec " + optionalString cfg.inhibitsSleep ''\ + ${pkgs.systemd}/bin/systemd-inhibit \ + --who="borgbackup" \ + --what="sleep" \ + --why="Scheduled backup" \ + '' + backupScript; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -341,6 +349,15 @@ in { ''; }; + inhibitsSleep = mkOption { + default = false; + type = types.bool; + example = true; + description = lib.mdDoc '' + Prevents the system from sleeping while backing up. + ''; + }; + user = mkOption { type = types.str; description = lib.mdDoc '' diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index d3cd6c66bfeb..9afe4d537da4 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -99,6 +99,18 @@ in { environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; }; + sleepInhibited = { + inhibitsSleep = true; + # Blocks indefinitely while "backing up" so that we can try to suspend the local system while it's hung + dumpCommand = pkgs.writeScript "sleepInhibited" '' + cat /dev/zero + ''; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; + }; + }; }; @@ -204,5 +216,13 @@ in { client.wait_for_unit("network.target") client.systemctl("start --wait borgbackup-job-commandFail") client.succeed("systemctl is-failed borgbackup-job-commandFail") + + with subtest("sleepInhibited"): + server.wait_for_unit("sshd.service") + client.wait_for_unit("network.target") + client.fail("systemd-inhibit --list | grep -q borgbackup") + client.systemctl("start borgbackup-job-sleepInhibited") + client.wait_until_succeeds("systemd-inhibit --list | grep -q borgbackup") + client.systemctl("stop borgbackup-job-sleepInhibited") ''; }) From 3cf9d223857fd3195b60a9ebb8a1152bebb413bb Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Thu, 8 Dec 2022 21:05:00 -0800 Subject: [PATCH 06/63] unpoller: 2.3.1 -> 2.4.0 --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index aa217ece8778..69cce6c18e28 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-0IknWsJ7fWJuvXeiMZscWEv8p90KZQaQC4Q0KV98Z88="; + hash = "sha256-uTdxZCE0zlYhmHm0p13DF9pXtpkx/y8fPE4F9k+TXkI="; }; - vendorHash = "sha256-l2V41Rf8KDoh/fC9NcuGF4ISwCLwpbVuzQZiqiGNbuc="; + vendorHash = "sha256-GUzMu3ltdmFCKKWi9Hlr39rNe5uPnZpwQfhVAHtbeiw="; ldflags = [ "-w" "-s" From 7896543799efb5b8b3fd64cfe79ffa998bbc81b4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 9 Dec 2022 22:36:07 +0100 Subject: [PATCH 07/63] exiftool: 12.51 -> 12.52 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9879db71650..9b55cc37dda7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12507,11 +12507,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.51"; + version = "12.52"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-76meNQp9c0Z+81gNSMnDTtJmd/qOGu4uqeHsGhTnDkQ="; + hash = "sha256-yH8RlkTRAanHYNyq5Vi52W8mGKIJwmGZsWhzyokz+ao="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; From 136b81be7d7090c615d28900d08dbab0a935035e Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Fri, 9 Dec 2022 21:37:12 -0800 Subject: [PATCH 08/63] nixos/tests/prometheuts-exporters.unpoller: fix test script Unpoller behaviour changed and now it'll not server metrics if no controller available, so, let's check for not available controller message instead. --- nixos/tests/prometheus-exporters.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 8b40d7e41c00..1815ac6c6a9f 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1244,10 +1244,8 @@ let exporterConfig.enable = true; exporterConfig.controllers = [{ }]; exporterTest = '' - wait_for_unit("prometheus-unpoller-exporter.service") - wait_for_open_port(9130) - succeed( - "curl -sSf localhost:9130/metrics | grep 'unpoller_build_info{.\\+} 1'" + wait_until_succeeds( + 'journalctl -eu prometheus-unpoller-exporter.service -o cat | grep "Connection Error"' ) ''; }; From c1188a559b143950fd1dc55b22820fffc3013b1d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 9 Dec 2022 18:44:04 +0100 Subject: [PATCH 09/63] common-updater-scripts: list-directory-versions: scan for absolute urls too --- pkgs/common-updater/scripts/list-directory-versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/common-updater/scripts/list-directory-versions index 46c9e9d30a5d..cf2f0adbd43e 100755 --- a/pkgs/common-updater/scripts/list-directory-versions +++ b/pkgs/common-updater/scripts/list-directory-versions @@ -59,7 +59,7 @@ if __name__ == "__main__": link_url = link.get("href", None) if link_url is not None: match = re.fullmatch( - rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url + rf"(.*/)?{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url ) if match: - print(match.group(1)) + print(match.group(2)) From 19e4b53b090c7aa150af40232b2c75c80d53a017 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 10 Dec 2022 15:19:50 +0100 Subject: [PATCH 10/63] common-updater-scripts,directoryListingUpdater: add extraRegex parameter --- pkgs/common-updater/directory-listing-updater.nix | 3 ++- pkgs/common-updater/scripts/list-directory-versions | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/directory-listing-updater.nix b/pkgs/common-updater/directory-listing-updater.nix index fb7491ab879a..bd0b5b1df30d 100644 --- a/pkgs/common-updater/directory-listing-updater.nix +++ b/pkgs/common-updater/directory-listing-updater.nix @@ -11,9 +11,10 @@ , odd-unstable ? false , patchlevel-unstable ? false , url ? null +, extraRegex ? null }: genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; + versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"} ${lib.optionalString (extraRegex != null) "--extra-regex=${lib.escapeShellArg extraRegex}"}"; } diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/common-updater/scripts/list-directory-versions index cf2f0adbd43e..c713578beefb 100755 --- a/pkgs/common-updater/scripts/list-directory-versions +++ b/pkgs/common-updater/scripts/list-directory-versions @@ -26,6 +26,8 @@ parser.add_argument( parser.add_argument("--url", help="url of the page that lists the package versions") parser.add_argument("--file", help="file name for writing debugging information") +parser.add_argument("--extra-regex", help="additional regex to filter versions with") + if __name__ == "__main__": args = parser.parse_args() @@ -62,4 +64,6 @@ if __name__ == "__main__": rf"(.*/)?{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url ) if match: - print(match.group(2)) + version = match.group(2) + if (not args.extra_regex) or re.fullmatch(args.extra_regex, version): + print(version) From 400ec42904919bfcd19fe86d8f27f99044ec85d1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 9 Dec 2022 18:44:54 +0100 Subject: [PATCH 11/63] lbreakouthd: add updateScript --- pkgs/games/lgames/lbreakouthd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index bfe8eecc95b8..e83e5da6c702 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -5,6 +5,7 @@ , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater }: stdenv.mkDerivation rec { @@ -25,6 +26,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LBreakoutHD/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { broken = stdenv.isDarwin; homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; From 082d60f9fcd78172c4e4032877af10ce3fccfa9c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 9 Dec 2022 18:52:35 +0100 Subject: [PATCH 12/63] ltris: add updateScript --- pkgs/games/lgames/ltris/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index 618e86561f03..d0aaebcded12 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, SDL, SDL_mixer }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_mixer +, directoryListingUpdater +}: stdenv.mkDerivation rec { pname = "ltris"; @@ -16,6 +22,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LTris/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; From 848ec40f5ccf090e26d32f591d9ec0218c1ead09 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 9 Dec 2022 18:54:54 +0100 Subject: [PATCH 13/63] lpairs2: add updateScript --- pkgs/games/lgames/lpairs2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix index 394b690b63dd..977c640d863b 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -5,6 +5,7 @@ , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater }: stdenv.mkDerivation rec { @@ -23,6 +24,12 @@ stdenv.mkDerivation rec { SDL2_ttf ]; + passthru.updateScript = directoryListingUpdater { + inherit pname version; + url = "https://lgames.sourceforge.io/LPairs/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + meta = with lib; { broken = stdenv.isDarwin; homepage = "http://lgames.sourceforge.net/LPairs/"; From 096991f29fcb644903731b629ada89e0d1e35591 Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Mon, 12 Dec 2022 13:17:17 -0800 Subject: [PATCH 14/63] unpoller: 2.4.0 -> 2.4.1 --- pkgs/servers/monitoring/unpoller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 69cce6c18e28..a49fef47f549 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "unpoller"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-uTdxZCE0zlYhmHm0p13DF9pXtpkx/y8fPE4F9k+TXkI="; + hash = "sha256-t4f7iAIOg19n1aKG0tQy/GHNXdVAEnaRyTXMZY+1IUw="; }; vendorHash = "sha256-GUzMu3ltdmFCKKWi9Hlr39rNe5uPnZpwQfhVAHtbeiw="; From 20206a44e1b4acd2e658fbb868122596c7ac1f0f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Dec 2022 22:47:22 +0100 Subject: [PATCH 15/63] ltris: 1.2.5 -> 1.2.6 --- pkgs/games/lgames/ltris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index d0aaebcded12..30fbbdf4d78e 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-Ksb5TdQMTEzaJfjHVhgq27dSFvZxUnNUQ6OpAU+xwzM="; + hash = "sha256-wjziFFTAOJxSl6fvLhTv6ATZQGJefusDhqKXgOwsRvY="; }; buildInputs = [ From f19799deb98372856a9473a2859db82d86ca2061 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Dec 2022 22:47:50 +0100 Subject: [PATCH 16/63] lbreakouthd: 1.0.10 -> 1.1 --- pkgs/games/lgames/lbreakouthd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index e83e5da6c702..65280e3c9ae6 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "lbreakouthd"; - version = "1.0.10"; + version = "1.1"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-hlGhPa91u6pOaZoFJSDcXYQdizTFjuuTLnx9fcrXUhA="; + hash = "sha256-5hjS0aJ5f8Oe0aSuVgcV10h5OmWsaMHF5B9wYVFrlDY="; }; buildInputs = [ From cc74858a5aa674aa0a36fef2575447cb0cab1009 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Dec 2022 22:48:51 +0100 Subject: [PATCH 17/63] impy: 0.1 -> 0.2 --- pkgs/development/libraries/impy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index 1f5d9070dd37..6d148dd14639 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -1,27 +1,28 @@ { lib, stdenv , fetchFromGitHub -, cmake +, meson +, ninja , pkg-config , libpng , zlib , giflib , libjpeg -, SDL2 }: stdenv.mkDerivation rec { pname = "impy"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "bcampbell"; repo = "impy"; rev = "v${version}"; - sha256 = "1h45xjms56radhknspyx17a12dpnm7xgqm1x1chy42aw5ic8b5qf"; + sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; }; nativeBuildInputs = [ - cmake + meson + ninja pkg-config ]; @@ -30,7 +31,6 @@ stdenv.mkDerivation rec { zlib giflib libjpeg - SDL2 ]; meta = with lib; { From 77b73327e345cef628685852bb66084185c0a4ac Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:26:17 +0800 Subject: [PATCH 18/63] spice-gtk: fix cross compilation --- pkgs/development/libraries/spice-gtk/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index cb5065144c37..4ea33774cf2d 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -23,6 +23,7 @@ , libusb1 , lz4 , meson +, mesonEmulatorHook , ninja , openssl , perl @@ -36,6 +37,7 @@ , usbredir , vala , wayland-protocols +, wayland-scanner , zlib , withPolkit ? stdenv.isLinux }: @@ -82,6 +84,10 @@ stdenv.mkDerivation rec { "# meson.add_install_script('../build-aux/setcap-or-suid'," ''; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ docbook_xsl gettext @@ -94,7 +100,10 @@ stdenv.mkDerivation rec { python3 python3.pkgs.pyparsing python3.pkgs.six + wayland-scanner vala + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + mesonEmulatorHook ]; propagatedBuildInputs = [ @@ -118,6 +127,7 @@ stdenv.mkDerivation rec { pixman spice-protocol usbredir + vala zlib ] ++ lib.optionals withPolkit [ polkit From 7204727251fc80023a0b6fca0faf17882c1c61f0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 13 Dec 2022 12:40:11 -0500 Subject: [PATCH 19/63] cirrus-cli: 0.92.1 -> 0.93.0 Diff: https://github.com/cirruslabs/cirrus-cli/compare/v0.92.1...v0.93.0 --- .../tools/continuous-integration/cirrus-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 05bfd5655b28..37b36ff3ed5b 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.92.1"; + version = "0.93.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ehJyC5NXB53i7ZpWTKySnMwWiqgbgBbnxIVWhyrXC0A="; + sha256 = "sha256-exGOCBKPHuVBaFXd+/jbjAid7ZDodtZ/h/OWp/NBOhE="; }; - vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; + vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" From b861297c0399465a183778388f7a2cbba0fb14d4 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 12 Dec 2022 01:48:10 -0500 Subject: [PATCH 20/63] python3Packages.skorch: 0.11.0 -> 0.12.1; unbreak --- .../python-modules/skorch/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index a6508ded491e..20d3fb5f4e76 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest -, pytest-cov , flaky , numpy , pandas @@ -16,32 +14,41 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.11.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "b35cb4e50045742f0ffcfad33044af691d5d36b50212573753a804483a947ca9"; + hash = "sha256-fjNbNY/Dr7lgVGPrHJTvPGuhyPR6IVS7ohBQMI+J1+k="; }; propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; + checkInputs = [ flaky pandas pytestCheckHook ]; + + # patch out pytest-cov dep/invocation + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=skorch" "" \ + --replace "--cov-report=term-missing" "" \ + --replace "--cov-config .coveragerc" "" + ''; disabledTests = [ # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" # failing tests "test_pickle_load" - "test_grid_search_with_slds_" - "test_grid_search_with_dict_works" ]; + # tries to import `transformers` and download HuggingFace data + disabledTestPaths = [ "skorch/tests/test_hf.py" ]; + + pythonImportsCheck = [ "skorch" ]; + meta = with lib; { description = "Scikit-learn compatible neural net library using Pytorch"; homepage = "https://skorch.readthedocs.io"; changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - # TypeError: __init__() got an unexpected keyword argument 'iid' - broken = true; }; } From 97ecf070e810b7e9f1ddf6b0c41ef16e08583eab Mon Sep 17 00:00:00 2001 From: David Morgan Date: Tue, 13 Dec 2022 16:23:18 +0000 Subject: [PATCH 21/63] seashells: init at 0.1.2 --- pkgs/applications/misc/seashells/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/seashells/default.nix diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix new file mode 100644 index 000000000000..bc4d3cfdbfc3 --- /dev/null +++ b/pkgs/applications/misc/seashells/default.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "seashells"; + version = "0.1.2"; + format = "setuptools"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "seashells" ]; + + meta = with lib; { + homepage = "https://seashells.io/"; + description = "Pipe command-line programs to seashells.io"; + longDescription = '' + Official cient for seashells.io, which allows you to view + command-line output on the web, in real-time. + ''; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7eac3c6e11c9..801f998e46d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11462,6 +11462,8 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; + seashells = callPackage ../applications/misc/seashells { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; sec = callPackage ../tools/admin/sec { }; From 283ecac08289f5142c49fe6411a0a661e76e9872 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 14 Dec 2022 22:38:33 +0000 Subject: [PATCH 22/63] resholve: strip unused libraries from python27 Strip unused libraries from resholve's own python27 derivation, further reducing its size and reducing its attack surface. --- .../python/cpython/2.7/default.nix | 13 ++++- pkgs/development/misc/resholve/default.nix | 54 +++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 31798a719ec4..15626fe28cd7 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -35,6 +35,7 @@ , stripConfig ? false , stripIdlelib ? false , stripTests ? false +, stripLibs ? [ ] , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -325,14 +326,22 @@ in with passthru; stdenv.mkDerivation ({ '' + optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 '' + optionalString stripConfig '' - rm -R $out/bin/python*-config $out/lib/python*/config-* + rm -R $out/bin/python*-config $out/lib/python*/config* '' + optionalString stripIdlelib '' # Strip IDLE rm -R $out/bin/idle* $out/lib/python*/idlelib '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - ''; + '' + (concatStringsSep "\n" + (map + (lib: + '' + rm -vR $out/lib/python*/${lib} + # libraries in dynload (C libraries) may not exist, + # but when they exist they may be prefixed with _ + rm -vfR $out/lib/python*/lib-dynload/{,_}${lib} + '') stripLibs)); enableParallelBuilding = true; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index df0573fd884f..c87f496792a4 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -29,6 +29,60 @@ let stripConfig = true; stripIdlelib = true; stripTests = true; + stripLibs = [ + # directories + "bsddb*" + "curses" + "compiler" + "ensurepip" + "hotshot" + "lib-tk" + "sqlite3" + # files + "aifc*" + "antigravity*" + "async*" + "*audio*" + "BaseHTTPServer*" + "Bastion*" + "binhex*" + "bdb*" + "CGIHTTPServer*" + "cgitb*" + "chunk*" + "colorsys*" + "dbhash*" + "dircache*" + "*dbm*" + "ftplib*" + "*hdr*" + "imaplib*" + "imputil*" + "MimeWriter*" + "mailbox*" + "mhlib*" + "mimify*" + "multifile*" + "netrc*" + "nntplib*" + "os2emxpath*" + "pyclbr*" + "pydoc*" + "SimpleHTTPServer*" + "sgmllib*" + "smtp*" + "ssl*" + "sun*" + "tabnanny*" + "telnetlib*" + "this*" + "wave*" + "webbrowser*" + "whichdb*" + "wsgiref*" + "xdrlib*" + "*XMLRPC*" + ]; enableOptimizations = false; }; callPackage = lib.callPackageWith (pkgs // { python27 = python27'; }); From 192ae663cc6b50832a5546f294fd4db6f37bf712 Mon Sep 17 00:00:00 2001 From: Markus Napierkowski Date: Fri, 11 Nov 2022 16:11:37 +0100 Subject: [PATCH 23/63] nixos/pam: allow backing the motd with a file --- nixos/modules/security/pam.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 21e1749d8503..08b51788e082 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -694,7 +694,7 @@ let optionalString (cfg.limits != []) '' session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} '' + - optionalString (cfg.showMotd && config.users.motd != null) '' + optionalString (cfg.showMotd && (config.users.motd != null || config.users.motdFile != null)) '' session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} '' + optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' @@ -775,7 +775,9 @@ let }; })); - motd = pkgs.writeText "motd" config.users.motd; + motd = if isNull config.users.motdFile + then pkgs.writeText "motd" config.users.motd + else config.users.motdFile; makePAMService = name: service: { name = "pam.d/${name}"; @@ -1199,12 +1201,26 @@ in description = lib.mdDoc "Message of the day shown to users when they log in."; }; + users.motdFile = mkOption { + default = null; + example = "/etc/motd"; + type = types.nullOr types.path; + description = lib.mdDoc "A file containing the message of the day shown to users when they log in."; + }; }; ###### implementation config = { + assertions = [ + { + assertion = isNull config.users.motd || isNull config.users.motdFile; + message = '' + Only one of users.motd and users.motdFile can be set. + ''; + } + ]; environment.systemPackages = # Include the PAM modules in the system path mostly for the manpages. From e6c6e41649886783d9dd4765bc7fccd25f022b43 Mon Sep 17 00:00:00 2001 From: Markus Napierkowski Date: Tue, 13 Dec 2022 17:37:56 +0100 Subject: [PATCH 24/63] release-notes: add an entry for users.motdFile --- nixos/doc/manual/from_md/release-notes/rl-2305.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index b73aa325bbf7..7bbbb37f7d1b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -221,6 +221,13 @@ package. + + + The new option users.motdFile allows + configuring a Message Of The Day that can be updated + dynamically. + + Resilio sync secret keys can now be provided using a secrets diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 84216758bad5..ab21cb561a23 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -66,6 +66,8 @@ In addition to numerous new and upgraded packages, this release has the followin - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). +- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically. + - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. - The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)). From 49ad241e30aff3d04bbb9dd56faa0ffb3056e3dc Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Mon, 12 Dec 2022 01:04:58 +0530 Subject: [PATCH 25/63] maestro: 1.15.0 -> 1.17.2 --- pkgs/development/mobile/maestro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 5f3764652192..ab94b59d52b7 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.15.0"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1rv9481pffd27ksqdm6z809sa1c5cslxvq53bw04iqgwvhdjzm2m"; + sha256 = "1lf0226gl9912qrk4s57bsncv23886b8wk7wri6icg26xp1cxa3v"; }; dontUnpack = true; From fc27da629ab2e4c1ac5e62d843c7f4e0b1db0ac2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 01:32:50 +0000 Subject: [PATCH 26/63] python310Packages.selenium: 4.6.0 -> 4.7.0 --- pkgs/development/python-modules/selenium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index c6f42a38e0f1..0cdbfdfec4b1 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-xgGGtJo+DZIwPa0H6dsT0VClRTMM8iFbNzSDZjH7ImI="; + hash = "sha256-7inmi8dHi6So+8AbLq85Go/GEaiV1XK/7+wt9UkTdo8="; }; postPatch = '' From a935888d452387d6ae5d96d87662c8d8388b8f43 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 15 Dec 2022 21:07:15 -0600 Subject: [PATCH 27/63] nixos/atuin: init module --- .../from_md/release-notes/rl-2305.section.xml | 7 ++ .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/atuin.nix | 85 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/atuin.nix | 65 ++++++++++++++ 6 files changed, 161 insertions(+) create mode 100644 nixos/modules/services/misc/atuin.nix create mode 100644 nixos/tests/atuin.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index e7bfd27e249b..7f2f1dc6fe74 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -37,6 +37,13 @@ programs.fzf. + + + atuin, + a sync server for shell history. Available as + services.atuin. + + v2rayA, a Linux diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index cfebfd9a86c4..d52d54e0440f 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -18,6 +18,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). +- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). + - [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable). ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 842797d24302..375059f6514d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -559,6 +559,7 @@ ./services/misc/airsonic.nix ./services/misc/ankisyncd.nix ./services/misc/apache-kafka.nix + ./services/misc/atuin.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix ./services/misc/bazarr.nix diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix new file mode 100644 index 000000000000..c94852e3aad9 --- /dev/null +++ b/nixos/modules/services/misc/atuin.nix @@ -0,0 +1,85 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.atuin; +in +{ + options = { + services.atuin = { + enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin."); + + openRegistration = mkOption { + type = types.bool; + default = false; + description = mdDoc "Allow new user registrations with the atuin server."; + }; + + path = mkOption { + type = types.str; + default = ""; + description = mdDoc "A path to prepend to all the routes of the server."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "The host address the atuin server should listen on."; + }; + + port = mkOption { + type = types.port; + default = 8888; + description = mdDoc "The port the atuin server should listen on."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = mdDoc "Open ports in the firewall for the atuin server."; + }; + + }; + }; + + config = mkIf cfg.enable { + + # enable postgres to host atuin db + services.postgresql = { + enable = true; + ensureUsers = [{ + name = "atuin"; + ensurePermissions = { + "DATABASE atuin" = "ALL PRIVILEGES"; + }; + }]; + ensureDatabases = [ "atuin" ]; + }; + + systemd.services.atuin = { + description = "atuin server"; + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.atuin}/bin/atuin server start"; + RuntimeDirectory = "atuin"; + RuntimeDirectoryMode = "0700"; + DynamicUser = true; + }; + + environment = { + ATUIN_HOST = cfg.host; + ATUIN_PORT = toString cfg.port; + ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration; + ATUIN_DB_URI = "postgresql:///atuin"; + ATUIN_PATH = cfg.path; + ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b372ae20480b..b94ef1e700c6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -80,6 +80,7 @@ in { apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; + atuin = handleTest ./atuin.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; diff --git a/nixos/tests/atuin.nix b/nixos/tests/atuin.nix new file mode 100644 index 000000000000..85213d1e53ea --- /dev/null +++ b/nixos/tests/atuin.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + testPort = 8888; + testUser = "testerman"; + testPass = "password"; + testEmail = "test.testerman@test.com"; +in +with lib; +{ + name = "atuin"; + meta.maintainers = with pkgs.lib.maintainers; [ devusb ]; + + nodes = { + server = + { ... }: + { + services.atuin = { + enable = true; + port = testPort; + host = "0.0.0.0"; + openFirewall = true; + openRegistration = true; + }; + }; + + client = + { ... }: + { }; + + }; + + testScript = with pkgs; '' + start_all() + + # wait for atuin server startup + server.wait_for_unit("atuin.service") + server.wait_for_open_port(${toString testPort}) + + # configure atuin client on server node + server.execute("mkdir -p ~/.config/atuin") + server.execute("echo 'sync_address = \"http://localhost:${toString testPort}\"' > ~/.config/atuin/config.toml") + + # register with atuin server on server node + server.succeed("${atuin}/bin/atuin register -u ${testUser} -p ${testPass} -e ${testEmail}") + _, key = server.execute("${atuin}/bin/atuin key") + + # store test record in atuin server and sync + server.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history start 'shazbot'") + server.succeed("${atuin}/bin/atuin sync") + + # configure atuin client on client node + client.execute("mkdir -p ~/.config/atuin") + client.execute("echo 'sync_address = \"http://server:${toString testPort}\"' > ~/.config/atuin/config.toml") + + # log in to atuin server on client node + client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k {key}") + + # pull records from atuin server + client.succeed("${atuin}/bin/atuin sync -f") + + # check for test record + client.succeed("ATUIN_SESSION=$(${atuin}/bin/atuin uuid) ${atuin}/bin/atuin history list | grep shazbot") + ''; +}) From 67b35bfcf00261bddeaf3635e8bb09d1656ce34b Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 15 Dec 2022 21:07:26 -0600 Subject: [PATCH 28/63] atuin: add passthru for NixOS module tests --- pkgs/tools/misc/atuin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 3501ebf91019..9d3de4aaa5f9 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -6,6 +6,7 @@ , libiconv , Security , SystemConfiguration +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -32,6 +33,10 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/atuin gen-completions -s zsh) ''; + passthru.tests = { + inherit (nixosTests) atuin; + }; + meta = with lib; { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/ellie/atuin"; From 489f2cf089321e8ccc6eeb342bfd2a2e2a12b0dd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:35:01 +0800 Subject: [PATCH 29/63] bgpdump: fix cross compilation --- pkgs/tools/networking/bgpdump/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index f60b60c39926..5e98228da2e5 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM="; }; + postPatch = '' + substituteInPlace Makefile.in --replace 'ar r libbgpdump.a' '$(AR) r libbgpdump.a' + ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib bzip2 ]; From 87e87ca7b874c2ab1d95763fd73388241976620d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:44:53 +0800 Subject: [PATCH 30/63] iperf2: fix cross compilation --- pkgs/tools/networking/iperf/2.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 82c1ba34f143..9831a4f4f7d1 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ "--enable-fastsampling" ]; + makeFlags = [ "AR:=$(AR)" ]; + postInstall = '' mv $out/bin/iperf $out/bin/iperf2 ln -s $out/bin/iperf2 $out/bin/iperf From e75c2fd5f1374ebe5dc5cc4e9508196a42279e63 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:49:27 +0800 Subject: [PATCH 31/63] libcgroup: fix cross compilation --- pkgs/os-specific/linux/libcgroup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 13c248a03982..8f24362b94b2 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { hash = "sha256-x2yBqpr3LedtWmpZ4K1ipZxIualNJuDtC4FVGzzcQn8="; }; - buildInputs = [ pam bison flex ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ pam ]; postPatch = '' substituteInPlace src/tools/Makefile.am \ From cab0268555eb599dfb63397e1e59a5f6f5b207be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 07:06:58 +0000 Subject: [PATCH 32/63] git-delete-merged-branches: 7.2.2 -> 7.3.1 --- .../git-and-tools/git-delete-merged-branches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index e24003c85891..7d3d1b6b2c69 100644 --- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.2.2"; + version = "7.3.1"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Q83s0kkrArRndxQa+V+eZw+iaJje7VR+aPScB33l1W0="; + sha256 = "sha256-9Y4n8OWZMwGoCunqwWtkDeDvRcJ4aepw1vgMXFHkhx0="; }; propagatedBuildInputs = with python3Packages; [ From 5e4c049862f4542781fc752792a7ad3bf0e5af76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 12:56:43 +0000 Subject: [PATCH 33/63] docker-compose: 2.14.0 -> 2.14.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 47ab9f6951fc..e3a9ddbbf102 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-6dTVDAFq5CwLvTzOczyaM+ZILKjKZzR2SAaRq2hqk7M="; + sha256 = "sha256-FxioqEPVHI6PlKfcQlKbPVj6LGyUsXabCpJh+zY3gco="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-B6xqMsspWexTdYX+o2BJNlXuJFL7/rv8oexFUxOO8BI="; + vendorSha256 = "sha256-sWEtpwtr2/2qNWyHZdiZRYdw/LTwmIQKM9nCaHxL7ns="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 8ebf746e6ceb192e98d63b27a176081b76cdc1ee Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Dec 2022 22:49:13 +0100 Subject: [PATCH 34/63] evilpixie: 0.2.1 -> 0.3 --- .../graphics/evilpixie/default.nix | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index be8e00b5154a..88a381ed5699 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -1,52 +1,43 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchFromGitHub -, makeDesktopItem -, qmake +, meson +, ninja +, pkg-config +, wrapQtAppsHook , qtbase , libpng , giflib +, libjpeg , impy }: -let - desktopItem = makeDesktopItem { - name = "EvilPixie"; - desktopName = "EvilPixie"; - exec = "evilpixie %F"; - icon = "evilpixie"; - genericName = "Image Editor"; - categories = [ "Graphics" "2DGraphics" "RasterGraphics" ]; - mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ]; - }; - -in mkDerivation rec { +stdenv.mkDerivation rec { pname = "evilpixie"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; rev = "v${version}"; - sha256 = "0dwgfr8kmkfppgf5wx9i5f7fjz3gxk0ji1l06x1z4r3vj52hdbph"; + sha256 = "sha256-t7ccaMXaCanCyn3oV8WJ11bhF7xTBkd992AheFJpSGQ="; }; nativeBuildInputs = [ - qmake + meson + ninja + pkg-config + wrapQtAppsHook ]; buildInputs = [ qtbase libpng giflib + libjpeg impy ]; - postInstall = '' - ln -s ${desktopItem}/share/applications $out/share - install -Dm 444 icon_128x128.png $out/share/icons/hicolor/128x128/apps/evilpixie.png - ''; - meta = with lib; { description = "Pixel-oriented paint program, modelled on Deluxe Paint"; homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone @@ -54,6 +45,11 @@ in mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # Undefined symbols for architecture x86_64: + # "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o + broken = stdenv.isDarwin || + # https://github.com/bcampbell/evilpixie/issues/28 + stdenv.isAarch64; }; } From f1e60a13ef6572314f68b33a5d3ec7351ae90ac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 14:31:47 +0000 Subject: [PATCH 35/63] eksctl: 0.122.0 -> 0.123.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 45c6d69a5737..d3eb9eda84e3 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.122.0"; + version = "0.123.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-NvUnLnACQCBvIiM3a0dtTUhfr9P3Ra9TX5Gy4Pj0tww="; + sha256 = "sha256-K5o7lEFrUjAXXwL1cnWfuRNVXvLehk0tXCCIc0rfK5s="; }; - vendorSha256 = "sha256-qc2i4bfasTBzndsxbMk6xRhtbgmbBAvuyBgUMeIiHaA="; + vendorSha256 = "sha256-CJ2b6O57E1mrNAWkDcnICeDzW3q4+uSeXV5UnYkbUng="; doCheck = false; From b2742248e8730435483e0f7d2564f5f8cde3cb3e Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Fri, 16 Dec 2022 16:11:40 +0100 Subject: [PATCH 36/63] miniflux: Add package option --- nixos/modules/services/web-apps/miniflux.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 34a108cebd2b..7cc8ce10ffe0 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -21,6 +21,13 @@ in services.miniflux = { enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it"); + package = mkOption { + type = types.package; + default = pkgs.miniflux; + defaultText = literalExpression "pkgs.miniflux"; + description = lib.mdDoc "Miniflux package to use."; + }; + config = mkOption { type = types.attrsOf types.str; example = literalExpression '' @@ -89,7 +96,7 @@ in after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { - ExecStart = "${pkgs.miniflux}/bin/miniflux"; + ExecStart = "${cfg.package}/bin/miniflux"; User = dbUser; DynamicUser = true; RuntimeDirectory = "miniflux"; @@ -122,6 +129,6 @@ in environment = cfg.config; }; - environment.systemPackages = [ pkgs.miniflux ]; + environment.systemPackages = [ cfg.package ]; }; } From 1d12ad41d1f5107e97a0ac15891d54338248f2f5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:58:08 +0100 Subject: [PATCH 37/63] linux: 4.14.301 -> 4.14.302 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 31f2e25c8f65..02893f731e3e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.301"; + version = "4.14.302"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "16zrpfadsnznpl37crbq5g1hz1ch0zfp2a75yzlqy2fs0f7fxlmc"; + sha256 = "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3"; }; } // (args.argsOverride or {})) From 1103904492b5e1476c849e8219d25ea224b3d151 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:58:22 +0100 Subject: [PATCH 38/63] linux: 4.19.268 -> 4.19.269 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 167f7cd84792..44a976ef0c7d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.268"; + version = "4.19.269"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0kr0di4gr6p57c8h6ybcli01kazq235npbh6qrpx0hpmqcdcx6r1"; + sha256 = "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf"; }; } // (args.argsOverride or {})) From 7b15da8941a830d38f62c8a09c3e13aab64d75ea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:58:33 +0100 Subject: [PATCH 39/63] linux: 5.10.158 -> 5.10.159 --- 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 3b56aa0c8e1a..5614aeb1cabf 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.158"; + version = "5.10.159"; # 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 = "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"; + sha256 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v"; }; } // (args.argsOverride or {})) From 0d9e47d655494fe510ece7a7ec2f11b7fccfbcb3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:58:46 +0100 Subject: [PATCH 40/63] linux: 5.15.82 -> 5.15.83 --- 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 5892aead9007..8e07ff461ef6 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.82"; + version = "5.15.83"; # 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 = "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw"; + sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0"; }; } // (args.argsOverride or { })) From e084dd9bffde68c7faeadada1534877f46e1d90c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:58:56 +0100 Subject: [PATCH 41/63] linux: 5.4.226 -> 5.4.227 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8d874fc72694..b45ef4f3b502 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.226"; + version = "5.4.227"; # 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 = "0i4s1hl5q0ax55z7m5krzyw1zj9v03q8jcfksknb6qrg3lm5a7qc"; + sha256 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy"; }; } // (args.argsOverride or {})) From f3e1ec7edaadc83af58d809b7b85db867d4de048 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:59:09 +0100 Subject: [PATCH 42/63] linux: 6.0.12 -> 6.0.13 --- 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 e882de626a15..2bd2a3f07c1d 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.12"; + version = "6.0.13"; # 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 = "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9"; + sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8"; }; } // (args.argsOverride or { })) From 0fd3622bbc0589d143aa1b2f6ae9e4702eb8a71e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 17:59:23 +0100 Subject: [PATCH 43/63] linux-rt_5_10: 5.10.153-rt76 -> 5.10.158-rt77 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 2909ca33853e..103b142054af 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.153-rt76"; # updated by ./update-rt.sh + version = "5.10.158-rt77"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; + sha256 = "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "12gf2nnnfcbmyp34xnns35qpnzsnwjilq2qs1xvq6m51gcnnzq7g"; + sha256 = "1yl2add34ylsancly5dblxigljwrcxgs456cz7xlnpywrlfsir5m"; }; }; in [ rt-patch ] ++ kernelPatches; From 168c60bbe8bdd53c2ca1112415b030e880ff6aec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:00:18 +0100 Subject: [PATCH 44/63] linux/hardened/patches/4.14: 4.14.300-hardened1 -> 4.14.302-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c21ed64d95ca..a593ebc635ca 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.300-hardened1.patch", - "sha256": "1y43qxcn00w1gayjj1rr3vfws8m4f2p9nz080nqilw0g14kq73sa", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.300-hardened1/linux-hardened-4.14.300-hardened1.patch" + "name": "linux-hardened-4.14.302-hardened1.patch", + "sha256": "028wmgp5xkxf0k127vfnfr8wfvrdn68phfjxh21fjs5nag0vxmgs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.302-hardened1/linux-hardened-4.14.302-hardened1.patch" }, - "sha256": "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y", - "version": "4.14.300" + "sha256": "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3", + "version": "4.14.302" }, "4.19": { "patch": { From 4a9708ac03f559eec7b267a365ebbc0324ea3e3e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:00:30 +0100 Subject: [PATCH 45/63] linux/hardened/patches/4.19: 4.19.267-hardened1 -> 4.19.269-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a593ebc635ca..76e6aa4e0cc9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.267-hardened1.patch", - "sha256": "0phlfwigzh2j5j8xjqamywqn8libpzvhingx0vjxggf0wqxvgix0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.267-hardened1/linux-hardened-4.19.267-hardened1.patch" + "name": "linux-hardened-4.19.269-hardened1.patch", + "sha256": "03gmxnficyjngxq1ciwp2jbr38zi0pfkax8bycs3xp1xhx90p3db", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.269-hardened1/linux-hardened-4.19.269-hardened1.patch" }, - "sha256": "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l", - "version": "4.19.267" + "sha256": "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf", + "version": "4.19.269" }, "5.10": { "patch": { From 2d3cabe51f0188e4ddc5ddb62b2bbec12ae53817 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:00:43 +0100 Subject: [PATCH 46/63] linux/hardened/patches/5.10: 5.10.157-hardened1 -> 5.10.159-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 76e6aa4e0cc9..40810e317d84 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.157-hardened1.patch", - "sha256": "1igmixscnjynnczwcrwp2kcw2llrbw3zlg4qzvyfmqvf3ylbbq5z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.157-hardened1/linux-hardened-5.10.157-hardened1.patch" + "name": "linux-hardened-5.10.159-hardened1.patch", + "sha256": "0kjiijq9qd5zyy2gvsn8xv99jv5crfyqi69lchmsqk1gs4qhs7m9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.159-hardened1/linux-hardened-5.10.159-hardened1.patch" }, - "sha256": "0zrjdmaj3sx0w7397glaiq6w9wwdj7lpff77a09kzmbyfz0dfk7w", - "version": "5.10.157" + "sha256": "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v", + "version": "5.10.159" }, "5.15": { "patch": { From 9ceaa23872b6e52087d0d98c306e1939d3a86ee6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:00:56 +0100 Subject: [PATCH 47/63] linux/hardened/patches/5.15: 5.15.81-hardened1 -> 5.15.83-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 40810e317d84..0ac2ff9455a9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.81-hardened1.patch", - "sha256": "0dignkwdpfi0jm3d1iz63rc4a0ki1vwyw100nganxbrg13kjm9jv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.81-hardened1/linux-hardened-5.15.81-hardened1.patch" + "name": "linux-hardened-5.15.83-hardened1.patch", + "sha256": "0cyd14xlmiy7bj5psjws2p1xdc7vzhv1hy77xca4mlwssb41zvdb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.83-hardened1/linux-hardened-5.15.83-hardened1.patch" }, - "sha256": "1awny3lgfkh5n2gdksajbyzips8kawz6rkr0p5inwkbmppg5r24g", - "version": "5.15.81" + "sha256": "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0", + "version": "5.15.83" }, "5.4": { "patch": { From b346fc800520671f20062948d751a5c833c5c857 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:01:09 +0100 Subject: [PATCH 48/63] linux/hardened/patches/5.4: 5.4.225-hardened1 -> 5.4.227-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ac2ff9455a9..919bfba6695f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.225-hardened1.patch", - "sha256": "09h8bjq73fyx6kqk0kcy3z2a0cs32gg4visv859siwb8rw1ziva2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.225-hardened1/linux-hardened-5.4.225-hardened1.patch" + "name": "linux-hardened-5.4.227-hardened1.patch", + "sha256": "1q5xxaz154iz65x6n4m1lfsly9p978zzrnp9xdh6sp1cw8g39fyn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.227-hardened1/linux-hardened-5.4.227-hardened1.patch" }, - "sha256": "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar", - "version": "5.4.225" + "sha256": "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy", + "version": "5.4.227" }, "6.0": { "patch": { From 9a1c48091756febfbec9a995dddadc6a159b2fa0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 18:01:22 +0100 Subject: [PATCH 49/63] linux/hardened/patches/6.0: 6.0.11-hardened1 -> 6.0.13-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 919bfba6695f..5ac0c9dc683b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.11-hardened1.patch", - "sha256": "0y48mj6sj43s1d58gds0v8dbyiavsvl5n0a8iqjs0fb8f6wbld0r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.11-hardened1/linux-hardened-6.0.11-hardened1.patch" + "name": "linux-hardened-6.0.13-hardened1.patch", + "sha256": "0v037rg3h8khjdr1hhkpqv2xb9g5vc7dklxf8zidaww27gb2g528", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.13-hardened1/linux-hardened-6.0.13-hardened1.patch" }, - "sha256": "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib", - "version": "6.0.11" + "sha256": "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8", + "version": "6.0.13" } } From 3d311879444594abb7bc0d66118cb48e1a01e704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Dec 2022 19:59:39 +0100 Subject: [PATCH 50/63] dtools: fixup build by using older make --- pkgs/development/tools/dtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5faf403e71a6..f1d841828b3f 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl}: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl, gnumake42 }: stdenv.mkDerivation rec { pname = "dtools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ ldc ]; + nativeBuildInputs = [ ldc gnumake42 ]; # fails with make 4.4 buildInputs = [ curl ]; makeCmd = '' From a68595ff0545c5dce78720aa56a9fac4050a1284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Dec 2022 20:04:17 +0100 Subject: [PATCH 51/63] fwts: fixup build by using older make --- pkgs/os-specific/linux/fwts/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index a5b2dabfd264..ec3d0f880f84 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: stdenv.mkDerivation rec { @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + # fails with make 4.4 + nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; postPatch = '' From af7975109224e2824de18807add24442519e6a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Dec 2022 20:07:42 +0100 Subject: [PATCH 52/63] netsniff-ng: fixup build by using older make --- pkgs/tools/networking/netsniff-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 36028208f56d..a6bf4383b317 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -15,6 +15,7 @@ , liburcu , ncurses , pkg-config +, gnumake42 , zlib }: @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { flex makeWrapper pkg-config + gnumake42 # fails with make 4.4 ]; buildInputs = [ From 62023ba1c57865ed8436ebb73d118ffd009b35e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Dec 2022 20:17:01 +0100 Subject: [PATCH 53/63] python3Packages.exchangelib: fix tests by upstream patch The error was triggered by tzdata: 2022f -> 2022g --- pkgs/development/python-modules/exchangelib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 381cb282db99..4befeed6586a 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -45,6 +45,12 @@ buildPythonPackage rec { url = "https://github.com/ecederstrand/exchangelib/commit/d5d386f54adec8ab02f871332b89e1176c214ba2.diff"; hash = "sha256-E3Ys6IDJ/yMsvi+1GKbwckkhbNrc9JLM/+GrPtUz+mY="; }) + (fetchpatch { + name = "tests-timezones-2.patch"; + url = "https://github.com/ecederstrand/exchangelib/commit/419eafcd9261bfd0617823ee437204d5556a8271.diff"; + excludes = [ "tests/test_ewsdatetime.py" ]; + hash = "sha256-dSp6NkNT5dHOg8XgDi8sR3t3hq46sNtPjUXva2YfFSU="; + }) ]; propagatedBuildInputs = [ From bf28b001738bac39a50d7607d2fdfd40d3502d45 Mon Sep 17 00:00:00 2001 From: "\"Sam Willcocks\"" <"sam@wlcx.cc"> Date: Sun, 11 Dec 2022 21:57:44 +0000 Subject: [PATCH 54/63] vimPlugins.html5-vim: init at 2020-08-22 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b7e0d8e1c4ea..d658323dafd5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3596,6 +3596,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + html5-vim = buildVimPluginFrom2Nix { + pname = "html5.vim"; + version = "2020-08-22"; + src = fetchFromGitHub { + owner = "othree"; + repo = "html5.vim"; + rev = "7c9f6f38ce4f9d35db7eeedb764035b6b63922c6"; + sha256 = "1hgbvdpmn3yffk5ahz7hz36a7f5zjc1k3pan5ybgncmdq9f4rzq6"; + }; + meta.homepage = "https://github.com/othree/html5.vim/"; + }; + hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; version = "2022-11-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6ed73b5e9a8a..dff2ab29a7f4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -301,6 +301,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/othree/html5.vim/,HEAD, https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, From fa894bf0a7c9b2b4cb6a53606e4d3fced8ad6bae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 20:37:24 +0100 Subject: [PATCH 55/63] mautrix-whatsapp: 0.7.2 -> 0.8.0 ChangeLog: https://github.com/mautrix/whatsapp/releases/tag/v0.8.0 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 50ec60989701..847aaeffdcad 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-KeuAxrp4DYy0+K1XYF3FxindYoOHHfwtufwKnic46i8="; + hash = "sha256-shCFKTS6ArvjecokNSrgOBr5jO+64+d6OdubTHOWiws="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-oxRxGxYvpO1TeEBAKO1RDwqw4NUSW4XunGdVB6zXjx8="; + vendorSha256 = "sha256-BD1DBzr8iwVq2Qe7Zz1i871ysAYJ7iUlcBftjDYreeM="; doCheck = false; From 1e30bc4aeb78d080c2224d9f0b46724b59b90f92 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 14 Nov 2022 12:53:16 +0100 Subject: [PATCH 56/63] pinentry: 1.2.0 -> 1.2.1 --- pkgs/tools/security/pinentry/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 61f84e5d76e9..54c8685f38eb 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,6 +1,6 @@ { fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpg-error, libassuan, qtbase, wrapQtAppsHook -, ncurses, gtk2, gcr, libcap +, ncurses, gtk2, gcr , withLibsecret ? true, libsecret , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] @@ -35,18 +35,18 @@ in pinentryMkDerivation rec { pname = "pinentry"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2"; - sha256 = "sha256-EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA="; + sha256 = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; + buildInputs = [ libgpg-error libassuan ] ++ lib.optional withLibsecret libsecret - ++ lib.optional (!stdenv.isDarwin) libcap ++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; dontWrapGApps = true; @@ -62,8 +62,7 @@ pinentryMkDerivation rec { ]; configureFlags = [ - (lib.withFeature (libcap != null) "libcap") - (lib.enableFeature withLibsecret "libsecret") + (lib.enableFeature withLibsecret "libsecret") ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo)); postInstall = From da1333cdd296f891ef68327c36ffe5c0f44ab555 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Fri, 16 Dec 2022 20:30:42 +0000 Subject: [PATCH 57/63] pms: init at unstable-2022-11-12 (#205941) Co-authored-by: Nikolay Korotkiy Co-authored-by: Sandro --- pkgs/applications/audio/pms/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/audio/pms/default.nix diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/applications/audio/pms/default.nix new file mode 100644 index 000000000000..bb6d018efe4a --- /dev/null +++ b/pkgs/applications/audio/pms/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule { + pname = "pms"; + version = "unstable-2022-11-12"; + + src = fetchFromGitHub { + owner = "ambientsound"; + repo = "pms"; + rev = "40d6e37111293187ab4542c7a64bd73d1b13974f"; + sha256 = "sha256-294MiS4c2PO2lFSSRrg8ns7sXzZsEUAqPG3q2z3TRUg="; + }; + + vendorHash = "sha256-XNFzG4hGDUN0wWbpBoQWUH1bWIgoYcyP4tNRGSV4ro4="; + + meta = with lib; { + description = "An interactive Vim-like console client for MPD"; + homepage = "https://ambientsound.github.io/pms/"; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51277870bfb9..b4320bd86ac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30678,6 +30678,8 @@ with pkgs; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + pms = callPackage ../applications/audio/pms { }; + pragha = libsForQt5.callPackage ../applications/audio/pragha { }; rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; From 053a1b0eb9d96e8db4e6e049717dadf2f92fd94c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 00:01:36 +0000 Subject: [PATCH 58/63] esbuild: 0.16.1 -> 0.16.7 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index afb3b1c17e07..42f02ee15f85 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.16.1"; + version = "0.16.7"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-5b9uJfIGWDQi5exPVCgK/9wrozptX1FebPMrWJ0v4TM="; + sha256 = "sha256-zo7YQ4Is3VWsXGvPNrg95tZ76qTSQRyntFjDeqhoyVw="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From f885004d3a35a82d33df84f12669f745d74332d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 20:59:51 +0000 Subject: [PATCH 59/63] bacon: 2.2.7 -> 2.2.8 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index ce374a0e8a81..eac02f3ff735 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GVwaqpczo+9bRA8VUwpLTwP+3PQ0mqM+4F1K61WKaNA="; + sha256 = "sha256-UFuU3y+v1V7Llc+IrWbh7kz8uUyCsxJO2zJhE6zwjSg="; }; - cargoSha256 = "sha256-mdzNbGDA93MSuZw3gYXGIuHbt36WAlf/7JcxJtkl0mk="; + cargoSha256 = "sha256-CPugHGkYbJG6WrguuGt/CnHq6NvRZ2fP2hgPIuIGGqc="; buildInputs = lib.optional stdenv.isDarwin CoreServices; From 8e271f170ff821a255db66d1c3ef273d0875d2cc Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 16 Dec 2022 22:28:08 +0100 Subject: [PATCH 60/63] gns3-{gui,server}: fix build --- pkgs/applications/networking/gns3/gui.nix | 3 ++- pkgs/applications/networking/gns3/server.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 756cbd7c8b97..e0c45e8eede3 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -46,7 +46,8 @@ python3.pkgs.buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "psutil==" "psutil>=" \ - --replace "jsonschema>=4.17.0,<4.18" "jsonschema" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \ + --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 5eee199d6915..5bc6e9be80c2 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ --replace "psutil==" "psutil>=" \ - --replace "jsonschema>=4.17.0,<4.18" "jsonschema" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \ + --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk" ''; propagatedBuildInputs = with python3.pkgs; [ From 46ac366b4c5b425582673ac673bb4c042f3504e9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Dec 2022 22:31:09 +0100 Subject: [PATCH 61/63] nsjail: fix hooks invoked in `installPhase` --- pkgs/tools/security/nsjail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index b2e17cae6b68..5abb9012b7d3 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - runHook preInstallPhase + runHook preInstall install -Dm755 nsjail "$out/bin/nsjail" installManPage nsjail.1 - runHook postInstallPhase + runHook postInstall ''; meta = with lib; { From 6f215c6be2581695f65cf17adde1fd09963aa6c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 21:31:22 +0000 Subject: [PATCH 62/63] bemenu: 0.6.13 -> 0.6.14 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 5b78e9993201..ced6a70a2468 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; + sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8="; }; nativeBuildInputs = [ pkg-config pcre ]; From 41f5d8a1f4686b1723e63d781b1b8b9917243590 Mon Sep 17 00:00:00 2001 From: laalsaas Date: Thu, 27 Oct 2022 00:50:12 +0200 Subject: [PATCH 63/63] mbidled: init at unstable-2022-10-30 --- pkgs/tools/networking/mbidled/default.nix | 39 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/networking/mbidled/default.nix diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/tools/networking/mbidled/default.nix new file mode 100644 index 000000000000..1b5c1c3dc3d4 --- /dev/null +++ b/pkgs/tools/networking/mbidled/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, libev +, openssl +}: +stdenv.mkDerivation { + pname = "mbidled"; + version = "unstable-2022-10-30"; + + src = fetchFromGitHub { + owner = "zsugabubus"; + repo = "mbidled"; + rev = "b06152f015a470876b042e538804ebb1ac247c09"; + sha256 = "sha256-eHm10onJ7v6fhvJiGXZhuN3c9cj+NoVIW2XQb2fdmuA="; + }; + + preConfigure = '' + export LIBRARY_PATH=${libev}/lib + ''; + + nativeBuildInputs = [ + meson ninja + ]; + + buildInputs = [ + libev openssl + ]; + + meta = with lib; { + description = "run command on mailbox change"; + homepage = "https://github.com/zsugabubus/mbidled"; + license = licenses.unlicense; + maintainers = with maintainers; [ laalsaas ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3a1dc02dc13..cc3e6ddc9a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1371,6 +1371,8 @@ with pkgs; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; + mbidled = callPackage ../tools/networking/mbidled { }; + metapixel = callPackage ../tools/graphics/metapixel { }; midimonster = callPackage ../tools/audio/midimonster { };