diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index d582e0c162de..29e9498018ec 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -135,7 +135,7 @@ in }; version = lib.mkOption { - type = types.nullOr (types.strMatching "^[a-z0-9._-]+$"); + type = types.nullOr (types.strMatching "^[a-z0-9._-~^]+$"); default = null; description = '' Image version. diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 943c5ab0b974..af7abcef17db 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-5qdnvGFgFEk+00tjnVhqW29AyyjCfiFQOyYyVmAjHnM="; + hash = "sha256-hGphQ8epqym47C9doiSOQd3yc28XwV2UsNc7ivhaae4="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index b4e737fa7805..5e13ece9a51e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "exodus"; - version = "24.19.3"; + version = "24.19.4"; src = fetchurl { name = "exodus-linux-x64-${finalAttrs.version}.zip"; url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - hash = "sha256-zqi1En22H3b2pD95C747gF9TtyMCX4TzXC10mP7iUoM="; + hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 1aaa53948619..d04820afad96 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -19,8 +19,6 @@ python3Packages.buildPythonApplication rec { colorama imagesize lxml requests setuptools six ]; - disabled = python3Packages.pythonOlder "3.3"; - meta = { description = "A comic strip downloader and archiver"; mainProgram = "dosage"; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index e8d216d391d0..5882057988a4 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.4"; + version = "3.29.6.5"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-/Tz3brcny9wp8DnCvO7GpPczglJpJD0kWzBR6exRlPA="; + hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 47d1cfe83bbf..0c078e98d18a 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "18.0.4"; + version = "19.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-FqaXLoFgkKHzOvy7f9R36uIDnv2c6HrVF6T3VK5Aw3c="; + sha256 = "sha256-yRJsyJ4dhPAbqVmUmVnFlGGQ5CUJZ0VG19TMnSW0tJ4="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index e902bc3597eb..f09ce52939b7 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-iQ+9CN6De2jz3+dZ26jgqbXAx9Fef8ROgVX8kKYMAG0="; + hash = "sha256-+eysHATyAdCN6HVPN2bgc/ICo+XXaef0H0UDW2xCcjc="; }; vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 30e76bce99ac..58051120cc34 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.10.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-7Gmb28/k72wfd2bWDCk7onUBAzNs6b5q52lCn0WB3B8="; + hash = "sha256-TBLxwHiL3knM+GQoTYD2L/deASPpbUsDlGk4VeVmki4="; }; - vendorHash = "sha256-uYClwaFSj03K4YD/jvn67sIko72jDqd5Fv2zoCXZZbw="; + vendorHash = "sha256-kmnV1W0HGlxFZYYUeUd9D/zOabUhM5kDoTZTnRYJ2sM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index da70f6e6ede4..6beba3f4c6b9 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - hash = "sha256-Y1Z+j5+Ffqho5Q2O8uQgNxsxPE7gqHaxe1SZEJDA0oY="; + hash = "sha256-ZOOlK9mfZVrfxvgFREgqcRcSs18EMpADD8Y4Ev391Bw="; }; strictDeps = true; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 48384eca2998..38c4fdb78cd8 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.114.0"; + version = "2.114.1"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-1eLxk+nlgHoe0Gmo/DXlTOnWssrN9cAubvqpV6SqQS8="; + hash = "sha256-bvX5onyTPc4G+9PcrSXhsfkNbU6DZ5T3ljf+r77bjKw="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index adb64f02c14f..d0d95818ff93 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]); buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); - dontAddPrefix = true; - configureFlags = [ "--prefix" "$(out)" ]; + prefixKey = "--prefix "; meta = with lib; { description = "A program for proof-tree visualization"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 6b65ab58dc63..aa3675ac2001 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.11"; + version = "2.1.12"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-QQgpvvk7S6ARzBct/4AQP66End30EXcUPqv8a4Udoas="; + hash = "sha256-iSC1Q7fdf+4YH4vLFPOscRWxNv/xygYx872u8msmMmc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index e733fe42127a..35c1f805c8ba 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-+CyihuSo/ssX8tX2rYi3c41eAwdG58aagAsYiBBjQ48="; + hash = "sha256-qGuYH2xYmd3CYoYobjoum+zUImcsiaG5No36FG0H0bA="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index f19d015e9e30..ac5d726439ce 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonApplication, fetchPypi, pythonOlder +{ lib, buildPythonApplication, fetchPypi , installShellFiles , mock, pytest, nose , pyyaml, colorama, docopt , dockerpty, docker, jsonschema, requests , six, texttable, websocket-client, cached-property -, enum34, functools32, paramiko, distro, python-dotenv +, paramiko, distro, python-dotenv }: buildPythonApplication rec { @@ -24,9 +24,7 @@ buildPythonApplication rec { pyyaml colorama dockerpty docker jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv - ] - ++ lib.optional (pythonOlder "3.4") enum34 - ++ lib.optional (pythonOlder "3.2") functools32; + ]; postPatch = '' # Remove upper bound on requires, see also diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 1f2bb7f10a77..800d0ce51231 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; - hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU="; + hash = "sha256-yNIHCEiLvoNNsYisAKo/jj6Q2mLrLMttZyj2XzrWFU4="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/by-name/ha/haredo/001-use-nix-store-sh.patch b/pkgs/by-name/ha/haredo/001-use-nix-store-sh.patch new file mode 100644 index 000000000000..4bd6507d7ea4 --- /dev/null +++ b/pkgs/by-name/ha/haredo/001-use-nix-store-sh.patch @@ -0,0 +1,20 @@ +diff --git a/src/haredo.ha b/src/haredo.ha +index c2e56e6..304c9ad 100644 +--- a/src/haredo.ha ++++ b/src/haredo.ha +@@ -280,12 +280,12 @@ fn try_do( + const tmpfilepath = strings::concat(ctx.tmpdir, "/", tmpfilename); + + const cmd = if (ctx.verbose) { +- fmt::errorln("* sh -ev", dopaths.do, dopaths.target, ++ fmt::errorln("* @bash@/bin/sh -ev", dopaths.do, dopaths.target, + dopaths.basename, tmpfilepath)?; +- yield exec::cmd("sh", "-ev", dopaths.do, dopaths.target, ++ yield exec::cmd("@bash@/bin/sh", "-ev", dopaths.do, dopaths.target, + dopaths.basename, tmpfilepath)?; + } else { +- yield exec::cmd("sh", "-e", dopaths.do, dopaths.target, ++ yield exec::cmd("@bash@/bin/sh", "-e", dopaths.do, dopaths.target, + dopaths.basename, tmpfilepath)?; + }; + diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix index e31ae96c7832..a6db89149eb8 100644 --- a/pkgs/by-name/ha/haredo/package.nix +++ b/pkgs/by-name/ha/haredo/package.nix @@ -1,17 +1,22 @@ -{ stdenv -, lib -, fetchFromSourcehut -, hare -, scdoc -, nix-update-script -, makeWrapper -, bash +{ + stdenv, + lib, + fetchFromSourcehut, + hare, + scdoc, + nix-update-script, + makeWrapper, + bash, + substituteAll, }: stdenv.mkDerivation (finalAttrs: { pname = "haredo"; version = "1.0.5"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromSourcehut { owner = "~autumnull"; @@ -20,6 +25,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gpui5FVRw3NKyx0AB/4kqdolrl5vkDudPOgjHc/IE4U="; }; + patches = [ + # Use nix store's bash instead of sh. `@bash@/bin/sh` is used, since haredo expects a posix shell. + (substituteAll { + src = ./001-use-nix-store-sh.patch; + inherit bash; + }) + ]; + nativeBuildInputs = [ hare makeWrapper @@ -62,11 +75,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/haredo \ - --prefix PATH : "${lib.makeBinPath [bash]}" - ''; - setupHook = ./setup-hook.sh; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 7de21ab0233c..a49dd7df9ccc 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.3.0"; + version = "0.3.1"; subPackages = [ "." ]; @@ -16,12 +16,12 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-QyVcy9rqj1n1Nn/+gBufd57LyEaXPyu0KQhAUTgNmBA="; + hash = "sha256-zU8c/ZAKTKd4dbG056gOCiPzvPNS5/KEkJ2fw48oV00="; }; buildInputs = [ olm ]; - vendorHash = "sha256-oQSjP1WY0LuxrMtIrvyKhize91wXJxTzWeH0Y3MsEL4="; + vendorHash = "sha256-uwprj4G7HI87ZGr+6Bqkp77nzW6kgV3S5j4NGjbtOwQ="; passthru = { tests = { diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index b7b66d8544ff..eaf637c88e64 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -86,7 +86,11 @@ in { dontFixCmake = true; - inherit lua treesitter-parsers; + inherit lua; + treesitter-parsers = treesitter-parsers // + { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } // + { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } + ; buildInputs = [ gperf @@ -169,11 +173,13 @@ in { '' + '' mkdir -p $out/lib/nvim/parser '' + lib.concatStrings (lib.mapAttrsToList - (language: src: '' + (language: grammar: '' ln -s \ ${tree-sitter.buildGrammar { - inherit language src; + inherit (grammar) src; version = "neovim-${finalAttrs.version}"; + language = grammar.language or language; + location = grammar.location or null; }}/parser \ $out/lib/nvim/parser/${language}.so '') diff --git a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix index d36f8bda8542..e4d4dd60e2eb 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix @@ -1,24 +1,36 @@ { fetchurl }: { - c = fetchurl { - url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz"; - hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2"; + c.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0.tar.gz"; + hash = "sha256:6f0f5d1b71cf8ffd8a37fb638c6022fa1245bd630150b538547d52128ce0ea7e"; }; - lua = fetchurl { - url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz"; - hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d"; + lua.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0.tar.gz"; + hash = "sha256:230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722"; }; - vim = fetchurl { - url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz"; - hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2"; + vim.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.gz"; + hash = "sha256:9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5"; }; - vimdoc = fetchurl { - url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz"; - hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274"; + vimdoc.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz"; + hash = "sha256:063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3"; }; - query = fetchurl { - url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz"; - hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c"; + query.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz"; + hash = "sha256:f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0"; + }; + python.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz"; + hash = "sha256:720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13"; + }; + bash.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz"; + hash = "sha256:f0515efda839cfede851adb24ac154227fbc0dfb60c6c11595ecfa9087d43ceb"; + }; + markdown.src = fetchurl { + url = "https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3.tar.gz"; + hash = "sha256:4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5"; }; } diff --git a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py index 27260ca64917..117c7eb48123 100755 --- a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py +++ b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py @@ -7,7 +7,7 @@ from pathlib import Path parsers = {} dir = Path(__file__).parent -regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$") +regex = re.compile(r"^TREESITTER_([A-Z_]+)_(URL|SHA256)\s+(.+)$") src = subprocess.check_output( [ @@ -20,8 +20,8 @@ src = subprocess.check_output( text=True, ).strip() -for line in open(f"{src}/cmake.deps/CMakeLists.txt"): - m = regex.fullmatch(line) +for line in open(f"{src}/cmake.deps/deps.txt"): + m = regex.fullmatch(line.strip()) if m is None: continue @@ -37,7 +37,7 @@ with open(dir / "treesitter-parsers.nix", "w") as f: f.write("{ fetchurl }:\n\n{\n") for lang, src in parsers.items(): f.write( - f""" {lang} = fetchurl {{ + f""" {lang}.src = fetchurl {{ url = "{src["URL"]}"; hash = "sha256:{src["SHA256"]}"; }}; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 4cfcef61f359..8044e41d8e44 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -10,15 +10,15 @@ , darwin }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.8"; + version = "1.0.0-rc.9"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-F2n7ui0EgXK8fT76M14RVhXXGeRYub+VpH+puDUJ1pQ="; + hash = "sha256-GFltwKc6madTJWPTeAeslmFffHtixR0Dxd+3hAnHvz0="; }; - cargoHash = "sha256-+QthR5M3qAxC42TPnR5iylfpuWnsSmg68SuCbhmkCvw="; + cargoHash = "sha256-UM9eDWyeewWPq3+z0JWqdAsCxx6EqytuYMwLXDHOC64="; nativeBuildInputs = [ asciidoctor installShellFiles ]; nativeCheckInputs = [ git ]; @@ -26,15 +26,16 @@ darwin.apple_sdk.frameworks.Security ]; - doCheck = with stdenv.hostPlatform; isx86_64 && isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release + # Tests want to open many files. + ulimit -n 4096 ''; checkFlags = [ "--skip=service::message::tests::test_node_announcement_validate" "--skip=tests::test_announcement_relay" - "--skip=tests::e2e" ]; postInstall = '' diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix new file mode 100644 index 000000000000..ff325cee7054 --- /dev/null +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "workshop-runner"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "mainmatter"; + repo = "rust-workshop-runner"; + rev = "v${version}"; + hash = "sha256-2lt4RloIRnFvWZ+HeZx7M2cg/wHb1/j0qDmhUhOoF+M="; + }; + + cargoHash = "sha256-VoIAwPrkhrRl48czXtKWmLTktsZ/U4TVV924wx0DL+A="; + + meta = { + description = "A CLI tool to drive test-driven Rust workshops"; + homepage = "https://github.com/mainmatter/rust-workshop-runner"; + license = with lib.licenses; [ + mit + asl20 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ RaghavSood ]; + mainProgram = "wr"; + }; +} diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index 591331464e3a..b42651aa1404 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -3,15 +3,12 @@ , fetchPypi , pyserial , pyudev -, pythonOlder }: buildPythonApplication rec { pname = "rshell"; version = "0.0.32"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix index 0c7ef3796125..e35e2d1244c6 100644 --- a/pkgs/development/libraries/ctre/default.nix +++ b/pkgs/development/libraries/ctre/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-EzAPIqdfktrZ+FTEzz52nRNnH7CG59ZE9Ww7qMkAAbY="; + hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 38de27740300..e24f519d1cc3 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchurl , testers -, ngspice + , cmake }: @@ -17,7 +17,6 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ ngspice ]; # https://github.com/libgeos/geos/issues/930 cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index 9deceded4068..a694c7a54c3c 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -2,14 +2,15 @@ buildDunePackage rec { pname = "menhirLib"; - version = "20230608"; + version = "20231231"; + minimalOCamlVersion = "4.03"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; rev = version; - sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY="; + hash = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index eb412275a882..99271645f19a 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -1,10 +1,8 @@ { buildPythonPackage , lib -, pythonOlder , fetchPypi , setuptools , six -, enum34 }: buildPythonPackage rec { @@ -23,8 +21,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; # checks use bazel; should be revisited diff --git a/pkgs/development/python-modules/ago/default.nix b/pkgs/development/python-modules/ago/default.nix index ad095c441db2..59aaf184a6fc 100644 --- a/pkgs/development/python-modules/ago/default.nix +++ b/pkgs/development/python-modules/ago/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchPypi - -, pythonOlder - , pytestCheckHook - , setuptools }: @@ -14,8 +10,6 @@ buildPythonPackage rec { version = "0.0.95"; pyproject = true; - disabled = pythonOlder "3.3"; - src = fetchPypi { inherit pname version; hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q="; diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index da1d4a3dca4c..2e08bef31d70 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, pythonOlder , attrs , pluggy , six @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "2.13.5"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE="; diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index 647a36f78b33..e958e853b046 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pycrypto -, pythonOlder -, enum34 , python }: @@ -21,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto - ] ++ lib.optional (pythonOlder "3.4") enum34; + ]; checkPhase = '' ${python.interpreter} -m android_backup.tests diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix index d781a552cca1..3e001d5a1874 100644 --- a/pkgs/development/python-modules/anyascii/default.nix +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , pytestCheckHook }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "anyascii"; version = "0.3.2"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 6c4d629e0843..7768dd5a8d7c 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, numpy, scipy, @@ -16,10 +15,6 @@ buildPythonPackage rec { version = "0.6.1"; pyproject = true; - # Python 2 not supported and not some old Python 3 because MPL doesn't support - # them properly. - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "bayespy"; repo = "bayespy"; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 23a19f89f279..3a0c5fbd3dd1 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , docopt , pytz @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "mjj4791"; repo = "python-buienradar"; diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix index 8778dfc6aa93..c48d7603a045 100644 --- a/pkgs/development/python-modules/domeneshop/default.nix +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -1,12 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , setuptools , urllib3 -, pyopenssl -, cryptography -, idna , certifi }: @@ -15,8 +11,6 @@ buildPythonPackage rec { version = "0.4.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg="; diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index 49c5dbb51db4..fc051d105bf6 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , pytestCheckHook }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "dronecan"; version = "1.0.26"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 7cfc29c9ff81..e66763b23d5e 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pythonAtLeast , pytestCheckHook }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "dugong"; version = "3.8.1"; format = "setuptools"; - disabled = pythonOlder "3.3"; src = fetchFromGitHub { owner = "python-dugong"; diff --git a/pkgs/development/python-modules/dynalite-panel/default.nix b/pkgs/development/python-modules/dynalite-panel/default.nix index 33be58906c75..960f5544d30e 100644 --- a/pkgs/development/python-modules/dynalite-panel/default.nix +++ b/pkgs/development/python-modules/dynalite-panel/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , setuptools }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "0.0.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE="; diff --git a/pkgs/development/python-modules/functools32/default.nix b/pkgs/development/python-modules/functools32/default.nix deleted file mode 100644 index be907e963c10..000000000000 --- a/pkgs/development/python-modules/functools32/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -if isPy3k then null else buildPythonPackage rec { - pname = "functools32"; - version = "3.2.3-2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn"; - }; - - meta = with lib; { - description = "This is a backport of the functools standard library module from"; - homepage = "https://github.com/MiCHiLU/python-functools32"; - license = licenses.psfl; - }; - -} diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 307e8dfb63b8..1ec16d8216aa 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -2,7 +2,6 @@ , cryptography , fetchPypi , lib -, pythonOlder , protobuf , pycryptodome , requests @@ -12,7 +11,6 @@ buildPythonPackage rec { version = "0.4.4"; format = "setuptools"; pname = "gpapi"; - disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index 2dc90870b614..d8d6bb67e47f 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonOlder, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, glibcLocales, pytest }: buildPythonPackage rec { pname = "hcs-utils"; @@ -21,8 +21,6 @@ buildPythonPackage rec { buildInputs = [ six glibcLocales ]; nativeCheckInputs = [ pytest ]; - disabled = pythonOlder "3.4"; - meta = with lib; { description = "Library collecting some useful snippets"; homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 6d1374075886..59530ab5a704 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }: +{ lib, fetchPypi, buildPythonPackage, docopt }: buildPythonPackage rec { pname = "httpserver"; @@ -11,9 +11,6 @@ buildPythonPackage rec { # drivers. doCheck = false; - # Because it uses asyncio - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv"; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index d8a3fa92e483..2c60b0b294b8 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -1,8 +1,6 @@ { lib -, pythonOlder , buildPythonPackage , fetchPypi -, monotonic }: buildPythonPackage rec { @@ -15,8 +13,6 @@ buildPythonPackage rec { sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; - propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; - # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( diff --git a/pkgs/development/python-modules/hurry-filesize/default.nix b/pkgs/development/python-modules/hurry-filesize/default.nix index 62bd1f810f9d..7dd168bf9704 100644 --- a/pkgs/development/python-modules/hurry-filesize/default.nix +++ b/pkgs/development/python-modules/hurry-filesize/default.nix @@ -1,9 +1,6 @@ { lib , buildPythonPackage , fetchPypi - -, pythonOlder - , setuptools }: @@ -12,8 +9,6 @@ buildPythonPackage rec { version = "0.9"; pyproject = true; - disabled = pythonOlder "3.3"; - src = fetchPypi { pname = "hurry.filesize"; inherit version; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index e96a5b37db43..6b976adc6b1e 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; + hash = "sha256-SSMUHC4IsMIIhmRrG0ZWNO2MNKKvoBSybmEEibAY5q0="; }; pythonRelaxDeps = [ "dataclasses-json" ]; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index b95c2b295257..989967719d09 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, python, fetchFromGitHub , fetchpatch -, cmake, sip4, protobuf, pythonOlder }: +, cmake, sip4, protobuf }: buildPythonPackage rec { pname = "libarcus"; @@ -23,8 +23,6 @@ buildPythonPackage rec { }) ]; - disabled = pythonOlder "3.4"; - propagatedBuildInputs = [ sip4 ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/matlink-gpapi/default.nix b/pkgs/development/python-modules/matlink-gpapi/default.nix index 3c3cda1bf8db..c88638e4391f 100644 --- a/pkgs/development/python-modules/matlink-gpapi/default.nix +++ b/pkgs/development/python-modules/matlink-gpapi/default.nix @@ -2,7 +2,6 @@ , cryptography , fetchPypi , lib -, pythonOlder , protobuf , pycryptodome , requests @@ -12,7 +11,6 @@ buildPythonPackage rec { version = "0.4.4.5"; format = "setuptools"; pname = "matlink-gpapi"; - disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/memestra/default.nix b/pkgs/development/python-modules/memestra/default.nix index db7d4e254a73..0bbf08a84698 100644 --- a/pkgs/development/python-modules/memestra/default.nix +++ b/pkgs/development/python-modules/memestra/default.nix @@ -6,7 +6,6 @@ , gast , nbconvert , nbformat -, pythonOlder , pyyaml }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.2.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-6shwf9BoDfZMy0itP8esNP4ov6fw6LJpO3Y5ZahwDZw="; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 704054c46c04..413c5f832d29 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "mock-open"; @@ -13,15 +13,6 @@ buildPythonPackage rec { sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; - patches = lib.optional (pythonOlder "3.0") - (fetchpatch { - name = "ascii-only.patch"; - url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; - sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; - }); - - propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; - meta = with lib; { homepage = "https://github.com/nivbend/mock-open"; description = "A better mock for file I/O"; diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 7c010a224340..04ae611925db 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -5,8 +5,6 @@ , numpy , pytestCheckHook , pykka -, enum34 -, pythonOlder , pythonAtLeast }: @@ -32,8 +30,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 4effafe3311a..121b162b2fe1 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , azure-core , azure-identity , opencensus @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.1.13"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-rsMEchdwBTebpWpwKgl9YYxfV1WOG7ZnbsdflIEwaSo="; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 0fa4ba74deab..7aa65b2d1d22 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , setuptools , attrs , pytest @@ -11,8 +10,6 @@ buildPythonPackage rec { pname = "outcome"; version = "1.3.0.post0"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-nc8C5l8pcbgAR7N3Ro5yomjhXArzzxI45v8U9/kRQ7g="; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 15238a858990..ab1948005fe8 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,6 @@ , pythonOlder , scandir ? null , glibcLocales -, mock , typing }: @@ -21,8 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; - nativeCheckInputs = [ glibcLocales ] - ++ lib.optional (pythonOlder "3.3") mock; + nativeCheckInputs = [ glibcLocales ]; preCheck = '' export LC_ALL="en_US.UTF-8" diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index d6be608aaa2b..52ddc9367251 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , path -, pathlib2 -, pythonOlder }: buildPythonPackage rec { @@ -16,8 +14,7 @@ buildPythonPackage rec { sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"; }; - propagatedBuildInputs = [ path ] - ++ lib.optional (pythonOlder "3.4") pathlib2; + propagatedBuildInputs = [ path ]; # No proper test suite doCheck = false; diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix index f8df017c9b18..b07843c8eaa6 100644 --- a/pkgs/development/python-modules/pure-cdb/default.nix +++ b/pkgs/development/python-modules/pure-cdb/default.nix @@ -1,10 +1,9 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }: +{ lib, fetchFromGitHub, buildPythonPackage, flake8 }: buildPythonPackage rec { pname = "pure-cdb"; version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.4"; # Archive on pypi has no tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 9ae0d1a1d3db..bf860e83e6b6 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , morphys , pytestCheckHook -, pythonOlder , six , varint }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "2.0.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "multiformats"; repo = pname; diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 832658039531..02d00afd628f 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , krakenex , pandas @@ -10,8 +9,6 @@ buildPythonPackage rec { pname = "pykrakenapi"; version = "0.3.2"; - disabled = pythonOlder "3.3"; - format = "setuptools"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 755c03501e56..6a4736c3fb21 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , bson , pytestCheckHook , pyyaml @@ -12,7 +11,6 @@ buildPythonPackage rec { pname = "pymarshal"; version = "2.2.0"; format = "setuptools"; - disabled = pythonOlder "3.0"; src = fetchFromGitHub { owner = "stargateaudio"; diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 7e609cbe1ccd..b900618e4dd2 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , click , colorama -, enum34 , fetchPypi , git , gnugrep @@ -12,7 +11,6 @@ , pbr , pexpect , pythonAtLeast -, pythonOlder , substituteAll , tree , xclip @@ -53,7 +51,7 @@ buildPythonPackage rec { click colorama pexpect - ] ++ lib.optional (pythonOlder "3.4") enum34; + ]; nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index a515c5acfcd1..ea51736d6dd9 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -3,8 +3,6 @@ , buildPythonPackage , fetchPypi , unittestCheckHook -, pythonOlder -, isPy3k }: buildPythonPackage rec { @@ -12,9 +10,6 @@ buildPythonPackage rec { version = "3.5"; format = "setuptools"; - # Supports Python 2.7 and 3.4+ - disabled = isPy3k && pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-PHfgFBcN//vYFub/wgXphC77EL6fWOwW0+hnW0klzds="; diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index 1b573628edda..1bfd129cf21e 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -1,12 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, sqlcipher }: +{ lib, buildPythonPackage, fetchPypi, sqlcipher }: buildPythonPackage rec { pname = "pysqlcipher3"; version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.3"; - src = fetchPypi { inherit pname version; hash = "sha256-PIAzgSZVlH6/KagJrFEGsrxpvgJ06szva1j0WAyNBsU="; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 44251a333ed9..57db690b04cb 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , lib -, python , fetchPypi , systemd , lxml @@ -19,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; - disabled = python.pythonOlder "3.4"; - buildInputs = [ systemd ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 13ed448938d9..0130c690ef4c 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -22,7 +22,7 @@ }: let pname = "python-glanceclient"; - version = "4.5.0"; + version = "4.6.0"; disabledTests = [ "test_http_chunked_response" @@ -42,7 +42,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-ZGTE1be+S/4Tbhw6Px+9qMgkNTZgoDn6lnAJhNvVYuA="; + hash = "sha256-gJm4TzxtIjvkpOlbN82MPbY0JmDdiwlEMGGxZvTR+Po="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 2cb13c747742..4a659c1e26a5 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub , pytestCheckHook, mock, pytest-cov, coverage -, future, futures ? null, ujson}: +, future, ujson}: buildPythonPackage rec { pname = "python-jsonrpc-server"; @@ -22,8 +22,7 @@ buildPythonPackage rec { pytestCheckHook mock pytest-cov coverage ]; - propagatedBuildInputs = [ future ujson ] - ++ lib.optional (pythonOlder "3.2") futures; + propagatedBuildInputs = [ future ujson ]; meta = with lib; { homepage = "https://github.com/palantir/python-jsonrpc-server"; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index b2fbfef19f8c..61fbc746f7cc 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TwvDtbYGkDZFIsr0GgwD2R0Il7pV2GCuDw3OZXxDXso="; + hash = "sha256-Q7ADjuGQh5C88WqT5II+NMYLYFwTip/bzZinca/xqFY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index e4648919d9f7..77d2c30fa32b 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , twisted , qtpy @@ -18,8 +17,6 @@ buildPythonPackage rec { sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h"; }; - disabled = pythonOlder "3.0"; - propagatedBuildInputs = [ twisted qtpy ]; diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 87dc4e91e6e9..7e9e7971e137 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , mock -, pythonOlder , repeated-test , setuptools-scm , sphinx @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix index 7a348b1f602d..f6b808cf31c8 100644 --- a/pkgs/development/python-modules/simple-term-menu/default.nix +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , setuptools }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "1.6.4"; pyproject = true; - disabled = pythonOlder "3.4"; - src = fetchPypi { inherit pname version; hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 8fb0d7276141..9bd76b15d2bd 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -3,7 +3,6 @@ , fetchPypi , hypothesis , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "3.5.3"; format = "setuptools"; - disabled = pythonOlder "2.7"; - src = fetchPypi { inherit pname version; sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; diff --git a/pkgs/development/python-modules/stashy/default.nix b/pkgs/development/python-modules/stashy/default.nix index fbac0df71f1d..24a157360636 100644 --- a/pkgs/development/python-modules/stashy/default.nix +++ b/pkgs/development/python-modules/stashy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , decorator , fetchPypi -, pythonOlder , requests }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "stashy"; version = "0.7"; format = "setuptools"; - disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix index 99e63ebd3dfb..71d5327ef5cf 100644 --- a/pkgs/development/python-modules/stickytape/default.nix +++ b/pkgs/development/python-modules/stickytape/default.nix @@ -1,10 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose -, pytestCheckHook -, pythonOlder -, spur }: buildPythonPackage rec { @@ -12,8 +8,6 @@ buildPythonPackage rec { version = "0.2.1"; format = "setuptools"; - disabled = pythonOlder "3.4"; - src = fetchFromGitHub { owner = "mwilliamson"; repo = pname; diff --git a/pkgs/development/python-modules/theano/default.nix b/pkgs/development/python-modules/theano/default.nix index 78a2a0836e76..ef8b80953390 100644 --- a/pkgs/development/python-modules/theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -53,7 +53,7 @@ in buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + disabled = isPyPy || pythonOlder "2.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 2b0058357d88..cb4d128eb246 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder # build-system , flit-core @@ -26,8 +25,6 @@ buildPythonPackage rec { version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "2.7"; - src = fetchFromGitHub { owner = "wagtail"; repo = "Willow"; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index bd4e2cbb0f2d..3b06401c3924 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,14 +2,12 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { pname = "xmltodict"; version = "0.13.0"; format = "setuptools"; - disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/bodyclose/default.nix b/pkgs/development/tools/bodyclose/default.nix index 6f8686a7b7b1..9072fe4c1045 100644 --- a/pkgs/development/tools/bodyclose/default.nix +++ b/pkgs/development/tools/bodyclose/default.nix @@ -1,23 +1,26 @@ { lib , buildGoModule , fetchFromGitHub +, unstableGitUpdater }: -buildGoModule rec { +buildGoModule { pname = "bodyclose"; - version = "2023-04-21"; + version = "0-unstable-2024-01-26"; src = fetchFromGitHub { owner = "timakin"; repo = "bodyclose"; - rev = "574207250966ef48b7c65325648b17ff2c3a900a"; - hash = "sha256-qUt8uOk1vgj2rtzTevGh9c4McxbFKgEw83pq7IAlRdg="; + rev = "f835fa56326ac81b2d54408f1a3a6c43bca4d5aa"; + hash = "sha256-yPvBDJx6ECrSLDazdNDRl79iogsZO2qNWHuUuwQoRHU="; }; - vendorHash = "sha256-TSYaY7Rg0ZoXdIN1sTNmgjC4PcVcgwSTuE43FYbzlAs="; + vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8="; ldflags = [ "-s" "-w" ]; + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { description = "Golang linter to check whether HTTP response body is closed and a re-use of TCP connection is not blocked"; mainProgram = "bodyclose"; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index e62980768843..69004289f528 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -6,7 +6,6 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; version = "1.11.0"; - disabled = python3Packages.pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 3b86b15aa4ac..2f343011cd11 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.43.0"; + version = "2.43.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-R3J6TZO28x0I6vHjm5X7nMiJBhHuMIYdfp7IUNtu4Do="; + sha256 = "sha256-q4N8tAWlJ+P30KvOnt3AdO9Lee2Mg8mCBUXfT+i4m10="; }; preCheck = '' diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 7a791f75936e..eb216bbab11d 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-XUzXqzgAIZKWNpfyBvkYX/g1R8JcIJlVTUb2N4zL96w="; + hash = "sha256-SYmKxcU2CxvIFLWoNWBjhJBxIfhZqO2LTyv8WUbuyAY="; }; - cargoHash = "sha256-U2ocN9UENms0KZQuEu75jmxphyNGz5OYCLrh6vhvKiI="; + cargoHash = "sha256-ZbvZBdJ14fQxdVYvPQjCkT5o0Ip9AJyhATGLRAwFfp4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index b9b76e915b5a..1844d25c706a 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.2"; + version = "0.33.3"; src = fetchCrate { inherit pname version; - hash = "sha256-4qwRBJNbPkqEHrRY67wgxtmVLzaVkCSvvMc8gKPblew="; + hash = "sha256-Ed7dwVXjLOAtW9ZOh1g+yamnSzyoKo1lS4N2nyyqaJ8="; }; - cargoHash = "sha256-5NGW9uTemoHWvrhz06suVXzjZ48pk+jN6DUkdzIXT5k="; + cargoHash = "sha256-BppPMYsv0v7K6z9URYEWrz0SHPx+oe2jeP3EzydFcuI="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 6fd920e8b00c..b471f0ca5e85 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.35.3"; + version = "0.36.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-5G5gFxr7CIvZ1RfkLIEF/z4t+wTj09fJXTNr2v0vuyg="; + hash = "sha256-13zPRp5lzUkQEcNpME1M8VMON0mq7VMQ90WL24fzcaI="; }; - cargoHash = "sha256-5lAs2J5hkPhBN3tORt6N7834brS/dAkKsXvZ6C1K+OY="; + cargoHash = "sha256-7agdxuEVLZg1uTKyrtPnLdzMHlvdY41/w6QCDj7TC2E="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 187a5aebe2ba..c20cff446e00 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-j/NkWKqQ/x2YBik1e23fXoira8kXsBGn+fpdXhKs9Ro="; + hash = "sha256-ZXQm+exVz+xafwSEjtK03yrIv8szwlYmrSOSGdRE7pg="; }; extraBuildInputs = [qtdeclarative]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4e9cde7e4e8f..bcf3560c2077 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,35 +4,35 @@ "hash": "sha256:075l5vhk8zmwln4jks7gr5n5k67s65qvs07l2rpbc7a75fdp6c14" }, "6.1": { - "version": "6.1.90", - "hash": "sha256:07cfg0chssvpc4mqls3aln6s4lqjp6k4x2n63wndmkjgfqpdg8w3" + "version": "6.1.91", + "hash": "sha256:1v2d5syxwwqlhvjzxk003qz9sr18r0n8dgg976vbi492r9iww2l8" }, "5.15": { - "version": "5.15.158", - "hash": "sha256:1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr" + "version": "5.15.159", + "hash": "sha256:1ia1nfci2wkx4nhnldfczpcq47mp7y7g657ikkh8i72y498gwy1l" }, "5.10": { - "version": "5.10.216", - "hash": "sha256:0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473" + "version": "5.10.217", + "hash": "sha256:0qhzqrjci45vcbzjch7vq75i6hpyap6yb7jw6g71phcnqgzw2ay5" }, "5.4": { - "version": "5.4.275", - "hash": "sha256:0k1hyknx854k8z27j4rq1gcp8l0xc0bspmrhc41a033gjilb1lns" + "version": "5.4.276", + "hash": "sha256:01vfx19n8rv9fgjjzvi78125md71zgn5jrinbarabzr18jyjwwg2" }, "4.19": { - "version": "4.19.313", - "hash": "sha256:1j1r4mrdh1ray468jr5i8d2afiswb653bhq0ck8bcdw4rwp5w558" + "version": "4.19.314", + "hash": "sha256:0nvrpg5aj2q4h2drmczprqaprcc2zhcrijfri77b830ms8rg4y2a" }, "6.6": { - "version": "6.6.30", - "hash": "sha256:1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn" + "version": "6.6.31", + "hash": "sha256:080wwrc231fbf43hvvygddmdxdspyw23jc5vnd6fr5ccdybgzv6n" }, "6.8": { - "version": "6.8.9", - "hash": "sha256:1dn9bgmf03bdfbmgq98d043702g808rjikxs2i9yia57iqiz21gr" + "version": "6.8.10", + "hash": "sha256:0xjirg2w5fc2w2q6wr702akszq32m31lk4q5nbjq10zqhbcr5fxh" }, "6.9": { - "version": "6.9", - "hash": "sha256:0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4" + "version": "6.9.1", + "hash": "sha256:0jn0qp22vx7xf2mgaj7cwf8agqhahvrwlda4ak6rw67xk2x19d01" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index b013c7f1bf18..e19b0699a33f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.215-rt107"; # updated by ./update-rt.sh + version = "5.10.216-rt108"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1af6h86flx96pszg006agpak2f9dkk2jqaazfykd7aafqdcs3747"; + sha256 = "0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0lnnpnfmypafzfzhcmaxqqc18nna4fr236v6hrcyabnxmxam79xj"; + sha256 = "0p0qmyz3g7fqlz4f638dlcp37az8lpq5yqw2fy5zqqs3qagy018j"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 91774ba38dbd..5e43eca364d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.153-rt75"; # updated by ./update-rt.sh + version = "5.15.158-rt76"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1g44gjcwcdq5552vwinljqwiy90bxax72jjvdasp71x88khv3pfp"; + sha256 = "1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "04i22p0ap4dsqybf9jbbmrbzva11qknilnyk46z18gzrr0msjldl"; + sha256 = "17kw7cs1p0qgqf911prn3472c1j7r01g0mzqxsxpkdvhawxps7wy"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 06028d209779..ac0f7d6d9d88 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.83-rt28"; # updated by ./update-rt.sh + version = "6.1.90-rt30"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "145iw3wii7znhrqdmgnwhswk235g6gw8axjjji2cw4rn148rddl8"; + sha256 = "07cfg0chssvpc4mqls3aln6s4lqjp6k4x2n63wndmkjgfqpdg8w3"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "07wv3zd7n5378k8ywdavrp5ndqkdcis923dwpswfv7062xm34y5h"; + sha256 = "0sgwxdy4bzjqr74nrmsyw1f2lcqpapxmkj5yywf7jkqa20jkdvgr"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index eb85f9c3cd09..5a2e8959090f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.25-rt29"; # updated by ./update-rt.sh + version = "6.6.30-rt30"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0i0zvqlj02rm6wpbidji0rn9559vrpfc1b8gbfjk70lhhyz11llr"; + sha256 = "1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "15mb4zycv86yp1cbs5svgs3pnmh8jihjhf4jxc4h4ywlzglkb1za"; + sha256 = "05n6fyy5c0f18v4n1rfkcvqj8s0p5x6s16qq5mnmya86rhdr6gn7"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 5b1994f77d2f..8f5766aac0be 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -26,6 +26,8 @@ localtuya = callPackage ./localtuya {}; + midea_ac_lan = callPackage ./midea_ac_lan {}; + midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; miele = callPackage ./miele {}; diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix new file mode 100644 index 000000000000..7123389e8bc1 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent rec { + owner = "georgezhao2010"; + domain = "midea_ac_lan"; + version = "0.3.22"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "v${version}"; + hash = "sha256-xTnbA4GztHOE61QObEJbzUSdbuSrhbcJ280DUDdM+n4="; + }; + + meta = with lib; { + description = "Auto-configure and then control your Midea M-Smart devices (Air conditioner, Fan, Water heater, Washer, etc) via local area network"; + homepage = "https://github.com/georgezhao2010/midea_ac_lan/"; + changelog = "https://github.com/georgezhao2010/midea_ac_lan/releases/tag/v${version}"; + maintainers = with maintainers; [ k900 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 721ce0e19e01..f35972e1b615 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -289,6 +289,17 @@ let doCheck = false; # no tests }); + # Can probably be removed with 2024.6.0 + plugwise = super.plugwise.overridePythonAttrs rec { + version = "0.37.3"; + src = fetchFromGitHub { + owner = "plugwise"; + repo = "python-plugwise"; + rev = "refs/tags/v${version}"; + hash = "sha256-aQz0p+DNi1XVoFwdFjc3RjpHqA2kGf4pU1QS6m271gU="; + }; + }; + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index ac7f52e9561f..62a9326f2398 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGo122Module , fetchFromGitHub , fetchNpmDeps @@ -11,7 +12,6 @@ , npmHooks , nix-update-script , nixosTests -, stdenv }: let @@ -21,20 +21,20 @@ in buildGoModule rec { pname = "evcc"; - version = "0.126.2"; + version = "0.126.3"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-jeOlBHCPn+k+rXADm0hcGqg+7qn8FOJKnCfSwZazRl8="; + hash = "sha256-Q+g/XEfIfpGchIZQdouoP9muqq6l0xixOLmIntgIWe0="; }; - vendorHash = "sha256-jJOxFkoVBT1NrnhntHPa2/irjHD09zKbtNDQoyelJp4="; + vendorHash = "sha256-tFj1cPBB1qeuwz1RXVVDVNJRfFFKPH6mdMnaiM3jwUc="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-KW2aVK3Ui5sGBcNhTsNXUr9HyHcm0iJxxzBUjrNWrqw="; + hash = "sha256-ghDLmsmcG+qDItiqaZy8MTYw/AU58bZfUzYY32XKNyk="; }; nativeBuildInputs = [ @@ -72,14 +72,33 @@ buildGoModule rec { make ui ''; - doCheck = !stdenv.isDarwin; # tries to bind to local network, doesn't work in darwin sandbox + doCheck = !stdenv.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more - preCheck = '' - # requires network access - rm meter/template_test.go - rm charger/template_test.go - rm tariff/template_test.go - ''; + checkFlags = let + skippedTests = [ + # network access + "TestOctopusConfigParse" + "TestTemplates/allinpower" + "TestTemplates/electricitymaps" + "TestTemplates/elering" + "TestTemplates/energinet" + "TestTemplates/grünstromindex" + "TestTemplates/pun" + "TestTemplates/entsoe" + "TestTemplates/ngeso" + "TestTemplates/tibber" + "TestTemplates/groupe-e" + "TestTemplates/awattar" + "TestTemplates/energy-charts-api" + "TestTemplates/polestar" + "TestTemplates/sma-inverter-speedwire/battery" + "TestTemplates/sma-inverter-speedwire/pv" + "TestTemplates/smartenergy" + "TestTemplates/tibber-pulse/grid" + + ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; passthru = { tests = { diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 7e9c27d38d22..524897c1d51f 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mautrix-signal"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "v${version}"; - hash = "sha256-T5w5k9fuAq5s6Y6pkGoDHSUHCf+kyURBLY0TtzgO85o="; + hash = "sha256-JybQhVej82aWcsGLKS/tCBUuy9rARSe4d+ivYEZ0ve4="; }; buildInputs = [ @@ -18,7 +18,7 @@ buildGoModule rec { libsignal-ffi ]; - vendorHash = "sha256-NuPctTEdj2BjCKqmzASYTlip7cimSff0OuhVIxlh1I8="; + vendorHash = "sha256-LHq/CH53/Jzh49qXdoqXURqTVbSitczw3yH3KU2BMpc="; doCheck = false; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index fac861d56b02..93e2a009c335 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,23 +1,32 @@ { lib , python3 , fetchFromGitHub +, fetchpatch2 , nixosTests }: with python3.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.4.0"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zJH2ojLQChElRvU2TWg4lW+Mey+wP0XbLJhVF16nvss="; + hash = "sha256-1Q/jRjFUoJb1S3cGF8aVuguWMJwYrAtXdKpZV8nRK0k="; }; + patches = [ + (fetchpatch2 { + # fix entrypoint + url = "https://github.com/supakeen/pinnwand/commit/7868b4b4dcd57066dd0023b5a3cbe91fc5a0a858.patch"; + hash = "sha256-Fln9yJNRvNPHZ0JIgzmwwjUpAHMu55NaEb8ZVDWhLyE="; + }) + ]; + nativeBuildInputs = [ - poetry-core + pdm-pep517 pythonRelaxDepsHook ]; @@ -31,6 +40,7 @@ with python3.pkgs; buildPythonApplication rec { docutils pygments pygments-better-html + python-dotenv sqlalchemy token-bucket tomli diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 49610ddd9bc1..a9ca0c8f2585 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "yrutschle"; repo = pname; rev = "v${version}"; - hash = "sha256-NCjLqYSPHukY11URQ/n+33Atzl4DhPDbNOEDaP6bQlg="; + hash = "sha256-+G6xYiytSWW2CljuaeJZfTuXCjkbDCzwU/FSLBmvnGw="; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix index 668637ef1cc6..e44fa4a71a97 100644 --- a/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.4.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-gEBGMVR1lMVKNPVuPjtdPkgOXI1MWO0EAtk7JRmS0Ok="; + hash = "sha256-FcT1gk11a3nluP0sFMa5LoF7oT/MO4B1GdqdTdFxsLQ="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index b3db825bbba6..be89f60d8927 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; + sha256 = "sha256-Jl3wZa/WIA+GtkUiCn0vKfd6N/GitOavwZ+uqfmzdps="; }; strictDeps = true; diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index f4e681f80103..5b45b78835f0 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.2"; + version = "18.2.3"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-3WJ8yxSwvYOs8LaUBgqALyxY1cMiHusBPzKbSeAxrCw="; + hash = "sha256-TjwiNQqGZbezZu3Ul5IIug5vVNhx1op+ZRXQlxnurVI="; }; - npmDepsHash = "sha256-sHjz0VWVM6x5iAbG9e6x4F6Gx2OpS94hDMvirExDt0M="; + npmDepsHash = "sha256-OQ8i76cKFbdEH6Fj41ifAeGyIMAACOgo7dMxByULJMk="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index ba1a609c9682..f0a20fe9687f 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.18.3"; + version = "10.18.6"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-HLYcKF+DCj5QA+0ZJwRpC+iTN5z/S249UnQirNJMLF4="; + sha256 = "sha256-LbauIeDUqfL1ChZTThq7CJ++yNiuKaa773jSdmxorf8="; stripRoot = false; }; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index b893c9b0b2d6..fe9c1d22f407 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aespipe"; - version = "2.4g"; + version = "2.4h"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "sha256-v7l+feFh6NfOETsWO9odGo7HfSwa+rVtzIFT16kBh/w="; + sha256 = "sha256-6rMR/CbqQyibw632YNYnBJJJSWByXSAm7EkXKUoaukk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 8bb9b605a8f4..0959e6166a0d 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -1,9 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, systemd, pytest }: buildPythonPackage rec { pname = "journalwatch"; version = "1.1.0"; - disabled = pythonOlder "3.3"; src = fetchFromGitHub { owner = "The-Compiler"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fa8dae079aa8..780b1ac5cb0c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -184,6 +184,7 @@ mapAliases ({ foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 + functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa9fc0727caf..29b5d95a9922 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4570,8 +4570,6 @@ self: super: with self; { functiontrace = callPackage ../development/python-modules/functiontrace { }; - functools32 = callPackage ../development/python-modules/functools32 { }; - funcy = callPackage ../development/python-modules/funcy { }; funsor = callPackage ../development/python-modules/funsor { };