From 01ede6f1baec0ac450832cd80b571425a791f6f3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 16 Nov 2021 16:01:15 +0000 Subject: [PATCH 01/52] kdash: init at 0.2.4 Signed-off-by: Matthias Beyer --- pkgs/development/tools/kdash/default.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/kdash/default.nix diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix new file mode 100644 index 00000000000..79beb161b58 --- /dev/null +++ b/pkgs/development/tools/kdash/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, perl +, python3 +, openssl +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "kdash"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "kdash-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "09f9qkab2scass4p2vxkhyqslcf32kvpxi1zfa23p72v681jp0c8"; + }; + + nativeBuildInputs = [ perl python3 pkg-config ]; + + buildInputs = [ openssl xorg.xcbutil ]; + + cargoSha256 = "0jbyvjgxcjw610nd2i6d3jfmhv1lwsl8ss4fd3kwczsms28frx5c"; + + meta = with lib; { + description = "A simple and fast dashboard for Kubernetes"; + homepage = "https://github.com/kdash-rs/kdash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d185b12909..058e9bb4647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6686,6 +6686,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + kdash = callPackage ../development/tools/kdash { }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; From 18dbdee6e19eb1e6b8f29ac64a2bf37bafadcc2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 4 Apr 2022 03:49:28 +0200 Subject: [PATCH 02/52] nodejs: mark versions older than 14 as vulnerable NodeJS 12 will reach EOL on 2022/04/30. --- pkgs/development/web/nodejs/nodejs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 1e05850884c..36ec3e311a6 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -179,7 +179,7 @@ let maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; - knownVulnerabilities = optional (versionOlder version "12") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; + knownVulnerabilities = optional (versionOlder version "14") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; }; passthru.python = python; # to ensure nodeEnv uses the same version From 58b94a6eb0f34f21be50f5c1ab40f5f0d557cc13 Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Tue, 12 Apr 2022 10:04:53 -0700 Subject: [PATCH 03/52] android-studio: fixing gui for tiling window managers --- pkgs/applications/editors/android-studio/common.nix | 2 ++ pkgs/applications/editors/android-studio/default.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 12324088b04..3a8112d7868 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -52,6 +52,7 @@ , xkeyboard_config , zlib , makeDesktopItem +, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper }: let @@ -80,6 +81,7 @@ let --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e7824cd93f1..f0feae8deb9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }: +{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -7,6 +7,7 @@ let }; inherit (gnome2) GConf gnome_vfs; inherit buildFHSUserEnv; + inherit tiling_wm; }; stableVersion = { version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" From 1b44874d7248bb24870d2adbd04dad82742bb1a0 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 25 Apr 2022 00:29:17 +1000 Subject: [PATCH 04/52] htmlcxx: 0.86 -> 0.87 Also fix build with C++17, thoughtfully stolen from [1]. [1]: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch --- .../development/libraries/htmlcxx/c++17.patch | 24 +++++++++++++++++++ .../development/libraries/htmlcxx/default.nix | 11 +++++---- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/htmlcxx/c++17.patch diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/development/libraries/htmlcxx/c++17.patch new file mode 100644 index 00000000000..53fa9fbfc8c --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/c++17.patch @@ -0,0 +1,24 @@ +diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc +--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100 +@@ -7,7 +7,7 @@ + using namespace std; + using namespace htmlcxx; + +-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception) ++CharsetConverter::CharsetConverter(const string &from, const string &to) + { + mIconvDescriptor = iconv_open(to.c_str(), from.c_str()); + if (mIconvDescriptor == (iconv_t)(-1)) +diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h +--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100 +@@ -17,7 +17,7 @@ + : std::runtime_error(arg) {} + }; + +- CharsetConverter(const std::string &from, const std::string &to) throw (Exception); ++ CharsetConverter(const std::string &from, const std::string &to); + ~CharsetConverter(); + + std::string convert(const std::string &input); diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index d9072e46e40..221ec7622ff 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { pname = "htmlcxx"; - version = "0.86"; + version = "0.87"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; - sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; + url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; }; buildInputs = [ libiconv ]; - patches = [ ./ptrdiff.patch ]; + patches = [ + ./ptrdiff.patch + ./c++17.patch + ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; From 93f2fab507afe51c8e848c8df26f7c1c9342879f Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Fri, 29 Apr 2022 12:08:10 +0800 Subject: [PATCH 05/52] vivaldi: 5.2.2623.39-1 -> 5.2.2623.41-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 87be80bda8c..6e496c30ecf 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.2.2623.39-1"; + version = "5.2.2623.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk"; + sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d"; }; unpackPhase = '' From bc97215ff3ce215971e79e341ec9db3d65f8a43c Mon Sep 17 00:00:00 2001 From: be7a Date: Sun, 1 May 2022 22:37:45 +0200 Subject: [PATCH 06/52] pferd: 3.3.1 -> 3.4.0 --- pkgs/tools/misc/pferd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 76df2a68827..518547e1837 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh"; + sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g"; }; propagatedBuildInputs = with python3Packages; [ From a4e708522768a30cd5120a65c979c87abd525336 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Apr 2021 13:46:53 +0200 Subject: [PATCH 07/52] stdenv.mkDerivation: Allow overriding of recursive definitions See updated manual for further explanation. --- doc/stdenv/meta.chapter.md | 30 +++++++++++ doc/stdenv/stdenv.chapter.md | 52 +++++++++++++++++++ pkgs/stdenv/generic/make-derivation.nix | 67 +++++++++++++++++++++++-- 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index d3e1dd5b27d..5f3e12ba004 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -175,6 +175,36 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). +Alternatively, you can specify other derivations as tests. You can make use of +the optional parameter (here: `self`) to inject the correct package without +relying on non-local definitions, even in the presence of `overrideAttrs`. This +definition of `tests` does not rely on the original `mypkg` or overrides it in +all places. + +```nix +# my-package/default.nix +{ stdenv, callPackage }: +stdenv.mkDerivation (self: { + # ... + passthru.tests.example = callPackage ./example.nix { my-package = self; }; +}) +``` + +```nix +# my-package/example.nix +{ runCommand, lib, my-package, ... }: +runCommand "my-package-test" { + nativeBuildInputs = [ my-package ]; + src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ]; +} '' + my-package --help + my-package example.actual + diff -U3 --color=auto example.expected example.actual + mkdir $out +'' +``` + + ### `timeout` {#var-meta-timeout} A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 40f295b178b..2994f7020b1 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -317,6 +317,58 @@ The script will be usually run from the root of the Nixpkgs repository but you s For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`. +### Recursive attributes in `mkDerivation` + +If you pass a function to `mkDerivation`, it will receive as its argument the final output of the same `mkDerivation` call. For example: + +```nix +mkDerivation (self: { + pname = "hello"; + withFeature = true; + configureFlags = + lib.optionals self.withFeature ["--with-feature"]; +}) +``` + +Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`. +Instead, the definition references `self`, allowing users to change `withFeature` +consistently with `overrideAttrs`. + +Let's look at a more elaborate example to understand the differences between +various bindings: + +```nix +# `pkg` is the _original_ definition (for illustration purposes) +let pkg = + mkDerivation (self: { # self is the final package + # ... + + # An example attribute + packages = []; + + # `passthru.tests` is a commonly defined attribute. + passthru.tests.simple = f self; + + # An example of an attribute containing a function + passthru.appendPackages = packages': + self.overrideAttrs (newSelf: super: { + packages = super.packages ++ packages'; + }); + + # For illustration purposes; referenced as + # `(pkg.overrideAttrs(x)).self` etc in the text below. + passthru.self = self; + passthru.original = pkg; + }); +in pkg +``` + +Unlike the `pkg` binding in the above example, the `self` parameter always references the final package. For instance `(pkg.overrideAttrs(x)).self` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as `pkg`. + +This is also different from `mkDerivation rec { ..... }`, which binds the recursive references immediately, so it allows you to reference original _inputs_ only. + +See also the section about [`passthru.tests`](#var-meta-tests). + ## Phases {#sec-stdenv-phases} `stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder. diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index d1b93874a25..2a47ea99383 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -9,8 +9,68 @@ let # to build it. This is a bit confusing for cross compilation. inherit (stdenv) hostPlatform; }; + + makeOverlayable = mkDerivationSimple: # TODO(@robert): turn mkDerivationSimple into let binding. + fnOrAttrs: + if builtins.isFunction fnOrAttrs + then makeDerivationExtensible mkDerivationSimple fnOrAttrs + else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs; + + # Based off lib.makeExtensible, with modifications: + # - lib.fix' -> lib.fix ∘ mkDerivationSimple; then inline fix + # - convert `f` to an overlay + # - inline overrideAttrs and make it positional instead of // to reduce allocs + makeDerivationExtensible = mkDerivationSimple: rattrs: + let + r = mkDerivationSimple + (f0: + let + f = self: super: + # Convert f0 to an overlay. Legacy is: + # overrideAttrs (super: {}) + # We want to introduce self. We follow the convention of overlays: + # overrideAttrs (self: super: {}) + # Which means the first parameter can be either self or super. + # This is surprising, but far better than the confusion that would + # arise from flipping an overlay's parameters in some cases. + let x = f0 super; + in + if builtins.isFunction x + then + # Can't reuse `x`, because `self` comes first. + # Looks inefficient, but `f0 super` was a cheap thunk. + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple + (self: let super = rattrs self; in super // f self super)) + (rattrs r); + in r; + + # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), + # but pre-evaluated for a slight improvement in performance. + makeDerivationExtensibleConst = mkDerivationSimple: attrs: + mkDerivationSimple (f0: + let + f = self: super: + let x = f0 super; + in + if builtins.isFunction x + then + # Can't reuse `x`, because `self` comes first. + # Looks inefficient, but `f0 super` was a cheap thunk. + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) + attrs; + in +# TODO(@roberth): inline makeOverlayable; reindenting whole rest of this file. +makeOverlayable (overrideAttrs: + + # `mkDerivation` wraps the builtin `derivation` function to # produce derivations that use this stdenv and its shell. # @@ -70,6 +130,7 @@ in , # TODO(@Ericson2314): Make always true and remove strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform + , meta ? {} , passthru ? {} , pos ? # position used in error messages and for meta.position @@ -381,8 +442,6 @@ in lib.extendDerivation validity.handled ({ - overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs)); - # A derivation that always builds successfully and whose runtime # dependencies are the original derivations build time dependencies # This allows easy building and distributing of all derivations @@ -408,10 +467,12 @@ lib.extendDerivation args = [ "-c" "export > $out" ]; }); - inherit meta passthru; + inherit meta passthru overrideAttrs; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) (derivation derivationArg) + +) From 2afc03a084cf736cc76f629a45a720c3c44eb27d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Apr 2021 13:46:53 +0200 Subject: [PATCH 08/52] hello: Define a passthru test via new mkDerivation self arg --- pkgs/applications/misc/hello/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 60482a84c9b..8d36b344a22 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,5 @@ { lib +, runCommand , stdenv , fetchurl , nixos @@ -6,12 +7,12 @@ , hello }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "hello"; version = "2.12"; src = fetchurl { - url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; + url = "mirror://gnu/hello/${self.pname}-${self.version}.tar.gz"; sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; @@ -27,6 +28,13 @@ stdenv.mkDerivation rec { (nixos { environment.noXlibs = true; }).pkgs.hello; }; + passthru.tests.run = runCommand "hello-test-run" { + nativeBuildInputs = [ self ]; + } '' + diff -U3 --color=auto <(hello) <(echo 'Hello, world!') + touch $out + ''; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' @@ -34,9 +42,9 @@ stdenv.mkDerivation rec { It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${self.version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; -} +}) From 40ab3b8738b4bb10ae849712c6bdc0fdf7564e3e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 26 Apr 2021 14:47:18 +0200 Subject: [PATCH 09/52] hello: Use callPackage for test --- pkgs/applications/misc/hello/default.nix | 11 +++-------- pkgs/applications/misc/hello/test.nix | 8 ++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/misc/hello/test.nix diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8d36b344a22..0ea6570b320 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,5 +1,5 @@ -{ lib -, runCommand +{ callPackage +, lib , stdenv , fetchurl , nixos @@ -28,12 +28,7 @@ stdenv.mkDerivation (self: { (nixos { environment.noXlibs = true; }).pkgs.hello; }; - passthru.tests.run = runCommand "hello-test-run" { - nativeBuildInputs = [ self ]; - } '' - diff -U3 --color=auto <(hello) <(echo 'Hello, world!') - touch $out - ''; + passthru.tests.run = callPackage ./test.nix { hello = self; }; meta = with lib; { description = "A program that produces a familiar, friendly greeting"; diff --git a/pkgs/applications/misc/hello/test.nix b/pkgs/applications/misc/hello/test.nix new file mode 100644 index 00000000000..7acded2a16f --- /dev/null +++ b/pkgs/applications/misc/hello/test.nix @@ -0,0 +1,8 @@ +{ runCommand, hello }: + +runCommand "hello-test-run" { + nativeBuildInputs = [ hello ]; +} '' + diff -U3 --color=auto <(hello) <(echo 'Hello, world!') + touch $out +'' From 2f21bc2fdb4349ca89f3c8db9742cdaa15702a52 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 4 May 2021 16:41:31 +0200 Subject: [PATCH 10/52] doc/stdenv/meta: tests -> passthru.tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the text understandable without knowing that these are identical. Co-authored-by: Daniël de Kok --- doc/stdenv/meta.chapter.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 5f3e12ba004..64924dceb71 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -178,6 +178,7 @@ NixOS tests run in a VM, so they are slower than regular package tests. For more Alternatively, you can specify other derivations as tests. You can make use of the optional parameter (here: `self`) to inject the correct package without relying on non-local definitions, even in the presence of `overrideAttrs`. This +means `(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the definition of `tests` does not rely on the original `mypkg` or overrides it in all places. From 6d7efb3a16ddbc58d0c4688cbe8213b337388a0c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 29 Jul 2021 13:09:27 +0200 Subject: [PATCH 11/52] stdenv.mkDerivation: Make self more overlay-like; use self.public `self` is now arguments, like `super`. The final package is in `self.public`. --- doc/stdenv/meta.chapter.md | 2 +- doc/stdenv/stdenv.chapter.md | 15 +++-- pkgs/applications/misc/hello/default.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 78 ++++++++++++------------ 4 files changed, 49 insertions(+), 48 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 64924dceb71..e57669e261b 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -187,7 +187,7 @@ all places. { stdenv, callPackage }: stdenv.mkDerivation (self: { # ... - passthru.tests.example = callPackage ./example.nix { my-package = self; }; + passthru.tests.example = callPackage ./example.nix { my-package = self.public; } }) ``` diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 2994f7020b1..b54d68cb5dd 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,7 +319,7 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ### Recursive attributes in `mkDerivation` -If you pass a function to `mkDerivation`, it will receive as its argument the final output of the same `mkDerivation` call. For example: +If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, considering use of `overrideAttrs`. For example: ```nix mkDerivation (self: { @@ -331,9 +331,14 @@ mkDerivation (self: { ``` Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`. +The `rec` keyword works at the syntax level and is unaware of overriding. + Instead, the definition references `self`, allowing users to change `withFeature` consistently with `overrideAttrs`. +`self` also contains the attribute `public`, which represents the final package, +including the output paths, etc. + Let's look at a more elaborate example to understand the differences between various bindings: @@ -347,11 +352,11 @@ let pkg = packages = []; # `passthru.tests` is a commonly defined attribute. - passthru.tests.simple = f self; + passthru.tests.simple = f self.public; # An example of an attribute containing a function passthru.appendPackages = packages': - self.overrideAttrs (newSelf: super: { + self.public.overrideAttrs (newSelf: super: { packages = super.packages ++ packages'; }); @@ -363,9 +368,7 @@ let pkg = in pkg ``` -Unlike the `pkg` binding in the above example, the `self` parameter always references the final package. For instance `(pkg.overrideAttrs(x)).self` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as `pkg`. - -This is also different from `mkDerivation rec { ..... }`, which binds the recursive references immediately, so it allows you to reference original _inputs_ only. +Unlike the `pkg` binding in the above example, the `self` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).self.public` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as `pkg`. See also the section about [`passthru.tests`](#var-meta-tests). diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 0ea6570b320..75887348730 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (self: { (nixos { environment.noXlibs = true; }).pkgs.hello; }; - passthru.tests.run = callPackage ./test.nix { hello = self; }; + passthru.tests.run = callPackage ./test.nix { hello = self.public; }; meta = with lib; { description = "A program that produces a familiar, friendly greeting"; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2a47ea99383..ac661d9429f 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -17,52 +17,50 @@ let else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs; # Based off lib.makeExtensible, with modifications: - # - lib.fix' -> lib.fix ∘ mkDerivationSimple; then inline fix - # - convert `f` to an overlay - # - inline overrideAttrs and make it positional instead of // to reduce allocs makeDerivationExtensible = mkDerivationSimple: rattrs: let - r = mkDerivationSimple - (f0: - let - f = self: super: - # Convert f0 to an overlay. Legacy is: - # overrideAttrs (super: {}) - # We want to introduce self. We follow the convention of overlays: - # overrideAttrs (self: super: {}) - # Which means the first parameter can be either self or super. - # This is surprising, but far better than the confusion that would - # arise from flipping an overlay's parameters in some cases. - let x = f0 super; - in - if builtins.isFunction x - then - # Can't reuse `x`, because `self` comes first. - # Looks inefficient, but `f0 super` was a cheap thunk. - f0 self super - else x; - in - makeDerivationExtensible mkDerivationSimple - (self: let super = rattrs self; in super // f self super)) - (rattrs r); - in r; + args = rattrs (args // { inherit public; }); + public = + mkDerivationSimple + (f0: + let + f = self: super: + # Convert f0 to an overlay. Legacy is: + # overrideAttrs (super: {}) + # We want to introduce self. We follow the convention of overlays: + # overrideAttrs (self: super: {}) + # Which means the first parameter can be either self or super. + # This is surprising, but far better than the confusion that would + # arise from flipping an overlay's parameters in some cases. + let x = f0 super; + in + if builtins.isFunction x + then + # Can't reuse `x`, because `self` comes first. + # Looks inefficient, but `f0 super` was a cheap thunk. + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple + (self: let super = rattrs self; in super // f self super)) + args; + in public; # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), # but pre-evaluated for a slight improvement in performance. makeDerivationExtensibleConst = mkDerivationSimple: attrs: - mkDerivationSimple (f0: - let - f = self: super: - let x = f0 super; - in - if builtins.isFunction x - then - # Can't reuse `x`, because `self` comes first. - # Looks inefficient, but `f0 super` was a cheap thunk. - f0 self super - else x; - in - makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) + mkDerivationSimple + (f0: + let + f = self: super: + let x = f0 super; + in + if builtins.isFunction x + then + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) attrs; in From 41b3688ba1222b61d19e6f810c9a1867eef69141 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Dec 2021 19:46:32 +0100 Subject: [PATCH 12/52] make-derivation.nix: Remove unnecessary TODO The goal was to keep the number of calls to a minimum, but that would come at the cost of clobbering git blame and possibly not improving readability. --- pkgs/stdenv/generic/make-derivation.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index ac661d9429f..afb6eed632a 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -10,7 +10,7 @@ let inherit (stdenv) hostPlatform; }; - makeOverlayable = mkDerivationSimple: # TODO(@robert): turn mkDerivationSimple into let binding. + makeOverlayable = mkDerivationSimple: fnOrAttrs: if builtins.isFunction fnOrAttrs then makeDerivationExtensible mkDerivationSimple fnOrAttrs @@ -65,7 +65,6 @@ let in -# TODO(@roberth): inline makeOverlayable; reindenting whole rest of this file. makeOverlayable (overrideAttrs: From d629ba27d963664282253e6bf32d0f1a38af796a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Dec 2021 20:54:57 +0100 Subject: [PATCH 13/52] Use finalAttrs instead of self for mkDerivation "overlay" --- doc/stdenv/meta.chapter.md | 13 ++++++++----- doc/stdenv/stdenv.chapter.md | 20 ++++++++++---------- pkgs/applications/misc/hello/default.nix | 8 ++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index e57669e261b..ca8dd1d824f 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -176,18 +176,21 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). Alternatively, you can specify other derivations as tests. You can make use of -the optional parameter (here: `self`) to inject the correct package without -relying on non-local definitions, even in the presence of `overrideAttrs`. This -means `(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the +the optional parameter to inject the correct package without +relying on non-local definitions, even in the presence of `overrideAttrs`. +Here that's `finalAttrs.public`, but you could choose a different name if +`finalAttrs` already exists in your scope. + +`(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the definition of `tests` does not rely on the original `mypkg` or overrides it in all places. ```nix # my-package/default.nix { stdenv, callPackage }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { # ... - passthru.tests.example = callPackage ./example.nix { my-package = self.public; } + passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.public; } }) ``` diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b54d68cb5dd..26f242dbae4 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -322,21 +322,21 @@ For information about how to run the updates, execute `nix-shell maintainers/scr If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, considering use of `overrideAttrs`. For example: ```nix -mkDerivation (self: { +mkDerivation (finalAttrs: { pname = "hello"; withFeature = true; configureFlags = - lib.optionals self.withFeature ["--with-feature"]; + lib.optionals finalAttrs.withFeature ["--with-feature"]; }) ``` Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`. The `rec` keyword works at the syntax level and is unaware of overriding. -Instead, the definition references `self`, allowing users to change `withFeature` +Instead, the definition references `finalAttrs`, allowing users to change `withFeature` consistently with `overrideAttrs`. -`self` also contains the attribute `public`, which represents the final package, +`finalAttrs` also contains the attribute `public`, which represents the final package, including the output paths, etc. Let's look at a more elaborate example to understand the differences between @@ -345,30 +345,30 @@ various bindings: ```nix # `pkg` is the _original_ definition (for illustration purposes) let pkg = - mkDerivation (self: { # self is the final package + mkDerivation (finalAttrs: { # ... # An example attribute packages = []; # `passthru.tests` is a commonly defined attribute. - passthru.tests.simple = f self.public; + passthru.tests.simple = f finalAttrs.public; # An example of an attribute containing a function passthru.appendPackages = packages': - self.public.overrideAttrs (newSelf: super: { + finalAttrs.public.overrideAttrs (newSelf: super: { packages = super.packages ++ packages'; }); # For illustration purposes; referenced as - # `(pkg.overrideAttrs(x)).self` etc in the text below. - passthru.self = self; + # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below. + passthru.finalAttrs = finalAttrs; passthru.original = pkg; }); in pkg ``` -Unlike the `pkg` binding in the above example, the `self` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).self.public` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as `pkg`. +Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.public` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`. See also the section about [`passthru.tests`](#var-meta-tests). diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 75887348730..bd7bcd8a3b0 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -7,12 +7,12 @@ , hello }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "hello"; version = "2.12"; src = fetchurl { - url = "mirror://gnu/hello/${self.pname}-${self.version}.tar.gz"; + url = "mirror://gnu/hello/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation (self: { (nixos { environment.noXlibs = true; }).pkgs.hello; }; - passthru.tests.run = callPackage ./test.nix { hello = self.public; }; + passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.public; }; meta = with lib; { description = "A program that produces a familiar, friendly greeting"; @@ -37,7 +37,7 @@ stdenv.mkDerivation (self: { It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${self.version}"; + changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; From 1bbb5a14c89427241ec2d7d6c55724332dd59803 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Dec 2021 21:03:23 +0100 Subject: [PATCH 14/52] doc/using/overrides: Update for overlay style mkDerivation overrideAttrs --- doc/using/overrides.chapter.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 66e5103531a..6e69423fe5f 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -39,14 +39,18 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st Example usage: ```nix -helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { +helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: { separateDebugInfo = true; }); ``` In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package. -The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. +The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. + +The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `public` attribute which is the result of `mkDerivation` — the derivation or package. + +If only a one-argument function is written, the argument has the meaning of `previousAttrs`. ::: {.note} Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). From 37ab5b43963f51f939b9c031a0dd824d82b41259 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 11 Jan 2022 09:07:58 +0100 Subject: [PATCH 15/52] mkDerivation: Add error hint for infinite recursion --- pkgs/stdenv/generic/make-derivation.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index afb6eed632a..3e3a7aa790d 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -19,7 +19,14 @@ let # Based off lib.makeExtensible, with modifications: makeDerivationExtensible = mkDerivationSimple: rattrs: let + # NOTE: The following is a hint that will be printed by the Nix cli when + # encountering an infinite recursion. It must not be formatted into + # separate lines, because Nix would only show the last line of the comment. + + # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`. args = rattrs (args // { inherit public; }); + # ^^^^ + public = mkDerivationSimple (f0: From 2e0bd527623626dac4fa9937f94682ecf761af3e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Feb 2022 10:01:09 +0100 Subject: [PATCH 16/52] rl-2205: Add entry for overlay-style mkDerivation overriding --- .../from_md/release-notes/rl-2205.section.xml | 27 +++++++++++++++++++ .../manual/release-notes/rl-2205.section.md | 15 +++++++++++ 2 files changed, 42 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 2046e2449cc..c91fb4d90f0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -43,6 +43,33 @@ Shell. + + + stdenv.mkDerivation now supports a + self-referencing finalAttrs: parameter + containing the final mkDerivation arguments + including overrides. drv.overrideAttrs now + supports two parameters + finalAttrs: previousAttrs:. This allows + packaging configuration to be overridden in a consistent + manner by providing an alternative to + rec {} syntax. + + + Additionally, passthru can now reference + finalAttrs.public containing the final + package, including attributes such as the output paths and + overrideAttrs. + + + New language integrations can be simplified by overriding a + prototype package containing the + language-specific logic. This removes the need for a extra + layer of overriding for the generic builder + arguments, thus removing a usability problem and source of + error. + + PHP 8.1 is now available diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9674eb66a4c..6dec64695d2 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -17,6 +17,21 @@ In addition to numerous new and upgraded packages, this release has the followin - GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell. +- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter + containing the final `mkDerivation` arguments including overrides. + `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`. + This allows packaging configuration to be overridden in a consistent manner by + providing an alternative to `rec {}` syntax. + + Additionally, `passthru` can now reference `finalAttrs.public` containing + the final package, including attributes such as the output paths and + `overrideAttrs`. + + New language integrations can be simplified by overriding a "prototype" + package containing the language-specific logic. This removes the need for a + extra layer of overriding for the "generic builder" arguments, thus removing a + usability problem and source of error. + - PHP 8.1 is now available - Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). From ca83dd1ae73a94bee5c67ed21b2f6be41b195f40 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 9 Feb 2022 12:10:37 +0100 Subject: [PATCH 17/52] stdenv.md: Clarify overrideAttrs sentence I weirded my English. --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 26f242dbae4..fb0bdd5e2d7 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,7 +319,7 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ### Recursive attributes in `mkDerivation` -If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, considering use of `overrideAttrs`. For example: +If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example: ```nix mkDerivation (finalAttrs: { From f066dddaa5cb6aea4429cd9386d4aa6f3963a889 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 9 Feb 2022 12:35:35 +0100 Subject: [PATCH 18/52] hello: Make pname overridable without breaking src.url --- pkgs/applications/misc/hello/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index bd7bcd8a3b0..676d10d06ce 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.12"; src = fetchurl { - url = "mirror://gnu/hello/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; From 0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 15 Mar 2022 12:22:16 +0100 Subject: [PATCH 19/52] stdenv.mkDerivation: public -> finalPackage --- doc/stdenv/meta.chapter.md | 4 ++-- doc/stdenv/stdenv.chapter.md | 9 ++++----- doc/using/overrides.chapter.md | 2 +- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2205.section.md | 2 +- pkgs/applications/misc/hello/default.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 6 +++--- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index ca8dd1d824f..c1bb3f8863f 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -178,7 +178,7 @@ NixOS tests run in a VM, so they are slower than regular package tests. For more Alternatively, you can specify other derivations as tests. You can make use of the optional parameter to inject the correct package without relying on non-local definitions, even in the presence of `overrideAttrs`. -Here that's `finalAttrs.public`, but you could choose a different name if +Here that's `finalAttrs.finalPackage`, but you could choose a different name if `finalAttrs` already exists in your scope. `(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the @@ -190,7 +190,7 @@ all places. { stdenv, callPackage }: stdenv.mkDerivation (finalAttrs: { # ... - passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.public; } + passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; }; }) ``` diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index fb0bdd5e2d7..d5d27cbf086 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -336,8 +336,7 @@ The `rec` keyword works at the syntax level and is unaware of overriding. Instead, the definition references `finalAttrs`, allowing users to change `withFeature` consistently with `overrideAttrs`. -`finalAttrs` also contains the attribute `public`, which represents the final package, -including the output paths, etc. +`finalAttrs` also contains the attribute `finalPackage`, which includes the output paths, etc. Let's look at a more elaborate example to understand the differences between various bindings: @@ -352,11 +351,11 @@ let pkg = packages = []; # `passthru.tests` is a commonly defined attribute. - passthru.tests.simple = f finalAttrs.public; + passthru.tests.simple = f finalAttrs.finalPackage; # An example of an attribute containing a function passthru.appendPackages = packages': - finalAttrs.public.overrideAttrs (newSelf: super: { + finalAttrs.finalPackage.overrideAttrs (newSelf: super: { packages = super.packages ++ packages'; }); @@ -368,7 +367,7 @@ let pkg = in pkg ``` -Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.public` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`. +Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`. See also the section about [`passthru.tests`](#var-meta-tests). diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 6e69423fe5f..a97a39354a9 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -48,7 +48,7 @@ In the above example, the `separateDebugInfo` attribute is overridden to be true The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. -The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `public` attribute which is the result of `mkDerivation` — the derivation or package. +The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `finalPackage` attribute which is equal to the result of `mkDerivation` or subsequent `overrideAttrs` calls. If only a one-argument function is written, the argument has the meaning of `previousAttrs`. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c91fb4d90f0..3f0db0068d0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -57,9 +57,9 @@ Additionally, passthru can now reference - finalAttrs.public containing the final - package, including attributes such as the output paths and - overrideAttrs. + finalAttrs.finalPackage containing the + final package, including attributes such as the output paths + and overrideAttrs. New language integrations can be simplified by overriding a diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 6dec64695d2..1fba4fbbe2c 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -23,7 +23,7 @@ In addition to numerous new and upgraded packages, this release has the followin This allows packaging configuration to be overridden in a consistent manner by providing an alternative to `rec {}` syntax. - Additionally, `passthru` can now reference `finalAttrs.public` containing + Additionally, `passthru` can now reference `finalAttrs.finalPackage` containing the final package, including attributes such as the output paths and `overrideAttrs`. diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 676d10d06ce..c82de2ae027 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { (nixos { environment.noXlibs = true; }).pkgs.hello; }; - passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.public; }; + passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; meta = with lib; { description = "A program that produces a familiar, friendly greeting"; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 3e3a7aa790d..6d9f6a9e336 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -24,10 +24,10 @@ let # separate lines, because Nix would only show the last line of the comment. # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`. - args = rattrs (args // { inherit public; }); + args = rattrs (args // { inherit finalPackage; }); # ^^^^ - public = + finalPackage = mkDerivationSimple (f0: let @@ -51,7 +51,7 @@ let makeDerivationExtensible mkDerivationSimple (self: let super = rattrs self; in super // f self super)) args; - in public; + in finalPackage; # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), # but pre-evaluated for a slight improvement in performance. From 12fc9780aa9d73df78a89f34ed5e381a87ca0277 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 08:35:58 +0200 Subject: [PATCH 20/52] python310Packages.zeroconf: disable failing test --- pkgs/development/python-modules/zeroconf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index e9eba02ac90..ef78dee484c 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" + # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')] + "test_service_browser_expire_callbacks" ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" ]; From 5f3b40fdbeb9f46d81d2ffe4fd0b77ad88963cac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 08:46:45 +0200 Subject: [PATCH 21/52] python310Packages.signedjson: 1.1.1 -> 1.1.4 --- .../python-modules/signedjson/default.nix | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 8409d9702e7..c7604126c7a 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,40 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , canonicaljson -, unpaddedbase64 -, pynacl -, typing-extensions -, setuptools-scm +, fetchPypi , importlib-metadata +, pynacl +, pytestCheckHook , pythonOlder +, setuptools-scm +, typing-extensions +, unpaddedbase64 }: buildPythonPackage rec { pname = "signedjson"; - version = "1.1.1"; + version = "1.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m"; + hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI="; }; - patches = [ - # Do not require importlib_metadata on python 3.8 - (fetchpatch { - url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch"; - sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1"; - }) + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ + canonicaljson + unpaddedbase64 + pynacl + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "signedjson" + ]; meta = with lib; { - homepage = "https://pypi.org/project/signedjson/"; description = "Sign JSON with Ed25519 signatures"; + homepage = "https://github.com/matrix-org/python-signedjson"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From 7f1ddd2da55978274f012cd05a3b803050cabb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 3 May 2022 12:37:59 +0100 Subject: [PATCH 22/52] matrix-synapse: 1.57.0 -> 1.58.0 Closes #169534 --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 5 +++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ pkgs/servers/matrix-synapse/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 1e3f269dafb..036387090a0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -842,6 +842,11 @@ to the new location if the stateVersion is updated. + + As of Synapse 1.58.0, the old groups/communities feature has + been disabled by default. It will be completely removed with + Synapse 1.61.0. + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index dcfabf01ff3..6ae81e7b524 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -345,6 +345,8 @@ In addition to numerous new and upgraded packages, this release has the followin `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new location if the `stateVersion` is updated. + As of Synapse 1.58.0, the old groups/communities feature has been disabled by default. It will be completely removed with Synapse 1.61.0. + - The Keycloak package (`pkgs.keycloak`) has been switched from the Wildfly version, which will soon be deprecated, to the Quarkus based version. The Keycloak service (`services.keycloak`) has been updated diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 235d1895e15..c81800a3561 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.57.0"; + version = "1.58.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s="; + sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA="; }; buildInputs = [ openssl ]; From d61d12e35622745b6d71cf5e63f169612083027a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Apr 2022 02:41:47 +0200 Subject: [PATCH 23/52] tusk: fix nix-env version parsing --- pkgs/applications/office/tusk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 5bfc8ebc970..f23e88a323c 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -21,7 +21,8 @@ let }; in appimageTools.wrapType2 rec { - name = "${pname}-v${version}"; + inherit pname version; + src = fetchurl { url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky"; @@ -36,7 +37,7 @@ in appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" ''; From 9ad05a3835662c200fbbfbe5894b7e61c31ff022 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 15:42:12 +0000 Subject: [PATCH 24/52] python310Packages.python-sql: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/python-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index a32dcfa5f00..6c29948fe0b 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176"; + sha256 = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; }; meta = { From c660b584ef914cb5be8fdc45de984a725674329d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Apr 2022 02:45:35 +0200 Subject: [PATCH 25/52] 7kaa: fix nix-env version parsing --- pkgs/games/7kaa/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index 2b74306cd25..ad128d4e127 100644 --- a/pkgs/games/7kaa/default.nix +++ b/pkgs/games/7kaa/default.nix @@ -15,17 +15,15 @@ }: let + pname = "7kaa"; + version = "2.15.4p1"; - name = "7kaa"; - versionMajor = "2.15"; - versionMinor = "4p1"; - - music = stdenv.mkDerivation rec { - pname = "${name}-music"; - version = "${versionMajor}"; + music = stdenv.mkDerivation { + pname = "7kaa-music"; + version = lib.versions.majorMinor version; src = fetchurl { - url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; + url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2"; sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; }; @@ -41,8 +39,7 @@ let in gccStdenv.mkDerivation rec { - pname = "${name}"; - version = "v${versionMajor}.${versionMinor}"; + inherit pname version; src = fetchFromGitHub { owner = "the3dfxdude"; From be971bce5ba1a981d4910505e686a0259a5e1bc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 18:04:28 +0200 Subject: [PATCH 26/52] python39Packages.loopy: 2020.2 -> 2020.2.1 - rename package (loo-py -> loopy) - update inputs - disable on older Python releases --- .../{loo-py => loopy}/default.nix | 52 ++++++++++--------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 30 insertions(+), 25 deletions(-) rename pkgs/development/python-modules/{loo-py => loopy}/default.nix (51%) diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loopy/default.nix similarity index 51% rename from pkgs/development/python-modules/loo-py/default.nix rename to pkgs/development/python-modules/loopy/default.nix index d16b06a284a..75d250ad03d 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -1,51 +1,55 @@ { lib , buildPythonPackage -, fetchPypi -, pytools -, pymbolic -, genpy +, codepy , cgen -, islpy -, six , colorama +, fetchFromGitHub +, genpy +, islpy , mako +, numpy +, pymbolic , pyopencl -, pytest +, pyrsistent +, pythonOlder +, pytools }: buildPythonPackage rec { - pname = "loo-py"; - version = "2020.2"; + pname = "loopy"; + version = "2020.2.1"; + format = "setuptools"; - src = fetchPypi { - pname = "loo.py"; - inherit version; - sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "inducer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g="; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ - pytools - pymbolic - genpy + codepy cgen - islpy - six colorama + genpy + islpy mako + numpy + pymbolic pyopencl + pyrsistent + pytools ]; # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR doCheck = false; - checkPhase = '' - HOME=$(mktemp -d) pytest test - ''; meta = with lib; { description = "A code generator for array-based code on CPUs and GPUs"; - homepage = "https://mathema.tician.de/software/loopy"; + homepage = "https://github.com/inducer/loopy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9a54a773edc..0dcb33f7965 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 net2grid = gridnet; # add 2022-04-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223..757073e5d30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4944,7 +4944,7 @@ in { lomond = callPackage ../development/python-modules/lomond { }; - loo-py = callPackage ../development/python-modules/loo-py { }; + loopy = callPackage ../development/python-modules/loopy { }; losant-rest = callPackage ../development/python-modules/losant-rest { }; From 4381a2796d19c099a0ee29342b105aeabd036f60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 19:13:39 +0200 Subject: [PATCH 27/52] python310Packages.python-sql: switch to pytestCheckHook - add pythonImportsCheck - disable on older Python releases --- .../python-modules/python-sql/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 6c29948fe0b..91012839d05 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -1,18 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "python-sql"; version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; + hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; }; - meta = { - homepage = "https://python-sql.tryton.org/"; - description = "A library to write SQL queries in a pythonic way"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.bsd3; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sql" + ]; + + meta = with lib; { + description = "Library to write SQL queries in a pythonic way"; + homepage = "https://pypi.org/project/python-sql/"; + license = licenses.bsd3; + maintainers = with maintainers; [ johbo ]; }; } From b7d21e8167119fd8bd920143f36a4dbe920d6448 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 17:31:03 +0000 Subject: [PATCH 28/52] python310Packages.webssh: 1.5.3 -> 1.6.0 --- pkgs/development/python-modules/webssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index ff26a9f1711..db21f16f424 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.5.3"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; + hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94="; }; propagatedBuildInputs = [ From b75d93d7328dea9963bff216df6c466f5cdf75ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 17:53:42 +0000 Subject: [PATCH 29/52] python310Packages.lektor: 3.3.3 -> 3.3.4 --- pkgs/development/python-modules/lektor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 020506d5191..600304f48a1 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc="; + hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw="; }; propagatedBuildInputs = [ From aefb74d24caf3a9a0bb88d782480bf0cf2e4ae7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 21:10:26 +0200 Subject: [PATCH 30/52] python310Packages.aioslimproto: 1.0.1 -> 2.0.0 --- .../python-modules/aioslimproto/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index beb1652b14f..50f8ed56404 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aioslimproto"; - version = "1.0.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -15,11 +16,12 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E="; + hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c="; }; - # Module has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aioslimproto" From 11e5f517f97739a2280c32e674c1ccbadd97d746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 12:20:14 -0700 Subject: [PATCH 31/52] python3Packages.pyrogram: 2.0.14 -> 2.0.16 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 4ef9493eeaa..6a2ce2af05e 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.14"; + version = "2.0.16"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg="; + hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg="; }; propagatedBuildInputs = [ From 9600919e140428252d812d03f53170ccc710b3ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 22:20:52 +0200 Subject: [PATCH 32/52] urlwatch: 2.24 -> 2.25 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 46093f2c5b9..472c699a3d8 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; + hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4="; }; propagatedBuildInputs = with python3Packages; [ From 4fc3c441e976e92383b90d4398556496b8f3bdf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 22:48:10 +0200 Subject: [PATCH 33/52] python310Packages.exceptiongroup: 1.0.0rc2 -> 1.0.0rc5 --- pkgs/development/python-modules/exceptiongroup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index ac4174b2f45..b2a355e94d2 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0rc2"; + version = "1.0.0rc5"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM="; + hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4="; }; nativeBuildInputs = [ From c094f76bf94471857c43dd7406b4c807515a434d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 22:53:54 +0200 Subject: [PATCH 34/52] python310Packages.luxtronik: 0.3.12 -> 0.3.13 --- pkgs/development/python-modules/luxtronik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index 7f7225bdb92..e8c72a5cf4c 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.12"; + version = "0.3.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY="; + sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY="; }; # Project has no tests From ac2858f9f59a41edd516d57d85c1a9365f8f22a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 22:58:41 +0200 Subject: [PATCH 35/52] python310Packages.pynetgear: 0.9.4 -> 0.10.0 --- pkgs/development/python-modules/pynetgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 1eabc9daaee..454c684076b 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.9.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08="; + sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI="; }; propagatedBuildInputs = [ From 37fec07a96a35b4e996468ac9f14794929555b5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 23:24:32 +0200 Subject: [PATCH 36/52] python310Packages.aiooncue: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/aiooncue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix index 3e9cc46b16b..728c28eddd8 100644 --- a/pkgs/development/python-modules/aiooncue/default.nix +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiooncue"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM="; + hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg="; }; propagatedBuildInputs = [ From 561d29b64d8b61d4368277c93aced88504f70773 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 3 May 2022 23:26:38 +0200 Subject: [PATCH 37/52] cryptomator: 1.6.8 -> 1.6.10 Hotfix for a truncation issue with fuse. --- pkgs/tools/security/cryptomator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 57e420f8669..76b5f521663 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U="; + sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc="; + outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak="; doCheck = false; }; From 3e93ff80f8837aaadc5a3a7c0111e2fc6f39ffec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 May 2022 23:46:53 +0200 Subject: [PATCH 38/52] checkov: 2.0.1102 -> 2.0.1110 --- pkgs/development/tools/analysis/checkov/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 92bcfec2790..1245603c53a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1102"; + version = "2.0.1110"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-OPYlgj8jdgCQJddy9UUXMjHJtQcoMrZbghgPUdyUV5Y="; + hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI="; }; nativeBuildInputs = with py.pkgs; [ @@ -89,6 +89,7 @@ buildPythonApplication rec { pytest-mock pytest-xdist pytestCheckHook + responses ]; postPatch = '' From 352750b3af534ae614cd4659b2eed711d3136751 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 00:02:20 +0200 Subject: [PATCH 39/52] python39Packages.sentry-sdk: 1.5.10 -> 1.5.11 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 4cd80fbed80..e764cd912a0 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.10"; + version = "1.5.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0="; + hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0="; }; propagatedBuildInputs = [ From b04e85247425c5a4a24a43a9f7f51be4f797ae4c Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 3 May 2022 17:56:12 -0700 Subject: [PATCH 40/52] librewolf: 99.0.1-4 -> 100.0-1 --- .../networking/browsers/firefox/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index 3503f9d65bb..f46736d0672 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "99.0.1-4", + "packageVersion": "100.0-1", "source": { - "rev": "99.0.1-4", - "sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni" + "rev": "100.0-1", + "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla" }, "firefox": { - "version": "99.0.1", - "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f" + "version": "100.0", + "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa" } } From f908b3e348ecfd7651f455d3afa7ba49b027a6ab Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 May 2022 09:20:06 +0800 Subject: [PATCH 41/52] pantheon.switchboard: 6.0.0 -> 6.0.1 --- .../pantheon/apps/switchboard/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index ee43903a00a..cc719e65dfa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; + sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M="; }; nativeBuildInputs = [ @@ -46,18 +45,6 @@ stdenv.mkDerivation rec { patches = [ ./plugs-path-env.patch - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard/pull/214 - (fetchpatch { - url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; - sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; - }) - # Fix build with meson 0.61 - # https://github.com/elementary/switchboard/pull/226 - (fetchpatch { - url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; - sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; - }) ]; postPatch = '' From 8e756d0ce7bfae2457ceaca8d3e11c371a0f7ff6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 03:50:39 +0000 Subject: [PATCH 42/52] python310Packages.mypy-boto3-s3: 1.22.0.post1 -> 1.22.6 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index c77dc384663..a329d5ab9e5 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.0.post1"; + version = "1.22.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4="; + hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; }; propagatedBuildInputs = [ From 1c8e735d76120fd2e6a42fb53e4268890c395f3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 04:15:51 +0000 Subject: [PATCH 43/52] python310Packages.stripe: 2.74.0 -> 2.75.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 27c3f84331a..c49dd79679d 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.74.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA="; + hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME="; }; propagatedBuildInputs = [ From 9d9849374f60dea33a9005b0adc96ec3595bb64c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 04:33:19 +0000 Subject: [PATCH 44/52] python310Packages.xknx: 0.21.1 -> 0.21.2 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index efb944c4a71..315ba9416d5 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.1"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-QNy/jUh/kIj6sabWnmC5L00ikBTrVmOEp6mFBya29WM="; + sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w="; }; propagatedBuildInputs = [ From c62eceb91e5b463974fca2bcedf033ae1f6c52db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 May 2022 18:05:26 +0200 Subject: [PATCH 45/52] openssl_3_0: 3.0.2 -> 3.0.3 - The c_rehash script allows command injection (CVE-2022-1292) - OCSP_basic_verify may incorrectly verify the response signing certificate (CVE-2022-1343) - Incorrect MAC key used in the RC4-MD5 ciphersuite (CVE-2022-1434) - Resource leakage when decoding certificates and keys (CVE-2022-1473) https://mta.openssl.org/pipermail/openssl-announce/2022-May/000224.html Fixes: CVE-2022-1292, CVE-2022-1343, CVE-2022-1434, CVE-2022-1473 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8182a01cd52..6818418ad68 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -193,8 +193,8 @@ in { }; openssl_3_0 = common { - version = "3.0.2"; - sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M="; + version = "3.0.3"; + sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs="; patches = [ ./3.0/nix-ssl-cert-file.patch From 562fdfd04ea1565bb079a3aa29abef4be9df6018 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 4 May 2022 08:46:19 +0200 Subject: [PATCH 46/52] kdash: 0.2.4 -> 0.3.1 Signed-off-by: Matthias Beyer --- pkgs/development/tools/kdash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 79beb161b58..90bd304c87c 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.2.4"; + version = "0.3.1"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "09f9qkab2scass4p2vxkhyqslcf32kvpxi1zfa23p72v681jp0c8"; + sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq"; }; nativeBuildInputs = [ perl python3 pkg-config ]; buildInputs = [ openssl xorg.xcbutil ]; - cargoSha256 = "0jbyvjgxcjw610nd2i6d3jfmhv1lwsl8ss4fd3kwczsms28frx5c"; + cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204"; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; From 404e8283e9dcd874cd4192aa298262c56e6d76c6 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 3 May 2022 19:34:41 -0400 Subject: [PATCH 47/52] mastodon: 3.5.1 -> 3.5.2 --- pkgs/servers/mastodon/default.nix | 2 +- pkgs/servers/mastodon/gemset.nix | 144 +++++++++++++++--------------- pkgs/servers/mastodon/source.nix | 4 +- pkgs/servers/mastodon/version.nix | 2 +- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index f43747e185a..075389e325a 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8="; + sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I="; }; mastodon-gems = bundlerEnv { diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 0b841c325db..a6deedbcb81 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz"; + sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh"; + sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf"; + sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w"; + sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib"; + sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi"; + sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws"; + sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195"; + sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939"; + sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph"; + sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4"; + sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm"; + sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc"; type = "gem"; }; - version = "1.558.0"; + version = "1.582.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +261,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq"; + sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; type = "gem"; }; - version = "3.127.0"; + version = "3.130.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; + sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; type = "gem"; }; - version = "1.55.0"; + version = "1.56.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i"; type = "gem"; }; - version = "1.113.0"; + version = "1.113.2"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,10 +294,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; bcrypt = { groups = ["default" "pam_authentication"]; @@ -369,20 +369,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1"; + sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; type = "gem"; }; - version = "1.10.3"; + version = "1.11.1"; }; brakeman = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy"; + sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14"; type = "gem"; }; - version = "5.2.1"; + version = "5.2.2"; }; browser = { groups = ["default"]; @@ -864,10 +864,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m"; + sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; excon = { groups = ["default"]; @@ -1102,10 +1102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka"; + sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1312,10 +1312,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0"; + sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; idn-ruby = { groups = ["default"]; @@ -1342,10 +1342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; json = { groups = ["default" "test"]; @@ -1545,10 +1545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr"; type = "gem"; }; - version = "2.16.0"; + version = "2.17.0"; }; mail = { dependencies = ["mini_mime"]; @@ -1690,10 +1690,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; + sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; @@ -1762,10 +1762,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1941,10 +1941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8"; + sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; pkg-config = { groups = ["default"]; @@ -2099,10 +2099,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.6.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -2154,10 +2154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv"; + sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2220,10 +2220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93"; + sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2293,10 +2293,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; request_store = { dependencies = ["rack"]; @@ -2399,10 +2399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2410,10 +2410,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; rspec-sidekiq = { dependencies = ["rspec-core" "sidekiq"]; @@ -2453,10 +2453,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl"; + sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; type = "gem"; }; - version = "1.26.1"; + version = "1.27.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2464,10 +2464,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -2603,10 +2603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx"; + sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.0"; }; sidekiq-unique-jobs = { dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"]; @@ -2614,10 +2614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y"; + sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq"; type = "gem"; }; - version = "7.1.16"; + version = "7.1.21"; }; simple-navigation = { dependencies = ["activesupport"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index aa915395e31..6d4dc034ff6 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v3.5.1"; - sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0"; + rev = "v3.5.2"; + sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 7714a397576..843ef5820f9 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.5.1" +"3.5.2" From 19687b6c9c7acd06c0d9e6d2872f371cdae99731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 10:09:11 +0200 Subject: [PATCH 48/52] matrix-appservice-irc: 0.33.1 -> 0.34.0 https://matrix.org/blog/2022/05/04/0-34-0-security-release-for-matrix-appservice-irc-high-severity https://github.com/matrix-org/matrix-appservice-irc/releases/tag/0.34.0 --- .../matrix-appservice-irc/node-composition.nix | 2 +- .../matrix-appservice-irc/node-packages.nix | 14 +++++++------- .../matrix-appservice-irc/package.json | 4 ++-- .../matrix-synapse/matrix-appservice-irc/src.json | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix index f9a1999f36d..a038d882e7f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix index 92885cee877..2e74ced5fb2 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: @@ -3128,13 +3128,13 @@ let sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A=="; }; }; - "matrix-org-irc-1.2.0" = { + "matrix-org-irc-1.2.1" = { name = "matrix-org-irc"; packageName = "matrix-org-irc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz"; - sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ=="; + url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.1.tgz"; + sha512 = "x7SoeIOP+Z6R2s8PJqhM89OZNsS2RO4srx7c3JGa/VN6rtJ1AMLEyW4EPCVh09tGiTvmbit9KJysjLvFQPx9KA=="; }; }; "media-typer-0.3.0" = { @@ -5031,7 +5031,7 @@ let args = { name = "matrix-appservice-irc"; packageName = "matrix-appservice-irc"; - version = "0.33.1"; + version = "0.34.0"; src = ./.; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -5475,7 +5475,7 @@ let sources."qs-6.10.3" ]; }) - sources."matrix-org-irc-1.2.0" + sources."matrix-org-irc-1.2.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json index f94cfc996ba..f0a1b6fc60c 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-irc", - "version": "0.33.1", + "version": "0.34.0", "description": "An IRC Bridge for Matrix", "main": "app.js", "bin": "./bin/matrix-appservice-irc", @@ -34,7 +34,7 @@ "he": "^1.2.0", "logform": "^2.4.0", "matrix-appservice-bridge": "^3.2.0", - "matrix-org-irc": "^1.2.0", + "matrix-org-irc": "^1.2.1", "matrix-bot-sdk": "0.5.19", "nopt": "^3.0.1", "p-queue": "^6.6.2", diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json index 35bea461b9f..ca4ea394550 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/matrix-org/matrix-appservice-irc", - "rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc", - "date": "2022-03-30T14:29:04+01:00", - "path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc", - "sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi", + "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161", + "date": "2022-05-04T09:06:31+02:00", + "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc", + "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 2c3b80358b89467427e090484c5f7c363bcf97d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 08:14:40 +0000 Subject: [PATCH 49/52] python310Packages.slack-sdk: 3.15.2 -> 3.16.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 09682a2a3d0..baba69922eb 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.15.2"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - rev = "v${version}"; - sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0="; }; propagatedBuildInputs = [ From 1d2a0b801a8c5aad8d7d302df661a16142eddc7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 10:25:02 +0200 Subject: [PATCH 50/52] nixos/tests/matrix-appservice-irc: disable registration verification The test would previously error out like this: > synapse_homeserver[1155]: synapse.config._base.ConfigError: You have > enabled open registration without any verification. This is a known > vector for spam and abuse. If you would like to allow public > registration, please consider adding email, captcha, or token-based > verification. Otherwise this check can be removed by setting the > `enable_registration_without_verification` config option to `true`. --- nixos/tests/matrix-appservice-irc.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix-appservice-irc.nix index d1c561f95db..70d45852398 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix-appservice-irc.nix @@ -20,6 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: enable_registration = true; + # don't use this in production, always use some form of verification + enable_registration_without_verification = true; + listeners = [ { # The default but tls=false bind_addresses = [ From 141e57f59862929b77324ee2051c3330c150c8b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 08:37:15 +0000 Subject: [PATCH 51/52] python310Packages.sqlalchemy-mixins: 1.5.1 -> 1.5.3 --- .../python-modules/sqlalchemy-mixins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 85a03482a32..c979fc58b19 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "1.5.1"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "absent1706"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HZiv7F0/UatgY3KlILgzywrK5NJE/tDe6B8/smeYwlM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M="; }; propagatedBuildInputs = [ From 65d0a8d7a19a3fe1347df128e483435cf5ad3f98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 09:42:59 +0000 Subject: [PATCH 52/52] python310Packages.pymyq: 3.1.4 -> 3.1.5 --- pkgs/development/python-modules/pymyq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 5f151aa46e2..94ff699507e 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.4"; + version = "3.1.5"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw="; }; propagatedBuildInputs = [