diff options
39 files changed, 345 insertions, 179 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f1fb6baea38a6..fdc7a2d1be2bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7219,6 +7219,12 @@ githubId = 51356; name = "Mathieu Boespflug"; }; + mbprtpmnr = { + name = "mbprtpmnr"; + email = "mbprtpmnr@pm.me"; + github = "mbprtpmnr"; + githubId = 88109321; + }; mbrgm = { email = "marius@yeai.de"; github = "mbrgm"; @@ -9845,6 +9851,12 @@ githubId = 373566; name = "Ronuk Raval"; }; + rski = { + name = "rski"; + email = "rom.skiad+nix@gmail.com"; + github = "rski"; + githubId = 2960312; + }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; @@ -12526,6 +12538,16 @@ fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; }]; }; + yuu = { + email = "yuuyin@protonmail.com"; + github = "yuuyins"; + githubId = 86538850; + name = "Yuu Yin"; + keys = [{ + longkeyid = "rsa4096/0x416F303B43C20AC3"; + fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; + }]; + }; yvesf = { email = "yvesf+nix@xapek.org"; github = "yvesf"; @@ -12989,17 +13011,4 @@ github = "zupo"; githubId = 311580; }; - rski = { - name = "rski"; - email = "rom.skiad+nix@gmail.com"; - github = "rski"; - githubId = 2960312; - }; - mbprtpmnr = { - name = "mbprtpmnr"; - email = "mbprtpmnr@pm.me"; - github = "mbprtpmnr"; - githubId = 88109321; - }; - } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b7a03eaac7516..a8db42f5ed6fa 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -560,7 +560,7 @@ in package = mkOption { type = types.package; - default = pkgs.qemu; + default = pkgs.qemu_kvm; example = "pkgs.qemu_test"; description = "QEMU package to use."; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index af1ef907a4bb2..0b640b76fe4df 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -452,8 +452,8 @@ in tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tor = handleTest ./tor.nix {}; - # traefik test relies on docker-containers trac = handleTest ./trac.nix {}; + # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; trafficserver = handleTest ./trafficserver.nix {}; transmission = handleTest ./transmission.nix {}; @@ -465,7 +465,6 @@ in turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; tuxguitar = handleTest ./tuxguitar.nix {}; ucarp = handleTest ./ucarp.nix {}; - ucg = handleTest ./ucg.nix {}; udisks2 = handleTest ./udisks2.nix {}; unbound = handleTest ./unbound.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index ea9e19cefbc9f..d67acd075a13f 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -80,6 +80,10 @@ mapAttrs (channel: chromiumPkg: makeTest rec { binary = pname # Add optional CLI options: options = [] + major_version = "${versions.major (getVersion chromiumPkg.name)}" + if major_version > "95" and not pname.startswith("google-chrome"): + # Workaround to avoid a GPU crash: + options.append("--use-gl=swiftshader") # Launch the process: options.append("file://${startupHTML}") machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown')) diff --git a/nixos/tests/ucg.nix b/nixos/tests/ucg.nix deleted file mode 100644 index 7769fd01fce42..0000000000000 --- a/nixos/tests/ucg.nix +++ /dev/null @@ -1,18 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "ucg"; - meta = with pkgs.lib.maintainers; { - maintainers = [ AndersonTorres ]; - }; - - machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.ucg ]; - }; - - testScript = '' - machine.succeed("echo 'Lorem ipsum dolor sit amet\n2.7182818284590' > /tmp/foo") - assert "dolor" in machine.succeed("ucg 'dolor' /tmp/foo") - assert "Lorem" in machine.succeed("ucg --ignore-case 'lorem' /tmp/foo") - machine.fail("ucg --word-regexp '2718' /tmp/foo") - machine.fail("ucg 'pisum' /tmp/foo") - ''; -}) diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index ab55287f29f35..46625253d0f6a 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,11 +1,7 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: -let - # Using Electron 12 to solve errors regarding threading - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.5.0"; @@ -41,8 +37,9 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts - substituteInPlace $out/share/applications/pocket-casts.desktop --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" + substituteInPlace $out/share/applications/pocket-casts.desktop \ + --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts \ + --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" makeWrapper ${electron}/bin/electron \ $out/bin/pocket-casts \ --add-flags $out/opt/pocket-casts/resources/app.asar diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 7d1ec9f99783b..1d5edf892cb71 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.4"; + version = "0.9.5"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; - sha256 = "sha256-eZKrPQ07Z3pF5dArZ4QSclrRCaPHpPb8S5HANLUS9MM="; + sha256 = "sha256-20oy3R0gbVXO3Da80cTYXu+BG8OfVNRLtAwHk8nRFJk="; }; buildInputs = [ diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d37ace7107347..84b2a2f736a16 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -9,24 +9,27 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-GDO8iGntQncvdJiDMBJk9GrGF9JToasbLRzju3S0TS0="; + hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss="; }; - cargoHash = "sha256-Ms785+3Z4xEUW8FRRu1FIHk7HSWYLBThKlJDFjW6j0I="; + cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI=="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 + # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 + # # link rocksdb dynamically - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/applications/blockchains/electrs/update.sh index 3e4d90db59de1..14105d71a448a 100755 --- a/pkgs/applications/blockchains/electrs/update.sh +++ b/pkgs/applications/blockchains/electrs/update.sh @@ -21,6 +21,7 @@ repo=$tmpdir/repo trap "rm -rf $tmpdir" EXIT git clone --depth 1 --branch v${version} -c advice.detachedHead=false https://github.com/romanz/electrs $repo +git -C $repo checkout tags/v${version} export GNUPGHOME=$tmpdir echo diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index bddcfa497d919..8e19a311fce33 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -17,13 +17,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.26.4.7"; + version = "3.26.4.10"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-of0wsuHWM2mzGQmu9P4AHqXCHew45ywnnv/Al2o47ZM="; + sha256 = "sha256-dWpItV18lYjdwUsn2wwA//AUHU5ICGfmih2cJWihvn0="; }; patches = [ diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index b382e6f9e7549..48b1263e7961a 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,11 +1,11 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index fd9fe74..0fefa39 100644 +index c51e76d..d0a26d7 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -50,11 +50,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) - }; - - try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage)); +@@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) + entry + .unpack(&full_path) + .chain_err(|| ErrorKind::ExtractingPackage)?; + nix_patchelf_if_needed(&full_path); } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 5dc54fd27747e..fb636da0ec412 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "0q3gay0j45c6cmykbis14gmc7xm89d0gqyz7lnysl0pgr5k20j6b"; + sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1"; }; - cargoSha256 = "1cklpi40fbiwz8m9p0cknmslpj0vwpr0x8j02vam6sng9dsb50i9"; + cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7bcb26e0c972b..827fce8970265 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -52,7 +52,10 @@ in symlinkJoin { ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; - passthru.providedSessions = [ "sway" ]; + passthru = { + inherit (sway.passthru) tests; + providedSessions = [ "sway" ]; + }; inherit (sway) meta; } diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 8f6ea0825fa0d..d58e9bf9b0cb4 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-10-26"; + version = "unstable-2021-10-28"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "900805a8fe5cfa799966c4ef221524e967c44ca5"; - sha256 = "sha256-ahUpG2JH3Ee6FUGfTYZZ2TLk5tF6ovvMxbsjZjVug2o="; + rev = "0d68986b6f6aa046ab13776f39cc37b67b3477ba"; + sha256 = "sha256-K1XpVoJoY8QuUdP5rKnlAs4yTn5jhh9LKZjHalliNKs="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index bc46e80db9b32..521ae7f216d72 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -1,28 +1,71 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gflags +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gflags , staticOnly ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "crc32c"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "google"; repo = "crc32c"; rev = version; - sha256 = "1sazkis9rzbrklfrvk7jn1mqywnq4yghmzg94mxd153h8b1sb149"; + sha256 = "0c383p7vkfq9rblww6mqxz8sygycyl27rr0j3bzb8l8ga71710ii"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; - cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; + + cmakeFlags = [ + "-DCRC32C_INSTALL=1" + "-DCRC32C_BUILD_TESTS=1" + "-DCRC32C_BUILD_BENCHMARKS=0" + "-DCRC32C_USE_GLOG=0" + "-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}" + ]; + + doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + ctest + + runHook postInstallCheck + ''; + + postInstallCheck = '' + # without removing these libraries, dependents will look for + # libgtest/libgmock etc here, which can result in link time errors + rm $out/lib/libg* + ''; + + postFixup = '' + # dependents shouldn't be able to find gtest libraries as dependencies of + # this package + rm -r $out/lib/pkgconfig + + # remove GTest cmake config files + rm -r $out/lib/cmake/GTest + + # fix bogus include paths + for f in $(find $out/lib/cmake -name '*.cmake'); do + substituteInPlace "$f" --replace "\''${_IMPORT_PREFIX}/$out/include" "\''${_IMPORT_PREFIX}/include" + done + ''; meta = with lib; { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir cpcloud ]; }; } diff --git a/pkgs/development/libraries/libressl/CVE-2021-41581.patch b/pkgs/development/libraries/libressl/CVE-2021-41581.patch deleted file mode 100644 index 244792567192a..0000000000000 --- a/pkgs/development/libraries/libressl/CVE-2021-41581.patch +++ /dev/null @@ -1,53 +0,0 @@ -Based on upstream https://github.com/openbsd/src/commit/62ceddea5b1d64a1a362bbb7071d9e15adcde6b1 -with paths switched to apply to libressl-portable and CVS header -hunk removed. - ---- a/crypto/x509/x509_constraints.c -+++ b/crypto/x509/x509_constraints.c -@@ -339,16 +339,16 @@ - if (c == '.') - goto bad; - } -- if (wi > DOMAIN_PART_MAX_LEN) -- goto bad; - if (accept) { -+ if (wi >= DOMAIN_PART_MAX_LEN) -+ goto bad; - working[wi++] = c; - accept = 0; - continue; - } - if (candidate_local != NULL) { - /* We are looking for the domain part */ -- if (wi > DOMAIN_PART_MAX_LEN) -+ if (wi >= DOMAIN_PART_MAX_LEN) - goto bad; - working[wi++] = c; - if (i == len - 1) { -@@ -363,7 +363,7 @@ - continue; - } - /* We are looking for the local part */ -- if (wi > LOCAL_PART_MAX_LEN) -+ if (wi >= LOCAL_PART_MAX_LEN) - break; - - if (quoted) { -@@ -383,6 +383,8 @@ - */ - if (c == 9) - goto bad; -+ if (wi >= LOCAL_PART_MAX_LEN) -+ goto bad; - working[wi++] = c; - continue; /* all's good inside our quoted string */ - } -@@ -412,6 +414,8 @@ - } - if (!local_part_ok(c)) - goto bad; -+ if (wi >= LOCAL_PART_MAX_LEN) -+ goto bad; - working[wi++] = c; - } - if (candidate_local == NULL || candidate_domain == NULL) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index d70672f63ac35..c091a1b698d24 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -40,6 +40,9 @@ let # removing ./configure pre-config. preConfigure = '' rm configure + substituteInPlace CMakeLists.txt \ + --replace 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \ + --replace 'libdir \''${exec_prefix}' 'libdir \''${prefix}' ''; inherit patches; @@ -81,17 +84,11 @@ let in { libressl_3_2 = generic { - version = "3.2.5"; - sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr"; - patches = [ - ./CVE-2021-41581.patch - ]; + version = "3.2.7"; + sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw"; }; libressl_3_4 = generic { - version = "3.4.0"; - sha256 = "1lhn76nd59p1dfd27b4636zj6wh3f5xsi8b3sxqnl820imsswbp5"; - patches = [ - ./CVE-2021-41581.patch - ]; + version = "3.4.1"; + sha256 = "0766yxb599lx7qmlmsddiw9wgminz9mc311mav5q23l0rbkflz0h"; }; } diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 3f16f3cc3e2a8..653f437646825 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "07iljmv737kx24kd33x9ndf5l854mwslg9x2psqm12k07jmq9wjw"; + sha256 = "0s01q5sh50544s7q2q7kahcqydlyzk1lx3kg1zwl76y90942bjd1"; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix new file mode 100644 index 0000000000000..68451cc8d8dbb --- /dev/null +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, pythonOlder +, buildPythonPackage +, python +, django +, jinja2 +, sqlparse +, html5lib +}: + +buildPythonPackage rec { + pname = "django-debug-toolbar"; + version = "3.2.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = pname; + rev = version; + sha256 = "1dgb3s449nasbnqd5xfikxrfhwwilwlgrw9nv4bfkapvkzpdszjk"; + }; + + propagatedBuildInputs = [ + django + jinja2 + sqlparse + ]; + + DB_BACKEND = "sqlite3"; + DB_NAME = ":memory:"; + TEST_ARGS = "tests"; + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + html5lib + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test ${TEST_ARGS} + runHook postCheck + ''; + + meta = { + description = "Configurable set of panels that display debug information about the current request/response"; + homepage = "https://github.com/jazzband/django-debug-toolbar"; + changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; + maintainers = with lib.maintainers; [ yuu ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index d95449ab043e4..cfe9f451ef65a 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.8"; + version = "3.2.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f6d2c4069c9b9bfac03bedff927ea1f9e0d29e34525cec8a68fd28eb2a8df7af"; + sha256 = "51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 68e277d0b1a5e..1f5c983e14f38 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8dd4ac612fd60cb277eaf6e2ce02f68dda54aba06870ca6fa2b28369bf39aa14"; + sha256 = "a9134cb9efd334b1644ad7c5ee3ff3ff488317c4549ffc0e8d82e4d63383a1a4"; }; checkInputs = [ betamax pytest betamax-matchers ] diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index 0e36328bd7a48..f61599d827cd7 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "google-re2"; - version = "0.2.20210901"; + version = "0.2.20211101"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "676fa9ee54e3fb70f290526fc0f4d78d1e5a4add701b5547494eaf7c68c72247"; + sha256 = "305dc0f749c1abad51f8dc59b49b98a58dc06b976727f6b711c87c01944046d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index be1d5f7c58441..d3be5570aba8b 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.10.1"; + version = "2021.11.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-nd3k2enQvYzASFyLy8chBLGX8dXlLyMyg4yv06VSeUA="; + sha256 = "sha256-NpbmW4sWQmIqSllMSC+8uuSzVjUUZL+m5hshv4illCU="; }; # tests require network connection diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 6d2f9f30a4e5f..1fe609db93357 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.21.0"; + version = "1.23.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; + sha256 = "0n8zflphcj9l17mkqa4acxb0sna0v05zq5y07ayizf84zm93hpbr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 746cd3ab8adfb..e43db60fb11d1 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.8"; + version = "3.10.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6kBu8uFDiKs5ZJXw9gTS08lstaJWuWvAVW3Ycc19x7Q="; + sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix new file mode 100644 index 0000000000000..38cf79e190492 --- /dev/null +++ b/pkgs/development/python-modules/qutip/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub, buildPythonPackage, python, packaging, numpy +, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures }: + +buildPythonPackage rec { + pname = "qutip"; + version = "4.6.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "04g7ixq1yrrid4lliqbcamnzyw5r0fjbl8ipklps234hvsjfwmxb"; + }; + + # QuTiP says it needs specific (old) Numpy versions. We overwrite them here + # as the tests work perfectly fine with up-to-date packages. + postPatch = '' + substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" + ''; + + # Disabling OpenMP support on Darwin. + setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; + + propagatedBuildInputs = [ + packaging + numpy + cython + scipy + matplotlib + ]; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + ]; + + # - QuTiP tries to access the home directory to create an rc file for us. + # This of course fails and therefore, we provide a writable temp dir as HOME. + # - We need to go to another directory to run the tests from there. + # This is due to the Cython-compiled modules not being in the correct location + # of the source tree. + # - For running tests, see: + # https://qutip.org/docs/latest/installation.html#verifying-the-installation + checkPhase = '' + export OMP_NUM_THREADS=$NIX_BUILD_CORES + export HOME=$(mktemp -d) + mkdir -p test && cd test + ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" + ''; + + meta = with lib; { + description = "Open-source software for simulating the dynamics of closed and open quantum systems"; + homepage = "https://qutip.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.fabiangd ]; + }; +} diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index eb9f7f08454cd..c07d31f77df3c 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.8.0"; + version = "1.8.2"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-rInlaLWpPKmjihEp0iacg2nASxURGKxmJHH5jr+crM4="; + sha256 = "sha256-lIpi7GGKJSNgmX64K3xXvrzcu469Kxe3rW71Lp3LKms="; }; propagatedBuildInputs = [ diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 3d1d22f293d5f..7e62f006102f1 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,16 +3,16 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.48"; + version = "2.1.49"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "sha256-1ZvC8CPnYMzCxxrko1FfmTvKiJT+7BhOdk52zLTnLGE="; + sha256 = "sha256-uG39g9CXnquArFsxtFHWWoDaNwu8y2KKh+SqGt8aqi0="; }; darwin = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "sha256-HXYTpOxFxjQoqjs+04diy5d+GmS69dFNEfLI/E4NCXw="; + sha256 = "sha256-sEVWZQpICL7RYrOuPm1Y5XhzPxCwNk1WGP1rctTtE4Y="; }; }; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 18fe2a2c1ead1..4fdeed239cab6 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7086"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7094"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "85d8d1d7cab5615e6911b7b570c8dd0b94a521ab"; - sha256 = "11j54c7qrb7vcay8bjpv2jykdnwsjhf5cmqds43wvbicigbbds54"; + rev = "c6015daf8ddbd8a08e0adff8d39ffc38c7b339a2"; + sha256 = "088il16rxkk74fdpqrbw1fq5f2c23921zi7v544iw8c62hqxxzv1"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bf79e1dc25def..bcee983811dee 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -535,7 +535,7 @@ self: super: { postPatch = '' # check that version is up to date grep 'pname = "statix-vim"' -A 1 flake.nix \ - | grep -F 'version = "${version}"' flake.nix + | grep -F 'version = "${version}"' cd vim-plugin substituteInPlace ftplugin/nix.vim --replace statix ${statix}/bin/statix diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 7f2a97d868eda..2d153d31800e3 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -60,7 +60,7 @@ , kernelTests ? [] , nixosTests , ... -}: +}@args: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -70,6 +70,18 @@ assert stdenv.isLinux; let + # Dirty hack to make sure that `version` & `src` have + # `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position + # when using `builtins.unsafeGetAttrPos`. + # + # This is to make sure that ofborg actually detects changes in the kernel derivation + # and pings all maintainers. + # + # For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957 + basicArgs = builtins.removeAttrs + args + (lib.filter (x: ! (builtins.elem x [ "version" "src" ])) (lib.attrNames args)); + # Combine the `features' attribute sets of all the kernel patches. kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({ iwlwifi = true; @@ -180,13 +192,14 @@ let }; }; # end of configfile derivation - kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) { - inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) (basicArgs // { + inherit modDirVersion kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; - }; + }); - passthru = { + passthru = basicArgs // { features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d9a959c50bc9e..d741a1978d5cf 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Position of the Linux build expression + pos ? null, # Additional kernel make flags extraMakeFlags ? [], # The version of the kernel module directory @@ -333,4 +335,4 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; -}) +} // (optionalAttrs (pos != null) { inherit pos; })) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8da9639a5cfe9..c8fe9ce56e56c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -21,6 +21,19 @@ let defaultOverrides = [ + # aiounify 29 breaks integration tests + (self: super: { + aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec { + version = "28"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = "aiounifi"; + rev = "v${version}"; + sha256 = "1r86pk80sa1la2s7c6v9svh5cpkci6jcw1xziz0h09jdvv5j5iff"; + }; + }); + }) + # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") @@ -52,6 +65,19 @@ let }); }) + # Pinned due to API changes in influxdb-client>1.21.0 + (self: super: { + influxdb-client = super.influxdb-client.overridePythonAttrs (oldAttrs: rec { + version = "1.21.0"; + src = fetchFromGitHub { + owner = "influxdata"; + repo = "influxdb-client-python"; + rev = "v${version}"; + sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; + }; + }); + }) + # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/tools/misc/bitwise/default.nix index a7ae6243f4538..fc6f58ca2f4ef 100644 --- a/pkgs/tools/misc/bitwise/default.nix +++ b/pkgs/tools/misc/bitwise/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bitwise"; - version = "0.42"; + version = "0.43"; src = fetchFromGitHub { owner = "mellowcandle"; repo = "bitwise"; rev = "v${version}"; - sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g"; + sha256 = "18sz7bfpq83s2zhw7c35snz6k3b6rzad2mmfq2qwmyqwypbp1g7l"; }; buildInputs = [ ncurses readline ]; diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 51e29a31ddc50..db55a3dfd04c4 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,22 +2,29 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-DZC6uJR6TIHdmu8kZcbM+RC7pdejqLCOep0v3PM8/QY="; + sha256 = "sha256-zWxw4LZIlkT88yGTnxdupq7cUSacNRxPzzp01O9USDw="; }; - vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; + vendorSha256 = "sha256-zteMlrvRTVxOFlBy+z/qfiSii8+c8PMapwIsdbN+Aig="; postInstall = '' mv $out/bin/cni-plugin $out/bin/flannel ''; doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/flannel 2>&1 | fgrep -q v$version + runHook postInstallCheck + ''; meta = with lib; { description = "flannel CNI plugin"; diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index fdecf36717aab..c78ace218c088 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8xWtwa9ZtkcpWvLG2QS3jPlz2c+E5MjYWhZ/g5bjhkc="; + sha256 = "sha256-vJvHmg6X/B6wQYjeX1FZC4MDGo0HkKbTmQH+l4tZAwg="; }; - cargoSha256 = "sha256-f8f5wJyK+q6zTfNiCRN89ptlSWfSnrzLyefTIpw5mts="; + cargoSha256 = "sha256-OfLpnVe1QIjpjpD4ticG/7AxPGFMMjBWN3DdLZq6pA8="; cargoBuildFlags = lib.optionals withJson [ "--features" "json" ]; diff --git a/pkgs/tools/text/ucg/default.nix b/pkgs/tools/text/ucg/default.nix index d81b5a14f0914..d19379477d6ca 100644 --- a/pkgs/tools/text/ucg/default.nix +++ b/pkgs/tools/text/ucg/default.nix @@ -3,14 +3,11 @@ , pkg-config , autoreconfHook , pcre -, nixosTests }: -let +stdenv.mkDerivation rec { pname = "ucg"; - version = "20190225"; -in stdenv.mkDerivation { - inherit pname version; + version = "0.3.3+date=2019-02-25"; src = fetchFromGitHub { owner = "gvansickle"; @@ -19,8 +16,29 @@ in stdenv.mkDerivation { sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pcre ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + pcre + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + testFile=$(mktemp /tmp/ucg-test.XXXX) + echo -ne 'Lorem ipsum dolor sit amet\n2.7182818284590' > $testFile + $out/bin/ucg 'dolor' $testFile || { rm $testFile; exit -1; } + $out/bin/ucg --ignore-case 'lorem' $testFile || { rm $testFile; exit -1; } + $out/bin/ucg --word-regexp '2718' $testFile && { rm $testFile; exit -1; } + $out/bin/ucg 'pisum' $testFile && { rm $testFile; exit -1; } + rm $testFile + + runHook postInstallCheck + ''; meta = with lib; { homepage = "https://github.com/gvansickle/ucg/"; @@ -34,7 +52,7 @@ in stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + broken = stdenv.isAarch64; # cpuid.h: no such file or directory }; - - passthru.tests = { inherit (nixosTests) ucg; }; } +# TODO: report upstream diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e892f702dbb52..34b42dc02b983 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3412,7 +3412,9 @@ with pkgs; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { + electron = electron_12; + }; poweralertd = callPackage ../tools/misc/poweralertd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d476b718e25d5..aa808ecf736f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2110,6 +2110,8 @@ in { django-csp = callPackage ../development/python-modules/django-csp { }; + django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; @@ -7896,6 +7898,8 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; + qutip = callPackage ../development/python-modules/qutip { }; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; |