Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-02-24 18:01:21 +00:00 committed by GitHub
commit 35aa42e19a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
70 changed files with 490 additions and 353 deletions

View File

@ -16856,6 +16856,12 @@
github = "samalws"; github = "samalws";
githubId = 20981725; githubId = 20981725;
}; };
samasaur = {
name = "Samasaur";
email = "sam@samasaur.com";
github = "Samasaur1";
githubId = 30577766;
};
samb96 = { samb96 = {
email = "samb96@gmail.com"; email = "samb96@gmail.com";
github = "samb96"; github = "samb96";

View File

@ -44,8 +44,7 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/lorri daemon"; ExecStart = "${cfg.package}/bin/lorri daemon";
PrivateTmp = true; PrivateTmp = true;
ProtectSystem = "strict"; ProtectSystem = "full";
ProtectHome = "read-only";
Restart = "on-failure"; Restart = "on-failure";
}; };
}; };

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ft2-clone"; pname = "ft2-clone";
version = "1.75"; version = "1.76";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "ft2-clone"; repo = "ft2-clone";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-K+RUsRr19fc0E9VhZWIawxkGXCTwqXl3a13pRiRxDPg="; hash = "sha256-oVQ1B7rYZX2kHTY8jVVm3rkOLx499kiEvhkv2V94W9k=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lnd"; pname = "lnd";
version = "0.17.3-beta"; version = "0.17.4-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightningnetwork"; owner = "lightningnetwork";
repo = "lnd"; repo = "lnd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-JZ+DhFIDMRDDeW6YNeUy/pQt+IbFyZiiqFn4//S2Oao="; hash = "sha256-O6cGK4UMKrZpYqtghjjqqLBStLG5GEi/Q5liR557I8s=";
}; };
vendorHash = "sha256-lvysD9/26OoPCKBOGu/R95x1UKvhcLtn17bQLPT4ofM="; vendorHash = "sha256-eaQmM5bfsUmzTiUALX543VBQRJK+TqW2i28npwSrn3Q=";
subPackages = [ "cmd/lncli" "cmd/lnd" ]; subPackages = [ "cmd/lncli" "cmd/lnd" ];

View File

@ -53,10 +53,10 @@ let
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
AndersonTorres AndersonTorres
adisbladis adisbladis
atemu
jwiegley jwiegley
lovek323 lovek323
matthewbauer matthewbauer
# atemu for issues relating to Macport
]; ];
platforms = { platforms = {
"mainline" = lib.platforms.all; "mainline" = lib.platforms.all;

View File

@ -32,6 +32,7 @@
, pugixml , pugixml
, qtbase , qtbase
, qtsvg , qtsvg
, SDL2
, sfml , sfml
, udev , udev
, vulkan-loader , vulkan-loader
@ -57,13 +58,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dolphin-emu"; pname = "dolphin-emu";
version = "5.0-20347"; version = "5.0-21088";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dolphin-emu"; owner = "dolphin-emu";
repo = "dolphin"; repo = "dolphin";
rev = "dc0814ae4622313d513468bdc377ee9c031de199"; rev = "9240f579eab18a2f67eef23846a6b508393d0e6c";
hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w="; hash = "sha256-lOiDbEQZoi9Bsiyta/w+B1VXNNW4qST2cBZekqo5dDA=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -112,6 +113,7 @@ stdenv.mkDerivation rec {
pugixml pugixml
qtbase qtbase
qtsvg qtsvg
SDL2
sfml sfml
xxHash xxHash
xz # LibLZMA xz # LibLZMA

View File

@ -134,7 +134,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
configureFlags = prevConfigFlags configureFlags = prevConfigFlags
++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ]
++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ]; ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ];
# Wine locates a lot of libraries dynamically through dlopen(). Add # Wine locates a lot of libraries dynamically through dlopen(). Add
# them to the RPATH so that the user doesn't have to set them in # them to the RPATH so that the user doesn't have to set them in

View File

@ -52,6 +52,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
pyqt5 = super.pyqt5.override { pyqt5 = super.pyqt5.override {
withLocation = true; withLocation = true;
withSerialPort = true;
}; };
}; };
}; };
@ -77,14 +78,14 @@ let
urllib3 urllib3
]; ];
in mkDerivation rec { in mkDerivation rec {
version = "3.34.3"; version = "3.36.0";
pname = "qgis-unwrapped"; pname = "qgis-unwrapped";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qgis"; owner = "qgis";
repo = "QGIS"; repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-uf4qUalY6LxPykgUt/atHBTu+A6ITrcnfez/jwVMLvA="; hash = "sha256-uO9Bu+7n8xzsjumbp0t/yYQNvyDgRH1bdfqpX9oLoTY=";
}; };
passthru = { passthru = {

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oranda"; pname = "oranda";
version = "0.6.1"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "axodotdev"; owner = "axodotdev";
repo = "oranda"; repo = "oranda";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/tlGpsJ7qqBKC13w0kX2AqYyGR+KLNh+hM/FKjlEIaY="; hash = "sha256-BOMAkmJ2i/zqp6v49xeIF+EfZob8yXohPh86ERwp5OU=";
}; };
cargoHash = "sha256-cXf94Y9v80ofayJxzVTnrz0EpzWwhIH1CLvQIHDm1sw="; cargoHash = "sha256-SjXPfrO/YiOb1gOw75nAstKFipeIvLV6yl/sy+BZqE4=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -1,11 +1,11 @@
{ {
stable = { stable = {
chromedriver = { chromedriver = {
hash_darwin = "sha256-Mdm+aOd8czNX7oJcNCSdu5TFwIlh5Y37OLdiPpOD+mk="; hash_darwin = "sha256-qo7eiMC4MR4pskSim6twkC2QDeqe3qfZsIEe5mjS7jg=";
hash_darwin_aarch64 = hash_darwin_aarch64 =
"sha256-ZF8nfAXX99I4x6RUEvQkiXZ/SMugXYYyzgC1SzcE1OE="; "sha256-RHqu0wNeAx34LTkVgNjBfXrSWvZ1G7OkNAIGA4WUhmw=";
hash_linux = "sha256-DIC7Ew7aCvtYMVXVXsnMItdeLPDdkNZXZH35I0ZdWEs="; hash_linux = "sha256-K4QeHFp520Z3KjefvVsJf8V7gz7gTf2BCSW4Jxz/H9M=";
version = "122.0.6261.57"; version = "122.0.6261.69";
}; };
deps = { deps = {
gn = { gn = {
@ -15,25 +15,25 @@
version = "2024-01-22"; version = "2024-01-22";
}; };
}; };
hash = "sha256-VvurD1r89dI0ahaVDQ3yinGlHOfzzm7TkL09tF4nebE="; hash = "sha256-uEN1hN6DOLgw4QDrMBZdiLLPx+yKQc5MimIf/vbCC84=";
hash_deb_amd64 = "sha256-Q3AUKzUsRzW00+WLhuri86QzBGk/rlq5Hk+NdoRbbM4="; hash_deb_amd64 = "sha256-k3/Phs72eIMB6LAU4aU0+ze/cRu6KlRhpBshKhmq9N4=";
version = "122.0.6261.57"; version = "122.0.6261.69";
}; };
ungoogled-chromium = { ungoogled-chromium = {
deps = { deps = {
gn = { gn = {
hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s="; hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=";
rev = "7367b0df0a0aa25440303998d54045bda73935a5"; rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e";
url = "https://gn.googlesource.com/gn"; url = "https://gn.googlesource.com/gn";
version = "2023-11-28"; version = "2024-01-22";
}; };
ungoogled-patches = { ungoogled-patches = {
hash = "sha256-nJDLCVynuGFRIjLBV0NmC0zHeEDHjzFM16FKAv2QyNY="; hash = "sha256-G+agHdsssYhsyi4TgJUJBqMEnEgQ7bYeqpTqmonXI6I=";
rev = "121.0.6167.184-1"; rev = "122.0.6261.69-1";
}; };
}; };
hash = "sha256-mLXBaW4KBieOiz2gRXfgA/KPdmUnNlpUIOqdj7CywcY="; hash = "sha256-uEN1hN6DOLgw4QDrMBZdiLLPx+yKQc5MimIf/vbCC84=";
hash_deb_amd64 = "sha256-UDgO1sJ7bggFTe7C36CnHYXjG9rM+ZqFCOzNyIDpQ0Y="; hash_deb_amd64 = "sha256-k3/Phs72eIMB6LAU4aU0+ze/cRu6KlRhpBshKhmq9N4=";
version = "121.0.6167.184"; version = "122.0.6261.69";
}; };
} }

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubelogin"; pname = "kubelogin";
version = "0.1.0"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Azure"; owner = "Azure";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-j6koBf+8mF5k27H/N/UriTSkRstrdA2zrvU9KqP/l5U="; sha256 = "sha256-JBP2lE1/46VB/oKgDlNTQ8RFpgIlQE0If5vND7dzo7A=";
}; };
vendorHash = "sha256-GMTNcZ2jN+014Ivltcf00/UDYDu464fce36Zfg07/Yo="; vendorHash = "sha256-EwL/aiq2jyojM1r7wNZkA07TswHy6MLUUPQJFnaDG4A=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

