From 3ff04d2fc26b8d487a02843a804b8ee8995f6521 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 4 Nov 2021 13:16:32 +0100 Subject: [PATCH 001/140] logstash7: Fix passthru.tests since -oss variant removal --- pkgs/tools/misc/logstash/7.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 1e69fbc976d9..c8970033d0dd 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -1,4 +1,5 @@ -{ elk7Version +{ config +, elk7Version , enableUnfree ? true , lib , stdenv @@ -70,10 +71,10 @@ let maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + optionalAttrs (config.allowUnfree && enableUnfree) ( + assert this.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.logstash.drvPath; { - elk = nixosTests.elk.ELK-7; + elk = nixosTests.elk.unfree.ELK-7; } ); }; From 2a6d0bdf94a97eec69bdcc0c58929eb3b1aa4075 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Fri, 1 Jul 2022 23:18:16 +0200 Subject: [PATCH 002/140] swaylock-effects: changed source repository Original repository seems not maintained anymore. The new repo maintained by jirutka is up to date. --- pkgs/applications/window-managers/sway/lock-effects.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 6f1f337d23ee..80eea1218d26 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "unstable-2021-10-21"; + version = "1.6.10"; src = fetchFromGitHub { - owner = "mortie"; + owner = "jirutka"; repo = "swaylock-effects"; - rev = "a8fc557b86e70f2f7a30ca9ff9b3124f89e7f204"; - sha256 = "sha256-GN+cxzC11Dk1nN9wVWIyv+rCrg4yaHnCePRYS1c4JTk="; + rev = "v${version}"; + sha256 = "sha256-VkyH9XN/pR1UY/liG5ygDHp+ymdqCPeWHyU7/teJGbU="; }; postPatch = '' From 6d9a490980711d9501465fabc53c48bf41762d8f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 15 Aug 2022 01:08:13 -0700 Subject: [PATCH 003/140] default-crate-overrides.nix: remove unnecessary attrs from previous commit Sorry, I should have removed these before submitting https://github.com/NixOS/nixpkgs/pull/186748 --- pkgs/build-support/rust/default-crate-overrides.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..b4c08fd241e8 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -67,8 +67,6 @@ in }; evdev-sys = attrs: { - LIBGIT2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevdev ]; }; From 63d9913007113c7cbd699c90160e045d064ee3f3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 25 Aug 2022 17:47:42 -0700 Subject: [PATCH 004/140] release-cross.nix: skip job which requires build.canExec host --- pkgs/top-level/release-cross.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 8e951611bbc0..93e36360bf9c 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -218,5 +218,12 @@ in mkBootstrapToolsJob = drv: assert lib.elem drv.system supportedSystems; hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); - in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; + in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) + # The `bootstrapTools.${platform}.bootstrapTools` derivation + # *unpacks* the bootstrap-files using their own `busybox` binary, + # so it will fail unless buildPlatform.canExecute hostPlatform. + # Unfortunately `bootstrapTools` also clobbers its own `system` + # attribute, so there is no way to detect this -- we must add it + # as a special case. + (builtins.removeAttrs tools ["bootstrapTools"]); } From 4ceec72751fdab4cbfbf407e4b4500dd388232d6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 9 Sep 2022 18:37:53 -0700 Subject: [PATCH 005/140] default-crate-overrides.nix: add cairo-sys-rs --- pkgs/build-support/rust/default-crate-overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..4d02fd2c05fb 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -39,6 +39,11 @@ in buildInputs = [ cairo ]; }; + cairo-sys-rs = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo ]; + }; + capnp-rpc = attrs: { nativeBuildInputs = [ capnproto ]; }; From c804cea71d27d74becebc677bd2bc0064adfe025 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 9 Sep 2022 18:39:47 -0700 Subject: [PATCH 006/140] default-crate-overrides.nix: add {gtk4,gdk4,gsk4}-sys --- .../rust/default-crate-overrides.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..0d64ce726d0e 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -19,6 +19,7 @@ , foundationdb , capnproto , nettle +, gtk4 , clang , llvmPackages , linux-pam @@ -116,6 +117,21 @@ in buildInputs = [ gdk-pixbuf ]; }; + gtk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + + gdk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + + gsk4-sys = attrs: { + buildInputs = [ gtk4 ]; + nativeBuildInputs = [ pkg-config ]; + }; + libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ pkg-config ]; From 02de33cacd279f143086c8bdacd84985ba0f882d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 9 Sep 2022 19:51:43 -0700 Subject: [PATCH 007/140] default-crate-overrides.nix: add atk-sys --- pkgs/build-support/rust/default-crate-overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..479d1dec5940 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,6 @@ { lib , stdenv +, atk , pkg-config , curl , darwin @@ -227,4 +228,10 @@ in xcb = attrs: { buildInputs = [ python3 ]; }; + + atk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ atk ]; + }; + } From 2ab5cfe7ced072a34bd53e723e42292ab354bff5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 10 Sep 2022 02:05:49 -0700 Subject: [PATCH 008/140] default-crate-overrides.nix: import pango --- pkgs/build-support/rust/default-crate-overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f6383af44e82..c7297436b2c1 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -22,6 +22,7 @@ , clang , llvmPackages , linux-pam +, pango , cmake , glib , freetype From 31e5930b57d07db694237622a09c8f73b885e32e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 9 Sep 2022 19:52:42 -0700 Subject: [PATCH 009/140] default-crate-overrides.nix: add pangocairo-sys --- pkgs/build-support/rust/default-crate-overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index c7297436b2c1..9e47fda23c8b 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -197,6 +197,11 @@ in buildInputs = [ gmp ]; }; + pangocairo-sys = attr: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ]; + }; + sequoia-store = attrs: { nativeBuildInputs = [ capnproto ]; buildInputs = [ sqlite gmp ]; From ea9a09c9af59ddb8c38e8cb79e7156218df41bcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Sep 2022 23:16:55 +0000 Subject: [PATCH 010/140] nwg-wrapper: 0.1.2 -> 0.1.3 --- pkgs/applications/misc/nwg-wrapper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 4e7f864f3eaa..a1fae01f21ec 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; - rev = "v${version}"; - sha256 = "114y55mv2rgnp75a3c7rk46v5v84d1zqb6wkha7x16ab6xa9phzl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus="; }; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; From d03162e8bf6d2884f41cc430677539513c26f568 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 01:37:04 +0000 Subject: [PATCH 011/140] sagetex: 3.6 -> 3.6.1 --- pkgs/misc/sagetex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/misc/sagetex/default.nix index a30f037d9c47..510219e51b9c 100644 --- a/pkgs/misc/sagetex/default.nix +++ b/pkgs/misc/sagetex/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "sagetex"; - version = "3.6"; + version = "3.6.1"; passthru.tlType = "run"; src = fetchFromGitHub { owner = "sagemath"; repo = "sagetex"; rev = "v${version}"; - sha256 = "8iHcJbaY/dh0vmvYyd6zj1ZbuJRaJGb6bUBK1v4gXWU="; + sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38="; }; buildInputs = [ From 579f230b0a0e00427c038a8b5948aff5ee082f3b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 15 Nov 2022 21:23:54 -0500 Subject: [PATCH 012/140] nixos/environment: accept path for variables and sessionVariables --- nixos/modules/config/shells-environment.nix | 4 ++-- nixos/modules/config/system-environment.nix | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 50bb9b17783b..d5ec420f3044 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -42,8 +42,8 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = with types; attrsOf (either str (listOf str)); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + type = with types; attrsOf (oneOf [ str path (listOf str) ]); + apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}"); }; environment.profiles = mkOption { diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 5b226d5079b0..399304185223 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -1,6 +1,6 @@ # This module defines a system-wide environment that will be # initialised by pam_env (that is, not only in shells). -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -32,8 +32,7 @@ in therefore not possible to use PAM style variables such as `@{HOME}`. ''; - type = with types; attrsOf (either str (listOf str)); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + inherit (options.environment.variables) type apply; }; environment.profileRelativeSessionVariables = mkOption { From 57d036135a288e3bcb96c8b3e4a22ee6a7550ba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 11:39:04 +0000 Subject: [PATCH 013/140] kubecfg: 0.28.0 -> 0.28.1 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 899519e741f8..923b2fe1dcec 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-Ask1Mbt/7xhfTNPmLIFtndT6qqbyotFrhoaUggzgGas="; + sha256 = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; }; - vendorSha256 = "sha256-vqlANAwZTC4goeN/KsrYL9GWzkhi4WUx9Llyi863KVY="; + vendorSha256 = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; From 826597de64ec5c5d6c17dc02690283ef9f3928d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Dec 2022 17:20:11 +0100 Subject: [PATCH 014/140] kubecfg: add changelog to meta --- .../networking/cluster/kubecfg/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 923b2fe1dcec..7fd5175e1e48 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "kubecfg"; @@ -8,12 +12,16 @@ buildGoModule rec { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; + hash = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; }; - vendorSha256 = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; + vendorHash = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; nativeBuildInputs = [ installShellFiles ]; @@ -23,11 +31,12 @@ buildGoModule rec { --zsh <($out/bin/kubecfg completion --shell=zsh) ''; - meta = { + meta = with lib; { description = "A tool for managing Kubernetes resources as code"; homepage = "https://github.com/kubecfg/kubecfg"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ benley ]; - platforms = lib.platforms.unix; + changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; } From d8c8e9abb733b57d8534c6765d308b37eae39c39 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Thu, 21 Jan 2021 14:05:01 -0800 Subject: [PATCH 015/140] toolbox: init at 0.0.99.3 Fixes #96115 --- .../virtualization/toolbox/default.nix | 51 +++++++++++++++++++ .../virtualization/toolbox/glibc.patch | 12 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 65 insertions(+) create mode 100644 pkgs/applications/virtualization/toolbox/default.nix create mode 100644 pkgs/applications/virtualization/toolbox/glibc.patch diff --git a/pkgs/applications/virtualization/toolbox/default.nix b/pkgs/applications/virtualization/toolbox/default.nix new file mode 100644 index 000000000000..94928ff35733 --- /dev/null +++ b/pkgs/applications/virtualization/toolbox/default.nix @@ -0,0 +1,51 @@ +{ lib, buildGoModule, fetchFromGitHub, glibc, go-md2man, installShellFiles }: + +buildGoModule rec { + pname = "toolbox"; + version = "0.0.99.3"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8="; + }; + + patches = [ ./glibc.patch ]; + + vendorHash = "sha256-k79TcC9voQROpJnyZ0RsqxJnBT83W5Z+D+D3HnuQGsI="; + + postPatch = '' + substituteInPlace src/cmd/create.go --subst-var-by glibc ${glibc} + ''; + + modRoot = "src"; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/containers/toolbox/pkg/version.currentVersion=${version}" + ]; + + preCheck = "export PATH=$GOPATH/bin:$PATH"; + + postInstall = '' + cd .. + for d in doc/*.md; do + go-md2man -in $d -out ''${d%.md} + done + installManPage doc/*.[1-9] + installShellCompletion --bash completion/bash/toolbox + install profile.d/toolbox.sh -Dt $out/share/profile.d + ''; + + meta = with lib; { + homepage = "https://containertoolbx.org"; + changelog = "https://github.com/containers/toolbox/releases/tag/${version}"; + description = "Tool for containerized command line environments on Linux"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/virtualization/toolbox/glibc.patch b/pkgs/applications/virtualization/toolbox/glibc.patch new file mode 100644 index 000000000000..1055dc965a0b --- /dev/null +++ b/pkgs/applications/virtualization/toolbox/glibc.patch @@ -0,0 +1,12 @@ +diff --git a/src/cmd/create.go b/src/cmd/create.go +index 74e90b1..113ef80 100644 +--- a/src/cmd/create.go ++++ b/src/cmd/create.go +@@ -423,6 +425,7 @@ func createContainer(container, image, release string, showCommandToEnter bool) + "--volume", toolboxPathMountArg, + "--volume", usrMountArg, + "--volume", runtimeDirectoryMountArg, ++ "--volume", "@glibc@:@glibc@:ro", + }...) + + createArgs = append(createArgs, avahiSocketMount...) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3c2791aafb..daeb5ea56095 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12257,6 +12257,8 @@ with pkgs; todo = callPackage ../tools/misc/todo { }; + toolbox = callPackage ../applications/virtualization/toolbox { }; + tor = callPackage ../tools/security/tor { }; tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; From 80d9e24cbf15faba75acd955770add1344315e41 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Sat, 26 Nov 2022 05:24:30 +0000 Subject: [PATCH 016/140] linx-server: init at unstable-2021-12-24 We were forced to patch out a single broke upstream test, and have left that patch as a pull request: ZizzyDizzyMC/linx-server#34. Fixes #188667 --- pkgs/servers/web-apps/linx-server/default.nix | 33 +++++++++ pkgs/servers/web-apps/linx-server/test.patch | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 109 insertions(+) create mode 100644 pkgs/servers/web-apps/linx-server/default.nix create mode 100644 pkgs/servers/web-apps/linx-server/test.patch diff --git a/pkgs/servers/web-apps/linx-server/default.nix b/pkgs/servers/web-apps/linx-server/default.nix new file mode 100644 index 000000000000..995eacf792e4 --- /dev/null +++ b/pkgs/servers/web-apps/linx-server/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, go-rice +, lib +}: + +buildGoModule rec { + pname = "linx-server"; + version = "unstable-2021-12-24"; + + src = fetchFromGitHub { + owner = "zizzydizzymc"; + repo = pname; + rev = "3f503442f10fca68a3212975b23cf74d92c9988c"; + hash = "sha256-tTHw/rIb2Gs5i5vZKsSgbUePIY7Np6HofBXu4TTjKbw="; + }; + + # upstream tests are broken, see zizzydizzymc/linx-server#34 + patches = [ ./test.patch ]; + + vendorHash = "sha256-/N3AXrPyENp3li4X86LNXsfBYbjJulk+0EAyogPNIpc="; + + nativeBuildInputs = [ go-rice ]; + + preBuild = "rice embed-go"; + + meta = with lib; { + description = "Self-hosted file/code/media sharing website."; + homepage = "https://put.icu"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/servers/web-apps/linx-server/test.patch b/pkgs/servers/web-apps/linx-server/test.patch new file mode 100644 index 000000000000..7303aecaf8ef --- /dev/null +++ b/pkgs/servers/web-apps/linx-server/test.patch @@ -0,0 +1,74 @@ +diff --git a/server_test.go b/server_test.go +index fc225ce..2df3608 100644 +--- a/server_test.go ++++ b/server_test.go +@@ -446,63 +446,6 @@ func TestPostJSONUpload(t *testing.T) { + } + } + +-func TestPostJSONUploadMaxExpiry(t *testing.T) { +- mux := setup() +- Config.maxExpiry = 300 +- +- // include 0 to test edge case +- // https://github.com/andreimarcu/linx-server/issues/111 +- testExpiries := []string{"86400", "-150", "0"} +- for _, expiry := range testExpiries { +- w := httptest.NewRecorder() +- +- filename := generateBarename() + ".txt" +- +- var b bytes.Buffer +- mw := multipart.NewWriter(&b) +- fw, err := mw.CreateFormFile("file", filename) +- if err != nil { +- t.Fatal(err) +- } +- +- fw.Write([]byte("File content")) +- mw.Close() +- +- req, err := http.NewRequest("POST", "/upload/", &b) +- req.Header.Set("Content-Type", mw.FormDataContentType()) +- req.Header.Set("Accept", "application/json") +- req.Header.Set("Linx-Expiry", expiry) +- if err != nil { +- t.Fatal(err) +- } +- +- mux.ServeHTTP(w, req) +- +- if w.Code != 200 { +- t.Log(w.Body.String()) +- t.Fatalf("Status code is not 200, but %d", w.Code) +- } +- +- var myjson RespOkJSON +- err = json.Unmarshal([]byte(w.Body.String()), &myjson) +- if err != nil { +- t.Fatal(err) +- } +- +- myExp, err := strconv.ParseInt(myjson.Expiry, 10, 64) +- if err != nil { +- t.Fatal(err) +- } +- +- expected := time.Now().Add(time.Duration(Config.maxExpiry) * time.Second).Unix() +- if myExp != expected { +- t.Fatalf("File expiry is not %d but %s", expected, myjson.Expiry) +- } +- } +- +- Config.maxExpiry = 0 +-} +- + func TestPostExpiresJSONUpload(t *testing.T) { + mux := setup() + w := httptest.NewRecorder() +@@ -1301,5 +1244,4 @@ func TestPutAndGetCLI(t *testing.T) { + if !strings.HasPrefix(contentType, "text/plain") { + t.Fatalf("Didn't receive file directly but %s", contentType) + } +- + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddd3f57f82b8..5756b469b44f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23844,6 +23844,8 @@ with pkgs; listmonk = callPackage ../servers/mail/listmonk { }; + linx-server = callPackage ../servers/web-apps/linx-server {}; + livepeer = callPackage ../servers/livepeer { }; lwan = callPackage ../servers/http/lwan { }; From 292ee77c817b5b0d00d096e28a6cf9825dc5c466 Mon Sep 17 00:00:00 2001 From: Evan Mattiza Date: Thu, 28 Oct 2021 19:42:51 +0000 Subject: [PATCH 017/140] maintainers: add emattiza --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d51ea84e9efb..cb0235957140 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4132,6 +4132,12 @@ githubId = 1365692; name = "Will Fancher"; }; + emattiza = { + email = "nix@mattiza.dev"; + github = "emattiza"; + githubId = 11719476; + name = "Evan Mattiza"; + }; emmabastas = { email = "emma.bastas@protonmail.com"; matrix = "@emmabastas:matrix.org"; From 4684607935932853e918ad07fa37ec07f13e8d90 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Sat, 26 Nov 2022 10:14:01 +0000 Subject: [PATCH 018/140] booster: init at 0.9 The check phase is disabled because integration tests need kernel and other impure resources to function. Fixes #173437 --- pkgs/applications/system/booster/default.nix | 58 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/system/booster/default.nix diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix new file mode 100644 index 000000000000..dda41f24531b --- /dev/null +++ b/pkgs/applications/system/booster/default.nix @@ -0,0 +1,58 @@ +{ bash +, binutils +, buildGoModule +, fetchFromGitHub +, kbd +, lib +, libfido2 +, lvm2 +, lz4 +, makeWrapper +, mdadm +, unixtools +, xz +, zfs +}: + +buildGoModule rec { + pname = "booster"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "anatol"; + repo = pname; + rev = version; + hash = "sha256-kalVFVBb+ngoUpm+iiIHGS6vBVLEvTVyKuSMSMbp7Qc="; + }; + + vendorHash = "sha256-GD+nsT4/Y2mTF+ztOC3N560BY5+QSfsPrXZ+dJYtzAw="; + + postPatch = '' + substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" + ''; + + # integration tests are run against the current kernel + doCheck = false; + + nativeBuildInputs = [ + kbd + lz4 + makeWrapper + xz + ]; + + postInstall = let + runtimeInputs = [ bash binutils kbd libfido2 lvm2 mdadm zfs ]; + in '' + wrapProgram $out/bin/generator --prefix PATH : ${lib.makeBinPath runtimeInputs} + wrapProgram $out/bin/init --prefix PATH : ${lib.makeBinPath runtimeInputs} + ''; + + meta = with lib; { + description = "Fast and secure initramfs generator "; + homepage = "https://github.com/anatol/booster"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + mainProgram = "init"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29973ea019f5..33f5d144afc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27776,6 +27776,8 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; + booster = callPackage ../applications/system/booster {}; + bottles = callPackage ../applications/misc/bottles/fhsenv.nix { }; bottles-unwrapped = callPackage ../applications/misc/bottles { }; From 7adad93912459caa35e8a591464792b8e1dc3a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 17 Dec 2022 13:14:05 +0100 Subject: [PATCH 019/140] tree-sitter/update: use `unionOfDisjoints` --- .../tools/parsing/tree-sitter/update.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 92a755e4da6c..5283c7c6c3d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -375,19 +375,7 @@ let knownTreeSitterOrgGrammarRepos); in - mergeAttrsUnique otherGrammars treeSitterOrgaGrammars; - - # TODO: move to lib - mergeAttrsUnique = left: right: - let intersect = lib.intersectLists (lib.attrNames left) (lib.attrNames right); in - assert - lib.assertMsg (intersect == [ ]) - (lib.concatStringsSep "\n" [ - "mergeAttrsUnique: keys in attrset overlapping:" - "left: ${lib.generators.toPretty {} (lib.getAttrs intersect left)}" - "right: ${lib.generators.toPretty {} (lib.getAttrs intersect right)}" - ]); - left // right; + lib.attrsets.unionOfDisjoint otherGrammars treeSitterOrgaGrammars; From 56a9ace9335180b6702f039c770e561478f428db Mon Sep 17 00:00:00 2001 From: Evan Mattiza Date: Thu, 28 Oct 2021 19:42:51 +0000 Subject: [PATCH 020/140] otel-cli: init at 0.0.20 Fixes #143471 Closes #143475 --- pkgs/tools/misc/otel-cli/default.nix | 30 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/otel-cli/default.nix diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix new file mode 100644 index 000000000000..68d89d1a6e4a --- /dev/null +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -0,0 +1,30 @@ +{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }: + +buildGoModule rec { + pname = "otel-cli"; + version = "0.0.20"; + + src = fetchFromGitHub { + owner = "equinix-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE="; + }; + + vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8="; + + preCheck = '' + ln -s $GOPATH/bin/otel-cli . + '' + lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace main_test.go \ + --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`' + ''; + + meta = with lib; { + homepage = "https://github.com/equinix-labs/otel-cli"; + description = "A command-line tool for sending OpenTelemetry traces"; + changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ emattiza urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887b29613371..dd2bc0fa1786 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10308,6 +10308,8 @@ with pkgs; ostree = callPackage ../tools/misc/ostree { }; + otel-cli = callPackage ../tools/misc/otel-cli {}; + otfcc = callPackage ../tools/misc/otfcc { }; otpclient = callPackage ../applications/misc/otpclient { }; From 64866119846ef9c03739cbd77451f4623d1e695d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Fri, 9 Dec 2022 22:35:36 +0100 Subject: [PATCH 021/140] linux: build with support for Multi-Gen LRU --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5ac3a827f686..f65fd2da81bc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -939,6 +939,8 @@ let SCHED_CORE = whenAtLeast "5.14" yes; + LRU_GEN = whenAtLeast "6.1" yes; + FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; From 95c27f5975e241b9359d886c48c420f384792450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Fri, 9 Dec 2022 22:35:51 +0100 Subject: [PATCH 022/140] linux: enable Multi-Gen LRU by default --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f65fd2da81bc..2fee060932ed 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -940,6 +940,7 @@ let SCHED_CORE = whenAtLeast "5.14" yes; LRU_GEN = whenAtLeast "6.1" yes; + LRU_GEN_ENABLED = whenAtLeast "6.1" yes; FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); From be2ee8b4a485a56b98cf71583c3cb96acd5fbc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 19 Dec 2022 15:09:19 +0100 Subject: [PATCH 023/140] linux_xanmod: note on Multigen. LRU being on by default --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cd1c82778072..7450dab107a2 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -33,7 +33,8 @@ let TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; - # Google's Multigenerational LRU framework + # Multigenerational LRU framework + # This can be removed when the LTS variant reaches version >= 6.1 (since it's on by default then) LRU_GEN = yes; LRU_GEN_ENABLED = yes; From 03554797153aa90263161784c296ef6518af3358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 18:38:47 +0100 Subject: [PATCH 024/140] lib/versions: add `pad` Pad a version string with zeros to match a given number of components. --- lib/tests/misc.nix | 15 +++++++++++++++ lib/versions.nix | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index c719fcf5d4fa..faf2b96530c1 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -212,6 +212,21 @@ runTests { expected = [ "1" "2" "3" ]; }; + testPadVersionLess = { + expr = versions.pad 3 "1.2"; + expected = "1.2.0"; + }; + + testPadVersionLessExtra = { + expr = versions.pad 3 "1.3-rc1"; + expected = "1.3.0-rc1"; + }; + + testPadVersionMore = { + expr = versions.pad 3 "1.2.3.4"; + expected = "1.2.3"; + }; + testIsStorePath = { expr = let goodPath = diff --git a/lib/versions.nix b/lib/versions.nix index 0e9d81ac78b1..986e7e5f9b37 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -46,4 +46,19 @@ rec { builtins.concatStringsSep "." (lib.take 2 (splitVersion v)); + /* Pad a version string with zeros to match the given number of components. + + Example: + pad 3 "1.2" + => "1.2.0" + pad 3 "1.3-rc1" + => "1.3.0-rc1" + pad 3 "1.2.3.4" + => "1.2.3" + */ + pad = n: version: let + numericVersion = lib.head (lib.splitString "-" version); + versionSuffix = lib.removePrefix numericVersion version; + in lib.concatStringsSep "." (lib.take n (lib.splitVersion numericVersion ++ lib.genList (_: "0") n)) + versionSuffix; + } From fc346c5e6282c8e5a4115da7420505a2fbdd3d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 21 Dec 2022 12:49:37 +0100 Subject: [PATCH 025/140] linux: use `lib.versions.pad` for `modDirVersion` --- pkgs/os-specific/linux/kernel/generic.nix | 9 +++++---- pkgs/os-specific/linux/kernel/linux-4.14.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-4.19.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-5.10.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-5.15.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-5.4.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-6.0.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-6.1.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-testing.nix | 3 ++- pkgs/os-specific/linux/kernel/manual-config.nix | 7 ++++--- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 2 +- pkgs/os-specific/linux/kernel/zen-kernels.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/linux-kernels.nix | 6 +++--- 15 files changed, 32 insertions(+), 23 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a4c2858f95f..dce2ed074a05 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -29,7 +29,8 @@ structuredExtraConfig ? {} , # The version number used for the module directory - modDirVersion ? version + # If unspecified, this is determined automatically from the version. + modDirVersion ? null , # An attribute set whose attributes express the availability of # certain features in this kernel. E.g. `{iwlwifi = true;}' @@ -195,15 +196,15 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) (basicArgs // { - inherit modDirVersion kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + inherit kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; - }); + } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; }); passthru = basicArgs // { features = kernelFeatures; - inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 02893f731e3e..777aa852650a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3"; }; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 44a976ef0c7d..6c5531afd6fd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf"; }; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 5614aeb1cabf..7662f6be96c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v"; }; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 8e07ff461ef6..f72a304d30c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0"; }; } // (args.argsOverride or { })) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index b45ef4f3b502..b41f18d400a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy"; }; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 2bd2a3f07c1d..ea98462bdf40 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8"; }; } // (args.argsOverride or { })) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 64ed1a717caf..aab12f77786a 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { version = "6.1"; # 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; + modDirVersion = versions.pad 3 version; # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; @@ -16,3 +16,4 @@ buildLinux (args // rec { sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes="; }; } // (args.argsOverride or { })) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy 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 103b142054af..a97b1acb5aad 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -13,8 +13,7 @@ in buildLinux (args // { inherit version; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. - modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version - else lib.replaceStrings ["-"] [".0-"] version; + modDirVersion = lib.versions.pad 3 version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 76db1b11bbd2..859df2c53e6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -7,7 +7,7 @@ buildLinux (args // rec { extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 - modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; + modDirVersion = versions.pad 3 version; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; @@ -18,3 +18,4 @@ buildLinux (args // rec { extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) + // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index edfd1f7dbc28..1ba5495fc90e 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -22,8 +22,9 @@ in { pos ? null, # Additional kernel make flags extraMakeFlags ? [], - # The version of the kernel module directory - modDirVersion ? version, + # The name of the kernel module directory + # Needs to be X.Y.Z[-extra], so pad with zeros if needed. + modDirVersion ? lib.versions.pad 3 version, # The kernel source (tarball, git checkout, etc.) src, # a list of { name=..., patch=..., extraConfig=...} patches @@ -36,7 +37,7 @@ in { # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is # automatically extended with extra per-version and per-config values. randstructSeed ? "", - # Use defaultMeta // extraMeta + # Extra meta attributes extraMeta ? {}, # for module compatibility diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cd1c82778072..42997b5302ec 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -16,7 +16,7 @@ let xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; - modDirVersion = "${version}-${suffix}"; + modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; src = fetchFromGitHub { owner = "xanmod"; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a58782828478..08671e83ffc5 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ let }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { inherit version; - modDirVersion = "${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version ++ [ "0" "0" ]))}-${suffix}"; + modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff0e2f7591c..53f4f77a0cbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25470,7 +25470,7 @@ with pkgs; linuxPackages_custom_tinyconfig_kernel = let base = linuxPackages.kernel; tinyLinuxPackages = linuxKernel.customPackage { - inherit (base) version src; + inherit (base) version modDirVersion src; allowImportFromDerivation = false; configfile = linuxConfig { makeTarget = "tinyconfig"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ac0511a649bf..da4270896f67 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -40,6 +40,7 @@ let }; argsOverride = { inherit version; + modDirVersion = modDirVersion' + kernelPatches.hardened.${kernel.meta.branch}.extra; src = fetchurl { url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; inherit sha256; @@ -48,7 +49,6 @@ let kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = modDirVersion' + (kernelPatches.hardened.${kernel.meta.branch}).extra; isHardened = true; }; in { @@ -595,9 +595,9 @@ in { manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); - customPackage = { version, src, configfile, allowImportFromDerivation ? true }: + customPackage = { version, src, modDirVersion ? lib.versions.pad 3 version, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (packagesFor (manualConfig { - inherit version src configfile lib stdenv allowImportFromDerivation; + inherit version src modDirVersion configfile lib stdenv allowImportFromDerivation; })); # Derive one of the default .config files From cf568d20d5bc094292fc02fdce92201b11a7f169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 14:15:04 +0100 Subject: [PATCH 026/140] linux: remove `modDirVersionArg` argument It's redundant with `argsOverride.modDirVersion`. --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-4.19.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-5.10.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-5.15.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-5.4.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-6.0.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-6.1.nix | 3 +-- pkgs/os-specific/linux/kernel/linux-testing.nix | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 777aa852650a..0b954a0ef902 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3"; }; } // (args.argsOverride or {})) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6c5531afd6fd..07583ccb4df6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf"; }; } // (args.argsOverride or {})) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7662f6be96c9..cd74e6f29372 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v"; }; } // (args.argsOverride or {})) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index f72a304d30c9..ee73320163d1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0"; }; } // (args.argsOverride or { })) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index b41f18d400a3..3e219578fd67 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy"; }; } // (args.argsOverride or {})) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index ea98462bdf40..c15f0d7338cc 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8"; }; } // (args.argsOverride or { })) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index aab12f77786a..342f2b4ea762 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -16,4 +16,3 @@ buildLinux (args // rec { sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes="; }; } // (args.argsOverride or { })) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 859df2c53e6c..f9060325051c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: with lib; @@ -18,4 +18,3 @@ buildLinux (args // rec { extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) - // lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy From 3a8fd0ef47c22a1262dbf4ef80936b27cfa13157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 21 Dec 2022 15:17:53 +0100 Subject: [PATCH 027/140] nixos/installation-cd-minimal: disable `noXlibs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Causes a lot of uncached builds for a negligible decrease in size (822 → 821 MiB currently). --- nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index abf0a5186b6a..7a3bd74cb70a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -9,6 +9,9 @@ ./installation-cd-base.nix ]; + # Causes a lot of uncached builds for a negligible decrease in size. + environment.noXlibs = lib.mkOverride 500 false; + documentation.man.enable = lib.mkOverride 500 true; fonts.fontconfig.enable = lib.mkForce false; From 2c8a4001d220a4941645392f34caa0ca267de69e Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 21 Dec 2022 23:53:05 +0100 Subject: [PATCH 028/140] virtiofsd: 1.4.0 -> 1.5.0 --- pkgs/servers/misc/virtiofsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 25d3a504ef1f..383b008962af 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-r8r7rDIFgZqxnudVQqO8kOdfNoMkV2LWiW+yE1qJgJM="; + sha256 = "sha256-jDjP0sHzKHvat/2x6/vhi/ZtdooK3y5wDRujPgi+T4E="; }; - cargoSha256 = "sha256-bK+N11SmdXrWU4HlACkOWav/xuwRUvXrbLC394N9urs="; + cargoSha256 = "sha256-VFOLNl9kh1EjJaWr3chjyFJqF81vNeqbVqtVElCkZyY="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = From f677cbabe93e039a9d4ac995a49f9ca7991d0a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 14:28:47 +0100 Subject: [PATCH 029/140] nixos/tests: remove minimal-kernel module It's not used, doesn't build, and seems like the only reason to have `manualConfig` take `stdenv` as an argument. --- nixos/lib/testing/legacy.nix | 3 ++- nixos/lib/testing/nodes.nix | 10 +-------- nixos/modules/testing/minimal-kernel.nix | 28 ------------------------ 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 nixos/modules/testing/minimal-kernel.nix diff --git a/nixos/lib/testing/legacy.nix b/nixos/lib/testing/legacy.nix index 868b8b65b17d..b31057556601 100644 --- a/nixos/lib/testing/legacy.nix +++ b/nixos/lib/testing/legacy.nix @@ -3,9 +3,10 @@ let inherit (lib) mkIf mkOption types; in { - # This needs options.warnings, which we don't have (yet?). + # This needs options.warnings and options.assertions, which we don't have (yet?). # imports = [ # (lib.mkRenamedOptionModule [ "machine" ] [ "nodes" "machine" ]) + # (lib.mkRemovedOptionModule [ "minimal" ] "The minimal kernel module was removed as it was broken and not used any more in nixpkgs.") # ]; options = { diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 8e620c96b3bb..c538ab468c52 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -23,7 +23,7 @@ let nixpkgs.config.allowAliases = false; }) testModuleArgs.config.extraBaseModules - ] ++ optional config.minimal ../../modules/testing/minimal-kernel.nix; + ]; }; @@ -78,14 +78,6 @@ in ''; }; - minimal = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Enable to configure all [{option}`nodes`](#test-opt-nodes) to run with a minimal kernel. - ''; - }; - nodesCompat = mkOption { internal = true; description = mdDoc '' diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix deleted file mode 100644 index 7c2b9c05cf9a..000000000000 --- a/nixos/modules/testing/minimal-kernel.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - configfile = builtins.storePath (builtins.toFile "config" (lib.concatStringsSep "\n" - (map (builtins.getAttr "configLine") config.system.requiredKernelConfig)) - ); - - origKernel = pkgs.buildLinux { - inherit (pkgs.linux) src version stdenv; - inherit configfile; - allowImportFromDerivation = true; - kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ]; - }; - - kernel = origKernel // (derivation (origKernel.drvAttrs // { - configurePhase = '' - runHook preConfigure - mkdir ../build - make $makeFlags "''${makeFlagsArray[@]}" mrproper - make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig - runHook postConfigure - ''; - })); - - kernelPackages = pkgs.linuxPackagesFor kernel; -in { - boot.kernelPackages = kernelPackages; -} From 6c563f30fe9415fff6ab33df738a7b9ddc84cf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 14:42:38 +0100 Subject: [PATCH 030/140] linuxManualConfig: don't require lib and stdenv arguments Reverts https://github.com/NixOS/nixpkgs/commit/7c7c83e2335c3aa6f26a4f9c905c49c430b5be09 which was only needed for the minimal-kernel.nix test module and clutters the call site. stdenv can still be overridden with `linuxManualConfig.override { stdenv = ...; }`. --- pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- pkgs/os-specific/linux/kernel/manual-config.nix | 14 +++++++------- pkgs/top-level/linux-kernels.nix | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index dce2ed074a05..51ad268a5fe7 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -195,8 +195,8 @@ let }; }; # end of configfile derivation - kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) (basicArgs // { - inherit kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) (basicArgs // { + inherit kernelPatches randstructSeed extraMakeFlags extraMeta configfile; pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1ba5495fc90e..45281d5d3bdb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,11 @@ -{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl +{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole }: let + lib_ = lib; + stdenv_ = stdenv; + readConfig = configfile: import (runCommand "config.nix" {} '' echo "{" > "$out" while IFS='=' read key val; do @@ -12,10 +15,7 @@ let done < "${configfile}" echo "}" >> $out '').outPath; -in { - lib, - # Allow overriding stdenv on each buildLinux call - stdenv, +in lib.makeOverridable ({ # The kernel version version, # Position of the Linux build expression @@ -48,7 +48,7 @@ in { # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, # ignored - features ? null, + features ? null, lib ? lib_, stdenv ? stdenv_, }: let @@ -387,4 +387,4 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; -} // (optionalAttrs (pos != null) { inherit pos; })) +} // (optionalAttrs (pos != null) { inherit pos; }))) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index da4270896f67..d6c9bd3ceeae 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -593,11 +593,11 @@ in { linux_hardkernel_latest = packages.hardkernel_4_14; }; - manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; customPackage = { version, src, modDirVersion ? lib.versions.pad 3 version, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (packagesFor (manualConfig { - inherit version src modDirVersion configfile lib stdenv allowImportFromDerivation; + inherit version src modDirVersion configfile allowImportFromDerivation; })); # Derive one of the default .config files From a8fd50b79c899b3b4958f8bb95bb5717906a37b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 20 Dec 2022 16:49:27 +0100 Subject: [PATCH 031/140] nixos/doc: update custom kernel instructions Document the `linux.override` way first, then `linuxManualConfig`. Add a `linux.configEnv` passthru attribute for quickly getting a `make nconfig`-ready shell. --- .../configuration/linux-kernel.chapter.md | 93 +++++++------- .../configuration/linux-kernel.chapter.xml | 113 ++++++++++-------- pkgs/os-specific/linux/kernel/generic.nix | 9 ++ 3 files changed, 124 insertions(+), 91 deletions(-) diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md index 7b84416a8646..f5bce99dd1bb 100644 --- a/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -82,61 +82,68 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; sets the kernel's TCP keepalive time to 120 seconds. To see the available parameters, run `sysctl -a`. -## Customize your kernel {#sec-linux-config-customizing} +## Building a custom kernel {#sec-linux-config-customizing} -The first step before compiling the kernel is to generate an appropriate -`.config` configuration. Either you pass your own config via the -`configfile` setting of `linuxKernel.manualConfig`: +You can customize the default kernel configuration by overriding the arguments for your kernel package: ```nix -custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; - in super.linuxKernel.manualConfig { - inherit (super) stdenv hostPlatform; - inherit (base_kernel) src; - version = "${base_kernel.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; -}; -``` - -You can edit the config with this snippet (by default `make - menuconfig` won\'t work out of the box on nixos): - -```ShellSession -nix-shell -E 'with import {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' -``` - -or you can let nixpkgs generate the configuration. Nixpkgs generates it -via answering the interactive kernel utility `make config`. The answers -depend on parameters passed to -`pkgs/os-specific/linux/kernel/generic.nix` (which you can influence by -overriding `extraConfig, autoModules, - modDirVersion, preferBuiltin, extraConfig`). - -```nix -mptcp93.override ({ - name="mptcp-local"; - +pkgs.linux_latest.override { ignoreConfigErrors = true; autoModules = false; kernelPreferBuiltin = true; + extraStructuredConfig = with lib.kernel; { + DEBUG_KERNEL = yes; + FRAME_POINTER = yes; + KGDB = yes; + KGDB_SERIAL_CONSOLE = yes; + DEBUG_INFO = yes; + }; +} +``` - enableParallelBuilding = true; +See `pkgs/os-specific/linux/kernel/generic.nix` for details on how these arguments +affect the generated configuration. You can also build a custom version of Linux by calling +`pkgs.buildLinux` directly, which requires the `src` and `version` arguments to be specified. - extraConfig = '' - DEBUG_KERNEL y - FRAME_POINTER y - KGDB y - KGDB_SERIAL_CONSOLE y - DEBUG_INFO y - ''; -}); +To use your custom kernel package in your NixOS configuration, set + +```nix +boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; +``` + +Note that this method will use the common configuration defined in `pkgs/os-specific/linux/kernel/common-config.nix`, +which is suitable for a NixOS system. + +If you already have a generated configuration file, you can build a kernel that uses it with `pkgs.linuxManualConfig`: + +```nix +let + baseKernel = pkgs.linux_latest; +in pkgs.linuxManualConfig { + inherit (baseKernel) src modDirVersion; + version = "${baseKernel.version}-custom"; + configfile = ./my_kernel_config; + allowImportFromDerivation = true; +} +``` + +::: {.note} +The build will fail if `modDirVersion` does not match the source's `kernel.release` file, +so `modDirVersion` should remain tied to `src`. +::: + +To edit the `.config` file for Linux X.Y, proceed as follows: + +```ShellSession +$ nix-shell '' -A linuxKernel.kernels.linux_X_Y.configEnv +$ unpackPhase +$ cd linux-* +$ make nconfig ``` ## Developing kernel modules {#sec-linux-config-developing-modules} -When developing kernel modules it\'s often convenient to run +When developing kernel modules it's often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing `mellanox` drivers. diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml index dd570e1d66c2..058a890d7a3e 100644 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -96,65 +96,82 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; available parameters, run sysctl -a.
- Customize your kernel + Building a custom kernel - The first step before compiling the kernel is to generate an - appropriate .config configuration. Either you - pass your own config via the configfile setting - of linuxKernel.manualConfig: + You can customize the default kernel configuration by overriding + the arguments for your kernel package: -custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; - in super.linuxKernel.manualConfig { - inherit (super) stdenv hostPlatform; - inherit (base_kernel) src; - version = "${base_kernel.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; -}; - - - You can edit the config with this snippet (by default - make menuconfig won't work out of the box on - nixos): - - -nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' - - - or you can let nixpkgs generate the configuration. Nixpkgs - generates it via answering the interactive kernel utility - make config. The answers depend on parameters - passed to - pkgs/os-specific/linux/kernel/generic.nix - (which you can influence by overriding - extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig). - - -mptcp93.override ({ - name="mptcp-local"; - +pkgs.linux_latest.override { ignoreConfigErrors = true; autoModules = false; kernelPreferBuiltin = true; - - enableParallelBuilding = true; - - extraConfig = '' - DEBUG_KERNEL y - FRAME_POINTER y - KGDB y - KGDB_SERIAL_CONSOLE y - DEBUG_INFO y - ''; -}); + extraStructuredConfig = with lib.kernel; { + DEBUG_KERNEL = yes; + FRAME_POINTER = yes; + KGDB = yes; + KGDB_SERIAL_CONSOLE = yes; + DEBUG_INFO = yes; + }; +} + + + See pkgs/os-specific/linux/kernel/generic.nix + for details on how these arguments affect the generated + configuration. You can also build a custom version of Linux by + calling pkgs.buildLinux directly, which + requires the src and version + arguments to be specified. + + + To use your custom kernel package in your NixOS configuration, set + + +boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; + + + Note that this method will use the common configuration defined in + pkgs/os-specific/linux/kernel/common-config.nix, + which is suitable for a NixOS system. + + + If you already have a generated configuration file, you can build + a kernel that uses it with + pkgs.linuxManualConfig: + + +let + baseKernel = pkgs.linux_latest; +in pkgs.linuxManualConfig { + inherit (baseKernel) src modDirVersion; + version = "${baseKernel.version}-custom"; + configfile = ./my_kernel_config; + allowImportFromDerivation = true; +} + + + + The build will fail if modDirVersion does not + match the source’s kernel.release file, so + modDirVersion should remain tied to + src. + + + + To edit the .config file for Linux X.Y, proceed + as follows: + + +$ nix-shell '<nixpkgs>' -A linuxKernel.kernels.linux_X_Y.configEnv +$ unpackPhase +$ cd linux-* +$ make nconfig
Developing kernel modules - When developing kernel modules it's often convenient to run + When developing kernel modules it’s often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing mellanox drivers. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 51ad268a5fe7..5a39ef915000 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -206,6 +206,15 @@ let features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; + + # Adds dependencies needed to edit the config: + # nix-shell '' -A linux.configEnv --command 'make nconfig' + configEnv = kernel.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs or [] ++ (with buildPackages; [ + pkg-config ncurses + ]); + }); + passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let overridableKernel = finalKernel // { From 82373dfc748844b07d625f18e7f58d5c2386227d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Dec 2022 15:17:58 +0100 Subject: [PATCH 032/140] dovecot: 2.3.19.1 -> 2.3.20 https://github.com/dovecot/core/blob/2.3.20/NEWS --- pkgs/servers/mail/dovecot/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 9c9121baf0e4..9eb9eff298ea 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.19.1"; + version = "2.3.20"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - hash = "sha256-21q82H1zCWWeprRbLLbunF+XSGsrcZpd0Fp1nh9qXFE="; + hash = "sha256-yqgy65aBSKvfNe6dD1NLd5+nMsDOSpE9mrjDRpshhVI="; }; enableParallelBuilding = true; @@ -58,11 +58,6 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.3.x-module_dir.patch - # fix CVE-2022-30550 - (fetchpatch { - url = "https://github.com/dovecot/core/compare/7bad6a24%5E..a1022072.patch"; - hash = "sha256-aSyRcQreyA9j8QwkODHqPpRuS3vzouVatEWCqhh+r+8="; - }) # fix openssl 3.0 compatibility (fetchpatch { url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch"; From 10089b769e218254de7dff558c88eaec707dbac7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Dec 2022 15:51:30 +0100 Subject: [PATCH 033/140] dovecot_pigeonhole: 0.5.19 -> 0.5.20 https://raw.githubusercontent.com/dovecot/pigeonhole/0.5.20/NEWS --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index c3f11bc14b28..35826e61de15 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.19"; + version = "0.5.20"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - hash = "sha256:033kkhby9k9yrmgvlfmyzp8fccsw5bhq1dyvxj94sg3grkpj7f8h"; + hash = "sha256-rjK9SHDqLBMorgm6IG6ewSEoBG1q/KUvu8nvf3VhfJg="; }; buildInputs = [ dovecot openssl ]; From 633f90dfd9ffff9e11b43530001aa41e8fcffc04 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 22 Dec 2022 19:06:38 +0100 Subject: [PATCH 034/140] kivy: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/kivy/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 0e8b81ed19cd..0b91d0bb9728 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -11,23 +11,15 @@ buildPythonPackage rec { pname = "Kivy"; - version = "2.0.0"; + version = "2.1.0"; - # use github since pypi line endings are CRLF and patches do not apply src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; rev = version; - sha256 = "sha256-/7GSVQUkYSBEnLVBizMnZAZZxvXVN4r4lskyOgLEcew="; + sha256 = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/kivy/kivy/commit/1c0656c4472817677cf3b08be504de9ca6b1713f.patch"; - sha256 = "sha256-phAjMaC3LQuvufwiD0qXzie5B+kezCf8FpKeQMhy/ms="; - }) - ]; - nativeBuildInputs = [ pkg-config cython From 35bb28b367312d94815f03d07d5600ecd362fb26 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 22 Dec 2022 23:00:14 -0500 Subject: [PATCH 035/140] nixos: Add iso_minimal_new_kernel_no_zfs Support for ZFS, while desirable, is problematic with newer kernel releases. The stable ZFS release seldom supports the current newest kernel version, and this makes the new_kernel iso basically useless as it cannot be published, and is not often built with new kernel releases. This uses a dirty workaround to work around the fact it is impossible to remove a list item from a modules system list type. Since ZFS support is conditional to being supported on the current platform, we can fake ZFS not being supported *for the no-zfs build only*. This overlay is only added when evaluating the iso, nothing else. --- .../installation-cd-minimal-new-kernel-no-zfs.nix | 15 +++++++++++++++ nixos/release.nix | 12 ++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix new file mode 100644 index 000000000000..9d09cdbe0206 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + imports = [ ./installation-cd-minimal-new-kernel.nix ]; + + # Makes `availableOn` fail for zfs, see . + # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. + # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we + # could then `lib.mkForce false` + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: { + meta.platforms = []; + }); + })]; +} diff --git a/nixos/release.nix b/nixos/release.nix index 919aa86a2d63..7907be3c02fa 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -181,14 +181,22 @@ in rec { inherit system; }); - # A variant with a more recent (but possibly less stable) kernel - # that might support more hardware. + # A variant with a more recent (but possibly less stable) kernel that might support more hardware. + # This variant keeps zfs support enabled, hoping it will build and work. iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; }); + # A variant with a more recent (but possibly less stable) kernel that might support more hardware. + # ZFS support disabled since it is unlikely to support the latest kernel. + iso_minimal_new_kernel_no_zfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix; + type = "minimal-new-kernel-no-zfs"; + inherit system; + }); + sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { module = { armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix; From d91e1f98fa83fecf614111b3bfde9bf2b3c3aa3d Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 22 Dec 2022 23:07:19 -0500 Subject: [PATCH 036/140] nixos: Add sd_image_minimal_new_kernel_no_zfs Support for ZFS, while desirable, is problematic with newer kernel releases. The stable ZFS release seldom supports the current newest kernel version, and this makes the new_kernel image basically useless as it cannot be published, and is not often built with new kernel releases. This uses a dirty workaround to work around the fact it is impossible to remove a list item from a modules system list type. Since ZFS support is conditional to being supported on the current platform, we can fake ZFS not being supported *for the no-zfs build only*. This overlay is only added when evaluating the image, nothing else. --- ...-image-aarch64-new-kernel-no-zfs-installer.nix | 15 +++++++++++++++ nixos/release.nix | 8 ++++++++ 2 files changed, 23 insertions(+) create mode 100644 nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix new file mode 100644 index 000000000000..0e5055960294 --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + imports = [ ./sd-image-aarch64-new-kernel-installer.nix ]; + + # Makes `availableOn` fail for zfs, see . + # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. + # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we + # could then `lib.mkForce false` + nixpkgs.overlays = [(final: super: { + zfs = super.zfs.overrideAttrs(_: { + meta.platforms = []; + }); + })]; +} diff --git a/nixos/release.nix b/nixos/release.nix index 7907be3c02fa..946379bcd661 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -214,6 +214,14 @@ in rec { inherit system; }); + sd_image_new_kernel_no_zfs = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { + module = { + aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix; + }.${system}; + type = "minimal-new-kernel-no-zfs"; + inherit system; + }); + # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: From 2e37bf37546f38161113439ca0aebdbe77b8788e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Dec 2022 14:49:07 +0100 Subject: [PATCH 037/140] fastStdenv: default to latest This enviroment is mainly used for development shells, where we also want the latest and greatest gcc for better safety checks, more c++ features, etc. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f210979796a..2626f0d8ea3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14042,7 +14042,7 @@ with pkgs; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking # profile-guided optimizations - fastStdenv = overrideCC gccStdenv (wrapNonDeterministicGcc gccStdenv buildPackages.gcc10); + fastStdenv = overrideCC gccStdenv (wrapNonDeterministicGcc gccStdenv buildPackages.gcc_latest); wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let From da625fb824416eab6f931fff8741c27512135b03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 17:12:05 +0000 Subject: [PATCH 038/140] python310Packages.yoda: 1.9.6 -> 1.9.7 --- pkgs/development/libraries/physics/yoda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 5424ad73787c..233a4acc3ac7 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-IVI/ova2yPM0iVnzqUhzSpMMollR08kZC0Qk4Tc18qQ="; + hash = "sha256-jQe7BNy3k2SFhxihggNFLY2foAAp+pQjnq+oUpAyuP8="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; From d666d47b9638e3219b813d45b14d3db3aaff931a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Dec 2022 21:06:38 +0100 Subject: [PATCH 039/140] python310Packages.yoda: add changelog to meta --- .../libraries/physics/yoda/default.nix | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 233a4acc3ac7..8806b0611d13 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, python +, root +, makeWrapper +, zlib +, withRootSupport ? false +}: stdenv.mkDerivation rec { pname = "yoda"; @@ -9,11 +18,23 @@ stdenv.mkDerivation rec { hash = "sha256-jQe7BNy3k2SFhxihggNFLY2foAAp+pQjnq+oUpAyuP8="; }; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; - buildInputs = [ python ] - ++ (with python.pkgs; [ numpy matplotlib ]) - ++ lib.optional withRootSupport root; - propagatedBuildInputs = [ zlib ]; + nativeBuildInputs = with python.pkgs; [ + cython + makeWrapper + ]; + + buildInputs = [ + python + ] ++ (with python.pkgs; [ + numpy + matplotlib + ]) ++ lib.optional withRootSupport [ + root + ]; + + propagatedBuildInputs = [ + zlib + ]; enableParallelBuilding = true; @@ -31,13 +52,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; doInstallCheck = true; + installCheckTarget = "check"; - meta = { + meta = with lib; { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = lib.licenses.gpl3Only; + license = licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } From 278dd6c7cf7f926b4d1ff03ee9fe4c75e61fd4f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 09:47:22 +0000 Subject: [PATCH 040/140] chezmoi: 2.27.2 -> 2.28.0 --- 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 77aa3bcab7f6..560dbb056d45 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.27.2"; + version = "2.28.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-H+9DFJm8V7MCeq7/iXNsCPe2NZFirf+nQfluihxNCFw="; + sha256 = "sha256-IZzYW3ynrZJlPgyziwMwysz4ujoFZw4lGBkUFDwjeV0="; }; - vendorSha256 = "sha256-yfT32MxnzYQr+UXqZEgGLuAxbMDfc/PWhmhDUXAIRhA="; + vendorSha256 = "sha256-spZEl3GyJsO5qa77kZlpK1X2jv3EgZwG+8Gz+Zi9Vvc="; doCheck = false; From f5a98fef5ff4a446d143101f85c5752b6dfc7c70 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 24 Dec 2022 20:26:55 +0100 Subject: [PATCH 041/140] snapcast: unbreak on x86_64-darwin --- pkgs/applications/audio/snapcast/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 513c2bb56956..558948ab4a0d 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, darwin +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox]; + ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; TARGET=lib.optionalString stdenv.isDarwin "MACOS"; @@ -45,7 +46,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; - # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1593b7e74a3..730c2373c6f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11713,7 +11713,8 @@ with pkgs; snallygaster = callPackage ../tools/security/snallygaster { }; - snapcast = callPackage ../applications/audio/snapcast { + snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { + inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; }; From 8550c75203549b9e3bea914ab6196ba31f140bbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 03:45:42 +0000 Subject: [PATCH 042/140] python310Packages.spacy-transformers: 1.1.8 -> 1.1.9 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 14969a61b102..912b473c1e37 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.8"; + version = "1.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e7YuBEq2yggW5G2pJ0Rjw9z3c1jqgRKCifYSfnzblVs="; + hash = "sha256-2uU6y/rsvNSLpeXL6O9IOQ0RMN0AEMH+/IKH6uufusU="; }; propagatedBuildInputs = [ From 9850c78e00cf2802042b6bf7869e29e40b4d2002 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Dec 2022 09:38:23 +0100 Subject: [PATCH 043/140] python310Packages.spacy-transformers: add changelog to meta --- .../python-modules/spacy-transformers/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 912b473c1e37..068f8ede69dd 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -30,11 +30,6 @@ buildPythonPackage rec { transformers ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "transformers>=3.4.0,<4.22.0" "transformers>=3.4.0 # ,<4.22.0" - ''; - # Test fails due to missing arguments for trfs2arrays(). doCheck = false; @@ -47,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; homepage = "https://github.com/explosion/spacy-transformers"; + changelog = "https://github.com/explosion/spacy-transformers/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From d78711a3e146fd3da8965e2b82037ced8c9eb7e5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 23 Dec 2022 19:53:54 +0200 Subject: [PATCH 044/140] gnustep.base: use multiple outputs and support multiple outputs in hook had to move the installFlagsArray in preInstallPhases so that ${!outputX} work because they're set by the multiple-output hook unar before: closure size 1.4G unar after: closure size 138.9M --- pkgs/desktops/gnustep/base/default.nix | 1 + pkgs/desktops/gnustep/make/setup-hook.sh | 32 +++++++++++++----------- pkgs/servers/web-apps/sogo/default.nix | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 7c6127a830b4..78c9bdd0aee1 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -19,6 +19,7 @@ gsmakeDerivation rec { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; }; + outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ aspell audiofile diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 177a381100a6..83adfefc10cd 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -1,20 +1,24 @@ # this path is used by some packages to install additional makefiles export DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles -installFlagsArray=( \ - "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \ - "GNUSTEP_SYSTEM_APPS=$out/lib/GNUstep/Applications" \ - "GNUSTEP_SYSTEM_ADMIN_APPS=$out/lib/GNUstep/Applications" \ - "GNUSTEP_SYSTEM_WEB_APPS=$out/lib/GNUstep/WebApplications" \ - "GNUSTEP_SYSTEM_TOOLS=$out/bin" \ - "GNUSTEP_SYSTEM_ADMIN_TOOLS=$out/sbin" \ - "GNUSTEP_SYSTEM_LIBRARY=$out/lib/GNUstep" \ - "GNUSTEP_SYSTEM_HEADERS=$out/include" \ - "GNUSTEP_SYSTEM_LIBRARIES=$out/lib" \ - "GNUSTEP_SYSTEM_DOC=$out/share/GNUstep/Documentation" \ - "GNUSTEP_SYSTEM_DOC_MAN=$out/share/man" \ - "GNUSTEP_SYSTEM_DOC_INFO=$out/share/info" \ -) +addGnustepInstallFlags() { + installFlagsArray=( \ + "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" \ + "GNUSTEP_SYSTEM_APPS=${!outputLib}/lib/GNUstep/Applications" \ + "GNUSTEP_SYSTEM_ADMIN_APPS=${!outputLib}/lib/GNUstep/Applications" \ + "GNUSTEP_SYSTEM_WEB_APPS=${!outputLib}/lib/GNUstep/WebApplications" \ + "GNUSTEP_SYSTEM_TOOLS=${!outputBin}/bin" \ + "GNUSTEP_SYSTEM_ADMIN_TOOLS=${!outputBin}/sbin" \ + "GNUSTEP_SYSTEM_LIBRARY=${!outputLib}/lib/GNUstep" \ + "GNUSTEP_SYSTEM_HEADERS=${!outputInclude}/include" \ + "GNUSTEP_SYSTEM_LIBRARIES=${!outputLib}/lib" \ + "GNUSTEP_SYSTEM_DOC=${!outputDoc}/share/GNUstep/Documentation" \ + "GNUSTEP_SYSTEM_DOC_MAN=${!outputMan}/share/man" \ + "GNUSTEP_SYSTEM_DOC_INFO=${!outputInfo}/share/info" \ + ) +} + +preInstallPhases+=" addGnustepInstallFlags" addEnvVars() { local filename diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 6517ad1a6001..d5a422606af1 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -51,7 +51,7 @@ gnustep.stdenv.mkDerivation rec { sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf # Link in GNUstep base - ${lndir}/bin/lndir ${gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ + ${lndir}/bin/lndir ${lib.getLib gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ # Link in sope ${lndir}/bin/lndir ${sope}/ $out/ From 6e5cb911f3bcbe158b8f4801a0118dc8aad5b09a Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Dec 2022 15:31:25 -0500 Subject: [PATCH 045/140] mdevctl: remove patch, install more files --- pkgs/os-specific/linux/mdevctl/default.nix | 36 +- pkgs/os-specific/linux/mdevctl/lock.patch | 446 --------------------- 2 files changed, 24 insertions(+), 458 deletions(-) delete mode 100644 pkgs/os-specific/linux/mdevctl/lock.patch diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/os-specific/linux/mdevctl/default.nix index 9762011b7a30..80c3c1316d85 100644 --- a/pkgs/os-specific/linux/mdevctl/default.nix +++ b/pkgs/os-specific/linux/mdevctl/default.nix @@ -1,24 +1,36 @@ -{ lib, fetchFromGitHub -, rustPackages, pkg-config, docutils +{ lib +, rustPlatform +, fetchCrate +, docutils +, installShellFiles }: -rustPackages.rustPlatform.buildRustPackage rec { - +rustPlatform.buildRustPackage rec { pname = "mdevctl"; version = "1.2.0"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v" + version; - hash = "sha256-Hgl+HsWAYIdabHJdPbCaBNnhY49vpuIjR3l6z2CAmx0="; + src = fetchCrate { + inherit pname version; + hash = "sha256-0X/3DWNDPOgSNNTqcj44sd7DNGFt+uGBjkc876dSgU8="; }; - cargoPatches = [ ./lock.patch ]; + cargoHash = "sha256-TmumQBWuH5fJOe2qzcDtEGbmCs2G9Gfl8mH7xifzRGc="; - cargoHash = "sha256-PXVc7KUMPze06gCnD2gqzlySwPumOw/z31CTd0UHp9w="; + nativeBuildInputs = [ + docutils + installShellFiles + ]; - nativeBuildInputs = [ pkg-config docutils ]; + postInstall = '' + ln -s mdevctl $out/bin/lsmdev + + install -Dm444 60-mdevctl.rules -t $out/lib/udev/rules.d + + installManPage $releaseDir/build/mdevctl-*/out/mdevctl.8 + ln -s mdevctl.8 $out/share/man/man8/lsmdev.8 + + installShellCompletion $releaseDir/build/mdevctl-*/out/{lsmdev,mdevctl}.bash + ''; meta = with lib; { homepage = "https://github.com/mdevctl/mdevctl"; diff --git a/pkgs/os-specific/linux/mdevctl/lock.patch b/pkgs/os-specific/linux/mdevctl/lock.patch deleted file mode 100644 index bb176771efff..000000000000 --- a/pkgs/os-specific/linux/mdevctl/lock.patch +++ /dev/null @@ -1,446 +0,0 @@ ---- - Cargo.lock | 432 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 432 insertions(+) - create mode 100644 Cargo.lock - -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..b91a26d ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,432 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "3.2.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -+dependencies = [ -+ "atty", -+ "bitflags", -+ "clap_derive", -+ "clap_lex", -+ "indexmap", -+ "once_cell", -+ "strsim", -+ "termcolor", -+ "textwrap", -+] -+ -+[[package]] -+name = "clap_complete" -+version = "3.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -+dependencies = [ -+ "clap", -+] -+ -+[[package]] -+name = "clap_derive" -+version = "3.2.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "clap_lex" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -+dependencies = [ -+ "os_str_bytes", -+] -+ -+[[package]] -+name = "env_logger" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -+dependencies = [ -+ "atty", -+ "humantime", -+ "log", -+ "regex", -+ "termcolor", -+] -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[package]] -+name = "heck" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "humantime" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -+ -+[[package]] -+name = "indexmap" -+version = "1.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "itoa" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -+ -+[[package]] -+name = "libc" -+version = "0.2.136" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197" -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "mdevctl" -+version = "1.2.0" -+dependencies = [ -+ "anyhow", -+ "clap", -+ "clap_complete", -+ "env_logger", -+ "log", -+ "serde_json", -+ "tempfile", -+ "uuid", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -+ -+[[package]] -+name = "once_cell" -+version = "1.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" -+ -+[[package]] -+name = "os_str_bytes" -+version = "6.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+ -+[[package]] -+name = "proc-macro-error" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -+dependencies = [ -+ "proc-macro-error-attr", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro-error-attr" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "version_check", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.47" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "regex" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+ -+[[package]] -+name = "serde" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -+ -+[[package]] -+name = "serde_json" -+version = "1.0.87" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" -+dependencies = [ -+ "indexmap", -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -+ -+[[package]] -+name = "syn" -+version = "1.0.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if", -+ "fastrand", -+ "libc", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" -+ -+[[package]] -+name = "uuid" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --- -2.37.2 - From dfccd69bfb6caa890903af44a4662a6300bc9981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 21:44:39 +0000 Subject: [PATCH 046/140] qjackctl: 0.9.7 -> 0.9.8 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 2406ba24a8c9..a9cc966af2ed 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-PchW9cM5qEP51G9RXUZ3j/AvKqTkgNiw3esqSQqsy0M="; + sha256 = "sha256-GEnxxYul4qir/92hGq4L+29dnpy1MxHonM1llkzSLPw="; }; buildInputs = [ From f896f689eded225feca7ee50031f83c3893031e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 25 Dec 2022 18:48:59 +0100 Subject: [PATCH 047/140] nixos/nix-index: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/nix-index.nix | 62 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 nixos/modules/programs/nix-index.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ac40b6cbfd97..c858b4a6fc2d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./programs/nbd.nix ./programs/neovim.nix ./programs/nethoscope.nix + ./programs/nix-index.nix ./programs/nix-ld.nix ./programs/nm-applet.nix ./programs/nncp.nix diff --git a/nixos/modules/programs/nix-index.nix b/nixos/modules/programs/nix-index.nix new file mode 100644 index 000000000000..a494b9d8c2c9 --- /dev/null +++ b/nixos/modules/programs/nix-index.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.nix-index; +in { + options.programs.nix-index = with lib; { + enable = mkEnableOption (lib.mdDoc "nix-index, a file database for nixpkgs"); + + package = mkOption { + type = types.package; + default = pkgs.nix-index; + defaultText = literalExpression "pkgs.nix-index"; + description = lib.mdDoc "Package providing the `nix-index` tool."; + }; + + enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // { + default = true; + }; + + enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // { + default = true; + }; + + enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // { + default = true; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = let + checkOpt = name: { + assertion = cfg.${name} -> !config.programs.command-not-found.enable; + message = '' + The 'programs.command-not-found.enable' option is mutually exclusive + with the 'programs.nix-index.${name}' option. + ''; + }; + in [ (checkOpt "enableBashIntegration") (checkOpt "enableZshIntegration") ]; + + environment.systemPackages = [ cfg.package ]; + + programs.bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration '' + source ${cfg.package}/etc/profile.d/command-not-found.sh + ''; + + programs.zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' + source ${cfg.package}/etc/profile.d/command-not-found.sh + ''; + + # See https://github.com/bennofs/nix-index/issues/126 + programs.fish.interactiveShellInit = let + wrapper = pkgs.writeScript "command-not-found" '' + #!${pkgs.bash}/bin/bash + source ${cfg.package}/etc/profile.d/command-not-found.sh + command_not_found_handle "$@" + ''; + in lib.mkIf cfg.enableFishIntegration '' + function __fish_command_not_found_handler --on-event fish_command_not_found + ${wrapper} $argv + end + ''; + }; +} From 67dec7ce267e69957603f0def396277f7c71e9ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 21:58:25 +0000 Subject: [PATCH 048/140] podiff: 1.3 -> 1.4 --- pkgs/tools/text/podiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index 2078c75f1362..eec0eb351636 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.3.tar.gz"; - sha256 = "sha256-7fpix+GkXsfpRgnkHtk1iXF6ILHri7BtUhNPK6sDQFA="; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.4.tar.gz"; + sha256 = "sha256-IxUx87CxdhWh8MqdcSo8GWaG358aZBaIx0oldK94sio="; }; patchPhase = '' From bfad8cd5e0c52e2c8db7dab6a843c8d0f0e89f59 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 25 Dec 2022 23:06:52 +0000 Subject: [PATCH 049/140] paperless-ngx: add celery wrapper --- pkgs/applications/office/paperless-ngx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c31436edef8c..eaad04c64f6f 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -200,6 +200,9 @@ python.pkgs.pythonPackages.buildPythonApplication rec { makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PATH : "${path}" + makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \ + --prefix PATH : "${path}" ''; checkInputs = with python.pkgs.pythonPackages; [ From 2d7b8ef56f960645cf4833426e354ac90e3b4c45 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 25 Dec 2022 23:07:17 +0000 Subject: [PATCH 050/140] nixos/paperless: update for paperless-ngx 1.10.2 --- nixos/modules/services/misc/paperless.nix | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 6a98d5cb686d..33a8394dff2d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -211,19 +211,15 @@ in ]; systemd.services.paperless-scheduler = { - description = "Paperless scheduler"; + description = "Paperless Celery Beat"; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = "${pkg}/bin/paperless-ngx qcluster"; + ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO"; Restart = "on-failure"; - # The `mbind` syscall is needed for running the classifier. - SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; - # Needs to talk to mail server for automated import rules - PrivateNetwork = false; }; environment = env; wantedBy = [ "multi-user.target" ]; - wants = [ "paperless-consumer.service" "paperless-web.service" ]; + wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ]; preStart = '' ln -sf ${manage} ${cfg.dataDir}/paperless-manage @@ -250,6 +246,20 @@ in after = [ "redis-paperless.service" ]; }; + systemd.services.paperless-task-queue = { + description = "Paperless Celery Workers"; + serviceConfig = defaultServiceConfig // { + User = cfg.user; + ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO"; + Restart = "on-failure"; + # The `mbind` syscall is needed for running the classifier. + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; + # Needs to talk to mail server for automated import rules + PrivateNetwork = false; + }; + environment = env; + }; + # Reading the user-provided password file requires root access systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) { requiredBy = [ "paperless-scheduler.service" ]; @@ -301,7 +311,7 @@ in }; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. - unitConfig.JoinsNamespaceOf = "paperless-scheduler.service"; + unitConfig.JoinsNamespaceOf = "paperless-task-queue.service"; # Bind to `paperless-scheduler` so that the web server never runs # during migrations bindsTo = [ "paperless-scheduler.service" ]; From cb1e2bf9c33683ca2fc1df00def5144175f4d117 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Dec 2022 10:04:19 +1000 Subject: [PATCH 051/140] talosctl: 1.2.8 -> 1.3.0 https://github.com/siderolabs/talos/releases/tag/v1.3.0 --- pkgs/applications/networking/cluster/talosctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index fcd2ef9fb5be..f7f74497fb3a 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-5oleIRJHEmIOXLXwBuklY16WhkePAokPGDfcPoxOUo0="; + sha256 = "sha256-2/myjkALv5gz/mbT/unRBC2Hi0jWPBzcoDKhOOHq/bw="; }; - vendorSha256 = "sha256-+jKbBWDBNgDYf6Ka69NqHzB2KAwKIDJWZpjXl3aylBA="; + vendorSha256 = "sha256-NAGq4HX4A3Sq8QlWSD/UBBVwY6EgT/1MC5s8uTJX2Po="; ldflags = [ "-s" "-w" ]; From 17f86667e3bf72a8c7454383d615479cbbc97972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 01:04:24 +0000 Subject: [PATCH 052/140] bisq-desktop: 1.9.6 -> 1.9.8 --- pkgs/applications/blockchains/bisq-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 05542ef4c24e..0da9675d2503 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.6"; + version = "1.9.8"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "02j6n693lhfn9x8kaz253xm76zzsdz8h10rkyxnlqiwwbn1wnmsa"; + sha256 = "1hwfchwqvflfzpv8n9wvj567a68fa4bch0hi8vk4pzmwxsx4z7g1"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; From 1d91e23fba38d8331a6ea654b30502d0924e6afd Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 26 Dec 2022 10:17:08 +0800 Subject: [PATCH 053/140] kooha: 2.2.2 -> 2.2.3 --- pkgs/applications/video/kooha/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index ba959ec5717e..91ead29833b1 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation rec { pname = "kooha"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w="; + hash = "sha256-vLgBuP0DncBIb05R3484WozS+Nl+S7YBJUYek2CkJkQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE="; + hash = "sha256-NPh603/5yZDUdTegAzFvjRn5tuzyrcNzbbKQr6NxXso="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Simple screen recorder"; + description = "Elegantly record your screen"; homepage = "https://github.com/SeaDve/Kooha"; license = licenses.gpl3Only; platforms = platforms.linux; From 9935565c676798021464e73d707529c9fdef7c01 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Dec 2022 21:29:38 -0500 Subject: [PATCH 054/140] ruff: 0.0.193 -> 0.0.194 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.193...v0.0.194 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.194 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 4da5922a4653..8e1dc50218d0 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.193"; + version = "0.0.194"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OsK5RUaUTuIvB5DZAbzazbeCqHTZbA2v+xIZHWsls8c="; + sha256 = "sha256-28ckhFvUjA/Hb7bkd/iRaSm24EP0oUAxlVymHdPIJk0="; }; - cargoSha256 = "sha256-GyINYYNcYuTRPrM9W0/09xqFxe5CezBIsprUiEgF2MA="; + cargoSha256 = "sha256-PLYU+J7xneZZOkJ+MEVTpgICIN3/Kunr7B+ryb4eZFk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 14d8537ee223f7f0b0284f6e6a3ce73f5ead060d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 02:42:49 +0000 Subject: [PATCH 055/140] fluent-bit: 2.0.6 -> 2.0.8 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index c0f2a9683e32..2c78a0a62136 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.6"; + version = "2.0.8"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-DUMsNuu1sdtkWCX5yweFcjbRcDRHhZYLku4mTmQqXDk="; + sha256 = "sha256-kgjLjGloudigDTP6K4W8Tv42uK/dHyH1W2aI9+uh/ws="; }; nativeBuildInputs = [ cmake flex bison ]; From 9c503f72543a009e36adfa8d95dbecb30d9de65c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 03:01:13 +0000 Subject: [PATCH 056/140] pipecontrol: 0.2.4 -> 0.2.8 --- pkgs/applications/audio/pipecontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index a2abab72ec69..dacfd63164af 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.4"; + version = "0.2.8"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3faJMkvjAY6A5ieNpAxjk6BHPb6uCvYYfwrI9/Iskg="; + sha256 = "sha256-x33L/oLgJFiHp19FzinVuGT9k73wOhdSaTTemq52ZVg="; }; nativeBuildInputs = [ From 7f64e371c182a8018fde2eda5f1b44bf118a5e8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 03:42:13 +0000 Subject: [PATCH 057/140] steamtinkerlaunch: 11.11 -> 12.0 --- pkgs/tools/games/steamtinkerlaunch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/tools/games/steamtinkerlaunch/default.nix index 3098bd2912e6..d780ba1ddf61 100644 --- a/pkgs/tools/games/steamtinkerlaunch/default.nix +++ b/pkgs/tools/games/steamtinkerlaunch/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "steamtinkerlaunch"; - version = "11.11"; + version = "12.0"; src = fetchFromGitHub { owner = "sonic2kk"; repo = pname; rev = "v${version}"; - hash = "sha256-rWENtgV6spokzkhnmrrzsAQ19dROJ50ofEulU5Jx5IE="; + hash = "sha256-cEGERh0INc/xetQhALqc+lp/HNDoy3JdTZr/nHlthYc="; }; # hardcode PROGCMD because #150841 From 7337718da22610a7248eca65d32b6108d38b82b7 Mon Sep 17 00:00:00 2001 From: Peter Nguyen Date: Sun, 25 Dec 2022 21:58:18 -0600 Subject: [PATCH 058/140] devbox: 0.1.2 -> 0.2.0 --- pkgs/development/tools/devbox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index f2a82621dd7b..ea24dfe5fcd3 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,25 +5,25 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-AUZPMNGhYimoqcFNeYg5lj3NGDnna5XE4plC9eEDVXg="; + hash = "sha256-zfNVx3u4MtpVzxTK1yvLvPJcHUGcCFwZlGL0rZeCt4M="; }; ldflags = [ "-s" "-w" - "-X go.jetpack.io/devbox/build.Version=${version}" + "-X go.jetpack.io/devbox/internal/build.Version=${version}" ]; # integration tests want file system access doCheck = false; - vendorHash = "sha256-tnQCRrpOI1qgsouI7pLO4gLTDwEiHZV1KeNSy07wS4o="; + vendorHash = "sha256-KQu1Ik15YR3R+taqOJI9jUlGiVJDkVhytxPTl4sCQOk="; nativeBuildInputs = [ installShellFiles ]; From bb73112a647df66bf90b6b4485a302fd3eecbbe7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 07:01:59 +0000 Subject: [PATCH 059/140] bun: 0.3.0 -> 0.4.0 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 815351d48220..817e32e4921c 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "CPoSo8Kqu87c0bF4J2KSoamz6bsfS/DnkYqRi+XL8Qw="; + sha256 = "T+vxwYM0zc1HsPiBncZolIquglKThsx2RDOS3/jPn4s="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "0ymZ4cYJn3Qth4jiTeXuAAsY0wFrYO2OHumY5WLamME="; + sha256 = "AEo4xXnePlQYTXepwSDUaG8NczPdTCbPGPzxgH+/HHo="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "8f5w+wu1vId0R7UQsdbi/yopw1R00lR9ibEAOYwUglI="; + sha256 = "w66xgmVepmC543apTTGLfeV3FMsLiiUpfqzzRhpaNy8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "bnuz+n8pAhBUgQKImCUKRZCwIqGHHaB3KtZOVfqy4Zw="; + sha256 = "LMutdGNiGp4aLmeqMLk8Pc0xIjqgWPO6GSli1EfTgkY="; }; }; updateScript = writeShellScript "update-bun" '' From 2452bd1c491fbfa213eea77ce57066777535a69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Sun, 18 Dec 2022 16:54:13 +0100 Subject: [PATCH 060/140] osv-scanner: init at 1.0.2 --- pkgs/tools/security/osv-scanner/default.nix | 42 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/osv-scanner/default.nix diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix new file mode 100644 index 000000000000..192d9f13b0ff --- /dev/null +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, osv-scanner +}: +buildGoModule rec { + pname = "osv-scanner"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + hash = "sha256-RmR6ZJg+UkE+eSmz4hGuMlObl6UvnGKNoLtBGVKoQ8Q="; + }; + + vendorHash = "sha256-HUgzoQuWBRnt8+lCiu9QfO1XR5EMnqVIkrL+nIMf0IA="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=n/a" + "-X main.date=1970-01-01T00:00:00Z" + ]; + + # Tests require network connectivity to query https://api.osv.dev. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = osv-scanner; + }; + + meta = with lib; { + description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev"; + homepage = "https://github.com/google/osv-scanner"; + changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ stehessel urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ccdec4f5573..dd227ff6aa72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5164,6 +5164,8 @@ with pkgs; osv-detector = callPackage ../tools/security/osv-detector {}; + osv-scanner = callPackage ../tools/security/osv-scanner {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; From 4b7e72757bca2ed3f8dd41ec9fa29821e7f5a262 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Dec 2022 12:41:33 -0500 Subject: [PATCH 061/140] cargo-zigbuild: 0.14.2 -> 0.14.3 Diff: https://github.com/messense/cargo-zigbuild/compare/v0.14.2...v0.14.3 Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.14.3 --- pkgs/development/tools/rust/cargo-zigbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index f0e7e4577e07..496c8768ed46 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-koEKWtcpkxK2h562ZIjM0PvvLit7TMo03Ikg2SLMEWM="; + sha256 = "sha256-OHr+VCYt+w1VWv6XAfMZv0I7IZJ1m0UtErgMonGytns="; }; - cargoSha256 = "sha256-CAaSnnCL+F1av6UYj4QKMEEXSFIAKroBQxew4SO1oU8="; + cargoSha256 = "sha256-tOJNQLPWpCqHCFRk85PW91axUTljo8YoeWUpPrl8P4c="; nativeBuildInputs = [ makeWrapper ]; From 6cd7a38207fa2e4f227e0c537d61f895993a2735 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 26 Dec 2022 13:20:45 -0500 Subject: [PATCH 062/140] insync: remove benley from maintainers --- pkgs/applications/networking/insync/default.nix | 2 +- pkgs/applications/networking/insync/v3.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index feeb87ab3fe2..0c96262fff67 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.benley ]; + maintainers = [ ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index cf68308176fa..933d2288069a 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' From 5880a6a2c8a7ea31896b8aa642fa2bf8b458c89d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Dec 2022 20:04:56 +0100 Subject: [PATCH 063/140] webkitgtk: 2.38.2 -> 2.38.3 https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html https://webkitgtk.org/security/WSA-2022-0011.html Fixes: CVE-2022-42852, CVE-2022-42856, CVE-2022-42867, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699, CVE-2022-46700 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d226270c7954..e925b6891027 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.2"; + version = "2.38.3"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4="; + hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; }; patches = lib.optionals stdenv.isLinux [ From c5f3de74cad8fa425fd249689c8bbdd24421f9ab Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Mon, 26 Dec 2022 20:38:45 +0100 Subject: [PATCH 064/140] stt: 0.9.3 -> 1.4.0 Closes #193775 --- pkgs/tools/audio/stt/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 91e18f409a21..31256c191ecc 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook }: +{ stdenv, lib, fetchurl, autoPatchelfHook, bzip2, lzma }: stdenv.mkDerivation rec { pname = "stt"; - version = "0.9.3"; + version = "1.4.0"; src = fetchurl { - url = "https://github.com/coqui-ai/STT/releases/download/v${version}/native_client.tf.Linux.tar.xz"; - sha256 = "0axwys8vis4f0m7d1i2r3dfqlc8p3yj2nisvc7pdi5qs741xgy8w"; + url = "https://github.com/coqui-ai/STT/releases/download/v${version}/native_client.tflite.Linux.tar.xz"; + hash = "sha256-RVYc64pLYumQoVUEFZdxfUUaBMozaqgD0h/yiMaWN90="; }; setSourceRoot = "sourceRoot=`pwd`"; @@ -15,12 +15,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + bzip2 + lzma stdenv.cc.cc.lib ]; installPhase = '' install -D stt $out/bin/stt install -D coqui-stt.h $out/include/coqui-stt.h + install -D libkenlm.so $out/lib/libkenlm.so + install -D libsox.so.3 $out/lib/libsox.so.3 install -D libstt.so $out/lib/libstt.so ''; From fa5ee424e499ecb2a763265a5af4acdb69d3a10a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Dec 2022 20:55:25 +0100 Subject: [PATCH 065/140] chezmoi: add changelog to meta --- pkgs/tools/misc/chezmoi/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 560dbb056d45..e0be716b0430 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "chezmoi"; @@ -8,10 +12,10 @@ buildGoModule rec { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-IZzYW3ynrZJlPgyziwMwysz4ujoFZw4lGBkUFDwjeV0="; + hash = "sha256-IZzYW3ynrZJlPgyziwMwysz4ujoFZw4lGBkUFDwjeV0="; }; - vendorSha256 = "sha256-spZEl3GyJsO5qa77kZlpK1X2jv3EgZwG+8Gz+Zi9Vvc="; + vendorHash = "sha256-spZEl3GyJsO5qa77kZlpK1X2jv3EgZwG+8Gz+Zi9Vvc="; doCheck = false; @@ -32,6 +36,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://www.chezmoi.io/"; description = "Manage your dotfiles across multiple machines, securely"; + changelog = "https://github.com/twpayne/chezmoi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jhillyerd ]; }; From 49ab84dbe74b0465c4f91e913a5af94b5b857054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 20:25:11 +0000 Subject: [PATCH 066/140] sq: 0.16.0 -> 0.18.2 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 602358fe99dd..95d32874ee36 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,18 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: buildGoModule rec { pname = "sq"; - version = "0.16.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0BpQDlLWERm8UOcmxAVH5aWBGrcdV64YB7S+3etOtU0="; + sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-tzq22S3fuaxOIoXL1mMPV90El8cUwzm2XSaiDHIuc4g="; + vendorSha256 = "sha256-OHgdvitHi2f/svn0QDlknmteii+5rLKaZ7f7VJ+7H4w="; # Some tests violates sandbox constraints. doCheck = false; From da4fd3a5a92ad795abef7b9deac8739599782953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 20:51:55 +0000 Subject: [PATCH 067/140] python310Packages.vertica-python: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 3b994b7e50d0..b1cfaf72a2f8 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3t9W12tnZztNV6E/f5br3FeznqZQuT6/DAXrbR0sDAU="; + hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM="; }; propagatedBuildInputs = [ From 3bd39a37c24bbee27c02829f67ec266f161fd4c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 23:16:37 +0000 Subject: [PATCH 068/140] python310Packages.hydra: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/hydra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 6d6899822010..cbd2502305bd 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "hydra"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "facebookresearch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0Wl1TaWZTD6y/SC+7CWKoBfe80lJLmg6DbFJsccSO4M="; + hash = "sha256-4FOh1Jr+LM8ffh/xcAqMqKudKbXb2DZdxU+czq2xwxs="; }; nativeBuildInputs = [ From 4d496b29af7e1a5f6e1a21d47c2ef8417e22e4ff Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 26 Dec 2022 23:27:19 +0000 Subject: [PATCH 069/140] olaris-server: 0.4.0 -> unstable-2022-06-11 As called out in the linked issue below, olaris-server has a runtime dependency on ffmpeg. Unfortunately, 0.4.0 requires a custom fork of ffmpeg. While we could fetch the upstream compiled artefact or build it ourselves, the former was unpalatable and the latter prohibitively difficult. As such, we have bumped to the, yet to be released, tip of the default branch, which has merged support for upstream ffmpeg. Fixes #207877 --- pkgs/servers/olaris/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/olaris/default.nix b/pkgs/servers/olaris/default.nix index 2561fed1dc60..29966aadc692 100644 --- a/pkgs/servers/olaris/default.nix +++ b/pkgs/servers/olaris/default.nix @@ -1,14 +1,21 @@ -{ buildGoModule, fetchFromGitLab, fetchzip, installShellFiles, lib }: +{ buildGoModule +, fetchFromGitLab +, fetchzip +, ffmpeg +, installShellFiles +, lib +, makeWrapper +}: buildGoModule rec { pname = "olaris-server"; - version = "0.4.0"; + version = "unstable-2022-06-11"; src = fetchFromGitLab { - owner = "olaris"; + owner = "olaris"; repo = pname; - rev = "v${version}"; - hash = "sha256-iworyQqyTabTI0NpZHTdUBGZSCaiC5Dhr69mRtsHLOs="; + rev = "bdb2aeb1595c941210249164a97c12404c1ae0d8"; + hash = "sha256-Uhnh6GC85ORKnfHeYNtbSA40osuscxXDF5/kXJrF2Cs="; }; preBuild = let @@ -29,9 +36,9 @@ buildGoModule rec { "-X gitlab.com/olaris/olaris-server/helpers.Version=${version}" ]; - vendorHash = "sha256-xWywDgw0LzJhPtVK0aGgT0TTanejJ39ZmGc50A3d68U="; + vendorHash = "sha256-bw8zvDGFBci9bELsxAD0otpNocBnO8aAcgyohLZ3Mv0="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; # integration tests require network access doCheck = false; @@ -41,6 +48,7 @@ buildGoModule rec { --bash <($out/bin/olaris-server completion bash) \ --fish <($out/bin/olaris-server completion fish) \ --zsh <($out/bin/olaris-server completion zsh) + wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ffmpeg]} ''; meta = with lib; { From d57af94bdeab4e7ec068945c63d632f8b43eed05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 00:54:45 +0000 Subject: [PATCH 070/140] python310Packages.scikit-hep-testdata: 0.4.24 -> 0.4.25 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index a4fc84d2f66b..1c6c2a1d640e 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.24"; + version = "0.4.25"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Q9yyzwFQpqN3Q1SmNKDBxdo51uMqKp8xJ9Ilo9eCTV0="; + sha256 = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; }; nativeBuildInputs = [ From d38feecb89d11effbeaf3d183d68a7b56dbcf0f3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Dec 2022 20:06:49 -0500 Subject: [PATCH 071/140] sq: fix build on darwin --- pkgs/development/tools/sq/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 95d32874ee36..d150332ae63e 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,4 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: + buildGoModule rec { pname = "sq"; version = "0.18.2"; @@ -10,15 +11,19 @@ buildGoModule rec { sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; }; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-IRuwX+VF0ltASTt/QKlZ3A00tgDhc9qpBfzhINp3HgQ="; - vendorSha256 = "sha256-OHgdvitHi2f/svn0QDlknmteii+5rLKaZ7f7VJ+7H4w="; + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; # Some tests violates sandbox constraints. doCheck = false; ldflags = [ - "-s" "-w" "-X github.com/neilotoole/sq/cli/buildinfo.Version=${version}" + "-s" + "-w" + "-X=github.com/neilotoole/sq/cli/buildinfo.Version=${version}" ]; postInstall = '' From 6ef390adbf7b83504d5fed981b8561e7c51031e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 01:24:03 +0000 Subject: [PATCH 072/140] python310Packages.django-storages: 1.13.1 -> 1.13.2 --- pkgs/development/python-modules/django-storages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 040fe39d2b50..97cb8a87d601 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s9mOzAnxsWJ8Kyz0MJZDIs5OCGF9v5tCNsFqModaHgs="; + sha256 = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; }; propagatedBuildInputs = [ django ]; From 1e92bc11fc459922b4ffa1169adab5e5cea3864b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 29 Oct 2022 12:44:23 +0200 Subject: [PATCH 073/140] mediaelch: switch from qt5 to qt6 --- pkgs/applications/misc/mediaelch/default.nix | 44 ++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 2db12da25758..295cab9ca160 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,22 +1,25 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub -, qmake +, cmake , qttools +, wrapQtAppsHook , curl , ffmpeg , libmediainfo , libzen +, qt5compat , qtbase , qtdeclarative , qtmultimedia , qtsvg +, qtwayland , quazip }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mediaelch"; version = "2.8.18"; @@ -28,20 +31,35 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake qttools ]; - - buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; - - qmakeFlags = [ - "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook ]; - postPatch = '' - substituteInPlace MediaElch.pro --replace "/usr" "$out" - ''; + buildInputs = [ + curl + ffmpeg + libmediainfo + libzen + qt5compat + qtbase + qtdeclarative + qtmultimedia + qtsvg + qtwayland + quazip + ]; + + cmakeFlags = [ + "-DDISABLE_UPDATER=ON" + "-DUSE_EXTERN_QUAZIP=ON" + "-DMEDIAELCH_FORCE_QT6=ON" + ]; + + # libmediainfo.so.0 is loaded dynamically qtWrapperArgs = [ - # libmediainfo.so.0 is loaded dynamically "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246647a2c1d..bbdd7ec18e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30555,7 +30555,7 @@ with pkgs; media-downloader = callPackage ../applications/video/media-downloader { }; - mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediaelch = qt6Packages.callPackage ../applications/misc/mediaelch { }; mediainfo = callPackage ../applications/misc/mediainfo { }; From bfb898bc7cba02d0758aa4aca34e25075cbe2faf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 24 Dec 2022 13:39:08 +0100 Subject: [PATCH 074/140] mediaelch: split qt5/6 --- pkgs/applications/misc/mediaelch/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 295cab9ca160..582d3186eaad 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -10,7 +10,7 @@ , ffmpeg , libmediainfo , libzen -, qt5compat +, qt5compat ? null # qt6 only , qtbase , qtdeclarative , qtmultimedia @@ -18,7 +18,9 @@ , qtwayland , quazip }: - +let + qtVersion = lib.versions.major qtbase.version; +in stdenv.mkDerivation rec { pname = "mediaelch"; version = "2.8.18"; @@ -42,20 +44,21 @@ stdenv.mkDerivation rec { ffmpeg libmediainfo libzen - qt5compat qtbase qtdeclarative qtmultimedia qtsvg qtwayland quazip + ] ++ lib.optional (qtVersion == "6") [ + qt5compat ]; cmakeFlags = [ "-DDISABLE_UPDATER=ON" "-DUSE_EXTERN_QUAZIP=ON" - "-DMEDIAELCH_FORCE_QT6=ON" + "-DMEDIAELCH_FORCE_QT${qtVersion}=ON" ]; # libmediainfo.so.0 is loaded dynamically diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbdd7ec18e55..146890c84cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30555,7 +30555,9 @@ with pkgs; media-downloader = callPackage ../applications/video/media-downloader { }; - mediaelch = qt6Packages.callPackage ../applications/misc/mediaelch { }; + mediaelch = mediaelch-qt5; + mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; mediainfo = callPackage ../applications/misc/mediainfo { }; From 474198f808502a76f636bb677a5d028d2ca5a5c9 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Mon, 26 Dec 2022 20:25:56 -0600 Subject: [PATCH 075/140] darwin.builder: Fix gratuitous rebuilds See the discussion starting here: https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1364760917 The `darwin.builder` derivation had a gratuitous dependency on the current Nixpkgs revision due to `config.system.nixos.revision`. Setting the revision explicitly to null fixes this problem and prevents the derivation from being rebuilt on every change to Nixpkgs. --- nixos/modules/profiles/macos-builder.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index 0cbac3bd61fe..15fad007bd3e 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -93,7 +93,12 @@ in }; }); - system.stateVersion = "22.05"; + system = { + # To prevent gratuitous rebuilds on each change to Nixpkgs + nixos.revision = null; + + stateVersion = "22.05"; + }; users.users."${user}"= { isNormalUser = true; From 48adc1627bc7efc33f0f964cc2eafea0b1902f71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 02:55:55 +0000 Subject: [PATCH 076/140] python39Packages.nvidia-ml-py: 11.515.48 -> 11.515.75 --- pkgs/development/python-modules/nvidia-ml-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 3adb6f829ab2..64ecf95ef5d2 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.515.48"; + version = "11.515.75"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-iNLQu9c8Q3B+FXMObRTtxqE3B/siJIlIlCH6T0rX+sY="; + hash = "sha256-48dfBtWjIB3FETbgDljFwTKzvl1gTYbBQ0Jq205BxJA="; }; patches = [ From c09bdb1fc4557b310a41bc1a01c58a1e32d55c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 03:05:25 +0000 Subject: [PATCH 077/140] python39Packages.ezyrb: 1.3.0.post2209 -> 1.3.0.post2212 --- pkgs/development/python-modules/ezyrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index e3f6419871f9..21741fac030c 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2209"; + version = "1.3.0.post2212"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jybDVPUybIuTeWRAA0cphb2pDVobuMX1OufBavZ/ZbQ="; + sha256 = "sha256-Em7t84fCTYCJfsjLGKhno75PheALhSbLH7z1mfgQ+v4="; }; propagatedBuildInputs = [ From e9b3984fb84beea1ace89b08d438ce0c2a24ce98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 03:44:03 +0000 Subject: [PATCH 078/140] snappymail: 2.23.0 -> 2.24.1 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index e4c7dd052d44..21f8433c9946 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.23.0"; + version = "2.24.1"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-wOHp0hNxpDa6JPDaGNHG2+TL+YTP3GaKLab/PdxtU20="; + sha256 = "sha256-8gnTNSVi508EMkSbevmYBMpjqJJvtgkh6WjvcBhDXZE="; }; sourceRoot = "snappymail"; From afe8e763cbd72af124011d641218d627f0d66435 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 03:07:20 +0000 Subject: [PATCH 079/140] =?UTF-8?q?terraform-providers.libvirt:=200.7.0=20?= =?UTF-8?q?=E2=86=92=200.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c45ca027e611..1542c2ba0423 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -661,11 +661,11 @@ "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { - "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", + "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", "repo": "terraform-provider-libvirt", - "rev": "v0.7.0", + "rev": "v0.7.1", "spdx": "Apache-2.0", "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, From 8dfafb3d9c871754ced1647ab94dcc1ca9e29c6c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 03:07:40 +0000 Subject: [PATCH 080/140] =?UTF-8?q?terraform-providers.ksyun:=201.3.60=20?= =?UTF-8?q?=E2=86=92=201.3.61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1542c2ba0423..5f50b33f059c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -625,11 +625,11 @@ "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { - "hash": "sha256-B8ficMkGmChPFxCDULcDtIusH+gil3w+yJo4B/nahzg=", + "hash": "sha256-vmENjW/r+d6UWdq8q/x9kO16CQkRVQRdBYAFkBKa1vI=", "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", "repo": "terraform-provider-ksyun", - "rev": "v1.3.60", + "rev": "v1.3.61", "spdx": "MPL-2.0", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, From 77e33fa1bf83a2a3ae2631b7619f0307cc5971e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 03:09:19 +0000 Subject: [PATCH 081/140] =?UTF-8?q?terraform-providers.sentry:=200.10.0=20?= =?UTF-8?q?=E2=86=92=200.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5f50b33f059c..69dab424dd4a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -996,13 +996,13 @@ "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { - "hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=", + "hash": "sha256-hzSNgRaAZIClElIdmbhO36jYuDN6YELkHzGyFOrNw3w=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.10.0", + "rev": "v0.11.0", "spdx": "MIT", - "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=" + "vendorHash": "sha256-//0Ijxgm4+b5TZHgBkLb8l6v1DEgEUJSgwcdVt8ys8o=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From 53ea61b4536a15622f2ad2234ba8e938d69806c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 04:02:44 +0000 Subject: [PATCH 082/140] python310Packages.pglast: 4.0 -> 4.1 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 03ff7c6ed240..0ef677155b6e 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "4.0"; + version = "4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GmDM+90joF3+IHjUibeNZX54z6jR8rCC+R/fcJ03dHM="; + hash = "sha256-JXgU2uoMhfqKlQOksbdYZtnJbs7UZKlTxZNo7OIGEig="; }; propagatedBuildInputs = [ From 35cea3b24c1fb38908920bc15b417a46e6dbceaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 05:25:19 +0000 Subject: [PATCH 083/140] vals: 0.19.0 -> 0.21.0 --- pkgs/tools/security/vals/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index d886908389c3..cce4aefdfc19 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-0TO8aN1qKpGQnec6hKph6EHkRWb1dfHtyRdFYX0BjM0="; + sha256 = "sha256-yRHWhvbXpKrjJJ/Xwm3IVVOMyilFUvmsjPcDcciFc9U="; }; - vendorSha256 = "sha256-wxM8g553DCkoL09Icz+HoXB98z1f6mm4qzk01k09++0="; + vendorSha256 = "sha256-l837w2K3GsDTb9EEeYPfyrnkRSkv0FyoPr29Ud+iiJ8="; ldflags = [ "-s" From b9c1fc696155934cb9a91ba19281b7e37467da21 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Dec 2022 08:17:08 +0100 Subject: [PATCH 084/140] ocamlPackages.multipart-form-data: init at 0.3.0 --- .../multipart-form-data/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/multipart-form-data/default.nix diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix new file mode 100644 index 000000000000..126e77f6f240 --- /dev/null +++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildDunePackage +, lwt, lwt_ppx, stringext +, alcotest }: + +buildDunePackage rec { + pname = "multipart-form-data"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "cryptosense"; + repo = pname; + rev = version; + hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII="; + }; + + nativeBuildInputs = [ lwt_ppx ]; + propagatedBuildInputs = [ lwt stringext ]; + + duneVersion = "3"; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Parser for multipart/form-data (RFC2388)"; + homepage = "https://github.com/cryptosense/multipart-form-data"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 27d42a85c5a8..20bd8520cd8c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -934,6 +934,8 @@ let mtime = callPackage ../development/ocaml-modules/mtime { }; + multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; + mustache = callPackage ../development/ocaml-modules/mustache { }; netchannel = callPackage ../development/ocaml-modules/netchannel { }; From b169e34beb97288fda1bffb05dc727f6f4717a11 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Dec 2022 08:42:31 +0100 Subject: [PATCH 085/140] ocamlPackages.httpaf-lwt-unix: init at 0.7.1 --- .../ocaml-modules/httpaf/lwt-unix.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpaf/lwt-unix.nix diff --git a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix new file mode 100644 index 000000000000..9b78d7bf6401 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage +, httpaf +, faraday-lwt-unix +, lwt +}: + +buildDunePackage { + pname = "httpaf-lwt-unix"; + inherit (httpaf) version src; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + faraday-lwt-unix + httpaf + lwt + ]; + + meta = httpaf.meta // { + description = "Lwt support for http/af"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 20bd8520cd8c..885009594229 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -610,6 +610,8 @@ let httpaf = callPackage ../development/ocaml-modules/httpaf { }; + httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + index = callPackage ../development/ocaml-modules/index { }; inifiles = callPackage ../development/ocaml-modules/inifiles { }; From 55d12597f348363b83f491df3bb2946d4b32d409 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Dec 2022 08:48:25 +0100 Subject: [PATCH 086/140] ocamlPackages.rock: init at 0.20.0 --- .../ocaml-modules/rock/default.nix | 35 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/ocaml-modules/rock/default.nix diff --git a/pkgs/development/ocaml-modules/rock/default.nix b/pkgs/development/ocaml-modules/rock/default.nix new file mode 100644 index 000000000000..ae484e937b83 --- /dev/null +++ b/pkgs/development/ocaml-modules/rock/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, buildDunePackage +, bigstringaf +, hmap +, httpaf +, lwt +, sexplib0 +}: + +buildDunePackage rec { + pname = "rock"; + version = "0.20.0"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; + hash = "sha256-MmuRhm3pC69TX4t9Sy/yPjnZUuVzwEs8E/EFS1n/L7Y="; + }; + + propagatedBuildInputs = [ + bigstringaf + hmap + httpaf + lwt + sexplib0 + ]; + + meta = { + description = "Minimalist framework to build extensible HTTP servers and clients"; + homepage = "https://github.com/rgrinberg/opium"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 885009594229..6a8ce3aec370 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1204,6 +1204,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + rock = callPackage ../development/ocaml-modules/rock { }; + samplerate = callPackage ../development/ocaml-modules/samplerate { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { From a164dca9c9e54323e0edea889762716f53050955 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Dec 2022 08:58:26 +0100 Subject: [PATCH 087/140] =?UTF-8?q?ocamlPackages.opium:=200.18.0=20?= =?UTF-8?q?=E2=86=92=200.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/opium/default.nix | 70 +++++++++++++------ .../ocaml-modules/opium_kernel/default.nix | 44 ------------ pkgs/top-level/ocaml-packages.nix | 2 - 3 files changed, 50 insertions(+), 66 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/opium_kernel/default.nix diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 5db3d1b4a241..b98d892696ec 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -1,32 +1,62 @@ { buildDunePackage - -, ppx_sexp_conv -, ppx_fields_conv - +, lib +, fetchurl +, astring +, base64 , cmdliner -, cohttp-lwt-unix +, fmt +, httpaf +, httpaf-lwt-unix , logs , magic-mime -, opium_kernel -, stringext - -, alcotest +, mirage-crypto +, mtime +, multipart-form-data +, ptime +, re +, rock +, tyxml +, uri +, yojson +, alcotest-lwt }: -buildDunePackage { +buildDunePackage rec { pname = "opium"; - inherit (opium_kernel) version src meta minimumOCamlVersion; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; - useDune2 = true; - - doCheck = true; - - buildInputs = [ - ppx_sexp_conv ppx_fields_conv - alcotest - ]; + inherit (rock) src version; propagatedBuildInputs = [ - opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext + astring + base64 + cmdliner + fmt + httpaf + httpaf-lwt-unix + logs + magic-mime + mirage-crypto + mtime + multipart-form-data + ptime + re + rock + tyxml + uri + yojson ]; + + doCheck = true; + checkInputs = [ + alcotest-lwt + ]; + + meta = { + description = "OCaml web framework"; + homepage = "https://github.com/rgrinberg/opium"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmahoney ]; + }; } diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix deleted file mode 100644 index 6b51443df232..000000000000 --- a/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildDunePackage -, fetchurl - -, ppx_fields_conv -, ppx_sexp_conv - -, cohttp-lwt -, ezjsonm -, hmap -, sexplib -, fieldslib -}: - -buildDunePackage rec { - pname = "opium_kernel"; - version = "0.18.0"; - - useDune2 = true; - - minimumOCamlVersion = "4.04.1"; - - src = fetchurl { - url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; - sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q"; - }; - - doCheck = true; - - buildInputs = [ - ppx_sexp_conv ppx_fields_conv - ]; - - propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm sexplib fieldslib - ]; - - meta = { - description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; - homepage = "https://github.com/rgrinberg/opium"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.pmahoney ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6a8ce3aec370..0f9762d8157b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1108,8 +1108,6 @@ let opium = callPackage ../development/ocaml-modules/opium { }; - opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; - opti = callPackage ../development/ocaml-modules/opti { }; optint = callPackage ../development/ocaml-modules/optint { }; From 42943086571097d24157ae7424009225564a412c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 07:46:15 +0000 Subject: [PATCH 088/140] python39Packages.coinmetrics-api-client: 2022.9.22.15 -> 2022.11.14.16 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 11b3f859d0a2..babe6614fcb7 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2022.9.22.15"; + version = "2022.11.14.16"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-37tuZDsGQAmbWSEGc7rjrXtCoSxuBN3MDMmjWHr0eS4="; + hash = "sha256-2x8S9Jj/1bBnhXS/x0lQ8YUQkCvfpgGcDSQU2dGbAn0="; }; nativeBuildInputs = [ poetry-core ]; From 9c748218f252c39e51dc801bac50361c832778a5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 20 Dec 2022 15:44:42 -0500 Subject: [PATCH 089/140] itk: unstable -> 5.3.0 --- pkgs/applications/graphics/c3d/default.nix | 4 ++-- pkgs/applications/science/biology/ants/default.nix | 4 ++-- pkgs/development/libraries/itk/5.2.x.nix | 5 +++++ pkgs/development/libraries/itk/5.x.nix | 4 ++-- pkgs/development/libraries/itk/generic.nix | 2 ++ pkgs/development/libraries/itk/unstable.nix | 5 ----- .../libraries/science/biology/elastix/default.nix | 4 ++-- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/itk/5.2.x.nix delete mode 100644 pkgs/development/libraries/itk/unstable.nix diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index e38ca908fe07..58af10640484 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk_5_2, Cocoa }: stdenv.mkDerivation rec { pname = "c3d"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] + buildInputs = [ itk_5_2 ] ++ lib.optional stdenv.isDarwin Cocoa; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index debd69733aa7..8a143d36a29b 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/development/libraries/itk/5.2.x.nix b/pkgs/development/libraries/itk/5.2.x.nix new file mode 100644 index 000000000000..e50f2bbca494 --- /dev/null +++ b/pkgs/development/libraries/itk/5.2.x.nix @@ -0,0 +1,5 @@ +import ./generic.nix rec { + version = "5.2.1"; + rev = "v${version}"; + sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; +} diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix index e50f2bbca494..765b464e46a1 100644 --- a/pkgs/development/libraries/itk/5.x.nix +++ b/pkgs/development/libraries/itk/5.x.nix @@ -1,5 +1,5 @@ import ./generic.nix rec { - version = "5.2.1"; + version = "5.3.0"; rev = "v${version}"; - sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; + sourceSha256 = "sha256-+qCd8Jzpl5fEPTUpLyjjFBkfgCn3+Lf4pi8QnjCwofs="; } diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 0d742b393b1d..0408aed50a05 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ --replace "-mtune=native" "" + substituteInPlace Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in \ + --replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@" ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ''; diff --git a/pkgs/development/libraries/itk/unstable.nix b/pkgs/development/libraries/itk/unstable.nix deleted file mode 100644 index bb64d4afca9a..000000000000 --- a/pkgs/development/libraries/itk/unstable.nix +++ /dev/null @@ -1,5 +0,0 @@ -import ./generic.nix { - version = "unstable-2022-07-02"; - rev = "5e7aea957c82b67d4364b2b88999805616e3b01d"; - sourceSha256 = "sha256-tjkoaHCuVdvgE6X+7Kb8mt9oxINWs4R0xD9cxdEeYKk="; -} diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 84762414fef9..4fd4c0c130f0 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 71a3b7ffee72..2990bc25e9d4 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: +{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk_5_2 }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk ]; + buildInputs = [ lua itk_5_2 ]; # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e12fb5b65579..9b260e9ac45a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20065,11 +20065,11 @@ with pkgs; nodejs = nodejs-14_x; }; - itk_5 = callPackage ../development/libraries/itk/5.x.nix { + itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - itk-unstable = callPackage ../development/libraries/itk/unstable.nix { + itk_5 = callPackage ../development/libraries/itk/5.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From ba71dea8b1fa0c50b059050dae5f448a1ba7cf45 Mon Sep 17 00:00:00 2001 From: bland Date: Mon, 26 Dec 2022 02:01:08 -0600 Subject: [PATCH 090/140] debootstrap: Add xz to PATH to support archives that only publish Packages.xz --- pkgs/tools/misc/debootstrap/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 9465d412b046..82bc5585cabf 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, coreutils, util-linux -, gnugrep, gnupg1, gnutar, gnused, gzip, makeWrapper }: +, gnugrep, gnupg1, gnutar, gnused, gzip, xz, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? let binPath = lib.makeBinPath [ @@ -13,6 +13,7 @@ let binPath = lib.makeBinPath [ gzip perl wget + xz ]; in stdenv.mkDerivation rec { pname = "debootstrap"; From 813159a4264a1cacd2a0ebed863ac3b041f1ebb9 Mon Sep 17 00:00:00 2001 From: bland Date: Mon, 26 Dec 2022 02:03:08 -0600 Subject: [PATCH 091/140] debootstrap: Add bzip2 and ar to PATH --- pkgs/tools/misc/debootstrap/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 82bc5585cabf..2f34fb1e5645 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, coreutils, util-linux +{ lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, binutils, bzip2, coreutils, util-linux , gnugrep, gnupg1, gnutar, gnused, gzip, xz, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? let binPath = lib.makeBinPath [ + binutils + bzip2 coreutils dpkg gawk From 363980f93d89a23d759caed71beadf9fa0192d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Dec 2022 21:06:50 +0100 Subject: [PATCH 092/140] bash: remove ? null inputs, other little cleanups --- pkgs/shells/bash/5.1.nix | 48 +++++++++++++++------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 0dbfd77bf0e7..458210873a68 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,23 +1,18 @@ { lib, stdenv , buildPackages , fetchurl -, binutils ? null +, binutils , bison , util-linux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin -, readline ? null +, readline , withDocs ? false -, texinfo ? null +, texinfo , forFHSEnv ? false }: -with lib; - -assert interactive -> readline != null; -assert withDocs -> texinfo != null; -assert stdenv.hostPlatform.isDarwin -> binutils != null; let upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl { url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}"; @@ -25,7 +20,7 @@ let }); in stdenv.mkDerivation rec { - name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; + name = "bash-${lib.optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; version = "5.1"; src = fetchurl { @@ -37,14 +32,14 @@ stdenv.mkDerivation rec { # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 # or you can check libc/include/sys/cdefs.h in bionic source code - ++ optional (stdenv.hostPlatform.libc == "bionic") "fortify"; + ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; outputs = [ "out" "dev" "man" "doc" "info" ]; NIX_CFLAGS_COMPILE = '' -DSYS_BASHRC="/etc/bashrc" -DSYS_BASH_LOGOUT="/etc/bash_logout" - '' + optionalString (!forFHSEnv) '' + '' + lib.optionalString (!forFHSEnv) '' -DDEFAULT_PATH_VALUE="/no-such-path" -DSTANDARD_UTILS_PATH="/no-such-path" '' + '' @@ -59,18 +54,18 @@ stdenv.mkDerivation rec { configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "bash_cv_job_control_missing=nomissing" "bash_cv_sys_named_pipes=nomissing" "bash_cv_getcwd_malloc=yes" - ] ++ optionals stdenv.hostPlatform.isCygwin [ + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "--without-libintl-prefix" "--without-libiconv-prefix" "--with-installed-readline" "bash_cv_dev_stdin=present" "bash_cv_dev_fd=standard" "bash_cv_termcap_lib=libncurses" - ] ++ optionals (stdenv.hostPlatform.libc == "musl") [ + ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--without-bash-malloc" "--disable-nls" ]; @@ -79,14 +74,14 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ] - ++ optional withDocs texinfo - ++ optional stdenv.hostPlatform.isDarwin binutils; + ++ lib.optional withDocs texinfo + ++ lib.optional stdenv.hostPlatform.isDarwin binutils; - buildInputs = optional interactive readline; + buildInputs = lib.optional interactive readline; enableParallelBuilding = true; - makeFlags = optionals stdenv.hostPlatform.isCygwin [ + makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [ "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a" "SHOBJ_LIBS=-lbash" ]; @@ -110,12 +105,13 @@ stdenv.mkDerivation rec { rm -rf "$out/share" "$out/bin/bashbug" ''; + passthru = { + shellPath = "/bin/bash"; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/bash/"; - description = - "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); - + description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + lib.optionalString interactive " (for interactive use)"; longDescription = '' Bash is the shell, or command language interpreter, that will appear in the GNU operating system. Bash is an sh-compatible @@ -126,17 +122,9 @@ stdenv.mkDerivation rec { interactive use. In addition, most sh scripts can be run by Bash without modification. ''; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; - mainProgram = "bash"; }; - - passthru = { - shellPath = "/bin/bash"; - }; } From d97726bb767167a9baf67979bd37b3a1d45aa83e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Dec 2022 10:54:18 +1000 Subject: [PATCH 093/140] bat: add completion patch --- pkgs/tools/misc/bat/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index cc52d952eee3..81870cd492f1 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -8,6 +8,7 @@ , libiconv , installShellFiles , makeWrapper +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -22,6 +23,16 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-ye6GH4pcI9h1CNpobUzfJ+2WlqJ98saCdD77AtSGafg="; + cargoPatches = [ + # merged upstream in https://github.com/sharkdp/bat/pull/2399 + (fetchpatch { + name = "disable-completion-of-cache-subcommand.patch"; + url = "https://github.com/sharkdp/bat/commit/b6b9d3a629bd9b08725df2a4e7b92c3023584a89.patch"; + hash = "sha256-G4LajO09+qfhpr+HRvAHCuE9EETit2e16ZEyAtz26B4="; + excludes = [ "CHANGELOG.md" ]; + }) + ]; + nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; From ec36ffd7cc683b72913514f1db64c9dca3478375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 08:48:16 +0000 Subject: [PATCH 094/140] polymake: 4.7 -> 4.8 --- pkgs/applications/science/math/polymake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 073275e410b7..35b10210e3ff 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.7"; + version = "4.8"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-1qv+3gIsbM1xHh02S3ybkcvVkKS3OZDNNWfJt2nybmE="; + sha256 = "sha256-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; }; buildInputs = [ From 391de01d3c096de5fcde5e30311e7ceb6491a1ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:01:37 +0100 Subject: [PATCH 095/140] python39Packages.coinmetrics-api-client: use optional-dependencies for test deps --- .../coinmetrics-api-client/default.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index babe6614fcb7..ca6d28f83dc1 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -1,11 +1,23 @@ -{ buildPythonPackage, fetchPypi, lib, orjson, pandas, poetry-core -, pytestCheckHook, pytest-mock, pythonOlder, python-dateutil, requests, typer -, websocket-client }: +{ lib +, buildPythonPackage +, fetchPypi +, orjson +, pandas +, poetry-core +, pytestCheckHook +, pytest-mock +, pythonOlder +, python-dateutil +, requests +, typer +, websocket-client +}: buildPythonPackage rec { pname = "coinmetrics-api-client"; version = "2022.11.14.16"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { @@ -13,19 +25,26 @@ buildPythonPackage rec { hash = "sha256-2x8S9Jj/1bBnhXS/x0lQ8YUQkCvfpgGcDSQU2dGbAn0="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ - orjson python-dateutil requests typer websocket-client + orjson + python-dateutil + requests + typer + websocket-client ]; checkInputs = [ - pandas pytestCheckHook pytest-mock - ]; + ] ++ passthru.optional-dependencies.pandas; - pythonImportsCheck = [ "coinmetrics.api_client" ]; + pythonImportsCheck = [ + "coinmetrics.api_client" + ]; passthru = { optional-dependencies = { @@ -34,8 +53,8 @@ buildPythonPackage rec { }; meta = with lib; { + description = "Coin Metrics API v4 client library"; homepage = "https://coinmetrics.github.io/api-client-python/site/index.html"; - description = "Coin Metrics API v4 client library (Python)"; license = licenses.mit; maintainers = with maintainers; [ centromere ]; }; From 52e954da7c950ae52bb935f18d4f0ab87f96da5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 09:05:46 +0000 Subject: [PATCH 096/140] git-cliff: 0.10.0 -> 1.0.0 --- pkgs/applications/version-management/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index efc12299f941..1a122ef6c8f3 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.10.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-f7nM4airKOTXiYEMksTCm18BN036NQLLwNcKIlhuHWs="; + sha256 = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0="; }; - cargoSha256 = "sha256-wjqQAVQ1SCjD24aCwZorUhnfOKM+j9TkB84tLxeaNgo="; + cargoSha256 = "sha256-kWWg3Ul6SzULdW7oOmkz5Lm2FK1vF/TkggrZcNbIzck="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 581f37593551a90ae2a95c8f868b00ff03e45226 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:09:15 +0100 Subject: [PATCH 097/140] python310Packages.django-storages: add changelog to meta --- .../python-modules/django-storages/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 97cb8a87d601..b49e983c1a73 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,6 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , django - , azure-storage-blob , boto3 , dropbox @@ -15,10 +16,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; + hash = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; preCheck = '' export DJANGO_SETTINGS_MODULE=tests.settings @@ -27,6 +30,7 @@ buildPythonPackage rec { --replace 'test_accessed_time' 'dont_test_accessed_time' \ --replace 'test_modified_time' 'dont_test_modified_time' ''; + checkInputs = [ azure-storage-blob boto3 @@ -36,11 +40,14 @@ buildPythonPackage rec { paramiko ]; - pythonImportsCheck = [ "storages" ]; + pythonImportsCheck = [ + "storages" + ]; meta = with lib; { description = "Collection of custom storage backends for Django"; homepage = "https://django-storages.readthedocs.io"; + changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; From b089c076aa98cfcb58746b293908a09760ec3487 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:11:44 +0100 Subject: [PATCH 098/140] python310Packages.vertica-python: add changelog to meta --- pkgs/development/python-modules/vertica-python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index b1cfaf72a2f8..6a850fed990b 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; + changelog = "https://github.com/vertica/vertica-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ arnoldfarkas ]; }; From e6c672b59fa270b3053c46b2dde99e3e40e8ee1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:15:47 +0100 Subject: [PATCH 099/140] git-cliff: add changelog to meta --- .../version-management/git-cliff/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 1a122ef6c8f3..c159d95fad05 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: rustPlatform.buildRustPackage rec { pname = "git-cliff"; @@ -8,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0="; + hash = "sha256-2EaPVNRcSiXN43iazK5MkZ8ytiALlnYRCH2gEtlqBW0="; }; cargoSha256 = "sha256-kWWg3Ul6SzULdW7oOmkz5Lm2FK1vF/TkggrZcNbIzck="; @@ -16,11 +21,14 @@ rustPlatform.buildRustPackage rec { # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "A highly customizable Changelog Generator that follows Conventional Commit specifications"; homepage = "https://github.com/orhun/git-cliff"; + changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ siraben ]; }; From fc4b36771be28f05d2051c2d449b5736082e7e93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:20:07 +0100 Subject: [PATCH 100/140] polymake: add changelog to meta --- .../science/math/polymake/default.nix | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 35b10210e3ff..0eecff0a1798 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchurl -, perl, gmp, mpfr, flint, boost -, bliss, ppl, singular, cddlib, lrs, nauty -, ninja, ant, openjdk +{ lib +, stdenv +, fetchurl +, perl +, gmp +, mpfr +, flint +, boost +, bliss +, ppl +, singular +, cddlib +, lrs +, nauty +, ninja +, ant +, openjdk , perlPackages , makeWrapper }: @@ -21,18 +34,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; }; + nativeBuildInputs = [ + makeWrapper + ninja + ant + perl + ]; + buildInputs = [ - perl gmp mpfr flint boost - bliss ppl singular cddlib lrs nauty + perl + gmp + mpfr + flint + boost + bliss + ppl + singular + cddlib + lrs + nauty openjdk ] ++ (with perlPackages; [ - JSON TermReadLineGnu TermReadKey XMLSAX + JSON + TermReadLineGnu + TermReadKey + XMLSAX ]); - nativeBuildInputs = [ - makeWrapper ninja ant perl - ]; - ninjaFlags = [ "-C" "build/Opt" ]; postInstall = '' @@ -43,9 +71,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software for research in polyhedral geometry"; + homepage = "https://www.polymake.org/doku.php"; + changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.linux; - homepage = "https://www.polymake.org/doku.php"; }; } From a2080cf0b1ab7fc4b9448a4d9ad7b84f4f0c41d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:22:40 +0100 Subject: [PATCH 101/140] python310Packages.aliyun-python-sdk-cdn: 3.7.9 -> 3.7.10 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 023afd0482c5..f305aebecf5e 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.9"; + version = "3.7.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EdHsg/e9ANj191MVpFHJ1omMDwFx77BDrK7S+WxzUTI="; + hash = "sha256-Zewi/LroLKFPCVYp2yBvn6gL/KAvbH5p8yNDxaHHTDY="; }; propagatedBuildInputs = [ From 3c240f5f78072054bb0b7aef9703de6b70e345f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:23:13 +0100 Subject: [PATCH 102/140] python310Packages.aliyun-python-sdk-config: 2.2.2 -> 2.2.3 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index 9bda15181312..a398612cea07 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cX3DqY8n0UEq9F1xOQI3IQi2Rc4cutcT0y3xc5G9dcg="; + hash = "sha256-rSywGyd9xpR11u9C0kJsx8RSzYhzZ4mF41ZPQ9PWWqQ="; }; propagatedBuildInputs = [ From cb76df1dab8efcc3746e5396133694d2ccab00d3 Mon Sep 17 00:00:00 2001 From: Lux Date: Tue, 27 Dec 2022 00:12:23 +0100 Subject: [PATCH 103/140] Nanosaur2: init at 2.1.0 --- pkgs/games/nanosaur2/default.nix | 56 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/games/nanosaur2/default.nix diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix new file mode 100644 index 000000000000..7b449ac2d920 --- /dev/null +++ b/pkgs/games/nanosaur2/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "nanosaur2"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "jorio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UY+fyn8BA/HfCd2LCj5cfGmQACKUICH6CDCW4q6YDkg="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + buildInputs = [ + SDL2 + ]; + + configurePhase = '' + runHook preConfigure + cmake -S . -B build -DCMAKE_BUILD_TYPE=Release + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + cmake --build build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mv build $out + makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out" + runHook postInstall + ''; + + meta = with lib; { + description = "A port of Nanosaur2, a 2004 Macintosh game by Pangea Software, for modern operating systems"; + longDescription = '' + Nanosaur is a 2004 Macintosh game by Pangea Software. + + Is a continuation of the original Nanosaur storyline, only this time you get to fly a pterodactyl who’s loaded with hi-tech weaponry. + ''; + homepage = "https://github.com/jorio/Nanosaur2"; + license = with licenses; [ + cc-by-sa-40 + ]; + maintainers = with maintainers; [ lux ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4061f7ded7ac..eacd5015d292 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34690,6 +34690,8 @@ with pkgs; nanosaur = callPackage ../games/nanosaur { }; + nanosaur2 = callPackage ../games/nanosaur2 { }; + nethack = callPackage ../games/nethack { }; nethack-qt = callPackage ../games/nethack { From 7f7626fd759b95a5c010b0f49ca1e0f09a5111fd Mon Sep 17 00:00:00 2001 From: Lux Date: Tue, 27 Dec 2022 04:37:57 +0100 Subject: [PATCH 104/140] license on one line for pangea games --- pkgs/games/nanosaur/default.nix | 4 +--- pkgs/games/nanosaur2/default.nix | 4 +--- pkgs/games/otto-matic/default.nix | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 4b2509275269..a841451db97c 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { And you get to shoot at T-Rexes with nukes. ''; homepage = "https://github.com/jorio/Nanosaur"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index 7b449ac2d920..da0e6dbe7293 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -47,9 +47,7 @@ stdenv.mkDerivation rec { Is a continuation of the original Nanosaur storyline, only this time you get to fly a pterodactyl who’s loaded with hi-tech weaponry. ''; homepage = "https://github.com/jorio/Nanosaur2"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 2257b50e0c8d..7523f2070e9a 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -35,9 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of Otto Matic, a 2001 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/OttoMatic"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = licenses.cc-by-sa-40; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; From 15d89c485f606b652e37c637ce3e0653ec50ee20 Mon Sep 17 00:00:00 2001 From: Lux Date: Tue, 27 Dec 2022 10:24:25 +0100 Subject: [PATCH 105/140] align Nanosaur to build the same way as the new Nanosaur2 --- pkgs/games/nanosaur/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index a841451db97c..c62fd3c5db72 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -12,22 +12,31 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + ]; buildInputs = [ SDL2 ]; configurePhase = '' + runHook preConfigure cmake -S . -B build -DCMAKE_BUILD_TYPE=Release + runHook postConfigure ''; buildPhase = '' + runHook preBuild cmake --build build + runHook postBuild ''; installPhase = '' + runHook preInstall mv build $out makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out" + runHook postInstall ''; meta = with lib; { From 0947e46d11b28adb4ddcd9db42806c08966abf46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:28:03 +0100 Subject: [PATCH 106/140] python310Packages.plugwise: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 303c43697453..5762d03e7042 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.26.0"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-WDjZZFl64tYZ7cy7xcLEX2/87TJSOw71QSro6cgE98s="; + sha256 = "sha256-W6aLpm3Z0JQIZcqDu9wH2RFuXfzl0Px61zfIuhm92pk="; }; propagatedBuildInputs = [ From 688042d20021e9e271993ca8a2183348e099797c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:34:08 +0100 Subject: [PATCH 107/140] python310Packages.pyskyqremote: 0.3.21 -> 0.3.22 Changelog: https://github.com/RogerSelwyn/skyq_remote/releases/tag/0.3.22 --- pkgs/development/python-modules/pyskyqremote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 687fc3c65994..1f9533984c15 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.21"; + version = "0.3.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - hash = "sha256-SVNvgQe4OonR6sVIMUeMYfs7fjL6JMnVEsQuw7VrJhQ="; + hash = "sha256-sYhB3S6tDIdqGCu+tHvodn0NdIaYIlnE7zbHEjNUNDw="; }; propagatedBuildInputs = [ From fdabe5577d855c27e8b36b054983c5179c09718a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 10:35:12 +0100 Subject: [PATCH 108/140] python310Packages.skodaconnect: 1.2.2 -> 1.2.5 Changelog: https://github.com/lendy007/skodaconnect/releases/tag/1.2.5 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 479655b3b70a..a3354718c3aa 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.2.2"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pBCeOp71A0uksSv4N50ZXAZeg72mT5FC4Toad/1Yc0Y="; + hash = "sha256-Re6ECMaDmg007XHw9Kpa46+oEs+01CzOZzszKzKS4WA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 28354ec5d1d97494982d1b2405b50911173c3aaf Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 26 Dec 2022 01:40:17 +0000 Subject: [PATCH 109/140] allmark: init at 0.10.0 We are using buildGoPackage, because upstream is not a module: see andreaskoch/allmark#36. Fixes #206256 --- pkgs/servers/allmark/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/allmark/default.nix diff --git a/pkgs/servers/allmark/default.nix b/pkgs/servers/allmark/default.nix new file mode 100644 index 000000000000..439e064b2aff --- /dev/null +++ b/pkgs/servers/allmark/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "allmark"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "andreaskoch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JfNn/e+cSq1pkeXs7A2dMsyhwOnh7x2bwm6dv6NOjLU="; + }; + + goPackagePath = "github.com/andreaskoch/allmark"; + + postInstall = '' + mv $out/bin/{cli,allmark} + ''; + + meta = with lib; { + description = "A cross-platform markdown web server"; + homepage = "https://allmark.io"; + changelog = "https://github.com/andreaskoch/allmark/-/releases/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b260e9ac45a..b9d91b5a0f3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23679,6 +23679,8 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; + allmark = callPackage ../servers/allmark {}; + alps = callPackage ../servers/alps { }; apache-directory-server = callPackage ../servers/ldap/apache-directory-server {}; From a753a425963129f149459cbaea1f46a4bea67636 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 26 Dec 2022 15:30:00 +0100 Subject: [PATCH 110/140] python3Packages.scapy: 2.4.5 -> 2.5.0 Diff: https://github.com/secdev/scapy/compare/v2.4.5...v2.5.0 Changelog: https://github.com/secdev/scapy/releases/tag/v2.5.0 --- pkgs/development/python-modules/scapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 152be5166c50..42a195008d6f 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.4.5"; + version = "2.5.0"; disabled = isPyPy; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "0nxci1v32h5517gl9ic6zjq8gc8drwr0n5pz04c91yl97xznnw94"; + sha256 = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU="; }; patches = [ From 3148ec4f6c088eff4f4a43f1f4e78f4418d7f5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 27 Dec 2022 12:24:01 +0000 Subject: [PATCH 111/140] cachix-agent: always restart --- nixos/modules/services/system/cachix-agent/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index aa3b2153422c..11769d4e3095 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -67,7 +67,8 @@ in { serviceConfig = { # we don't want to kill children processes as those are deployments KillMode = "process"; - Restart = "on-failure"; + Restart = "always"; + RestartSec = 5; EnvironmentFile = cfg.credentialsFile; ExecStart = '' ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \ From 385c252b3aa291f2689047ae364f8158eeb030a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Dec 2022 13:26:54 +0100 Subject: [PATCH 112/140] jumanpp: unbreak on aarch64-darwin --- pkgs/tools/text/jumanpp/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5c6943b281df..348c785ab28d 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, protobuf, libiconv }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, protobuf, libiconv }: stdenv.mkDerivation rec { pname = "jumanpp"; @@ -9,7 +9,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; - patches = [ ./0001-Exclude-all-tests-from-the-build.patch ]; + patches = [ + ./0001-Exclude-all-tests-from-the-build.patch + # https://github.com/ku-nlp/jumanpp/pull/132 + (fetchpatch { + name = "fix-unused-warning.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/cc0d555287c8b214e9d6f0279c449a4e035deee4.patch"; + sha256 = "sha256-yRKwuUJ2UPXJcjxBGhSOmcQI/EOijiJDMmmmSRdNpX8="; + }) + (fetchpatch { + name = "update-libs.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/5e9068f56ae310ed7c1df185b14d49654ffe1ab6.patch"; + sha256 = "sha256-X49/ZoLT0OGePLZYlgacNxA1dHM4WYdQ8I4LW3sW16E="; + }) + (fetchpatch { + name = "fix-mmap-on-apple-m1.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/0c22249f12928d0c962f03f229026661bf0c7921.patch"; + sha256 = "sha256-g6CuruqyoMJxU/hlNoALx1QnFM8BlTsTd0pwlVrco3I="; + }) + ]; cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; nativeBuildInputs = [ cmake ]; @@ -27,7 +45,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } From c549ba2a2724ff9f2a5a686fee69a56c248249bb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Dec 2022 13:31:03 +0100 Subject: [PATCH 113/140] mongoose: unbreak on aarch64-darwin --- .../science/math/mongoose/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index 401497379562..c7348c9e4a98 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , cmake }: @@ -16,17 +18,27 @@ stdenv.mkDerivation rec { sha256 = "0ymwd4n8p8s0ndh1vcbmjcsm0x2cc2b7v3baww5y6as12873bcrh"; }; + patches = [ + # TODO: remove on next release + (fetchpatch { + name = "add-an-option-to-disable-coverage.patch"; + url = "https://github.com/ScottKolo/Mongoose/commit/39f4a0059ff7bad5bffa84369f31839214ac7877.patch"; + sha256 = "sha256-V8lCq22ixCCzLmKtW6bUL8cvJFZzdgYoA4BFs4xYd3c="; + }) + ]; + nativeBuildInputs = [ cmake ]; + # ld: file not found: libclang_rt.profile_osx.a + cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DENABLE_COVERAGE=OFF"; + meta = with lib; { description = "Graph Coarsening and Partitioning Library"; homepage = "https://github.com/ScottKolo/Mongoose"; - license = licenses.gpl3; - maintainers = with maintainers; []; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wegank ]; platforms = with platforms; unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } From a91852b7bb9d7a122eb42bc721423ed44fc98be4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 23:27:08 +0000 Subject: [PATCH 114/140] python310Packages.statsmodels: 0.13.2 -> 0.13.4 --- pkgs/development/python-modules/statsmodels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 0f01870c41b4..9a6e3cfb6663 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.2"; + version = "0.13.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-d9wpLJk5wDakdvF3D50Il2sFQ32qIpko2nMjEUfN59Q="; + sha256 = "sha256-juXRtp9kvA6TeWZ0Ve41hYSdXmvNPz5I5Yumytrf6tU="; }; nativeBuildInputs = [ cython ]; From 649fa431c10c7f889d6ba5fa6e3bde47697ad547 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 27 Dec 2022 03:47:11 +0100 Subject: [PATCH 115/140] vimPlugins.sniprun: 1.1.2 -> 1.2.8 --- pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index de8f0c1a5bcd..08b8ae20412e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -730,18 +730,18 @@ self: super: { sniprun = let - version = "1.1.2"; + version = "1.2.8"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4="; + sha256 = "sha256-iPZ0DPAErkMJIn85t1FIiGhLcMZlL06iNKLqmRu7gXI="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM="; + cargoSha256 = "sha256-HZEh6jtuRqsyjyDbDIV38x2N1unbSu24D8vrPZ17ktE="; nativeBuildInputs = [ makeWrapper ]; From 112fa92938583e841128d65d4637b409d00fc4a6 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Thu, 1 Dec 2022 13:18:24 +0000 Subject: [PATCH 116/140] calico-various,calicoctl,confd-calico: init at 3.24.5 As calico internally builds a series of images, and multiple images contain different calico binaries, we have had to segregate the various components into different derivations. We have also used these image's CMD or ENTRYPOINT as the mainProgram, so that nix run is more useful. The cgo build process also proved to be quite tricky, so for now calico-felix and calico-node, both of which depend on libbpf, have not been packaged. Updates #124071 --- .../networking/cluster/calico/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 +++ 2 files changed, 92 insertions(+) create mode 100644 pkgs/applications/networking/cluster/calico/default.nix diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix new file mode 100644 index 000000000000..192899ff1b22 --- /dev/null +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -0,0 +1,81 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { + inherit pname; + version = "3.24.5"; + + src = fetchFromGitHub { + owner = "projectcalico"; + repo = "calico"; + rev = "v${version}"; + hash = "sha256-fB9FHiIqVieVkPfHmBvcaUmUqkT1ZbDT26+DUE9lbdc="; + }; + + vendorHash = "sha256-ogQ/REf5cngoGAFIBN++txew6UqOw1hqCVsixyuGtug="; + + inherit doCheck subPackages; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://projectcalico.docs.tigera.io"; + changelog = "https://github.com/projectcalico/calico/releases/tag/v${version}"; + description = "Cloud native networking and network security"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + inherit mainProgram; + }; +}) { + calico-apiserver = { + mainProgram = "apiserver"; + subPackages = [ + "apiserver/cmd/..." + ]; + }; + calico-app-policy = { + # integration tests require network + doCheck = false; + mainProgram = "dikastes"; + subPackages = [ + "app-policy/cmd/..." + ]; + }; + calico-cni-plugin = { + mainProgram = "calico"; + subPackages = [ + "cni-plugin/cmd/..." + ]; + }; + calico-kube-controllers = { + # integration tests require network and docker + doCheck = false; + mainProgram = "kube-controllers"; + subPackages = [ + "kube-controllers/cmd/..." + ]; + }; + calico-pod2daemon = { + mainProgram = "flexvol"; + subPackages = [ + "pod2daemon/csidriver" + "pod2daemon/flexvol" + "pod2daemon/nodeagent" + ]; + }; + calico-typha = { + subPackages = [ + "typha/cmd/..." + ]; + }; + calicoctl = { + subPackages = [ + "calicoctl/calicoctl" + ]; + }; + confd-calico = { + mainProgram = "confd"; + subPackages = [ + "confd" + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3c2791aafb..aaa21f17860a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27822,6 +27822,17 @@ with pkgs; calibre-web = callPackage ../servers/calibre-web { }; + # calico-felix and calico-node have not been packaged due to libbpf, linking issues + inherit (callPackage ../applications/networking/cluster/calico {}) + calico-apiserver + calico-app-policy + calico-cni-plugin + calico-kube-controllers + calico-pod2daemon + calico-typha + calicoctl + confd-calico; + calligra = libsForQt5.callPackage ../applications/office/calligra { }; perkeep = callPackage ../applications/misc/perkeep { }; From faae415dcda7e23c5d22fef7a8a92c6cf80abfdc Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 21 Sep 2022 18:33:47 +0200 Subject: [PATCH 117/140] akkoma: init at 3.5.0 --- pkgs/servers/akkoma/default.nix | 210 +++++ pkgs/servers/akkoma/mix.nix | 1494 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1706 insertions(+) create mode 100644 pkgs/servers/akkoma/default.nix create mode 100644 pkgs/servers/akkoma/mix.nix diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix new file mode 100644 index 000000000000..050d2c64285c --- /dev/null +++ b/pkgs/servers/akkoma/default.nix @@ -0,0 +1,210 @@ +{ lib +, beamPackages +, fetchFromGitea, fetchFromGitHub, fetchFromGitLab +, cmake, file, libxcrypt +, writeText +, ... +}: + +beamPackages.mixRelease rec { + pname = "pleroma"; + version = "3.5.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "akkoma"; + rev = "v${version}"; + hash = "sha256-Apt+6nI4zOCyRb5msPt5UF9vyaendyaOjrYBMl0DqRY="; + }; + + postPatch = '' + # Remove dependency on OS_Mon + sed -E -i 's/(^|\s):os_mon,//' \ + mix.exs + ''; + + postBuild = '' + # Digest and compress static files + rm -f priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE + mix phx.digest --no-deps-check + ''; + + # cf. https://github.com/whitfin/cachex/issues/205 + stripDebug = false; + + mixNixDeps = import ./mix.nix { + inherit beamPackages lib; + overrides = (final: prev: { + # mix2nix does not support git dependencies yet, + # so we need to add them manually + captcha = beamPackages.buildMix rec { + name = "captcha"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "elixir-captcha"; + rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab"; + sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; + }; + }; + crypt = beamPackages.buildRebar3 rec { + name = "crypt"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "msantos"; + repo = "crypt"; + rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; + sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; + }; + + buildInputs = [ libxcrypt ]; + + postInstall = '' + mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so + ''; + + beamDeps = with final; [ elixir_make ]; + }; + elasticsearch = beamPackages.buildMix rec { + name = "elasticsearch"; + version = "1.0.1"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "elasticsearch-elixir"; + rev = "6cd946f75f6ab9042521a009d1d32d29a90113ca"; + hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; + }; + }; + gettext = beamPackages.buildMix { + name = "gettext"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "tusooa"; + repo = "gettext"; + rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; + hash = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; + }; + }; + linkify = beamPackages.buildMix rec { + name = "linkify"; + version = "0.5.2"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "linkify"; + rev = "2567e2c1073fa371fd26fd66dfa5bc77b6919c16"; + hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg="; + }; + }; + mfm_parser = beamPackages.buildMix rec { + name = "mfm_parser"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "mfm-parser"; + rev = "912fba81152d4d572e457fd5427f9875b2bc3dbe"; + hash = "sha256-n3WmERxKK8VM8jFIBAPS6GkbT7/zjqi3AjjWbjOdMzs="; + }; + + beamDeps = with final; [ phoenix_view temple ]; + }; + remote_ip = beamPackages.buildMix rec { + name = "remote_ip"; + version = "0.1.5"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "remote_ip"; + rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"; + sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6"; + }; + beamDeps = with final; [ combine plug inet_cidr ]; + }; + search_parser = beamPackages.buildMix rec { + name = "search_parser"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "FloatingGhost"; + repo = "pleroma-contrib-search-parser"; + rev = "08971a81e68686f9ac465cfb6661d51c5e4e1e7f"; + hash = "sha256-sbo9Kcp2oT05o2GAF+IgziLPYmCkWgBfFMBCytmqg3Y="; + }; + + beamDeps = with final; [ nimble_parsec ]; + }; + temple = beamPackages.buildMix rec { + name = "temple"; + version = "0.9.0-rc.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "temple"; + rev = "066a699ade472d8fa42a9d730b29a61af9bc8b59"; + hash = "sha256-qA0z8WTMjO2OixcZBARn/LbuV3s3LGtwZ9nSjj/tWBc="; + }; + + mixEnv = "dev"; + beamDeps = with final; [ earmark_parser ex_doc makeup makeup_elixir makeup_erlang nimble_parsec ]; + }; + + + # Some additional build inputs and build fixes + fast_html = prev.fast_html.override { + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + }; + http_signatures = prev.http_signatures.override { + patchPhase = '' + substituteInPlace mix.exs --replace ":logger" ":logger, :public_key" + ''; + }; + majic = prev.majic.override { + buildInputs = [ file ]; + }; + syslog = prev.syslog.override { + buildPlugins = with beamPackages; [ pc ]; + }; + + mime = prev.mime.override { + patchPhase = let + cfgFile = writeText "config.exs" '' + use Mix.Config + config :mime, :types, %{ + "application/activity+json" => ["activity+json"], + "application/jrd+json" => ["jrd+json"], + "application/ld+json" => ["activity+json"], + "application/xml" => ["xml"], + "application/xrd+xml" => ["xrd+xml"] + } + ''; + in '' + mkdir config + cp ${cfgFile} config/config.exs + ''; + }; + }); + }; + + meta = with lib; { + description = "ActivityPub microblogging server"; + homepage = "https://akkoma.social"; + license = licenses.agpl3; + maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix new file mode 100644 index 000000000000..f26d96c0f216 --- /dev/null +++ b/pkgs/servers/akkoma/mix.nix @@ -0,0 +1,1494 @@ +{ lib, beamPackages, overrides ? (x: y: {}) }: + +let + buildRebar3 = lib.makeOverridable beamPackages.buildRebar3; + buildMix = lib.makeOverridable beamPackages.buildMix; + buildErlangMk = lib.makeOverridable beamPackages.buildErlangMk; + + self = packages // (overrides self packages); + + packages = with beamPackages; with self; { + base62 = buildMix rec { + name = "base62"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + }; + + beamDeps = [ custom_base ]; + }; + + bbcode_pleroma = buildMix rec { + name = "bbcode_pleroma"; + version = "0.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + }; + + beamDeps = [ nimble_parsec ]; + }; + + bcrypt_elixir = buildMix rec { + name = "bcrypt_elixir"; + version = "2.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ybjs37fyn45x31lzhxic4kd4jmzwcwkgy4spwayykbn8rgjs622"; + }; + + beamDeps = [ comeonin elixir_make ]; + }; + + benchee = buildMix rec { + name = "benchee"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "14vdbvmkkqhcqvilq1w8zl895f4hpbv7fw2q5c0ml5h3a1a7v9bx"; + }; + + beamDeps = [ deep_merge statistex ]; + }; + + bunt = buildMix rec { + name = "bunt"; + version = "0.2.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + }; + + beamDeps = []; + }; + + cachex = buildMix rec { + name = "cachex"; + version = "3.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rfbbij81zmk6p75z33wg04mfcjqsxzzh67vclllvfjgmfqj609p"; + }; + + beamDeps = [ eternal jumper sleeplocks unsafe ]; + }; + + calendar = buildMix rec { + name = "calendar"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + }; + + beamDeps = [ tzdata ]; + }; + + castore = buildMix rec { + name = "castore"; + version = "0.1.19"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0291pdk3x7qzbv8laris1y90vi7g9akmykd23m2fz0nwlmhh2vp9"; + }; + + beamDeps = []; + }; + + certifi = buildRebar3 rec { + name = "certifi"; + version = "2.9.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + }; + + beamDeps = []; + }; + + combine = buildMix rec { + name = "combine"; + version = "0.10.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + }; + + beamDeps = []; + }; + + comeonin = buildMix rec { + name = "comeonin"; + version = "5.3.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1pw4rhhsh8mwj26dkbxz2niih9j8pc3qijlpcl8jh208rg1cjf1y"; + }; + + beamDeps = []; + }; + + concurrent_limiter = buildMix rec { + name = "concurrent_limiter"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk"; + }; + + beamDeps = [ telemetry ]; + }; + + connection = buildMix rec { + name = "connection"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + }; + + beamDeps = []; + }; + + cors_plug = buildMix rec { + name = "cors_plug"; + version = "2.0.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf"; + }; + + beamDeps = [ plug ]; + }; + + cowboy = buildErlangMk rec { + name = "cowboy"; + version = "2.9.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic"; + }; + + beamDeps = [ cowlib ranch ]; + }; + + cowboy_telemetry = buildRebar3 rec { + name = "cowboy_telemetry"; + version = "0.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis"; + }; + + beamDeps = [ cowboy telemetry ]; + }; + + cowlib = buildRebar3 rec { + name = "cowlib"; + version = "2.11.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib"; + }; + + beamDeps = []; + }; + + credo = buildMix rec { + name = "credo"; + version = "1.6.7"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; + }; + + beamDeps = [ bunt file_system jason ]; + }; + + custom_base = buildMix rec { + name = "custom_base"; + version = "0.2.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + }; + + beamDeps = []; + }; + + db_connection = buildMix rec { + name = "db_connection"; + version = "2.4.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "04iwywfqf8k125yfvm084l1mp0bcv82mwih7xlpb7kx61xdw29y1"; + }; + + beamDeps = [ connection telemetry ]; + }; + + decimal = buildMix rec { + name = "decimal"; + version = "2.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril"; + }; + + beamDeps = []; + }; + + deep_merge = buildMix rec { + name = "deep_merge"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + }; + + beamDeps = []; + }; + + earmark = buildMix rec { + name = "earmark"; + version = "1.4.33"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "01mfb0c1vq72pira1622cmvaly2p6n4dxwmsrw10i9x0srii7cr1"; + }; + + beamDeps = [ earmark_parser ]; + }; + + earmark_parser = buildMix rec { + name = "earmark_parser"; + version = "1.4.29"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; + }; + + beamDeps = []; + }; + + eblurhash = buildRebar3 rec { + name = "eblurhash"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + }; + + beamDeps = []; + }; + + ecto = buildMix rec { + name = "ecto"; + version = "3.9.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; + }; + + beamDeps = [ decimal jason telemetry ]; + }; + + ecto_enum = buildMix rec { + name = "ecto_enum"; + version = "1.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + }; + + beamDeps = [ ecto ecto_sql postgrex ]; + }; + + ecto_psql_extras = buildMix rec { + name = "ecto_psql_extras"; + version = "0.7.10"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "123h3s4zpk5q618rcxlfz4axj3rz3cmyk68gps8c05sg3vc8qpjh"; + }; + + beamDeps = [ ecto_sql postgrex table_rex ]; + }; + + ecto_sql = buildMix rec { + name = "ecto_sql"; + version = "3.9.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "060iqmkqnsyy2kv05s218ady9lgnz7rvgknwz6xjks7jzyj71m2z"; + }; + + beamDeps = [ db_connection ecto postgrex telemetry ]; + }; + + elixir_make = buildMix rec { + name = "elixir_make"; + version = "0.6.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "05ppvbhqi5m9zk1c4xnrki814sqhxrc7d1dpvfmwm2v7qm8xdjzm"; + }; + + beamDeps = []; + }; + + eternal = buildMix rec { + name = "eternal"; + version = "1.2.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + }; + + beamDeps = []; + }; + + ex_aws = buildMix rec { + name = "ex_aws"; + version = "2.1.9"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y"; + }; + + beamDeps = [ hackney jason sweet_xml ]; + }; + + ex_aws_s3 = buildMix rec { + name = "ex_aws_s3"; + version = "2.3.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "017iswr9m2kwri2m5j3r9m0b7hk4vqqddbqy09k5d4nfz6vg0i00"; + }; + + beamDeps = [ ex_aws sweet_xml ]; + }; + + ex_const = buildMix rec { + name = "ex_const"; + version = "0.2.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + }; + + beamDeps = []; + }; + + ex_doc = buildMix rec { + name = "ex_doc"; + version = "0.29.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1xkljn0ggg7fk8qv2dmr2m40h3lmfhi038p2hksdldja6yk5yx5p"; + }; + + beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; + }; + + ex_machina = buildMix rec { + name = "ex_machina"; + version = "2.7.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + }; + + beamDeps = [ ecto ecto_sql ]; + }; + + ex_syslogger = buildMix rec { + name = "ex_syslogger"; + version = "1.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb"; + }; + + beamDeps = [ poison syslog ]; + }; + + excoveralls = buildMix rec { + name = "excoveralls"; + version = "0.12.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; + }; + + beamDeps = [ hackney jason ]; + }; + + fast_html = buildMix rec { + name = "fast_html"; + version = "2.0.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; + }; + + beamDeps = [ elixir_make nimble_pool ]; + }; + + fast_sanitize = buildMix rec { + name = "fast_sanitize"; + version = "0.2.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qjnbs63q0d95dqhh2r9sz3zpg2y4hjy23kxsqanwf6h21njibg8"; + }; + + beamDeps = [ fast_html plug ]; + }; + + file_system = buildMix rec { + name = "file_system"; + version = "0.2.10"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + }; + + beamDeps = []; + }; + + finch = buildMix rec { + name = "finch"; + version = "0.13.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1k56zfbadpppn8flavb4aczq0npcqnlhg993l51c1k8dw76pv5a9"; + }; + + beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; + }; + + flake_id = buildMix rec { + name = "flake_id"; + version = "0.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + }; + + beamDeps = [ base62 ecto ]; + }; + + floki = buildMix rec { + name = "floki"; + version = "0.34.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1769xg2sqdh6s1j06l7gi98iy35ri79xk6sq58rh1phdyi1ryflw"; + }; + + beamDeps = []; + }; + + gen_smtp = buildRebar3 rec { + name = "gen_smtp"; + version = "0.15.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99"; + }; + + beamDeps = []; + }; + + gun = buildRebar3 rec { + name = "gun"; + version = "2.0.0-rc.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + }; + + beamDeps = [ cowlib ]; + }; + + hackney = buildRebar3 rec { + name = "hackney"; + version = "1.18.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + }; + + beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; + }; + + hpax = buildMix rec { + name = "hpax"; + version = "0.1.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; + }; + + beamDeps = []; + }; + + html_entities = buildMix rec { + name = "html_entities"; + version = "0.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + }; + + beamDeps = []; + }; + + http_signatures = buildMix rec { + name = "http_signatures"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + }; + + beamDeps = []; + }; + + httpoison = buildMix rec { + name = "httpoison"; + version = "1.8.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "08crb48yz7r7w00pzw9gfk862g99z2ma2x6awab0rqvjd7951crb"; + }; + + beamDeps = [ hackney ]; + }; + + idna = buildRebar3 rec { + name = "idna"; + version = "6.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + }; + + beamDeps = [ unicode_util_compat ]; + }; + + inet_cidr = buildMix rec { + name = "inet_cidr"; + version = "1.0.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + }; + + beamDeps = []; + }; + + jason = buildMix rec { + name = "jason"; + version = "1.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; + }; + + beamDeps = [ decimal ]; + }; + + joken = buildMix rec { + name = "joken"; + version = "2.5.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rvlvwgxi7myg5mp1yb0f75gk82yl90660iigg5dhpkwc64mrci2"; + }; + + beamDeps = [ jose ]; + }; + + jose = buildMix rec { + name = "jose"; + version = "1.11.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1lj715gzl022yc47qsg9712x8nc9wi7x70msv8c3lpym92y3y54q"; + }; + + beamDeps = []; + }; + + jumper = buildMix rec { + name = "jumper"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + }; + + beamDeps = []; + }; + + majic = buildMix rec { + name = "majic"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; + }; + + beamDeps = [ elixir_make mime nimble_pool plug ]; + }; + + makeup = buildMix rec { + name = "makeup"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"; + }; + + beamDeps = [ nimble_parsec ]; + }; + + makeup_elixir = buildMix rec { + name = "makeup_elixir"; + version = "0.16.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rrqydcq2bshs577z7jbgdnrlg7cpnzc8n48kap4c2ln2gfcpci8"; + }; + + beamDeps = [ makeup nimble_parsec ]; + }; + + makeup_erlang = buildMix rec { + name = "makeup_erlang"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p"; + }; + + beamDeps = [ makeup ]; + }; + + meck = buildRebar3 rec { + name = "meck"; + version = "0.9.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + }; + + beamDeps = []; + }; + + metrics = buildRebar3 rec { + name = "metrics"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + }; + + beamDeps = []; + }; + + mime = buildMix rec { + name = "mime"; + version = "1.6.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + }; + + beamDeps = []; + }; + + mimerl = buildRebar3 rec { + name = "mimerl"; + version = "1.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + }; + + beamDeps = []; + }; + + mint = buildMix rec { + name = "mint"; + version = "1.4.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "106x9nmzi4ji5cqaddn76pxiyxdihk12z2qgszcdgd2rrjxsaxff"; + }; + + beamDeps = [ castore hpax ]; + }; + + mock = buildMix rec { + name = "mock"; + version = "0.3.7"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d"; + }; + + beamDeps = [ meck ]; + }; + + mogrify = buildMix rec { + name = "mogrify"; + version = "0.9.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "17b9dy40rq3rwn7crjggjafibxz4ys4nqq81adcf486af3yi13f1"; + }; + + beamDeps = []; + }; + + mox = buildMix rec { + name = "mox"; + version = "1.0.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1wpyh6wp76lyx0q2cys23rpmci4gj1pqwnqvfk467xxanchlk1pr"; + }; + + beamDeps = []; + }; + + nimble_options = buildMix rec { + name = "nimble_options"; + version = "0.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + }; + + beamDeps = []; + }; + + nimble_parsec = buildMix rec { + name = "nimble_parsec"; + version = "1.2.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1c3hnppmjkwnqrc9vvm72kpliav0mqyyk4cjp7vsqccikgiqkmy8"; + }; + + beamDeps = []; + }; + + nimble_pool = buildMix rec { + name = "nimble_pool"; + version = "0.2.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + }; + + beamDeps = []; + }; + + oban = buildMix rec { + name = "oban"; + version = "2.12.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0n6h8a6v9hzk6s5dhadfbrvwnx2nkl64n575ff5ph3afnz14864v"; + }; + + beamDeps = [ ecto_sql jason postgrex telemetry ]; + }; + + open_api_spex = buildMix rec { + name = "open_api_spex"; + version = "3.10.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + }; + + beamDeps = [ jason plug poison ]; + }; + + parse_trans = buildRebar3 rec { + name = "parse_trans"; + version = "3.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + }; + + beamDeps = []; + }; + + phoenix = buildMix rec { + name = "phoenix"; + version = "1.6.15"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0wh6s8id3b4c4hgiawq995p192wxsws4sr4bm1g7b55kyvxvj2np"; + }; + + beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; + }; + + phoenix_ecto = buildMix rec { + name = "phoenix_ecto"; + version = "4.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9"; + }; + + beamDeps = [ ecto phoenix_html plug ]; + }; + + phoenix_html = buildMix rec { + name = "phoenix_html"; + version = "3.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ky5idgid1psz6hmh2b2kmj6n974axww74hrxwv02p6jasx9gv1n"; + }; + + beamDeps = [ plug ]; + }; + + phoenix_live_dashboard = buildMix rec { + name = "phoenix_live_dashboard"; + version = "0.6.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0lmq1m7k465i9mzw35l7bx69n85mibwzd76976840r43sw6sakzg"; + }; + + beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; + }; + + phoenix_live_view = buildMix rec { + name = "phoenix_live_view"; + version = "0.17.12"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1j4r1pjl60hphan7mf0fn60cnqkdc7hah9zmf4sz8vy1mbhdavdg"; + }; + + beamDeps = [ jason phoenix phoenix_html telemetry ]; + }; + + phoenix_pubsub = buildMix rec { + name = "phoenix_pubsub"; + version = "2.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1"; + }; + + beamDeps = []; + }; + + phoenix_swoosh = buildMix rec { + name = "phoenix_swoosh"; + version = "0.3.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "072pa2rnzkvw645f3jh15rmgsnzccbyqjx1wbsmj28138qc24w9r"; + }; + + beamDeps = [ hackney phoenix phoenix_html swoosh ]; + }; + + phoenix_template = buildMix rec { + name = "phoenix_template"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ms39n5s6kh532s20yxzj7sh0rz5lslh09ibq5j21lkglacny1hv"; + }; + + beamDeps = [ phoenix_html ]; + }; + + phoenix_view = buildMix rec { + name = "phoenix_view"; + version = "2.0.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0vykabqxyk08gkfm45zy5dnlnzygwx6g9z4z2h7fxix51qiyfad9"; + }; + + beamDeps = [ phoenix_html phoenix_template ]; + }; + + plug = buildMix rec { + name = "plug"; + version = "1.10.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; + }; + + beamDeps = [ mime plug_crypto telemetry ]; + }; + + plug_cowboy = buildMix rec { + name = "plug_cowboy"; + version = "2.6.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19jgv5dm53hv5aqgxxzr3fnrpgfll9ics199swp6iriwfl5z4g07"; + }; + + beamDeps = [ cowboy cowboy_telemetry plug ]; + }; + + plug_crypto = buildMix rec { + name = "plug_crypto"; + version = "1.2.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "18plj2idhp3f0nmqyjjf2rzj849l3br0797m8ln20p5dqscj0rxm"; + }; + + beamDeps = []; + }; + + plug_static_index_html = buildMix rec { + name = "plug_static_index_html"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + }; + + beamDeps = [ plug ]; + }; + + poison = buildMix rec { + name = "poison"; + version = "5.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1z6kv2s6w5nrq20446510nys30ir0hfr8ksrlxi0rf01qlbn3p0i"; + }; + + beamDeps = [ decimal ]; + }; + + poolboy = buildRebar3 rec { + name = "poolboy"; + version = "1.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + }; + + beamDeps = []; + }; + + postgrex = buildMix rec { + name = "postgrex"; + version = "0.16.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd"; + }; + + beamDeps = [ connection db_connection decimal jason ]; + }; + + pot = buildRebar3 rec { + name = "pot"; + version = "1.0.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1q62ascgjgddq0l42nvysfwkxmbvh9qsd8m5dsfr2psgb9zi5zkq"; + }; + + beamDeps = []; + }; + + quack = buildMix rec { + name = "quack"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp"; + }; + + beamDeps = [ poison tesla ]; + }; + + ranch = buildRebar3 rec { + name = "ranch"; + version = "1.8.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + }; + + beamDeps = []; + }; + + recon = buildMix rec { + name = "recon"; + version = "2.5.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "070f4dgfp1vzvz0fxwavzv9bd7nl5fx3rmmkyr0zy7g9vv426x9c"; + }; + + beamDeps = []; + }; + + sleeplocks = buildRebar3 rec { + name = "sleeplocks"; + version = "1.1.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "19argym7xifhsbrp21glkgs0dz1xpd00yfhsbhqdd0dpqm4d1rcz"; + }; + + beamDeps = []; + }; + + ssl_verify_fun = buildRebar3 rec { + name = "ssl_verify_fun"; + version = "1.1.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; + }; + + beamDeps = []; + }; + + statistex = buildMix rec { + name = "statistex"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09vcm2sz2llv00cm7krkx3n5r8ra1b42zx9gfjs8l0imf3p8p7gz"; + }; + + beamDeps = []; + }; + + sweet_xml = buildMix rec { + name = "sweet_xml"; + version = "0.7.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1fpmwhqgvakvdpbwmmyh31ays3hzhnm9766xqyzp9zmkl5kwh471"; + }; + + beamDeps = []; + }; + + swoosh = buildMix rec { + name = "swoosh"; + version = "1.8.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; + }; + + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; + }; + + syslog = buildRebar3 rec { + name = "syslog"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + }; + + beamDeps = []; + }; + + table_rex = buildMix rec { + name = "table_rex"; + version = "3.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + }; + + beamDeps = []; + }; + + telemetry = buildRebar3 rec { + name = "telemetry"; + version = "0.4.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb"; + }; + + beamDeps = []; + }; + + telemetry_metrics = buildMix rec { + name = "telemetry_metrics"; + version = "0.6.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + }; + + beamDeps = [ telemetry ]; + }; + + tesla = buildMix rec { + name = "tesla"; + version = "1.4.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; + }; + + beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; + }; + + timex = buildMix rec { + name = "timex"; + version = "3.7.9"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1q8chs28k5my6nzzm61rhc2l9wkhzfn0kiqzf87i71xvwn11asb4"; + }; + + beamDeps = [ combine gettext tzdata ]; + }; + + trailing_format_plug = buildMix rec { + name = "trailing_format_plug"; + version = "0.0.7"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + }; + + beamDeps = [ plug ]; + }; + + tzdata = buildMix rec { + name = "tzdata"; + version = "1.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "11wpm1mjla8hbkb5mssprg3gsq1v24s8m8nyk3hx5z7aaa1yr756"; + }; + + beamDeps = [ hackney ]; + }; + + ueberauth = buildMix rec { + name = "ueberauth"; + version = "0.10.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1lz660mr1sgv302f6qkr85swpd2jgs7255fg70h7zsb4dimg750k"; + }; + + beamDeps = [ plug ]; + }; + + unicode_util_compat = buildRebar3 rec { + name = "unicode_util_compat"; + version = "0.7.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + }; + + beamDeps = []; + }; + + unsafe = buildMix rec { + name = "unsafe"; + version = "1.0.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + }; + + beamDeps = []; + }; + + vex = buildMix rec { + name = "vex"; + version = "0.9.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0zw51hj525xiiggjk9n5ciix6pdhr8fvl6z7mqgkzan8sm2gz7y6"; + }; + + beamDeps = []; + }; + + web_push_encryption = buildMix rec { + name = "web_push_encryption"; + version = "0.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + }; + + beamDeps = [ httpoison jose ]; + }; + + websockex = buildMix rec { + name = "websockex"; + version = "0.4.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm"; + }; + + beamDeps = []; + }; + }; +in self + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342052eb5f85..85d64e1dcdc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1194,6 +1194,8 @@ with pkgs; adminer = callPackage ../servers/adminer { }; + akkoma = callPackage ../servers/akkoma { }; + advancecomp = callPackage ../tools/compression/advancecomp {}; aefs = callPackage ../tools/filesystems/aefs { }; From 6658dfbefbf4de06efc4df3fdd4b416dae53daf4 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 23 Sep 2022 00:10:40 +0200 Subject: [PATCH 118/140] akkoma-frontends/pleroma-fe: init at unstable-2022-12-10 --- pkgs/servers/akkoma/pleroma-fe/default.nix | 82 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/servers/akkoma/pleroma-fe/default.nix diff --git a/pkgs/servers/akkoma/pleroma-fe/default.nix b/pkgs/servers/akkoma/pleroma-fe/default.nix new file mode 100644 index 000000000000..71f3bcd8aee2 --- /dev/null +++ b/pkgs/servers/akkoma/pleroma-fe/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitea, fetchYarnDeps +, fixup_yarn_lock, yarn, nodejs +, jpegoptim, oxipng, nodePackages +}: + +stdenv.mkDerivation rec { + pname = "pleroma-fe"; + version = "unstable-2022-12-10"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "pleroma-fe"; + rev = "9c9b4cc07c018a21c8261dd7680a97aa3a670756"; + hash = "sha256-jYJcG2Q5kxOH29G5WV/6Cx7a+b7FuFROEn/8ruh7cDc="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-pz6NHBYZRi+Rwx6H74895vFWGLSivI7Ul8XV6wMbgJg="; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + yarn + nodejs + jpegoptim + oxipng + nodePackages.svgo + ]; + + postPatch = '' + # Build scripts assume to be used within a Git repository checkout + sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${builtins.substring 0 7 src.rev}";' \ + build/webpack.prod.conf.js + ''; + + configurePhase = '' + runHook preConfigure + + export HOME="$(mktemp -d)" + + yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} + fixup_yarn_lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export NODE_ENV="production" + export NODE_OPTIONS="--openssl-legacy-provider" + yarn run build --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # (Losslessly) optimise compression of image artifacts + find dist -type f -name '*.jpg' -execdir ${jpegoptim}/bin/jpegoptim -w$NIX_BUILD_CORES {} \; + find dist -type f -name '*.png' -execdir ${oxipng}/bin/oxipng -o max -t $NIX_BUILD_CORES {} \; + find dist -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \; + + cp -R -v dist $out + + runHook postInstall + ''; + + meta = with lib; { + description = "Frontend for Akkoma and Pleroma"; + homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/"; + license = licenses.agpl3; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85d64e1dcdc6..be7694ec68f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1195,6 +1195,9 @@ with pkgs; adminer = callPackage ../servers/adminer { }; akkoma = callPackage ../servers/akkoma { }; + akkoma-frontends = recurseIntoAttrs { + pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { }; + }; advancecomp = callPackage ../tools/compression/advancecomp {}; From 628b61f33fcbb2530da55e9419c99bc5924675ad Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 25 Sep 2022 16:01:48 +0200 Subject: [PATCH 119/140] akkoma-frontends/admin-fe: init at unstable-2022-09-10 --- pkgs/servers/akkoma/admin-fe/default.nix | 84 + pkgs/servers/akkoma/admin-fe/deps.patch | 46 + pkgs/servers/akkoma/admin-fe/yarn.lock | 12493 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 12624 insertions(+) create mode 100644 pkgs/servers/akkoma/admin-fe/default.nix create mode 100644 pkgs/servers/akkoma/admin-fe/deps.patch create mode 100644 pkgs/servers/akkoma/admin-fe/yarn.lock diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix new file mode 100644 index 000000000000..9b75d1e0dbcf --- /dev/null +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitea, fetchYarnDeps +, fixup_yarn_lock, yarn, nodejs +, python3, pkg-config, libsass +}: + +stdenv.mkDerivation rec { + pname = "admin-fe"; + version = "unstable-2022-09-10"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "admin-fe"; + rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad"; + hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk="; + }; + + patches = [ ./deps.patch ]; + + offlineCache = fetchYarnDeps { + yarnLock = ./yarn.lock; + hash = "sha256-h+QUBT2VwPWu2l05Zkcp+0vHN/x40uXxw2KYjq7l/Xk="; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + yarn + nodejs + pkg-config + python3 + libsass + ]; + + postPatch = '' + cp ${./yarn.lock} yarn.lock + ''; + + configurePhase = '' + runHook preConfigure + + export HOME="$(mktemp -d)" + + yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} + fixup_yarn_lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/cross-env + + mkdir -p "$HOME/.node-gyp/${nodejs.version}" + echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion" + ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" + export npm_config_nodedir=${nodejs} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd node_modules/node-sass + LIBSASS_EXT=auto yarn run build --offline + popd + + export NODE_OPTIONS="--openssl-legacy-provider" + yarn run build:prod --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R -v dist $out + runHook postInstall + ''; + + meta = with lib; { + description = "Admin interface for Akkoma"; + homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; + license = licenses.agpl3; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/pkgs/servers/akkoma/admin-fe/deps.patch b/pkgs/servers/akkoma/admin-fe/deps.patch new file mode 100644 index 000000000000..35e1efdff84a --- /dev/null +++ b/pkgs/servers/akkoma/admin-fe/deps.patch @@ -0,0 +1,46 @@ +diff --git a/package.json b/package.json +index f267be19..fb806527 100644 +--- a/package.json ++++ b/package.json +@@ -31,14 +31,12 @@ + "type": "git", + "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git" + }, +- "resolutions": { +- "prosemirror-model": "1.9.1" +- }, + "bugs": { + "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues" + }, + "dependencies": { + "@babel/runtime": "^7.3.4", ++ "@toast-ui/editor": "^3.2.0", + "axios": "0.18.0", + "clipboard": "1.7.1", + "codemirror": "5.39.2", +@@ -65,7 +63,6 @@ + "sortablejs": "1.7.0", + "tiptap": "^1.29.6", + "tiptap-extensions": "^1.32.7", +- "tui-editor": "1.2.7", + "vue": "^2.6.8", + "vue-count-to": "1.0.13", + "vue-i18n": "^8.9.0", +diff --git a/src/components/element-ui/MarkdownEditor/index.vue b/src/components/element-ui/MarkdownEditor/index.vue +index 7ae9fd40..18114701 100644 +--- a/src/components/element-ui/MarkdownEditor/index.vue ++++ b/src/components/element-ui/MarkdownEditor/index.vue +@@ -5,10 +5,10 @@ +