Merge branch 'staging' into staging-next

main
Vladimír Čunát 2 years ago
commit 2a3df3e740
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 67
      doc/languages-frameworks/python.section.md
  2. 4
      pkgs/applications/audio/quodlibet/default.nix
  3. 4
      pkgs/applications/finance/odoo/default.nix
  4. 6
      pkgs/applications/misc/privacyidea/default.nix
  5. 7
      pkgs/applications/networking/browsers/firefox/common.nix
  6. 32
      pkgs/applications/networking/errbot/default.nix
  7. 4
      pkgs/applications/networking/instant-messengers/turses/default.nix
  8. 22
      pkgs/applications/networking/sync/rsync/base.nix
  9. 39
      pkgs/applications/networking/sync/rsync/default.nix
  10. 12
      pkgs/applications/networking/sync/rsync/rrsync.nix
  11. 8
      pkgs/applications/science/biology/MACS2/default.nix
  12. 2
      pkgs/build-support/cc-wrapper/default.nix
  13. 22
      pkgs/data/misc/mailcap/default.nix
  14. 4
      pkgs/data/misc/mobile-broadband-provider-info/default.nix
  15. 25
      pkgs/development/compilers/dtc/default.nix
  16. 28
      pkgs/development/compilers/dtc/python-3.10.patch
  17. 24
      pkgs/development/compilers/gcc/9/default.nix
  18. 4
      pkgs/development/compilers/go/1.17.nix
  19. 4
      pkgs/development/compilers/go/1.18.nix
  20. 10
      pkgs/development/interpreters/lua-5/CVE-2022-28805.patch
  21. 16
      pkgs/development/interpreters/lua-5/default.nix
  22. 2
      pkgs/development/interpreters/python/default.nix
  23. 4
      pkgs/development/interpreters/spidermonkey/78.nix
  24. 9
      pkgs/development/libraries/dbus/default.nix
  25. 26
      pkgs/development/libraries/dbus/make-dbus-conf.nix
  26. 4
      pkgs/development/libraries/glib/default.nix
  27. 21
      pkgs/development/libraries/gnu-efi/default.nix
  28. 6
      pkgs/development/libraries/gstreamer/bad/default.nix
  29. 22
      pkgs/development/libraries/jansson/default.nix
  30. 13
      pkgs/development/libraries/json-c/default.nix
  31. 13
      pkgs/development/libraries/libffi/default.nix
  32. 23
      pkgs/development/libraries/libffi/libffi-powerpc64.patch
  33. 4
      pkgs/development/libraries/libqmi/default.nix
  34. 4
      pkgs/development/libraries/libusb1/default.nix
  35. 13
      pkgs/development/libraries/mapnik/default.nix
  36. 4
      pkgs/development/libraries/mesa/default.nix
  37. 4
      pkgs/development/libraries/nss/esr.nix
  38. 4
      pkgs/development/libraries/nss/generic.nix
  39. 4
      pkgs/development/libraries/nss/latest.nix
  40. 42
      pkgs/development/libraries/openldap/default.nix
  41. 17
      pkgs/development/libraries/pipewire/default.nix
  42. 9
      pkgs/development/libraries/portaudio/default.nix
  43. 56
      pkgs/development/libraries/thrift/default.nix
  44. 8
      pkgs/development/libraries/tracker/default.nix
  45. 17
      pkgs/development/libraries/unicorn/default.nix
  46. 39
      pkgs/development/libraries/xxHash/default.nix
  47. 51
      pkgs/development/libraries/zlib/comprehensive-crc-validation-for-wrong-implementations.patch
  48. 6
      pkgs/development/libraries/zlib/default.nix
  49. 4
      pkgs/development/python-modules/GitPython/default.nix
  50. 34
      pkgs/development/python-modules/Rtree/default.nix
  51. 4
      pkgs/development/python-modules/aiomysql/default.nix
  52. 3
      pkgs/development/python-modules/aiosteamist/default.nix
  53. 6
      pkgs/development/python-modules/ansible-later/default.nix
  54. 3
      pkgs/development/python-modules/antlr4-python3-runtime/default.nix
  55. 4
      pkgs/development/python-modules/apipkg/default.nix
  56. 13
      pkgs/development/python-modules/asgiref/default.nix
  57. 22
      pkgs/development/python-modules/astroid/default.nix
  58. 6
      pkgs/development/python-modules/audible/default.nix
  59. 34
      pkgs/development/python-modules/azure-data-tables/default.nix
  60. 6
      pkgs/development/python-modules/azure-mgmt-consumption/default.nix
  61. 4
      pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
  62. 4
      pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
  63. 6
      pkgs/development/python-modules/azure-mgmt-relay/default.nix
  64. 4
      pkgs/development/python-modules/azure-storage-blob/default.nix
  65. 7
      pkgs/development/python-modules/beautifulsoup4/default.nix
  66. 5
      pkgs/development/python-modules/billiard/default.nix
  67. 2
      pkgs/development/python-modules/botocore/default.nix
  68. 13
      pkgs/development/python-modules/cachecontrol/default.nix
  69. 4
      pkgs/development/python-modules/cachetools/default.nix
  70. 4
      pkgs/development/python-modules/certbot/default.nix
  71. 4
      pkgs/development/python-modules/certifi/default.nix
  72. 2
      pkgs/development/python-modules/cfn-flip/default.nix
  73. 15
      pkgs/development/python-modules/cherrypy/default.nix
  74. 40
      pkgs/development/python-modules/cloudpickle/default.nix
  75. 5
      pkgs/development/python-modules/colorama/default.nix
  76. 29
      pkgs/development/python-modules/configobj/default.nix
  77. 2
      pkgs/development/python-modules/constantly/default.nix
  78. 10
      pkgs/development/python-modules/cryptography/default.nix
  79. 2
      pkgs/development/python-modules/cryptography/vectors.nix
  80. 4
      pkgs/development/python-modules/cssutils/default.nix
  81. 32
      pkgs/development/python-modules/dask-gateway-server/default.nix
  82. 54
      pkgs/development/python-modules/dask-glm/default.nix
  83. 6
      pkgs/development/python-modules/dask-ml/default.nix
  84. 63
      pkgs/development/python-modules/dask/default.nix
  85. 4
      pkgs/development/python-modules/databases/default.nix
  86. 30
      pkgs/development/python-modules/distributed/default.nix
  87. 6
      pkgs/development/python-modules/fastapi-mail/default.nix
  88. 25
      pkgs/development/python-modules/fastapi/default.nix
  89. 32
      pkgs/development/python-modules/fastparquet/default.nix
  90. 13
      pkgs/development/python-modules/filelock/default.nix
  91. 2
      pkgs/development/python-modules/flask-limiter/default.nix
  92. 2
      pkgs/development/python-modules/flickrapi/default.nix
  93. 64
      pkgs/development/python-modules/fonttools/default.nix
  94. 34
      pkgs/development/python-modules/fsspec/default.nix
  95. 8
      pkgs/development/python-modules/gcsfs/default.nix
  96. 3
      pkgs/development/python-modules/gdown/default.nix
  97. 4
      pkgs/development/python-modules/glances-api/default.nix
  98. 2
      pkgs/development/python-modules/globus-sdk/default.nix
  99. 59
      pkgs/development/python-modules/graph-tool/default.nix
  100. 66
      pkgs/development/python-modules/graphite-web/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -8,9 +8,9 @@
