nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
cdd38f16 c9c8e35a

+544 -90
+55
doc/languages-frameworks/coq.section.md
··· 88 88 }; 89 89 } 90 90 ``` 91 + 92 + ## Three ways of overriding Coq packages {#coq-overriding-packages} 93 + 94 + There are three distinct ways of changing a Coq package by overriding one of its values: `.override`, `overrideCoqDerivation`, and `.overrideAttrs`. This section explains what sort of values can be overridden with each of these methods. 95 + 96 + ### `.override` {#coq-override} 97 + 98 + `.override` lets you change arguments to a Coq derivation. In the case of the `multinomials` package above, `.override` would let you override arguments like `mkCoqDerivation`, `version`, `coq`, `mathcomp`, `mathcom-finmap`, etc. 99 + 100 + For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency: 101 + 102 + ```nix 103 + multinomials.override { 104 + mathcomp = my-special-mathcomp; 105 + } 106 + ``` 107 + 108 + In Nixpkgs, all Coq derivations take a `version` argument. This can be overridden in order to easily use a different version: 109 + 110 + ```nix 111 + coqPackages.multinomials.override { 112 + version = "1.5.1"; 113 + } 114 + ``` 115 + 116 + Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions. 117 + 118 + ### `overrideCoqDerivation` {#coq-overrideCoqDerivation} 119 + 120 + The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqDerivation`. These arguments are described in [](#coq-packages-attribute-sets-coqpackages). 121 + 122 + For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release: 123 + 124 + ```nix 125 + coqPackages.lib.overrideCoqDerivation 126 + { 127 + defaultVersion = "2.0"; 128 + release."2.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkk"; 129 + } 130 + coqPackages.multinomials 131 + ``` 132 + 133 + ### `.overrideAttrs` {#coq-overrideAttrs} 134 + 135 + `.overrideAttrs` lets you override arguments to the underlying `stdenv.mkDerivation` call. Internally, `mkCoqDerivation` uses `stdenv.mkDerivation` to create derivations for Coq libraries. You can override arguments to `stdenv.mkDerivation` with `.overrideAttrs`. 136 + 137 + For instance, here is how you could add some code to be performed in the derivation after installation is complete: 138 + 139 + ```nix 140 + coqPackages.multinomials.overrideAttrs (oldAttrs: { 141 + postInstall = oldAttrs.postInstall or "" + '' 142 + echo "you can do anything you want here" 143 + ''; 144 + }) 145 + ```
+6
maintainers/maintainer-list.nix
··· 13263 13263 }]; 13264 13264 name = "Karim Vergnes"; 13265 13265 }; 13266 + thetallestjj = { 13267 + email = "me+nixpkgs@jeroen-jetten.com"; 13268 + github = "thetallestjj"; 13269 + githubId = 6579555; 13270 + name = "Jeroen Jetten"; 13271 + }; 13266 13272 theuni = { 13267 13273 email = "ct@flyingcircus.io"; 13268 13274 github = "ctheune";
+5 -2
pkgs/applications/editors/sublime/4/common.nix
··· 2 2 3 3 { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook 4 4 , writeShellScript, common-updater-scripts, curl 5 - , openssl, bzip2, bash, unzip, zip 5 + , openssl_1_1, bzip2, bash, unzip, zip 6 6 }: 7 7 8 8 let ··· 15 15 versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; 16 16 versionFile = builtins.toString ./packages.nix; 17 17 18 - libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ]; 18 + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ]; 19 19 in let 20 20 binaryPackage = stdenv.mkDerivation rec { 21 21 pname = "${pnameBase}-bin"; ··· 64 64 65 65 installPhase = '' 66 66 runHook preInstall 67 + 68 + # No need to patch these libraries, it works well with our own 69 + rm libcrypto.so.1.1 libssl.so.1.1 67 70 68 71 mkdir -p $out 69 72 cp -r * $out/
+2 -2
pkgs/applications/graphics/jpegoptim/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, libjpeg }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "1.4.7"; 4 + version = "1.5.0"; 5 5 pname = "jpegoptim"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "tjko"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk="; 11 + sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; 12 12 }; 13 13 14 14 # There are no checks, it seems.
+2 -2
pkgs/applications/logging/humioctl/default.nix
··· 1 1 { buildGoModule, fetchFromGitHub, installShellFiles, lib }: 2 2 3 3 let 4 - humioCtlVersion = "0.30.0"; 5 - sha256 = "sha256-BwpnqaUZvttGRtsZT2xcyXfMJZ7EIsKenTPF669ktQM="; 4 + humioCtlVersion = "0.30.1"; 5 + sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM="; 6 6 vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; 7 7 in buildGoModule { 8 8 name = "humioctl-${humioCtlVersion}";
+2 -2
pkgs/applications/misc/gpsprune/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "gpsprune"; 5 - version = "22"; 5 + version = "22.1"; 6 6 7 7 src = fetchurl { 8 8 url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; 9 - sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q="; 9 + sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI="; 10 10 }; 11 11 12 12 dontUnpack = true;
+3 -3
pkgs/build-support/dotnet/build-dotnet-module/default.nix
··· 180 180 ;; 181 181 esac 182 182 183 - deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")" 184 - export HOME=$(mktemp -td "XXXXXX-${pname}-home") 183 + deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")" 184 + export HOME=$(mktemp -td "${pname}-home-XXXXXX") 185 185 mkdir -p "$HOME/nuget_pkgs" 186 186 187 187 store_src="${srcOnly args}" 188 - src="$(mktemp -td "XXXXXX-${pname}-src")" 188 + src="$(mktemp -td "${pname}-src-XXXXXX")" 189 189 cp -rT "$store_src" "$src" 190 190 chmod -R +w "$src" 191 191 trap "rm -rf $src $HOME" EXIT
+1 -1
pkgs/build-support/dotnet/make-nuget-deps/default.nix
··· 4 4 fetchNuGet = { pname, version, sha256 5 5 , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: 6 6 fetchurl { 7 - name = "${pname}-${version}.nupkg"; 7 + name = "${pname}.${version}.nupkg"; 8 8 inherit url sha256; 9 9 }; 10 10 })
+3 -1
pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
··· 30 30 pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" 31 31 32 32 pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")" 33 - if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then 33 + if [[ -d $pkg_src ]]; then 34 + continue 35 + elif [[ $pkg_src != https://api.nuget.org/* ]]; then 34 36 pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}" 35 37 pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg" 36 38 echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}
+11 -6
pkgs/data/fonts/iosevka/comfy.nix
··· 2 2 3 3 let 4 4 sets = [ 5 + # The compact, sans-serif set: 5 6 "comfy" 6 7 "comfy-fixed" 7 8 "comfy-duo" 9 + # The compact, serif set: 10 + "comfy-motion" 11 + "comfy-motion-fixed" 12 + "comfy-motion-duo" 13 + # The wide, sans-serif set: 8 14 "comfy-wide" 9 15 "comfy-wide-fixed" 10 - "comfy-motion" 11 - "comfy-motion-duo" 16 + "comfy-wide-duo" 12 17 ]; 13 - version = "0.4.0"; 18 + version = "1.0.0"; 14 19 src = fetchFromSourcehut { 15 20 owner = "~protesilaos"; 16 21 repo = "iosevka-comfy"; 17 22 rev = version; 18 - sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw="; 23 + sha256 = "0psbz40hicv3v3x7yq26hy6nfbzml1kha24x6a88rfrncdp6bds7"; 19 24 }; 20 25 privateBuildPlan = src.outPath + "/private-build-plans.toml"; 21 26 overrideAttrs = (attrs: { ··· 29 24 meta = with lib; { 30 25 inherit (src.meta) homepage; 31 26 description = '' 32 - Custom build of Iosevka with a rounded style and open shapes, 33 - adjusted metrics, and overrides for almost all individual glyphs 27 + Customised build of the Iosevka typeface, with a consistent 28 + rounded style and overrides for almost all individual glyphs 34 29 in both roman (upright) and italic (slanted) variants. 35 30 ''; 36 31 license = licenses.ofl;
+7
pkgs/development/beam-modules/mix-release.nix
··· 18 18 , mixNixDeps ? { } 19 19 , elixir ? inputs.elixir 20 20 , hex ? inputs.hex.override { inherit elixir; } 21 + , stripDebug ? true 21 22 , ... 22 23 }@attrs: 23 24 let ··· 26 25 overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ]; 27 26 in 28 27 assert mixNixDeps != { } -> mixFodDeps == null; 28 + assert stripDebug -> !enableDebugInfo; 29 + 29 30 stdenv.mkDerivation (overridable // { 30 31 # rg is used as a better grep to search for erlang references in the final release 31 32 nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ]; ··· 119 116 substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" 120 117 done 121 118 fi 119 + '' + lib.optionalString stripDebug '' 120 + # strip debug symbols to avoid hardreferences to "foreign" closures actually 121 + # not needed at runtime, while at the same time reduce size of BEAM files. 122 + erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop 122 123 ''; 123 124 124 125 # TODO investigate why the resulting closure still has
+50 -27
pkgs/development/compilers/dotnet/build-dotnet.nix
··· 18 18 , openssl_1_1 19 19 , libuuid 20 20 , zlib 21 + , libkrb5 21 22 , curl 22 23 , lttng-ust_2_12 24 + , testers 25 + , runCommand 23 26 }: 24 27 25 28 let ··· 40 37 sdk = ".NET SDK ${version}"; 41 38 }; 42 39 in 43 - stdenv.mkDerivation rec { 40 + stdenv.mkDerivation (finalAttrs: rec { 44 41 inherit pname version; 45 42 46 43 # Some of these dependencies are `dlopen()`ed. 47 - rpath = lib.makeLibraryPath ([ 48 - stdenv.cc.cc 49 - zlib 50 - curl 51 - icu 52 - libunwind 53 - libuuid 54 - openssl_1_1 55 - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); 56 - 57 44 nativeBuildInputs = [ 58 45 makeWrapper 59 46 ] ++ lib.optional stdenv.isLinux autoPatchelfHook; 60 47 61 48 buildInputs = [ 62 49 stdenv.cc.cc 63 - ]; 50 + zlib 51 + icu 52 + libkrb5 53 + # this must be before curl for autoPatchElf to find it 54 + # curl brings in its own openssl 55 + openssl_1_1 56 + curl 57 + ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; 64 58 65 59 src = fetchurl ( 66 60 srcs."${stdenv.hostPlatform.system}" or (throw ··· 77 77 runHook postInstall 78 78 ''; 79 79 80 - postFixup = lib.optionalString stdenv.isLinux '' 81 - patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet 82 - patchelf --set-rpath "${rpath}" $out/dotnet 83 - find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; 84 - find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; 85 - 86 - wrapProgram $out/bin/dotnet \ 87 - --prefix LD_LIBRARY_PATH : ${icu}/lib 88 - ''; 89 - 90 80 doInstallCheck = true; 91 81 installCheckPhase = '' 92 - # Fixes cross 93 - export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 94 - 95 82 $out/bin/dotnet --info 83 + ''; 84 + 85 + # Tell autoPatchelf about runtime dependencies. 86 + # (postFixup phase is run before autoPatchelfHook.) 87 + postFixup = lib.optionalString stdenv.isLinux '' 88 + patchelf \ 89 + --add-needed libicui18n.so \ 90 + --add-needed libicuuc.so \ 91 + $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ 92 + $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ 93 + $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost 94 + patchelf \ 95 + --add-needed libgssapi_krb5.so \ 96 + $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ 97 + $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost 98 + patchelf \ 99 + --add-needed libssl.so \ 100 + $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ 101 + $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost 96 102 ''; 97 103 98 104 setupHook = writeText "dotnet-setup-hook" '' ··· 123 117 124 118 # Convert a "stdenv.hostPlatform.system" to a dotnet RID 125 119 systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); 120 + 121 + tests = { 122 + version = testers.testVersion { 123 + package = finalAttrs.finalPackage; 124 + }; 125 + 126 + smoke-test = runCommand "dotnet-sdk-smoke-test" { 127 + nativeBuildInputs = [ finalAttrs.finalPackage ]; 128 + } '' 129 + HOME=$(pwd)/fake-home 130 + dotnet new console 131 + dotnet build 132 + output="$(dotnet run)" 133 + # yes, older SDKs omit the comma 134 + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" 135 + ''; 136 + }; 126 137 }; 127 138 128 139 meta = with lib; { ··· 148 125 license = licenses.mit; 149 126 maintainers = with maintainers; [ kuznero mdarocha ]; 150 127 mainProgram = "dotnet"; 151 - platforms = builtins.attrNames srcs; 128 + platforms = attrNames srcs; 152 129 }; 153 - } 130 + })
+5
pkgs/development/python-modules/aioaseko/default.nix
··· 3 3 , buildPythonPackage 4 4 , fetchFromGitHub 5 5 , pythonOlder 6 + , setuptools 6 7 }: 7 8 8 9 buildPythonPackage rec { ··· 19 18 rev = "v${version}"; 20 19 hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 propagatedBuildInputs = [ 24 27 aiohttp
+2
pkgs/development/python-modules/aiomusiccast/default.nix
··· 4 4 , fetchFromGitHub 5 5 , poetry-core 6 6 , aiohttp 7 + , setuptools 7 8 }: 8 9 9 10 buildPythonPackage rec { ··· 32 31 33 32 propagatedBuildInputs = [ 34 33 aiohttp 34 + setuptools 35 35 ]; 36 36 37 37 # upstream has no tests
+5
pkgs/development/python-modules/aiosenz/default.nix
··· 5 5 , httpx 6 6 , pytestCheckHook 7 7 , pythonOlder 8 + , setuptools 8 9 }: 9 10 10 11 buildPythonPackage rec { ··· 21 20 rev = version; 22 21 sha256 = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; 23 22 }; 23 + 24 + nativeBuildInputs = [ 25 + setuptools 26 + ]; 24 27 25 28 propagatedBuildInputs = [ 26 29 httpx
+5
pkgs/development/python-modules/aurorapy/default.nix
··· 5 5 , pyserial 6 6 , pytestCheckHook 7 7 , pythonOlder 8 + , setuptools 8 9 , six 9 10 }: 10 11 ··· 22 21 rev = version; 23 22 hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; 24 23 }; 24 + 25 + nativeBuildInputs = [ 26 + setuptools 27 + ]; 25 28 26 29 propagatedBuildInputs = [ 27 30 future
+2
pkgs/development/python-modules/av/default.nix
··· 6 6 # build 7 7 , cython 8 8 , pkg-config 9 + , setuptools 9 10 10 11 # runtime 11 12 , ffmpeg ··· 34 33 nativeBuildInputs = [ 35 34 cython 36 35 pkg-config 36 + setuptools 37 37 ]; 38 38 39 39 buildInputs = [
+5
pkgs/development/python-modules/bitlist/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , setuptools 4 5 , nose 5 6 , parts 6 7 , pytestCheckHook ··· 19 18 inherit pname version; 20 19 hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI="; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 propagatedBuildInputs = [ 24 27 parts
+28
pkgs/development/python-modules/deep-chainmap/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + }: 5 + 6 + buildPythonPackage rec { 7 + pname = "deep-chainmap"; 8 + version = "0.1.1"; 9 + 10 + src = fetchPypi { 11 + pname = "deep_chainmap"; 12 + inherit version; 13 + sha256 = "sha256-6K7dyB5iQzzw3lXLcU10SVsiHZ+SAXhz9DSCkYnPQAA="; 14 + }; 15 + 16 + # Tests are not published to pypi 17 + doCheck = false; 18 + 19 + pythonImportsCheck = [ "deep_chainmap" ]; 20 + 21 + # See the guide for more information: https://nixos.org/nixpkgs/manual/#chap-meta 22 + meta = with lib; { 23 + description = "A recursive subclass of ChainMap"; 24 + homepage = "https://github.com/neutrinoceros/deep-chainmap"; 25 + license = licenses.mit; 26 + maintainers = with maintainers; [ rehno-lindeque ]; 27 + }; 28 + }
+5
pkgs/development/python-modules/desktop-notifier/default.nix
··· 4 4 , pythonOlder 5 5 , stdenv 6 6 , packaging 7 + , setuptools 7 8 , importlib-resources 8 9 , dbus-next 9 10 }: ··· 21 20 rev = "v${version}"; 22 21 sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4="; 23 22 }; 23 + 24 + nativeBuildInputs = [ 25 + setuptools 26 + ]; 24 27 25 28 propagatedBuildInputs = [ 26 29 packaging
+2
pkgs/development/python-modules/dunamai/default.nix
··· 6 6 , importlib-metadata 7 7 , packaging 8 8 , pytestCheckHook 9 + , setuptools 9 10 }: 10 11 11 12 buildPythonPackage rec { ··· 40 39 41 40 checkInputs = [ 42 41 pytestCheckHook 42 + setuptools 43 43 ]; 44 44 45 45 pythonImportsCheck = [ "dunamai" ];
+5
pkgs/development/python-modules/exdown/default.nix
··· 3 3 , isPy27 4 4 , fetchPypi 5 5 , pythonOlder 6 + , setuptools 6 7 , importlib-metadata 7 8 , pytestCheckHook 8 9 }: ··· 19 18 inherit pname version; 20 19 sha256 = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0="; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; 24 27
+4 -1
pkgs/development/python-modules/falcon/default.nix
··· 6 6 7 7 # build 8 8 , cython 9 + , setuptools 9 10 10 11 # tests 11 12 , aiofiles ··· 39 38 hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; 40 39 }; 41 40 42 - nativeBuildInputs = lib.optionals (!isPyPy) [ 41 + nativeBuildInputs = [ 42 + setuptools 43 + ] ++ lib.optionals (!isPyPy) [ 43 44 cython 44 45 ]; 45 46
+5
pkgs/development/python-modules/fasteners/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , diskcache 5 6 , more-itertools 6 7 , pytestCheckHook ··· 18 17 rev = version; 19 18 hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; 20 19 }; 20 + 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 21 24 22 25 checkInputs = [ 23 26 diskcache
+10 -4
pkgs/development/python-modules/goodwe/default.nix
··· 3 3 , fetchFromGitHub 4 4 , pytestCheckHook 5 5 , pythonOlder 6 + , setuptools 6 7 }: 7 8 8 9 buildPythonPackage rec { ··· 20 19 sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; 21 20 }; 22 21 23 - checkInputs = [ 24 - pytestCheckHook 25 - ]; 26 - 27 22 postPatch = '' 28 23 substituteInPlace setup.cfg \ 29 24 --replace "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ 30 25 --replace "version: file: VERSION" "version = ${version}" 31 26 ''; 32 27 28 + nativeBuildInputs = [ 29 + setuptools 30 + ]; 31 + 33 32 pythonImportsCheck = [ 34 33 "goodwe" 35 34 ]; 35 + 36 + checkInputs = [ 37 + pytestCheckHook 38 + ]; 39 + 36 40 37 41 meta = with lib; { 38 42 description = "Python library for connecting to GoodWe inverter";
+5
pkgs/development/python-modules/homeconnect/default.nix
··· 4 4 , requests 5 5 , requests-oauthlib 6 6 , pythonOlder 7 + , setuptools 7 8 , six 8 9 }: 9 10 ··· 19 18 inherit pname version; 20 19 hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 propagatedBuildInputs = [ 24 27 requests
+15 -6
pkgs/development/python-modules/http-parser/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 - , pytest 4 + , cython 5 + , setuptools 6 + , pytestCheckHook 5 7 }: 6 8 7 9 buildPythonPackage rec { ··· 14 12 src = fetchFromGitHub { 15 13 owner = "benoitc"; 16 14 repo = pname; 17 - rev = version; 18 - sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; 15 + rev = "refs/tags/${version}"; 16 + hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU="; 19 17 }; 20 18 21 - checkInputs = [ pytest ]; 19 + nativeBuildInputs = [ 20 + setuptools 21 + ]; 22 22 23 - checkPhase = "pytest testing/"; 24 23 25 - pythonImportsCheck = [ "http_parser" ]; 24 + pythonImportsCheck = [ 25 + "http_parser" 26 + ]; 27 + 28 + checkInputs = [ 29 + pytestCheckHook 30 + ]; 26 31 27 32 meta = with lib; { 28 33 description = "HTTP request/response parser for python in C";
+5
pkgs/development/python-modules/json-stream/default.nix
··· 4 4 , pytestCheckHook 5 5 , pythonOlder 6 6 , requests 7 + , setuptools 7 8 }: 8 9 9 10 buildPythonPackage rec { ··· 18 17 inherit pname version; 19 18 hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk="; 20 19 }; 20 + 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 21 24 22 25 propagatedBuildInputs = [ 23 26 requests
+17 -3
pkgs/development/python-modules/matrix-common/default.nix
··· 2 2 , lib 3 3 , buildPythonPackage 4 4 , fetchPypi 5 + , setuptools 5 6 , attrs 7 + , unittestCheckHook 6 8 }: 7 9 8 10 buildPythonPackage rec { 9 - pname = "matrix_common"; 11 + pname = "matrix-common"; 10 12 version = "1.3.0"; 11 13 format = "pyproject"; 12 14 13 15 src = fetchPypi { 14 - inherit pname version; 16 + pname = "matrix_common"; 17 + inherit version; 15 18 sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; 16 19 }; 17 20 18 - propagatedBuildInputs = [ attrs ]; 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 24 + 25 + propagatedBuildInputs = [ 26 + attrs 27 + ]; 28 + 29 + checkInputs = [ 30 + unittestCheckHook 31 + ]; 32 + 19 33 pythonImportsCheck = [ "matrix_common" ]; 20 34 21 35 meta = with lib; {
+2
pkgs/development/python-modules/mdformat/default.nix
··· 6 6 , poetry-core 7 7 , pytestCheckHook 8 8 , pythonOlder 9 + , setuptools 9 10 , tomli 10 11 , typing-extensions 11 12 }: ··· 27 26 28 27 nativeBuildInputs = [ 29 28 poetry-core 29 + setuptools 30 30 ]; 31 31 32 32 propagatedBuildInputs = [
+5
pkgs/development/python-modules/mdit-py-plugins/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , pythonOlder 5 + , setuptools 5 6 , markdown-it-py 6 7 , pytest-regressions 7 8 , pytestCheckHook ··· 21 20 rev = "v${version}"; 22 21 sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; 23 22 }; 23 + 24 + nativeBuildInputs = [ 25 + setuptools 26 + ]; 24 27 25 28 propagatedBuildInputs = [ 26 29 markdown-it-py
+5
pkgs/development/python-modules/mistune/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , pytestCheckHook 5 + , setuptools 5 6 }: 6 7 7 8 buildPythonPackage rec { ··· 15 14 inherit pname version; 16 15 sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; 17 16 }; 17 + 18 + nativeBuildInputs = [ 19 + setuptools 20 + ]; 18 21 19 22 checkInputs = [ 20 23 pytestCheckHook
+5
pkgs/development/python-modules/parts/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , pythonOlder 5 + , setuptools 5 6 }: 6 7 7 8 buildPythonPackage rec { ··· 16 15 inherit pname version; 17 16 hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM="; 18 17 }; 18 + 19 + nativeBuildInputs = [ 20 + setuptools 21 + ]; 19 22 20 23 # Project has no tests 21 24 doCheck = false;
+5
pkgs/development/python-modules/peco/default.nix
··· 4 4 , fetchPypi 5 5 , pydantic 6 6 , pythonOlder 7 + , setuptools 7 8 }: 8 9 9 10 buildPythonPackage rec { ··· 18 17 inherit pname version; 19 18 hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; 20 19 }; 20 + 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 21 24 22 25 propagatedBuildInputs = [ 23 26 aiohttp
+5
pkgs/development/python-modules/pg8000/default.nix
··· 5 5 , passlib 6 6 , pythonOlder 7 7 , scramp 8 + , setuptools 8 9 }: 9 10 10 11 buildPythonPackage rec { ··· 19 18 inherit pname version; 20 19 hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs="; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 propagatedBuildInputs = [ 24 27 passlib
+5
pkgs/development/python-modules/portpicker/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , setuptools 4 5 , psutil 5 6 , pythonOlder 6 7 }: ··· 17 16 inherit pname version; 18 17 hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; 19 18 }; 19 + 20 + nativeBuildInputs = [ 21 + setuptools 22 + ]; 20 23 21 24 propagatedBuildInputs = [ 22 25 psutil
+5
pkgs/development/python-modules/py-canary/default.nix
··· 6 6 , pythonOlder 7 7 , requests 8 8 , requests-mock 9 + , setuptools 9 10 }: 10 11 11 12 buildPythonPackage rec { ··· 22 21 rev = "refs/tags/${version}"; 23 22 hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; 24 23 }; 24 + 25 + nativeBuildInputs = [ 26 + setuptools 27 + ]; 25 28 26 29 propagatedBuildInputs = [ 27 30 requests
+5
pkgs/development/python-modules/pyeapi/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , fetchpatch 5 + , setuptools 5 6 , mock 6 7 , netaddr 7 8 , pytestCheckHook ··· 22 21 rev = "v${version}"; 23 22 sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; 24 23 }; 24 + 25 + nativeBuildInputs = [ 26 + setuptools 27 + ]; 25 28 26 29 propagatedBuildInputs = [ 27 30 netaddr
+5
pkgs/development/python-modules/pylutron-caseta/default.nix
··· 7 7 , pytest-timeout 8 8 , pytestCheckHook 9 9 , pythonOlder 10 + , setuptools 10 11 }: 11 12 12 13 buildPythonPackage rec { ··· 23 22 rev = "v${version}"; 24 23 hash = "sha256-D1P4roUZ+byU031RtdwIOR/ncxY9wl9UqCKVb/XPGVk="; 25 24 }; 25 + 26 + nativeBuildInputs = [ 27 + setuptools 28 + ]; 26 29 27 30 propagatedBuildInputs = [ 28 31 cryptography
+6 -1
pkgs/development/python-modules/pypng/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , pytestCheckHook 5 + , setuptools 5 6 }: 6 7 7 8 buildPythonPackage rec { ··· 13 12 src = fetchFromGitHub { 14 13 owner = "drj11"; 15 14 repo = "pypng"; 16 - rev = "${pname}-${version}"; 15 + rev = "refs/tags/${pname}-${version}"; 17 16 sha256 = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; 18 17 }; 18 + 19 + nativeBuildInputs = [ 20 + setuptools 21 + ]; 19 22 20 23 pythonImportsCheck = [ "png" ]; 21 24
+5
pkgs/development/python-modules/pyrituals/default.nix
··· 3 3 , buildPythonPackage 4 4 , fetchFromGitHub 5 5 , pythonOlder 6 + , setuptools 6 7 }: 7 8 8 9 buildPythonPackage rec { ··· 18 17 rev = version; 19 18 sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g"; 20 19 }; 20 + 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 21 24 22 25 propagatedBuildInputs = [ aiohttp ]; 23 26
+5
pkgs/development/python-modules/pytest-test-utils/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , pytestCheckHook 5 6 , pytest 6 7 , pythonOlder ··· 20 19 rev = "refs/tags/${version}"; 21 20 hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; 22 21 }; 22 + 23 + nativeBuildInputs = [ 24 + setuptools 25 + ]; 23 26 24 27 buildInputs = [ 25 28 pytest
+20 -1
pkgs/development/python-modules/python-gnupg/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, gnupg }: 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , setuptools 5 + , gnupg 6 + , pytestCheckHook 7 + }: 2 8 3 9 buildPythonPackage rec { 4 10 pname = "python-gnupg"; ··· 23 17 substituteInPlace test_gnupg.py \ 24 18 --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${gnupg}/bin/gpg')" 25 19 ''; 20 + 21 + nativeBuildInputs = [ 22 + setuptools 23 + ]; 24 + 25 + checkInputs = [ 26 + pytestCheckHook 27 + ]; 28 + 29 + disabledTests = [ 30 + # network access 31 + "test_search_keys" 32 + ]; 26 33 27 34 pythonImportsCheck = [ "gnupg" ]; 28 35
+5
pkgs/development/python-modules/python-pam/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , pam 5 6 , six 6 7 , toml ··· 24 23 --replace 'find_library("pam")' '"${pam}/lib/libpam.so"' \ 25 24 --replace 'find_library("pam_misc")' '"${pam}/lib/libpam_misc.so"' 26 25 ''; 26 + 27 + nativeBuildInputs = [ 28 + setuptools 29 + ]; 27 30 28 31 buildInputs = [ 29 32 pam
+9 -1
pkgs/development/python-modules/python-vagrant/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi }: 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , setuptools 5 + }: 2 6 3 7 buildPythonPackage rec { 4 8 version = "1.0.0"; ··· 13 9 inherit pname version; 14 10 sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; 15 11 }; 12 + 13 + nativeBuildInputs = [ 14 + setuptools 15 + ]; 16 16 17 17 # The tests try to connect to qemu 18 18 doCheck = false;
+5
pkgs/development/python-modules/pyvex/default.nix
··· 8 8 , future 9 9 , pycparser 10 10 , pythonOlder 11 + , setuptools 11 12 }: 12 13 13 14 buildPythonPackage rec { ··· 22 21 inherit pname version; 23 22 hash = "sha256-Yik1RTz4SQBFJxgPzp7LnPHV4EMbxGEhD2fBVcKJC7c="; 24 23 }; 24 + 25 + nativeBuildInputs = [ 26 + setuptools 27 + ]; 25 28 26 29 propagatedBuildInputs = [ 27 30 archinfo
+13
pkgs/development/python-modules/reportlab/darwin-m1-compat.patch
··· 1 + diff --git a/setup.py b/setup.py 2 + index 7625074..b3aa2fc 100644 3 + --- a/setup.py 4 + +++ b/setup.py 5 + @@ -249,7 +249,7 @@ class inc_lib_dirs: 6 + aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config")) 7 + elif platform == "darwin": 8 + machine = sysconfig_platform.split('-')[-1] 9 + - if machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64': 10 + + if False and machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64': 11 + #print('!!!!! detected darwin arm64 build') 12 + #probably an M1 13 + target = pjoin(
+4
pkgs/development/python-modules/reportlab/default.nix
··· 19 19 sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko="; 20 20 }; 21 21 22 + patches = [ 23 + ./darwin-m1-compat.patch 24 + ]; 25 + 22 26 checkInputs = [ glibcLocales ]; 23 27 24 28 buildInputs = [ ft pillow ];
+5
pkgs/development/python-modules/rpi-bad-power/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , pytestCheckHook 5 6 }: 6 7 ··· 19 18 rev = "v${version}"; 20 19 hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk"; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 pythonImportsCheck = [ 24 27 "rpi_bad_power"
+11 -5
pkgs/development/python-modules/scmrepo/default.nix
··· 10 10 , pygit2 11 11 , pygtrie 12 12 , pythonOlder 13 + , setuptools 13 14 }: 14 15 15 16 buildPythonPackage rec { ··· 27 26 hash = "sha256-269vJNclTBWEqM9AJbF96R1I6Ru3q8YBd5A8Rmw7Jjo="; 28 27 }; 29 28 29 + postPatch = '' 30 + substituteInPlace setup.cfg \ 31 + --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" \ 32 + --replace "pathspec>=0.9.0,<0.10.0" "pathspec" 33 + ''; 34 + 35 + nativeBuildInputs = [ 36 + setuptools 37 + ]; 38 + 30 39 propagatedBuildInputs = [ 31 40 asyncssh 32 41 dulwich ··· 47 36 pygit2 48 37 pygtrie 49 38 ]; 50 - 51 - postPatch = '' 52 - substituteInPlace setup.cfg \ 53 - --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" 54 - ''; 55 39 56 40 # Requires a running Docker instance 57 41 doCheck = false;
+5
pkgs/development/python-modules/shellingham/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , pytest-mock 5 6 , pytestCheckHook 6 7 , pythonOlder ··· 19 18 rev = version; 20 19 sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp"; 21 20 }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 22 25 23 26 checkInputs = [ 24 27 pytest-mock
+2 -2
pkgs/development/python-modules/simple-rlp/default.nix
··· 5 5 6 6 buildPythonPackage rec { 7 7 pname = "simple-rlp"; 8 - version = "0.1.2"; 8 + version = "0.1.3"; 9 9 10 10 src = fetchPypi { 11 11 inherit pname version; 12 - sha256 = "5c4a9c58f1b742f7fa8af0fe4ea6ff9fb02294ae041912f771570dfaf339d2b9"; 12 + sha256 = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY="; 13 13 }; 14 14 15 15 pythonImportsCheck = [ "rlp" ];
+5
pkgs/development/python-modules/simpleeval/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , setuptools 4 5 , pytestCheckHook 5 6 }: 6 7 ··· 16 15 rev = version; 17 16 sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4"; 18 17 }; 18 + 19 + nativeBuildInputs = [ 20 + setuptools 21 + ]; 19 22 20 23 checkInputs = [ 21 24 pytestCheckHook
+5
pkgs/development/python-modules/teletype/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , pythonOlder 5 + , setuptools 5 6 }: 6 7 7 8 buildPythonPackage rec { ··· 16 15 inherit pname version; 17 16 hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo="; 18 17 }; 18 + 19 + nativeBuildInputs = [ 20 + setuptools 21 + ]; 19 22 20 23 # no tests 21 24 doCheck = false;
+8 -1
pkgs/development/python-modules/tensorboard-plugin-profile/default.nix
··· 1 - { lib, fetchPypi, buildPythonPackage 1 + { lib 2 + , fetchPypi 3 + , buildPythonPackage 4 + , setuptools 2 5 , gviz-api 3 6 , protobuf 4 7 , werkzeug ··· 19 16 python = "py3"; 20 17 hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; 21 18 }; 19 + 20 + nativeBuildInputs = [ 21 + setuptools 22 + ]; 22 23 23 24 propagatedBuildInputs = [ 24 25 gviz-api
+5
pkgs/development/python-modules/toposort/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , setuptools 4 5 }: 5 6 6 7 buildPythonPackage rec { ··· 13 12 inherit pname version; 14 13 sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; 15 14 }; 15 + 16 + nativeBuildInputs = [ 17 + setuptools 18 + ]; 16 19 17 20 pythonImportsCheck = [ 18 21 "toposort"
+1
pkgs/development/python2-modules/pygtk/default.nix
··· 5 5 pname = "pygtk"; 6 6 outputs = [ "out" "dev" ]; 7 7 version = "2.24.0"; 8 + format = "other"; 8 9 9 10 disabled = isPy3k; 10 11
+3 -3
pkgs/development/tools/kube-linter/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "kube-linter"; 5 - version = "0.4.0"; 5 + version = "0.5.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "stackrox"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "XAsPbl9fqYk2nhDxRg5wyPwciwSpfigoBZ4hzdWAVgw="; 11 + sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-0bjAIHSjw0kHrh9CzJHv1UAaBJDn6381055eOHufvCw="; 14 + vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8="; 15 15 16 16 ldflags = [ 17 17 "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"
+30
pkgs/development/tools/rust/cargo-espflash/default.nix
··· 1 + { lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "cargo-espflash"; 5 + version = "1.6.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "esp-rs"; 9 + repo = "espflash"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-YQ621YbdEy2sS4uEYvgnQU1G9iW5SpWNObPH4BfyeF0="; 12 + }; 13 + 14 + nativeBuildInputs = [ 15 + pkg-config 16 + ]; 17 + 18 + buildInputs = [ 19 + udev 20 + ]; 21 + 22 + cargoSha256 = "sha256-mDSNjeaEtYpEGpiIg2F+e8x/XCssNQxUx+6Cj+8XX5Q="; 23 + 24 + meta = with lib; { 25 + description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py"; 26 + homepage = "https://github.com/esp-rs/cargo-espflash"; 27 + license = licenses.gpl2Only; 28 + maintainers = with maintainers; [ matthiasbeyer ]; 29 + }; 30 + }
+5 -5
pkgs/os-specific/linux/kernel/zen-kernels.nix
··· 4 4 # comments with variant added for update script 5 5 # ./update-zen.py zen 6 6 zenVariant = { 7 - version = "5.19.8"; #zen 7 + version = "5.19.9"; #zen 8 8 suffix = "zen1"; #zen 9 - sha256 = "1jqzny85gl2wc029wp96v5x48wpn6nyx6zx9xrxqw0bhrlczzgq7"; #zen 9 + sha256 = "1zwy5d7wzjxpzf9v13550zvfpkxhq7gck08zv9s94hwaz9h5xna3"; #zen 10 10 isLqx = false; 11 11 }; 12 12 # ./update-zen.py lqx 13 13 lqxVariant = { 14 - version = "5.19.8"; #lqx 15 - suffix = "lqx2"; #lqx 16 - sha256 = "1k1i9fqc0d5p2kp9bwdsp0ccbdfimavx4wpxv48mcnb7b93bpln2"; #lqx 14 + version = "5.19.9"; #lqx 15 + suffix = "lqx1"; #lqx 16 + sha256 = "0jgl5dnbdcg7p2ix4lliif7l8pqvhnbl4ndxq64yyx78r7jrbfs2"; #lqx 17 17 isLqx = true; 18 18 }; 19 19 zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
+3 -3
pkgs/servers/dex/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "dex"; 5 - version = "2.33.0"; 5 + version = "2.34.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "dexidp"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-sl/OdwSkN4uEtuIyYtR5xjxy1z7B6rmG2Cf7xWz0Kp0="; 11 + sha256 = "sha256-OML1DMIuFzoIyXtWxZW+lE/yU0B+7gx61v9CTb6MNmM="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-9zjQBgAuphtvpbs9kzFmrgto6KvNh1N4GdRDk3wIBGY="; 14 + vendorSha256 = "sha256-qMkU4OQtoOYFF9vexZ+SH0E/4xo+WARIqQrbsMPm/C8="; 15 15 16 16 subPackages = [ 17 17 "cmd/dex"
+2 -2
pkgs/servers/icingaweb2/default.nix
··· 2 2 3 3 stdenvNoCC.mkDerivation rec { 4 4 pname = "icingaweb2"; 5 - version = "2.10.1"; 5 + version = "2.11.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Icinga"; 9 9 repo = "icingaweb2"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-X4RaAJjhUnSALJyFYiwagN3cHyW+GyB5MPkW7l+Zv10="; 11 + hash = "sha256-MRk+ZshdOUg311+FNuEM+jspYM4ZqqQLx5dRBM1KNpI="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ makeWrapper ];
+49
pkgs/tools/admin/zbctl/default.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchurl 4 + }: 5 + 6 + stdenvNoCC.mkDerivation rec { 7 + pname = "zbctl"; 8 + version = "8.0.6"; 9 + 10 + src = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then fetchurl { 11 + url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin"; 12 + sha256 = "17hfjrcr6lmw91jq24nbw5yz61x6larmx39lyfj6pwlz0710y13p"; 13 + } else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then fetchurl { 14 + url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl"; 15 + sha256 = "1xng11x7wcjvc0vipdrqyn97aa4jlgcp7g9aw4d36fw0xp9p47kp"; 16 + } else throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}"; 17 + 18 + dontUnpack = true; 19 + dontConfigure = true; 20 + dontBuild = true; 21 + 22 + installPhase = '' 23 + runHook preInstall 24 + mkdir -p $out/bin 25 + cp $src $out/bin/zbctl 26 + chmod +x $out/bin/zbctl 27 + runHook postInstall 28 + ''; 29 + 30 + meta = with lib; { 31 + description = "The command line interface to interact with Camunda 8 and Zeebe"; 32 + homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/"; 33 + downloadPage = "https://github.com/camunda/zeebe/releases"; 34 + changelog = "https://github.com/camunda/zeebe/releases/tag/${version}"; 35 + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 36 + license = licenses.asl20; 37 + platforms = [ "x86_64-darwin" "x86_64-linux" ]; 38 + maintainers = with maintainers; [ thetallestjj ]; 39 + longDescription = '' 40 + A command line interface for Camunda Platform 8 designed to create and read resources inside a Zeebe broker. 41 + It can be used for regular development and maintenance tasks such as: 42 + * Deploying processes 43 + * Creating process instances and job workers 44 + * Activating, completing, or failing jobs 45 + * Updating variables and retries 46 + * Viewing cluster status 47 + ''; 48 + }; 49 + }
+1 -1
pkgs/tools/graphics/agi/default.nix
··· 38 38 cp -r lib $out 39 39 40 40 for i in 16 32 48 64 96 128 256 512 1024; do 41 - install -D ${src}/icon.png $out/share/icons/hicolor/$ix$i/apps/agi.png 41 + install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png 42 42 done 43 43 44 44 runHook postInstall
+3 -3
pkgs/tools/misc/goreleaser/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "goreleaser"; 5 - version = "1.11.2"; 5 + version = "1.11.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "goreleaser"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-Qe2Q7cFu9G0Zj/mHTnxSq57OpeNMX3yZQp8VApVtZDc="; 11 + sha256 = "sha256-aWaNJVNd3CUTU6ap4sUMo2EqDDkA4iMe9xdxqaA+wl0="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-7xySEPmc24yOwUerGoARsKaGIYnIvaJFjcwNvbHG4Ls="; 14 + vendorSha256 = "sha256-iUXbvwh04W8cZ4pa+OS4bRi3bCyFQ2shPzHNh6/e3Vs="; 15 15 16 16 ldflags = [ 17 17 "-s"
+8 -2
pkgs/top-level/all-packages.nix
··· 428 428 429 429 cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { }; 430 430 431 - datalad = callPackage ../applications/version-management/datalad { }; 431 + datalad = callPackage ../applications/version-management/datalad { 432 + python3 = python39; # `boto` currently broken with Python3.10 433 + }; 432 434 433 435 dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; 434 436 ··· 12721 12719 autoreconfHook = buildPackages.autoreconfHook269; 12722 12720 }; 12723 12721 12722 + zbctl = callPackage ../tools/admin/zbctl { }; 12723 + 12724 12724 zdelta = callPackage ../tools/compression/zdelta { }; 12725 12725 12726 12726 zed = callPackage ../development/tools/zed { }; ··· 14477 14473 buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; 14478 14474 buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; 14479 14475 cratesIO = callPackage ../build-support/rust/crates-io.nix { }; 14476 + 14477 + cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { }; 14480 14478 14481 14479 cargo-web = callPackage ../development/tools/rust/cargo-web { 14482 14480 inherit (darwin.apple_sdk.frameworks) CoreServices Security; ··· 32216 32210 32217 32211 kodi-cli = callPackage ../tools/misc/kodi-cli { }; 32218 32212 32219 - xca = libsForQt5.callPackage ../applications/misc/xca { }; 32213 + xca = libsForQt5_openssl_1_1.callPackage ../applications/misc/xca { }; 32220 32214 32221 32215 xcalib = callPackage ../tools/X11/xcalib { }; 32222 32216
+2
pkgs/top-level/python-packages.nix
··· 2341 2341 2342 2342 deemix = callPackage ../development/python-modules/deemix { }; 2343 2343 2344 + deep-chainmap = callPackage ../development/python-modules/deep-chainmap { }; 2345 + 2344 2346 deep_merge = callPackage ../development/python-modules/deep_merge { }; 2345 2347 2346 2348 deepdiff = callPackage ../development/python-modules/deepdiff { };