From e691cae38e954f8d90ae63f732f18fb3f387f81d Mon Sep 17 00:00:00 2001 From: laalsaas Date: Mon, 31 Oct 2022 17:07:15 +0100 Subject: [PATCH 01/30] 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 41d11e36244bbd39027095601aaed1e372c4f75c Mon Sep 17 00:00:00 2001 From: Subhrajyoti Sen Date: Wed, 16 Nov 2022 22:41:12 +0000 Subject: [PATCH 02/30] 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 c1188a559b143950fd1dc55b22820fffc3013b1d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 9 Dec 2022 18:44:04 +0100 Subject: [PATCH 03/30] 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 04/30] 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 05/30] 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 06/30] 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 07/30] 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 20206a44e1b4acd2e658fbb868122596c7ac1f0f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 12 Dec 2022 22:47:22 +0100 Subject: [PATCH 08/30] 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 09/30] 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 97ecf070e810b7e9f1ddf6b0c41ef16e08583eab Mon Sep 17 00:00:00 2001 From: David Morgan Date: Tue, 13 Dec 2022 16:23:18 +0000 Subject: [PATCH 10/30] 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 49ad241e30aff3d04bbb9dd56faa0ffb3056e3dc Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Mon, 12 Dec 2022 01:04:58 +0530 Subject: [PATCH 11/30] 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 489f2cf089321e8ccc6eeb342bfd2a2e2a12b0dd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 12 Dec 2022 14:35:01 +0800 Subject: [PATCH 12/30] 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 13/30] 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 f1e60a13ef6572314f68b33a5d3ec7351ae90ac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 14:31:47 +0000 Subject: [PATCH 14/30] 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 15/30] 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 16/30] 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 17/30] 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 18/30] 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 19/30] 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 20/30] 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 21/30] 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 22/30] 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 23/30] 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 24/30] 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 25/30] 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 26/30] 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 27/30] 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 28/30] 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 da1333cdd296f891ef68327c36ffe5c0f44ab555 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Fri, 16 Dec 2022 20:30:42 +0000 Subject: [PATCH 29/30] 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 30/30] 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=";