Several versions of the Python interpreter are available on Nix, as well as a
high amount of packages. The attribute `python3` refers to the default
interpreter, which is currently CPython 3.9. The attribute `python` refers to
interpreter, which is currently CPython 3.10. 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
specific versions, e.g. `python39` refers to CPython 3.9, and `pypy` refers to
the default PyPy interpreter.
Python is used a lot, and in different ways. This affects also how it is
@ -26,10 +26,10 @@ however, are in separate sets, with one set per interpreter version.
The interpreters have several common attributes. One of these attributes is
`pkgs`, which is a package set of Python libraries for this specific
interpreter. E.g., the `toolz` package corresponding to the default interpreter
is `python.pkgs.toolz`, and the CPython 3.8 version is `python38.pkgs.toolz`.
is `python.pkgs.toolz`, and the CPython 3.9 version is `python39.pkgs.toolz`.
The main package set contains aliases to these package sets, e.g.
`pythonPackages` refers to `python.pkgs` and `python38Packages` to
`python38.pkgs`.
`pythonPackages` refers to `python.pkgs` and `python39Packages` to
`python39.pkgs`.
#### Installing Python and packages {#installing-python-and-packages}
@ -54,7 +54,7 @@ with `python.buildEnv` or `python.withPackages` where the interpreter and other
executables are wrapped to be able to find each other and all of the modules.
In the following examples we will start by creating a simple, ad-hoc environment
with a nix-shell that has `numpy` and `toolz` in Python 3.8; then we will create
with a nix-shell that has `numpy` and `toolz` in Python 3.9; then we will create
a re-usable environment in a single-file Python script; then we will create a
full Python environment for development with this same environment.
@ -70,10 +70,10 @@ temporary shell session with a Python and a *precise* list of packages (plus
their runtime dependencies), with no other Python packages in the Python
interpreter's scope.
To create a Python 3.8 session with `numpy` and `toolz` available, run:
To create a Python 3.9 session with `numpy` and `toolz` available, run:
```sh
$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])'
$ nix-shell -p 'python39.withPackages(ps: with ps; [ numpy toolz ])'
```
By default `nix-shell` will start a `bash` session with this interpreter in our
@ -81,8 +81,8 @@ By default `nix-shell` will start a `bash` session with this interpreter in our
```Python console
[nix-shell:~/src/nixpkgs]$ python3
Python 3.8.1 (default, Dec 18 2019, 19:06:26)
[GCC 9.2.0] on linux
Python 3.9.12 (main, Mar 23 2022, 21:36:19)
[GCC 11.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import numpy; import toolz
```
@ -102,13 +102,16 @@ will still get 1 wrapped Python interpreter. We can start the interpreter
directly like so:
```sh
$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz requests ])' --run python3
these derivations will be built:
/nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv
building '/nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv'...
created 277 symlinks in user environment
Python 3.8.1 (default, Dec 18 2019, 19:06:26)
[GCC 9.2.0] on linux
$ nix-shell -p "python39.withPackages (ps: with ps; [ numpy toolz requests ])" --run python3
this derivation will be built:
/nix/store/mpn7k6bkjl41fm51342rafaqfsl10qs4-python3-3.9.12-env.drv
this path will be fetched (0.09 MiB download, 0.41 MiB unpacked):
/nix/store/5gaiacnzi096b6prc6aa1pwrhncmhc8b-python3.9-toolz-0.11.2
copying path '/nix/store/5gaiacnzi096b6prc6aa1pwrhncmhc8b-python3.9-toolz-0.11.2' from 'https://cache.nixos.org'...
building '/nix/store/mpn7k6bkjl41fm51342rafaqfsl10qs4-python3-3.9.12-env.drv'...
created 279 symlinks in user environment
Python 3.9.12 (main, Mar 23 2022, 21:36:19)
[GCC 11.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import requests
>>>
@ -147,7 +150,7 @@ Executing this script requires a `python3` that has `numpy`. Using what we learn
in the previous section, we could startup a shell and just run it like so:
```ShellSession
$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py'
$ nix-shell -p 'python39.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py'
The dot product of [1 2] and [3 4] is: 11
```
@ -210,12 +213,12 @@ create a single script with Python dependencies, but in the course of normal
development we're usually working in an entire package repository.
As explained in the Nix manual, `nix-shell` can also load an expression from a
`.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before,
`.nix` file. Say we want to have Python 3.9, `numpy` and `toolz`, like before,
in an environment. We can add a `shell.nix` file describing our dependencies:
```nix
with import <nixpkgs> {};
(python38.withPackages (ps: [ps.numpy ps.toolz])).env
(python39.withPackages (ps: [ps.numpy ps.toolz])).env
```
And then at the command line, just typing `nix-shell` produces the same
@ -229,7 +232,7 @@ What's happening here?
imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
brings all attributes of `nixpkgs` in the local scope. These attributes form
the main package set.
2. Then we create a Python 3.8 environment with the `withPackages` function, as before.
2. Then we create a Python 3.9 environment with the `withPackages` function, as before.
3. The `withPackages` function expects us to provide a function as an argument
that takes the set of all Python packages and returns a list of packages to
include in the environment. Here, we select the packages `numpy` and `toolz`
@ -240,7 +243,7 @@ To combine this with `mkShell` you can:
```nix
with import <nixpkgs> {};
let
pythonEnv = python38.withPackages (ps: [
pythonEnv = python39.withPackages (ps: [
ps.numpy
ps.toolz
]);
@ -378,8 +381,8 @@ information. The output of the function is a derivation.
An expression for `toolz` can be found in the Nixpkgs repository. As explained
in the introduction of this Python section, a derivation of `toolz` is available
for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz`
derivation corresponding to the CPython 3.8 interpreter.
for each interpreter version, e.g. `python39.pkgs.toolz` refers to the `toolz`
derivation corresponding to the CPython 3.9 interpreter.
The above example works when you're directly working on
`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
@ -392,11 +395,11 @@ and adds it along with a `numpy` package to a Python environment.
with import <nixpkgs> {};
( let
my_toolz = python38.pkgs.buildPythonPackage rec {
my_toolz = python39.pkgs.buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";
src = python38.pkgs.fetchPypi {
src = python39.pkgs.fetchPypi {
inherit pname version;
sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
};
@ -414,7 +417,7 @@ with import <nixpkgs> {};
```
Executing `nix-shell` will result in an environment in which you can use
Python 3.8 and the `toolz` package. As you can see we had to explicitly mention
Python 3.9 and the `toolz` package. As you can see we had to explicitly mention
for which Python version we want to build a package.
So, what did we do here? Well, we took the Nix expression that we used earlier
@ -742,7 +745,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
is a local source, and if the local source has a `setup.py`, then development
mode is activated.
In the following example we create a simple environment that has a Python 3.8
In the following example we create a simple environment that has a Python 3.9
version of our package in it, as well as its dependencies and other packages we
like to have in the environment, all specified with `propagatedBuildInputs`.
Indeed, we can just add any package we like to have in our environment to
@ -750,7 +753,7 @@ Indeed, we can just add any package we like to have in our environment to
```nix
with import <nixpkgs> {};
with python38Packages;
with python39Packages;
buildPythonPackage rec {
name = "mypackage";
@ -828,9 +831,9 @@ and in this case the `python38` interpreter is automatically used.
### Interpreters {#interpreters}
Versions 2.7, 3.7, 3.8 and 3.9 of the CPython interpreter are available as
respectively `python27`, `python37`, `python38` and `python39`. The
aliases `python2` and `python3` correspond to respectively `python27` and
Versions 2.7, 3.7, 3.8, 3.9 and 3.10 of the CPython interpreter are available
as respectively `python27`, `python37`, `python38`, `python39` and `python310`.
The aliases `python2` and `python3` correspond to respectively `python27` and
`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

@ -9,11 +9,11 @@
let optionals = lib.optionals; in
python3.pkgs.buildPythonApplication rec {
pname = "quodlibet${tag}";
version = "4.4.0";
version = "4.5.0";
src = fetchurl {
url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
sha256 = "sha256-oDMY0nZ+SVlVF2PQqH+tl3OHr3EmCP5XJxQXaiS782c=";
sha256 = "sha256-MBYVgp9lLLr+2zVTkjcWKli8HucaVn0kn3eJ2SaCRbw=";
};
nativeBuildInputs = [ wrapGAppsHook gettext ];

@ -1,14 +1,14 @@
{ stdenv
, lib
, fetchurl
, python3
, python39
, nodePackages
, wkhtmltopdf
, nixosTests
}:
let
python = python3.override {
python = python39.override {
packageOverrides = self: super: {
click = super.click.overridePythonAttrs (old: rec {
version = "7.1.2";

@ -1,9 +1,9 @@
{ lib, fetchFromGitHub, cacert, openssl, nixosTests
, python3
, python39
}:
let
python3' = python3.override {
python3' = python39.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
@ -19,7 +19,7 @@ let
});
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0";
src = python3.pkgs.fetchPypi {
src = self.fetchPypi {
pname = "Flask-Migrate";
inherit version;
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";

@ -21,6 +21,7 @@
{ lib
, pkgs
, stdenv
, fetchpatch
# build time
, autoconf
@ -219,6 +220,12 @@ buildStdenv.mkDerivation ({
];
patches = [
(fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch";
url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch";
hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
})
]
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch

@ -1,32 +1,12 @@
{ lib
, ansi
, buildPythonApplication
, colorlog
, daemonize
, deepmerge
, dulwich
, fetchFromGitHub
, flask
, glibcLocales
, hypchat
, irc
, jinja2
, markdown
, mock
, pyasn1
, pyasn1-modules
, pygments
, pygments-markdown-lexer
, pyopenssl
, pytestCheckHook
, requests
, slackclient
, sleekxmpp
, telegram
, webtest
, python39
}:
buildPythonApplication rec {
let
python3 = python39;
in python3.pkgs.buildPythonApplication rec {
pname = "errbot";
version = "6.1.7";
@ -41,7 +21,7 @@ buildPythonApplication rec {
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
ansi
colorlog
daemonize
@ -64,7 +44,7 @@ buildPythonApplication rec {
webtest
];
checkInputs = [
checkInputs = with python3.pkgs; [
mock
pytestCheckHook
];

@ -19,6 +19,10 @@ let
rev = "v${version}";
sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
super.six
super.requests.optional-dependencies.socks
];
doCheck = false;
});
};

@ -1,22 +0,0 @@
{ lib, fetchurl, fetchpatch }:
rec {
version = "3.2.4";
src = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE=";
};
upstreamPatchTarball = fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "sha256-cKWXWQr2xhzz0F1mNCn/n2D/4k5E+cc6TNxp69wTIqQ=";
};
meta = with lib; {
description = "Fast incremental file transfer utility";
homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}

@ -20,27 +20,32 @@
, nixosTests
}:
let
base = import ./base.nix { inherit lib fetchurl fetchpatch; };
in
stdenv.mkDerivation rec {
pname = "rsync";
version = base.version;
version = "3.2.4";
mainSrc = base.src;
srcs = [
(fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
sha256 = "sha256-b3YYONCAUrC2V5z39nN9k+R/AfTaBMXSTTRHt/Kl+tE=";
})
] ++ lib.optional enableCopyDevicesPatch (fetchurl {
# signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5
url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
sha256 = "1wj21v57v135n6fnm2m2dxmb9lhrrg62jgkggldp1gb7d6s4arny";
});
patchesSrc = base.upstreamPatchTarball;
srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc;
patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
nativeBuildInputs = [ perl ];
buildInputs = [ libiconv zlib popt ]
++ lib.optional enableACLs acl
++ lib.optional enableZstd zstd
++ lib.optional enableLZ4 lz4
++ lib.optional enableOpenSSL openssl
++ lib.optional enableXXHash xxHash;
nativeBuildInputs = [ perl ];
configureFlags = [
"--with-nobody-group=nogroup"
@ -48,12 +53,22 @@ stdenv.mkDerivation rec {
# disable the included zlib explicitly as it otherwise still compiles and
# links them even.
"--with-included-zlib=no"
];
]
# Work around issue with cross-compilation:
# configure.sh: error: cannot run test program while cross compiling
# Remove once 3.2.4 or more recent is released.
# The following PR should fix the cross-compilation issue.
# Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`.
# https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no";
passthru.tests = { inherit (nixosTests) rsyncd; };
meta = base.meta // {
description = "A fast incremental file transfer utility";
meta = with lib; {
description = "Fast incremental file transfer utility";
homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ];
};
}

@ -1,13 +1,8 @@
{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }:
let
base = import ./base.nix { inherit lib fetchurl fetchpatch; };
in
stdenv.mkDerivation {
pname = "rrsync";
version = base.version;
src = base.src;
inherit (rsync) version srcs;
buildInputs = [ rsync perl ];
@ -16,6 +11,8 @@ stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
inherit (rsync) patches;
postPatch = ''
substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
'';
@ -26,8 +23,7 @@ stdenv.mkDerivation {
chmod a+x $out/bin/rrsync
'';
meta = base.meta // {
meta = rsync.meta // {
description = "A helper to run rsync-only environments from ssh-logins";
maintainers = [ lib.maintainers.kampfschlaefer ];
};
}

@ -9,6 +9,12 @@ python3.pkgs.buildPythonPackage rec {
sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d";
};
postPatch = ''
# remove version check which breaks on 3.10
substituteInPlace setup.py \
--replace 'if float(sys.version[:3])<3.6:' 'if False:'
'';
propagatedBuildInputs = with python3.pkgs; [ numpy ];
# To prevent ERROR: diffpeak_cmd (unittest.loader._FailedTest) for obsolete
@ -21,5 +27,7 @@ python3.pkgs.buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ gschwartz ];
platforms = platforms.linux;
# error: ‘PyThreadState’ {aka ‘struct _ts’} has no member named ‘use_tracing’; did you mean ‘tracing’?
broken = true;
};
}

@ -492,6 +492,8 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" format stackprotector strictoverflow"
'' + optionalString cc.langD or false ''
hardening_unsupported_flags+=" format"
'' + optionalString cc.langFortran or false ''
hardening_unsupported_flags+=" format"
'' + optionalString targetPlatform.isWasm ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
''

