diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index eded81c5e3c96..e6c08dabb5b05 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -94,10 +94,7 @@ stdenvNoCC.mkDerivation { name = "nixpkgs-lib-docs"; - src = lib.fileset.toSource { - root = ../..; - fileset = ../../lib; - }; + src = ../../lib; nativeBuildInputs = [ nixdoc @@ -105,6 +102,8 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' + cd .. + export NIX_STATE_DIR=$(mktemp -d) nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \ --arg nixpkgsPath "./." \ diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index c2bbdf09e5339..bc5566f3cbd3e 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -25,16 +25,22 @@ stdenvNoCC.mkDerivation ( nativeBuildInputs = [ nixos-render-docs ]; - src = lib.fileset.toSource { - root = ../.; - fileset = lib.fileset.unions [ - (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.) - ../style.css - ../anchor-use.js - ../anchor.min.js - ../manpage-urls.json - ../redirects.json - ]; + src = lib.cleanSourceWith { + src = ../.; + filter = + path: type: + type == "directory" + || lib.hasSuffix ".md" path + || lib.hasSuffix ".md.in" path + || lib.elem path ( + map toString [ + ../style.css + ../anchor-use.js + ../anchor.min.js + ../manpage-urls.json + ../redirects.json + ] + ); }; postPatch = '' diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 35471f74949c4..f22744806d489 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -14,22 +14,12 @@ extraPythonPackages ? (_: [ ]), nixosTests, }: -let - fs = lib.fileset; -in python3Packages.buildPythonApplication { pname = "nixos-test-driver"; version = "1.1"; pyproject = true; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./pyproject.toml - ./test_driver - ./extract-docstrings.py - ]; - }; + src = ./src; build-system = with python3Packages; [ setuptools diff --git a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix index b76da9ac5fb21..b6450685e0470 100644 --- a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix +++ b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix @@ -11,6 +11,6 @@ in runCommand "nixos-test-driver-docstrings" env '' mkdir $out - python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \ + python3 ${./src/extract-docstrings.py} ${./src/test_driver/machine.py} \ > $out/machine-methods.md '' diff --git a/nixos/lib/test-driver/extract-docstrings.py b/nixos/lib/test-driver/src/extract-docstrings.py similarity index 100% rename from nixos/lib/test-driver/extract-docstrings.py rename to nixos/lib/test-driver/src/extract-docstrings.py diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/src/pyproject.toml similarity index 100% rename from nixos/lib/test-driver/pyproject.toml rename to nixos/lib/test-driver/src/pyproject.toml diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py similarity index 100% rename from nixos/lib/test-driver/test_driver/__init__.py rename to nixos/lib/test-driver/src/test_driver/__init__.py diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py similarity index 100% rename from nixos/lib/test-driver/test_driver/driver.py rename to nixos/lib/test-driver/src/test_driver/driver.py diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py similarity index 100% rename from nixos/lib/test-driver/test_driver/logger.py rename to nixos/lib/test-driver/src/test_driver/logger.py diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py similarity index 100% rename from nixos/lib/test-driver/test_driver/machine.py rename to nixos/lib/test-driver/src/test_driver/machine.py diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/src/test_driver/polling_condition.py similarity index 100% rename from nixos/lib/test-driver/test_driver/polling_condition.py rename to nixos/lib/test-driver/src/test_driver/polling_condition.py diff --git a/nixos/lib/test-driver/test_driver/py.typed b/nixos/lib/test-driver/src/test_driver/py.typed similarity index 100% rename from nixos/lib/test-driver/test_driver/py.typed rename to nixos/lib/test-driver/src/test_driver/py.typed diff --git a/nixos/lib/test-driver/test_driver/qmp.py b/nixos/lib/test-driver/src/test_driver/qmp.py similarity index 100% rename from nixos/lib/test-driver/test_driver/qmp.py rename to nixos/lib/test-driver/src/test_driver/qmp.py diff --git a/nixos/lib/test-driver/test_driver/vlan.py b/nixos/lib/test-driver/src/test_driver/vlan.py similarity index 100% rename from nixos/lib/test-driver/test_driver/vlan.py rename to nixos/lib/test-driver/src/test_driver/vlan.py diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b81b3a1283d38..f923356b5604e 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -29,7 +29,6 @@ , libltc , libogg , libpulseaudio -, librdf_raptor , librdf_rasqal , libsamplerate , libsigcxx @@ -133,7 +132,6 @@ stdenv.mkDerivation rec { libltc libogg libpulseaudio - librdf_raptor librdf_rasqal libsamplerate libsigcxx diff --git a/pkgs/build-support/testers/shellcheck/example.sh b/pkgs/build-support/testers/shellcheck/src/example.sh similarity index 100% rename from pkgs/build-support/testers/shellcheck/example.sh rename to pkgs/build-support/testers/shellcheck/src/example.sh diff --git a/pkgs/build-support/testers/shellcheck/tester.nix b/pkgs/build-support/testers/shellcheck/tester.nix index 131a64a851574..caa4f51f99271 100644 --- a/pkgs/build-support/testers/shellcheck/tester.nix +++ b/pkgs/build-support/testers/shellcheck/tester.nix @@ -2,6 +2,7 @@ { lib, stdenv, + runCommand, shellcheck, }: @@ -10,7 +11,7 @@ # Tests: ./tests.nix { src }: let - inherit (lib) fileset pathType isPath; + inherit (lib) pathType isPath; in stdenv.mkDerivation { name = "run-shellcheck"; @@ -18,10 +19,10 @@ stdenv.mkDerivation { if isPath src && pathType src == "regular" # note that for strings this would have been IFD, which we prefer to avoid then - fileset.toSource { - root = dirOf src; - fileset = src; - } + runCommand "testers-shellcheck-src" { } '' + mkdir $out + cp ${src} $out + '' else src; nativeBuildInputs = [ shellcheck ]; diff --git a/pkgs/build-support/testers/shellcheck/tests.nix b/pkgs/build-support/testers/shellcheck/tests.nix index 0128670dbe707..4a9ebdf9ffb1c 100644 --- a/pkgs/build-support/testers/shellcheck/tests.nix +++ b/pkgs/build-support/testers/shellcheck/tests.nix @@ -6,9 +6,6 @@ testers, runCommand, }: -let - inherit (lib) fileset; -in lib.recurseIntoAttrs { example-dir = @@ -16,12 +13,7 @@ lib.recurseIntoAttrs { { failure = testers.testBuildFailure ( testers.shellcheck { - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./example.sh - ]; - }; + src = ./src; } ); } @@ -37,7 +29,7 @@ lib.recurseIntoAttrs { { failure = testers.testBuildFailure ( testers.shellcheck { - src = ./example.sh; + src = ./src/example.sh; } ); } diff --git a/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch new file mode 100644 index 0000000000000..09ff008d332c7 --- /dev/null +++ b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 19059a41b..6e3ae0ad7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,15 +82,7 @@ endif () + find_package (Boost 1.38 REQUIRED + COMPONENTS filesystem iostreams program_options regex system) + +-include(FetchContent) +-FetchContent_Declare( +- fmt +- GIT_REPOSITORY https://github.com/fmtlib/fmt.git +- GIT_TAG 10.2.1 +- GIT_PROGRESS TRUE +- USES_TERMINAL_DOWNLOAD TRUE +-) +-FetchContent_MakeAvailable(fmt) ++find_package(fmt REQUIRED) + + find_package(Snappy) + if (SNAPPY_FOUND) diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index f82ef1924dbe3..b0bd09a65756f 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -2,41 +2,44 @@ lib, stdenv, fetchurl, - fetchpatch, cmake, boost, python3, + fmt, + versionCheckHook, }: stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64="; + hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs="; }; + patches = [ - # This patch fixes boost compatibility and can be removed when - # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920 - (fetchpatch { - name = "fix-boost-compatibility.patch"; - url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch"; - hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A="; - }) + ./0001-get-rid-of-fmt-fetchcontent.patch ]; - patchFlags = [ "-p3" ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ boost ]; - preConfigure = '' - substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" - substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" - ''; + propagatedBuildInputs = [ + boost + fmt + ]; + + doCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/avrogencpp"; + versionCheckProgramArg = [ "--version" ]; meta = { description = "C++ library which implements parts of the Avro Specification"; diff --git a/pkgs/by-name/bo/bodyclose/package.nix b/pkgs/by-name/bo/bodyclose/package.nix index ed791e7546c6c..a563e6d4782cd 100644 --- a/pkgs/by-name/bo/bodyclose/package.nix +++ b/pkgs/by-name/bo/bodyclose/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "bodyclose"; - version = "0-unstable-2024-10-17"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "timakin"; repo = "bodyclose"; - rev = "adbc21e6bf369ca6d936dbb140733f34867639bd"; - hash = "sha256-GNZNzXEZnIxep5BS1sBZsMl876FwwIkOBwHAMk/73fo="; + rev = "1db5c5ca4d6719fe28430df1ae8d337ee2ac09c7"; + hash = "sha256-s5bWvpV6gHGEsuiNXJl2ZuyDaffD82/rCbusov3zsyw="; }; vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8="; diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index c7c6fb5d55b0b..21a2201d1a30b 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.8.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-zNSQVMF5ciGGUBQyPFvIVtePNMbJ3e0LXBmRWMohoGA="; + hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; }; - cargoHash = "sha256-jVQErw89rCm9f3uJftmyytru1xQa+FKsUkszHJWBGNU="; + cargoHash = "sha256-2qm2hL4M2xHidRYF9Fhxxn2IG22mPEBZW5yhu6wPVDY="; # openssl crate requires perl during build process nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix index 37bf0f40d9a3b..74fbec4ad2261 100644 --- a/pkgs/by-name/co/coursier/package.nix +++ b/pkgs/by-name/co/coursier/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-E6LEi2m/BMCT9T5UYzMbIcoj42MKP2OIc27XGDMUI7w="; + hash = "sha256-0ugWgvG3AHt7h8F8W8kCksyx93YO51i5StqGAEZXGmg="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flattenReferencesGraph/package.nix index 9adb9a320e0c7..c3c7edb17609e 100644 --- a/pkgs/by-name/fl/flattenReferencesGraph/package.nix +++ b/pkgs/by-name/fl/flattenReferencesGraph/package.nix @@ -1,25 +1,19 @@ { callPackage, - lib, + nix-gitignore, python3Packages, }: let - inherit (lib) fileset; helpers = callPackage ./helpers.nix { }; pythonPackages = python3Packages; + in pythonPackages.buildPythonApplication { version = "0.1.0"; pname = "flatten-references-graph"; - src = fileset.toSource { - root = ./src; - fileset = fileset.unions [ - ./src/.flake8 - ./src/flatten_references_graph - ./src/setup.py - ]; - }; + # Note: this uses only ./src/.gitignore + src = nix-gitignore.gitignoreSource [ ] ./src; propagatedBuildInputs = with pythonPackages; [ igraph diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index e16386bcf7a78..7ca46e9e1cdb5 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -1,12 +1,13 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + stdenv, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.13.2"; + version = "3.13.5"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,15 +15,15 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-UjKYHZwAOOv3Adj13r2zJkVmxwEpJLQk87UslddX9Qk="; + hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY="; }; # relax dep constrains, keep environment constraints pythonRelaxDeps = true; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml # and https://github.com/Flexget/Flexget/blob/develop/requirements.txt apscheduler @@ -40,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { pyrss2gen python-dateutil pyyaml + rarfile rebulk requests rich @@ -66,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { deluge-client cloudscraper python-telegram-bot + boto3 ]; pythonImportsCheck = [ @@ -93,14 +96,69 @@ python3.pkgs.buildPythonApplication rec { "flexget.plugins.services.pogcal_acquired" ]; - # ~400 failures - doCheck = false; + nativeCheckInputs = [ + python3Packages.pytestCheckHook + python3Packages.pytest-vcr + python3Packages.paramiko + ]; + + doCheck = !stdenv.isDarwin; + + disabledTests = [ + # reach the Internet + "TestExistsMovie" + "TestImdb" + "TestImdbLookup" + "TestImdbParser" + "TestInputHtml" + "TestInputSites" + "TestNfoLookupWithMovies" + "TestNpoWatchlistInfo" + "TestNpoWatchlistLanguageTheTVDBLookup" + "TestNpoWatchlistPremium" + "TestPlex" + "TestRadarrListActions" + "TestRssOnline" + "TestSeriesRootAPI" + "TestSftpDownload" + "TestSftpList" + "TestSonarrListActions" + "TestSubtitleList" + "TestTMDBMovieLookupAPI" + "TestTVDBEpisodeABSLookupAPI" + "TestTVDBEpisodeAirDateLookupAPI" + "TestTVDBEpisodeLookupAPI" + "TestTVDBExpire" + "TestTVDBFavorites" + "TestTVDBLanguages" + "TestTVDBList" + "TestTVDBLookup" + "TestTVDBLookup" + "TestTVDBSeriesActorsLookupAPI" + "TestTVDBSeriesLookupAPI" + "TestTVDSearchIMDBLookupAPI" + "TestTVDSearchNameLookupAPI" + "TestTVDSearchZAP2ITLookupAPI" + "TestTVMAzeSeriesLookupAPI" + "TestTVMazeSeasonLookup" + "TestTVMazeShowLookup" + "TestTVMazeUnicodeLookup" + "TestTaskParsing::test_selected_parser_cleared" + "TestTheTVDBLanguages" + "TestTheTVDBList" + "TestTmdbLookup" + "TestURLRewriters" + "TestURLRewriters::test_ettv" + # others + "TestRegexp" + "TestYamlLists" + ]; - meta = with lib; { + meta = { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix index 81a99677a7032..4653a16a3153b 100644 --- a/pkgs/by-name/gh/ghostty/deps.nix +++ b/pkgs/by-name/gh/ghostty/deps.nix @@ -1,4 +1,5 @@ # generated by zon2nix (https://github.com/Cloudef/zig2nix) + { lib, linkFarm, @@ -8,14 +9,13 @@ zig, name ? "zig-packages", }: + with builtins; with lib; + let unpackZigArtifact = - { - name, - artifact, - }: + { name, artifact }: runCommandLocal name { nativeBuildInputs = [ zig ]; @@ -169,11 +169,11 @@ linkFarm name [ }; } { - name = "12204358b2848ffd993d3425055bff0a5ba9b1b60bead763a6dea0517965d7290a6c"; + name = "1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/d6c42066b3045292e0b1154ad84ff22d6863ebf7.tar.gz"; - hash = "sha256-s6us3PkOPmQCtLS9QNPM7BDLt7x+37KbmYF9d4NMD/c="; + url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz"; + hash = "sha256-hFGjD0rNfZ7Qd7uJZgVn+FmIVXunbjLT+E1BoXhXoJE="; }; } { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 7242ba82c9dae..2db4e3637f6c0 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -44,8 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; - version = "1.0.0"; - + version = "1.0.1"; outputs = [ "out" "man" @@ -58,15 +57,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "ghostty-org"; repo = "ghostty"; tag = "v${finalAttrs.version}"; - hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM="; + hash = "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU="; }; - # Avoid using runtime hacks to help find X11 - postPatch = lib.optionalString (appRuntime == "gtk") '' - substituteInPlace src/apprt/gtk/x11.zig \ - --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");' - ''; - deps = callPackage ./deps.nix { name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; }; @@ -118,8 +111,7 @@ stdenv.mkDerivation (finalAttrs: { zigCheckFlags = finalAttrs.zigBuildFlags; - # Unit tests currently fail inside the sandbox - doCheck = false; + doCheck = true; /** Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them @@ -186,7 +178,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://ghostty.org/"; downloadPage = "https://ghostty.org/download"; - + changelog = "https://ghostty.org/docs/install/release-notes/${ + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version + }"; license = lib.licenses.mit; mainProgram = "ghostty"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix index 5b76dc8ccdcd3..832146707d168 100644 --- a/pkgs/by-name/li/libportal/package.nix +++ b/pkgs/by-name/li/libportal/package.nix @@ -21,7 +21,7 @@ assert stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.9.0"; + version = "0.8.1"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "sha256-uKblVaJB3s01En/T3ofT8uZHHarPKAO1qyLidLZ/b/g="; + sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix index 5a8cc69e00169..f42ff147381e1 100644 --- a/pkgs/by-name/li/libserdes/package.nix +++ b/pkgs/by-name/li/libserdes/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, perl, which, - boost, rdkafka, jansson, curl, @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost rdkafka jansson curl @@ -43,10 +41,26 @@ stdenv.mkDerivation rec { avro-cpp ]; - makeFlags = [ "GEN_PKG_CONFIG=y" ]; + configureFlags = [ + # avro-cpp public headers use at least C++17 features, but libserdes configure scripts + # basically cap it at C++11. It's really unfortunate that we have to patch the configure scripts for this, + # but this seems to be the most sensible way. + # - NIX_CFLAGS_COMPILE - fails because of -Werror in compiler checks since --std=... has no effect for C compilers. + # - CXXFLAGS without patching configure.self does nothing, because --std=c++11 is appended to the final flags, overriding + # everything specified manually. + "--CXXFLAGS=${toString [ "--std=c++17" ]}" + ]; + + makeFlags = [ + "GEN_PKG_CONFIG=y" + ]; postPatch = '' patchShebangs configure lds-gen.pl + # Don't append the standard to CXXFLAGS, since we want to set it higher for avro-cpp. + substituteInPlace configure.self --replace-fail \ + 'mkl_mkvar_append CXXFLAGS CXXFLAGS "--std=c++11"' \ + ":" # Do nothing, we set the standard ourselves. ''; # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: diff --git a/pkgs/by-name/op/open-in-mpv/package.nix b/pkgs/by-name/op/open-in-mpv/package.nix index 219f708b10e4c..2bd21ae35ab0e 100644 --- a/pkgs/by-name/op/open-in-mpv/package.nix +++ b/pkgs/by-name/op/open-in-mpv/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-EkWz28X+pPfSjinYEMP2y1YiZ46HdnjRGjXRDwO28PY="; + hash = "sha256-5Hu/BXUMI8CSOvE09I0YXfQ6BuIRA37yLlSTqWrrqy0="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; diff --git a/pkgs/by-name/pu/purescm/README.rst b/pkgs/by-name/pu/purescm/README.rst index 635d4b46d811a..ff34f3913009b 100644 --- a/pkgs/by-name/pu/purescm/README.rst +++ b/pkgs/by-name/pu/purescm/README.rst @@ -14,6 +14,6 @@ Suggested additional ``buildInputs`` To update this package ====================== -#. Bump the ``./package.json`` version pin -#. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"`` +#. Bump the ``./manifests/package.json`` version pin +#. Run ``(cd manifests && nix-shell -p nodejs --command "npm i --package-lock-only")`` #. Update ``npmDeps.hash`` in the ``package.nix`` diff --git a/pkgs/by-name/pu/purescm/.gitignore b/pkgs/by-name/pu/purescm/manifests/.gitignore similarity index 100% rename from pkgs/by-name/pu/purescm/.gitignore rename to pkgs/by-name/pu/purescm/manifests/.gitignore diff --git a/pkgs/by-name/pu/purescm/package-lock.json b/pkgs/by-name/pu/purescm/manifests/package-lock.json similarity index 100% rename from pkgs/by-name/pu/purescm/package-lock.json rename to pkgs/by-name/pu/purescm/manifests/package-lock.json diff --git a/pkgs/by-name/pu/purescm/package.json b/pkgs/by-name/pu/purescm/manifests/package.json similarity index 100% rename from pkgs/by-name/pu/purescm/package.json rename to pkgs/by-name/pu/purescm/manifests/package.json diff --git a/pkgs/by-name/pu/purescm/package.nix b/pkgs/by-name/pu/purescm/package.nix index faee196e3eb92..9dd16d489a0ca 100644 --- a/pkgs/by-name/pu/purescm/package.nix +++ b/pkgs/by-name/pu/purescm/package.nix @@ -8,7 +8,7 @@ let inherit (lib) fileset; - packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json); + packageLock = builtins.fromJSON (builtins.readFile ./manifests/package-lock.json); pname = "purescm"; version = packageLock.packages."node_modules/${pname}".version; @@ -16,24 +16,11 @@ let package = buildNpmPackage { inherit pname version; - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./package.json - ./package-lock.json - ./.gitignore - ]; - }; + src = ./manifests; dontNpmBuild = true; npmDeps = fetchNpmDeps { - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./package-lock.json - ./package.json - ]; - }; + src = ./manifests; hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o="; }; diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json similarity index 100% rename from pkgs/by-name/sh/shopify-cli/package-lock.json rename to pkgs/by-name/sh/shopify-cli/manifests/package-lock.json diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json similarity index 100% rename from pkgs/by-name/sh/shopify-cli/package.json rename to pkgs/by-name/sh/shopify-cli/manifests/package.json diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index b49e430de8beb..a45f65ce75066 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -6,13 +6,7 @@ buildNpmPackage { pname = "shopify"; version = version; - src = lib.fileset.toSource { - root = ./.; - fileset = with lib.fileset; unions [ - ./package.json - ./package-lock.json - ]; - }; + src = ./manifests; npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk="; dontNpmBuild = true; diff --git a/pkgs/by-name/sh/shopify-cli/update.sh b/pkgs/by-name/sh/shopify-cli/update.sh index 6421f59a3a17f..a63a81b590571 100755 --- a/pkgs/by-name/sh/shopify-cli/update.sh +++ b/pkgs/by-name/sh/shopify-cli/update.sh @@ -18,6 +18,8 @@ if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then exit 0 fi +pushd manifests + # Update the package.json sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json @@ -25,6 +27,9 @@ sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json rm -f package-lock.json npm i --package-lock-only npm_hash=$(prefetch-npm-deps package-lock.json) + +popd + sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix popd diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index c1767f1388fde..347f2428a0a85 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-JEe4dmbb/T2A4+t1ycvgJofes2CkEphytFMnWJgpZ7s="; + hash = "sha256-yS3KnR9JLUEwtV8e2J5l4WW+XNHWg7PDOKtlfT/zfUE="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index 812d30c14d856..a0ee8fcd7d91e 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -53,6 +53,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "--skip=system::watcher::test::should_poll_file_removed" "--skip=system::watcher::test::should_poll_file_update" + "--skip=system::watcher::test::should_poll_nothing" ]; passthru = { diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index f1a44bfda5fc2..8a48ffb6f6f30 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -2,24 +2,36 @@ lib, fetchFromGitHub, rustPlatform, + installShellFiles, }: rustPlatform.buildRustPackage rec { pname = "tex-fmt"; - version = "0.4.7"; + version = "0.5.1"; src = fetchFromGitHub { owner = "WGUNDERWOOD"; repo = "tex-fmt"; rev = "refs/tags/v${version}"; - hash = "sha256-jVrd3yZ07+ppsdt+8sNKX1rdmU+UiRCyx80EMXdoK54="; + hash = "sha256-LeoV500tnvnvl869NXi4b4LpBvX1FclYJzYAcC0QVRo="; }; - cargoHash = "sha256-XQ1oEF+axp8pC6OkLlab1qI7RJeAyeSb58oChgaaS1s="; + cargoHash = "sha256-jjBPGrdCJ3zk/kuIImEXkZTI5+492yekt5+iNyYhHGM="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage man/tex-fmt.1 + installShellCompletion \ + --bash completion/tex-fmt.bash \ + --fish completion/tex-fmt.fish \ + --zsh completion/_tex-fmt + ''; meta = { description = "LaTeX formatter written in Rust"; homepage = "https://github.com/WGUNDERWOOD/tex-fmt"; + changelog = "https://github.com/WGUNDERWOOD/tex-fmt/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "tex-fmt"; maintainers = with lib.maintainers; [ wgunderwood ]; diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 57b6120ccea92..c1d1711fc9974 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -18,19 +18,12 @@ let libcublas ; inherit (lib) getDev getLib getOutput; - fs = lib.fileset; in backendStdenv.mkDerivation { pname = "saxpy"; version = "unstable-2023-07-11"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./CMakeLists.txt - ./saxpy.cu - ]; - }; + src = ./src; __structuredAttrs = true; strictDeps = true; diff --git a/pkgs/development/cuda-modules/saxpy/CMakeLists.txt b/pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt similarity index 100% rename from pkgs/development/cuda-modules/saxpy/CMakeLists.txt rename to pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt diff --git a/pkgs/development/cuda-modules/saxpy/saxpy.cu b/pkgs/development/cuda-modules/saxpy/src/saxpy.cu similarity index 100% rename from pkgs/development/cuda-modules/saxpy/saxpy.cu rename to pkgs/development/cuda-modules/saxpy/src/saxpy.cu diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index e722d504d61f2..0080974e646d6 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ansitable"; - version = "0.11.3"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk="; + hash = "sha256-XUjXVs9/ETlbbtvYz8YJqCsP1BFajqQKQfSM+Rvm4O0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index ef55f5eebefcb..050cbce9cf703 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.23.0"; + version = "0.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/fV2FX2CMt3jjpnJ4XjhfWVa1yWmWna7eYO/6npPxig="; + hash = "sha256-FMT4E0TseXccmqk4AFlClu5+qknbD7n9FatmKiH634o="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 997d52e128979..bac13da083f73 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.12.3"; + version = "7.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_servicebus"; inherit version; - hash = "sha256-PwdZcxrSIRxo60sh5byimCf31v8Ccr3H7vEDwcE/gyI="; + hash = "sha256-p16aYUNco606eX8di/T90Nhz66nl04OJSsh+9eGnDPA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index bb91d65287bf3..31bf7bbbb09f3 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.10"; + version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-We1cr12Stq2kv2W8ZDf+6kqdoQkzhERf7U1HKsxs/3s="; + hash = "sha256-tb/lWglavZ/iAJkXinxsBg+ES/1P5MdtKONeTFK50x4="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index efb065b171946..b82658ed4b8c7 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "berkeleydb"; - version = "18.1.10"; + version = "18.1.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QmNBoWAHqQAtmHpvTZcib46v/8saBIhIgFPTijEnyBo="; + hash = "sha256-SVqBecajayLQ+i9ogfp4PPdSIUooV2BSlgX2CBAd6yg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f89ea81255e43..46abe5a8c4839 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-vrNt9Rm4cJ59NXwMljmwO4hcpjVbv15TdSxoXeUWBbg="; + hash = "sha256-+o6OF5nepUg85maUYmYPnZqVZJ9vmKgNMVuE7In0SfQ="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 8fd6f490f0422..57a790c3326c5 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.13"; + version = "2.0.16"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-xPPARaxclTRy7thJXtXaMK0F5/91q7o35LyzSmx1HPU="; + hash = "sha256-Hgg2mwBdUwW26h0mkgTIFLyigefAENDItQ0EvPGAOc0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index ecdcd5759349b..1a7d54470677b 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.5.3"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "confluentinc"; repo = "confluent-kafka-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-b9RTz4wUtDzGkoeB0cp5vbZEBk8jSw2JiXEx6tUuPVw="; + tag = "v${version}"; + hash = "sha256-SFmZ/KriysvLkGT5mvIS9SJcUHWmvZXrqFAY0lC6bGc="; }; buildInputs = [ rdkafka ]; diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix index cd1a76e840a6f..2d747f8919bed 100644 --- a/pkgs/development/python-modules/consolekit/default.nix +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { pname = "consolekit"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TU5sufqJ0znCD/QOidrT7jB1NCXJ1p8Z7FPFNPp97qg="; + hash = "sha256-3qa58lA2nquII99W+SGEQHHlb1BRrAWdihUOiQYmcns="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index ea2d9d1b0ca63..92713066e5bab 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, distutils, fetchPypi, @@ -8,21 +9,24 @@ packaging, setuptools, filelock, - wheel, patchelf, + tomli, + importlib-metadata, + typing-extensions, + dmgbuild, }: buildPythonPackage rec { pname = "cx-freeze"; - version = "7.2.2"; + version = "7.2.7"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "cx_freeze"; inherit version; - hash = "sha256-6bLEvWjr9PuZtq8v8oHA5TewSa7pSIBcxKAo4XGKvGo="; + hash = "sha256-xNQ6TlNXNSrFqJID/aOoz63wM9Q2gvc6u+/ThgzlD7Q="; }; postPatch = '' @@ -34,18 +38,25 @@ buildPythonPackage rec { build-system = [ setuptools - wheel ]; buildInputs = [ ncurses ]; - dependencies = [ - distutils - filelock - packaging - setuptools - wheel - ]; + dependencies = + [ + distutils + packaging + setuptools + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] + ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + typing-extensions + ] + ++ lib.optional stdenv.hostPlatform.isLinux filelock + ++ lib.optional stdenv.hostPlatform.isDarwin dmgbuild; makeWrapperArgs = [ "--prefix" diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix index 7438dd3810253..db2044f9b565b 100644 --- a/pkgs/development/python-modules/django-pgactivity/default.nix +++ b/pkgs/development/python-modules/django-pgactivity/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pgactivity"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { - owner = "Opus10"; + owner = "AmbitionEng"; repo = "django-pgactivity"; tag = version; - hash = "sha256-XJDnNMhkoaRQBVsAdDqnFjOobUHi/RaMQZJnI61MuVI="; + hash = "sha256-PDJJf0PI5aqFn1HODv6wRSgTCr9ajfpPSDCB8twrFcQ="; }; build-system = [ poetry-core ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "View, filter, and kill Postgres queries"; - homepage = "https://github.com/Opus10/django-pgactivity"; - changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/AmbitionEng/django-pgactivity"; + changelog = "https://github.com/AmbitionEng/django-pgactivity/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jopejoe1 ]; }; diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix index 7db93173c742a..16500e9515e43 100644 --- a/pkgs/development/python-modules/django-pglock/default.nix +++ b/pkgs/development/python-modules/django-pglock/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pglock"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { - owner = "Opus10"; + owner = "AmbitionEng"; repo = "django-pglock"; tag = version; - hash = "sha256-7PBZvI4OTDIZjjLWnfOwGAdEJr3D6snmR20hPboLvXc="; + hash = "sha256-WbifapA2A0grxePozwDSPzREIzmgBV+V5wpA9jeYfJ8="; }; build-system = [ poetry-core ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Postgres advisory locks, table locks, and blocking lock management"; - homepage = "https://github.com/Opus10/django-pglock"; - changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/AmbitionEng/django-pglock"; + changelog = "https://github.com/AmbitionEng/django-pglock/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jopejoe1 ]; }; diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix index ef55f085d2be6..ee3bd1b357464 100644 --- a/pkgs/development/python-modules/django-soft-delete/default.nix +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "django-soft-delete"; - version = "1.0.14"; + version = "1.0.16"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Qo31bqT7sT9C1PdS8R8qUXqjGsPRtFDmt4xMXV2d/Ds="; + hash = "sha256-zEA5jM2GnHWm1rp/Um4WxK/isMCBHCE6MY2Wu0xYp4c="; }; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 13ea26e68c2c5..d4577d545cf82 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dploot"; - version = "3.0.0"; + version = "3.0.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY="; + hash = "sha256-MBuO9anCe8wDD+72pR/bFrV5pAmEIWY2pKSvPSTq0yQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 6b853fd9d9bfc..637bc2903ede9 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU="; + hash = "sha256-r/Mnijvn/d8wLf2AM16fkkJEZmxxI5zZHoNvPQVfHEo="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix index 8692d8a3c3da9..d9bfea658144a 100644 --- a/pkgs/development/python-modules/fabio/default.nix +++ b/pkgs/development/python-modules/fabio/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fabio"; - version = "2024.4.0"; + version = "2024.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NPVxu4sZ7hIvrHrh1iRakraa5fj1cUnH259tTDByRNc="; + hash = "sha256-+HPfUfRoUxwRqufgzYihTyIfTvCUMfvFpspnse1HU1s="; }; pythonImportsCheck = [ "fabio" ]; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index a817e75cb91bc..2a40ee42ea4cc 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -17,6 +17,7 @@ pytest-flask, pytest-mock, pytest-benchmark, + pytest-vcr, pytestCheckHook, setuptools, }: @@ -55,6 +56,7 @@ buildPythonPackage rec { pytest-benchmark pytest-flask pytest-mock + pytest-vcr pytestCheckHook ]; @@ -70,6 +72,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_specs_endpoint_host_and_subdomain" # broken in werkzeug 2.3 upgrade "test_media_types_method" "test_media_types_q" diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 1937656cba93c..7cf3361a66046 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.1"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-ewPCALnkGDhzxn3P9GO5QUaFZDhqsbQNeCmyTCXd7kE="; + hash = "sha256-sI24tSvwbh+zPTPVjkNlBg7TM6D5qMxfeF4pfj+6Q+E="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 895e9f1ab25ea..3f142eb84be46 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.9.0"; + version = "6.9.5"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-NanqjZZkxrhPaBsR+FrARvsO3vdT2MYnWFtkO0hpbQg="; + hash = "sha256-9b4nPiGyBsTplEhfmPdhjalV0fexYXerdRqUbOUXlh0="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 480bf6f76d87c..039d89b18faaf 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.12.0"; + version = "5.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-S1jXIPAgxONTeKKeqHzoKGr2Mes7w4LMvL/zncAZnik="; + hash = "sha256-I7LYrk9kjgG2b+0KvqEUtgDTNj2VW4VYx2Rak/KNbjw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 5aad5fed69005..0b19ec7c7a372 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.25.1"; + version = "3.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-6R4CSOyB+beTUPNtj8wQc7uQmMUxhyO8lebV0PDu1Lg="; + hash = "sha256-+kxjk9deiNQU+Vhjs53Xpgo/UZEtA2gDylr7WR1obzQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 4ff230e62cd11..ddd303bcbea1f 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.4"; + version = "11.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Yph2g254fSnPVfgmkmeRSqlmsUfHgP+wqN0GHLIV/wc="; + hash = "sha256-Jun1gZYZXv8nuJBnberK1bcTPTLCDgGGd543OeOEVOs="; }; nativeCheckInputs = [ mercurial ]; diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 4bed24b4bdae8..b7f9e04470072 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -5,12 +5,11 @@ pytestCheckHook, pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { pname = "import-expression"; - version = "2.1.0.post1"; + version = "2.2.1.post1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,13 +17,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "import_expression"; inherit version; - hash = "sha256-mclYGeuISXUDrOS1mhpVgDp1439KnHAwzHKIbRtdibQ="; + hash = "sha256-HIMb8mvvft82qXs0xoe5Yuer4GEWxm8A4U+aMhhiPU8="; }; build-system = [ setuptools ]; - dependencies = [ typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests.py" ]; diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 411f7df5ee458..2469f6569f354 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.801"; + version = "1.826"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-piK9Ym94cKdaHGz/ogX7ylyAF1ww0jCdRXnHN6lu2MI="; + hash = "sha256-9vNCwXCOEHG2WNu8nDqCKJ3Z4vrsfX1lwKvkVGRrPPA="; }; dependencies = [ lilypond ]; diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index a99720cce80df..481abb883c862 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.32.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-js2XTplrRZyyVHztA3yGicdjfBFNoUTvjzT/U2NESWQ="; + hash = "sha256-39MxXX3bBYLmpaUpNYLWq+8Huoy0zQSyURQiZvXFaZc="; }; build-system = [ setuptools ]; - nativeBuildInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_performance.py" diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 342459baea457..c69eaa54f189c 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.4.1"; - format = "pyproject"; + version = "3.5.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-okh5/tI4ATrDryQkudESTji0o4sgRP0pfI/zjlkS5xg="; + hash = "sha256-Hu+BaNB+UeExokl//srUtmP2II58OuO43BXFFzSm+AE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ language-data marisa-trie setuptools # pkg_resources import in language_data/util.py diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix index 4ebd50e349ece..ab099c119279b 100644 --- a/pkgs/development/python-modules/libusbsio/default.nix +++ b/pkgs/development/python-modules/libusbsio/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "libusbsio"; format = "setuptools"; - version = "2.1.12"; + version = "2.1.13"; # If the versions come back into sync switch back to inheriting from c lib # inherit (libusbsio) version; src = fetchPypi { inherit pname version; - hash = "sha256-RdUhwilBOwg19ay3Po3zsxqlBV9FTy3btJDbO4YEKS8="; + hash = "sha256-3xudSyqfXq3wsFdOgBeGK1nSY0NZjx9UhmTqbQGXWyU="; }; # The source includes both the python module directly and also prebuilt binaries diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 3e53e25e0b1d4..74ddf2035eb76 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2024.8.26"; + version = "2024.12.20"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-X1Nvm7bccwHn9KIKQuRb+mLzUwEdeiLNkzyxKa2Jk8Y="; + hash = "sha256-e8YvB29tggssX8aMRSoLvprsSBWeKVKfhDrSZeA2rCQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index dce3a93374e0a..91e77789b4b1a 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.1.3"; + version = "4.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.8" || isPyPy; src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-5fESPDZywyGLoGPCO9ZKURWeRGSf7WeAuZPHgfte0xg="; + hash = "sha256-CeEPJfh2UUOAs/rubek/sMIoq7qFgguhpZHds+tFGpY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index e98a78f9bc1d7..86114e43b0973 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.22.0"; + version = "5.25.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "linode"; repo = "python-linode-api"; - rev = "refs/tags/v${version}"; - hash = "sha256-f9v9xhlOfSCKEWHmzi/tpoMIXccGwA6isoAAIZOf3r4="; + tag = "v${version}"; + hash = "sha256-rEBMZft4o7R2e0N7x1ZEaCisRmhKggMbZWdtDvraoD0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 89a7dc6605323..52aede44e28c5 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manuel"; - version = "1.12.4"; + version = "1.13.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; + hash = "sha256-XWMSDej6bZJ3gLaa4oqj6dFmmxCvPTJ4Xz+6EaW+iFo="; }; patches = lib.optionals (lib.versionAtLeast python.version "3.11") [ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 5eebd19f53cff..d25a2a7f34faa 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mecab_python3"; inherit version; - hash = "sha256-LYkfSgEZ+3Zvp5bijYgaVXk6DDVE5EbP9k3JRq1yJ8w="; + hash = "sha256-Ic1EFgQ+mpk/z7mG3ek+Q2agdUPdlYSbXvLlDJqa/M4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 14ff9dcf67e18..7c258307de3ae 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.52.0"; + version = "1.53.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8fNrHRZZ58FW0UOBdbUUzI3y+Y6kAyue4uHnPoODdzw="; + hash = "sha256-GC07gpx0Yeajm8LPcHFtkz/Uuc4kO46TUQs58/IEzyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix index 0c346aac1d0ce..5b249d65626ef 100644 --- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "mkdocs-git-authors-plugin"; - version = "0.9.0"; + version = "0.9.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-authors-plugin"; - rev = "refs/tags/v${version}"; - hash = "sha256-UomcEXWNt5aVE9JxP9wskkHkFYXKN/+jXwr1SXCmeyE="; + tag = "v${version}"; + hash = "sha256-2ITro34lZ+tz7ev7Yuh1wJjsSNik6VUTt3dupIajmLU="; }; propagatedBuildInputs = [ mkdocs ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 1d78557d796e2..4eafbac1307e2 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.39"; + version = "9.5.45"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-ArCd7NbqvPw3kHJd4MG62FplgXwW1gFTfdCHZqfxuqU="; + hash = "sha256-uhUatalHcObQbar1xbdR44FnQs/+qS4ad0sdB2jH/OU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index cde2beff63bd9..3e818f7c33f06 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.5.13"; + version = "0.5.14"; format = "setuptools"; pname = "num2words"; src = fetchPypi { inherit pname version; - hash = "sha256-owZHFvu/kNdcRJRQzr+8c6ahPmOyUx0JvezDqxoiCc8="; + hash = "sha256-sGbsGOVrZhajs4CGtXR9qvuqiGiyJqNhJ+BFHAzzecY="; }; propagatedBuildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 7bc6e2f1da4d6..2e2391e5d4b1a 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -7,23 +7,20 @@ fetchFromGitHub, pyopenssl, python-dateutil, - pythonOlder, pytz, setuptools, }: buildPythonPackage rec { pname = "oci"; - version = "2.139.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.141.1"; + pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-FjP68c1h97KwCCuqLVB677YyR4/HMstGfwlLUqdtNLU="; + hash = "sha256-D2iaEK25ryU1oRRahnlC3wuEIxtyjR6rAa7TXFTaRi4="; }; pythonRelaxDeps = [ @@ -31,11 +28,9 @@ buildPythonPackage rec { "pyOpenSSL" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi circuitbreaker cryptography @@ -49,14 +44,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "oci" ]; - meta = with lib; { + meta = { description = "Oracle Cloud Infrastructure Python SDK"; homepage = "https://github.com/oracle/oci-python-sdk"; changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or upl ]; - maintainers = with maintainers; [ ilian ]; + maintainers = with lib.maintainers; [ ilian ]; }; } diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index ab7927abbc28e..a2b34a52dcb72 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.5.1"; + version = "1.5.5"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-cglT8X3x6tb5ewWluKdTNDi4lFUQqeJQIBSmHGAGDmI="; + hash = "sha256-MfdvzTr+OoawjPGstBAhK7XpkqgVxk/CMApYsllRVv0="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 422f427c6ed68..9f1d47939b22d 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.7"; + version = "3.17.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; rev = "refs/tags/${version}"; - hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw="; + hash = "sha256-2mViwo39adzzhpFS056C1JU5fXr3zKorzkVyJrKKRhI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix index c0fe6b756b348..10b9ec015050f 100644 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ b/pkgs/development/python-modules/py-scrypt/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "py-scrypt"; - version = "0.8.24"; + version = "0.8.27"; src = fetchPypi { pname = "scrypt"; inherit version; - hash = "sha256-mP/eReSpVGHXPe1UunomhXZ5kg1Pj/Mg9vet5uKVMb0="; + hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 6bb1c8386bcec..beacd7d791383 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.16.0"; + version = "0.16.1"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-GMgQ7k5n4FKB43HhVsH7W7D6HydHJARhsiUnL32NV9g="; + hash = "sha256-IlMx6KxLMmgsGPysWlem9xfE5jLOpd0OJHtVFV+uzN4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index 404f29068affa..bb1605b74c790 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk="; + hash = "sha256-yHWZHB3pAUBjRdE8fd5sSs/V8IsWr2xKiBpSxsPDqwY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index f6c317cc924a0..359af2a577d89 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylibftdi"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8="; + hash = "sha256-v1tMa6c9eab234ScNFsAunY9AjIBvtm6Udh2pDl7Ftg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index e1696d0382a18..693863346bb74 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; - rev = "refs/tags/v${version}"; - hash = "sha256-8IwTMj/RqMc9UqhzyvmrirPGuMEwj3iMr+FmF+8312U="; + tag = "v${version}"; + hash = "sha256-sQNYtm+EK/F4S/Kfy87MwqDjCfV33/v8bYi48UBz+qc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 7cec1417bfc81..7d6537386687d 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.32"; + version = "3.3.37"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE="; + hash = "sha256-InDbfWzRb+Q+E6feeatHIliq83g83oUfo3Yze/BAJdM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index a7d91fcb759a8..f41e54f406aa4 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_sql"; inherit version; - hash = "sha256-93RnHx0IT6a6Q4mJJM3r5O0NAHHfjWCAQKzU8cjYaqM="; + hash = "sha256-c19SNyGHy5VrGu6MoHADn3O6iRO7i33vlC78FNUGzTY="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 71ba2f75af495..08487c7109c93 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cuNYauyJoGNzwFheb5fG/QuBUZ5B8yiWo2OZCez0XbA="; + hash = "sha256-WEh448JD6HOiLbiJVQXZVxW8eW73TMG4/pn1lhdBYeM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 6273cd695f39a..af6ffede5aed8 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.1.3"; + version = "2.1.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "amazon-redshift-python-driver"; - rev = "refs/tags/v${version}"; - hash = "sha256-NjUgmvmy0buBFpXjcEsZU0F2JNeXE3GBpkaxClvo4T0="; + tag = "v${version}"; + hash = "sha256-q8OF8osAfnAXL1BSgnhE3vQpLHfD/8vPeU2+wCCGSQs="; }; # remove addops as they add test directory and coverage parameters to pytest diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index 27fa225ba7d05..5745751eacded 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "returns"; - version = "0.23.0"; - format = "pyproject"; + version = "0.24.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dry-python"; repo = "returns"; - rev = "refs/tags/${version}"; - hash = "sha256-4ZP/wvPgqQQec/BaXuL9r7BEc2G+LztMdFul0NeEJTc="; + tag = version; + hash = "sha256-qmBxW1XxUlFpAqf2t2ix01TN5NSxOtnYqLyE5ovZU58="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index b3984446c404d..c48b87d54094f 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rjsmin"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jBvNghFD/s8jJCAStV4TYQhAqDnNRns1jxY1kBDWLa4="; + hash = "sha256-E4i1JJOkwE+8lwotdXwwH6BaPDdkAxTCzp38jYpzDMY="; }; # The package does not ship tests, and the setup machinary confuses diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index aa8c563a52185..facd9e0b23634 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.8.5"; + version = "0.8.6"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; - rev = "refs/tags/${version}"; - hash = "sha256-sd2zi0dKXLo9HCFDQrLr4icaJnwWeMPoaeTV8qaoyhQ="; + tag = version; + hash = "sha256-4/vKf5RwWbiFYKCQo4kAQzXLM85L4CwaL/MR7/xTkH8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index 191fbb5df796e..197642db2dcdc 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "simplemma"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "adbar"; repo = "simplemma"; rev = "refs/tags/v${version}"; - hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY="; + hash = "sha256-aFN/cOSqsrTJ5GMw0/SM7uoC+T1RhDTQFf8AF00Tz/o="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix index 8d028f2c63e71..aff028d3ba892 100644 --- a/pkgs/development/python-modules/sphinxawesome-theme/default.nix +++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinxawesome-theme"; - version = "5.2.0"; + version = "5.3.2"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinxawesome_theme"; - hash = "sha256-wk8eXAueR1OA0W/F8fO/2ElVgX2gkF2V9+IICdfNPF0="; + hash = "sha256-BinTi4Cu/CebEYbFOnpvryHnIbWy7NoU9IjKEHTiYx8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 28e192318adc2..986b87ef7273a 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.253.1"; + version = "0.254.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,8 +52,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; - rev = "refs/tags/${version}"; - hash = "sha256-lerQynV/c0fLX+Du1j9bX0i2kvuWKmtH7RIBZxuDkK8="; + tag = version; + hash = "sha256-lD5TQvBxv4+1fuDHoX45kkTFRHrURRL2jLH/rPfCzzA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/torchdiffeq/default.nix b/pkgs/development/python-modules/torchdiffeq/default.nix index 455450a718c16..fed9c71ce5465 100644 --- a/pkgs/development/python-modules/torchdiffeq/default.nix +++ b/pkgs/development/python-modules/torchdiffeq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "torchdiffeq"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wOV8PIif7dp/I6YBXb/Nba5QcqBt1u0Q6CAMIAmEQEM="; + hash = "sha256-tQ03YNE/0TjczqxlH0uAOW9E/vzr0DegM/7P6qnMEuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index a4027dc808f7e..fde52c82ab8f8 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.9.0.20240906"; + version = "2.9.0.20241003"; pyproject = true; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24="; + hash = "sha256-WMuFRJsqVtZoTkGu77TEKAYxJGoNoacZvb5vP7AxdEY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 5878c4bd88a66..1b832700620b4 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240903"; + version = "4.6.0.20241004"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S6saN42/I8LJXDcN/biajwM5V8T9GlP+5xtSnBgv4Ag="; + hash = "sha256-XxfSs/kJGrdThBU7+idmGf+hz2o42mDhDV5nScxbkC4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index bb2211a43dfb5..e18bd2e288e7e 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.10.2"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24="; + hash = "sha256-AxI0d+MGTIHv5xK/nTcsfHLyeQcRQx+bqlnPlupgcmc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 37662921905a6..6466e08496f6e 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; + hash = "sha256-ES5+o0qaPOkKrqVBgvDTr+9NGpE+63XpiiY7SXjNc8Y="; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 7bb87b98bc565..f9435e61a32e5 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.11"; + version = "0.7.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y="; + hash = "sha256-NiXLNsRQ/ah+fB2r91A1oqf/8Yt95Vdt2JQFJE73HXo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 9358f20e1a33d..cb0c46abb611c 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -6,22 +6,12 @@ waitress, }: -let - fs = lib.fileset; -in - buildPythonPackage { pname = "waitress-django"; version = "1.0.0"; pyproject = true; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./setup.py - ./src - ]; - }; + src = ./src; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/src/setup.py similarity index 76% rename from pkgs/development/python-modules/waitress-django/setup.py rename to pkgs/development/python-modules/waitress-django/src/setup.py index 16fde78f42a9f..65f51237b589d 100644 --- a/pkgs/development/python-modules/waitress-django/setup.py +++ b/pkgs/development/python-modules/waitress-django/src/setup.py @@ -7,6 +7,5 @@ , description = "A waitress WSGI server serving django" , author = "Bas van Dijk" , author_email = "v.dijk.bas@gmail.com" - , package_dir = {"" : "src"} - , scripts = ["src/waitress-serve-django"] + , scripts = ["waitress-serve-django"] ) diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index ed966cace7130..45e1cd6db59bb 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wheel-inspect"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jwodder"; repo = "wheel-inspect"; rev = "refs/tags/v${version}"; - hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0="; + hash = "sha256-Mdw9IlY/2qDlb5FumNH+VHmg7vrUzo3vn+03QsUGgo8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index c1a0a6cc900f1..3474c86b27515 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.10"; + version = "1.2.12"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Y1fWHpvrqGuBPyJ2dO2y0W2zhEgcTJABtkOAoZ7uyZU="; + hash = "sha256-K66LC/HhajAMCWU7PPfxkoaK84kLlAccYAH5FXoc+yE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix similarity index 98% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix rename to pkgs/development/tools/yarn2nix-moretea/default.nix index 3cc5e31c3c152..94048c28f88b0 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/default.nix @@ -398,15 +398,7 @@ in rec { }); yarn2nix = mkYarnPackage { - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./bin - ./lib - ./package.json - ./yarn.lock - ]; - }; + src = ./yarn2nix; # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. @@ -415,7 +407,7 @@ in rec { # Using the filter above and importing package.json from the filtered # source results in an error in restricted mode. To circumvent this, # we import package.json from the unfiltered source - packageJSON = ./package.json; + packageJSON = ./yarn2nix/package.json; yarnFlags = defaultYarnFlags ++ [ "--ignore-scripts" "--production=true" ]; @@ -446,7 +438,7 @@ in rec { mkdir -p $out/lib mkdir -p $out/bin - cp ${./lib/urlToName.js} $out/lib/urlToName.js + cp ${./yarn2nix/lib/urlToName.js} $out/lib/urlToName.js cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock patchShebangs $out diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh b/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh rename to pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn.nix similarity index 100% rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix rename to pkgs/development/tools/yarn2nix-moretea/yarn.nix diff --git a/pkgs/test/haskell/cabalSdist/default.nix b/pkgs/test/haskell/cabalSdist/default.nix index d9dc2bada6e22..147602126ded6 100644 --- a/pkgs/test/haskell/cabalSdist/default.nix +++ b/pkgs/test/haskell/cabalSdist/default.nix @@ -6,18 +6,7 @@ }: let - src = lib.fileset.toSource { - root = ./local; - fileset = lib.fileset.unions [ - ./local/app - ./local/CHANGELOG.md - ./local/local.cabal - ]; - }; - # This prevents the source from depending on the formatting of the ./local/generated.nix file - localRaw = haskell.lib.compose.overrideSrc { - inherit src; - } (haskellPackages.callPackage ./local/generated.nix { }); + localRaw = haskellPackages.callPackage ./generated.nix { }; in lib.recurseIntoAttrs rec { @@ -28,7 +17,6 @@ lib.recurseIntoAttrs rec { localFromCabalSdist = haskellPackages.buildFromCabalSdist localRaw; - # NOTE: ./local refers to the "./." path in `./local/generated.nix`. # This test makes sure that localHasNoDirectReference can actually fail if # it doesn't do anything. If this test fails, either the test setup was broken, # or Haskell packaging has changed the way `src` is treated in such a way that @@ -39,7 +27,7 @@ lib.recurseIntoAttrs rec { drvPath = builtins.unsafeDiscardOutputDependency localRaw.drvPath; } '' - grep ${src} $drvPath >/dev/null + grep ${localRaw.src} $drvPath >/dev/null touch $out ''; @@ -49,7 +37,7 @@ lib.recurseIntoAttrs rec { drvPath = builtins.unsafeDiscardOutputDependency localFromCabalSdist.drvPath; } '' - grep -v ${src} $drvPath >/dev/null + grep -v ${localRaw.src} $drvPath >/dev/null touch $out ''; } diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/generated.nix similarity index 64% rename from pkgs/test/haskell/cabalSdist/local/generated.nix rename to pkgs/test/haskell/cabalSdist/generated.nix index f0f52a03e0d03..0cf12d6d565df 100644 --- a/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/pkgs/test/haskell/cabalSdist/generated.nix @@ -1,4 +1,4 @@ -# nix run ../../../../..#cabal2nix -- ./. +# nix run ../../../../..#cabal2nix -- ./local { mkDerivation, base, @@ -7,10 +7,11 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = ./.; # also referred to as ./local in the test; these are the same path constants + src = ./local; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; description = "Nixpkgs test case"; license = lib.licenses.mit; + mainProgram = "local"; } diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index 012bce8541e67..68f9b25dba75a 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -1,7 +1,7 @@ { pkgs, haskellPackages }: let - # This can be regenerated by running `cabal2nix .` in the current directory. + # This can be regenerated by running `cabal2nix ./src` in the current directory. pkgDef = { mkDerivation, @@ -11,19 +11,11 @@ let mkDerivation { pname = "haskell-setBuildTarget"; version = "0.1.0.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./haskell-setBuildTarget.cabal - ./Bar.hs - ./Foo.hs - ./Setup.hs - ]; - }; + src = ./src; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - license = lib.licenses.bsd3; + license = "unknown"; }; drv = haskellPackages.callPackage pkgDef { }; diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/src/Bar.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Bar.hs rename to pkgs/test/haskell/setBuildTarget/src/Bar.hs diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/src/Foo.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Foo.hs rename to pkgs/test/haskell/setBuildTarget/src/Foo.hs diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/src/Setup.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Setup.hs rename to pkgs/test/haskell/setBuildTarget/src/Setup.hs diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal similarity index 100% rename from pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal rename to pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags/add-flags.c similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.c rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.c diff --git a/pkgs/test/make-binary-wrapper/add-flags.cmdline b/pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.cmdline rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline diff --git a/pkgs/test/make-binary-wrapper/add-flags.env b/pkgs/test/make-binary-wrapper/add-flags/add-flags.env similarity index 100% rename from pkgs/test/make-binary-wrapper/add-flags.env rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.env diff --git a/pkgs/test/make-binary-wrapper/argv0.c b/pkgs/test/make-binary-wrapper/argv0/argv0.c similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.c rename to pkgs/test/make-binary-wrapper/argv0/argv0.c diff --git a/pkgs/test/make-binary-wrapper/argv0.cmdline b/pkgs/test/make-binary-wrapper/argv0/argv0.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.cmdline rename to pkgs/test/make-binary-wrapper/argv0/argv0.cmdline diff --git a/pkgs/test/make-binary-wrapper/argv0.env b/pkgs/test/make-binary-wrapper/argv0/argv0.env similarity index 100% rename from pkgs/test/make-binary-wrapper/argv0.env rename to pkgs/test/make-binary-wrapper/argv0/argv0.env diff --git a/pkgs/test/make-binary-wrapper/basic.c b/pkgs/test/make-binary-wrapper/basic/basic.c similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.c rename to pkgs/test/make-binary-wrapper/basic/basic.c diff --git a/pkgs/test/make-binary-wrapper/basic.cmdline b/pkgs/test/make-binary-wrapper/basic/basic.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.cmdline rename to pkgs/test/make-binary-wrapper/basic/basic.cmdline diff --git a/pkgs/test/make-binary-wrapper/basic.env b/pkgs/test/make-binary-wrapper/basic/basic.env similarity index 100% rename from pkgs/test/make-binary-wrapper/basic.env rename to pkgs/test/make-binary-wrapper/basic/basic.env diff --git a/pkgs/test/make-binary-wrapper/chdir.c b/pkgs/test/make-binary-wrapper/chdir/chdir.c similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.c rename to pkgs/test/make-binary-wrapper/chdir/chdir.c diff --git a/pkgs/test/make-binary-wrapper/chdir.cmdline b/pkgs/test/make-binary-wrapper/chdir/chdir.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.cmdline rename to pkgs/test/make-binary-wrapper/chdir/chdir.cmdline diff --git a/pkgs/test/make-binary-wrapper/chdir.env b/pkgs/test/make-binary-wrapper/chdir/chdir.env similarity index 100% rename from pkgs/test/make-binary-wrapper/chdir.env rename to pkgs/test/make-binary-wrapper/chdir/chdir.env diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination/combination.c similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.c rename to pkgs/test/make-binary-wrapper/combination/combination.c diff --git a/pkgs/test/make-binary-wrapper/combination.cmdline b/pkgs/test/make-binary-wrapper/combination/combination.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.cmdline rename to pkgs/test/make-binary-wrapper/combination/combination.cmdline diff --git a/pkgs/test/make-binary-wrapper/combination.env b/pkgs/test/make-binary-wrapper/combination/combination.env similarity index 100% rename from pkgs/test/make-binary-wrapper/combination.env rename to pkgs/test/make-binary-wrapper/combination/combination.env diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 036b70f7594e7..6f086de299a0b 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -20,16 +20,7 @@ let runCommand "make-binary-wrapper-test-${testname}" env '' mkdir -p tmp/foo # for the chdir test - source=${ - lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - (./. + "/${testname}.cmdline") - (./. + "/${testname}.c") - (lib.fileset.maybeMissing (./. + "/${testname}.env")) - ]; - } - } + source=${./${testname}} params=$(<"$source/${testname}.cmdline") eval "makeCWrapper /send/me/flags $params" > wrapper.c diff --git a/pkgs/test/make-binary-wrapper/env.c b/pkgs/test/make-binary-wrapper/env/env.c similarity index 100% rename from pkgs/test/make-binary-wrapper/env.c rename to pkgs/test/make-binary-wrapper/env/env.c diff --git a/pkgs/test/make-binary-wrapper/env.cmdline b/pkgs/test/make-binary-wrapper/env/env.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/env.cmdline rename to pkgs/test/make-binary-wrapper/env/env.cmdline diff --git a/pkgs/test/make-binary-wrapper/env.env b/pkgs/test/make-binary-wrapper/env/env.env similarity index 100% rename from pkgs/test/make-binary-wrapper/env.env rename to pkgs/test/make-binary-wrapper/env/env.env diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.c b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.c rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.cmdline b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.cmdline rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.env b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env similarity index 100% rename from pkgs/test/make-binary-wrapper/inherit-argv0.env rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env diff --git a/pkgs/test/make-binary-wrapper/invalid-env.c b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c similarity index 100% rename from pkgs/test/make-binary-wrapper/invalid-env.c rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c diff --git a/pkgs/test/make-binary-wrapper/invalid-env.cmdline b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/invalid-env.cmdline rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.c b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.c rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.cmdline b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.cmdline rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.env b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env similarity index 100% rename from pkgs/test/make-binary-wrapper/overlength-strings.env rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env diff --git a/pkgs/test/make-binary-wrapper/prefix.c b/pkgs/test/make-binary-wrapper/prefix/prefix.c similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.c rename to pkgs/test/make-binary-wrapper/prefix/prefix.c diff --git a/pkgs/test/make-binary-wrapper/prefix.cmdline b/pkgs/test/make-binary-wrapper/prefix/prefix.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.cmdline rename to pkgs/test/make-binary-wrapper/prefix/prefix.cmdline diff --git a/pkgs/test/make-binary-wrapper/prefix.env b/pkgs/test/make-binary-wrapper/prefix/prefix.env similarity index 100% rename from pkgs/test/make-binary-wrapper/prefix.env rename to pkgs/test/make-binary-wrapper/prefix/prefix.env diff --git a/pkgs/test/make-binary-wrapper/suffix.c b/pkgs/test/make-binary-wrapper/suffix/suffix.c similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.c rename to pkgs/test/make-binary-wrapper/suffix/suffix.c diff --git a/pkgs/test/make-binary-wrapper/suffix.cmdline b/pkgs/test/make-binary-wrapper/suffix/suffix.cmdline similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.cmdline rename to pkgs/test/make-binary-wrapper/suffix/suffix.cmdline diff --git a/pkgs/test/make-binary-wrapper/suffix.env b/pkgs/test/make-binary-wrapper/suffix/suffix.env similarity index 100% rename from pkgs/test/make-binary-wrapper/suffix.env rename to pkgs/test/make-binary-wrapper/suffix/suffix.env diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e171039a7c218..9508dce9689e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5667,7 +5667,7 @@ with pkgs; yarn-berry = callPackage ../development/tools/yarn-berry { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; }; inherit (yarn2nix-moretea) yarn2nix diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 5c224802d5bf3..fd443ac773ffb 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -27,6 +27,10 @@ , # Allow a configuration attribute set to be passed in as an argument. config ? {} +, # Temporary hack to let Nixpkgs forbid internal use of `lib.fileset` + # until is fixed. + __allowFileset ? true + , # List of overlays layers used to extend Nixpkgs. overlays ? [] @@ -47,7 +51,24 @@ let # Rename the function arguments crossSystem0 = crossSystem; in let - lib = import ../../lib; + pristineLib = import ../../lib; + + lib = + if __allowFileset then + pristineLib + else + pristineLib.extend (_: _: { + fileset = abort '' + + The use of `lib.fileset` is currently forbidden in Nixpkgs due to the + upstream Nix bug . This + causes difficult‐to‐debug errors when combined with chroot stores, + such as in the NixOS installer. + + For packages that require source to be vendored inside Nixpkgs, + please use a subdirectory of the package instead. + ''; + }); inherit (lib) throwIfNot; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 1ce8f8f709e21..492a7503a03d6 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -17,7 +17,10 @@ , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { + config = { allowUnfree = false; inHydra = true; }; + __allowFileset = false; + } }: let diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 945f0e6d2954e..a19bc6f8ecaaa 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -43,6 +43,8 @@ in "${variant}Support" = true; inHydra = true; }; + + __allowFileset = false; }, ... }@args: diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index c7581c47d3414..a2821386ce3e7 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -3,7 +3,10 @@ , packageSet ? (import ../..) , scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { + config = { allowUnfree = false; inHydra = true; }; + __allowFileset = false; + } }: let diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix index 0b70ea631244f..e6caabec04e94 100644 --- a/pkgs/top-level/release-outpaths.nix +++ b/pkgs/top-level/release-outpaths.nix @@ -57,6 +57,8 @@ let inHydra = true; }; + + __allowFileset = false; }; }; recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index a6222acaad53d..161a6ddb68c38 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -15,6 +15,8 @@ allowUnfree = false; inHydra = true; }; + + __allowFileset = false; }, }: diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 42cf6e79b7325..511cef6a0d8a3 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,6 +19,8 @@ allowUnfree = false; inHydra = true; }; + + __allowFileset = false; }, }: diff --git a/pkgs/top-level/release-unfree-redistributable.nix b/pkgs/top-level/release-unfree-redistributable.nix index 96384e9fb0207..45940c4d02ccb 100644 --- a/pkgs/top-level/release-unfree-redistributable.nix +++ b/pkgs/top-level/release-unfree-redistributable.nix @@ -37,6 +37,8 @@ cudaSupport = true; inHydra = true; }; + + __allowFileset = false; }, # We only build the full package set on infrequently releasing channels. full ? false, diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0140f0bd9d6a4..78bdf1491125e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -28,16 +28,20 @@ # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { - allowUnfree = false; - inHydra = true; - # Exceptional unsafe packages that we still build and distribute, - # so users choosing to allow don't have to rebuild them every time. - permittedInsecurePackages = [ - "olm-3.2.16" # see PR #347899 - "kanidm_1_3-1.3.3" - ]; - }; } +, nixpkgsArgs ? { + config = { + allowUnfree = false; + inHydra = true; + # Exceptional unsafe packages that we still build and distribute, + # so users choosing to allow don't have to rebuild them every time. + permittedInsecurePackages = [ + "olm-3.2.16" # see PR #347899 + "kanidm_1_3-1.3.3" + ]; + }; + + __allowFileset = false; + } # This flag, if set to true, will inhibit the use of `mapTestOn` # and `release-lib.packagePlatforms`. Generally, it causes the