diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 26458c3906e..c0f1342a94f 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -7,8 +7,9 @@
#### Overview
Several versions of the Python interpreter are available on Nix, as well as a
-high amount of packages. The attribute `python` refers to the default
-interpreter, which is currently CPython 2.7. It is also possible to refer to
+high amount of packages. The attribute `python3` refers to the default
+interpreter, which is currently CPython 3.8. The attribute `python` refers to
+CPython 2.7 for backwards-compatibility. It is also possible to refer to
specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to
the default PyPy interpreter.
@@ -762,10 +763,10 @@ and in this case the `python38` interpreter is automatically used.
Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
respectively `python27`, `python36`, `python37`, `python38` and `python39`. The
aliases `python2` and `python3` correspond to respectively `python27` and
-`python38`. The default interpreter, `python`, maps to `python2`. The PyPy
-interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
-`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`.
-The Nix expressions for the interpreters can be found in
+`python39`. The attribute `python` maps to `python2`. The PyPy interpreters
+compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with
+aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix
+expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.
All packages depending on any Python interpreter get appended
@@ -788,6 +789,23 @@ Each interpreter has the following attributes:
- `executable`. Name of the interpreter executable, e.g. `python3.8`.
- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
+### Optimizations
+
+The Python interpreters are by default not build with optimizations enabled, because
+the builds are in that case not reproducible. To enable optimizations, override the
+interpreter of interest, e.g using
+
+```
+let
+ pkgs = import ./. {};
+ mypython = pkgs.python3.override {
+ enableOptimizations = true;
+ reproducibleBuild = false;
+ self = mypython;
+ };
+in mypython
+```
+
### Building packages and applications
Python libraries and applications that use `setuptools` or
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 218bb3ae309..5d9d91053e7 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -67,6 +67,12 @@
for the motivation).
+
+
+ Python optimizations were disabled again. Builds with optimizations enabled
+ are not reproducible. Optimizations can now be enabled with an option.
+
+
Kodi has been updated to version 19.0 "Matrix". See
@@ -579,6 +585,11 @@ self: super:
no longer uses the deprecated cirrus and vesa device dependent X drivers by default. It also enables both amdgpu and nouveau drivers by default now.
+
+
+ The kindlegen package is gone, because it is no longer supported or hosted by Amazon. Sadly, its replacement, Kindle Previewer, has no Linux support. However, there are other ways to generate MOBI files. See the discussion for more info.
+
+
The apacheKafka packages are now built with
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6b672c7b2eb..e3cd8f58c06 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -84,6 +84,7 @@ let
# Kernel module loading.
"systemd-modules-load.service"
"kmod-static-nodes.service"
+ "modprobe@.service"
# Filesystems.
"systemd-fsck@.service"
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 4ae7600f4a1..71e7be66b1e 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.2.1522";
+ version = "8.2.2567";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "0dah3392cq06pagik5y7kcq61mslqvfsh7vqldv3kvhr5ilqb8qy";
+ sha256 = "sha256-FS3TZX7FKnnNpGYKbng2LIfWA9z2jqg7d2HC6t3xYTU=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 58c47721b6b..49021f5e3c3 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.10-61";
- sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8=";
+ version = "7.0.11-3";
+ sha256 = "sha256-y937OxAHNTbWa96oQmTpp/ivxtPVL16hr4SvzZWugQo=";
patches = [];
};
in
@@ -84,6 +84,7 @@ stdenv.mkDerivation {
homepage = "http://www.imagemagick.org/";
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ erictapen ];
license = licenses.asl20;
};
}
diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix
index d7f829dc00e..31eb3371038 100644
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubelogin";
- version = "0.0.7";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "Azure";
repo = pname;
rev = "v${version}";
- sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy";
+ sha256 = "sha256-iR+DomoCErzl9GEE8qTWEkJvbCnw4Ob7R66eluMBNcQ=";
};
- vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb";
+ vendorSha256 = "sha256-HXSvZoOX22poOYGghCpXX9BSSR9L6YMqw+7x4WZS39o=";
buildFlagsArray = ''
-ldflags=
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 5d1589446be..1f7fd36e1d3 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -24,7 +24,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.30.1";
+ version = "2.31.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r";
+ sha256 = "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -311,6 +311,9 @@ stdenv.mkDerivation {
# Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options"
+ # Flaky tests:
+ disable_test t5319-multi-pack-index
+
${lib.optionalString (!perlSupport) ''
# request-pull is a Bash script that invokes Perl, so it is not available
# when NO_PERL=1, and the test should be skipped, but the test suite does
@@ -336,7 +339,7 @@ stdenv.mkDerivation {
homepage = "https://git-scm.com/";
description = "Distributed version control system";
license = lib.licenses.gpl2;
- changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt";
+ changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.txt";
longDescription = ''
Git, a popular distributed version control system designed to
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 5fafc36273a..c2186cf6bfa 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -74,7 +74,7 @@ runCommand name
preferLocalBuild = true;
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
- passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
+ passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
}
''
${buildPackages.perl}/bin/perl -w ${builder}
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index d08fd24cd2d..b402893100b 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -132,12 +132,13 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then
fi
if [[ "$isCpp" = 1 ]]; then
- if [[ "$cppInclude" = 1 ]]; then
- NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"
- fi
NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@"
fi
+if [[ "$cppInclude" = 1 ]]; then
+ NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"
+fi
+
source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper.
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index eab5366e183..4995efd9a4b 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -1,27 +1,12 @@
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }:
-let
-
- runCommand' = runLocal: stdenv: name: env: buildCommand:
- stdenv.mkDerivation ({
- name = lib.strings.sanitizeDerivationName name;
- inherit buildCommand;
- passAsFile = [ "buildCommand" ];
- }
- // (lib.optionalAttrs runLocal {
- preferLocalBuild = true;
- allowSubstitutes = false;
- })
- // env);
-
-in
-
rec {
/* Run the shell command `buildCommand' to produce a store path named
* `name'. The attributes in `env' are added to the environment
- * prior to running the command. By default `runCommand' runs using
- * stdenv with no compiler environment. `runCommandCC`
+ * prior to running the command. By default `runCommand` runs in a
+ * stdenv with no compiler environment. `runCommandCC` uses the default
+ * stdenv, `pkgs.stdenv`.
*
* Examples:
* runCommand "name" {envVariable = true;} ''echo hello > $out''
@@ -42,13 +27,64 @@ rec {
runCommand = runCommandNoCC;
runCommandLocal = runCommandNoCCLocal;
- runCommandNoCC = runCommand' false stdenvNoCC;
- runCommandNoCCLocal = runCommand' true stdenvNoCC;
+ runCommandNoCC = name: env: runCommandWith {
+ stdenv = stdenvNoCC;
+ runLocal = false;
+ inherit name;
+ derivationArgs = env;
+ };
+ runCommandNoCCLocal = name: env: runCommandWith {
+ stdenv = stdenvNoCC;
+ runLocal = true;
+ inherit name;
+ derivationArgs = env;
+ };
- runCommandCC = runCommand' false stdenv;
+ runCommandCC = name: env: runCommandWith {
+ stdenv = stdenv;
+ runLocal = false;
+ inherit name;
+ derivationArgs = env;
+ };
# `runCommandCCLocal` left out on purpose.
# We shouldn’t force the user to have a cc in scope.
+ /* Generalized version of the `runCommand`-variants
+ * which does customized behavior via a single
+ * attribute set passed as the first argument
+ * instead of having a lot of variants like
+ * `runCommand*`. Additionally it allows changing
+ * the used `stdenv` freely and has a more explicit
+ * approach to changing the arguments passed to
+ * `stdenv.mkDerivation`.
+ */
+ runCommandWith =
+ let
+ # prevent infinite recursion for the default stdenv value
+ defaultStdenv = stdenv;
+ in
+ { stdenv ? defaultStdenv
+ # which stdenv to use, defaults to a stdenv with a C compiler, pkgs.stdenv
+ , runLocal ? false
+ # whether to build this derivation locally instead of substituting
+ , derivationArgs ? {}
+ # extra arguments to pass to stdenv.mkDerivation
+ , name
+ # name of the resulting derivation
+ }: buildCommand:
+ stdenv.mkDerivation ({
+ name = lib.strings.sanitizeDerivationName name;
+ inherit buildCommand;
+ passAsFile = [ "buildCommand" ]
+ ++ (derivationArgs.passAsFile or []);
+ }
+ // (lib.optionalAttrs runLocal {
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+ })
+ // builtins.removeAttrs derivationArgs [ "passAsFile" ]);
+
+
/* Writes a text file to the nix store.
* The contents of text is added to the file in the store.
*
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index e50aa81656a..fec2dfa9001 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -10,13 +10,6 @@
with lib;
let
-
- certdata2pem = fetchurl {
- name = "certdata2pem.py";
- url = "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py";
- sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
- };
-
version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in
@@ -29,6 +22,15 @@ stdenv.mkDerivation {
sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0=";
};
+ certdata2pem = fetchurl {
+ name = "certdata2pem.py";
+ url = [
+ "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"
+ "https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957"
+ ];
+ sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
+ };
+
outputs = [ "out" "unbundled" ];
nativeBuildInputs = [ python3 ];
@@ -40,7 +42,8 @@ stdenv.mkDerivation {
${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)}
EOF
- cat ${certdata2pem} > certdata2pem.py
+ # copy from the store, otherwise python will scan it for imports
+ cat "$certdata2pem" > certdata2pem.py
'';
buildPhase = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index fa2fb86a5ce..f0a80bc525a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -29,11 +29,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
- version = "3.38.2";
+ version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1";
+ sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM=";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 4e7892c048f..1374cfc9358 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,15 +1,13 @@
{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
-let
+stdenv.mkDerivation rec {
pname = "dconf-editor";
- version = "3.38.0";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "3.38.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 5187f51cbf2..cec0ac7a681 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "eog";
- version = "3.38.1";
+ version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp";
+ sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 603aaf1744b..f8c458a3df1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,6 +1,5 @@
{ fetchurl
, fetchFromGitLab
-, fetchpatch
, lib, stdenv
, substituteAll
, accountsservice
@@ -70,11 +69,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
- version = "3.38.1";
+ version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
+ sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk=";
};
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
@@ -151,22 +150,6 @@ stdenv.mkDerivation rec {
inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet;
})
-
- # Fix double free when leaving user accounts panel.
- # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch";
- sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw=";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
- sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
- })
- # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch";
- sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4=";
- })
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index bfe0bfe9d61..c6d8b319308 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
- version = "3.38.2";
+ version = "3.38.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9";
+ sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 95dfd0ef282..5c573d2502c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
- version = "3.38.1";
+ version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k=";
+ sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index d2909c449d4..435da4e3720 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -37,11 +37,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
- version = "3.38.2";
+ version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g=";
+ sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 56408d464db..2cd22e3ceaa 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
- version = "3.38.2";
+ version = "3.38.3";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k";
+ sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0=";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 1ac0be1b194..07e3b536a41 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -42,13 +42,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.38.2";
+ version = "3.38.3";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr";
+ sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8=";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 6d282283925..64009cd75eb 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
- version = "3.38.1";
+ version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy";
+ sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index d4b6561c0de..22ce6c72011 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "yelp-xsl";
- version = "3.38.1";
+ version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk";
+ sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 62c5994fd41..754a7748668 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "yelp";
- version = "3.38.1";
+ version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl";
+ sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0=";
};
nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ];
diff --git a/pkgs/development/compilers/rust/1_50.nix b/pkgs/development/compilers/rust/1_50.nix
index 06449d59dad..4e393a588fb 100644
--- a/pkgs/development/compilers/rust/1_50.nix
+++ b/pkgs/development/compilers/rust/1_50.nix
@@ -15,7 +15,7 @@
, CoreFoundation, Security
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
-, llvmPackages_5, llvm_11
+, llvmPackages_11, llvm_11
} @ args:
import ./default.nix {
@@ -26,7 +26,7 @@ import ./default.nix {
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; };
- llvmBootstrapForDarwin = llvmPackages_5;
+ llvmBootstrapForDarwin = llvmPackages_11;
# For use at runtime
llvmShared = llvm_11.override { enableSharedLibraries = true; };
@@ -54,4 +54,4 @@ import ./default.nix {
];
}
-(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"])
+(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"])
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 222ad903ec1..b56f509b31a 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -38,6 +38,8 @@ let
"0.48" = ./disable-graphviz-0.46.1.patch;
+ "0.50" = ./disable-graphviz-0.46.1.patch;
+
}.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@@ -108,8 +110,8 @@ in rec {
};
vala_0_40 = generic {
- version = "0.40.18";
- sha256 = "1f7cdkjdysg4dcri1wbzdddm46amk2s48jkwb5ghpdvhjb4l5j2m";
+ version = "0.40.25";
+ sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7";
};
vala_0_44 = generic {
@@ -118,13 +120,18 @@ in rec {
};
vala_0_46 = generic {
- version = "0.46.5";
- sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s";
+ version = "0.46.13";
+ sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs";
};
vala_0_48 = generic {
- version = "0.48.9";
- sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw";
+ version = "0.48.14";
+ sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw";
+ };
+
+ vala_0_50 = generic {
+ version = "0.50.4";
+ sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q";
};
vala = vala_0_48;
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index adeafa80e6c..f905612d022 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -27,7 +27,10 @@
, sha256
, passthruFun
, static ? false
-, enableOptimizations ? (!stdenv.isDarwin)
+, stripBytecode ? reproducibleBuild
+, rebuildBytecode ? true
+, reproducibleBuild ? true
+, enableOptimizations ? false
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
}:
@@ -36,12 +39,26 @@ assert x11Support -> tcl != null
&& xlibsWrapper != null
&& libX11 != null;
+assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
+ "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
+
+assert lib.assertMsg (reproducibleBuild -> stripBytecode)
+ "Deterministic builds require stripping bytecode.";
+
+assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations))
+ "Deterministic builds are not achieved when optimizations are enabled.";
+
+
with lib;
let
buildPackages = pkgsBuildHost;
inherit (passthru) pythonForBuild;
+ pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then
+ "$out/bin/python"
+ else pythonForBuild.interpreter;
+
passthru = passthruFun rec {
inherit self sourceVersion packageOverrides;
implementation = "cpython";
@@ -272,14 +289,15 @@ in with passthru; stdenv.mkDerivation ({
# Determinism: Windows installers were not deterministic.
# We're also not interested in building Windows installers.
find "$out" -name 'wininst*.exe' | xargs -r rm -f
- '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform)
- ''
- # Determinism: rebuild all bytecode
- # We exclude lib2to3 because that's Python 2 code which fails
- # We rebuild three times, once for each optimization level
- find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
+ '' + optionalString stripBytecode ''
+ # Determinism: deterministic bytecode
+ # First we delete all old bytecode.
+ find $out -name "*.pyc" -delete
+ '' + optionalString rebuildBytecode ''
+ # Then, we build for the two optimization levels.
+ # We do not build unoptimized bytecode, because its not entirely deterministic yet.
+ find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i -
+ find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
'' + optionalString stdenv.hostPlatform.isCygwin ''
cp libpython2.7.dll.a $out/lib
'';
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index fdf022213c5..72b47b7afd3 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -4,6 +4,7 @@
, libffi
, gdbm
, lzma
+, mime-types ? null, mimetypesSupport ? true
, ncurses
, openssl
, readline
@@ -11,6 +12,7 @@
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
, bluez ? null, bluezSupport ? false
, zlib
+, tzdata ? null
, self
, configd
, autoreconfHook
@@ -33,12 +35,11 @@
, stripTests ? false
, stripTkinter ? false
, rebuildBytecode ? true
-, stripBytecode ? false
+, stripBytecode ? reproducibleBuild
, includeSiteCustomize ? true
, static ? stdenv.hostPlatform.isStatic
-# Not using optimizations on Darwin
-# configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.
-, enableOptimizations ? (!stdenv.isDarwin)
+, enableOptimizations ? false
+, reproducibleBuild ? true
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
}:
@@ -54,12 +55,25 @@ assert x11Support -> tcl != null
assert bluezSupport -> bluez != null;
+assert mimetypesSupport -> mime-types != null;
+
+assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
+ "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
+
+assert lib.assertMsg (reproducibleBuild -> stripBytecode)
+ "Deterministic builds require stripping bytecode.";
+
+assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations))
+ "Deterministic builds are not achieved when optimizations are enabled.";
+
with lib;
let
buildPackages = pkgsBuildHost;
inherit (passthru) pythonForBuild;
+ tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9";
+
passthru = passthruFun rec {
inherit self sourceVersion packageOverrides;
implementation = "cpython";
@@ -92,7 +106,8 @@ let
zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
++ optionals x11Support [ tcl tk libX11 xorgproto ]
++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]
- ++ optionals stdenv.isDarwin [ configd ]);
+ ++ optionals stdenv.isDarwin [ configd ])
+ ++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@@ -175,6 +190,9 @@ in with passthru; stdenv.mkDerivation {
# (since it will do a futile invocation of gcc (!) to find
# libuuid, slowing down program startup a lot).
(./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch")
+ ] ++ optionals mimetypesSupport [
+ # Make the mimetypes module refer to the right file
+ ./mimetypes.patch
] ++ optionals (isPy35 || isPy36) [
# Determinism: Write null timestamps when compiling python files.
./3.5/force_bytecode_determinism.patch
@@ -235,6 +253,9 @@ in with passthru; stdenv.mkDerivation {
postPatch = ''
substituteInPlace Lib/subprocess.py \
--replace "'/bin/sh'" "'${bash}/bin/sh'"
+ '' + optionalString mimetypesSupport ''
+ substituteInPlace Lib/mimetypes.py \
+ --replace "@mime-types@" "${mime-types}"
'' + optionalString (x11Support && (tix != null)) ''
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
@@ -285,6 +306,8 @@ in with passthru; stdenv.mkDerivation {
# Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms.
"ac_cv_func_lchmod=no"
+ ] ++ optionals tzdataSupport [
+ "--with-tzpath=${tzdata}/share/zoneinfo"
] ++ optional static "LDFLAGS=-static";
preConfigure = ''
@@ -304,7 +327,14 @@ in with passthru; stdenv.mkDerivation {
setupHook = python-setup-hook sitePackages;
- postInstall = ''
+ postInstall = let
+ # References *not* to nuke from (sys)config files
+ keep-references = concatMapStringsSep " " (val: "-e ${val}") ([
+ (placeholder "out")
+ ] ++ optionals tzdataSupport [
+ tzdata
+ ]);
+ in ''
# needed for some packages, especially packages that backport functionality
# to 2.x from 3.x
for item in $out/lib/${libPrefix}/test/*; do
@@ -340,8 +370,8 @@ in with passthru; stdenv.mkDerivation {
done
# Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668
- find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' +
- find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' +
+ find $out/lib/python*/config-* -type f -print -exec nuke-refs ${keep-references} '{}' +
+ find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs ${keep-references} '{}' +
# Make the sysconfigdata module accessible on PYTHONPATH
# This allows build Python to import host Python's sysconfigdata
@@ -360,18 +390,19 @@ in with passthru; stdenv.mkDerivation {
'' + optionalString includeSiteCustomize ''
# Include a sitecustomize.py file
cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
- '' + optionalString rebuildBytecode ''
- # Determinism: rebuild all bytecode
- # We exclude lib2to3 because that's Python 2 code which fails
- # We rebuild three times, once for each optimization level
+ '' + optionalString stripBytecode ''
+ # Determinism: deterministic bytecode
+ # First we delete all old bytecode.
+ find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
+ '' + optionalString rebuildBytecode ''
+ # Then, we build for the two optimization levels.
+ # We do not build unoptimized bytecode, because its not entirely deterministic yet.
# Python 3.7 implements PEP 552, introducing support for deterministic bytecode.
- # This is automatically used when `SOURCE_DATE_EPOCH` is set.
- find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i -
+ # compileall uses this checked-hash method by default when `SOURCE_DATE_EPOCH` is set.
+ # We exclude lib2to3 because that's Python 2 code which fails
find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i -
find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
- '' + optionalString stripBytecode ''
- find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
'';
preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/development/interpreters/python/cpython/mimetypes.patch b/pkgs/development/interpreters/python/cpython/mimetypes.patch
new file mode 100644
index 00000000000..4ea700a1f2a
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/mimetypes.patch
@@ -0,0 +1,23 @@
+diff --git i/Lib/mimetypes.py w/Lib/mimetypes.py
+index f3343c8..ab5b886 100644
+--- i/Lib/mimetypes.py
++++ w/Lib/mimetypes.py
+@@ -40,16 +40,8 @@
+ ]
+
+ knownfiles = [
+- "/etc/mime.types",
+- "/etc/httpd/mime.types", # Mac OS X
+- "/etc/httpd/conf/mime.types", # Apache
+- "/etc/apache/mime.types", # Apache 1
+- "/etc/apache2/mime.types", # Apache 2
+- "/usr/local/etc/httpd/conf/mime.types",
+- "/usr/local/lib/netscape/mime.types",
+- "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2
+- "/usr/local/etc/mime.types", # Apache 1.3
+- ]
++ "@mime-types@/etc/mime.types",
++]
+
+ inited = False
+ _db = None
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 2a4ffeb4215..39e27ec9944 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -108,6 +108,19 @@ with pkgs;
python = self;
};
};
+
+ sources = {
+ "python38" = {
+ sourceVersion = {
+ major = "3";
+ minor = "8";
+ patch = "8";
+ suffix = "";
+ };
+ sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw=";
+ };
+ };
+
in {
python27 = callPackage ./cpython/2.7 {
@@ -149,18 +162,11 @@ in {
inherit passthruFun;
};
- python38 = callPackage ./cpython {
+ python38 = callPackage ./cpython ({
self = python38;
- sourceVersion = {
- major = "3";
- minor = "8";
- patch = "8";
- suffix = "";
- };
- sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw=";
inherit (darwin) configd;
inherit passthruFun;
- };
+ } // sources.python38);
python39 = callPackage ./cpython {
self = python39;
@@ -189,8 +195,9 @@ in {
};
# Minimal versions of Python (built without optional dependencies)
- python3Minimal = (python38.override {
+ python3Minimal = (callPackage ./cpython ({
self = python3Minimal;
+ inherit passthruFun;
pythonAttr = "python3Minimal";
# strip down that python version as much as possible
openssl = null;
@@ -199,6 +206,7 @@ in {
gdbm = null;
sqlite = null;
configd = null;
+ tzdata = null;
stripConfig = true;
stripIdlelib = true;
stripTests = true;
@@ -207,7 +215,8 @@ in {
stripBytecode = true;
includeSiteCustomize = false;
enableOptimizations = false;
- }).overrideAttrs(old: {
+ mimetypesSupport = false;
+ } // sources.python38)).overrideAttrs(old: {
pname = "python3-minimal";
meta = old.meta // {
maintainers = [];
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 2161ad9e59c..e0b1f05516c 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -6,11 +6,11 @@
# files.
stdenv.mkDerivation rec {
- name = "acl-2.2.53";
+ name = "acl-2.3.0";
src = fetchurl {
url = "mirror://savannah/acl/${name}.tar.gz";
- sha256 = "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6";
+ sha256 = "sha256-vTj9u7A8eTdK9RRn6+VJfLwDNbgld/MMlRpBqVtTMAk=";
};
outputs = [ "bin" "dev" "out" "man" "doc" ];
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 464e79f6c2d..bc8dc70f9b4 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sratom";
- version = "0.6.4";
+ version = "0.6.8";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l";
+ sha256 = "sha256-Ossysa3Forf6za3i4IGLzWxx8j+EoevBeBW7eg0tAt8=";
};
nativeBuildInputs = [ pkg-config wafHook python3 ];
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b18ce099dce..ce64bef95ad 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
- version = "2.66.4";
+ version = "2.66.8";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ=";
+ sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs=";
};
patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/development/libraries/glib/schema-override-variable.patch
index 1cb5a730351..f98af04a7f2 100644
--- a/pkgs/development/libraries/glib/schema-override-variable.patch
+++ b/pkgs/development/libraries/glib/schema-override-variable.patch
@@ -1,12 +1,14 @@
+diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
+index 1282c10a1..feadfe3aa 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
-@@ -352,6 +352,9 @@
+@@ -360,6 +360,9 @@ initialise_schema_sources (void)
try_prepend_data_dir (g_get_user_data_dir ());
-+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
++ if (!is_setuid && (path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
+ try_prepend_dir (path);
+
- if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
- try_prepend_dir (path);
-
+ /* Disallow loading extra schemas if running as setuid, as that could
+ * allow reading privileged files. */
+ if (!is_setuid && (path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz
index 36aaf51cce9..bd99c36d741 100644
Binary files a/pkgs/development/libraries/glibc/2.32-master.patch.gz and b/pkgs/development/libraries/glibc/2.32-master.patch.gz differ
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 8bf78300739..b3862cc5c0b 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
let
version = "2.32";
- patchSuffix = "-37";
+ patchSuffix = "-39";
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
in
@@ -63,7 +63,7 @@ stdenv.mkDerivation ({
and using git or something would complicate bootstrapping.
Fortunately it's not too big.
$ git checkout origin/release/2.32/master; git describe
- glibc-2.32-37-g760e1d2878
+ glibc-2.32-39-g44b3959329
$ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz
*/
./2.32-master.patch.gz
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 19567a98721..a9abfbd1776 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,18 +1,20 @@
-{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
+{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }:
stdenv.mkDerivation rec {
pname = "glibmm";
- version = "2.64.2";
+ version = "2.64.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
+ sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
+ meson
pkg-config
+ ninja
gnum4
glib # for glib-compile-schemas
];
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 57acec4860a..e97630871a9 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
- version = "3.6.15";
+ version = "3.7.1";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# https://hydra.nixos.org/build/2962084/nixlog/1/raw .
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
- url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
- sha256 = "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f";
+ url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz";
+ sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -45,9 +45,7 @@ stdenv.mkDerivation {
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11)
# - psk-file: no idea; it broke between 3.6.3 and 3.6.4
# Change p11-kit test to use pkg-config to find p11-kit
- postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
- sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' -i tests/cert-tests/name-constraints
- '' + lib.optionalString (lib.versionAtLeast version "3.6") ''
+ postPatch = lib.optionalString (lib.versionAtLeast version "3.6") ''
sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index f9d739a43ea..d1e478ded26 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -62,7 +62,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk+3";
- version = "3.24.24";
+ version = "3.24.27";
outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
outputBin = "dev";
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
- sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
+ sha256 = "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p";
};
patches = [
@@ -188,6 +188,8 @@ stdenv.mkDerivation rec {
moveToOutput bin/gtk-update-icon-cache "$out"
# Launcher
moveToOutput bin/gtk-launch "$out"
+ # Broadway daemon
+ moveToOutput bin/broadwayd "$out"
# TODO: patch glib directly
for f in $dev/bin/gtk-encode-symbolic-svg; do
@@ -226,7 +228,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.gtk.org/";
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ raskin lethalman worldofpeace ];
+ maintainers = with maintainers; [ raskin ] ++ teams.gnome.members;
platforms = platforms.all;
changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS";
};
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 4a31acd2ff6..950e1a976a6 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
stdenv.mkDerivation rec {
pname = "gtkmm";
- version = "3.24.2";
+ version = "3.24.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd";
+ sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU=";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config meson ninja python3 ];
buildInputs = [ epoxy ];
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index fe3463eeff2..d6465d71c50 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, meson
, ninja
, pkg-config
@@ -20,36 +19,15 @@
stdenv.mkDerivation rec {
pname = "gupnp";
- version = "1.2.0";
+ version = "1.2.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x";
+ sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E=";
};
- patches = [
- # Nix’s pkg-config ignores Requires.private
- # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
- # We are essentialy reverting the following patch for now
- # https://bugzilla.gnome.org/show_bug.cgi?id=685477
- # at least until Requires.internal or something is implemented
- # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
- ./fix-requires.patch
-
- # fix deadlock in gupnp-igd tests
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch";
- sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f";
- })
- # fix breakage in gupnp-igd tests
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch";
- sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch
deleted file mode 100644
index ffe9b68fd04..00000000000
--- a/pkgs/development/libraries/gupnp/fix-requires.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/libgupnp/meson.build
-+++ b/libgupnp/meson.build
-@@ -110,6 +110,7 @@ pkg.generate(
- libraries : libgupnp,
- subdirs: 'gupnp-1.2',
- name : 'gupnp-1.2',
-+ requires: requires,
- description : 'GObject-based UPnP library',
- version : meson.project_version(),
- filebase : 'gupnp-1.2'
---- a/meson.build
-+++ a/meson.build
-@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c')
-
- guul = subproject('guul', default_options : ['default_library=static'])
-
-+requires = [
-+ dependency('glib-2.0', version : '>= 2.44'),
-+ dependency('gssdp-1.2', version : '>= 1.1'),
-+ dependency('libsoup-2.4', version : '>= 2.48.0'),
-+ dependency('libxml-2.0')
-+]
-+
- dependencies = [
- dependency('glib-2.0', version : '>= 2.44'),
- dependency('gio-2.0', version : '>= 2.44'),
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 3f31a3f6db3..d2287526278 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "2.7.4";
+ version = "2.8.0";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "harfbuzz";
repo = "harfbuzz";
rev = version;
- sha256 = "sha256-uMkniDNBQ2mxDmeM7K/YQtZ3Avh9RVXYe7XsUErGas8=";
+ sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 6d770430ce5..75ace8097c9 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "iso-codes";
- version = "4.5.0";
+ version = "4.6.0";
src = fetchurl {
url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2";
- sha256 = "17nnyx07q8vbyqsxbvp4m5s2nrc4fxl3dvgbgmkqww2wl4x1fv9y";
+ sha256 = "sha256-Ivd5538QpTFXP2r6ca/g12IZ0ZW1nduu0z4kiSb9Mxs=";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
index 272c61c47a5..15a677b3188 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libipt";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchFromGitHub {
owner = "intel";
repo = "libipt";
rev = "v${version}";
- sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4";
+ sha256 = "sha256-KhRmRoIHvpx5rV7roCnUH+a7JtPb6UqD41Wi4wHSR1c=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 66e38fbfbc0..bd28f490ecb 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -8,7 +8,7 @@
# files.
let
- version = "1.2.0";
+ version = "1.2.1";
in
stdenv.mkDerivation {
pname = "libmpc";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
- sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";
+ sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p";
};
buildInputs = [ gmp mpfr ];
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 70dd9cb7bbf..fbf3117fa35 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libxkbcommon";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchurl {
url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
- sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852";
+ sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21";
};
patches = [
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 44a0e017a2a..39831a3baf0 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "openldap";
- version = "2.4.57";
+ version = "2.4.58";
src = fetchurl {
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
- sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo=";
+ sha256 = "sha256-V7WSVL4V0L9qmrPVFMHAV3ewISMpFTMTSofJRGj49Hs=";
};
# TODO: separate "out" and "bin"
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2edf02e738f..d203d693af0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -3,8 +3,17 @@
, enableSSL2 ? false
, enableSSL3 ? false
, static ? stdenv.hostPlatform.isStatic
+# Used to avoid cross compiling perl, for example, in darwin bootstrap tools.
+# This will cause c_rehash to refer to perl via the environment, but otherwise
+# will produce a perfectly functional openssl binary and library.
+, withPerl ? true
}:
+assert (
+ lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform)
+ "withPerl should not be disabled unless cross compiling"
+);
+
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
@@ -46,7 +55,10 @@ let
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
nativeBuildInputs = [ perl ];
- buildInputs = lib.optional withCryptodev cryptodev;
+ buildInputs = lib.optional withCryptodev cryptodev
+ # perl is included to allow the interpreter path fixup hook to set the
+ # correct interpreter in c_rehash.
+ ++ lib.optional withPerl perl;
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
@@ -108,12 +120,20 @@ let
rm "$out/lib/"*.a
fi
- '' +
- ''
mkdir -p $bin
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
+ # Fix bin/c_rehash's perl interpreter line
+ #
+ # - openssl 1_0_2: embeds a reference to buildPackages.perl
+ # - openssl 1_1: emits "#!/usr/bin/env perl"
+ #
+ # In the case of openssl_1_0_2, reset the invalid reference and let the
+ # interpreter hook take care of it.
+ #
+ # In both cases, if withPerl = false, the intepreter line is expected be
+ # "#!/usr/bin/env perl"
''
- substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
+ substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl"
'' +
''
mv $out/bin $bin/
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 68511003215..0369cedebf4 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,57 +1,91 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz
-, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
-, meson, ninja, glib
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, pkg-config
+, cairo
+, harfbuzz
+, libintl
+, libthai
+, gobject-introspection
+, darwin
+, fribidi
+, gnome3
+, gi-docgen
+, makeFontsConf
+, freefont_ttf
+, meson
+, ninja
+, glib
, x11Support? !stdenv.isDarwin, libXft
}:
-with lib;
-
-let
+stdenv.mkDerivation rec {
pname = "pango";
- version = "1.47.0";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "1.48.3";
+
+ outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin";
};
- # FIXME: docs fail on darwin
- outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc";
+ patches = [
+ # Install developer documentation.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch";
+ sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ=";
+ })
+ ];
nativeBuildInputs = [
meson ninja
glib # for glib-mkenum
- pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
+ pkg-config
+ gobject-introspection
+ gi-docgen
];
+
buildInputs = [
fribidi
libthai
- ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
Carbon
CoreGraphics
CoreText
]);
- propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
- optional x11Support libXft;
- mesonFlags = [
- "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
- ] ++ lib.optionals stdenv.isDarwin [
- "-Dxft=disabled" # only works with x11
+ propagatedBuildInputs = [
+ cairo
+ glib
+ libintl
+ harfbuzz
+ ] ++ lib.optionals x11Support [
+ libXft
];
- enableParallelBuilding = true;
+ mesonFlags = [
+ "-Dgtk_doc=true"
+ ] ++ lib.optionals (!x11Support) [
+ "-Dxft=disabled" # only works with x11
+ ];
# Fontconfig error: Cannot load default config file
FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
- doCheck = false; # /layout/valid-1.markup: FAIL
+ doCheck = false; # test-font: FAIL
+
+ postInstall = ''
+ # So that devhelp can find this.
+ # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448
+ mkdir -p "$devdoc/share/devhelp"
+ mv "$out/share/doc/pango/reference" "$devdoc/share/devhelp/books"
+ rmdir -p --ignore-fail-on-non-empty "$out/share/doc/pango"
+ '';
passthru = {
updateScript = gnome3.updateScript {
@@ -73,7 +107,7 @@ in stdenv.mkDerivation rec {
homepage = "https://www.pango.org/";
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ raskin ];
+ maintainers = with maintainers; [ raskin ] ++ teams.gnome.members;
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 0ff0d9a7d4e..3eb5f39c382 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3
, ApplicationServices }:
stdenv.mkDerivation rec {
pname = "pangomm";
- version= "2.42.1";
+ version= "2.42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
+ sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io=";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [
+ nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optional stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [ pango glibmm cairomm ];
diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index bb8debbce91..b7adc3d2a42 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -3,7 +3,7 @@
} :
let
- version = "3.2.2";
+ version = "3.2.3";
in stdenv.mkDerivation {
pname = "pmix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
repo = "openpmix";
owner = "openpmix";
rev = "v${version}";
- sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7";
+ sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 393ef2c2c33..92c143f2417 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "popt";
- version = "1.16";
+ version = "1.18";
src = fetchurl {
url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz";
- sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
+ sha256 = "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai";
};
patches = lib.optionals stdenv.isCygwin [
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index bd7b739bd77..23a82f483dc 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -42,6 +42,14 @@ let
USE_OPENMP = true;
};
+ aarch64-darwin = {
+ BINARY = 64;
+ TARGET = setTarget "VORTEX";
+ DYNAMIC_ARCH = true;
+ USE_OPENMP = false;
+ MACOSX_DEPLOYMENT_TARGET = "11.0";
+ };
+
aarch64-linux = {
BINARY = 64;
TARGET = setTarget "ARMV8";
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index f0c82e7190f..e053d5bcf34 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "suitesparse";
- version = "5.8.1";
+ version = "5.9.0";
outputs = [ "out" "dev" "doc" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis";
repo = "SuiteSparse";
rev = "v${version}";
- sha256 = "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c";
+ sha256 = "sha256-tvwpSVgZrfYZHXHN8OQF0Y/aJM03JHGPFok7hUqPE/4=";
};
nativeBuildInputs = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
"CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
] ++ lib.optionals stdenv.isDarwin [
# Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
- # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368
+ # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.9.0/SuiteSparse_config/SuiteSparse_config.mk#L368
"BLAS=-lblas"
"LAPACK=-llapack"
]
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 641a5120e8d..b122a3121e4 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "serd";
- version = "0.30.4";
+ version = "0.30.10";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c";
+ sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8=";
};
nativeBuildInputs = [ pkg-config python3 wafHook ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index bf1b8b7aa3b..50b52b905a9 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -12,12 +12,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
- version = "3.34.1";
+ version = "3.35.2";
# NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz";
- sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra";
+ sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 7e43fc7f5c3..d260c4211ec 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -4,11 +4,11 @@ let
archiveVersion = import ./archive-version.nix lib;
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
inherit pname;
- version = "3.34.1";
+ version = "3.35.2";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip";
- sha256 = "0jgzaawf6vn15qyi15b6dlq80sk2gaiwfikingldx5mhjrwj7pfx";
+ sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 2ca5dd6bd93..5b4c1d195ec 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -48,11 +48,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
- version = "3.0.1";
+ version = "3.0.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
+ sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 38885048fcc..1da2f34aa5b 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, gettext
, meson
, ninja
@@ -30,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
- version = "3.0.1";
+ version = "3.0.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
+ sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM=";
};
patches = [
@@ -44,13 +43,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
-
- # Fix consistency error with sqlite 3.34
- # https://gitlab.gnome.org/GNOME/tracker/merge_requests/353
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch";
- sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs=";
- })
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 8b2558c0850..ef70f4b2c37 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "unixODBC";
- version = "2.3.7";
+ version = "2.3.9";
src = fetchurl {
url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz";
- sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5";
+ sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc=";
};
configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 9f2722a9ae8..a17b164445f 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "vte";
- version = "0.62.1";
+ version = "0.62.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
+ sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A=";
};
passthru = {
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index cfca33a62d2..e2d049cd7b3 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm";
+ xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c=";
}
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 23899d49010..e404edddbcf 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -4,52 +4,71 @@
, isPy27
, ansible
, pyyaml
-, setuptools_scm
-, ruamel_yaml
+, ruamel-yaml
, rich
, pytestCheckHook
-, pytestcov
-, pytest_xdist
+, pytest-xdist
, git
+, wcmatch
+, enrich
+, python
}:
buildPythonPackage rec {
pname = "ansible-lint";
- version = "4.3.7";
- # pip is not able to import version info on raumel.yaml
+ version = "5.0.2";
disabled = isPy27;
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "0kwwv9dv9rgsqvp15r2vma7hii9lkkqn0n2irvp5h32cbhzzq4hh";
+ sha256 = "sha256-vgt/KqNozTPaON/I19SybBZuo7bbl3Duq5dTBTMlj44=";
};
- format = "pyproject";
-
- nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ];
- checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ];
-
postPatch = ''
- patchShebangs bin/ansible-lint
- substituteInPlace setup.cfg \
- --replace "setuptools_scm_git_archive>=1.0" ""
+ substituteInPlace src/ansiblelint/file_utils.py \
+ --replace 'raise RuntimeError("Unable to determine file type for %s" % pathex)' 'return "playbook"'
'';
- # give a hint to setuptools_scm on package version
- preBuild = ''
- export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
+ buildInputs = [ python ];
+
+ propagatedBuildInputs = [ ansible enrich pyyaml rich ruamel-yaml wcmatch ];
+
+ checkInputs = [ pytestCheckHook pytest-xdist git ];
+
+ preCheck = ''
+ # ansible wants to write to $HOME and crashes if it can't
export HOME=$(mktemp -d)
+ export PATH=$PATH:${lib.makeBinPath [ ansible ]}
+
+ # create a working ansible-lint executable
+ export PATH=$PATH:$PWD/src/ansiblelint
+ ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint
+ patchShebangs src/ansiblelint/__main__.py
'';
- checkPhase = ''
- pytest -W ignore::DeprecationWarning -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script'
- '';
+ disabledTests = [
+ # requires network
+ "test_prerun_reqs_v1"
+ "test_prerun_reqs_v2"
+ # Assertion error with negative numbers; maybe requieres an ansible update?
+ "test_negative"
+ "test_example"
+ "test_playbook"
+ "test_included_tasks"
+ "test_long_line"
+
+ "test_get_yaml_files_umlaut"
+ "test_run_inside_role_dir"
+ "test_role_handler_positive"
+ ];
+
+ makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ];
meta = with lib; {
- homepage = "https://github.com/ansible/ansible-lint";
+ homepage = "https://github.com/ansible-community/ansible-lint";
description = "Best practices checker for Ansible";
license = licenses.mit;
- maintainers = [ maintainers.sengaya ];
+ maintainers = with maintainers; [ sengaya SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix
new file mode 100644
index 00000000000..0f8282ae7b6
--- /dev/null
+++ b/pkgs/development/python-modules/bracex/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "bracex";
+ version = "2.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-AfcVzQ7XpiLsizIyLnFYE/dXTeUx8Jtw9vOywQ9oJCU=";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "bracex" ];
+
+ meta = with lib; {
+ description = "Bash style brace expansion for Python";
+ homepage = "https://github.com/facelessuser/bracex";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 2a80523a656..21dcffc4a84 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -1,61 +1,55 @@
-{ lib, fetchPypi, buildPythonPackage
-, nose
-, parameterized
-, mock
-, flake8
-, glibcLocales
-, six
-, jdatetime
-, dateutil
-, umalqurra
-, pytz
-, tzlocal
-, regex
-, ruamel_yaml
-, python
+{ lib
+, buildPythonPackage
, isPy3k
+, fetchFromGitHub
+, dateutil
+, pytz
+, regex
+, tzlocal
+, hijri-converter
+, convertdate
+, parameterized
+, pytestCheckHook
+, GitPython
+, ruamel_yaml
}:
buildPythonPackage rec {
pname = "dateparser";
version = "1.0.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a";
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "scrapinghub";
+ repo = "dateparser";
+ rev = "v${version}";
+ sha256 = "0i6ci14lqfsqrmaif57dyilrjbxzmbl98hps1b565gkiy1xqmjhl";
};
- checkInputs = [
- flake8
- nose
- mock
- parameterized
- six
- glibcLocales
- ];
- preCheck =''
- # skip because of missing convertdate module, which is an extra requirement
- rm tests/test_jalali.py
- '';
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover -s tests
- '';
-
- # Strange
- # AttributeError: 'module' object has no attribute 'config'
- doCheck = false;
-
propagatedBuildInputs = [
# install_requires
dateutil pytz regex tzlocal
# extra_requires
- jdatetime ruamel_yaml umalqurra
+ hijri-converter convertdate
];
+ checkInputs = [
+ parameterized
+ pytestCheckHook
+ GitPython
+ ruamel_yaml
+ ];
+
+ # Upstream only runs the tests in tests/ in CI, others use git clone
+ pytestFlagsArray = [ "tests" ];
+
+ pythonImportsCheck = [ "dateparser" ];
+
meta = with lib; {
description = "Date parsing library designed to parse dates from HTML pages";
homepage = "https://github.com/scrapinghub/dateparser";
license = licenses.bsd3;
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index dcad0c3698a..e71a532a806 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+, six
+}:
+
buildPythonPackage rec {
pname = "python-dateutil";
version = "2.8.1";
@@ -8,19 +14,27 @@ buildPythonPackage rec {
sha256 = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c";
};
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ six setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
- checkPhase = ''
- py.test dateutil/test
- '';
+ propagatedBuildInputs = [ six ];
- # Requires fixing
+ # cyclic dependency: tests need freezegun, which depends on python-dateutil
doCheck = false;
+ pythonImportsCheck = [
+ "dateutil.easter"
+ "dateutil.parser"
+ "dateutil.relativedelta"
+ "dateutil.rrule"
+ "dateutil.tz"
+ "dateutil.utils"
+ "dateutil.zoneinfo"
+ ];
+
meta = with lib; {
description = "Powerful extensions to the standard datetime module";
- homepage = "https://pypi.python.org/pypi/python-dateutil";
- license = "BSD-style";
+ homepage = "https://github.com/dateutil/dateutil/";
+ license = with licenses; [ asl20 bsd3 ];
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix
new file mode 100644
index 00000000000..2b81577af22
--- /dev/null
+++ b/pkgs/development/python-modules/enrich/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm, rich, pytest-mock }:
+
+buildPythonPackage rec {
+ pname = "enrich";
+ version = "1.2.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Dpn/V9h/e13vDKeZF+iPuTUaoNUuIo7ji/982FgxX+Q=";
+ };
+
+ buildInputs = [ setuptools-scm ];
+
+ propagatedBuildInputs = [ rich ];
+
+ checkInputs = [ pytestCheckHook pytest-mock ];
+
+ pythonImportsCheck = [ "enrich" ];
+
+ meta = with lib; {
+ description = "Enrich adds few missing features to the wonderful rich library";
+ homepage = "https://github.com/pycontribs/enrich";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index 74c214d9231..2f26cc0c86f 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "more-itertools";
- version = "8.6.0";
+ version = "8.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf";
+ sha256 = "c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713";
};
checkInputs = [ nose ];
@@ -25,6 +25,7 @@ buildPythonPackage rec {
meta = {
homepage = "https://more-itertools.readthedocs.org";
+ changelog = "https://more-itertools.readthedocs.io/en/stable/versions.html";
description = "Expansion of the itertools module";
license = lib.licenses.mit;
};
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 0a747a75768..a261c8c1e26 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -5,7 +5,7 @@
, six
, pytestCheckHook
, pretend
-, flit-core
+, setuptools
}:
buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
- flit-core
+ setuptools
];
propagatedBuildInputs = [ pyparsing six ];
@@ -29,10 +29,6 @@ buildPythonPackage rec {
pretend
];
- checkPhase = ''
- py.test tests
- '';
-
# Prevent circular dependency
doCheck = false;
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
new file mode 100644
index 00000000000..f15cbc80a6d
--- /dev/null
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, authlib
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pylitterbot";
+ version = "2021.2.5";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "natekspencer";
+ repo = pname;
+ rev = version;
+ sha256 = "0705bxm0rlpgwg8my7z5pp6y362bs2j53zy1yslha0ya6cgx37g8";
+ };
+
+ propagatedBuildInputs = [
+ authlib
+ httpx
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pylitterbot" ];
+
+ meta = with lib; {
+ description = "Python package for controlling a Litter-Robot";
+ homepage = "https://github.com/natekspencer/pylitterbot";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix
index fad9a70af0f..4e45477c8ca 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -9,7 +9,9 @@ buildPythonPackage rec {
sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9";
};
- propagatedBuildInputs = [ pytest aiohttp ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ aiohttp ];
# There are no tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 4ca6bdac6e9..25d5aa30543 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -21,10 +21,12 @@ buildPythonPackage rec {
sed -i "s/'setuptools-markdown'//g" setup.py
'';
+ buildInputs = [ pytest ];
+
# requires pandoc < 2.0
# buildInputs = [ setuptools-markdown ];
checkInputs = [ mock ];
- propagatedBuildInputs = [ ansible pytest ];
+ propagatedBuildInputs = [ ansible ];
# tests not included with release, even on github
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix
index 8b1de360f49..5c6f9cf2b85 100644
--- a/pkgs/development/python-modules/pytest-arraydiff/default.nix
+++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix
@@ -16,10 +16,11 @@ buildPythonPackage rec {
sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
numpy
six
- pytest
];
# The tests requires astropy, which itself requires
diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix
index 4b40280ed70..963e621986c 100644
--- a/pkgs/development/python-modules/pytest-astropy-header/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -31,8 +31,7 @@ buildPythonPackage rec {
})
];
-
- propagatedBuildInputs = [
+ buildInputs = [
pytest
];
diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix
index ae3bc04d0b4..5d5a0de447d 100644
--- a/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy/default.nix
@@ -25,9 +25,10 @@ buildPythonPackage rec {
setuptools_scm
];
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
hypothesis
- pytest
pytest-astropy-header
pytest-doctestplus
pytest-filter-subpackage
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index 83757c2e166..e71b3e7350a 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -22,7 +22,9 @@ buildPythonPackage rec {
sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz";
};
- propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ glob2 Mako parse parse-type py six ];
# Tests require extra dependencies
checkInputs = [ execnet mock pytest ];
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index eedbbc274f4..b84b42e351d 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -19,7 +19,9 @@ buildPythonPackage rec {
sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj";
};
- propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ];
meta = {
description = "Py.test fixture for benchmarking code";
diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix
index 6f23c00baf3..629b4292f86 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/pkgs/development/python-modules/pytest-black/default.nix
@@ -16,7 +16,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ black pytest toml ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ black toml ];
# does not contain tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index 4c3e9dd96fe..a7729545873 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix
index 0c23a907cba..887fe7fe7b5 100644
--- a/pkgs/development/python-modules/pytest-click/default.nix
+++ b/pkgs/development/python-modules/pytest-click/default.nix
@@ -19,8 +19,9 @@ buildPythonPackage rec {
sha256 = "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
click
];
diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
index 7108a8f4c17..01550080d74 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index c9c373a2752..bf8dc9f8dfc 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -17,10 +17,11 @@ buildPythonPackage rec {
sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
six
numpy
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix
index e63b7329c96..39d6bc127e6 100644
--- a/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -21,10 +21,11 @@ buildPythonPackage rec {
sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
factory_boy
inflection
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
index 6caf4d9c772..67f759cb59f 100644
--- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
+++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
@@ -21,8 +21,9 @@ buildPythonPackage rec {
setuptools_scm
];
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
pytest-doctestplus
pytestcov
pytestCheckHook
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 805c19751ed..e016b68837d 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -15,8 +15,9 @@ buildPythonPackage rec {
sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
};
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ pyflakes ];
checkInputs = [ pytest ];
- propagatedBuildInputs = [ pytest pyflakes ];
# no longer passes
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index 7b459b4a294..e55d98ce46b 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -12,8 +12,9 @@ buildPythonPackage rec {
doCheck = false;
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
flask
werkzeug
];
diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix
index 1b09d6863b9..4df30e3f193 100644
--- a/pkgs/development/python-modules/pytest-html/default.nix
+++ b/pkgs/development/python-modules/pytest-html/default.nix
@@ -12,7 +12,8 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pytest pytest-metadata ];
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ pytest-metadata ];
meta = with lib; {
description = "Plugin for generating HTML reports";
diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 508b7b7781b..d6f30486f9b 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -18,9 +18,10 @@ buildPythonPackage rec {
sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
httpx
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix
index f7766003be1..1a03ec2f91d 100644
--- a/pkgs/development/python-modules/pytest-metadata/default.nix
+++ b/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
meta = with lib; {
description = "Plugin for accessing test session metadata";
diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix
index 9062284d5df..370416c4aa8 100644
--- a/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -18,7 +18,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pytest mypy filelock ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ mypy filelock ];
# does not contain tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix
index bb7bdf03d00..baa5438dfa8 100644
--- a/pkgs/development/python-modules/pytest-openfiles/default.nix
+++ b/pkgs/development/python-modules/pytest-openfiles/default.nix
@@ -20,8 +20,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
psutil
];
diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix
index cde0554d4b2..8e10cd4f587 100644
--- a/pkgs/development/python-modules/pytest-order/default.nix
+++ b/pkgs/development/python-modules/pytest-order/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "9c9e4f1b060414c642e88ad98ca60f1fd37937debd704bd8f4a2ef8e08b9cb6d";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [
pytestCheckHook
diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix
index e35d2ebc73e..16a1fb92dd6 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -21,8 +21,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ pytestrunner ];
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
pylint
six
toml
diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix
index 4194b7bd0e9..117471aa8df 100644
--- a/pkgs/development/python-modules/pytest-pythonpath/default.nix
+++ b/pkgs/development/python-modules/pytest-pythonpath/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "0qhxh0z2b3p52v3i0za9mrmjnb1nlvvyi2g23rf88b3xrrm59z33";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [ pytest ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix
index 201da93b018..c91c3eae4ab 100644
--- a/pkgs/development/python-modules/pytest-qt/default.nix
+++ b/pkgs/development/python-modules/pytest-qt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
setuptools_scm
];
- propagatedBuildInputs = [
+ buildInputs = [
pytest
];
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
index d84bb3c9acf..d95af8651f3 100644
--- a/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.5";
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
meta = with lib; {
homepage = "https://github.com/jbasko/pytest-random-order";
diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix
index 94bc02159bf..fb91f461329 100644
--- a/pkgs/development/python-modules/pytest-remotedata/default.nix
+++ b/pkgs/development/python-modules/pytest-remotedata/default.nix
@@ -14,9 +14,10 @@ buildPythonPackage rec {
sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
six
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 1bd91fe70f7..b0b0e2372f4 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -11,9 +11,9 @@ buildPythonPackage rec {
sha256 = "1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2";
};
- checkInputs = [ mock pytest ];
+ buildInputs = [ pytest ];
- propagatedBuildInputs = [ pytest ];
+ checkInputs = [ mock pytest ];
checkPhase = ''
py.test test_pytest_rerunfailures.py
diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix
index e2353c4840b..84330cfd62e 100644
--- a/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/pkgs/development/python-modules/pytest-sanic/default.nix
@@ -1,4 +1,5 @@
{ lib
+, aiohttp
, async_generator
, buildPythonPackage
, doCheck ? true
@@ -21,7 +22,10 @@ buildPythonPackage rec {
sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
+ aiohttp
async_generator
httpx
pytest
diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
index 761fe1d5d54..7ab175a893c 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -25,10 +25,11 @@ buildPythonPackage rec {
toml
];
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
requests
psutil
- pytest
zc_lockfile
] ++ lib.optional (!isPy3k) subprocess32;
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 9d088e44f8d..0483063c53b 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -11,9 +11,9 @@ buildPythonPackage rec {
sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq";
};
+ buildInputs = [ pytest ];
checkInputs = [ cmdline pytest ];
propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
- nativeBuildInputs = [ pytest ];
checkPhase = ''
py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"}
diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix
index d57c7f66c24..f38f3954320 100644
--- a/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -11,7 +11,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ packaging pytest ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ packaging ];
# pypi does not contain tests and GitHub archive is not supported because setuptools-scm can't detect the version
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix
index dcfa2036014..05f632d39ba 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/pkgs/development/python-modules/pytest-socket/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh";
};
- propagatedBuildInputs = [
+ buildInputs = [
pytest
];
diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index d1f271ea2bc..953e56ae0a4 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -16,9 +16,10 @@ buildPythonPackage rec {
sha256 = "b1b2186b0a72aada6859bea2a5764145e3aaa2c1cfbb23c3a19b5f7b697563d3";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
termcolor
- pytest
packaging
];
diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix
index 658ca7122f4..bd1ce2a597b 100644
--- a/pkgs/development/python-modules/pytest-tornado/default.nix
+++ b/pkgs/development/python-modules/pytest-tornado/default.nix
@@ -17,7 +17,9 @@ buildPythonPackage rec {
# package has no tests
doCheck = false;
- propagatedBuildInputs = [ pytest tornado ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ tornado ];
meta = with lib; {
description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications.";
diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix
index be1e76d21e4..f037ab86d5f 100644
--- a/pkgs/development/python-modules/pytest-tornasync/default.nix
+++ b/pkgs/development/python-modules/pytest-tornasync/default.nix
@@ -15,8 +15,9 @@ buildPythonPackage rec {
sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
tornado
];
diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix
index 7bf05013f21..a9327e2b232 100644
--- a/pkgs/development/python-modules/pytest-trio/default.nix
+++ b/pkgs/development/python-modules/pytest-trio/default.nix
@@ -13,11 +13,12 @@ buildPythonPackage rec {
sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
trio
async_generator
outcome
- pytest
];
checkInputs = [
diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix
index 19e1091c8c7..789af676941 100644
--- a/pkgs/development/python-modules/pytest-twisted/default.nix
+++ b/pkgs/development/python-modules/pytest-twisted/default.nix
@@ -16,7 +16,9 @@ buildPythonPackage rec {
sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847";
};
- propagatedBuildInputs = [ greenlet pytest decorator ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ greenlet decorator ];
meta = with lib; {
description = "A twisted plugin for py.test";
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index 119f3021b41..3887261ba5b 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -16,8 +16,9 @@ buildPythonPackage rec {
sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
vcrpy
];
diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix
index 600ffbfdc7f..d088bde8b0c 100644
--- a/pkgs/development/python-modules/pytest-warnings/default.nix
+++ b/pkgs/development/python-modules/pytest-warnings/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "5939f76fe04ad18297e53af0c9fb38aca1ec74db807bd40ad72733603adbbc7d";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
meta = {
description = "Plugin to list Python warnings in pytest report";
diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/pkgs/development/python-modules/pytest-watch/default.nix
index 0088bf45e4a..077b3eca6bf 100644
--- a/pkgs/development/python-modules/pytest-watch/default.nix
+++ b/pkgs/development/python-modules/pytest-watch/default.nix
@@ -16,7 +16,9 @@ buildPythonPackage rec {
sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9";
};
- propagatedBuildInputs = [ pytest colorama docopt watchdog ];
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ colorama docopt watchdog ];
# No Tests
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix
index 124adb8b2a5..6e557a7adce 100644
--- a/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-xprocess/default.nix
@@ -14,7 +14,10 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ psutil pytest ];
+
+ buildInputs = [ pytest ];
+
+ propagatedBuildInputs = [ psutil ];
# Remove test QoL package from install_requires
postPatch = ''
diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index 64078d68a8b..c3dabe7f6e3 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -16,8 +16,9 @@ buildPythonPackage rec {
sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
- pytest
virtual-display
];
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
index ba716c313fd..fa3a3de8532 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pip, pytest }:
+{ lib, buildPythonPackage, fetchPypi, toml }:
buildPythonPackage rec {
pname = "setuptools_scm";
@@ -9,13 +9,16 @@ buildPythonPackage rec {
sha256 = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8";
};
+ propagatedBuildInputs = [ toml ];
+
# Requires pytest, circular dependency
doCheck = false;
+ pythonImportsCheck = [ "setuptools_scm" ];
meta = with lib; {
- homepage = "https://bitbucket.org/pypa/setuptools_scm/";
+ homepage = "https://github.com/pypa/setuptools_scm/";
description = "Handles managing your python package versions in scm metadata";
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index 0772b73a15c..7f1803d12c6 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -1,4 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytestCheckHook
+, pytest-subtests
+, importlib-resources
+}:
buildPythonPackage rec {
pname = "tzdata";
@@ -10,6 +17,11 @@ buildPythonPackage rec {
sha256 = "sha256-4ZxzUfiHUioaxznSEEHlkt3ebdG3ZP3vqPeys1UdPTg=";
};
+ checkInputs = [
+ pytestCheckHook
+ pytest-subtests
+ ] ++ lib.optional (pythonOlder "3.7") importlib-resources;
+
pythonImportsCheck = [ "tzdata" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index a7cd91d6845..c5514cfa53a 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -15,9 +15,12 @@ buildPythonPackage rec {
# test fail (timezone test fail)
doCheck = false;
+ pythonImportsCheck = [ "tzlocal" ];
+
meta = with lib; {
description = "Tzinfo object for the local timezone";
homepage = "https://github.com/regebro/tzlocal";
license = licenses.cddl;
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index fa323fb960b..7ee5eefb5e1 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -2,11 +2,11 @@
, stdenv
, brotli
, buildPythonPackage
-, certifi
, cryptography
, dateutil
, fetchPypi
, idna
+, isPy27
, mock
, pyopenssl
, pysocks
@@ -21,7 +21,6 @@
buildPythonPackage rec {
pname = "urllib3";
version = "1.26.3";
- disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -30,11 +29,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [
brotli
- certifi
+ pysocks
+ ] ++ lib.optionals isPy27 [
cryptography
idna
pyopenssl
- pysocks
];
checkInputs = [
diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix
new file mode 100644
index 00000000000..ade529e5627
--- /dev/null
+++ b/pkgs/development/python-modules/wcmatch/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, bracex }:
+
+buildPythonPackage rec {
+ pname = "wcmatch";
+ version = "8.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-e6CRkflYLoLYZIKb37qwLfRuJqRqME5Xx/5WUvB/KXo=";
+ };
+
+ propagatedBuildInputs = [ bracex ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ disabledTests = [
+ "TestTilde"
+ ];
+
+ pythonImportsCheck = [ "wcmatch" ];
+
+ meta = with lib; {
+ description = "Wilcard File Name matching library";
+ homepage = "https://github.com/facelessuser/wcmatch";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index 7f35dd124d8..73bebd8366e 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -25,5 +25,6 @@ buildPythonPackage rec {
homepage = "https://palletsprojects.com/p/werkzeug/";
description = "A WSGI utility library for Python";
license = licenses.bsd3;
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index ae62ce539ba..4d4bb6957ea 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
pname = "waf";
- version = "2.0.20";
+ version = "2.0.22";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = "${pname}-${version}";
- sha256 = "1xbd1lmchq9pdrplkr2db28xqafyw753qbhnrfn8pxdg3inxxqvq";
+ sha256 = "sha256-WGGyhvQdFYmC0NOA5VVqCRMF1fvfPcTI42x1nHvz0W0=";
};
buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix
new file mode 100644
index 00000000000..186045c9aa8
--- /dev/null
+++ b/pkgs/development/tools/documentation/gi-docgen/default.nix
@@ -0,0 +1,94 @@
+{ lib
+, fetchFromGitLab
+, fetchpatch
+, meson
+, ninja
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "gi-docgen";
+ version = "2021.2";
+
+ format = "other";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "ebassi";
+ repo = pname;
+ rev = version;
+ sha256 = "17swx4s60anfyyb6dcsl8fq3s0j9cy54qcw0ciq4qj59d4039w5h";
+ };
+
+ patches = [
+ # Add pkg-config file so that Meson projects can find this.
+ # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/26
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/d65ed2e4827c4129d26e3c1df9a48054b4e72c50.patch";
+ sha256 = "BEefcHiAd/HTW5zo39J2WtfQjGXUkNFB6MDJj8/Ge80=";
+ })
+
+ # Name generated devhelp files correctly.
+ # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/27
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/7c4de72f55cbce5670c3a6a1451548e97e5f07f7.patch";
+ sha256 = "ov/PvrZzKmCzw7nHJkbeLCnhtUVw1UbZQjFrWT3AtVg=";
+ })
+
+ # Fix broken link in Devhelp TOC.
+ # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/28
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/56f0e6f8b4bb9c92d635df60aa5d68f55b036711.patch";
+ sha256 = "5gFGiO9jPpkyZBL4qtWEotE5jY3sCGFGUGN/Fb6jZ+0=";
+ })
+
+ # Devhelp does not like subsections without links.
+ # https://gitlab.gnome.org/GNOME/devhelp/-/issues/28
+ (fetchpatch {
+ # Only visual but needed for the other two to apply.
+ # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/28
+ url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/7f67fad5107b73489cb7bffca49177d9ad78e422.patch";
+ sha256 = "OKbC690nJsl1ckm/y9eeKDYX6AEClsNvIFy7DK+JYEc=";
+ })
+ # Add links to index.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/f891cc5fd481bc4180eec144d14f32c15c91833b.patch";
+ sha256 = "Fcnvdgxei+2ulGoWoCZ8WFrNy01tlNXMkHru3ArGHVQ=";
+ })
+ # Use different link for each symbol type name.
+ # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/29
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/jtojnar/gi-docgen/commit/08dcc31f62be1a5af9bd9f8f702f321f4b5cffde.patch";
+ sha256 = "vAT8s7zQ9zCoZWK+6PsxcD5/48ZAfIOl4RSNljRCGWQ=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ ];
+
+ pythonPath = with python3.pkgs; [
+ jinja2
+ markdown
+ markupsafe
+ pygments
+ toml
+ typogrify
+ ];
+
+ doCheck = false; # no tests
+
+ postFixup = ''
+ # Do not propagate Python
+ substituteInPlace $out/nix-support/propagated-build-inputs \
+ --replace "${python3}" ""
+ '';
+
+ meta = with lib; {
+ description = "Documentation generator for GObject-based libraries";
+ homepage = "https://gitlab.gnome.org/ebassi/gi-docgen";
+ license = licenses.asl20; # OR GPL-3.0-or-later
+ maintainers = teams.gnome.members;
+ };
+}
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 72c8c2fab91..8954ff2bc42 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -1,6 +1,8 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts
, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
-, argp-standalone }:
+, argp-standalone
+, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
+}:
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
@@ -52,17 +54,25 @@ stdenv.mkDerivation rec {
})
] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
+ outputs = [ "bin" "dev" "out" "man" ];
+
hardeningDisable = [ "format" ];
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
# as the host-bzip2 will be in the path.
nativeBuildInputs = [ m4 bison flex gettext bzip2 ]
- ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ];
+ ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ]
+ ++ lib.optional enableDebuginfod [ pkg-config ];
buildInputs = [ zlib bzip2 xz ]
++ lib.optional stdenv.hostPlatform.isMusl [
argp-standalone
musl-fts
musl-obstack
+ ] ++ lib.optionals enableDebuginfod [
+ sqlite
+ curl
+ libmicrohttpd_0_9_70
+ libarchive
];
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
@@ -74,6 +84,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"
+ ] ++ lib.optionals (!enableDebuginfod) [
"--disable-libdebuginfod"
"--disable-debuginfod"
];
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index ba1fa720dd4..4a205268c26 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -6,11 +6,11 @@
# files.
stdenv.mkDerivation rec {
- name = "help2man-1.47.17";
+ name = "help2man-1.48.1";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
- sha256 = "sha256-2jo1xQseH4yPoyLWn6R8kBHORDqPuNHWcbHwG4sACOs=";
+ sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k=";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 42c9ee872fe..1de45b08447 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "bison";
- version = "3.7.5";
+ version = "3.7.6";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "sha256-FRy18ScW4/6TonoxfNRIeDKWWfJ1s0J3m/rvSlJrv3A=";
+ sha256 = "sha256-adwLtG6o/DB9TKHgthyMNV6yB9Cwxp9PhGIyjnTXueo=";
};
nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index da552600cdc..5dad37d0816 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
- sha256 = "1w9gf6fl1ncm2zlh0p29lislfsd35zd1mhns2mrxl2n734zavaqf";
+ sha256 = "sha256-S3t1hv/mRn6vwyzT78DPIacqiJV3CnjGdOKsdSyYs8g=";
};
- cargoSha256 = "12jw1m842gzy0ma4drgmwk1jac663vysllfpl9cglr039j1sfsx2";
+ cargoSha256 = "sha256-uaeJmGEQHVSuILlYlJOHmRWWdN6FPvrHu6CbJyb60MY=";
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index d0e685cd0fa..ad700c09772 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "cryptsetup";
- version = "2.3.4";
+ version = "2.3.5";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz";
- sha256 = "0wrpz2fzbsszmsgxxbssxjgylpyiindh24z8g13m2fxmjsxyw5lx";
+ sha256 = "sha256-ztmUb0RNEyU22vkvyKykJ3Y4o8LZbiBUCyuuTTb9cME=";
};
# Disable 4 test cases that fail in a sandbox
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 24e90118756..54fab6a7746 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -7,11 +7,11 @@ assert usePam -> pam != null;
stdenv.mkDerivation rec {
pname = "libcap";
- version = "2.47";
+ version = "2.48";
src = fetchurl {
url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
- sha256 = "0jx0vjlfg1nzdjdrkrnbdkrqjx4l80vi9isf2qav7s4zbzs5s5mg";
+ sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI=";
};
patches = lib.optional isStatic ./no-shared-lib.patch;
diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix
index b1ed0a72405..0bc1ed123dc 100644
--- a/pkgs/os-specific/linux/libfabric/default.nix
+++ b/pkgs/os-specific/linux/libfabric/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
- version = "1.11.2";
+ version = "1.12.0";
enableParallelBuilding = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Xy7A1hjz4O13bMZ0RbOuxEzVkVW5+WKC+MOH5rcGzH0=";
+ sha256 = "sha256-OFp6nEW5D8vjglqLRbEgKryb2/KFuJD8Zn6rkpcuPh0=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ] ;
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 9f12ab69539..1d19d915117 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, ncurses
+, pkg-config
-# `ps` with systemd support is able to properly report different
-# attributes like unit name, so we want to have it on linux.
+ # `ps` with systemd support is able to properly report different
+ # attributes like unit name, so we want to have it on linux.
, withSystemd ? stdenv.isLinux
-, systemd ? null
+, systemd
-# procps is mostly Linux-only. Most commands require a running Linux
-# system (or very similar like that found in Cygwin). The one
-# exception is ‘watch’ which is portable enough to run on pretty much
-# any UNIX-compatible system.
+ # procps is mostly Linux-only. Most commands require a running Linux
+ # system (or very similar like that found in Cygwin). The one
+ # exception is ‘watch’ which is portable enough to run on pretty much
+ # any UNIX-compatible system.
, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
}:
@@ -35,28 +40,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
makeFlags = [ "usrbin_execdir=$(out)/bin" ]
- ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="];
+ ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS=" ];
enableParallelBuilding = true;
# Too red
configureFlags = [ "--disable-modern-top" ]
++ lib.optional withSystemd "--with-systemd"
- ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
- [ "ac_cv_func_malloc_0_nonnull=yes"
- "ac_cv_func_realloc_0_nonnull=yes" ];
+ ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "ac_cv_func_malloc_0_nonnull=yes"
+ "ac_cv_func_realloc_0_nonnull=yes"
+ ];
- installPhase = if watchOnly then ''
+ installPhase = lib.optionalString watchOnly ''
install -m 0755 -D watch $out/bin/watch
install -m 0644 -D watch.1 $out/share/man/man1/watch.1
- '' else null;
+ '';
- meta = {
+ meta = with lib; {
homepage = "https://gitlab.com/procps-ng/procps";
description = "Utilities that give information about processes using the /proc filesystem";
priority = 11; # less than coreutils, which also provides "kill" and "uptime"
- license = lib.licenses.gpl2;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.typetetris ];
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.typetetris ];
};
}
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b76b13c8c0f..aef87e7c82d 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -4,7 +4,7 @@
} :
let
- version = "33.1";
+ version = "34.0";
in stdenv.mkDerivation {
pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
- sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv";
+ sha256 = "sha256-2HFtj595sDmWqAewIMwKMaiSDVVWKdQA9l0QsPcw8qA=";
};
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 2d54223edb5..2eff999ac7c 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, gettext, bzip2 }:
stdenv.mkDerivation rec {
- name = "sysstat-12.3.2";
+ name = "sysstat-12.4.3";
src = fetchurl {
url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz";
- sha256 = "0gaas16q2f7qmrv4sbqk2l2mrc7yr64s33bzw4094p59fkylm7k4";
+ sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0=";
};
buildInputs = [ gettext ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7e3c6d1fe51..4f757862897 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -415,6 +415,7 @@ stdenv.mkDerivation {
src/shared/generator.c \
src/shutdown/shutdown.c \
units/emergency.service.in \
+ units/modprobe@.service \
units/rescue.service.in \
units/systemd-logind.service.in \
units/systemd-nspawn@.service.in; \
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 59879c652f9..11dcd57d9cc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2471,11 +2471,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation {
- name = "xkbcomp-1.4.4";
+ name = "xkbcomp-1.4.5";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2";
- sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r";
+ url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2";
+ sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index aaab0c994f6..1da71809502 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -46,7 +46,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
mirror://xorg/individual/app/xhost-1.0.8.tar.bz2
mirror://xorg/individual/app/xinit-1.4.1.tar.bz2
mirror://xorg/individual/app/xinput-1.6.3.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7168ce4084c..a73474c952e 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -157,7 +157,8 @@ addToSearchPathWithCustomDelimiter() {
local delimiter="$1"
local varName="$2"
local dir="$3"
- if [ -d "$dir" ]; then
+ if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" \
+ != *"${delimiter}${dir}${delimiter}"* ]]; then
export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"
fi
}
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 844bd8de29c..5f456f92217 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnutar";
- version = "1.32";
+ version = "1.34";
src = fetchurl {
url = "mirror://gnu/tar/tar-${version}.tar.xz";
- sha256 = "1n7xy657ii0sa42zx6944v2m4v9qrh6sqgmw17l3nch3y43sxlyh";
+ sha256 = "sha256-Y769JoecXh7qQ1Lw0DyZH5Zq6z3es8dEXJAlaNVBHSg=";
};
# avoid retaining reference to CF during stdenv bootstrap
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 2da5a725e71..6394ea3338d 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "zstd";
- version = "1.4.8";
+ version = "1.4.9";
src = fetchFromGitHub {
owner = "facebook";
repo = "zstd";
rev = "v${version}";
- sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw";
+ sha256 = "18alxnym54gswsmsr5ra82q4k1q5fyzsyx0jykb2sk2nkpvx7334";
};
nativeBuildInputs = [ cmake ]
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional stdenv.hostPlatform.isUnix bash;
patches = [
+ # This patches makes sure we do not attempt to use the MD5 implementation
+ # of the host platform when running the tests
./playtests-darwin.patch
];
diff --git a/pkgs/tools/compression/zstd/playtests-darwin.patch b/pkgs/tools/compression/zstd/playtests-darwin.patch
index a98365eec33..f829c93c705 100644
--- a/pkgs/tools/compression/zstd/playtests-darwin.patch
+++ b/pkgs/tools/compression/zstd/playtests-darwin.patch
@@ -1,18 +1,28 @@
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
-@@ -109,5 +109,2 @@ esac
+@@ -112,17 +112,10 @@ case "$OS" in
+ esac
+
case "$UNAME" in
- Darwin) MD5SUM="md5 -r" ;;
- FreeBSD) MD5SUM="gmd5sum" ;;
+- NetBSD) MD5SUM="md5 -n" ;;
- OpenBSD) MD5SUM="md5" ;;
*) MD5SUM="md5sum" ;;
-@@ -116,5 +113,2 @@ esac
+ esac
+
MTIME="stat -c %Y"
-case "$UNAME" in
-- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;;
+- Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;;
-esac
-@@ -752,3 +746,2 @@ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by de
+ DIFF="diff"
+ case "$UNAME" in
+@@ -842,7 +835,6 @@ $MD5SUM dirTestDict/* > tmph1
+ zstd -f --rm dirTestDict/* -D tmpDictC
+ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by default
case "$UNAME" in
- Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5
*) $MD5SUM -c tmph1 ;;
+ esac
+ rm -rf dirTestDict
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index c55c1bc1c5d..0e135d41a4b 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "5.10.1";
+ version = "5.11";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "sha256-E3nMcx/q5/RzrZ43yEW7+4czge9ns0Dxoi+8qaTaA0Q=";
+ sha256 = "sha256-1BlhsKkhYMgPiUrZoYgoIoicLh0ITL8+CLjCFKXPATc=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 131ce2774d1..bfe5c5c5045 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation (rec {
sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh
sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh
+ # Depends on the mountpoints
+ sed '2i echo Skipping df df-symlink test && exit 77' -i ./tests/df/df-symlink.sh
+
# Some target platforms, especially when building inside a container have
# issues with the inotify test.
sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh
@@ -103,8 +106,7 @@ stdenv.mkDerivation (rec {
# and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = stdenv.hostPlatform == stdenv.buildPlatform
- && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
- && builtins.storeDir == "/nix/store";
+ && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl);
# Prevents attempts of running 'help2man' on cross-built binaries.
PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 6fdd4a69ebc..2ab76e8dfd4 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
} :
stdenv.mkDerivation rec {
- version = "20200929";
+ version = "20210209";
pname = "mbuffer";
src = fetchurl {
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
- sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk";
+ sha256 = "sha256-6B8niOJiHyD4SBge8ssZrG0SMoaRQ38wFXSyU/2Jmgw=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index f207eda0de8..6de64acfafc 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -1,32 +1,24 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
-, openssl, pkg-config, protobuf
-, Security, libiconv, rdkafka
-, tzdata
+{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, protobuf
+, Security, libiconv, rdkafka, tzdata, coreutils, CoreServices
, features ?
- ((if stdenv.isAarch64
- then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
- else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
- ++
- (lib.optional stdenv.targetPlatform.isUnix "unix")
- ++
- [ "sinks" "sources" "transforms" ])
-, coreutils
-, CoreServices
+ ([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
+ ++ (lib.optional stdenv.targetPlatform.isUnix "unix")
+ ++ [ "sinks" "sources" "transforms" ])
}:
rustPlatform.buildRustPackage rec {
pname = "vector";
- version = "0.10.0";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0";
+ sha256 = "0sw05472znxmggckxjbrl3b8ky8nsw42xmrsb41p8z4q0aw115fd";
};
- cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
+ cargoSha256 = "0mfhrdqry6qrzfx5px1zqgfv5iqa186vl2yh290ibinkxy0x5fa9";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@@ -35,7 +27,7 @@ rustPlatform.buildRustPackage rec {
PROTOC="${protobuf}/bin/protoc";
PROTOC_INCLUDE="${protobuf}/include";
- cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
+ cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ];
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
# recent overhauls of DNS support in 0.9 mean that we try to resolve
@@ -49,15 +41,17 @@ rustPlatform.buildRustPackage rec {
# nor do I know why it depends on rustc.
# However, in order for the closure size to stay at a reasonable level,
# transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
- patchPhase = ''
+ postPatch = ''
substituteInPlace ./src/dns.rs \
- --replace "#[test]" ""
+ --replace "#[tokio::test]" ""
${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
''}
'';
+ passthru = { inherit features; };
+
meta = with lib; {
description = "A high-performance logs, metrics, and events router";
homepage = "https://github.com/timberio/vector";
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index d8f4285e0b8..a9e4b1390a1 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch
-, libidn, libnetfilter_conntrack }:
+, libidn, libnetfilter_conntrack, buildPackages }:
with lib;
let
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
"BINDIR=$(out)/bin"
"MANDIR=$(out)/man"
"LOCALEDIR=$(out)/share/locale"
+ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
];
hardeningEnable = [ "pie" ];
diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch
deleted file mode 100644
index 60ee437f6f4..00000000000
--- a/pkgs/tools/networking/network-manager/fix-paths.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
-index ace205e80..f19c1dea0 100644
---- a/clients/common/nm-polkit-listener.c
-+++ b/clients/common/nm-polkit-listener.c
-@@ -552,7 +552,7 @@ begin_authentication (AuthRequest *request)
- {
- int fd_flags;
- const char *helper_argv[] = {
-- POLKIT_PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1",
-+ "/run/wrappers/bin/polkit-agent-helper-1",
- request->username,
- NULL,
- };
-diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
-index 74ff52bb2..638857df4 100644
---- a/clients/common/nm-vpn-helpers.c
-+++ b/clients/common/nm-vpn-helpers.c
-@@ -213,10 +213,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
- NULL,
- };
-
-- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
-- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
-- if (!path)
-- return FALSE;
-+ path = "@openconnect@/bin/openconnect";
-
- if (!g_spawn_sync (NULL,
- (char **) NM_MAKE_STRV (path, "--authenticate", host),
-diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
-index e398cb9f2..a43d61864 100644
---- a/data/84-nm-drivers.rules
-+++ b/data/84-nm-drivers.rules
-@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
- # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
- ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
- DRIVERS=="?*", GOTO="nm_drivers_end"
--PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
-+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
-
- LABEL="nm_drivers_end"
-diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index 91ebd9a36..5201a56c3 100644
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
- [Service]
- Type=dbus
- BusName=org.freedesktop.NetworkManager
--ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
-+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
- #ExecReload=/bin/kill -HUP $MAINPID
- ExecStart=@sbindir@/NetworkManager --no-daemon
- Restart=on-failure
-diff --git a/libnm/meson.build b/libnm/meson.build
-index d3991ab19..58f01c666 100644
---- a/libnm/meson.build
-+++ b/libnm/meson.build
-@@ -283,7 +283,6 @@ if enable_introspection
- output: 'nm-settings-docs-gir.xml',
- command: [
- generate_setting_docs_env,
-- python.path(),
- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
- '--lib-path', meson.current_build_dir(),
- '--gir', '@INPUT@',
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index de09e4807..2755db165 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -13705,14 +13705,14 @@ nm_device_start_ip_check (NMDevice *self)
- gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
- if (gw) {
- _nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
-- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
-+ ping_binary = "@iputils@/bin/ping";
- log_domain = LOGD_IP4;
- }
- } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
- gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
- if (gw) {
- _nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
-- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
-+ ping_binary = "@iputils@/bin/ping";
- log_domain = LOGD_IP6;
- }
- }
-diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
-index 3950c3c3a..a9436d75a 100644
---- a/src/nm-core-utils.c
-+++ b/src/nm-core-utils.c
-@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
-
- /* construct the argument list */
- argv = g_ptr_array_sized_new (4);
-- g_ptr_array_add (argv, "/sbin/modprobe");
-+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
- g_ptr_array_add (argv, "--use-blacklist");
- g_ptr_array_add (argv, (char *) arg1);
-
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/networkmanager/0.9.8/default.nix
similarity index 98%
rename from pkgs/tools/networking/network-manager/0.9.8/default.nix
rename to pkgs/tools/networking/networkmanager/0.9.8/default.nix
index d7dd99b58fa..757c886fdf3 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/default.nix
+++ b/pkgs/tools/networking/networkmanager/0.9.8/default.nix
@@ -3,7 +3,7 @@
, libgcrypt, perl, libgudev, avahi, ppp, kmod }:
stdenv.mkDerivation rec {
- pname = "network-manager";
+ pname = "networkmanager";
version = "0.9.8.10";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch b/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch
rename to pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch
diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
rename to pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch
diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/applet/default.nix
rename to pkgs/tools/networking/networkmanager/applet/default.nix
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
similarity index 88%
rename from pkgs/tools/networking/network-manager/default.nix
rename to pkgs/tools/networking/networkmanager/default.nix
index 88e50579dcc..ba172a3922d 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -9,12 +9,12 @@
let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
- pname = "network-manager";
- version = "1.26.0";
+ pname = "networkmanager";
+ version = "1.30.0";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
- sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj";
+ sha256 = "1yf3k3pcszn904lk6rdya1qhp3yxbzsbhcd9l6yfrhlbc8r15w1r";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -45,6 +45,7 @@ in stdenv.mkDerivation rec {
"-Ddocs=true"
"-Dtests=no"
"-Dqt=false"
+ "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1"
# Allow using iwd when configured to do so
"-Diwd=true"
"-Dlibaudit=yes-disabled-by-default"
@@ -55,20 +56,13 @@ in stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
- inherit iputils kmod openconnect ethtool gnused systemd polkit;
+ inherit iputils kmod openconnect ethtool gnused systemd;
inherit runtimeShell;
})
# Meson does not support using different directories during build and
# for installation like Autotools did with flags passed to make install.
./fix-install-paths.patch
-
- # Fix build
- # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch";
- sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk=";
- })
];
buildInputs = [
diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/dmenu/default.nix
rename to pkgs/tools/networking/networkmanager/dmenu/default.nix
diff --git a/pkgs/tools/networking/network-manager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/fix-install-paths.patch
rename to pkgs/tools/networking/networkmanager/fix-install-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch
new file mode 100644
index 00000000000..cb9d3c3a0d2
--- /dev/null
+++ b/pkgs/tools/networking/networkmanager/fix-paths.patch
@@ -0,0 +1,92 @@
+diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
+index 15c47c3ec..4d1913aa6 100644
+--- a/clients/common/nm-vpn-helpers.c
++++ b/clients/common/nm-vpn-helpers.c
+@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
+ NULL,
+ };
+
+- path = nm_utils_file_search_in_paths("openconnect",
+- "/usr/sbin/openconnect",
+- DEFAULT_PATHS,
+- G_FILE_TEST_IS_EXECUTABLE,
+- NULL,
+- NULL,
+- error);
+- if (!path)
+- return FALSE;
++ path = "@openconnect@/bin/openconnect";
+
+ if (!g_spawn_sync(NULL,
+ (char **) NM_MAKE_STRV(path, "--authenticate", host),
+diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
+index e398cb9f2..a43d61864 100644
+--- a/data/84-nm-drivers.rules
++++ b/data/84-nm-drivers.rules
+@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
+ # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
+ ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
+ DRIVERS=="?*", GOTO="nm_drivers_end"
+-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
++PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+
+ LABEL="nm_drivers_end"
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index 91ebd9a36..5201a56c3 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
+ [Service]
+ Type=dbus
+ BusName=org.freedesktop.NetworkManager
+-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
++ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
+ #ExecReload=/bin/kill -HUP $MAINPID
+ ExecStart=@sbindir@/NetworkManager --no-daemon
+ Restart=on-failure
+diff --git a/libnm/meson.build b/libnm/meson.build
+index d0846419c..a7adb2cc6 100644
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -280,7 +280,6 @@ if enable_introspection
+ output: 'nm-settings-docs-gir.xml',
+ command: [
+ generate_setting_docs_env,
+- python.path(),
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+ '--lib-path', meson.current_build_dir(),
+ '--gir', '@INPUT@',
+diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
+index 040dd0b4d..98aea3aa9 100644
+--- a/src/core/devices/nm-device.c
++++ b/src/core/devices/nm-device.c
+@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self)
+ gw = nm_ip4_config_best_default_route_get(priv->ip_config_4);
+ if (gw) {
+ _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
+- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
++ ping_binary = "@iputils@/bin/ping";
+ log_domain = LOGD_IP4;
+ }
+ } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
+ gw = nm_ip6_config_best_default_route_get(priv->ip_config_6);
+ if (gw) {
+ _nm_utils_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
+- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
++ ping_binary = "@iputils@/bin/ping";
+ log_domain = LOGD_IP6;
+ }
+ }
+diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
+index 9075c30dd..4b140e92b 100644
+--- a/src/core/nm-core-utils.c
++++ b/src/core/nm-core-utils.c
+@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a
+
+ /* construct the argument list */
+ argv = g_ptr_array_sized_new(4);
+- g_ptr_array_add(argv, "/sbin/modprobe");
++ g_ptr_array_add(argv, "@kmod@/bin/modprobe");
+ g_ptr_array_add(argv, "--use-blacklist");
+ g_ptr_array_add(argv, (char *) arg1);
+
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/fortisslvpn/default.nix
rename to pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/iodine/default.nix
rename to pkgs/tools/networking/networkmanager/iodine/default.nix
diff --git a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/iodine/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/iodine/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/l2tp/default.nix
rename to pkgs/tools/networking/networkmanager/l2tp/default.nix
diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/libnma/default.nix
rename to pkgs/tools/networking/networkmanager/libnma/default.nix
diff --git a/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch
rename to pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/openconnect/default.nix
rename to pkgs/tools/networking/networkmanager/openconnect/default.nix
diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/openconnect/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/openvpn/default.nix
rename to pkgs/tools/networking/networkmanager/openvpn/default.nix
diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/sstp/default.nix
rename to pkgs/tools/networking/networkmanager/sstp/default.nix
diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/strongswan/default.nix
rename to pkgs/tools/networking/networkmanager/strongswan/default.nix
diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/tray.nix
rename to pkgs/tools/networking/networkmanager/tray.nix
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/vpnc/default.nix
rename to pkgs/tools/networking/networkmanager/vpnc/default.nix
diff --git a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/vpnc/fix-paths.patch
rename to pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
new file mode 100644
index 00000000000..f28c021fce3
--- /dev/null
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -0,0 +1,116 @@
+{ pname
+, version
+, extraDesc ? ""
+, src
+, extraPatches ? []
+, extraNativeBuildInputs ? []
+, extraMeta ? {}
+}:
+
+{ lib, stdenv
+, fetchurl
+, fetchpatch
+, zlib
+, openssl
+, libedit
+, pkg-config
+, pam
+, etcDir ? null
+, withKerberos ? true
+, kerberos
+, libfido2
+, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
+, linkOpenssl ? true
+}:
+
+with lib;
+stdenv.mkDerivation rec {
+ inherit pname version src;
+
+ patches = [
+ ./locale_archive.patch
+
+ # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
+ ./dont_create_privsep_path.patch
+ ] ++ extraPatches;
+
+ postPatch =
+ # On Hydra this makes installation fail (sometimes?),
+ # and nix store doesn't allow such fancy permission bits anyway.
+ ''
+ substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
+ '';
+
+ nativeBuildInputs = [ pkg-config ]
+ ++ optional withKerberos kerberos
+ ++ extraNativeBuildInputs;
+ buildInputs = [ zlib openssl libedit ]
+ ++ optional withFIDO libfido2
+ ++ optional withKerberos kerberos
+ ++ optional stdenv.isLinux pam;
+
+ preConfigure = ''
+ # Setting LD causes `configure' and `make' to disagree about which linker
+ # to use: `configure' wants `gcc', but `make' wants `ld'.
+ unset LD
+ ''
+ # Upstream build system does not support static build, so we fall back
+ # on fragile patching of configure script.
+ #
+ # libedit is found by pkg-config, but without --static flag, required
+ # to get also transitive dependencies for static linkage, hence sed
+ # expression.
+ #
+ # Kerberos can be found either by krb5-config or by fall-back shell
+ # code in openssh's configure.ac. Neither of them support static
+ # build, but patching code for krb5-config is simpler, so to get it
+ # into PATH, kerberos.dev is added into buildInputs.
+ + optionalString stdenv.hostPlatform.isStatic ''
+ sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure
+ sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure
+ sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure
+ '';
+
+ # I set --disable-strip because later we strip anyway. And it fails to strip
+ # properly when cross building.
+ configureFlags = [
+ "--sbindir=\${out}/bin"
+ "--localstatedir=/var"
+ "--with-pid-dir=/run"
+ "--with-mantype=man"
+ "--with-libedit=yes"
+ "--disable-strip"
+ (if stdenv.isLinux then "--with-pam" else "--without-pam")
+ ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
+ ++ optional withFIDO "--with-security-key-builtin=yes"
+ ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
+ ++ optional stdenv.isDarwin "--disable-libutil"
+ ++ optional (!linkOpenssl) "--without-openssl";
+
+ buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
+
+ enableParallelBuilding = true;
+
+ hardeningEnable = [ "pie" ];
+
+ postInstall = ''
+ # Install ssh-copy-id, it's very useful.
+ cp contrib/ssh-copy-id $out/bin/
+ chmod +x $out/bin/ssh-copy-id
+ cp contrib/ssh-copy-id.1 $out/share/man/man1/
+ '';
+
+ installTargets = [ "install-nokeys" ];
+ installFlags = [
+ "sysconfdir=\${out}/etc/ssh"
+ ];
+
+ meta = {
+ description = "An implementation of the SSH protocol${extraDesc}";
+ homepage = "https://www.openssh.com/";
+ changelog = "https://www.openssh.com/releasenotes.html";
+ license = licenses.bsd2;
+ platforms = platforms.unix ++ platforms.windows;
+ maintainers = with maintainers; [ eelco aneeshusa ];
+ } // extraMeta;
+}
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 17a227c496a..3ea35daaeb3 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,141 +1,71 @@
-{ lib, stdenv
-, pkgs
-, fetchurl
-, fetchpatch
-, zlib
-, openssl
-, libedit
-, pkg-config
-, pam
-, autoreconfHook
-, etcDir ? null
-, hpnSupport ? false
-, withKerberos ? true
-, withGssapiPatches ? false
-, kerberos
-, libfido2
-, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
-, linkOpenssl ? true
-}:
-
+{ callPackage, fetchurl, fetchpatch, autoreconfHook }:
let
+ common = opts: callPackage (import ./common.nix opts) {};
+in {
- version = "8.4p1";
+ openssh = common rec {
+ pname = "openssh";
+ version = "8.5p1";
- # **please** update this patch when you update to a new openssh release.
- gssapiPatch = fetchpatch {
- name = "openssh-gssapi.patch";
- url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
- sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
+ src = fetchurl {
+ url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
+ sha256 = "09gc8rv7728chxraab85dzkdikaw4aph1wlcwcc9kai9si0kybzm";
+ };
+
+ extraPatches = [ ./ssh-keysign-8.5.patch ];
};
-in
-with lib;
-stdenv.mkDerivation rec {
- pname = "openssh";
- inherit version;
+ openssh_hpn = common rec {
+ pname = "openssh-with-hpn";
+ version = "8.4p1";
+ extraDesc = " with high performance networking patches";
- src = if hpnSupport then
- fetchurl {
- url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
- sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
- }
- else
- fetchurl {
- url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
- sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
- };
+ src = fetchurl {
+ url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
+ sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
+ };
- patches =
- [
- ./locale_archive.patch
-
- # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
- ./dont_create_privsep_path.patch
-
- ./ssh-keysign.patch
+ extraPatches = [
+ ./ssh-keysign-8.4.patch
# See https://github.com/openssh/openssh-portable/pull/206
./ssh-copy-id-fix-eof.patch
- ]
- ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
+ ];
- postPatch =
- # On Hydra this makes installation fail (sometimes?),
- # and nix store doesn't allow such fancy permission bits anyway.
- ''
- substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
- '';
+ extraNativeBuildInputs = [ autoreconfHook ];
- nativeBuildInputs = [ pkg-config ]
- ++ optional (hpnSupport || withGssapiPatches) autoreconfHook
- ++ optional withKerberos pkgs.kerberos.dev;
- buildInputs = [ zlib openssl libedit pam ]
- ++ optional withFIDO libfido2
- ++ optional withKerberos kerberos;
+ extraMeta.knownVulnerabilities = [
+ "CVE-2021-28041"
+ ];
+ };
- preConfigure = ''
- # Setting LD causes `configure' and `make' to disagree about which linker
- # to use: `configure' wants `gcc', but `make' wants `ld'.
- unset LD
- ''
- # Upstream build system does not support static build, so we fall back
- # on fragile patching of configure script.
- #
- # libedit is found by pkg-config, but without --static flag, required
- # to get also transitive dependencies for static linkage, hence sed
- # expression.
- #
- # Kerberos can be found either by krb5-config or by fall-back shell
- # code in openssh's configure.ac. Neither of them support static
- # build, but patching code for krb5-config is simpler, so to get it
- # into PATH, kerberos.dev is added into buildInputs.
- + optionalString stdenv.hostPlatform.isStatic ''
- sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure
- sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure
- sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure
- '';
+ openssh_gssapi = common rec {
+ pname = "openssh-with-gssapi";
+ version = "8.4p1";
+ extraDesc = " with GSSAPI support";
- # I set --disable-strip because later we strip anyway. And it fails to strip
- # properly when cross building.
- configureFlags = [
- "--sbindir=\${out}/bin"
- "--localstatedir=/var"
- "--with-pid-dir=/run"
- "--with-mantype=man"
- "--with-libedit=yes"
- "--disable-strip"
- (if pam != null then "--with-pam" else "--without-pam")
- ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
- ++ optional withFIDO "--with-security-key-builtin=yes"
- ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
- ++ optional stdenv.isDarwin "--disable-libutil"
- ++ optional (!linkOpenssl) "--without-openssl";
+ src = fetchurl {
+ url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
+ sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
+ };
- buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
+ extraPatches = [
+ ./ssh-keysign-8.4.patch
- enableParallelBuilding = true;
+ # See https://github.com/openssh/openssh-portable/pull/206
+ ./ssh-copy-id-fix-eof.patch
- hardeningEnable = [ "pie" ];
+ (fetchpatch {
+ name = "openssh-gssapi.patch";
+ url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
+ sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
+ })
+ ];
- postInstall = ''
- # Install ssh-copy-id, it's very useful.
- cp contrib/ssh-copy-id $out/bin/
- chmod +x $out/bin/ssh-copy-id
- cp contrib/ssh-copy-id.1 $out/share/man/man1/
- '';
+ extraNativeBuildInputs = [ autoreconfHook ];
- installTargets = [ "install-nokeys" ];
- installFlags = [
- "sysconfdir=\${out}/etc/ssh"
- ];
-
- meta = {
- description = "An implementation of the SSH protocol";
- homepage = "https://www.openssh.com/";
- changelog = "https://www.openssh.com/releasenotes.html";
- license = lib.licenses.bsd2;
- platforms = platforms.unix ++ platforms.windows;
- maintainers = with maintainers; [ eelco aneeshusa ];
+ extraMeta.knownVulnerabilities = [
+ "CVE-2021-28041"
+ ];
};
}
diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch
similarity index 100%
rename from pkgs/tools/networking/openssh/ssh-keysign.patch
rename to pkgs/tools/networking/openssh/ssh-keysign-8.4.patch
diff --git a/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch b/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch
new file mode 100644
index 00000000000..67c45b6b7d8
--- /dev/null
+++ b/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch
@@ -0,0 +1,24 @@
+diff --git a/pathnames.h b/pathnames.h
+index cb44caa4..354fdf05 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -124,7 +124,7 @@
+
+ /* Location of ssh-keysign for hostbased authentication */
+ #ifndef _PATH_SSH_KEY_SIGN
+-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
++#define _PATH_SSH_KEY_SIGN "ssh-keysign"
+ #endif
+
+ /* Location of ssh-pkcs11-helper to support keys in tokens */
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -2021,7 +2021,7 @@
+
+ debug3_f("[child] pid=%ld, exec %s",
+ (long)getpid(), _PATH_SSH_KEY_SIGN);
+- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
++ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
+ fatal_f("exec(%s): %s", _PATH_SSH_KEY_SIGN,
+ strerror(errno));
+ }
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 232e049e456..3c28133a2db 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "unbound";
- version = "1.13.0";
+ version = "1.13.1";
src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
- sha256 = "18dj7migq6379hps59793457l81s3z7dll3y0fj6qcmhjlx08m59";
+ sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg=";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 849da7e606c..6716d764d5d 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -136,6 +136,7 @@ let
url = "https://github.com/downloads/dagwieers/asciidoc-odf/odt-backend-0.1.zip";
sha256 = "1zaa97h9sx6ncxcdkl1x3ggydi7f8kjgvrnpjnkjiizi45k350kw";
};
+
odpBackendSrc = fetchurl {
url = "https://github.com/downloads/dagwieers/asciidoc-odf/odp-backend-0.1.zip";
sha256 = "08ya4bskygzqkfqwjllpg31qc5k08xp2k78z9b2480g8y57bfy10";
@@ -159,7 +160,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python3 unzip autoreconfHook ];
# install filters early, so their shebangs are patched too
- patchPhase = with lib; ''
+ postPatch = with lib; ''
mkdir -p "$out/etc/asciidoc/filters"
mkdir -p "$out/etc/asciidoc/backends"
'' + optionalString _enableDitaaFilter ''
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 06a1716251a..4e321311f28 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -1,60 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
- Ascii85 (1.0.3)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ Ascii85 (1.1.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
- asciidoctor (2.0.10)
- asciidoctor-diagram (1.5.18)
- asciidoctor (>= 1.5.0, < 3.x)
- asciidoctor-epub3 (1.5.0.alpha.9)
- asciidoctor (>= 1.5.0, < 3.0.0)
- concurrent-ruby (~> 1.1.5)
- gepub (~> 1.0.2)
- thread_safe (~> 0.3.6)
- asciidoctor-mathematical (0.3.0)
- asciidoctor (~> 2.0, >= 2.0.0)
- mathematical (~> 1.5, >= 1.5.8)
- ruby-enum (~> 0.4)
- asciidoctor-pdf (1.5.0.alpha.18)
+ asciidoctor (2.0.12)
+ asciidoctor-diagram (2.1.0)
+ asciidoctor (>= 1.5.7, < 3.x)
+ asciidoctor-diagram-ditaamini (~> 0.13)
+ asciidoctor-diagram-plantuml (~> 1.2021)
+ rexml
+ asciidoctor-diagram-ditaamini (0.13.1)
+ asciidoctor-diagram-plantuml (1.2021.0)
+ asciidoctor-epub3 (1.5.0.alpha.19)
+ asciidoctor (>= 1.5.6, < 3.0.0)
+ gepub (~> 1.0.0)
+ mime-types (~> 3.0)
+ asciidoctor-mathematical (0.3.5)
+ asciidoctor (~> 2.0)
+ asciimath (~> 2.0)
+ mathematical (~> 1.6.0)
+ asciidoctor-pdf (1.5.4)
asciidoctor (>= 1.5.3, < 3.0.0)
concurrent-ruby (~> 1.1.0)
prawn (~> 2.2.0)
- prawn-icon (~> 2.3.0)
- prawn-svg (~> 0.29.0)
+ prawn-icon (~> 2.5.0)
+ prawn-svg (~> 0.31.0)
prawn-table (~> 0.2.0)
prawn-templates (~> 0.1.0)
safe_yaml (~> 1.0.0)
thread_safe (~> 0.3.0)
- treetop (~> 1.5.0)
- asciidoctor-revealjs (4.0.1)
+ treetop (~> 1.6.0)
+ ttfunk (~> 1.5.0, >= 1.5.1)
+ asciidoctor-revealjs (4.1.0)
asciidoctor (>= 2.0.0, < 3.0.0)
concurrent-ruby (~> 1.0)
thread_safe (~> 0.3.5)
- asciimath (2.0.1)
- coderay (1.1.2)
- concurrent-ruby (1.1.5)
- css_parser (1.7.0)
+ asciimath (2.0.2)
+ coderay (1.1.3)
+ concurrent-ruby (1.1.8)
+ css_parser (1.9.0)
addressable
- gepub (1.0.4)
- nokogiri (>= 1.8.2, < 1.11)
- rubyzip (>= 1.1.1)
+ gepub (1.0.13)
+ nokogiri (>= 1.8.2, < 1.12)
+ rubyzip (> 1.1.1, < 2.4)
hashery (2.1.2)
- i18n (1.6.0)
+ i18n (1.8.9)
concurrent-ruby (~> 1.0)
- mathematical (1.6.12)
+ mathematical (1.6.14)
ruby-enum (~> 0.4)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2020.1104)
- mini_portile2 (2.4.0)
- multi_json (1.13.1)
- nokogiri (1.10.3)
- mini_portile2 (~> 2.4.0)
+ mime-types-data (3.2021.0225)
+ mini_portile2 (2.5.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
pdf-core (0.7.0)
- pdf-reader (2.2.0)
- Ascii85 (~> 1.0.0)
+ pdf-reader (2.4.2)
+ Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
@@ -63,27 +68,28 @@ GEM
prawn (2.2.2)
pdf-core (~> 0.7.0)
ttfunk (~> 1.5)
- prawn-icon (2.3.0)
+ prawn-icon (2.5.0)
prawn (>= 1.1.0, < 3.0.0)
- prawn-svg (0.29.1)
+ prawn-svg (0.31.0)
css_parser (~> 1.6)
prawn (>= 0.11.1, < 3)
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
- prawn-templates (0.1.1)
+ prawn-templates (0.1.2)
pdf-reader (~> 2.0)
prawn (~> 2.2)
- public_suffix (3.1.1)
- pygments.rb (1.2.1)
- multi_json (>= 1.0.0)
- rouge (3.5.1)
- ruby-enum (0.7.2)
+ public_suffix (4.0.6)
+ pygments.rb (2.1.0)
+ racc (1.5.2)
+ rexml (3.2.4)
+ rouge (3.26.0)
+ ruby-enum (0.9.0)
i18n
ruby-rc4 (0.1.5)
- rubyzip (1.2.3)
+ rubyzip (2.3.0)
safe_yaml (1.0.5)
thread_safe (0.3.6)
- treetop (1.5.3)
+ treetop (1.6.11)
polyglot (~> 0.3)
ttfunk (1.5.1)
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index 29b2b567be2..73fb46d2e60 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, makeWrapper,
# Optional dependencies, can be null
- epubcheck, kindlegen,
+ epubcheck,
bundlerUpdateScript
}:
@@ -20,8 +20,7 @@ let
postBuild = ''
wrapProgram "$out/bin/asciidoctor-epub3" \
- ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \
- ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"}
+ ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"}
'';
passthru = {
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index db0f67d3a58..19106214c26 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.0";
};
afm = {
groups = ["default"];
@@ -25,64 +25,84 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs";
+ sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
asciidoctor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
+ sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9";
type = "gem";
};
- version = "2.0.10";
+ version = "2.0.12";
};
asciidoctor-diagram = {
- dependencies = ["asciidoctor"];
+ dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "095ar1hj96mi9vxnjjdkj7yzc3lp4wjxh4qsijx9inqflbcw7x71";
+ sha256 = "1fh73k306q1x4rzsly2fy1rdq1kpkdvs3r1084hgk0sh516ksc0s";
type = "gem";
};
- version = "1.5.18";
+ version = "2.1.0";
+ };
+ asciidoctor-diagram-ditaamini = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08jwpyklcplmfcxs4z9z0b0la6xdwrnf9bk6c02y54502228bg6b";
+ type = "gem";
+ };
+ version = "0.13.1";
+ };
+ asciidoctor-diagram-plantuml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bxlkq3k775lhhnbs85cx8cbixhw7p70hnxrqnnig470h6jhmj0b";
+ type = "gem";
+ };
+ version = "1.2021.0";
};
asciidoctor-epub3 = {
- dependencies = ["asciidoctor" "concurrent-ruby" "gepub" "thread_safe"];
+ dependencies = ["asciidoctor" "gepub" "mime-types"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056yp0z64b1fhhkzz2kaiqsd11gpbgx2d1yjgq7cqma9c70bbxa5";
+ sha256 = "1fgi0rb8026k0a43wnanan6nzc8386azygmfl4zv7c9vram4nr6h";
type = "gem";
};
- version = "1.5.0.alpha.9";
+ version = "1.5.0.alpha.19";
};
asciidoctor-mathematical = {
- dependencies = ["asciidoctor" "mathematical" "ruby-enum"];
+ dependencies = ["asciidoctor" "asciimath" "mathematical"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6qhfp6xc5jlqkscr9g7zzp9f2cv28jzcqzawhl8vjgcny7i6j3";
+ sha256 = "1lxfq7qn3ql642pva6jh3h1abm9j9daxg5icfn1h73k6cjsmcisp";
type = "gem";
};
- version = "0.3.0";
+ version = "0.3.5";
};
asciidoctor-pdf = {
- dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"];
+ dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop" "ttfunk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19rgi43abhkyv85r2gnwqq6kxwsn29hhv4clnnmln58d7s589n0j";
+ sha256 = "0k8hn9lrvr08grqx17x2vrllw5qmfh0j08wp56464w2pj279ka67";
type = "gem";
};
- version = "1.5.0.alpha.18";
+ version = "1.5.4";
};
asciidoctor-revealjs = {
dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"];
@@ -90,40 +110,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "084aq9frv4irzgd9ab3xad9i0ml9lb58w0wvg76gnwwr51plbpp4";
+ sha256 = "03vmbcc3x059h17ry4qwk1p0yar9wgh87l2qssi307gy45cjw2mq";
type = "gem";
};
- version = "4.0.1";
+ version = "4.1.0";
};
asciimath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1aapydwwkydbwgz07n7ma3a5jy9n3v0shy6q6j8mi4wr3crhx45a";
+ sha256 = "1yq9av7rh493xqmx4cq3fjl0c6d8njxp53qw4hg2d3xkyn2lyfc5";
type = "gem";
};
- version = "2.0.1";
+ version = "2.0.2";
};
coderay = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+ sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
type = "gem";
};
- version = "1.1.2";
+ version = "1.1.3";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.5";
+ version = "1.1.8";
};
css_parser = {
dependencies = ["addressable"];
@@ -131,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
+ sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751";
type = "gem";
};
- version = "1.7.0";
+ version = "1.9.0";
};
gepub = {
dependencies = ["nokogiri" "rubyzip"];
@@ -142,10 +162,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kg2h0mscb2hq6l3wjzq5fp5vw4552nglq8n9pawm7bzacf1gzyf";
+ sha256 = "01q33rkvqrhxqm8zgkhgcqhrqdfzgxswxfgiagdjxw67qdn1pids";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.13";
};
hashery = {
groups = ["default"];
@@ -163,10 +183,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
+ sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.9";
};
mathematical = {
dependencies = ["ruby-enum"];
@@ -174,10 +194,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19f9icaixg60wl8dvcxp6glbm5vpx2rsyx53sfk2rvwnzgsr42qh";
+ sha256 = "05mn68gxhfa37qsnzsmdqaa005hf511j5lga76qsrad2gcnhan1b";
type = "gem";
};
- version = "1.6.12";
+ version = "1.6.14";
};
mime-types = {
dependencies = ["mime-types-data"];
@@ -195,41 +215,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
+ sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
type = "gem";
};
- version = "3.2020.1104";
+ version = "3.2021.0225";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
- };
- multi_json = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
- type = "gem";
- };
- version = "1.13.1";
+ version = "2.5.0";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+ sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
- version = "1.10.3";
+ version = "1.11.1";
};
pdf-core = {
groups = ["default"];
@@ -247,10 +257,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0aas2f5clgwpgryywrh4gihdi10afx3kbyfs1n31cinri02psd43";
+ sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6";
type = "gem";
};
- version = "2.2.0";
+ version = "2.4.2";
};
polyglot = {
groups = ["default"];
@@ -279,10 +289,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nc810wdpa93z162yzjgvf7mdanfxm4bjwinjjxx5smq6wdvhdqi";
+ sha256 = "1ivkdf8rdf92hhy97vbmc2a4w97vcvqd58jcj4z9hz3hfsb1526w";
type = "gem";
};
- version = "2.3.0";
+ version = "2.5.0";
};
prawn-svg = {
dependencies = ["css_parser" "prawn"];
@@ -290,10 +300,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wwfv6lw2diywgjp15pd3awpr8g7xkjfi10jzhmvziikakzsz6gj";
+ sha256 = "1rb5hmjqc4hvy6liw9y51y6glbw66f09r09w0nvdfxhfi2kka16l";
type = "gem";
};
- version = "0.29.1";
+ version = "0.31.0";
};
prawn-table = {
dependencies = ["prawn"];
@@ -312,41 +322,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gs894sj9zdlwx59h3rk4p0l3y8r18p22zhnfiyx9lngsa56gcrj";
+ sha256 = "1w9irn3rllm992c6j7fsx81gg539i7yy8zfddyw7q53hnlys0yhi";
type = "gem";
};
- version = "0.1.1";
+ version = "0.1.2";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
- version = "3.1.1";
+ version = "4.0.6";
};
"pygments.rb" = {
- dependencies = ["multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv";
+ sha256 = "1736rbjgin97p3vjknz60p6dl66c936djwsk7wnwvwmav8r1nx0y";
type = "gem";
};
- version = "1.2.1";
+ version = "2.1.0";
+ };
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+ type = "gem";
+ };
+ version = "3.2.4";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.5.1";
+ version = "3.26.0";
};
ruby-enum = {
dependencies = ["i18n"];
@@ -354,10 +383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
+ sha256 = "1pys90hxylhyg969iw9lz3qai5lblf8xwbdg1g5aj52731a9k83p";
type = "gem";
};
- version = "0.7.2";
+ version = "0.9.0";
};
ruby-rc4 = {
groups = ["default"];
@@ -374,10 +403,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+ sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
type = "gem";
};
- version = "1.2.3";
+ version = "2.3.0";
};
safe_yaml = {
groups = ["default"];
@@ -405,10 +434,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b";
+ sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh";
type = "gem";
};
- version = "1.5.3";
+ version = "1.6.11";
};
ttfunk = {
groups = ["default"];
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix
deleted file mode 100644
index 6afa246f818..00000000000
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ fetchurl, lib, stdenv, unzip }:
-
-let
- version = "2.9";
- fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
-
- sha256 = {
- x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
-
- url = {
- x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
-
-in stdenv.mkDerivation {
- pname = "kindlegen";
- inherit version;
-
- src = fetchurl {
- inherit url;
- inherit sha256;
- };
-
- sourceRoot = ".";
-
- nativeBuildInputs = lib.optional (lib.hasSuffix ".zip" url) unzip;
-
- installPhase = ''
- mkdir -p $out/bin $out/share/kindlegen/doc
- install -m755 kindlegen $out/bin/kindlegen
- cp -r *.txt *.html docs/* $out/share/kindlegen/doc
- '';
-
- meta = with lib; {
- broken = true; # download links got removed
- description = "Convert documents to .mobi for use with Amazon Kindle";
- homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211";
- license = licenses.unfree;
- maintainers = with maintainers; [ peterhoeg ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ];
- };
-}
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
index 655cd5a61e1..aa1d68e708a 100644
--- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, makeWrapper,
# Optional dependencies, can be null
- epubcheck, kindlegen,
+ epubcheck,
bundlerUpdateScript
}:
@@ -17,8 +17,7 @@ let
# postBuild = ''
# wrapProgram "$out/bin/asciidoctor-epub3" \
- # ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \
- # ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"}
+ # ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"}
# '';
# passthru = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b2ff3e93c3a..0ba45dd8f89 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -325,6 +325,7 @@ mapAliases ({
keybase-go = keybase; # added 2016-08-24
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25
+ kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
krename-qt5 = krename; # added 2017-02-18
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
kvm = qemu_kvm; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3444df35798..02d98556a19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3006,8 +3006,6 @@ in
});
asciidoctor = callPackage ../tools/typesetting/asciidoctor {
- # kindlegen is unfree, don't enable by default
- kindlegen = null;
# epubcheck pulls in Java, which is problematic on some platforms
epubcheck = null;
};
@@ -6014,8 +6012,6 @@ in
jump = callPackage ../tools/system/jump {};
- kindlegen = callPackage ../tools/typesetting/kindlegen { };
-
latex2html = callPackage ../tools/misc/latex2html { };
latexrun = callPackage ../tools/typesetting/tex/latexrun { };
@@ -6620,33 +6616,33 @@ in
};
# stripped down, needed by steam
- networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { };
+ networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { };
- networkmanager = callPackage ../tools/networking/network-manager { };
+ networkmanager = callPackage ../tools/networking/networkmanager { };
- networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { };
+ networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
- networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { };
+ networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
- networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { };
+ networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { };
- networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { };
+ networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { };
- networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { };
+ networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { };
- networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { };
+ networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { };
- networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { };
+ networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { };
- networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { };
+ networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
- networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };
+ networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
- libnma = callPackage ../tools/networking/network-manager/libnma { };
+ libnma = callPackage ../tools/networking/networkmanager/libnma { };
- networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { };
+ networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { };
- nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { };
+ nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };
newsboat = callPackage ../applications/networking/feedreaders/newsboat {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
@@ -6947,20 +6943,19 @@ in
opensm = callPackage ../tools/networking/opensm { };
- openssh =
- callPackage ../tools/networking/openssh {
- hpnSupport = false;
- etcDir = "/etc/ssh";
- pam = if stdenv.isLinux then pam else null;
- };
+ opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});
- openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override {
- hpnSupport = true;
- });
+ openssh = opensshPackages.openssh.override {
+ etcDir = "/etc/ssh";
+ };
- openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override {
- withGssapiPatches = true;
- });
+ openssh_hpn = opensshPackages.openssh_hpn.override {
+ etcDir = "/etc/ssh";
+ };
+
+ openssh_gssapi = opensshPackages.openssh_gssapi.override {
+ etcDir = "/etc/ssh";
+ };
opensp = callPackage ../tools/text/sgml/opensp { };
@@ -11235,6 +11230,7 @@ in
vala_0_44
vala_0_46
vala_0_48
+ vala_0_50
vala;
vyper = with python3Packages; toPythonApplication vyper;
@@ -12518,6 +12514,8 @@ in
inherit (xorg) libX11 libXext libXi libXtst;
};
+ gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };
+
github-release = callPackage ../development/tools/github/github-release { };
global = callPackage ../development/tools/misc/global { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b35c242edb..12991afcb37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1094,6 +1094,8 @@ in {
bpython = callPackage ../development/python-modules/bpython { };
+ bracex = callPackage ../development/python-modules/bracex { };
+
braintree = callPackage ../development/python-modules/braintree { };
branca = callPackage ../development/python-modules/branca { };
@@ -2139,6 +2141,8 @@ in {
enamlx = callPackage ../development/python-modules/enamlx { };
+ enrich = callPackage ../development/python-modules/enrich { };
+
entrance = callPackage ../development/python-modules/entrance {
routerFeatures = false;
};
@@ -5870,6 +5874,8 @@ in {
pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
+ pylitterbot = callPackage ../development/python-modules/pylitterbot { };
+
py-lru-cache = callPackage ../development/python-modules/py-lru-cache { };
pylru = callPackage ../development/python-modules/pylru { };
@@ -7312,12 +7318,16 @@ in {
rtslib = callPackage ../development/python-modules/rtslib { };
+ ruamel-base = self.ruamel_base;
ruamel_base = callPackage ../development/python-modules/ruamel_base { };
+ ruamel-ordereddict = self.ruamel_ordereddict;
ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { };
+ ruamel-yaml = self.ruamel_yaml;
ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };
+ ruamel-yaml-clib = self.ruamel_yaml_clib;
ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
@@ -8715,6 +8725,8 @@ in {
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
+ wcmatch = callPackage ../development/python-modules/wcmatch { };
+
wcwidth = callPackage ../development/python-modules/wcwidth { };
weasyprint = callPackage ../development/python-modules/weasyprint { };