@ -1,23 +1,25 @@
{ lib, fetchzip }:
{ lib, stdenv, fetchurl }:
let
stdenv.mkDerivation rec {
pname = "mailcap";
version = "2.1.53";
in fetchzip {
name = "mailcap-${version}";
src = fetchurl {
url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
sha256 = "sha256-Xuou8XswSXe6PsuHr61DGfoEQPgl5Pb7puj6L/64h4U=";
};
url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
sha256 = "sha256-6JPj2tZgoTEZ8hNEi9ZZhElBNm9SRTSXifMmCicwiLo=";
installPhase = ''
runHook preInstall
postFetch = ''
tar -xavf $downloadedFile --strip-components=1
substituteInPlace mailcap --replace "/usr/bin/" ""
gzip mailcap.5
sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types
install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types
install -D -m0644 -t $out/etc mailcap mime.types
install -D -m0644 -t $out/share/man/man5 mailcap.5.gz
install -D -m0644 -t $out/share/man/man5 mailcap.5
runHook postInstall
'';
meta = with lib; {

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mobile-broadband-provider-info";
version = "20220315";
version = "20220511";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-H82sctF52xQnl4Nm9wG+HDx1Nf1aZYvFzIKCR8b2RcY=";
sha256 = "sha256-dfk+iGZh8DWYMsPigjyvqG505AgEJbjOCpw7DQqyp3Q=";
};
nativeBuildInputs = [

@ -1,5 +1,15 @@
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
, pythonSupport ? false, python ? null, swig, libyaml
{ stdenv
, lib
, fetchgit
, fetchpatch
, flex
, bison
, pkg-config
, which
, pythonSupport ? false
, python ? null
, swig
, libyaml
}:
stdenv.mkDerivation rec {
@ -12,8 +22,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gx9LG3U9etWhPxm7Ox7rOu9X5272qGeHqZtOe68zFs4=";
};
patches = [
# fix python 3.10 compatibility
# based on without requiring the setup.py rework
# https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=383e148b70a47ab15f97a19bb999d54f9c3e810f
./python-3.10.patch
];
nativeBuildInputs = [ flex bison pkg-config which ]
++ lib.optionals pythonSupport [ python swig ];
buildInputs = [ libyaml ];
nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ];
postPatch = ''
patchShebangs pylibfdt/

@ -0,0 +1,28 @@
diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i
index 51ee801..075ef70 100644
--- a/pylibfdt/libfdt.i
+++ b/pylibfdt/libfdt.i
@@ -1044,9 +1044,9 @@ typedef uint32_t fdt32_t;
$result = Py_None;
else
%#if PY_VERSION_HEX >= 0x03000000
- $result = Py_BuildValue("y#", $1, *arg4);
+ $result = Py_BuildValue("y#", $1, (Py_ssize_t)*arg4);
%#else
- $result = Py_BuildValue("s#", $1, *arg4);
+ $result = Py_BuildValue("s#", $1, (Py_ssize_t)*arg4);
%#endif
}
diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
index ef40f15..81e161a 100755
--- a/pylibfdt/setup.py
+++ b/pylibfdt/setup.py
@@ -42,6 +42,7 @@ def get_version():
libfdt_module = Extension(
'_libfdt',
sources=[os.path.join(srcdir, 'libfdt.i')],
+ define_macros=[('PY_SSIZE_T_CLEAN', None)],
include_dirs=[os.path.join(srcdir, '../libfdt')],
libraries=['fdt'],
library_dirs=[os.path.join(top_builddir, 'libfdt')],

@ -58,22 +58,12 @@ with lib;
with builtins;
let majorVersion = "9";
/*
If you update, please build on aarch64-linux
and check braces adjacent to `cplusplus` lines in file
./result/lib/gcc/aarch64-unknown-linux-gnu/9.*.0/include/arm_acle.h
*/
version = "${majorVersion}.3.0";
version = "${majorVersion}.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
# Fix ICE: Max. number of generated reload insns per insn is achieved (90)
#
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796
#
# This patch can most likely be removed by a post 9.3.0-release.
[ ./avoid-cycling-subreg-reloads.patch ./gcc9-asan-glibc-2.34.patch ]
[ ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
++ optional noSysDirs ../no-sys-dirs.patch
@ -83,19 +73,13 @@ let majorVersion = "9";
sha256 = ""; # TODO: uncomment and check hash when available.
}) */
++ optional langAda ../gnat-cflags.patch
++ optional langAda (fetchpatch {
name = "gnat-glibc-234.diff";
url = "https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103.diff";
sha256 = "eS4B7vJasnv2N+5v5yB8/iDpKPX8CJDAy2xabWWj+aU=";
})
++ optional langD ../libphobos.patch
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ [ ../libsanitizer-no-cyclades-9.patch ];
;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@ -112,7 +96,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi";
sha256 = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7";
};
inherit patches;

@ -60,11 +60,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.17.10";
version = "1.17.11";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-KZ5VrzDxVpGwFdjc+OyuckEkElaeWy7OIDYXU6RW8vk=";
sha256 = "sha256-rCZJpllExqWr5VBUAA7uPXcZaIDaNqNVX2LgZUDo61Q=";
};
strictDeps = true;

@ -60,11 +60,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.18.2";
version = "1.18.3";
src = fetchurl {
url = "https://go.dev/dl/go${version}.src.tar.gz";
sha256 = "sha256-LETQPqLDQJITerkZumAvLCYaA40I60aFKKPzoo5WZ+I=";
sha256 = "sha256-ABI4bdy7XzNQ5AfGeZI4EdvSg/zcQhckkxYUqELsvC0=";
};
strictDeps = true;

@ -0,0 +1,10 @@
--- a/src/lparser.c
+++ b/src/lparser.c
@@ -301,6 +301,7 @@
expdesc key;
singlevaraux(fs, ls->envn, var, 1); /* get environment variable */
lua_assert(var->k == VLOCAL || var->k == VUPVAL);
+ luaK_exp2anyregup(fs, var); /* but could be a constant */
codestring(ls, &key, varname); /* key is variable name */
luaK_indexed(fs, var, &key); /* env[varname] */
}

