From d6158ff0ee2578568a5c18510b39bd9755e199b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 04:50:42 +0000 Subject: [PATCH 01/25] cve-bin-tool: 2.2.1 -> 3.0 --- pkgs/tools/security/cve-bin-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index fac922628752..dd26ce887eaa 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -28,13 +28,13 @@ }: buildPythonApplication rec { pname = "cve-bin-tool"; - version = "2.2.1"; + version = "3.0"; src = fetchFromGitHub { owner = "intel"; repo = "cve-bin-tool"; rev = "v${version}"; - sha256 = "087w7fsc4vd4sjz8ww6q71b108yhz94ydr76d99rhlmcqsq7fihs"; + sha256 = "1fmdnlhi03fdr4d4n7ydf6m0gx0cl77n3db8ldbs3m9zryblhzpr"; }; # Wants to open a sqlite database, access the internet, etc From 6978d8befa206f9140d3108dccc6c100c88e84cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 19 Dec 2021 04:20:00 +0000 Subject: [PATCH 02/25] postgresqlPackages.postgis: 3.1.4 -> 3.2.0 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 245ff62f7c03..dbb800a27606 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.4"; + version = "3.2.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "15ip38p7df9d9l6l3xhn2x8marbz8dy5lk3jblpl4bjkpkl3z3nw"; + sha256 = "sha256-ernhVMaUfAz/uPoS1wgGrdmqBg5itshqLiBvnUtQfP0="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From 577f4ce218617b2092f5dac54785d2a758a3ac10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Dec 2021 06:56:37 +0000 Subject: [PATCH 03/25] protonmail-bridge: 1.8.10 -> 1.8.12 --- pkgs/applications/networking/protonmail-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 49e4bd01e423..1283f0d7fa80 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.8.10"; + version = "1.8.12"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-T6pFfGKG4VNcZ6EYEU5A5V91PlZZDylTNSNbah/pwS4="; + sha256 = "sha256-CkvD7PKx2Gm2KgsIIqQ9l1Z3tWlhqIbW0sxCV2UBYTE="; }; - vendorSha256 = "sha256-hRGedgdQlky9UBqsVTSbgAgii1skF/MA21ZQ0+goaM4="; + vendorSha256 = "sha256-Pz3xRTwlnJGh1XvxIbyjvYcMywk/wdp4hYovPLBD494="; nativeBuildInputs = [ pkg-config ]; From 5b68d3ee15dfb15f1c06d6962a3cc40bb9680aee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Dec 2021 12:19:05 +0000 Subject: [PATCH 04/25] buildpack: 0.22.0 -> 0.23.0 --- pkgs/development/tools/buildpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index cd2365ef86f3..c10e5e7f459b 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ddJqHHunh8NSFJel7hCqkji8iYExytZ1phI8jxDMuPM="; + sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA="; }; - vendorSha256 = "sha256-PnZRyxRV/umJCS3L/GknqwcBedJVb2kRlVjiRgJoIuc="; + vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI="; nativeBuildInputs = [ installShellFiles ]; From 358421d890ab1ffd35f11967d9577dc774f89643 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Tue, 21 Dec 2021 17:46:58 +0100 Subject: [PATCH 05/25] citrix-workspace: fix build dependency on glib-networking without the buildInput, the GIO modules environment will not be added to the wrapper, causing the searchpath at runtime to be wrong. Now https login pages work --- pkgs/applications/networking/remote/citrix-workspace/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 2f9c5f76c5e8..e54bc2358632 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext + glib-networking webkitgtk gtk2 gtk2-x11 From c5e9cacf97825203e97cc5a6070ba1fc1a465140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Dec 2021 11:40:48 +0100 Subject: [PATCH 06/25] linux_zen: 5.15.8-zen1 -> 5.15.11-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index e349c3073b67..257485645f46 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.8-zen1"; + modDirVersion = "5.15.11-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-vuMgxdGjTpR4iVVm1y28Hj3CdfpwGLnTpyZEnz3jd1U="; + sha256 = "sha256-KOy1bmNnfa8LtnE+03Y+0pr9r1OCimY0bjGsVmGnPN4="; }; structuredExtraConfig = with lib.kernel; { From 8ff4f433811b1fcf80e838190bfe363eb3e9841c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 01:35:09 +0000 Subject: [PATCH 07/25] bazel-remote: 2.3.0 -> 2.3.1 --- .../tools/build-managers/bazel/bazel-remote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 3d67dfafb83b..c0c32a76a71d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ILD7uGVzRgFugHYkhvxy0rbWarXgGZXi/SLRSQb8nl4="; + sha256 = "sha256-aQsc2dBS1IWm1lpBPrrHx1CfrHXJYkDIObNHMqqVYn4="; }; vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; From 04d210397a397ea1090444605b9b730e1de87c52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 03:36:41 +0000 Subject: [PATCH 08/25] chezmoi: 2.9.2 -> 2.9.4 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 16a251c9cc65..932d9c19f302 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-tGmyn6RCr+1JiSAaoSDzk9rG2+y8G2Eot3srXEJ0Re0="; + sha256 = "sha256-idkPhBGrLz4xv/DnFt4iiO4jVRTsBmMXGhM0MQmVtpw="; }; - vendorSha256 = "sha256-jaEaVfPlYbmQ998KwZm8PUfbNlPEIr1lX5fx90jcqV4="; + vendorSha256 = "sha256-9uOlNgMsz4UklSk7UJDKZMjszoxQZK6mLQwhtK8I+Mc="; doCheck = false; From 2d55a4bcecca6ca84fdae8d118bc935df4fb8ba5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 04:22:53 +0000 Subject: [PATCH 09/25] codeql: 2.7.2 -> 2.7.3 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 790eafaefe9e..7491b5892744 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.7.2"; + version = "2.7.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-BbSYIhSFXBge/jb88UumLkHH+xw+Rp9uSYnpdntZGws="; + sha256 = "sha256-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE="; }; nativeBuildInputs = [ From f5f27bccabc49d959de7c0a8a8293820f440ac41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 04:33:50 +0000 Subject: [PATCH 10/25] toybox: 0.8.5 -> 0.8.6 --- pkgs/tools/misc/toybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 0f41f15d9fdb..07c875a94ccd 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-32LQiPsBjBh5LpRZuaYT+Dr/oETNTQERGqrpwWPhMTo="; + sha256 = "sha256-NbONJten685wekfCwbOOQxdS3B2/Ljfp/jdTa7D4U+M="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross From c594375b56739cdaea14cb9ce494328d94a205a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 05:59:06 +0000 Subject: [PATCH 11/25] thanos: 0.23.1 -> 0.24.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 7433328d40b3..932e03b99f83 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-JQp0Bg7sCA5obb24G/Ca7EcD7er+ux9x+BgRK0L7dJE="; + sha256 = "sha256-HdfOxi9l2xPs4JOY15Yt+KlCm7SQ0Ap1qa5F7abr2g8="; }; - vendorSha256 = "sha256-I7d81A5FMAOY1M8vhhrPFsPl/1sh2ydAzKySM5i5VfM="; + vendorSha256 = "sha256-+0XW7xGocM00kxmOMj0xHYPIpxc0rTQnyr9JQ/cPl3I="; doCheck = false; From 2836e46d0348da5cd292415c764daacb58ee9832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Dec 2021 06:53:44 +0000 Subject: [PATCH 12/25] traefik: 2.5.5 -> 2.5.6 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 677ea7b70a19..962569d517e2 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.5"; + version = "2.5.6"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-Y7gYUe7vFC672f3U8QOA8NdGcZ2zGp0UjnvKFOci/vs="; + sha256 = "sha256-HHJTfAigUH7C0VuKUeGypqFlQwVdy05Ki/aTxDsl+tg="; stripRoot = false; }; - vendorSha256 = "sha256-fiODtiw7mxMshdwywW4esBYM1GEa2CS7+X80KxkzImE="; + vendorSha256 = "sha256-DqjqJPyoFlCjIIaHYS5jrROQWDxZk+RGfccC2jYZ8LE="; doCheck = false; From b5e0221e44c6367f7150cb65a4de78e8f29586b9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 7 Dec 2021 20:40:23 +0100 Subject: [PATCH 13/25] treewide: use pname&version instead of name --- pkgs/os-specific/linux/v86d/default.nix | 10 ++++++---- pkgs/os-specific/linux/vendor-reset/default.nix | 4 ++-- pkgs/os-specific/linux/virtualbox/default.nix | 3 ++- .../linux/x86_energy_perf_policy/default.nix | 3 ++- pkgs/servers/openafs/1.8/module.nix | 5 +++-- pkgs/servers/openafs/1.9/module.nix | 5 +++-- pkgs/shells/zsh/zsh-better-npm-completion/default.nix | 2 +- pkgs/shells/zsh/zsh-deer/default.nix | 6 ++---- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 254abb5838e8..dbc98344c5ec 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -5,14 +5,16 @@ , klibc }: -stdenv.mkDerivation rec { - name = "v86d-${version}-${kernel.version}"; - version = "0.1.10"; +let + pversion = "0.1.10"; +in stdenv.mkDerivation rec { + pname = "v86d"; + version = "${pversion}-${kernel.version}"; src = fetchFromGitHub { owner = "mjanusz"; repo = "v86d"; - rev = "v86d-${version}"; + rev = "v86d-${pversion}"; hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA="; }; diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 8f1bde7ecbd5..e1395bd33c07 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, kernel, lib }: stdenv.mkDerivation rec { - name = "vendor-reset-${version}-${kernel.version}"; - version = "unstable-2021-02-16"; + pname = "vendor-reset"; + version = "unstable-2021-02-16-${kernel.version}"; src = fetchFromGitHub { owner = "gnif"; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index f795d36207a8..3aae58933c8f 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -1,7 +1,8 @@ { stdenv, virtualbox, kernel }: stdenv.mkDerivation { - name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; + pname = "virtualbox-modules"; + version = "${virtualbox.version}-${kernel.version}"; src = virtualbox.modsrc; hardeningDisable = [ "fortify" "pic" "stackprotector" diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix index 4b57ed4ceae5..d636f928f249 100644 --- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix +++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, kernel }: stdenv.mkDerivation { - name = "x86_energy_perf_policy-${kernel.version}"; + pname = "x86_energy_perf_policy"; + version = kernel.version; src = kernel.src; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index f8b2d222af17..02966d2ac70d 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -23,8 +23,9 @@ let in stdenv.mkDerivation { - name = "openafs-${version}-${kernel.modDirVersion}"; - inherit version src; + pname = "openafs"; + version = "${version}-${kernel.modDirVersion}"; + inherit src; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix index 83fe7ac98a7c..9799454223b2 100644 --- a/pkgs/servers/openafs/1.9/module.nix +++ b/pkgs/servers/openafs/1.9/module.nix @@ -10,8 +10,9 @@ let kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation { - name = "openafs-${version}-${kernel.modDirVersion}"; - inherit version src; + pname = "openafs"; + version = "${version}-${kernel.modDirVersion}"; + inherit src; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix index 983a772d6d57..372d49eaeb7e 100644 --- a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix +++ b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zsh-better-npm-completion"; + pname = "zsh-better-npm-completion"; version = "unstable-2019-11-19"; src = fetchFromGitHub { diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix index 895ca621cfed..ab544d7c3147 100644 --- a/pkgs/shells/zsh/zsh-deer/default.nix +++ b/pkgs/shells/zsh/zsh-deer/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, perl }: -let +stdenv.mkDerivation rec { + pname = "deer"; version = "1.4"; - name = "deer-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "Vifon"; From 1e5d724d5eb73dec29cadc6b5a41e952ccd7aba9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 25 Dec 2021 02:08:50 +0200 Subject: [PATCH 14/25] perlPackages.RegexpCommontime: init at 0.16 --- pkgs/top-level/perl-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 339b237493cf..404b0d407409 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18997,6 +18997,29 @@ let }; }; + RegexpCommontime = buildPerlPackage { + pname = "Regexp-Common-time"; + version = "0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MANWAR/Regexp-Common-time-0.16.tar.gz"; + sha256 = "1jjay5gybbls3xn5ihc6q5ig3kf4i28nq4gvg2zp4p5m1ajhg08w"; + }; + propagatedBuildInputs = [ RegexpCommon ]; + meta = { + homepage = "https://github.com/manwar/Regexp-Common-time"; + description = "Date and time regexps."; + maintainers = [ maintainers.artturin ]; + # This module is copyrighted only to ensure proper attribution of + # authorship and to ensure that it remains available to all. This + # module is free, open-source software. This module may be freely used + # for any purpose, commercial, public, or private, provided that proper + # credit is given, and that no more-restrictive license is applied to + # derivative (not dependent) works. + # https://metacpan.org/release/MANWAR/Regexp-Common-time-0.13/view/lib/Regexp/Common/time.pm#LICENSE-AND-COPYRIGHT + license = lib.licenses.free; + }; + }; + RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; version = "1.057"; From 8cc34955fbe54037ffcb080d9bc6552a185604dd Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sun, 19 Dec 2021 20:53:32 +0800 Subject: [PATCH 15/25] jetbrains: update --- pkgs/applications/editors/jetbrains/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5c129fa3f385..3a4fc329de64 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -247,12 +247,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3"; /* updated by script */ + version = "2021.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0rvq0k99c4kniw2k0a8m2hq27v9nvn7qg6yg9dwxlmadsrx6as29"; /* updated by script */ + sha256 = "0nf1r02i51pplrazlyavc6xs6mi91spa92srfqpsgb78ar9vn027"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -260,12 +260,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "18drbddcjbbv6q6j95wy7ila8d7imi0gh5nnf0lhj4gkkxhszmii"; /* updated by script */ + sha256 = "0m0nc988w2a2p0l3a9cirnk2vbrsas4wb3fc4pwiml5bz5vwh255"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -273,12 +273,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.3"; /* updated by script */ + version = "2021.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0bdsvfsx0vhmvlqvy9phw6yz98la8qw2avm4p0yl9j8y9zplbhl0"; /* updated by script */ + sha256 = "1kl1sg2fjh8wpx47984vw6zrqf7nakbji606cl52brkxik7py0d3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -365,12 +365,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0c788xvcd5b9jafz2yyllj1pzgc9ry3pg82qi8glghvimjnk1cfd"; /* updated by script */ + sha256 = "0arnh9wlw874jqlgad00q0nf1kjp7pvb4xixwrb6v1l9fbr9nsan"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; From c5ab0b23d72be39e6dce1002eb2af9da6776c58e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Dec 2021 12:16:42 +0100 Subject: [PATCH 16/25] python3Packages.deemix: 3.5.5 -> 3.6.1 --- pkgs/development/python-modules/deemix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index 670a459970b0..f7b2ef597792 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.5.5"; + version = "3.6.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qattUKdGr9P2al5cibG0CPJNmVCJjgE+hucOtl7pAhE="; + sha256 = "sha256-oLVCh268TlImOff75m3oSy0dPJi7qrOQ4YOf6rj105M="; }; propagatedBuildInputs = [ From 796ca3a47f2d906f831f17e5e5b6ab5dd0e70660 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 11:22:03 +0000 Subject: [PATCH 17/25] proxify: 0.0.4 -> 0.0.5 --- pkgs/tools/networking/proxify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 47e36df3ac64..36db5037a44c 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "v${version}"; - sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s"; + sha256 = "sha256-jITmLJHKTIXnQRUTLaXQPv57gJSbD+6AfJNl36AemR0="; }; - vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx"; + vendorSha256 = "sha256-Yf1edWWHao2A+iY/5N14mvtvLP+IJDZEEB0Voj47sCs="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; From 0bec88c4f76d238fdb0f9ff360298436ba28c0bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 11:30:29 +0000 Subject: [PATCH 18/25] powershell: 7.2.0 -> 7.2.1 --- pkgs/shells/powershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index c34dd472f948..4efa2cd88a72 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -9,7 +9,7 @@ let archString = if stdenv.isAarch64 then "arm64" else throw "unsupported platform"; platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-h5zjn8wtgHmsJFiGq1rja6kZTZj3Q72W2kH3AexRDQs=" else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-NHM9ZUpBJb59Oq0Ke7DcvaN+bZ9MjSpXBRu5Ng9OVZ0=" - else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-gRebkDY0WOKabuLd/WNMoRPL7oGQJtHELFNe+sQ0TwA=" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-kidPtDMkEZ/1r4WIApPZ/BsdJkolpSZ3f72JyDv3798=" else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-bUacA4DwjDNlIG7yooXxUGL9AysAogNWuQDvcTqo1sE=" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" @@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.2.0"; + version = "7.2.1"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; From 9a489c577271da18f1f36f5c38156c771876ffed Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 23 Dec 2021 11:08:50 +0300 Subject: [PATCH 19/25] super-slicer: 2.3.57.7 -> 2.3.57.8 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 99f1f79ce7cb..2cbcd4c2cea6 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -5,8 +5,8 @@ let description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; }; - latest = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; }; + stable = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; }; + latest = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; }; }; override = { version, sha256 }: super: { From eef4a51941579e52e02bca0900a8a07184d15f8e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 24 Dec 2021 18:06:58 +0100 Subject: [PATCH 20/25] skawarePackages: Winter 2021-2022 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I bumped all versions of all packages that we packaged so far (I hope). We might want to build an update script at some point, there is a lot of potential for copy & paste errors in these updates. Laurent’s notes below: Hello, New versions of all the skarnet.org packages are available. The changes are, for the most part, minimal: essentially, the new versions fix a bug in the build system that made cross-building under slashpackage more difficult than intended. Very few people should have been impacted by this bug. Some packages had a few more bugfixes; and some packages have additional functionality. No major update; no compatibility break. The new versions are the following: skalibs-2.11.1.0 (minor) nsss-0.2.0.1 (release) utmps-0.1.1.0 (minor) execline-2.8.2.0 (minor) s6-2.11.0.1 (release) s6-rc-0.5.3.0 (minor) s6-portable-utils-2.2.3.4 (release) s6-linux-utils-2.5.1.7 (release) s6-linux-init-1.0.7.0 (minor) s6-dns-2.3.5.3 (release) s6-networking-2.5.1.0 (minor) mdevd-0.1.5.1 (release) bcnm-0.0.1.5 (release) dnsfunnel-0.0.1.3 (release) smtpd-starttls-proxy-0.0.1.1 (release) Dependencies have all been updated to the latest versions. They are not strict: libraries and binaries may build with older releases of their dependencies, although this is not guaranteed. You do not need to recompile your s6-rc service databases. To make use of the new s6-linux-init functionality, however, you will have to recreate your run-image. You do not need to restart your supervision tree, unless you're deleting your old s6 binaries. Details of minor package changes follow. * skalibs-2.11.1.0 ---------------- - New function: opendir_at() * utmps-0.1.1.0 ------------ - New binary: utmps-write, a generic utmp client that can write user-crafted records to the utmp and/or wtmp databases. * execline-2.8.2.0 ---------------- - New -s option to the case binary, enabling fnmatch() (shell) expression matching instead of regular expression matching. * s6-rc-0.5.3.0 ------------- - Bundle contents are now read in a "contents.d/" subdirectory, one file per content, instead of one per line in a "contents" file. In the same way, service dependencies are now read in a "dependencies.d/" subdirectory, one file per dependency. Old "contents" and "dependencies" files are still supported, but deprecated. This change allows better integration of s6-rc service definitions with package managers. * s6-linux-init-1.0.7.0 --------------------- - New -S option to s6-linux-init-maker, forcing a sync on halt even in a container. * s6-networking-2.5.1.0 --------------------- - SNI wildcarding is implemented, as well as a workaround for a bearssl bug causing errors on certificate signatures in certain cases. Enjoy, Bug-reports welcome. And happy holidays to you all! -- Laurent --- pkgs/development/libraries/nsss/default.nix | 4 ++-- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/development/libraries/utmps/default.nix | 4 ++-- pkgs/os-specific/linux/mdevd/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-init/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++-- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 4 ++-- pkgs/tools/system/s6-rc/default.nix | 4 ++-- pkgs/tools/system/s6/default.nix | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 9fee8333fb3d..e6db2aee60c5 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.2.0.0"; - sha256 = "0zg0lwkvx9ch4a6h9ryc73nqfz733v2pv4gbf65qzpz7ccniwagi"; + version = "0.2.0.1"; + sha256 = "0nqjnfqvzzn4i45h849b3n8qwcrzd5wlrwlvkmjdga5k4yk4x63x"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 7e3e457d5034..ddf2ee5b467d 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.11.0.0"; - sha256 = "1n9l7mb54dlb0iijjaf446jba6nmq1ql9n39s095ngrk5ahcipwq"; + version = "2.11.1.0"; + sha256 = "1fga2kmzcp2llqv5nzrmgm33p1jz7y9pnaghzbxf8ldnsns800a0"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index fcf032b26500..84f5b26c300c 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.0.3"; - sha256 = "0npgg90lzxmhld6hp296gbnrsixip28s7axirc2g6yjpjz2bvcan"; + version = "0.1.1.0"; + sha256 = "0vsx5b99fwmp05l4wsw744gg79hbfb4wlzyfip3k0g76fcs49nil"; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix index fe549e880a4d..9860c3e73021 100644 --- a/pkgs/os-specific/linux/mdevd/default.nix +++ b/pkgs/os-specific/linux/mdevd/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "mdevd"; - version = "0.1.5.0"; - sha256 = "01ykxgnbm53wijdrbld10664xy2wkvyzbbs98mfnqnf4h1y064n0"; + version = "0.1.5.1"; + sha256 = "1xch9sk3hklf2v9z3qlw0rfhhmikqp85zkij7qzwbs09g039bkll"; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix index 5d579c3ab2ad..ab9843d07f1f 100644 --- a/pkgs/os-specific/linux/s6-linux-init/default.nix +++ b/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-init"; - version = "1.0.6.4"; - sha256 = "0grqk111d6aqym1c4l9j26fdqcgra1hvwb9vdgylrfbvn1c3hlpb"; + version = "1.0.7.0"; + sha256 = "16bzijmzxi91ycayhpn398yjgag3c5pnlghs6sqdmzlf2fiirif5"; description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 06a177f1cc62..753a77aa1c72 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.1.6"; - sha256 = "0hr49nl0d7a6i5w8cfg43xzvzayb8kpqij9xg7bmw2fyvc2z338z"; + version = "2.5.1.7"; + sha256 = "1n6zmnczbybwcchkhg5zqixz8mdk5bfn0sxq0kxifgpi9ggw5a46"; description = "A set of minimalistic Linux-specific system utilities"; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 2e1e1b8f7e03..e1dd404a357e 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.8.1.0"; - sha256 = "0msmzf5zwjcsgjlvvq28rd2i0fkdb2skmv8ii0ix8dhyckwwjmav"; + version = "2.8.2.0"; + sha256 = "0h9kb3cx8dw05md6smvs56i4lr8g5n3ljaxy5vj4zs86yc3pdprg"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 045a8b9ab034..84877508607e 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-portable-utils"; - version = "2.2.3.3"; - sha256 = "132jj5qk8x40kw6lrrn7jiqhvqj9d2h6g6mhl8zma1sp37bg0i84"; + version = "2.2.3.4"; + sha256 = "04n9i9ydaa3cb3pip9d02dm24k26v3djvwrafjzq5qx94zvrifip"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 0a7307b6293b..678b8639f07b 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.2"; - sha256 = "0nczzjprvp6wirzycgf5h32dlgx4r8grzkqhif27n3ii6f5g78yw"; + version = "2.3.5.3"; + sha256 = "1nknkh2rw7ggf5ncspb11wyp6ldyqc9lf3nmnklwb5fcf5kjzi1a"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 42f7187fabed..abdc773280b4 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.5.0.0"; - sha256 = "1fn3g9gkwgmnxallhk82f5rly81pnkilj7n49g5fbfmaalsq96mh"; + version = "2.5.1.0"; + sha256 = "0hgzj68bk17r1gr32ld1dm5s1x1a5x8ac03klykhfbasx8gwa1r5"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index ab4ea7804942..0144a605e408 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.2.3"; - sha256 = "1xyaplwzvqnb53mg59a7jklakzwsiqivp6qggsry3sbaw4hf3d5j"; + version = "0.5.3.0"; + sha256 = "09rznjlz988fk9pff6mxc3dknwh2mibbawr9g62gcscmscmiv8wk"; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index dc64afa6246f..f1215f9934d7 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.11.0.0"; - sha256 = "1a3lj0xfhn1w3a4ygqsxy8q4dr3n48hnwml4xzdpz3nrikhy8if5"; + version = "2.11.0.1"; + sha256 = "02pr4q4cr9wc8i8ad8s6184a6fyndpmpnylgxwhfnkk3hx2j0zxd"; description = "skarnet.org's small & secure supervision software suite"; From 037d1aec5475a456fa997df7dd8f3f473d76b04d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 13:56:07 +0000 Subject: [PATCH 21/25] numix-icon-theme-circle: 21.11.29 -> 21.12.05 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index d7a7a0c8614c..089e098e97e2 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "21.11.29"; + version = "21.12.05"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-0hGxgmNNYvNT1QQpA7SdOdN1VM8Iix+kZZFcO2R1V/Y="; + sha256 = "sha256-tmrysmg4jVPurNJy3AqzAIjd1QCXoH2nGuJhRinvqVQ="; }; nativeBuildInputs = [ gtk3 ]; From db2a9d1b4e9fa1299640d805494b3968d967e8c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 14:10:22 +0000 Subject: [PATCH 22/25] python38Packages.soco: 0.25.1 -> 0.25.2 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index dd6f2d0526b2..df9a06aec14c 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.25.1"; + version = "0.25.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-KmB7uTONzNTFPNzwyjQ2eBId7RQynzuNUMeIqSO2gm4="; + sha256 = "sha256-Bu9RtzvQVDPekIzkVvcDkTs5Z+IDx6lSBCMv5zs8gNA="; }; propagatedBuildInputs = [ From 0971bb14be8134128d1c63672fc5801f510f0f26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 14:35:36 +0000 Subject: [PATCH 23/25] numix-icon-theme-square: 21.11.29 -> 21.12.05 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index d8d22f867cab..8aeb6d44669a 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "21.11.29"; + version = "21.12.05"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-3zZ/LpjYhYOHPpgRysGYXFLvYux5GgurItuYm7zAZ2M="; + sha256 = "sha256-SVWIY7RGwk2AKruDkAYoZ5nDSAU8LPb9dtqxDFumZ5o="; }; nativeBuildInputs = [ gtk3 ]; From 640945195409cd8805ef8ace8115ceb7f1092c9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Dec 2021 15:28:13 +0000 Subject: [PATCH 24/25] nfpm: 2.10.0 -> 2.11.2 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 777aadfa96de..85d8c259d677 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.10.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZLlTcybBoLfiSWb0DKn+U+S/LbekZvTRyDV6b1q9FDU="; + sha256 = "sha256-ycb5331o/ILz+eUGGipBrjI7/pYnmHUSDRc4UNpJO5s="; }; - vendorSha256 = "sha256-uGpMOKqNgGOtgLU9ztg3GmR4FYBaldgZf6BZWxn08W8="; + vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk="; doCheck = false; From 824f6f424c04628e1bce33c423e4a8a9f3e39566 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Dec 2021 14:10:42 +0100 Subject: [PATCH 25/25] =?UTF-8?q?scheherazade-new:=203.200=20=E2=86=92=203?= =?UTF-8?q?.300?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/scheherazade/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 3448226c58d9..e91d108ade8e 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchzip, version ? "3.200" }: +{ lib, fetchzip, version ? "3.300" }: let new = lib.versionAtLeast version "3.000"; sha256 = { "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.200" = "0qvmpsn6ja3g2hlvq0vb9pjsyk6ibna7s3w3n6q7lnhk0rhjg8bv"; + "3.300" = "1bja1ma1mnna0qlk3dis31cvq5z1kgcqj7wjp8ml03zc5mpa2wb2"; }."${version}"; in fetchzip rec { @@ -16,8 +16,9 @@ in fetchzip rec { mkdir -p $out/share/{doc,fonts} unzip -l $downloadedFile unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip $downloadedFile \*/documentation/\* -d $out/share/doc/ + mv $out/share/doc/* $out/share/doc/${name} unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} - unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; inherit sha256; @@ -30,7 +31,7 @@ in fetchzip rec { Scheherazade${lib.optionalString new " New"}, named after the heroine of the classic Arabian Nights tale, is designed in a similar style to traditional typefaces such as Monotype Naskh, extended to cover the - Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}. + Unicode Arabic repertoire through Unicode ${if new then "14.0" else "8.0"}. Scheherazade provides a “simplified” rendering of Arabic script, using basic connecting glyphs but not including a wide variety of additional