View File

@ -5,20 +5,20 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "diswall"; pname = "diswall";
version = "0.5.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dis-works"; owner = "dis-works";
repo = "diswall-rs"; repo = "diswall-rs";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-i3R1w2SBBa5hGorvyjEfkuZVN3bE7aHcpoIrtSuS4dA="; sha256 = "sha256-6XMw8fnuM1KyInYCw8DTonsj5gV9d+EuYfO5ggZ3YUU=";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
Security Security
]; ];
cargoHash = "sha256-aJDhLwzOgOVpH/JIrv1aczv5lvJrUlR6Oxj71XeYpSI="; cargoHash = "sha256-So7XBC66y2SKbcjErg4Tnd/NcEpX5zYOEr60RvU9OOU=";
doCheck = false; doCheck = false;

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitui"; pname = "gitui";
version = "0.25.0"; version = "0.25.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "extrawurst"; owner = "extrawurst";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-1sr/7Um+qp3HZ5jUKlSnjqkDJGVtnztCsyFplWEs/Wg="; hash = "sha256-+u0XvZb42RRlQnQUZHrMXRJU+31CDy/oLYQ55tLlmUg=";
}; };
cargoHash = "sha256-EATj4UQUEZxkGY7sKKxUuWi5cA+IOjHnICUi3Fk3v9M="; cargoHash = "sha256-3FBrJvLSuDehCy+o7valkf5LSuMkD2loD2JPQO4+3sY=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "freetube"; pname = "freetube";
version = "0.19.1"; version = "0.19.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
sha256 = "add96ad3509d4d5c6d8658b005dfd046963cd6bb0a4e1f3e88f726a86c05810f"; sha256 = "sha256-GhlU02CmglHUzVTqoajXFS1E6WXxXjxRTdiDEDqsH8s=";
}; };
passthru.tests = nixosTests.freetube; passthru.tests = nixosTests.freetube;

View File

@ -3,13 +3,13 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "iagl"; pname = "iagl";
namespace = "plugin.program.iagl"; namespace = "plugin.program.iagl";
version = "3.0.6"; version = "3.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zach-morris"; owner = "zach-morris";
repo = "plugin.program.iagl"; repo = "plugin.program.iagl";
rev = version; rev = version;
sha256 = "sha256-fwPrNDsEGoysHbl9k9cRYKlr3MxDRiUmJhSsWVT2HHQ="; sha256 = "sha256-b8nO3D/xTnj/5UDshGlIJdiHd75VhIlkrGUi0vkZqG4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,13 +5,13 @@ in
buildKodiAddon rec { buildKodiAddon rec {
pname = "jellyfin"; pname = "jellyfin";
namespace = "plugin.video.jellyfin"; namespace = "plugin.video.jellyfin";
version = "0.7.10"; version = "0.7.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jellyfin"; owner = "jellyfin";
repo = "jellyfin-kodi"; repo = "jellyfin-kodi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hR4cJEpP/RZH24M4Ma33ZUe9oydRg7CyP1hHncvDW8Y="; sha256 = "sha256-m8msTBim4Ss8XaYqIn6GWXxoCio5ABbqhhgyb1T/Yhg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,29 @@
{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, myconnpy }:
buildKodiAddon rec {
pname = "mediathekview";
namespace = "plugin.video.mediathekview";
version = "1.0.9";
src = fetchFromGitHub {
owner = pname;
repo = namespace;
rev = "release-${version}";
hash = "sha256-XYyocXFTiYO7Ar0TtxjpCAy2Ywtnwb8BTxdKxwDWm4Y=";
};
propagatedBuildInputs = [
myconnpy
];
passthru.updateScript = addonUpdateScript {
attrPath = "kodi.packages.mediathekview";
};
meta = with lib; {
homepage = "https://github.com/mediathekview/plugin.video.mediathekview";
description = "Access media libraries of German speaking broadcasting stations";
license = licenses.mit;
maintainers = teams.kodi.members;
};
}

View File

@ -2,13 +2,13 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "svtplay"; pname = "svtplay";
namespace = "plugin.video.svtplay"; namespace = "plugin.video.svtplay";
version = "5.1.12"; version = "5.1.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nilzen"; owner = "nilzen";
repo = "xbmc-" + pname; repo = "xbmc-" + pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; sha256 = "sha256-CZtBUqFaKtMmKcpfBQp0Mb8sVvpCTkqcpfdYe41YSJs=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-session"; pname = "ayatana-indicator-session";
version = "23.10.3"; version = "24.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AyatanaIndicators"; owner = "AyatanaIndicators";
repo = "ayatana-indicator-session"; repo = "ayatana-indicator-session";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-m2+qZxBrarenR41M41mCteFRXIEGkVDavRWQwM3G4tk="; hash = "sha256-XHJhzL7B+4FnUHbsJVywELoY7xxG19RRryaPYZVao1I=";
}; };
postPatch = '' postPatch = ''
@ -73,13 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
(lib.cmakeBool "GSETTINGS_COMPILE" true) (lib.cmakeBool "GSETTINGS_COMPILE" true)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
# Exclude tests
"-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [
# Currently broken: https://github.com/AyatanaIndicators/ayatana-indicator-session/issues/90
"^test-service"
]})")
]))
]; ];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

View File

@ -10,13 +10,13 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.123.2"; version = "0.123.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = "hugo"; repo = "hugo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-/FtRPRVmSRA/QcvQtzFm3PF9vDrt2uJPfAai3Q39/bA="; hash = "sha256-agFXyxjqtnL2JsOfIhp+o46kzw/F/Ggq1ALPPgZy+Gg=";
}; };
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o="; vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";

View File