@ -7,7 +7,17 @@ rec {
hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq";
makeWrapper = makeBinaryWrapper;
patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch;
patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch
++ [
(fetchpatch {
name = "CVE-2022-28805.patch";
url = "https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa.patch";
sha256 = "sha256-YTwoolSnRNJIHFPVijSO6ZDw35BG5oWYralZ8qOb9y8=";
stripLen = 1;
extraPrefix = "src/";
excludes = [ "src/testes/*" ];
})
];
};
lua5_4_compat = lua5_4.override({
@ -32,7 +42,9 @@ rec {
sourceVersion = { major = "5"; minor = "2"; patch = "4"; };
hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
makeWrapper = makeBinaryWrapper;
patches = lib.optional stdenv.isDarwin ./5.2.darwin.patch;
patches = [
./CVE-2022-28805.patch
] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch;
};
lua5_2_compat = lua5_2.override({

@ -230,7 +230,7 @@ in {
enableOptimizations = false;
enableLTO = false;
mimetypesSupport = false;
} // sources.python39)).overrideAttrs(old: {
} // sources.python310)).overrideAttrs(old: {
# TODO(@Artturin): Add this to the main cpython expr
strictDeps = true;
pname = "python3-minimal";

@ -4,7 +4,7 @@
, autoconf213
, pkg-config
, perl
, python3
, python39
, zip
, buildPackages
, which
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
rustc.llvmPackages.llvm # for llvm-objdump
perl
pkg-config
python3
python39
rust-cbindgen
rustc
which

@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
postPatch = ''
# We need to generate the file ourselves.
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/317
rm doc/catalog.xml
substituteInPlace bus/Makefile.am \
--replace 'install-data-hook:' 'disabled:' \
--replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
@ -98,6 +102,11 @@ stdenv.mkDerivation rec {
doCheck = true;
makeFlags = [
# Fix paths in XML catalog broken by mismatching build/install datadir.
"dtddir=${placeholder "out"}/share/xml/dbus-1"
];
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
"datadir=${placeholder "out"}/share"

@ -1,4 +1,8 @@
{ runCommand, writeText, libxslt, dbus
{ runCommand
, writeText
, libxslt
, dbus
, findXMLCatalogs
, serviceDirectories ? []
, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
, apparmor ? "disabled" # one of enabled, disabled, required
@ -14,19 +18,15 @@ runCommand "dbus-1"
inherit serviceDirectories suidHelper apparmor;
preferLocalBuild = true;
allowSubstitutes = false;
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC
"-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<rewriteSystem
systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/"
rewritePrefix="file://${dbus}/share/xml/dbus-1/"/>
</catalog>
'';
nativeBuildInputs = [ libxslt.bin ];
nativeBuildInputs = [
libxslt
findXMLCatalogs
];
buildInputs = [
dbus
];
}
''
mkdir -p $out

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.72.1";
version = "2.72.2";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "wH5XFHslTO+SzoCgN43AwCpDWOfeRwLp9AMGl4EJX+I=";
sha256 = "eNWZoTPbp/4gNt+o24+2Exq5ZCeD/JV4sHogmVJS0t4=";
};
patches = optionals stdenv.isDarwin [

@ -1,24 +1,17 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
{ lib, stdenv, buildPackages, fetchurl, pciutils
, gitUpdater }:
with lib;
stdenv.mkDerivation rec {
pname = "gnu-efi";
version = "3.0.11";
version = "3.0.14";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj";
sha256 = "tztkOg1Wl9HzltdDFEjoht2AVmh4lXjj4aKCd8lShDU=";
};
patches = [
# Fix build on armv6l
(fetchpatch {
url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch";
sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r";
})
];
buildInputs = [ pciutils ];
hardeningDisable = [ "stackprotector" ];
@ -29,6 +22,12 @@ stdenv.mkDerivation rec {
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
passthru.updateScript = gitUpdater {
inherit pname version;
# No nicer place to find latest release.
url = "https://git.code.sf.net/p/gnu-efi/code";
};
meta = with lib; {
description = "GNU EFI development toolchain";
homepage = "https://sourceforge.net/projects/gnu-efi/";

@ -93,6 +93,7 @@
, Foundation
, MediaToolbox
, enableGplPlugins ? true
, bluezSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
@ -181,8 +182,9 @@ stdenv.mkDerivation rec {
mjpegtools
faad2
x265
] ++ lib.optionals stdenv.isLinux [
] ++ lib.optionals bluezSupport [
bluez
] ++ lib.optionals stdenv.isLinux [
libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
wayland
wayland-protocols
@ -264,12 +266,12 @@ stdenv.mkDerivation rec {
"-Dgs=disabled" # depends on `google-cloud-cpp`
"-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
"-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
"-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
]
++ lib.optionals (!stdenv.isLinux) [
"-Dva=disabled" # see comment on `libva` in `buildInputs`
]
++ lib.optionals stdenv.isDarwin [
"-Dbluez=disabled"
"-Dchromaprint=disabled"
"-Ddirectfb=disabled"
"-Dflite=disabled"

@ -1,18 +1,28 @@
{lib, stdenv, fetchurl}:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "jansson";
version = "2.13.1";
version = "2.14";
src = fetchurl {
url = "https://digip.org/jansson/releases/${pname}-${version}.tar.gz";
sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl";
src = fetchFromGitHub {
owner = "akheron";
repo = "jansson";
rev = "v${version}";
sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
};
nativeBuildInputs = [ cmake ];
# networkmanager relies on libjansson.so:
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
cmakeFlags = [ "-DJANSSON_BUILD_SHARED_LIBS=ON" ];
meta = with lib; {
homepage = "http://www.digip.org/jansson/";
homepage = "https://github.com/akheron/jansson";
description = "C library for encoding, decoding and manipulating JSON data";
changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.marsam ];
};
}

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "json-c";
version = "0.15";
version = "0.16";
src = fetchurl {
url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz";
sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q";
sha256 = "sha256-jkWsj5bsd5Hq87t+5Q6cIQC7vIe40PHQMMW6igKI2Ws=";
};
outputs = [ "out" "dev" ];
@ -15,16 +15,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A JSON implementation in C";
homepage = "https://github.com/json-c/json-c/wiki";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
license = licenses.mit;
longDescription = ''
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted strings
and parse JSON formatted strings back into the C representation of JSON
objects.
'';
homepage = "https://github.com/json-c/json-c/wiki";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
license = licenses.mit;
};
}

@ -7,11 +7,6 @@
, dejagnu
}:
# 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
# files.
stdenv.mkDerivation rec {
pname = "libffi";
version = "3.4.2";
@ -21,7 +16,13 @@ stdenv.mkDerivation rec {
sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl";
};
patches = [];
# 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
# files.
patches = [
./libffi-powerpc64.patch
];
strictDeps = true;
outputs = [ "out" "dev" "man" "info" ];

@ -0,0 +1,23 @@
https://github.com/libffi/libffi/issues/668
--- a/src/powerpc/linux64.S
+++ b/src/powerpc/linux64.S
@@ -29,6 +29,8 @@
#include <fficonfig.h>
#include <ffi.h>
+ .machine altivec
+
#ifdef POWERPC64
.hidden ffi_call_LINUX64
.globl ffi_call_LINUX64
--- a/src/powerpc/linux64_closure.S
+++ b/src/powerpc/linux64_closure.S
@@ -30,6 +30,8 @@
.file "linux64_closure.S"
+ .machine altivec
+
#ifdef POWERPC64
FFI_HIDDEN (ffi_closure_LINUX64)
.globl ffi_closure_LINUX64

@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-udev-base-dir=${placeholder "out"}/lib/udev"
"--enable-gtk-doc"
"--enable-introspection"
"--enable-gtk-doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}"
"--enable-introspection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}"
];
enableParallelBuilding = true;

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "libusb";
version = "1.0.25";
version = "1.0.26";
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb";
rev = "v${version}";
sha256 = "141wygijjcgka0h31504cdlvih4l2j02j67pcbb2l527p7dbc5pn";
sha256 = "sha256-LEy45YiFbueCCi8d2hguujMsxBezaTUERHUpFsTKGZQ=";
};
outputs = [ "out" "dev" ];

@ -1,12 +1,15 @@
{ lib, stdenv, fetchzip
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib
, sconsPackages
# supply a postgresql package to enable the PostGIS input plugin
, postgresql ? null
}:
stdenv.mkDerivation rec {
let
scons = sconsPackages.scons_3_0_1;
in stdenv.mkDerivation rec {
pname = "mapnik";
version = "3.1.0";
@ -16,10 +19,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY=";
};
postPatch = ''
substituteInPlace configure \
--replace '$PYTHON scons/scons.py' ${scons}/bin/scons
rm -r scons
'';
# a distinct dev output makes python-mapnik fail
outputs = [ "out" ];
nativeBuildInputs = [ python3 ];
nativeBuildInputs = [ scons ];
buildInputs = [
boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff

@ -34,7 +34,7 @@ with lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "22.0.4";
version = "22.1.1";
branch = versions.major version;
self = stdenv.mkDerivation {
@ -48,7 +48,7 @@ self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
sha256 = "1m0y8wgy48hmcidsr7sbk5hcw3v0qr8359fd2x34fvl2z9c1z5y7";
sha256 = "1w8fpki67238l4yc92hsnsh4402py9zspirbmirxp577zxjhi526";
};
# TODO:

@ -1,4 +1,4 @@
import ./generic.nix {
version = "3.68.3";
sha256 = "sha256-5NDZsLVhfLM0gSZC7YAfjlH1mVyN2FwN78jMra/Lwzc=";
version = "3.79";
hash = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ=";
}

@ -1,4 +1,4 @@
{ version, sha256 }:
{ version, hash }:
{ lib
, stdenv
, fetchurl
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
inherit sha256;
inherit hash;
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.78";
sha256 = "sha256-9FXzQeeHwRZzKOgKhPd7mlV9WVBm3aZIahh01y2miAA=";
version = "3.79";
hash = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ=";
}

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
# dependencies
, cyrus_sasl
@ -21,6 +22,39 @@ stdenv.mkDerivation rec {
hash = "sha256-gdCTRSMutiSG7PWsrNLFbAxFtKbIwGZhLn9CGiOhz4c";
};
patches = [
# ITS#9840 - ldif-filter: fix parallel build failure
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/7d977f51e6dfa570a471d163b9e8255bdd3dc12f.patch";
hash = "sha256:1vid6pj2gmqywbghnd380x19ml241ldc1fyslb6br6q27zpgbdlp";
})
# ITS#9840 - libraries/Makefile.in: ignore the mkdir errors
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/71f24015c312171c00ce94c9ff9b9c6664bdca8d.patch";
hash = "sha256:1a81vv6nkhgiadnj4g1wyzgzdp2zd151h0vkwvv9gzmqvhwcnc04";
})
# ITS#7165 back-mdb: check for stale readers on
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/7e7f01c301db454e8c507999c77b55a1d97efc21.patch";
hash = "sha256:1fc2yck2gn3zlpfqjdn56ar206npi8cmb8yg5ny4lww0ygmyzdfz";
})
# ITS#9858 back-mdb: delay indexer task startup
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/ac061c684cc79d64ab4089fe3020921a0064a307.patch";
hash = "sha256:01f0y50zlcj6n5mfkmb0di4p5vrlgn31zccx4a9k5m8vzxaqmw9d";
})
# ITS#9858 back-mdb: fix index reconfig
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/c43c7a937cfb3a781f99b458b7ad71eb564a2bc2.patch";
hash = "sha256:02yh0c8cyx14iir5qhfam5shrg5d3115s2nv0pmqdj6najrqc5mm";
})
# ITS#9157: check for NULL ld
(fetchpatch {
url = "https://github.com/openldap/openldap/commit/6675535cd6ad01f9519ecd5d75061a74bdf095c7.patch";
hash = "sha256:0dali5ifcwba8400s065f0fizl9h44i0mzb06qgxhygff6yfrgif";
})
];
# TODO: separate "out" and "bin"
outputs = [
"out"
@ -59,7 +93,7 @@ stdenv.mkDerivation rec {
"ac_cv_func_memcmp_working=yes"
] ++ lib.optional stdenv.isFreeBSD "--with-pic";
makeFlags= [
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase.
"prefix=${placeholder "out"}"
@ -81,7 +115,7 @@ stdenv.mkDerivation rec {
];
postBuild = ''
for module in ${lib.concatStringsSep " " extraContribModules}; do
for module in $extraContribModules; do
make $makeFlags CC=$CC -C contrib/slapd-modules/$module
done
'';
@ -105,7 +139,7 @@ stdenv.mkDerivation rec {
];
postInstall = ''
for module in ${lib.concatStringsSep " " extraContribModules}; do
for module in $extraContribModules; do
make $installFlags install -C contrib/slapd-modules/$module
done
chmod +x "$out"/lib/*.{so,dylib}
@ -116,6 +150,6 @@ stdenv.mkDerivation rec {
description = "An open source implementation of the Lightweight Directory Access Protocol";
license = licenses.openldap;
maintainers = with maintainers; [ ajs124 das_j hexa ];
platforms = platforms.unix;
platforms = platforms.unix;
};
}

@ -6,7 +6,9 @@
, python3
, meson
, ninja
, eudev
, systemd
, enableSystemd ? true
, pkg-config
, docutils
, doxygen
@ -127,8 +129,8 @@ let
vulkan-headers
vulkan-loader
webrtc-audio-processing
systemd
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
] ++ (if enableSystemd then [ systemd ] else [ eudev ])
++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
++ lib.optionals libcameraSupport [ libcamera libdrm ]
++ lib.optional ffmpegSupport ffmpeg
++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ]
@ -153,7 +155,9 @@ let
"-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}"
"-Davahi=${mesonEnableFeature zeroconfSupport}"
"-Dgstreamer=${mesonEnableFeature gstreamerSupport}"
"-Dsystemd-system-service=enabled"
"-Dsystemd-system-service=${mesonEnableFeature enableSystemd}"
"-Dudev=${mesonEnableFeature (!enableSystemd)}"
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
"-Dffmpeg=${mesonEnableFeature ffmpegSupport}"
"-Dbluez5=${mesonEnableFeature bluezSupport}"
"-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}"
@ -193,8 +197,11 @@ let
cp ${buildPackages.pipewire}/nix-support/*.json "$out/nix-support"
''}
moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
${lib.optionalString enableSystemd ''
moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
''}
moveToOutput "bin/pipewire-pulse" "$pulse"
moveToOutput "bin/pw-jack" "$jack"

@ -3,6 +3,7 @@
, fetchurl
, alsa-lib
, pkg-config
, which
, AudioUnit
, AudioToolbox
, CoreAudio
@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7";
};
nativeBuildInputs = [ pkg-config ];
strictDeps = true;
nativeBuildInputs = [ pkg-config which ];
buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib;
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
@ -34,6 +36,11 @@ stdenv.mkDerivation rec {
# https://github.com/PortAudio/portaudio/commit/28d2781d9216115543aa3f0a0ffb7b4ee0fac551.patch
enableParallelBuilding = false;
postPatch = ''
# workaround for the configure script which expects an absolute path
export AR=$(which $AR)
'';
# not sure why, but all the headers seem to be installed by the make install
installPhase = ''
make install

@ -1,5 +1,15 @@
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config
, bison, flex
{ lib
, stdenv
, fetchurl
, boost
, zlib
, libevent
, openssl
, python3
, cmake
, pkg-config
, bison
, flex
, static ? stdenv.hostPlatform.isStatic
}:
@ -12,15 +22,39 @@ stdenv.mkDerivation rec {
sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk=";
};
# Workaround to make the python wrapper not drop this package:
# Workaround to make the Python wrapper not drop this package:
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];
nativeBuildInputs = [ cmake pkg-config bison flex ];
buildInputs = [ boost zlib libevent openssl ]
++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ];
nativeBuildInputs = [
bison
cmake
flex
pkg-config
];
buildInputs = [
boost
libevent
openssl
zlib
] ++ lib.optionals (!static) [
(python3.withPackages (ps: [ps.twisted]))
];
postPatch = ''
# Python 3.10 related failures:
# SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats
# AttributeError: module 'collections' has no attribute 'Hashable'
substituteInPlace test/py/RunClientServer.py \
--replace "'FastbinaryTest.py'," "" \
--replace "'TestEof.py'," "" \
--replace "'TestFrozen.py'," ""
'';
preConfigure = "export PY_PREFIX=$out";
preConfigure = ''
export PY_PREFIX=$out
'';
patches = [
# ToStringTest.cpp is failing from some reason due to locale issue, this
@ -43,12 +77,12 @@ stdenv.mkDerivation rec {
disabledTests = [
"PythonTestSSLSocket"
] ++ lib.optionals stdenv.isDarwin [
# tests that hang up in the darwin sandbox
# Tests that hang up in the Darwin sandbox
"SecurityTest"
"SecurityFromBufferTest"
"python_test"
# tests that fail in the darwin sandbox when trying to use network
# Tests that fail in the Darwin sandbox when trying to use network
"UnitTests"
"TInterruptTest"
"TServerIntegrationTest"
@ -62,6 +96,7 @@ stdenv.mkDerivation rec {
];
doCheck = !static;
checkPhase = ''
runHook preCheck
@ -69,6 +104,7 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
enableParallelChecking = false;
meta = with lib; {
@ -76,6 +112,6 @@ stdenv.mkDerivation rec {
homepage = "https://thrift.apache.org/";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor ];
};
}

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.3.0";
version = "3.3.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "Bwb5b+f5XfQqzsgSwd57RZOg1kgyHKg1BqnXHiJBe9o=";
sha256 = "Wtb1vJd4Hr9V7NaUfNSuf/QZJRZYDRC9g4Dx3UcZbtI=";
};
nativeBuildInputs = [
@ -79,11 +79,7 @@ stdenv.mkDerivation rec {
doCheck = true;
postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge
patchShebangs utils/data-generators/cc/generate
patchShebangs tests/functional-tests/test-runner.sh.in
patchShebangs tests/functional-tests/*.py
patchShebangs examples/python/endpoint.py
'';
preCheck = ''

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
@ -7,17 +8,23 @@
stdenv.mkDerivation rec {
pname = "unicorn";
version = "2.0.0-rc5";
version = "2.0.0-rc7";
src = fetchFromGitHub {
owner = "unicorn-engine";
repo = pname;
rev = version;
sha256 = "1q9k8swnq4qsi54zdfaap69z56w3yj4n4ggm9pscmmmr69nply5f";
hash = "sha256-qlxtFCJBmouPuUEu8RduZM+rbOr52sGjdb8ZRHWmJ/w=";
};
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
IOKit
];
meta = with lib; {
description = "Lightweight multi-platform CPU emulator library";

@ -1,4 +1,9 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "xxHash";
@ -11,21 +16,27 @@ stdenv.mkDerivation rec {
sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA=";
};
# Upstream Makefile does not anticipate that user may not want to
# build .so library.
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
sed -i 's/lib: libxxhash.a libxxhash/lib: libxxhash.a/' Makefile
sed -i '/LIBXXH) $(DESTDIR/ d' Makefile
'';
patches = [
# Merged in https://github.com/Cyan4973/xxHash/pull/649
# Should be present in next release
(fetchurl {
name = "cmakeinstallfix.patch";
url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch";
hash = "sha256-fj+5V5mDhFgWGvrG1E4fEekL4eh7as0ouVvY4wnIHjs=";
})
];
outputs = [ "out" "dev" ];
makeFlags = [ "PREFIX=$(dev)" "EXEC_PREFIX=$(out)" ];
nativeBuildInputs = [
cmake
];
# pkgs/build-support/setup-hooks/compress-man-pages.sh hook fails
# to compress symlinked manpages. Avoid compressing manpages until
# it's fixed.
dontGzipMan = true;
# Using unofficial CMake build script to install CMake module files.
cmakeDir = "../cmake_unofficial";
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
];
meta = with lib; {
description = "Extremely fast hash algorithm";
@ -39,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Cyan4973/xxHash";
license = with licenses; [ bsd2 gpl2 ];
maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
platforms = platforms.all;
};
}

@ -0,0 +1,51 @@
From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Wed, 30 Mar 2022 11:14:53 -0700
Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
The previous releases of zlib were not sensitive to incorrect CRC
inputs with bits set above the low 32. This commit restores that
behavior, so that applications with such bugs will continue to
operate as before.
---
crc32.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/crc32.c b/crc32.c
index a1bdce5c2..451887bc7 100644
--- a/crc32.c
+++ b/crc32.c
@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
#endif /* DYNAMIC_CRC_TABLE */
/* Pre-condition the CRC */
- crc ^= 0xffffffff;
+ crc = (~crc) & 0xffffffff;
/* Compute the CRC up to a word boundary. */
while (len && ((z_size_t)buf & 7) != 0) {
@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
#endif /* DYNAMIC_CRC_TABLE */
/* Pre-condition the CRC */
- crc ^= 0xffffffff;
+ crc = (~crc) & 0xffffffff;
#ifdef W
@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
#ifdef DYNAMIC_CRC_TABLE
once(&made, make_crc_table);
#endif /* DYNAMIC_CRC_TABLE */
- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
}
/* ========================================================================= */
@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
uLong crc2;
uLong op;
{
- return multmodp(op, crc1) ^ crc2;
+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
}

@ -42,6 +42,12 @@ stdenv.mkDerivation (rec {
patches = [
./fix-configure-issue-cross.patch
# Starting zlib 1.2.12, zlib is stricter to incorrect CRC inputs
# with bits set above the low 32.
# see https://github.com/madler/zlib/issues/618
# TODO: remove the patch if upstream releases https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2
# see https://github.com/NixOS/nixpkgs/issues/170539 for history.
./comprehensive-crc-validation-for-wrong-implementations.patch
];
strictDeps = true;

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "gitpython";
version = "3.1.25";
version = "3.1.27";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "gitpython-developers";
repo = "GitPython";
rev = version;
sha256 = "sha256-ienc7zvLe6t8rkMtC6wVIewUqQBFdFbLc8iPT6aPVrE=";
sha256 = "sha256-RA+6JFXHUQoXGErV8+aYuJPsfXzNSZK3kTm6eMbQIss=";
};
patches = [

@ -1,32 +1,36 @@
{ lib,
stdenv,
buildPythonPackage,
fetchPypi,
libspatialindex,
numpy,
pytestCheckHook
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, libspatialindex
, numpy
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "Rtree";
version = "0.9.7";
pname = "rtree";
version = "1.0.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e";
pname = "Rtree";
inherit version;
sha256 = "sha256-0Eg0ghITRrCTuaQlGNQPkhrfRFkVt66jB+smdoyDloI=";
};
buildInputs = [ libspatialindex ];
patchPhase = ''
postPatch = ''
substituteInPlace rtree/finder.py --replace \
"find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'"
'find_library("spatialindex_c")' '"${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
buildInputs = [ libspatialindex ];
checkInputs = [
numpy
pytestCheckHook
];
pythonImportsCheck = [ "rtree" ];
meta = with lib; {

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiomysql";
version = "0.1.0";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
hash = "sha256-TNaQ4EKiHwSmPpUco0pA5SBP3fljWQ/Kd5RLs649fu0=";
hash = "sha256-rYEos2RuE2xI59httYlN21smBH4/fU4uT48FWwrI6Qg=";
};
nativeBuildInputs = [

@ -32,7 +32,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=aiosteamist" ""
--replace "--cov=aiosteamist" "" \
--replace 'xmltodict = "^0.12.0"' 'xmltodict = "*"'
'';
pythonImportsCheck = [

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "ansible-later";
version = "2.0.13";
version = "2.0.14";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9xVFvXCHjgF+7asO1ialGIofJwsRRRiydo/Ui2C+Wig=";
hash = "sha256-iY+5p6LNrlCTGi61cm2DJdyt8SmAwYqKmXNXescjAVQ=";
};
nativeBuildInputs = [
@ -63,7 +63,7 @@ buildPythonPackage rec {
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"'
--replace 'jsonschema = "' 'jsonschema = "^'
'';
postInstall = ''

@ -9,8 +9,9 @@ buildPythonPackage rec {
sourceRoot = "source/runtime/Python3";
# in 4.9, test was renamed to tests
checkPhase = ''
cd test
cd test*
${python.interpreter} ctest.py
'';

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "apipkg";
version = "2.1.0";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "a4be31cf8081e660d2cdea6edfb8a0f39f385866abdcfcfa45e5a0887345cb70";
sha256 = "sha256-zKNAIkFKE5duM6HjjWoJBWfve2jQNy+SPGmaj4wIivw=";
};
nativeBuildInputs = [ setuptools-scm ];

@ -6,11 +6,10 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, fetchpatch
}:
buildPythonPackage rec {
version = "3.5.0";
version = "3.5.2";
pname = "asgiref";
format = "setuptools";
@ -20,17 +19,9 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
sha256 = "sha256-eWDsd8iWK1C/X3t/fKAM1i4hyTM/daGTd8CDSgDTL/U=";
sha256 = "sha256-56suF63ePRDprqODhVIPCEGiO8UGgWrpwg2wYEs6OOE=";
};
patches = [
(fetchpatch {
name = "remove-sock-nonblock-in-tests.patch";
url = "https://github.com/django/asgiref/commit/d451a724c93043b623e83e7f86743bbcd9a05c45.patch";
sha256 = "0whdsn5isln4dqbqqngvsy4yxgaqgpnziz0cndj1zdxim8cdicj7";
})
];
propagatedBuildInputs = [
async-timeout
];

@ -5,17 +5,18 @@
, pythonOlder
, isPyPy
, lazy-object-proxy
, wrapt
, setuptools
, setuptools-scm
, typing-extensions
, typed-ast
, pytestCheckHook
, setuptools-scm
, pylint
, pytestCheckHook
, wrapt
}:
buildPythonPackage rec {
pname = "astroid";
version = "2.11.2"; # Check whether the version is compatible with pylint
version = "2.11.5"; # Check whether the version is compatible with pylint
disabled = pythonOlder "3.6.2";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
sha256 = "sha256-adnvJCchsMWQxsIlenndUb6Mw1MgCNAanZcTmssmsEc=";
sha256 = "sha256-GKda3hNdOrsd11pi+6NpYodW4TAgSvqbv2hF4GaIvtM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -34,19 +35,19 @@ buildPythonPackage rec {
propagatedBuildInputs = [
lazy-object-proxy
setuptools
wrapt
] ++ lib.optionals (pythonOlder "3.10") [
typing-extensions
] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast;
] ++ lib.optionals (!isPyPy && pythonOlder "3.8") [
typed-ast
];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# assert (1, 1) == (1, 16)
"test_end_lineno_string"
] ++ lib.optionals (pythonAtLeast "3.10") [
# AssertionError: Lists differ: ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'Protocol', 'object'] != ['ABC[16 chars]yBase', 'Final', 'Generic', 'MyProtocol', 'object']
"test_mro_typing_extensions"
];
@ -59,7 +60,6 @@ buildPythonPackage rec {
description = "An abstract syntax tree for Python with inference support";
homepage = "https://github.com/PyCQA/astroid";
license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

@ -14,10 +14,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ];
postPatch = ''
substituteInPlace setup.py \
--replace 'httpx>=0.20.*,<=0.22.*' 'httpx'
sed -i "s/httpx.*/httpx',/" setup.py
'';
# has no tests
doCheck = false;
pythonImportsCheck = [ "audible"];
meta = with lib; {

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, azure-core
, msrest
}:
buildPythonPackage rec {
pname = "azure-data-tables";
version = "12.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw=";
};
propagatedBuildInputs = [
azure-core
msrest
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.data.tables" ];
meta = with lib; {
description = "NoSQL data storage service that can be accessed from anywhere";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
}

@ -24,6 +24,12 @@ buildPythonPackage rec {
azure-mgmt-nspkg
];
preBuild = ''
rm -f azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-nspkg" ""
'';
pythonNamespaces = [ "azure.mgmt" ];
# has no tests

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
version = "9.1.0";
version = "9.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "22164b0c59138b37bc48ba6d476bf635152bc428dcb420b521a14b8c25c797ad";
sha256 = "sha256-3rElVUvbGqF99ppZanUUrwFGtCAXak2zhMVOd6n9bkY=";
};
propagatedBuildInputs = [

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "9.1.0";
version = "10.0.0";
pname = "azure-mgmt-containerregistry";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jkzGLDqrJgwCnz27lGzFk4d2q+j0P+PU8uUVGQg7MkA=";
sha256 = "sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk=";
extension = "zip";
};

@ -24,6 +24,12 @@ buildPythonPackage rec {
azure-mgmt-nspkg
];
preBuild = ''
rm -f azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-nspkg" ""
'';
pythonNamespaces = [ "azure.mgmt" ];
# has no tests

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
version = "12.11.0";
version = "12.12.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-SVNbMZC7adDZ/3o4MkaxTaTSsb3/YMrl+Rc5IMZ8p+4=";
sha256 = "sha256-9trwfRyobRia4VybGFnf9bcSe/JKB6S75B4LgeAdYvc=";
};
propagatedBuildInputs = [

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, chardet
, html5lib
, lxml
, pytestCheckHook
@ -22,7 +23,12 @@ buildPythonPackage rec {
hash = "sha256-rZqlW2XvKAjrQF9Gz3Tff8twRNXLwmSH+W6y7y5DZpM=";
};
nativeBuildInputs = [
sphinxHook
];
propagatedBuildInputs = [
chardet
html5lib
lxml
soupsieve
@ -31,7 +37,6 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
];
nativeBuildInputs = [ sphinxHook ];
pythonImportsCheck = [
"bs4"

@ -25,6 +25,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# psutil.NoSuchProcess: process no longer exists (pid=168)
"test_set_pdeathsig"
];
pythonImportsCheck = [
"billiard"
];

@ -4,7 +4,6 @@
, python-dateutil
, jmespath
, docutils
, ordereddict
, simplejson
, mock
, nose
@ -24,7 +23,6 @@ buildPythonPackage rec {
python-dateutil
jmespath
docutils
ordereddict
simplejson
urllib3
];

@ -7,12 +7,13 @@
, msgpack
, pytestCheckHook
, pythonOlder
, redis
, requests
}:
buildPythonPackage rec {
pname = "cachecontrol";
version = "0.12.10";
version = "0.12.11";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,11 +22,10 @@ buildPythonPackage rec {
owner = "ionrock";
repo = pname;
rev = "v${version}";
hash = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs=";
hash = "sha256-uUPIQz/n347Q9G7NDOGuB760B/KxOglUxiS/rYjt5Po=";
};
propagatedBuildInputs = [
lockfile
msgpack
requests
];
@ -34,12 +34,17 @@ buildPythonPackage rec {
cherrypy
mock
pytestCheckHook
];
] ++ passthru.optional-dependencies.filecache;
pythonImportsCheck = [
"cachecontrol"
];
passthru.optional-dependencies = {
filecache = [ lockfile ];
redis = [ redis ];
};
meta = with lib; {
description = "Httplib2 caching for requests";
homepage = "https://github.com/ionrock/cachecontrol";

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "cachetools";
version = "5.0.0";
version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "tkem";
repo = pname;
rev = "v${version}";
hash = "sha256-urTkls1S83m7Eo7chPaQc5gxz0omZBToNYa8upQEiOo=";
hash = "sha256-DheHTD62f1ZxoiS0y0/CzDMHvKGmEiEUAX6oaqTpB78=";
};
checkInputs = [

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.24.0";
version = "1.27.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA=";
sha256 = "sha256-3IKRVR1rLpOH22Mp2m0InqcPt85+jQgBSyrRL9/nMxY=";
};
sourceRoot = "source/${pname}";

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "certifi";
version = "2021.10.08";
version = "2022.05.18.1";
disabled = pythonOlder "3.5";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-certifi";
rev = version;
sha256 = "sha256-SFb/spVHK15b53ZG1P147DcTjs1dqR0+MBXzpE+CWpo=";
sha256 = "sha256-uDNVzKcT45mz0zXBwPkttKV21fEcgbRamE3+QutNLjA=";
};
checkInputs = [

@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-cfn-template-flip";
rev = version;
hash = "sha256-1cV0mHc6+P0CbnLIMSSwNEzDB+1QzNjioH/EoIo40xU=";
hash = "sha256-lfhTR3+D1FvblhQGF83AB8+I8WDPBTmo+q22ksgDgt4=";
};
propagatedBuildInputs = [

@ -8,9 +8,11 @@
, objgraph
, path
, portend
, pyopenssl
, pytest-forked
, pytest-services
, pytestCheckHook
, python-memcached
, pythonAtLeast
, pythonOlder
, requests-toolbelt
@ -38,15 +40,11 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
# required
cheroot
portend
more-itertools
zc_lockfile
jaraco_collections
# optional
routes
simplejson
];
checkInputs = [
@ -90,6 +88,15 @@ buildPythonPackage rec {
"cherrypy"
];
passthru.optional-dependencies = {
json = [ simplejson ];
memcached_session = [ python-memcached ];
routes_dispatcher = [ routes ];
ssl = [ pyopenssl ];
# not packaged yet
xcgi = [ /* flup */ ];
};
meta = with lib; {
description = "Object-oriented HTTP framework";
homepage = "https://www.cherrypy.org";

@ -1,28 +1,46 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, mock }:
{ lib
, buildPythonPackage
, fetchPypi
, psutil
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "cloudpickle";
version = "2.0.0";
disabled = isPy27; # abandoned upstream
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4";
hash = "sha256-uyM+h2pYSR2VkKZ2+Tx6VHOgj3R9Wrnff5zlZLPnk44=";
};
buildInputs = [ pytest mock ];
checkInputs = [
psutil
pytestCheckHook
];
pythonImportsCheck = [
"cloudpickle"
];
# See README for tests invocation
checkPhase = ''
PYTHONPATH=$PYTHONPATH:'.:tests' py.test
'';
disabledTestPaths = [
# ModuleNotFoundError: No module named '_cloudpickle_testpkg'
"tests/cloudpickle_test.py"
];
# TypeError: cannot serialize '_io.FileIO' object
doCheck = false;
disabledTests = [
# TypeError: cannot pickle 'EncodedFile' object
"test_pickling_special_file_handles"
];
meta = with lib; {
description = "Extended pickling support for Python objects";
homepage = "https://github.com/cloudpipe/cloudpickle";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ ];
};
}

@ -12,10 +12,13 @@ buildPythonPackage rec {
# No tests in archive
doCheck = false;
pythonImportsCheck = [ "colorama" ];
meta = with lib; {
description = "Cross-platform colored terminal text";
homepage = "https://github.com/tartley/colorama";
license = licenses.bsd3;
description = "Cross-platform colored terminal text";
maintainers = with maintainers; [ ];
};
}

@ -1,29 +1,38 @@
{ lib, buildPythonPackage
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pytestCheckHook
, pythonOlder
, six
, mock, pytest
}:
buildPythonPackage rec {
pname = "configobj";
version = "5.0.6";
format = "setuptools";
disabled = pythonOlder "3.7";
# Pypi archives don't contain the tests
src = fetchFromGitHub {
owner = "DiffSK";
repo = pname;
rev = "v${version}";
sha256 = "0x97794nk3dfn0i3si9fv7y19jnpnarb34bkdwlz7ii7ag6xihhw";
hash = "sha256-HMLYzVMnxvMpb3ORsbKy18oU/NkuRT0isK6NaUk6J3U=";
};
propagatedBuildInputs = [
six
];
propagatedBuildInputs = [ six ];
checkPhase = ''
pytest --deselect=tests/test_configobj.py::test_options_deprecation
'';
checkInputs = [
mock
pytestCheckHook
];
checkInputs = [ mock pytest ];
pythonImportsCheck = [
"configobj"
];
meta = with lib; {
description = "Config file reading, writing and validation";

@ -9,6 +9,8 @@ buildPythonPackage rec {
sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq";
};
pythonImportsCheck = [ "constantly" ];
meta = with lib; {
homepage = "https://github.com/twisted/constantly";
description = "symbolic constant support";

@ -12,7 +12,9 @@
, isPyPy
, cffi
, pytestCheckHook
, pytest-benchmark
, pytest-subtests
, pythonOlder
, pretend
, libiconv
, iso8601
@ -25,18 +27,19 @@ let
in
buildPythonPackage rec {
pname = "cryptography";
version = "36.0.2"; # Also update the hash in vectors.nix
version = "37.0.2"; # Also update the hash in vectors.nix
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cPj097sqyfNAZVy6yJ1oxSevW7Q4dSKoQT6EHj5mKMk=";
sha256 = "sha256-8iStJTzJzqdWj0kHcAfSJj76VzlqLy94EUBm/VS1xo4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
sha256 = "sha256-6C4N445h4Xf2nCc9rJWpSZaNPilR9GfgbmKvNlSIFqg=";
sha256 = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8=";
};
cargoRoot = "src/rust";
@ -63,6 +66,7 @@ buildPythonPackage rec {
iso8601
pretend
pytestCheckHook
pytest-benchmark
pytest-subtests
pytz
];

@ -8,7 +8,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "cryptography_vectors";
inherit version;
sha256 = "sha256-KnkkRJoDAl+vf4dUpvQgAAHKshBzSmzmrB9r2s06aOQ=";
sha256 = "sha256-fGXT3lF1b0GBQt9gVBfsLG6WHDZPcMyKEDAwiJ1aMhk=";
};
# No tests included

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cssutils";
version = "2.4.0";
version = "2.4.1";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs=";
hash = "sha256-+Gicb66TTLanB3xwZvLGAmwOkN560wqBaz9tWaE41jg=";
};
nativeBuildInputs = [

@ -1,25 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, buildPythonPackage
, colorlog
, cryptography
, traitlets
, fetchFromGitHub
, go
, isPy27
, pythonOlder
, traitlets
}:
buildPythonPackage rec {
pname = "dask-gateway-server";
# update dask-gateway-server lock step with dask-gateway
version = "0.9.0";
disabled = isPy27;
version = "2022.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "82bca8a98fc1dbda9f67c8eceac59cb92abe07db6227c120a1eb1d040ea40fda";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dask";
repo = "dask-gateway";
rev = version;
hash = "sha256-Grjp7gt3Pos4cQSGV/Rynz6W/zebRI0OqDiWT4cTh8I=";
};
sourceRoot = "${src.name}/${pname}";
nativeBuildInputs = [
go
];
@ -36,15 +42,17 @@ buildPythonPackage rec {
export GO111MODULE=off
'';
# tests requires cluster for testing
# Tests requires cluster for testing
doCheck = false;
pythonImportsCheck = [ "dask_gateway_server" ];
pythonImportsCheck = [
"dask_gateway_server"
];
meta = with lib; {
description = "A multi-tenant server for securely deploying and managing multiple Dask clusters";
homepage = "https://gateway.dask.org/";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

@ -1,33 +1,63 @@
{ lib
, buildPythonPackage
, fetchPypi
, cloudpickle
, dask
, numpy, toolz # dask[array]
, distributed
, fetchPypi
, multipledispatch
, setuptools-scm
, scipy
, scikit-learn
, pytestCheckHook
, pythonOlder
, scikit-learn
, scipy
, setuptools-scm
, sparse
}:
buildPythonPackage rec {
version = "0.2.0";
pname = "dask-glm";
version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5";
hash = "sha256-WLhs6/BP5bnlgJLhxGfjLmDQHhG3H9xii6qp/G0a3uU=";
};
nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikit-learn ];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
cloudpickle
distributed
multipledispatch
scikit-learn
scipy
sparse
] ++ dask.optional-dependencies.array;
checkInputs = [
sparse
pytestCheckHook
];
pythonImportsCheck = [
"dask_glm"
];
disabledTestPaths = [
# Circular dependency with dask-ml
"dask_glm/tests/test_estimators.py"
# Test tries to imort an obsolete method
"dask_glm/tests/test_utils.py"
];
meta = with lib; {
homepage = "https://github.com/dask/dask-glm/";
description = "Generalized Linear Models with Dask";
homepage = "https://github.com/dask/dask-glm/";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

@ -13,7 +13,6 @@
, scikit-learn
, scipy
, setuptools-scm
, toolz
}:
buildPythonPackage rec {
@ -33,7 +32,6 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
dask
dask-glm
distributed
multipledispatch
@ -43,8 +41,8 @@ buildPythonPackage rec {
pandas
scikit-learn
scipy
toolz
];
] ++ dask.optional-dependencies.array
++ dask.optional-dependencies.dataframe;
# has non-standard build from source, and pypi doesn't include tests
doCheck = false;

@ -4,6 +4,7 @@
, buildPythonPackage
, cloudpickle
, distributed
, fastparquet
, fetchFromGitHub
, fetchpatch
, fsspec
@ -12,17 +13,20 @@
, packaging
, pandas
, partd
, pyarrow
, pytest-rerunfailures
, pytest-xdist
, pytestCheckHook
, pythonOlder
, pyyaml
, scipy
, toolz
, zarr
}:
buildPythonPackage rec {
pname = "dask";
version = "2022.02.1";
version = "2022.05.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -31,7 +35,7 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
hash = "sha256-A8ktvfpow/QKAEEt9SUnkTqYFJCrV1mgnuDIP3gdyrE=";
hash = "sha256-8M70Pf31PhYnBPRhSG55eWg6gK0lxsIFKF+cRCsf0/U=";
};
propagatedBuildInputs = [
@ -41,48 +45,71 @@ buildPythonPackage rec {
partd
pyyaml
toolz
pandas
jinja2
bokeh
numpy
];
doCheck = true;
passthru.optional-dependencies = {
array = [
numpy
];
complete = [
distributed
];
dataframe = [
numpy
pandas
];
distributed = [
distributed
];
diagnostics = [
bokeh
jinja2
];
};
checkInputs = [
fastparquet
pyarrow
pytestCheckHook
pytest-rerunfailures
pytest-xdist
scipy
zarr
];
dontUseSetuptoolsCheck = true;
postPatch = ''
# versioneer hack to set version of github package
# versioneer hack to set version of GitHub package
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
substituteInPlace setup.py \
--replace "version=versioneer.get_version()," "version='${version}'," \
--replace "cmdclass=versioneer.get_cmdclass()," ""
substituteInPlace setup.cfg \
--replace " --durations=10" "" \
--replace " -v" ""
'';
pytestFlagsArray = [
# rerun failed tests up to three times
# Rerun failed tests up to three times
"--reruns 3"
# don't run tests that require network access
# Don't run tests that require network access
"-m 'not network'"
# Ignore warning about pyarrow 5.0.0 feautres
"-W"
"ignore::FutureWarning"
];
disabledTests = lib.optionals stdenv.isDarwin [
# this test requires features of python3Packages.psutil that are
# Test requires features of python3Packages.psutil that are
# blocked in sandboxed-builds
"test_auto_blocksize_csv"
# AttributeError: 'str' object has no attribute 'decode'
"test_read_dir_nometa"
] ++ [
# A deprecation warning from newer sqlalchemy versions makes these tests
# to fail https://github.com/dask/dask/issues/7406
"test_sql"
# Test interrupt fails intermittently https://github.com/dask/dask/issues/2192
"test_interrupt"
"test_chunksize_files"
];
__darwinAllowLocalNetworking = true;
@ -98,10 +125,6 @@ buildPythonPackage rec {
"dask.diagnostics"
];
passthru.optional-dependencies = {
complete = [ distributed ];
};
meta = with lib; {
description = "Minimal task scheduling abstraction";
homepage = "https://dask.org/";

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "databases";
version = "0.5.5";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "encode";
repo = pname;
rev = version;
hash = "sha256-NOXK1UCQzqvJRfzsgIfpihuD9oF52sMD+BxqUHWF8Rk=";
hash = "sha256-5+x735EFX9B25HgXiqzUJm0nbF7tDF5FOQVnbYQyomE=";
};
propagatedBuildInputs = [

@ -1,57 +1,55 @@
{ lib
, buildPythonPackage
, fetchPypi
, click
, cloudpickle
, dask
, fetchPypi
, jinja2
, locket
, msgpack
, packaging
, psutil
, pythonOlder
, pyyaml
, sortedcontainers
, tblib
, toolz
, tornado
, urllib3
, zict
, pyyaml
, mpi4py
, bokeh
, pythonOlder
}:
buildPythonPackage rec {
pname = "distributed";
version = "2022.2.1";
version = "2022.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
hash = "sha256-+2KnWvjvM7vhqoCmjAGjOpPBzVozLdAXq0SVW/fs9ls=";
hash = "sha256-BEqsUfpk/Z4WsaLEMVIg0oHw5cwbBfTT03hSQm8efLY=";
};
propagatedBuildInputs = [
bokeh
click
cloudpickle
dask
mpi4py
jinja2
locket
msgpack
packaging
psutil
pyyaml
sortedcontainers
tblib
toolz
tornado
urllib3
zict
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "dask == 2022.02.0" "dask"
'';
# when tested random tests would fail and not repeatably
# When tested random tests would fail and not repeatably
doCheck = false;
pythonImportsCheck = [

@ -31,6 +31,12 @@ buildPythonPackage rec {
hash = "sha256-2Nb+FzmhsKvauT/yOCLHCEld8r+6niu9kV6EmjhC6S0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'fastapi = "^0.75.0"' 'fastapi = "*"' \
--replace 'httpx = "^0.22.0"' 'httpx = "*"'
'';
nativeBuildInputs = [
poetry-core
];

@ -7,7 +7,6 @@
, pytest-asyncio
, aiosqlite
, databases
, fetchpatch
, flask
, httpx
, passlib
@ -20,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi";
version = "0.75.2";
version = "0.78.0";
format = "flit";
disabled = pythonOlder "3.6";
@ -29,9 +28,14 @@ buildPythonPackage rec {
owner = "tiangolo";
repo = pname;
rev = version;
hash = "sha256-B4q3Q256Sj4jTQt1TDm3fiEaQKdVxddCF9+KsxkkTWo=";
hash = "sha256-4JS0VLVg67O7VdcDw2k2u+98kiCdCHvCAEGHYGWEIOA=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "starlette==" "starlette>="
'';
propagatedBuildInputs = [
starlette
pydantic
@ -51,21 +55,6 @@ buildPythonPackage rec {
trio
] ++ passlib.optional-dependencies.bcrypt;
patches = [
# Bump starlette, https://github.com/tiangolo/fastapi/pull/4483
(fetchpatch {
name = "support-later-starlette.patch";
# PR contains multiple commits
url = "https://patch-diff.githubusercontent.com/raw/tiangolo/fastapi/pull/4483.patch";
sha256 = "sha256-ZWaqAd/QYEYRL1hSQdXdFPgWgdmOill2GtmEn33vz2U=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "starlette ==" "starlette >="
'';
pytestFlagsArray = [
# ignoring deprecation warnings to avoid test failure from
# tests/test_tutorial/test_testing/test_tutorial001.py

@ -8,28 +8,50 @@
, cramjam
, fsspec
, thrift
, python-lzo
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "fastparquet";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
sha256 = "05qb4nz87p9vnrdsyl25hdp5sj35lki64gjza5dahc89fwfdnsmd";
hash = "sha256-rWrbHHcJMahaUV8+YuKkZUhdboNFUK9btjvdg74lCxc=";
};
propagatedBuildInputs = [
cramjam
fsspec
numba
numpy
pandas
thrift
];
passthru.optional-dependencies = {
lzo = [
python-lzo
];
};
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," "" \
--replace "oldest-supported-numpy" "numpy"
'';
propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ];
checkInputs = [ pytestCheckHook ];
# Workaround https://github.com/NixOS/nixpkgs/issues/123561
preCheck = ''
@ -43,7 +65,9 @@ buildPythonPackage rec {
rm "$fastparquet_test"
'';
pythonImportsCheck = [ "fastparquet" ];
pythonImportsCheck = [
"fastparquet"
];
meta = with lib; {
description = "A python implementation of the parquet format";

@ -1,20 +1,21 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, setuptools-scm
, pytestCheckHook
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "filelock";
version = "3.6.0";
version = "3.7.1";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nNVAqTUuQyxyRqSP5OhxKxCssd8q0fMOjAcLgq4f7YU=";
hash = "sha256-Og/YUWatnbq1TJrslnN7dEEG3F8VwLCaZ0SkRSmfzwQ=";
};
nativeBuildInputs = [
@ -26,8 +27,8 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "https://github.com/benediktschmitt/py-filelock";
description = "A platform independent file lock for Python";
homepage = "https://github.com/benediktschmitt/py-filelock";
license = licenses.unlicense;
maintainers = with maintainers; [ hyphon81 ];
};

@ -6,7 +6,6 @@
, hiro
, limits
, mock
, ordereddict
, pymemcache
, pytestCheckHook
, redis
@ -32,7 +31,6 @@ buildPythonPackage rec {
redis
flask-restful
pymemcache
ordereddict
];
postPatch = ''

@ -4,6 +4,7 @@
, requests
, requests-toolbelt
, requests-oauthlib
, six
, pytestCheckHook
, responses
, pythonOlder
@ -27,6 +28,7 @@ buildPythonPackage rec {
requests
requests-toolbelt
requests-oauthlib
six
];
checkInputs = [

@ -1,19 +1,25 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, brotlipy
, zopfli
, isPyPy
, fetchFromGitHub
, setuptools-scm
, fs
, lxml
, brotli
, brotlicffi
, zopfli
, unicodedata2
, lz4
, scipy
, munkres
, unicodedata2
, matplotlib
, sympy
, reportlab
, sphinx
, xattr
, skia-pathops
, uharfbuzz
, pytestCheckHook
, glibcLocales
, setuptools-scm
}:
buildPythonPackage rec {
@ -31,28 +37,32 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
# all dependencies are optional, but
# we run the checks with them
passthru.optional-dependencies = let
extras = {
ufo = [ fs ];
lxml = [ lxml ];
woff = [ (if isPyPy then brotlicffi else brotli) zopfli ];
unicode = lib.optional (pythonOlder "3.11") unicodedata2;
graphite = [ lz4 ];
interpolatable = [ (if isPyPy then munkres else scipy) ];
plot = [ matplotlib ];
symfont = [ sympy ];
type1 = lib.optional stdenv.isDarwin xattr;
pathops = [ skia-pathops ];
repacker = [ uharfbuzz ];
};
in extras // {
all = lib.concatLists (lib.attrValues extras);
};
checkInputs = [
pytestCheckHook
# etree extra
lxml
# woff extra
brotlipy
zopfli
# interpolatable extra
scipy
munkres
# symfont
sympy
# pens
reportlab
sphinx
] ++ lib.optionals (pythonOlder "3.9") [
# unicode extra
unicodedata2
];
] ++ lib.concatLists (lib.attrVals [
"woff"
"interpolatable"
"pathops"
"repacker"
] passthru.optional-dependencies);
pythonImportsCheck = [ "fontTools" ];

@ -1,29 +1,32 @@
{ lib
, stdenv
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, numpy
, aiohttp
, pytest-vcr
, pytest-mock
, paramiko
, pytest-asyncio
, pytest-mock
, pytest-vcr
, pytestCheckHook
, pythonOlder
, requests
, paramiko
, smbprotocol
, tqdm
}:
buildPythonPackage rec {
pname = "fsspec";
version = "2022.3.0";
disabled = pythonOlder "3.6";
version = "2022.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "intake";
repo = "filesystem_spec";
rev = version;
sha256 = "sha256-jTF8R0kaHMsCYg+7YFi21Homn63K+ulp9NDZC/jkIXM=";
hash = "sha256-WOzw9UPF8LZuOhp5p/CJUUJcYpAfixV6GiI8tfnoklc=";
};
propagatedBuildInputs = [
@ -31,13 +34,14 @@ buildPythonPackage rec {
paramiko
requests
smbprotocol
tqdm
];
checkInputs = [
numpy
pytest-vcr
pytest-mock
pytest-asyncio
pytest-mock
pytest-vcr
pytestCheckHook
];
@ -58,13 +62,15 @@ buildPythonPackage rec {
"test_touch"
];
pythonImportsCheck = [ "fsspec" ];
pythonImportsCheck = [
"fsspec"
];
meta = with lib; {
homepage = "https://github.com/intake/filesystem_spec";
description = "A specification that Python filesystems should adhere to";
homepage = "https://github.com/intake/filesystem_spec";
changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "gcsfs";
version = "2022.3.0";
version = "2022.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "fsspec";
repo = pname;
rev = version;
hash = "sha256-+Bchwsa8Jj7WBWbzyH+GQuqZki4EltMryumKt4Pm1es=";
hash = "sha256-gIkK1VSg1h04+MQBoxFtXIdn80faJlgQ9ayqV5p0RMU=";
};
propagatedBuildInputs = [
@ -55,7 +55,9 @@ buildPythonPackage rec {
"gcsfs/tests/test_retry.py"
];
pytestFlagsArray = [ "-x" ];
pytestFlagsArray = [
"-x"
];
pythonImportsCheck = [
"gcsfs"

@ -26,7 +26,8 @@ buildPythonApplication rec {
tqdm
setuptools
six
];
]
++ requests.optional-dependencies.socks;
checkPhase = ''
$out/bin/gdown --help > /dev/null

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "glances-api";
version = "0.3.5";
version = "0.3.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = version;
sha256 = "sha256-8NWrsiiKevIMeD++C2weRdG0FPm5T4fHMUSJM4J+AOo=";
sha256 = "sha256-2H8S08tntCNKwMw553/wuWLXmri7b2tLxFlgCDJWQNQ=";
};
nativeBuildInputs = [

@ -8,6 +8,7 @@
, pythonOlder
, requests
, responses
, six
, typing-extensions
}:
@ -37,6 +38,7 @@ buildPythonPackage rec {
mypy
pytestCheckHook
responses
six
];
postPatch = ''

@ -1,18 +1,34 @@
{ fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
, pkg-config, boost, expat, scipy, cgal, gmp, mpfr
, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
, buildPythonPackage
{ buildPythonPackage
, lib
, fetchurl
, autoreconfHook
, boost
, cairomm
, cgal
, expat
, gmp
, gobject-introspection
, gtk3
, matplotlib
, mpfr
, numpy
, pkg-config
, pycairo
, pygobject3
, python
, scipy
, sparsehash
}:
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
version = "2.43";
version = "2.45";
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
hash = "sha256-XxvuCUIgz7JIaNsPr0f44v/Sb3fdcJmVhC5NnomNqGw=";
hash = "sha256-+S2nrM/aArKXke/k8LPtkzKfJyMq9NOvwHySQh7Ghmg=";
};
configureFlags = [
@ -23,34 +39,35 @@ buildPythonPackage rec {
"--enable-openmp"
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses ];
enableParallelBuilding = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
];
# https://git.skewed.de/count0/graph-tool/-/wikis/installation-instructions#manual-compilation
propagatedBuildInputs = [
boost
cairomm
cgal
expat
gmp
mpfr
python
scipy
# optional
sparsehash
# drawing
cairomm
gobject-introspection
gtk3
pycairo
matplotlib
mpfr
numpy
pycairo
pygobject3
scipy
sparsehash
];
enableParallelBuilding = false;
meta = with lib; {
description = "Python module for manipulation and statistical analysis of graphs";
homepage = "https://graph-tool.skewed.de/";
license = licenses.gpl3;
maintainers = [ maintainers.joelmo ];
homepage = "https://graph-tool.skewed.de";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ];
};
}

@ -1,71 +1,73 @@
{ stdenv
, lib
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, cairocffi
, django
, python-memcached
, txamqp
, django_tagging
, fetchPypi
, gunicorn
, pytz
, pyparsing
, cairocffi
, python-memcached
, pythonOlder
, pytz
, six
, txamqp
, urllib3
, whisper
, whitenoise
, urllib3
, six
}:
buildPythonPackage rec {
pname = "graphite-web";
version = "1.1.8";
version = "1.1.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "54240b0f1e069b53e2ce92d4e534e21b195fb0ebd64b6ad8a49c44284e3eb0b1";
hash = "sha256-Pxho1QWo2jJZYAMJx999bbELDVMr7Wp7wsssYPkc01o=";
};
patches = [
./update-django-tagging.patch
];
postPatch = ''
# https://github.com/graphite-project/graphite-web/pull/2701
substituteInPlace setup.py \
--replace "'scandir'" "'scandir; python_version < \"3.5\"'"
'';
propagatedBuildInputs = [
cairocffi
django
python-memcached
txamqp
django_tagging
gunicorn
pytz
pyparsing
cairocffi
python-memcached
pytz
six
txamqp
urllib3
whisper
whitenoise
urllib3
six
];
postPatch = ''
substituteInPlace setup.py \
--replace "Django>=1.8,<3.1" "Django" \
--replace "django-tagging==0.4.3" "django-tagging"
'';
# Carbon-s default installation is /opt/graphite. This env variable ensures
# carbon is installed as a regular python module.
GRAPHITE_NO_PREFIX="True";
# carbon is installed as a regular Python module.
GRAPHITE_NO_PREFIX = "True";
preConfigure = ''
substituteInPlace webapp/graphite/settings.py \
--replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')"
'';
pythonImportsCheck = [ "graphite" ];
pythonImportsCheck = [
"graphite"
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
homepage = "http://graphiteapp.org/";
description = "Enterprise scalable realtime graphing";
maintainers = with maintainers; [ offline basvandijk ];
homepage = "http://graphiteapp.org/";
license = licenses.asl20;
maintainers = with maintainers; [ offline basvandijk ];
};
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save