b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-05-04 12:01:10 +00:00 committed by GitHub
parent d3d388c5df 4f68abccd8
commit 16684f8bd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 549 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
doc/stdenv/meta.chapter.md
View file

@ -175,6 +175,40 @@ 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 to inject the correct package without
relying on non-local definitions, even in the presence of `overrideAttrs`.
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
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 (finalAttrs: {
# ...
passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; };
})
```
```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.in >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`.

54
doc/stdenv/stdenv.chapter.md
View file

@ -317,6 +317,60 @@ 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 arguments, including the overrides when reinvoked via `overrideAttrs`. For example:
```nix
mkDerivation (finalAttrs: {
pname = "hello";
withFeature = true;
configureFlags =
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 `finalAttrs`, allowing users to change `withFeature`
consistently with `overrideAttrs`.
`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:
```nix
# `pkg` is the _original_ definition (for illustration purposes)
let pkg =
mkDerivation (finalAttrs: {
# ...
# An example attribute
packages = [];
# `passthru.tests` is a commonly defined attribute.
passthru.tests.simple = f finalAttrs.finalPackage;
# An example of an attribute containing a function
passthru.appendPackages = packages':
finalAttrs.finalPackage.overrideAttrs (newSelf: super: {
packages = super.packages ++ packages';
});
# For illustration purposes; referenced as
# `(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 `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).
## 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.

8
doc/using/overrides.chapter.md
View file

@ -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 `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`.
::: {.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).

32
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -43,6 +43,33 @@
Shell.
</para>
</listitem>
<listitem>
<para>
<literal>stdenv.mkDerivation</literal> now supports a
self-referencing <literal>finalAttrs:</literal> parameter
containing the final <literal>mkDerivation</literal> arguments
including overrides. <literal>drv.overrideAttrs</literal> now
supports two parameters
<literal>finalAttrs: previousAttrs:</literal>. This allows
packaging configuration to be overridden in a consistent
manner by providing an alternative to
<literal>rec {}</literal> syntax.
</para>
<para>
Additionally, <literal>passthru</literal> can now reference
<literal>finalAttrs.finalPackage</literal> containing the
final package, including attributes such as the output paths
and <literal>overrideAttrs</literal>.
</para>
<para>
New language integrations can be simplified by overriding a
<quote>prototype</quote> package containing the
language-specific logic. This removes the need for a extra
layer of overriding for the <quote>generic builder</quote>
arguments, thus removing a usability problem and source of
error.
</para>
</listitem>
<listitem>
<para>
PHP 8.1 is now available
@ -850,6 +877,11 @@
to the new location if the <literal>stateVersion</literal> is
updated.
</para>
<para>
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.
</para>
</listitem>
<listitem>
<para>

17
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -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.finalPackage` 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).
@ -347,6 +362,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

3
nixos/tests/matrix-appservice-irc.nix
View file

@ -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 = [

2
pkgs/applications/editors/android-studio/common.nix
View file

@ -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 [

3
pkgs/applications/editors/android-studio/default.nix
View file

@ -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.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"

13
pkgs/applications/misc/hello/default.nix
View file

@ -1,4 +1,5 @@
{ lib
{ callPackage
, lib
, stdenv
, fetchurl
, nixos
@ -6,12 +7,12 @@
, hello
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hello";
version = "2.12";
src = fetchurl {
url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";
sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
};
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
(nixos { environment.noXlibs = true; }).pkgs.hello;
};
passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
meta = with lib; {
description = "A program that produces a familiar, friendly greeting";
longDescription = ''
@ -34,9 +37,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${finalAttrs.version}";
license = licenses.gpl3Plus;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
};
}
})

8
pkgs/applications/misc/hello/test.nix Normal file
View file

@ -0,0 +1,8 @@
{ runCommand, hello }:
runCommand "hello-test-run" {
nativeBuildInputs = [ hello ];
} ''
diff -U3 --color=auto <(hello) <(echo 'Hello, world!')
touch $out
''

10
pkgs/applications/networking/browsers/firefox/librewolf/src.json
View file

@ -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"
}
}

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -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 = ''

5
pkgs/applications/office/tusk/default.nix
View file

@ -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/"
'';

17
pkgs/desktops/pantheon/apps/switchboard/default.nix
View file

@ -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 = ''

24
pkgs/development/libraries/htmlcxx/c++17.patch Normal file
View file

@ -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);

11
pkgs/development/libraries/htmlcxx/default.nix
View file

@ -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/";

4
pkgs/development/libraries/openssl/default.nix
View file

@ -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

4
pkgs/development/python-modules/aiooncue/default.nix
View file

@ -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 = [

10
pkgs/development/python-modules/aioslimproto/default.nix
View file

@ -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"

4
pkgs/development/python-modules/exceptiongroup/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/lektor/default.nix
View file

@ -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 = [

52
pkgs/development/python-modules/loo-py/default.nix → pkgs/development/python-modules/loopy/default.nix
View file

@ -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 ];
};
}

4
pkgs/development/python-modules/luxtronik/default.nix
View file

@ -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

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View file

@ -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 = [

6
pkgs/development/python-modules/pymyq/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/pynetgear/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/pyrogram/default.nix
View file

@ -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 = [

32
pkgs/development/python-modules/python-sql/default.nix
View file

@ -1,18 +1,34 @@
{ lib, fetchPypi, buildPythonPackage }:
{ lib
, fetchPypi
, buildPythonPackage
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-sql";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176";
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 ];
};
}

4
pkgs/development/python-modules/sentry-sdk/default.nix
View file

@ -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 = [

49
pkgs/development/python-modules/signedjson/default.nix
View file

@ -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; [ ];
};
}

6
pkgs/development/python-modules/slack-sdk/default.nix
View file

@ -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 = [

6
pkgs/development/python-modules/sqlalchemy-mixins/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/stripe/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/webssh/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/xknx/default.nix
View file

@ -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 = [

2
pkgs/development/python-modules/zeroconf/default.nix
View file

@ -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"
];

5
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -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 = ''

34
pkgs/development/tools/kdash/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
, perl
, python3
, openssl
, xorg
}:
rustPlatform.buildRustPackage rec {
pname = "kdash";
version = "0.3.1";
src = fetchFromGitHub {
owner = "kdash-rs";
repo = pname;
rev = "v${version}";
sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq";
};
nativeBuildInputs = [ perl python3 pkg-config ];
buildInputs = [ openssl xorg.xcbutil ];
cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204";
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 ];
};
}

2
pkgs/development/web/nodejs/nodejs.nix
View file

@ -194,7 +194,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

17
pkgs/games/7kaa/default.nix
View file

@ -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";

2
pkgs/servers/mastodon/default.nix
View file

@ -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 {

144
pkgs/servers/mastodon/gemset.nix
View file

@ -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"];

4
pkgs/servers/mastodon/source.nix
View file

@ -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;

2
pkgs/servers/mastodon/version.nix
View file

@ -1 +1 @@
"3.5.1"
"3.5.2"

4
pkgs/servers/matrix-synapse/default.nix
View file

@ -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 ];

2
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix
View file

@ -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 <nixpkgs> {
inherit system;

14
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix generated
View file

@ -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"

4
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
View file

@ -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",

8
pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json
View file

@ -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,

71
pkgs/stdenv/generic/make-derivation.nix
View file

@ -9,8 +9,72 @@ let
# to build it. This is a bit confusing for cross compilation.
inherit (stdenv) hostPlatform;
};
makeOverlayable = mkDerivationSimple:
fnOrAttrs:
if builtins.isFunction fnOrAttrs
then makeDerivationExtensible mkDerivationSimple fnOrAttrs
else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs;
# 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 finalPackage; });
# ^^^^
finalPackage =
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 finalPackage;
# 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
f0 self super
else x;
in
makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs))
attrs;
in
makeOverlayable (overrideAttrs:
# `mkDerivation` wraps the builtin `derivation` function to
# produce derivations that use this stdenv and its shell.
#
@ -70,6 +134,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 +446,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 +471,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)
)

4
pkgs/tools/misc/pferd/default.nix
View file

@ -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; [

4
pkgs/tools/networking/urlwatch/default.nix
View file

@ -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; [

6
pkgs/tools/security/cryptomator/default.nix
View file

@ -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;
};

2
pkgs/top-level/all-packages.nix
View file

@ -7378,6 +7378,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 { };

1
pkgs/top-level/python-aliases.nix
View file

@ -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

2
pkgs/top-level/python-packages.nix
View file

@ -4946,7 +4946,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 { };