@ -0,0 +1,43 @@
{ lib
, fetchurl
, appimageTools
}:
appimageTools.wrapType2 rec {
pname = "kchat";
version = "2.4.0";
src = fetchurl {
url = "https://download.storage5.infomaniak.com/kchat/kchat-desktop-${version}-linux-x86_64.AppImage";
name = "kchat-${version}.AppImage";
hash = "sha256-8mkkHod7iBhHVAL/vQCVnmwVlPGikdHhtiEaFVIayrU=";
};
extraInstallCommands =
let
contents = appimageTools.extractType2 { inherit pname version src; };
in
''
mkdir -p "$out/share/applications"
mkdir -p "$out/share/lib/kchat"
cp -r ${contents}/{locales,resources} "$out/share/lib/kchat"
cp -r ${contents}/usr/* "$out"
cp "${contents}/kchat-desktop.desktop" "$out/share/applications/"
mv "$out/bin/kchat-${version}" "$out/bin/${meta.mainProgram}"
substituteInPlace $out/share/applications/kchat-desktop.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}'
'';
meta = with lib; {
description = "Instant messaging service part of Infomaniak KSuite";
homepage = "https://www.infomaniak.com/en/apps/download-kchat";
license = licenses.unfree;
maintainers = [ maintainers.vinetos ];
mainProgram = "kchat";
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
longDescription = ''
kChat is an instant messaging service which enables you to discuss, share and coordinate your teams in complete
security via your Internet browser, mobile phone, tablet or computer.
'';
};
}

15
pkgs/by-name/lu/lubelogger/deps.nix generated Normal file
View File

@ -0,0 +1,15 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; })
(fetchNuGet { pname = "LiteDB"; version = "5.0.17"; sha256 = "126h0g850nc6dqvhwivfjsgb8lydsg250pcsvbzkasda2z5m9mln"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; })
(fetchNuGet { pname = "Npgsql"; version = "8.0.2"; sha256 = "0w1hm3bjh1vfnkzflp1x8bd4d723mpr4y6gb6ga79v5kkf09cmm2"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.3.1"; sha256 = "095vn30apzwhqf70541617276whp19a92ncfppbknjj97dlb8bja"; })
]

View File

@ -0,0 +1,44 @@
{ lib
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
}:
buildDotnetModule rec {
pname = "lubelogger";
version = "1.2.1";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-YxP8XmjYqxuTA2fIV1q7GBsrWPtLr02KkFl4UUNJ2p8=";
};
projectFile = "CarCareTracker.sln";
nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`.
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
makeWrapperArgs = [
"--set DOTNET_CONTENTROOT ${placeholder "out"}/lib/lubelogger"
];
executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
meta = with lib; {
description = "A vehicle service records and maintainence tracker";
longDescription = ''
A self-hosted, open-source, unconventionally-named vehicle maintenance records and fuel mileage tracker.
LubeLogger by Hargata Softworks is licensed under the MIT License for individual and personal use. Commercial users and/or corporate entities are required to maintain an active subscription in order to continue using LubeLogger.
'';
homepage = "https://lubelogger.com";
changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}";
license = licenses.unfree;
maintainers = with maintainers; [ samasaur ];
mainProgram = "CarCareTracker";
platforms = platforms.all;
};
}

View File

@ -36,7 +36,7 @@ let
rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23"; rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23";
rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I="; rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I=";
inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
@ -85,7 +85,7 @@ stdenv.mkDerivation {
libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM
] ++ cubeb.passthru.backendLibs ] ++ cubeb.passthru.backendLibs
++ lib.optionals faudioSupport [ faudio SDL2 ] ++ lib.optionals faudioSupport [ faudio SDL2 ]
++ lib.optional waylandSupport wayland; ++ lib.optionals waylandSupport [ wayland qtwayland ];
postInstall = '' postInstall = ''
# Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration

View File

@ -203,9 +203,9 @@ dependencies = [
[[package]] [[package]]
name = "async_http_range_reader" name = "async_http_range_reader"
version = "0.6.1" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5143aaae4ec035a5d7cfda666eab896fe5428a2a8ab09ca651a2dce3a8f06912" checksum = "cf8eeab30c68da4dc2c51f3afc4327ab06fe0f3f028ca423f7ca398c7ed8c5e7"
dependencies = [ dependencies = [
"bisection", "bisection",
"futures", "futures",
@ -4128,7 +4128,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]] [[package]]
name = "uv" name = "uv"
version = "0.1.9" version = "0.1.10"
dependencies = [ dependencies = [
"anstream", "anstream",
"anyhow", "anyhow",

View File

@ -15,14 +15,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "uv"; pname = "uv";
version = "0.1.9"; version = "0.1.10";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "uv"; repo = "uv";
rev = version; rev = version;
hash = "sha256-N9m0dvJXABAY7dFTE5i7KXIHF9AMEFptEwKFoBsxmyE="; hash = "sha256-ppUx6yLTmMElUqiW766AG5k2g6pnPxZc6hpiPdwQeyQ=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "An extremely fast Python package installer and resolver, written in Rust"; description = "An extremely fast Python package installer and resolver, written in Rust";
homepage = "https://github.com/astral-sh/uv"; homepage = "https://github.com/astral-sh/uv";
changelog = "https://github.com/astral-sh/uv/releases/tag/${version}";
license = with licenses; [ asl20 mit ]; license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ marsam ]; maintainers = with maintainers; [ marsam ];
mainProgram = "uv"; mainProgram = "uv";

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "zpaqfranz"; pname = "zpaqfranz";
version = "59.1"; version = "59.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcorbelli"; owner = "fcorbelli";
repo = "zpaqfranz"; repo = "zpaqfranz";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-i5HWAeREeMBjPMNhSSyJPmKRCChn9/08kV97kHOWJdk="; hash = "sha256-NPkaOmjeLPznG/kY2cF9ROA7SzWEeKKCcPhP91PnYOk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "postgresql-jdbc"; pname = "postgresql-jdbc";
version = "42.6.0"; version = "42.6.1";
src = fetchMavenArtifact { src = fetchMavenArtifact {
artifactId = "postgresql"; artifactId = "postgresql";
groupId = "org.postgresql"; groupId = "org.postgresql";
hash = "sha256-uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE="; hash = "sha256-ywd0/X0JsjniHp0Es3RKQId7/0Y6jVjD9AfPfZdsNVc=";
inherit version; inherit version;
}; };

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clipper2"; pname = "clipper2";
version = "1.2.2"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AngusJohnson"; owner = "AngusJohnson";
repo = "Clipper2"; repo = "Clipper2";
rev = "Clipper2_${version}"; rev = "Clipper2_${version}";
sha256 = "sha256-u/4GG1A2PAlk8VEWgJX8+EnZ5hpGhu1QbvHwct58sF4="; sha256 = "sha256-3TKhb48cABl0QcbeG12xlA1taQ/8/RdUUHSp0Qh85eE=";
}; };
sourceRoot = "${src.name}/CPP"; sourceRoot = "${src.name}/CPP";

View File

@ -6,13 +6,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "cohttp"; pname = "cohttp";
version = "5.3.0"; version = "5.3.1";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
hash = "sha256-s72RxwTl6lEOkkuDqy7eH8RqLM5Eiw+M70iDuaFu7d0="; hash = "sha256-9eJz08Lyn/R71+Ftsj4fPWzQGkC+ACCJhbxDTIjUV2s=";
}; };
postPatch = '' postPatch = ''

View File

@ -4,13 +4,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "macaddr"; pname = "macaddr";
version = "5.4.0"; version = "5.5.0";
minimalOCamlVersion = "4.04"; minimalOCamlVersion = "4.04";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
hash = "sha256-WmYpG/cQtF9+lVDs1WIievUZ1f7+iZ2hufsdD1HHNeo="; hash = "sha256-YokLMW4DV5KtKa8a2XFFbRDe/VJbdLU9sbZ/pCN1wXg=";
}; };
checkInputs = [ ppx_sexp_conv ounit2 ]; checkInputs = [ ppx_sexp_conv ounit2 ];

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aemet-opendata"; pname = "aemet-opendata";
version = "0.4.7"; version = "0.5.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Noltari"; owner = "Noltari";
repo = "AEMET-OpenData"; repo = "AEMET-OpenData";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY="; hash = "sha256-qj1rXM3yHYDQhtOkHfKEGS2ICjN7B2olD4og3uISjcw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -18,11 +18,6 @@ buildPythonPackage rec {
hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA="; hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA=";
}; };
postPatch = ''
substituteInPlace requirements.txt \
--replace-fail "pefile==2019.4.18" "pefile>=2019.4.18"
'';
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
]; ];

View File

@ -365,14 +365,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3-stubs"; pname = "boto3-stubs";
version = "1.34.48"; version = "1.34.49";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-8MKDQUYTza7LtrJk70A9niRF5W3JTvsFGEtPXKqrQVg="; hash = "sha256-l21X4VqWJUfeTnWo+2BRWYRpK3IQdDBbiK5Nelav4eU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore-stubs"; pname = "botocore-stubs";
version = "1.34.48"; version = "1.34.49";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "botocore_stubs"; pname = "botocore_stubs";
inherit version; inherit version;
hash = "sha256-buGZMJAFtiyr7X2aj2Q78LHc/ozLIkdZXb4c8IYdvT4="; hash = "sha256-St5+p0mKRFMiherfKD7Z3SvW540n/9VjKBj4pUgDs2w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "brother"; pname = "brother";
version = "3.0.0"; version = "4.0.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu"; owner = "bieniu";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s="; hash = "sha256-FLaSj1LQy/eWPxU1a4WGpsdoN5Zi4EwrgCmz8AXGeLc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cloudflare"; pname = "cloudflare";
version = "2.19.0"; version = "2.19.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-tV3I4zE/iD899k5jfB/RpNxy82Mv5m5pCEgBWVFRg9o="; hash = "sha256-ENS5ayrd7gffo2meChZ9930qjVq3+G5lkOqm6ofW3Bg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dep-logic"; pname = "dep-logic";
version = "0.0.4"; version = "0.2.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pdm-project"; owner = "pdm-project";
repo = "dep-logic"; repo = "dep-logic";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-AFiCNzHlo3BADqbjRBruA80cfM6Ytdb+gReEg5hUmro="; hash = "sha256-NB0TR7fCtjSm4cAl+Fy+6c+z1ZBDiRw7nXux/s6ON/c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "openstacksdk"; pname = "openstacksdk";
version = "2.1.0"; version = "3.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-dsm3QKLNYl/MbpJBYU7vKgk0y3I1SlxYcWj4+t7y5nQ="; hash = "sha256-sMf5oCXV2pKtTHYpQeasxMtTkwoH/3OamuvMXlpySuY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -50,6 +50,7 @@ buildPythonPackage {
openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
openstack.tests.unit.test_resource.TestWaitForStatus.test_callback
openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match

View File

@ -28,6 +28,7 @@
, bison , bison
, qt6 , qt6
, python , python
, darwin
}: }:
let let
# Matches the pyside6-uic implementation # Matches the pyside6-uic implementation
@ -46,6 +47,11 @@ buildPythonPackage rec {
hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg=";
}; };
stdenv = if python.stdenv.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
python.stdenv;
outputs = ["out" "doc"]; outputs = ["out" "doc"];
format = "other"; format = "other";
@ -72,9 +78,9 @@ buildPythonPackage rec {
"-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON"
"-DPXR_BUILD_EMBREE_PLUGIN=ON" "-DPXR_BUILD_EMBREE_PLUGIN=ON"
"-DPXR_BUILD_ALEMBIC_PLUGIN=ON" "-DPXR_BUILD_ALEMBIC_PLUGIN=ON"
"-DPXR_ENABLE_OSL_SUPPORT=ON"
"-DPXR_BUILD_DRACO_PLUGIN=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON"
"-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically
(lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin))
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -100,8 +106,12 @@ buildPythonPackage rec {
boost boost
draco draco
qt6.qtbase qt6.qtbase
qt6.qtwayland ]
]; ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
Cocoa
])
;
pythonImportsCheck = [ "pxr" "pxr.Usd" ]; pythonImportsCheck = [ "pxr" "pxr.Usd" ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "opower"; pname = "opower";
version = "0.3.0"; version = "0.3.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "tronikos"; owner = "tronikos";
repo = "opower"; repo = "opower";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-YqNHjGJ0BkF8/1LVDqbw9QoJgPgwbA1sIPJUuP4TTJY="; hash = "sha256-aSzy1QLNGfEqHE2IQDdh9YfK+pC6j8X+5KviasSvYI8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "class-registry"; pname = "class-registry";
version = "4.0.6"; version = "4.1.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "todofixthis"; owner = "todofixthis";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-kSEHgzBgnAq5rMv2HbmGl+9CUzsmzUzPQWr+5q8mcsA="; hash = "sha256-kJbyUzyklVSvW6bBxTTTrY+WhfcV0GUf/+Pzyv+7sEA=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pipdeptree"; pname = "pipdeptree";
version = "2.14.0"; version = "2.15.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tox-dev"; owner = "tox-dev";
repo = "pipdeptree"; repo = "pipdeptree";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-FkqpBF5JDSzUp3VrFuCohUhpWOl38cnFQVFYKY9qupQ="; hash = "sha256-ol5+icJAWW3+A8BEAt1MfoPeMnD/CivqSw0cPvSx2nU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "plaid-python"; pname = "plaid-python";
version = "18.4.0"; version = "19.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-bspTjaTATICk58YHxnq2ZM1N5PNS2o0nVQDWUeUvVAc="; hash = "sha256-mwWE5AZjqoUkPzyvuARotcRU2mKnqkoBh6priXLzE/I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -8,11 +8,12 @@
, pythonOlder , pythonOlder
, pythonRelaxDepsHook , pythonRelaxDepsHook
, setuptools , setuptools
, setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-httpx"; pname = "pytest-httpx";
version = "0.27.0"; version = "0.30.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,12 +22,13 @@ buildPythonPackage rec {
owner = "Colin-b"; owner = "Colin-b";
repo = "pytest_httpx"; repo = "pytest_httpx";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5CDmIjehW9/aBxoFVbo8W2fAwgIrPPxEqHQjxsTPlpY="; hash = "sha256-JfyqeOCHNHO4IEHVrh47TdWvb8lcy/1Prqnfphs0ufM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pythonRelaxDepsHook pythonRelaxDepsHook
setuptools setuptools
setuptools-scm
]; ];
buildInputs = [ buildInputs = [

View File

@ -24,7 +24,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version; srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system"; unsupported = throw "Unsupported system";
version = "2.2.0"; version = "2.2.1";
in buildPythonPackage { in buildPythonPackage {
inherit version; inherit version;

View File

@ -6,86 +6,86 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"2.2.0" = { "2.2.1" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torch-2.2.0-cp38-cp38-linux_x86_64.whl"; name = "torch-2.2.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-on2vBAW5JDWXlcOaWnP/MRUYgNY/ZePwBRwi+bs7Ix4="; hash = "sha256-OIDrgRsT+PGl/DKC5FVnS5qfpnOrJW8GOOK09JUlFsM=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torch-2.2.0-cp39-cp39-linux_x86_64.whl"; name = "torch-2.2.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-ccYx+u1TWJYdL6WCo3Dh0p+L7GT8Autv9vTrLFas/YU="; hash = "sha256-HLN5h0E455jAK0GWLdnU7AsGOoykWlEJfzJmFUd8m9A=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torch-2.2.0-cp310-cp310-linux_x86_64.whl"; name = "torch-2.2.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-xEECFnLr4uWvvbNIF6qF5tMhMPlN8tqa1Mt4qdS4E3A="; hash = "sha256-Gt9DDwH/ZJyEisAheF4YAHsHFP3eaOTmW9DGQL8/uOE=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torch-2.2.0-cp311-cp311-linux_x86_64.whl"; name = "torch-2.2.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-C8Wa5xUo8KYBPxsBZw8DnMbQGyztenIZyhbuGUwwURY="; hash = "sha256-I7souoAPJanTPVF2i/X976AiDLxc2aF/ItKkJig1lGg=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; name = "torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl";
hash = "sha256-n6S6LDDsKUolu0t6FaegYSDTqub4+N50A5G9ZSOcgAY="; hash = "sha256-YXaFhegqmdxcQZM759ucoGf6451F/r1RA8yKBNUkSRg=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; name = "torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl";
hash = "sha256-jTTFeq04rJJTWsryl8vuYDbwMZKGxgJnpKBz4fwWlxg="; hash = "sha256-o6OqT5rSqLjnLBqElA2MWd1O7SkbyytgOta1hJgwYvU=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; name = "torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl";
hash = "sha256-Ux4YihpeLVzqPX+bbqviXwOT9k5mTJj26LIYdfIFT5M="; hash = "sha256-531ee2Cn4cI0XGSC/4dvNqDwQ+a+Mu9Y2sQWxKoOOyg=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; name = "torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl";
hash = "sha256-yCp8ENobrFoxlWhnHce7+PexfFUfwjPlqAgDurnvDQQ="; hash = "sha256-lkeM9Oc3ADBZee0cp2tTVTbUYvMDAqNe3Rzu4MPYB9M=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; name = "torch-2.2.1-cp38-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_11_0_arm64.whl";
hash = "sha256-TCrIfQcXzbYqkUJTTPCFmFHvONk6KC6dyRUYETp6gDM="; hash = "sha256-fX1aq00JspIgKXkbacgDq6HAWcYP9lYj8ddFgMFHvUw=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; name = "torch-2.2.1-cp39-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_11_0_arm64.whl";
hash = "sha256-xZuzd7T6xt4wZrqPFZuWAEWLCcwyo/Y9ADDbmVpR/qk="; hash = "sha256-uQZpsWKYTjAvvQXJwnDveW5GeQOUTs76dFe6vpYRYH4=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; name = "torch-2.2.1-cp310-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_11_0_arm64.whl";
hash = "sha256-kApUIX2bUP0RIVXO11+JCB8jyFqlmLX+A8ng2gDlOSc="; hash = "sha256-Ur3sHiLQg4L9mNttK/F6KU0P1TJgz9ZPuHRDSSy6xrQ=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; name = "torch-2.2.1-cp311-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_11_0_arm64.whl";
hash = "sha256-qbGvT92jsrSCTl8SMz19vSJ5EwJBWGly2WrOuYtErJs="; hash = "sha256-zNmEmw3TcKmBPd3kenf0OciqzOAi5LoL+TZRc9WAgJY=";
}; };
aarch64-linux-38 = { aarch64-linux-38 = {
name = "torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-pfl3K7le+v2QbeaDEEryMB7xhgjQx/Ny/xpaYb95K4g="; hash = "sha256-y4ThL9QAXHh/zkDto96sBCmPWQY0iRBixM2yzywUIiE=";
}; };
aarch64-linux-39 = { aarch64-linux-39 = {
name = "torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-5tJVCovq33nOSCcaoqKBF16RowZf7ThdKouYAsKnRNs="; hash = "sha256-7g90adoiGNyHlIV1DaF6JF3DaRbi+cX8CDbkz1cq0H0=";
}; };
aarch64-linux-310 = { aarch64-linux-310 = {
name = "torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-GeiXY73Z3wv145Ri6UEMYSp6Rq/3LqKFuXkprCBFEj8="; hash = "sha256-8BgwAuGJeNWYw+6JGcLmSCAsf+u5CIFRVshmxSTEo1k=";
}; };
aarch64-linux-311 = { aarch64-linux-311 = {
name = "torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; name = "torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-TYGa0jWR4M2KPAt0DYTqrm/QmSjPLK3OveiuYFrC24s="; hash = "sha256-fyaXQWtneZbuHzCyZ2qKlN3b44ijXDYdyG6RW9pHt9o=";
}; };
}; };
} }

View File

@ -127,7 +127,7 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "torch"; pname = "torch";
# Don't forget to update torch-bin to the same version. # Don't forget to update torch-bin to the same version.
version = "2.2.0"; version = "2.2.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8.0"; disabled = pythonOlder "3.8.0";
@ -145,7 +145,7 @@ in buildPythonPackage rec {
repo = "pytorch"; repo = "pytorch";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-FfFjgx6yrPEQlF8CLglsWq+zWGr6MD4z0F+lYoy6grc="; hash = "sha256-6z8G5nMbGHbpA+xfmOR726h9E4N9NoEtaFgcYE0DuUE=";
}; };
patches = lib.optionals cudaSupport [ patches = lib.optionals cudaSupport [

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "torchaudio"; pname = "torchaudio";
version = "2.2.0"; version = "2.2.1";
format = "wheel"; format = "wheel";
src = src =

View File

@ -6,86 +6,86 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"2.2.0" = { "2.2.1" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torchaudio-2.2.0-cp38-cp38-linux_x86_64.whl"; name = "torchaudio-2.2.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-POcebL/QW1zrKI53MKygCOElGQn4PB5XRUV50q4UnCo="; hash = "sha256-XU/trqM3W8hQ+9kI6G1b+GAbp9eCPFId6+jY3lwiZYg=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torchaudio-2.2.0-cp39-cp39-linux_x86_64.whl"; name = "torchaudio-2.2.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-OpwwHNjLB7E3gI6JextkysqRA1kMrQ7GtCNRNmqdwas="; hash = "sha256-LQScsJsPn+EE0goKRwIW/Fzo+SW9SYVuZYDi2Vn1syg=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torchaudio-2.2.0-cp310-cp310-linux_x86_64.whl"; name = "torchaudio-2.2.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-2zy3mq2qPvY/+WjwqyRXaBrU+fRYwq+NZXnx1K/2Yys="; hash = "sha256-I/YjZCniv2drgg6OciGh1YqvkIv/K6JmWqhS33GpeWE=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torchaudio-2.2.0-cp311-cp311-linux_x86_64.whl"; name = "torchaudio-2.2.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-d3FY1g5mBPiYWqffYx+m1L8vvmvkWCc3f4pQsuQqZCU="; hash = "sha256-YJACsObf9ED81qY9FcA8PTdOIU56iqYcLvSlKLpkTDk=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torchaudio-2.2.0-cp38-cp38-macosx_10_9_x86_64.whl"; name = "torchaudio-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_10_13_x86_64.whl";
hash = "sha256-xcsLSJaxB/TR5zR84pY8m7d9JI6KnbWIYWTsobO6Ygo="; hash = "sha256-ge+I12k+O5kAfR7nQv2Buakjmey/iOt+1plJRDAF/7o=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torchaudio-2.2.0-cp39-cp39-macosx_10_9_x86_64.whl"; name = "torchaudio-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_10_13_x86_64.whl";
hash = "sha256-MdDGWy+jfACwxYL8Kstppyt/9wuBoXVNkAfVYv8UOIA="; hash = "sha256-Azn+eO2cKfcEKWdhsouwVbU1BiX/UDrXgXBDl5NOa1g=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torchaudio-2.2.0-cp310-cp310-macosx_10_9_x86_64.whl"; name = "torchaudio-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_10_13_x86_64.whl";
hash = "sha256-WeVoNs0r6BlAzrrNP07jd5xLeDeKPmGUVEbad8FjhLQ="; hash = "sha256-WA7v12SgGmTVtqomDAxHl0vmppZIktVAKac7F/RhH80=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torchaudio-2.2.0-cp311-cp311-macosx_10_9_x86_64.whl"; name = "torchaudio-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_10_13_x86_64.whl";
hash = "sha256-lx7enoSIqLhdZySgWGw4KGSHA9gFBU9dEnXTIGDBeUk="; hash = "sha256-J0y4R0vB5Wt2jvNH0xiGYcWp1eaOLfVvwK/xHMc8kWo=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; name = "torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-DQOCmhh+yJOzJT0Rgq8LW+Cak61flOHo3r9iaeHH3NY="; hash = "sha256-9Ien0xd65q8BZ1CFDuk3iOiAIYoaMQvGx2kB4hL5HNM=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; name = "torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-+xBG66mjt/Z2L2o35EMw3GyWJVAdpL676viWzqQG8tc="; hash = "sha256-aLHZ+P/psm7wToDYKuLcL3Sxoetkw+itIbUlgCs7x6w=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; name = "torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-3Ej5ZswZc6jVipaGM15ResAN2unNe1kpFqBLd0me8rs="; hash = "sha256-itVcIGmye74Y4UeDogLj8/gIL+nlkoFDa6eX7bD8lNU=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; name = "torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-aoRSKkjUYF5C9o5XKcCw6jxaYEyXqjTxC4FH7QEO7gc="; hash = "sha256-HmLCexdnLMK92WY2geUzAA+cCYTmoPPUVfcFG8AFuwI=";
}; };
aarch64-linux-38 = { aarch64-linux-38 = {
name = "torchaudio-2.2.0-cp38-cp38-manylinux2014_aarch64.whl"; name = "torchaudio-2.2.1-cp38-cp38-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp38-cp38-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-linux_aarch64.whl";
hash = "sha256-GWWTv0PlA/EP+MHGCvqXS19Qtc6yKddAXM7Ke11WAhY="; hash = "sha256-pEYrPyFPYLa4944SpM8Skcm8NT3u1wmsPf3tvtUTp6M=";
}; };
aarch64-linux-39 = { aarch64-linux-39 = {
name = "torchaudio-2.2.0-cp39-cp39-manylinux2014_aarch64.whl"; name = "torchaudio-2.2.1-cp39-cp39-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp39-cp39-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-linux_aarch64.whl";
hash = "sha256-hA64ZbBkfvHBd/fv7hSt0k2vUGKntOSZR/uY1KuZBmM="; hash = "sha256-yy2girt7aNx7AQV0ixpzbdMzKfhBN0AT7ALFTgS+3yk=";
}; };
aarch64-linux-310 = { aarch64-linux-310 = {
name = "torchaudio-2.2.0-cp310-cp310-manylinux2014_aarch64.whl"; name = "torchaudio-2.2.1-cp310-cp310-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp310-cp310-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-linux_aarch64.whl";
hash = "sha256-1OoJS4cho2GYLbBi7pk/Km9x3+FvYqhPiQCyNk8zouQ="; hash = "sha256-uRa3dkaYupMZqjslUZE5iS3oZl2EQ4lpusXh2FeMahE=";
}; };
aarch64-linux-311 = { aarch64-linux-311 = {
name = "torchaudio-2.2.0-cp311-cp311-manylinux2014_aarch64.whl"; name = "torchaudio-2.2.1-cp311-cp311-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp311-cp311-linux_aarch64.whl"; url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-linux_aarch64.whl";
hash = "sha256-m+GMogoMLoygtjOIcRQIPJKMleRUhwsdbqjP4FmCzsk="; hash = "sha256-ILKWXbT4QwIWNvU9P6sQdcP4lZxFDGR2KRJNJMfmy7A=";
}; };
}; };
} }

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "torchaudio"; pname = "torchaudio";
version = "2.2.0"; version = "2.2.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pytorch"; owner = "pytorch";
repo = "audio"; repo = "audio";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Z6Xc8bR6bqBHyzWfoB3F33YZEwzuvXByB6s1kSer1DY="; hash = "sha256-ejgxWVIkusGi7zwg3nyAHHdjEPrFaS1TN7nN+PpSgOE=";
}; };
patches = [ patches = [

View File

@ -7,47 +7,47 @@ version=$1
linux_cuda_version="cu121" linux_cuda_version="cu121"
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
linux_cpu_bucket="https://download.pytorch.org/whl" linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
darwin_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu"
url_and_key_list=( url_and_key_list=(
"x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
"x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl"
"x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
"x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
"x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
"x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl"
"aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl"
"aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
"aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
"aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
"aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl"
"aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
"aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
"aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
) )
hashfile=binary-hashes-"$version".nix hashfile=binary-hashes-"$version".nix
echo " \"$version\" = {" >> $hashfile echo " \"$version\" = {" >>$hashfile
for url_and_key in "${url_and_key_list[@]}"; do for url_and_key in "${url_and_key_list[@]}"; do
key=$(echo "$url_and_key" | cut -d' ' -f1) key=$(echo "$url_and_key" | cut -d' ' -f1)
url=$(echo "$url_and_key" | cut -d' ' -f2) url=$(echo "$url_and_key" | cut -d' ' -f2)
name=$(echo "$url_and_key" | cut -d' ' -f3) name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..." echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name"))
echo " $key = {" >> $hashfile echo " $key = {" >>$hashfile
echo " name = \"$name\";" >> $hashfile echo " name = \"$name\";" >>$hashfile
echo " url = \"$url\";" >> $hashfile echo " url = \"$url\";" >>$hashfile
echo " hash = \"$hash\";" >> $hashfile echo " hash = \"$hash\";" >>$hashfile
echo " };" >> $hashfile echo " };" >>$hashfile
echo echo
done done
echo " };" >> $hashfile echo " };" >>$hashfile
echo "done." echo "done."

View File

@ -16,7 +16,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version; srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system"; unsupported = throw "Unsupported system";
version = "0.17.0"; version = "0.17.1";
in buildPythonPackage { in buildPythonPackage {
inherit version; inherit version;

View File

@ -6,66 +6,66 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version { version : builtins.getAttr version {
"0.17.0" = { "0.17.1" = {
x86_64-linux-38 = { x86_64-linux-38 = {
name = "torchvision-0.17.0-cp38-cp38-linux_x86_64.whl"; name = "torchvision-0.17.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-3l28SA/MEAeS46rPkO3/5bzuTO06vE/B0hDSNH/DbgU="; hash = "sha256-oCRjQQZPPBdtqKpuMvATD2ACOAyQruqOMccY3ixUZOE=";
}; };
x86_64-linux-39 = { x86_64-linux-39 = {
name = "torchvision-0.17.0-cp39-cp39-linux_x86_64.whl"; name = "torchvision-0.17.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-v1BQa1hwhI5c8KV+ZSa50Az058aZKUkbqR+5/DhKvDg="; hash = "sha256-WsK2vDCcNDud6KklczHPcVtm+qm1kiep8HDZ4BJS5go=";
}; };
x86_64-linux-310 = { x86_64-linux-310 = {
name = "torchvision-0.17.0-cp310-cp310-linux_x86_64.whl"; name = "torchvision-0.17.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-4Sc+mGL8gh/rxMcW8ThJsf+ofA1p9quCQ1bFUyxJDwg="; hash = "sha256-J69HkV9udiwdROWOgIjSKsl0RWaPn3k1JAMrK69PNL0=";
}; };
x86_64-linux-311 = { x86_64-linux-311 = {
name = "torchvision-0.17.0-cp311-cp311-linux_x86_64.whl"; name = "torchvision-0.17.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-/WbJVU/BRIYzwjLu3cvZCpvNE1rpTmgvTLchmEl0yps="; hash = "sha256-bYKfOZSQQCWyiXHMxhvWbt2VKATyEipuEENQuOkXL08=";
}; };
x86_64-darwin-38 = { x86_64-darwin-38 = {
name = "torchvision-0.17.0-cp38-cp38-macosx_10_9_x86_64.whl"; name = "torchvision-0.17.1-cp38-cp38-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_10_13_x86_64.whl";
hash = "sha256-hw182ldCDkTSDrB7/je/U0SgZDSnphlbTH891Vg4WH0="; hash = "sha256-JiEJcGX6HIJ4heK1IQLoOaNUG5M7epDg+jxCw94bw88=";
}; };
x86_64-darwin-39 = { x86_64-darwin-39 = {
name = "torchvision-0.17.0-cp39-cp39-macosx_10_9_x86_64.whl"; name = "torchvision-0.17.1-cp39-cp39-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_10_13_x86_64.whl";
hash = "sha256-sc7UOLge9mKnHIyB3rrwyARVs1uBHKVaTDxZPXIbVgo="; hash = "sha256-WCmacks3uJPHzk0LMuoUgMMORnzBFBZ5ZLRfYBP2wtM=";
}; };
x86_64-darwin-310 = { x86_64-darwin-310 = {
name = "torchvision-0.17.0-cp310-cp310-macosx_10_9_x86_64.whl"; name = "torchvision-0.17.1-cp310-cp310-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_10_13_x86_64.whl";
hash = "sha256-FTiCzY/449vvXFBU/dFd9k6FQgVGgFqQwLIiHy8RnEo="; hash = "sha256-BkGIgCErZuRehV3Tn1Nuf9SLTmsDShHdn+niOEr7Uew=";
}; };
x86_64-darwin-311 = { x86_64-darwin-311 = {
name = "torchvision-0.17.0-cp311-cp311-macosx_10_9_x86_64.whl"; name = "torchvision-0.17.1-cp311-cp311-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_10_13_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_10_13_x86_64.whl";
hash = "sha256-ENJ2gh8RX7Np5s8fG3eyzKYM2hLLs5pBUTqdPQ8qk64="; hash = "sha256-6izNv1l04L8n/WZEozsZywcAKXzzl7sEaediwRxsQQU=";
}; };
aarch64-darwin-38 = { aarch64-darwin-38 = {
name = "torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; name = "torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-R39uZKnXmMD1re/DAKzCINpvF+9cHhENIBCPZlVP7k0="; hash = "sha256-XOdkZq8rWjBXOTnK4ebmLikxbOs+50gJEALzEqsJEvY=";
}; };
aarch64-darwin-39 = { aarch64-darwin-39 = {
name = "torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; name = "torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-tTVpxSvUvRF2oeSdjqVYg7z1fhYUy5fi6M43J2gpm3A="; hash = "sha256-ihsX+xWLK4gfLIeW/hg5piTknV/QeqYfba5gukgZQho=";
}; };
aarch64-darwin-310 = { aarch64-darwin-310 = {
name = "torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; name = "torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-xVwvhuPzoh3dknOalyNmJE6bF5Fug27EcWewoMCDxl8="; hash = "sha256-M9ZdDH/cs/e8HdjtMOo81+BYe0rRsQS1Z3yBkai62fE=";
}; };
aarch64-darwin-311 = { aarch64-darwin-311 = {
name = "torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; name = "torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-o+7y2t2ttcIegC4FUN1+PuPZjEMPSu0hKuO6A1hVi+E="; hash = "sha256-kQbjLJ8ecK+oFyzxsGTPnCmY2N/wdp7GnVN7ICCe5D0=";
}; };
}; };
} }

View File

@ -17,7 +17,7 @@ let
inherit (cudaPackages) backendStdenv; inherit (cudaPackages) backendStdenv;
pname = "torchvision"; pname = "torchvision";
version = "0.17.0"; version = "0.17.1";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -26,7 +26,7 @@ buildPythonPackage {
owner = "pytorch"; owner = "pytorch";
repo = "vision"; repo = "vision";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ZAmvVEVLzZ+AWER4vGssAhvFscoFooS1VaZnvgVDeNk="; hash = "sha256-K2irwwf6qgyfZqJH1NUasDmBSA4mH2Rclx7A7zP4kiQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "4.1.4"; version = "4.1.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-JeURuw0YImIKRwi35tYWDa5CQqYfPZm+NJiap8Qo6mE="; hash = "sha256-m7Qhx8vdQAtvBtJS+4nQQSh0qnp/TRXoch/WJgk/7EI=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zha-quirks"; pname = "zha-quirks";
version = "0.0.111"; version = "0.0.112";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "zigpy"; owner = "zigpy";
repo = "zha-device-handlers"; repo = "zha-device-handlers";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-e2Ho/LBdnEKn7hgykhstjv8ZUYAn41e1+rsgA1MEmf4="; hash = "sha256-wI7mpX6oFV/RrxH/UP1X9Odago0CxJ5dhjKAsDS+Sq4=";
}; };
postPatch = '' postPatch = ''

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks"; pname = "cargo-semver-checks";
version = "0.29.0"; version = "0.29.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "obi1kenobi"; owner = "obi1kenobi";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RclZ52E8xslHO5M+jwwC3BVe8QFam9/j7rlh/FoNgN8="; hash = "sha256-Eq8NLfgFoO/Upq+eO8kKDMtxgEMQYTG9B6TdCZjGdzc=";
}; };
cargoHash = "sha256-On6MU76Ehk2b+9hzUXN/PHr5BQTNcGIgQZUkPFBIl2Y="; cargoHash = "sha256-AMI997Tz1l7qUmdGPVOtb2KENX27ZfM0P7snzP3aRXU=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

View File

@ -290,6 +290,7 @@ let
IPW2200_MONITOR = option yes; # support promiscuous mode IPW2200_MONITOR = option yes; # support promiscuous mode
HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM = option yes; HOSTAP_FIRMWARE_NVRAM = option yes;
MAC80211_MESH = option yes; # Enable 802.11s (mesh networking) support
ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB = option yes; # Ditto, AHB bus ATH9K_AHB = option yes; # Ditto, AHB bus
# The description of this option makes it sound dangerous or even illegal # The description of this option makes it sound dangerous or even illegal

View File

@ -6,18 +6,18 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "r8168-${kernel.version}-${version}"; name = "r8168-${kernel.version}-${version}";
# on update please verify that the source matches the realtek version # on update please verify that the source matches the realtek version
version = "8.048.03"; version = "8.052.01";
# This is a mirror. The original website[1] doesn't allow non-interactive # This is a mirror. The original website[1] doesn't allow non-interactive
# downloads, instead emailing you a download link. # downloads, instead emailing you a download link.
# [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
# I've verified manually (`diff -r`) that the source code for version 8.046.00 # I've verified manually (`diff -r`) that the source code for version 8.052.01
# is the same as the one available on the realtek website. # is the same as the one available on the realtek website.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mtorromeo"; owner = "mtorromeo";
repo = "r8168"; repo = "r8168";
rev = version; rev = version;
sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4"; sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

View File

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
actionmailbox = { actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
@ -16,10 +16,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
actionmailer = { actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
actionpack = { actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
actiontext = { actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
@ -49,10 +49,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
actionview = { actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
active_model_serializers = { active_model_serializers = {
dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
@ -82,10 +82,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
activemodel = { activemodel = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
@ -93,10 +93,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
activerecord = { activerecord = {
dependencies = ["activemodel" "activesupport"]; dependencies = ["activemodel" "activesupport"];
@ -104,10 +104,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
activestorage = { activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -115,10 +115,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@ -126,10 +126,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
addressable = { addressable = {
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
@ -694,10 +694,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
type = "gem"; type = "gem";
}; };
version = "3.3.3"; version = "3.3.4";
}; };
debug_inspector = { debug_inspector = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -1609,10 +1609,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c";
type = "gem"; type = "gem";
}; };
version = "2.21.3"; version = "2.21.4";
}; };
mail = { mail = {
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
@ -1828,10 +1828,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
type = "gem"; type = "gem";
}; };
version = "0.2.1"; version = "0.2.2";
}; };
net-scp = { net-scp = {
dependencies = ["net-ssh"]; dependencies = ["net-ssh"];
@ -1850,10 +1850,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; sha256 = "0hwiqplhi29kfjl8jm0rhl51qv6wmxfynl4qap1dhv9xdwc4bm1x";
type = "gem"; type = "gem";
}; };
version = "0.3.3"; version = "0.3.4";
}; };
net-ssh = { net-ssh = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -2178,10 +2178,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7";
type = "gem"; type = "gem";
}; };
version = "2.2.8"; version = "2.2.8.1";
}; };
rack-attack = { rack-attack = {
dependencies = ["rack"]; dependencies = ["rack"];
@ -2255,10 +2255,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
rails-controller-testing = { rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"]; dependencies = ["actionpack" "actionview" "activesupport"];
@ -2323,10 +2323,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62";
type = "gem"; type = "gem";
}; };
version = "7.0.8"; version = "7.0.8.1";
}; };
rainbow = { rainbow = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -3043,10 +3043,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
type = "gem"; type = "gem";
}; };
version = "0.4.0"; version = "0.4.1";
}; };
tpm-key_attestation = { tpm-key_attestation = {
dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
@ -3342,10 +3342,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d";
type = "gem"; type = "gem";
}; };
version = "2.6.11"; version = "2.6.13";
}; };
} }

View File

@ -1,7 +1,7 @@
# This file was generated by pkgs.mastodon.updateScript. # This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }: { fetchFromGitHub, applyPatches, patches ? [] }:
let let
version = "4.2.7"; version = "4.2.8";
in in
( (
applyPatches { applyPatches {
@ -9,7 +9,7 @@ in
owner = "mastodon"; owner = "mastodon";
repo = "mastodon"; repo = "mastodon";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-lz1HMg/B6BOqGxypzDTTO5yY7C5B6QRNIpRnDZW2eGs="; hash = "sha256-7/E7iHqJxmYSorXYti7h8EbP7wcOAaD04ToLeU2I/nY=";
}; };
patches = patches ++ []; patches = patches ++ [];
}) // { }) // {

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lantern"; pname = "lantern";
version = "0.0.12"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lanterndata"; owner = "lanterndata";
repo = "lantern"; repo = "lantern";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-PJLpRX5IuHBz7xywgD/lXfr6c6Kn1XmQ6MCGSuKPmlE="; hash = "sha256-B8Dpt/VmD/QzNzfRSlhijnVEd/EuTOP+MI/qERcIbOU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -2,13 +2,13 @@
buildFishPlugin rec { buildFishPlugin rec {
pname = "done"; pname = "done";
version = "1.19.1"; version = "1.19.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "franciscolourenco"; owner = "franciscolourenco";
repo = "done"; repo = "done";
rev = version; rev = version;
hash = "sha256-BGHfwKoMfOZUsa05kEt8W2luc1aC3Su/OyaGmcb4UiI="; hash = "sha256-VSCYsGjNPSFIZSdLrkc7TU7qyPVm8UupOoav5UqXPMk=";
}; };
checkPlugins = [ fishtape ]; checkPlugins = [ fishtape ];

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cyberchef"; pname = "cyberchef";
version = "10.7.0"; version = "10.8.2";
src = fetchzip { src = fetchzip {
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
sha256 = "sha256-/miIdPP00vIh3Em8BFDoxkYFpgU4Vty4V5RiCgqOKPo="; sha256 = "sha256-CD09gve4QEkCBKZoNtTdSPOfGSogGoGwWMYWGzMHowg=";
stripRoot = false; stripRoot = false;
}; };

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "goflow"; pname = "goflow";
version = "3.4.4"; version = "3.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nMWAvvJj1S5W4ItOT212bn9CPG5Lpdd+k8ciwGmeu0w="; sha256 = "sha256-2tQADlAajuiNtygdu2SCu2EF3NAuloQL0ROBMUZudZU=";
}; };
vendorHash = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg="; vendorHash = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg=";

View File

@ -56,13 +56,7 @@ in
, util-linuxMinimal , util-linuxMinimal
, xz , xz
, enableDocumentation ? !atLeast24 || ( , enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform
(stdenv.hostPlatform == stdenv.buildPlatform) &&
# mdbook errors out on risc-v due to a rustc bug
# https://github.com/NixOS/nixpkgs/pull/242019
# https://github.com/rust-lang/rust/issues/114473
!stdenv.buildPlatform.isRiscV
)
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp

View File

@ -83,6 +83,8 @@ let self = rec {
mediacccde = callPackage ../applications/video/kodi/addons/mediacccde { }; mediacccde = callPackage ../applications/video/kodi/addons/mediacccde { };
mediathekview = callPackage ../applications/video/kodi/addons/mediathekview { };
netflix = callPackage ../applications/video/kodi/addons/netflix { }; netflix = callPackage ../applications/video/kodi/addons/netflix { };
orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { };

View File

@ -24,7 +24,6 @@
sourceHanPackages sourceHanPackages
steamPackages steamPackages
ut2004Packages ut2004Packages
zabbix40
zabbix50 zabbix50
zabbix60 zabbix60
zeroadPackages zeroadPackages