nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-10-21 06:05:43 +00:00
committed by GitHub
parent c7ac9aa65f 3fc3038625
commit d4d77ce350
108 changed files with 1014 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTING.md
View File

@@ -615,6 +615,11 @@ Names of files and directories should be in lowercase, with dashes between words
As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
# Practical contributing advice
To contribute effectively and efficiently, you need to be aware of how the contributing process generally works.
This section aims to document the process as we live it in Nixpkgs to set expectations right and give practical tips on how to work with it.
## I opened a PR, how do I get it merged?
[i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@@ -374,6 +374,8 @@
- `nodePackages.coc-metals` was removed due to being deprecated upstream.
`vimPlugins.nvim-metals` is its official replacement.
- `matrix-sliding-sync` was removed because it has been replaced by the simplified sliding sync functionality introduced in matrix-synapse 114.0.
- `teleport` has been upgraded from major version 15 to major version 16.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).

1
nixos/modules/module-list.nix
View File

@@ -711,7 +711,6 @@
./services/matrix/mjolnir.nix
./services/matrix/mx-puppet-discord.nix
./services/matrix/pantalaimon.nix
./services/matrix/matrix-sliding-sync.nix
./services/matrix/synapse.nix
./services/misc/airsonic.nix
./services/misc/amazon-ssm-agent.nix

1
nixos/modules/rename.nix
View File

@@ -87,6 +87,7 @@ in
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
(mkRemovedOptionModule [ "services" "matrix-sliding-sync" ] "The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality")
(mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mxisd" ] "The mxisd module has been removed as both mxisd and ma1sd got removed.")

107
nixos/modules/services/matrix/matrix-sliding-sync.nix
View File

@@ -1,107 +0,0 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.matrix-sliding-sync;
in
{
imports = [
(lib.mkRenamedOptionModule [ "services" "matrix-synapse" "sliding-sync" ] [ "services" "matrix-sliding-sync" ])
];
options.services.matrix-sliding-sync = {
enable = lib.mkEnableOption "sliding sync";
package = lib.mkPackageOption pkgs "matrix-sliding-sync" { };
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = with lib.types; attrsOf str;
options = {
SYNCV3_SERVER = lib.mkOption {
type = lib.types.str;
description = ''
The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`.
'';
};
SYNCV3_DB = lib.mkOption {
type = lib.types.str;
default = "postgresql:///matrix-sliding-sync?host=/run/postgresql";
description = ''
The postgres connection string.
Refer to <https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING>.
'';
};
SYNCV3_BINDADDR = lib.mkOption {
type = lib.types.str;
default = "127.0.0.1:8009";
example = "[::]:8008";
description = "The interface and port or path (for unix socket) to listen on.";
};
SYNCV3_LOG_LEVEL = lib.mkOption {
type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ];
default = "info";
description = "The level of verbosity for messages logged.";
};
};
};
default = { };
description = ''
Freeform environment variables passed to the sliding sync proxy.
Refer to <https://github.com/matrix-org/sliding-sync#setup> for all supported values.
'';
};
createDatabase = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync`
and the database `matrix-sliding-sync` exist.
'';
};
environmentFile = lib.mkOption {
type = lib.types.str;
description = ''
Environment file as defined in {manpage}`systemd.exec(5)`.
This must contain the {env}`SYNCV3_SECRET` variable which should
be generated with {command}`openssl rand -hex 32`.
'';
};
};
config = lib.mkIf cfg.enable {
services.postgresql = lib.optionalAttrs cfg.createDatabase {
enable = true;
ensureDatabases = [ "matrix-sliding-sync" ];
ensureUsers = [ {
name = "matrix-sliding-sync";
ensureDBOwnership = true;
} ];
};
systemd.services.matrix-sliding-sync = rec {
after =
lib.optional cfg.createDatabase "postgresql.service"
++ lib.optional config.services.dendrite.enable "dendrite.service"
++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
wants = after;
wantedBy = [ "multi-user.target" ];
environment = cfg.settings;
serviceConfig = {
DynamicUser = true;
EnvironmentFile = cfg.environmentFile;
ExecStart = lib.getExe cfg.package;
StateDirectory = "matrix-sliding-sync";
WorkingDirectory = "%S/matrix-sliding-sync";
RuntimeDirectory = "matrix-sliding-sync";
Restart = "on-failure";
RestartSec = "1s";
};
};
};
}

28
pkgs/applications/editors/vscode/extensions/default.nix
View File

@@ -656,7 +656,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes";
homepage = "https://github.com/mjbvz/vscode-markdown-footnotes";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -689,7 +689,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles";
homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -710,7 +710,7 @@ let
# or
asl20
];
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -727,7 +727,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish";
homepage = "https://github.com/bmalehorn/vscode-fish";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -1793,7 +1793,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github";
homepage = "https://github.com/fabiospampinato/vscode-open-in-github";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -1930,7 +1930,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran";
homepage = "https://github.com/fortran-lang/vscode-fortran-support";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -2844,7 +2844,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint";
homepage = "https://github.com/kravetsone/vscode-publint";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -3069,7 +3069,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter";
homepage = "https://github.com/meganrogge/template-string-converter";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -3605,7 +3605,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl";
homepage = "https://code.visualstudio.com/docs/remote/wsl";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -3716,7 +3716,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax";
homepage = "https://github.com/nefrob/vscode-just";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -4455,7 +4455,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=sswg.swift-lang";
homepage = "https://github.com/swiftlang/vscode-swift";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -5076,7 +5076,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer";
homepage = "https://github.com/vitaliymaz/vscode-svg-previewer";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -5408,7 +5408,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors";
homepage = "https://github.com/yoavbls/pretty-ts-errors";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};
@@ -5495,7 +5495,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons";
homepage = "https://github.com/zguolee/vscode-tabler-icons";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.uncenter ];
maintainers = [ ];
};
};

45
pkgs/applications/graphics/ovito/default.nix
View File

@@ -1,7 +1,8 @@
{ mkDerivation
, lib
{ lib
, stdenv
, fetchFromGitLab
, fetchurl
, makeDesktopItem
, cmake
, boost
, bzip2
@@ -17,21 +18,27 @@
, qtsvg
, qttools
, VideoDecodeAcceleration
, wrapQtAppsHook
, copyDesktopItems
# needed to run natively on wayland
, qtwayland
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "ovito";
version = "3.7.11";
version = "3.11.0";
src = fetchFromGitLab {
owner = "stuko";
repo = "ovito";
rev = "v${version}";
hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA=";
hash = "sha256-egiA6z1e8ZS7i4CIVjsCKJP1wQSRpmSKitoVTszu0Mc=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
copyDesktopItems
];
buildInputs = [
@@ -48,16 +55,42 @@ mkDerivation rec {
qtbase
qtsvg
qttools
qtwayland
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
VideoDecodeAcceleration
];
# manually create a desktop file
desktopItems = [ (makeDesktopItem {
name = "ovito";
comment= "Open Visualization Tool";
exec = "ovito";
icon = "ovito";
terminal = false;
startupNotify = false;
desktopName = "ovito";
startupWMClass = "Ovito";
categories = [ "Science" ];
})];
postInstall = let
icon = fetchurl {
url = "https://www.ovito.org/wp-content/uploads/logo_rgb-768x737.png";
hash = "sha256-FOmIUeXem+4MjavQNag0UIlcR2wa2emJjivwxoJh6fI=";
};
in ''
install -Dm644 ${icon} $out/share/pixmaps/ovito.png
'';
meta = with lib; {
description = "Scientific visualization and analysis software for atomistic and particle simulation data";
mainProgram = "ovito";
homepage = "https://ovito.org";
license = with licenses; [ gpl3Only mit ];
maintainers = with maintainers; [ twhitehead ];
maintainers = with maintainers; [
twhitehead
chn
];
broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=...
};
}

2
pkgs/by-name/an/ananicy-cpp/package.nix
View File

@@ -36,6 +36,8 @@ clangStdenv.mkDerivation (finalAttrs: {
hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
})
./match-wrappers.patch
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/27
./reliable-mounts-file.patch
];
strictDeps = true;

13
pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/src/platform/linux/cgroups.cpp b/src/platform/linux/cgroups.cpp
index 766fd2f5247ce64eb7dfd45e5551f41773eaa18b..d27dbf724bdf5097dfda0c8d4eaaadb3e81f70b3 100644
--- a/src/platform/linux/cgroups.cpp
+++ b/src/platform/linux/cgroups.cpp
@@ -223,7 +223,7 @@ control_groups::cgroup_info control_groups::get_cgroup_version(bool reset) {
}
if (!info.has_value()) {
- std::ifstream mtab("/etc/mtab");
+ std::ifstream mtab("/proc/self/mounts");
while (mtab) {
std::string word, line;
fs::path cgroup_path;

4
pkgs/by-name/bm/bmake/package.nix
View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bmake";
version = "20240808";
version = "20240921";
src = fetchurl {
url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg=";
hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI=";
};
patches = [

6
pkgs/by-name/ca/cargo-expand/package.nix
View File

@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.90";
version = "1.0.91";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-8Ls7Wklb5cnYo6acmGtjTHV1ZhSPVEQ9BsbR78a2LG0=";
hash = "sha256-ucxqC5OqBqmM9+jKnGWLd9g2GDAXjAqSl+0ouhs6evA=";
};
cargoHash = "sha256-8IKKK0xBgl5FiEoPrwO1uL/S+fOLv4Rof8KjquHJ6DI=";
cargoHash = "sha256-vDYpFJ+RFjouXgZc+ESPpkXA4sv5eHVZc93s+3KJj2g=";
meta = with lib; {
description = "Cargo subcommand to show result of macro expansion";

13
pkgs/development/tools/rust/cargo-hakari/default.nix → pkgs/by-name/ca/cargo-hakari/package.nix
View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hakari";
version = "0.9.30";
version = "0.9.33";
src = fetchFromGitHub {
owner = "guppy-rs";
repo = "guppy";
rev = "cargo-hakari-${version}";
sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw=";
sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo=";
};
cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY=";
cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew=";
cargoBuildFlags = [
"-p"
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
"cargo-hakari"
];
meta = with lib; {
meta = {
description = "Manage workspace-hack packages to speed up builds in large workspaces";
mainProgram = "cargo-hakari";
longDescription = ''
@@ -36,13 +36,14 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://crates.io/crates/cargo-hakari";
changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
license = with licenses; [
license = with lib.licenses; [
mit
asl20
];
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
figsoda
macalinao
nartsiss
];
};
}

16
pkgs/by-name/co/copilot-node-server/package-lock.json generated Normal file
View File

@@ -0,0 +1,16 @@
{
"name": "copilot-node-server",
"version": "1.41.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "copilot-node-server",
"version": "1.41.0",
"license": "GitHub Terms of Service",
"bin": {
"copilot-node-server": "copilot/dist/language-server.js"
}
}
}
}

42
pkgs/by-name/co/copilot-node-server/package.nix Normal file
View File

@@ -0,0 +1,42 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "copilot-node-server";
version = "1.41.0";
src = fetchFromGitHub {
owner = "jfcherng";
repo = "copilot-node-server";
rev = "v${version}";
hash = "sha256-yOqA2Xo4c7u0g6RQYt9joQk8mI9KE0xTAnLjln9atmg=";
};
npmDepsHash = "sha256-tbcNRQBbJjN1N5ENxCvPQbfteyxTbPpi35dYmeUc4A4=";
postPatch = ''
# Upstream doesn't provide any lock file so we provide our own:
cp ${./package-lock.json} package-lock.json
'';
preInstall = ''
# `npmInstallHook` requires a `node_modules/` folder but `npm
# install` doesn't generate one because the project has no
# dependencies:
mkdir node_modules/
'';
forceEmptyCache = true;
dontNpmBuild = true;
meta = with lib; {
description = "Copilot Node.js server";
homepage = src.meta.homepage;
license = licenses.unfree; # I don't know: https://github.com/jfcherng/copilot-node-server/blob/main/LICENSE.md
maintainers = with maintainers; [ DamienCassou ];
mainProgram = "copilot-node-server";
};
}

19
pkgs/by-name/ha/handlr-regex/package.nix
View File

@@ -6,20 +6,21 @@
libiconv,
installShellFiles,
nix-update-script,
stdenv,
}:
rustPlatform.buildRustPackage rec {
pname = "handlr-regex";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "Anomalocaridid";
repo = pname;
rev = "v${version}";
hash = "sha256-xYt+pntqfq1RwaLAoTIH6zaJZWgyl58I/2xWCWe+bBs=";
hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA=";
};
cargoHash = "sha256-w5eZm+wHx4aU6zsNZhg8mehDSzpd6k6PpV/V7tzukIA=";
cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A=";
nativeBuildInputs = [
installShellFiles
@@ -32,13 +33,13 @@ rustPlatform.buildRustPackage rec {
export HOME=$TEMPDIR
'';
postInstall = ''
installShellCompletion \
--zsh assets/completions/_handlr \
--bash assets/completions/handlr \
--fish assets/completions/handlr.fish
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd handlr \
--zsh <(COMPLETE=zsh $out/bin/handlr) \
--bash <(COMPLETE=bash $out/bin/handlr) \
--fish <(COMPLETE=fish $out/bin/handlr)
installManPage assets/manual/man1/*
installManPage target/release-tmp/build/handlr-regex-*/out/manual/man1/*
'';
passthru.updateScript = nix-update-script { };

6
pkgs/by-name/ho/home-manager/package.nix
View File

@@ -18,14 +18,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-09-26";
version = "0-unstable-2024-10-20";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "ffe2d07e771580a005e675108212597e5b367d2d";
hash = "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=";
rev = "fe56302339bb28e3471632379d733547caec8103";
hash = "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=";
};
nativeBuildInputs = [

26
pkgs/applications/networking/cluster/kubent/default.nix → pkgs/by-name/ku/kubent/package.nix
View File

@@ -1,20 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub, testers, kubent }:
{
buildGoModule,
fetchFromGitHub,
kubent,
lib,
testers,
}:
buildGoModule rec {
pname = "kubent";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "doitintl";
repo = "kube-no-trouble";
rev = version;
sha256 = "sha256-/gCbj0RDwV5E8kNkEu+37ilzw/A0BAXiYfHGPdkCsRs=";
hash = "sha256-7bn7DxbZ/Nqob7ZEWRy1UVg97FiJN5JWEgpH1CDz6jQ=";
};
vendorHash = "sha256-6hp7mzE45Tlmt4ybhpdJLYCv+WqQ9ak2S47kJTwyGVI=";
vendorHash = "sha256-+V+/TK60V8NYUDfF5/EgSZg4CLBn6Mt57diiyXm179k=";
ldflags = [
"-w" "-s"
"-w"
"-s"
"-X main.version=v${version}"
];
@@ -26,11 +33,12 @@ buildGoModule rec {
version = "v${version}";
};
meta = with lib; {
homepage = "https://github.com/doitintl/kube-no-trouble";
meta = {
description = "Easily check your cluster for use of deprecated APIs";
changelog = "https://github.com/doitintl/kube-no-trouble/releases/tag/${version}";
homepage = "https://github.com/doitintl/kube-no-trouble";
license = lib.licenses.mit;
mainProgram = "kubent";
license = licenses.mit;
maintainers = with maintainers; [ peterromfeldhk ];
maintainers = with lib.maintainers; [ peterromfeldhk ];
};
}

19
pkgs/by-name/mo/mozillavpn/package.nix
View File

@@ -4,6 +4,7 @@
cargo,
cmake,
fetchFromGitHub,
fetchpatch,
go,
lib,
libcap,
@@ -30,7 +31,23 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo=";
};
patches = [ ];
patches = [
# Fix build errors from deprecated QByteArray::count()
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/1b358d27d4bf29567b5d58f3591146bf639b99e1.patch";
hash = "sha256-LeDgwZaQDgS8HNf9k2fC0RYQy4nGEq0DMNjY7muNads=";
})
# Fix build errors from deprecated QVariant::type()
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/ebdd38ce19ef6eb80f076acf93299bd7d24ae6db.patch";
hash = "sha256-ZWl0wHH5Foxlttj/GK5phr/C6qJv39U2GWIofZR+Rto=";
})
# Fix build errors from deprecated QEventPoint::pos and friends
(fetchpatch {
url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/10b1c98517dac4eacffd6890c551b817aedd4a19.patch";
hash = "sha256-DHOtvVDEdQ+k2ggg4HGpcv1EmKzlijNRTi1yJ7a1bWU=";
})
];
netfilter = buildGoModule {
pname = "${finalAttrs.pname}-netfilter";

19
pkgs/servers/sql/patroni/default.nix → pkgs/by-name/pa/patroni/package.nix
View File

@@ -1,21 +1,22 @@
{ lib
, pythonPackages
, python3Packages
, fetchFromGitHub
, nixosTests
, nix-update-script
}:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "patroni";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU=";
sha256 = "sha256-urNTxaipM4wD+1fp7EFdT7/FGLq86O1nOfst7JyX0fc=";
};
propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python3Packages; [
boto3
click
consul
@@ -34,7 +35,7 @@ pythonPackages.buildPythonApplication rec {
ydiff
];
nativeCheckInputs = with pythonPackages; [
nativeCheckInputs = with python3Packages; [
flake8
mock
pytestCheckHook
@@ -47,8 +48,10 @@ pythonPackages.buildPythonApplication rec {
pythonImportsCheck = [ "patroni" ];
passthru.tests = {
patroni = nixosTests.patroni;
passthru = {
tests.patroni = nixosTests.patroni;
updateScript = nix-update-script { };
};
meta = with lib; {

15
pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
View File

@@ -24,8 +24,8 @@ let
libnbtplusplus = fetchFromGitHub {
owner = "PrismLauncher";
repo = "libnbtplusplus";
rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f";
hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=";
rev = "23b955121b8217c1c348a9ed2483167a6f3ff4ad";
hash = "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=";
};
in
@@ -35,13 +35,13 @@ assert lib.assertMsg (
stdenv.mkDerivation (finalAttrs: {
pname = "prismlauncher-unwrapped";
version = "8.4";
version = "9.0";
src = fetchFromGitHub {
owner = "PrismLauncher";
repo = "PrismLauncher";
rev = finalAttrs.version;
hash = "sha256-460hB91M2hZm+uU1tywJEj20oRd5cz/NDvya8/vJdSA=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-EFpZ3V8wm7q7iwUJg0kKdZzOviWKsCji0jgYrrrKSI0=";
};
postUnpack = ''
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
cmark
ghc_filesystem
kdePackages.qtbase
kdePackages.qtnetworkauth
kdePackages.quazip
tomlplusplus
zlib
@@ -90,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
];
doCheck = true;
dontWrapQtApps = true;
passthru = {
@@ -104,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
their associated options with a simple interface.
'';
homepage = "https://prismlauncher.org/";
changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.src.rev}";
changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
minion3665

25
pkgs/by-name/si/sioyek/package.nix
View File

@@ -24,17 +24,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-MOqWitXnYn8efk2LSeAOhmpcxGn6hbvjXbNTXEDdxIM=";
};
buildInputs = [
gumbo
harfbuzz
jbig2dec
mujs
mupdf
openjpeg
qt6.qt3d
qt6.qtbase
qt6.qtspeech
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
buildInputs =
[
gumbo
harfbuzz
jbig2dec
mujs
mupdf
openjpeg
qt6.qt3d
qt6.qtbase
qt6.qtspeech
]
++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
nativeBuildInputs = [
installShellFiles

55
pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch Normal file
View File

@@ -0,0 +1,55 @@
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index e23c63453e..d0142b83d8 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -40,10 +40,10 @@ nanoid = { workspace = true, optional = true}
parking_lot.workspace = true
postage.workspace = true
-[target.'cfg(target_os = "macos")'.dependencies]
+[target.'cfg(target_os = "none")'.dependencies]
core-foundation.workspace = true
-[target.'cfg(all(not(target_os = "macos")))'.dependencies]
+[target.'cfg(all(not(target_os = "none")))'.dependencies]
async-trait = { workspace = true }
collections = { workspace = true }
gpui = { workspace = true }
diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs
index 2fdfd982bf..7272614b87 100644
--- a/crates/live_kit_client/build.rs
+++ b/crates/live_kit_client/build.rs
@@ -36,7 +36,7 @@ const MACOS_TARGET_VERSION: &str = "10.15.7";
fn main() {
if cfg!(all(
- target_os = "macos",
+ target_os = "none",
not(any(test, feature = "test-support", feature = "no-webrtc")),
)) {
let swift_target = get_swift_target();
diff --git a/crates/live_kit_client/src/live_kit_client.rs b/crates/live_kit_client/src/live_kit_client.rs
index 4820a4eedb..6179e6c55a 100644
--- a/crates/live_kit_client/src/live_kit_client.rs
+++ b/crates/live_kit_client/src/live_kit_client.rs
@@ -2,16 +2,16 @@
use std::sync::Arc;
-#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
+#[cfg(all(target_os = "none", not(any(test, feature = "test-support"))))]
pub mod prod;
-#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
+#[cfg(all(target_os = "none", not(any(test, feature = "test-support"))))]
pub use prod::*;
-#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
+#[cfg(any(test, feature = "test-support", not(target_os = "none")))]
pub mod test;
-#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
+#[cfg(any(test, feature = "test-support", not(target_os = "none")))]
pub use test::*;
pub type Sid = String;

162
pkgs/by-name/ze/zed-editor/package.nix
View File

@@ -9,7 +9,6 @@
perl,
pkg-config,
protobuf,
xcbuild,
fontconfig,
freetype,
libgit2,
@@ -23,7 +22,6 @@
libglvnd,
xorg,
stdenv,
darwin,
makeFontsConf,
vulkan-loader,
envsubst,
@@ -32,6 +30,10 @@
versionCheckHook,
zed-editor,
buildFHSEnv,
cargo-bundle,
git,
apple-sdk_15,
darwinMinVersionHook,
withGLES ? false,
}:
@@ -93,14 +95,23 @@ rustPlatform.buildRustPackage rec {
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE=";
fetchSubmodules = true;
};
patches = [
# Zed uses cargo-install to install cargo-about during the script execution.
# We provide cargo-about ourselves and can skip this step.
./0001-generate-licenses.patch
];
patches =
[
# Zed uses cargo-install to install cargo-about during the script execution.
# We provide cargo-about ourselves and can skip this step.
./0001-generate-licenses.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# The Swift variant of livekit currently used inside Zed requires
# Swift 6, which is not available in nixpkgs yet:
# https://github.com/NixOS/nixpkgs/issues/343210
# The Rust variant of livekit for Zed is still pending and there is no
# schedule when it will be finished:
# https://github.com/zed-industries/zed/pull/13343
./0002-disable-livekit-darwin.patch
];
cargoLock = {
lockFile = ./Cargo.lock;
@@ -132,7 +143,7 @@ rustPlatform.buildRustPackage rec {
protobuf
rustPlatform.bindgenHook
cargo-about
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
dontUseCmakeConfigure = true;
@@ -153,30 +164,23 @@ rustPlatform.buildRustPackage rec {
wayland
xorg.libxcb
]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit
CoreAudio
CoreFoundation
CoreGraphics
CoreMedia
CoreServices
CoreText
Foundation
IOKit
Metal
Security
SystemConfiguration
VideoToolbox
]
);
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_15
# This will need to be increased to 12.3 once
# https://github.com/zed-industries/zed/pull/13343
# is merged and released, as ScreenCaptureKit is only available on 12.3 and up:
# https://developer.apple.com/documentation/screencapturekit
(darwinMinVersionHook "10.15")
];
cargoBuildFlags = [
"--package=zed"
"--package=cli"
];
buildFeatures = [ "gpui/runtime_shaders" ];
# Required on darwin because we don't have access to the
# proprietary Metal shader compiler.
buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -188,9 +192,12 @@ rustPlatform.buildRustPackage rec {
};
# Setting this environment variable allows to disable auto-updates
# https://zed.dev/docs/development/linux#notes-for-packaging-zed
ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled.";
ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
# Used by `zed --version`
RELEASE_VERSION = version;
# Required until `-isysroot` can be used with libclang in nixpkgs on darwin, otherwise
# rust bindgen will not work as expected
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${apple-sdk_15.sdkroot}/System/Library/Frameworks";
};
RUSTFLAGS = if withGLES then "--cfg gles" else "";
@@ -209,38 +216,79 @@ rustPlatform.buildRustPackage rec {
export HOME=$(mktemp -d);
'';
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
# Fails on certain hosts (including Hydra) for unclear reason
"--skip=test_open_paths_action"
checkFlags =
[
# Flaky: unreliably fails on certain hosts (including Hydra)
"--skip=zed::tests::test_window_edit_state_restoring_enabled"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Fails on certain hosts (including Hydra) for unclear reason
"--skip=test_open_paths_action"
];
# Flaky: unreliably fails on certain hosts (including Hydra)
"--skip=zed::tests::test_window_edit_state_restoring_enabled"
];
installPhase =
if stdenv.hostPlatform.isDarwin then
''
runHook preInstall
installPhase = ''
runHook preInstall
# cargo-bundle expects the binary in target/release
mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed target/release/zed
mkdir -p $out/bin $out/libexec
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor
pushd crates/zed
install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
# Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
export CARGO_BUNDLE_SKIP_BUILD=true
app_path=$(cargo bundle --release | xargs)
# extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
# and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
(
export DO_STARTUP_NOTIFY="true"
export APP_CLI="zeditor"
export APP_ICON="zed"
export APP_NAME="Zed"
export APP_ARGS="%U"
mkdir -p "$out/share/applications"
${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
)
# We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
# Remove closing tags from Info.plist (last two lines)
head -n -2 $app_path/Contents/Info.plist > Info.plist
# Append extensions
cat resources/info/*.plist >> Info.plist
# Add closing tags
printf "</dict>\n</plist>\n" >> Info.plist
mv Info.plist $app_path/Contents/Info.plist
runHook postInstall
'';
popd
mkdir -p $out/Applications $out/bin
# Zed expects git next to its own binary
ln -s ${git}/bin/git $app_path/Contents/MacOS/git
mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $app_path/Contents/MacOS/cli
mv $app_path $out/Applications/
# Physical location of the CLI must be inside the app bundle as this is used
# to determine which app to start
ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zeditor
runHook postInstall
''
else
''
runHook preInstall
mkdir -p $out/bin $out/libexec
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor
cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor
install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
# extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
# and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
(
export DO_STARTUP_NOTIFY="true"
export APP_CLI="zeditor"
export APP_ICON="zed"
export APP_NAME="Zed"
export APP_ARGS="%U"
mkdir -p "$out/share/applications"
${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
)
runHook postInstall
'';
nativeInstallCheckInputs = [
versionCheckHook
@@ -268,8 +316,6 @@ rustPlatform.buildRustPackage rec {
niklaskorz
];
mainProgram = "zeditor";
platforms = lib.platforms.all;
# Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618
broken = stdenv.hostPlatform.isDarwin;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

2
pkgs/development/cuda-modules/tensorrt/releases.nix
View File

@@ -137,7 +137,7 @@
version = "10.3.0.26";
minCudaVersion = "12.0";
maxCudaVersion = "12.5";
cudnnVersion = "8.9";
cudnnVersion = "9.3";
filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz";
hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE=";
}

21
pkgs/development/interpreters/gauche/boot.nix
View File

@@ -10,6 +10,7 @@
zlib,
mbedtls,
cacert,
darwin,
}:
stdenv.mkDerivation rec {
@@ -28,14 +29,18 @@ stdenv.mkDerivation rec {
texinfo
];
buildInputs = [
libiconv
gdbm
openssl
zlib
mbedtls
cacert
];
buildInputs =
[
libiconv
gdbm
openssl
zlib
mbedtls
cacert
]
++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk_11_0.frameworks.CoreServices
];
postPatch = ''
patchShebangs .

2
pkgs/development/libraries/gbenchmark/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ];
checkInputs = [ gtest ];
buildInputs = [ gtest ];
cmakeFlags = [
(lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false)

18
pkgs/development/lisp-modules/import/repository/quicklisp.lisp
View File

@@ -68,6 +68,13 @@
(sqlite:execute-single db
"select count(*) from sha256")))))
(defparameter *broken-systems*
'(
;; Infinite recursion through dependencies in 2024-10-12 dist
"cl-quil" "qvm"
)
"List of broken systems, which should be omitted from the package graph")
(defmethod import-lisp-packages ((repository quicklisp-repository)
(database sqlite-database))
@@ -113,6 +120,17 @@
asds
'vector))))))
;; Skip known broken systems and their dependents
(dolist (system *broken-systems*)
(sql-query
"with recursive broken(name) as (
select ?
union
select s.name from quicklisp_system s, broken b
where b.name in (select value from json_each(deps))
) delete from quicklisp_system where name in (select name from broken)"
system))
(sqlite:with-transaction db
;; Should these be temp tables, that then get queried by
;; system name? This looks like it uses a lot of memory.

208
pkgs/development/lisp-modules/imported.nix
View File

@@ -4188,38 +4188,6 @@ in lib.makeScope pkgs.newScope (self: {
hydraPlatforms = [ ];
};
});
boondoggle = (build-asdf-system {
pname = "boondoggle";
version = "20241012-git";
asds = [ "boondoggle" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "boondoggle";
asd = "boondoggle";
});
systems = [ "boondoggle" ];
lispLibs = [ (getAttr "cl-quil" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) ];
meta = {
hydraPlatforms = [ ];
};
});
boondoggle-tests = (build-asdf-system {
pname = "boondoggle-tests";
version = "20241012-git";
asds = [ "boondoggle-tests" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "boondoggle-tests";
asd = "boondoggle-tests";
});
systems = [ "boondoggle-tests" ];
lispLibs = [ (getAttr "boondoggle" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "sapaclisp" self) ];
meta = {
hydraPlatforms = [ ];
};
});
bordeaux-fft = (build-asdf-system {
pname = "bordeaux-fft";
version = "20150608-http";
@@ -22868,54 +22836,6 @@ in lib.makeScope pkgs.newScope (self: {
hydraPlatforms = [ ];
};
});
cl-quil = (build-asdf-system {
pname = "cl-quil";
version = "20241012-git";
asds = [ "cl-quil" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "cl-quil";
asd = "cl-quil";
});
systems = [ "cl-quil" ];
lispLibs = [ (getAttr "alexa" self) (getAttr "alexandria" self) (getAttr "cl-algebraic-data-type" self) (getAttr "cl-grnm" self) (getAttr "cl-heap" self) (getAttr "cl-permutation" self) (getAttr "clos-encounters" self) (getAttr "closer-mop" self) (getAttr "flexi-streams" self) (getAttr "global-vars" self) (getAttr "magicl" self) (getAttr "parse-float" self) (getAttr "queues_dot_priority-queue" self) (getAttr "qvm" self) (getAttr "salza2" self) (getAttr "split-sequence" self) (getAttr "trivial-garbage" self) (getAttr "yacc" self) (getAttr "yason" self) ];
meta = {
hydraPlatforms = [ ];
};
});
cl-quil-benchmarking = (build-asdf-system {
pname = "cl-quil-benchmarking";
version = "20241012-git";
asds = [ "cl-quil-benchmarking" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "cl-quil-benchmarking";
asd = "cl-quil-benchmarking";
});
systems = [ "cl-quil-benchmarking" ];
lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-quil" self) (getAttr "metering" self) (getAttr "qvm-app" self) (getAttr "trivial-benchmark" self) (getAttr "trivial-garbage" self) ];
meta = {
hydraPlatforms = [ ];
};
});
cl-quil-tests = (build-asdf-system {
pname = "cl-quil-tests";
version = "20241012-git";
asds = [ "cl-quil-tests" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "cl-quil-tests";
asd = "cl-quil-tests";
});
systems = [ "cl-quil-tests" ];
lispLibs = [ (getAttr "alexa" self) (getAttr "alexandria" self) (getAttr "cl-permutation" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "magicl" self) (getAttr "qvm" self) (getAttr "yacc" self) ];
meta = {
hydraPlatforms = [ ];
};
});
cl-rabbit = (build-asdf-system {
pname = "cl-rabbit";
version = "20210411-git";
@@ -60484,38 +60404,6 @@ in lib.makeScope pkgs.newScope (self: {
hydraPlatforms = [ ];
};
});
quilc = (build-asdf-system {
pname = "quilc";
version = "20241012-git";
asds = [ "quilc" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "quilc";
asd = "quilc";
});
systems = [ "quilc" ];
lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "cl-quil-benchmarking" self) (getAttr "cl-syslog" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) (getAttr "magicl" self) (getAttr "rpcq" self) (getAttr "split-sequence" self) (getAttr "swank" self) (getAttr "trivial-features" self) (getAttr "yason" self) ];
meta = {
hydraPlatforms = [ ];
};
});
quilc-tests = (build-asdf-system {
pname = "quilc-tests";
version = "20241012-git";
asds = [ "quilc-tests" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/quilc/2024-10-12/quilc-20241012-git.tgz";
sha256 = "0qy3fzd5cljq1dg5l3nd36wk7a6vna8lm22q0vncchpxvsdgnjpy";
system = "quilc-tests";
asd = "quilc-tests";
});
systems = [ "quilc-tests" ];
lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "fiasco" self) (getAttr "quilc" self) (getAttr "uuid" self) ];
meta = {
hydraPlatforms = [ ];
};
});
quine-mccluskey = (build-asdf-system {
pname = "quine-mccluskey";
version = "20141217-git";
@@ -60594,102 +60482,6 @@ in lib.makeScope pkgs.newScope (self: {
hydraPlatforms = [ ];
};
});
qvm = (build-asdf-system {
pname = "qvm";
version = "20241012-git";
asds = [ "qvm" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm";
asd = "qvm";
});
systems = [ "qvm" ];
lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) (getAttr "cl-quil" self) (getAttr "clos-encounters" self) (getAttr "global-vars" self) (getAttr "ieee-floats" self) (getAttr "lparallel" self) (getAttr "magicl" self) (getAttr "mt19937" self) (getAttr "static-vectors" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qvm-app = (build-asdf-system {
pname = "qvm-app";
version = "20241012-git";
asds = [ "qvm-app" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm-app";
asd = "qvm-app";
});
systems = [ "qvm-app" ];
lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) (getAttr "cl-quil" self) (getAttr "cl-syslog" self) (getAttr "command-line-arguments" self) (getAttr "drakma" self) (getAttr "global-vars" self) (getAttr "hunchentoot" self) (getAttr "ieee-floats" self) (getAttr "qvm" self) (getAttr "qvm-benchmarks" self) (getAttr "swank" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) (getAttr "yason" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qvm-app-tests = (build-asdf-system {
pname = "qvm-app-tests";
version = "20241012-git";
asds = [ "qvm-app-tests" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm-app-tests";
asd = "qvm-app-tests";
});
systems = [ "qvm-app-tests" ];
lispLibs = [ (getAttr "fiasco" self) (getAttr "qvm-app" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qvm-benchmarks = (build-asdf-system {
pname = "qvm-benchmarks";
version = "20241012-git";
asds = [ "qvm-benchmarks" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm-benchmarks";
asd = "qvm-benchmarks";
});
systems = [ "qvm-benchmarks" ];
lispLibs = [ (getAttr "cl-quil" self) (getAttr "qvm" self) (getAttr "trivial-benchmark" self) (getAttr "yason" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qvm-examples = (build-asdf-system {
pname = "qvm-examples";
version = "20241012-git";
asds = [ "qvm-examples" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm-examples";
asd = "qvm-examples";
});
systems = [ "qvm-examples" ];
lispLibs = [ (getAttr "cl-grnm" self) (getAttr "cl-quil" self) (getAttr "qvm" self) (getAttr "qvm-app" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qvm-tests = (build-asdf-system {
pname = "qvm-tests";
version = "20241012-git";
asds = [ "qvm-tests" ];
src = (createAsd {
url = "http://beta.quicklisp.org/archive/qvm/2024-10-12/qvm-20241012-git.tgz";
sha256 = "0kxgy8gdqvxp3hr14cxjk3s7d1w8myisclcaxbh7r9x8rci82a4v";
system = "qvm-tests";
asd = "qvm-tests";
});
systems = [ "qvm-tests" ];
lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cl-quil" self) (getAttr "fiasco" self) (getAttr "qvm" self) (getAttr "qvm-examples" self) (getAttr "trivial-garbage" self) ];
meta = {
hydraPlatforms = [ ];
};
});
qwt = (build-asdf-system {
pname = "qwt";
version = "20210531-git";

12
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View File

@@ -1,20 +1,20 @@
{ lib, buildDunePackage, fetchurl
, cstruct, zarith, bigarray-compat, stdlib-shims, ptime, alcotest
, ptime
, alcotest
}:
buildDunePackage rec {
minimalOCamlVersion = "4.08";
duneVersion = "3";
pname = "asn1-combinators";
version = "0.2.6";
version = "0.3.1";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE=";
url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-${version}.tbz";
hash = "sha256-+imExupuHhxP4gM/AWWvYRljwkAM4roFEAS3ffxVfE4=";
};
propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];
propagatedBuildInputs = [ ptime ];
doCheck = true;
checkInputs = [ alcotest ];

15
pkgs/development/ocaml-modules/awa/default.nix
View File

@@ -1,31 +1,26 @@
{ lib, buildDunePackage, fetchurl
, ppx_sexp_conv
, mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk
, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct
, x509, cstruct, cstruct-unix, eqaf
, mtime, logs, fmt, cmdliner, base64
, zarith
}:
buildDunePackage rec {
pname = "awa";
version = "0.3.1";
version = "0.4.0";
minimalOCamlVersion = "4.10";
src = fetchurl {
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk=";
hash = "sha256-uATKGr+J18jBx5vErB93Q9+BCR7ezi1Q+ueQGolpybQ=";
};
postPatch = ''
substituteInPlace lib/dune --replace-warn eqaf.cstruct eqaf-cstruct
'';
propagatedBuildInputs = [
mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509
cstruct cstruct-sexp sexplib mtime
cstruct mtime
logs base64 zarith
ppx_sexp_conv eqaf-cstruct
eqaf
];
doCheck = true;

2
pkgs/development/ocaml-modules/awa/mirage.nix
View File

@@ -8,8 +8,6 @@ buildDunePackage {
inherit (awa) version src;
duneVersion = "3";
propagatedBuildInputs = [
awa cstruct mtime lwt mirage-flow mirage-clock logs
duration mirage-time

6
pkgs/development/ocaml-modules/ca-certs-nss/default.nix
View File

@@ -7,20 +7,19 @@
, logs
, fmt
, bos
, astring
, cmdliner
, alcotest
}:
buildDunePackage rec {
pname = "ca-certs-nss";
version = "3.101";
version = "3.103";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
hash = "sha256-XE3201P5JXWMRLhCwAa6zwMHEwZjg3ORIKii7tmx/hI=";
hash = "sha256-ZBwPBUwYuBBuzukgocEHBoqorotLmzHkjUYCmWRqYAw=";
};
propagatedBuildInputs = [
@@ -33,7 +32,6 @@ buildDunePackage rec {
logs
fmt
bos
astring
cmdliner
];

6
pkgs/development/ocaml-modules/ca-certs/default.nix
View File

@@ -5,17 +5,15 @@
buildDunePackage rec {
pname = "ca-certs";
version = "0.2.3";
version = "1.0.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz";
hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw=";
hash = "sha256-hpDyMSNGckeZ8tihtoTsFrYnsCfUFkgDoOK34kYsCnI=";
};
duneVersion = "3";
propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ];
doCheck = true;

4
pkgs/development/ocaml-modules/chacha/default.nix
View File

@@ -26,9 +26,6 @@ buildDunePackage rec {
sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc=";
})];
minimalOCamlVersion = "4.02";
duneVersion = "3";
propagatedBuildInputs = [ cstruct mirage-crypto ];
# alcotest isn't available for OCaml < 4.05 due to fmt
@@ -45,5 +42,6 @@ buildDunePackage rec {
'';
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ fufexan ];
broken = true; # Not compatible with mirage-crypto ≥ 1.0
};
}

7
pkgs/development/ocaml-modules/conduit/async.nix
View File

@@ -1,5 +1,5 @@
{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit
, core, ipaddr, ipaddr-sexp, sexplib
{ buildDunePackage, async, ppx_sexp_conv, ppx_here, uri, conduit
, core, ipaddr, ipaddr-sexp, sexplib0
}:
buildDunePackage {
@@ -13,13 +13,12 @@ buildDunePackage {
propagatedBuildInputs = [
async
async_ssl
conduit
uri
ipaddr
ipaddr-sexp
core
sexplib
sexplib0
];
meta = conduit.meta // {

10
pkgs/development/ocaml-modules/conduit/default.nix
View File

@@ -1,20 +1,20 @@
{ lib, fetchurl, buildDunePackage
, ppx_sexp_conv, sexplib, astring, uri
, ppx_sexp_conv, sexplib0, astring, uri
, ipaddr, ipaddr-sexp
}:
buildDunePackage rec {
pname = "conduit";
version = "6.2.3";
version = "7.0.0";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.13";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
hash = "sha256-OkaEuxSFsfJH1ghN0KNW4QJ+ksLNRns1yr1Zp2RCPnk=";
hash = "sha256-Pg7ChIlqldF42NE1eS56Rssk+csK8OqWTQXO4avLEhg=";
};
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib0 uri ppx_sexp_conv ];
meta = {
description = "Network connection establishment library";

3
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
View File

@@ -1,6 +1,6 @@
{ buildDunePackage
, conduit-lwt, ppx_sexp_conv, lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
, lwt_ssl, tls, lwt_log, ssl
, lwt_ssl, lwt_log, ssl
}:
buildDunePackage {
@@ -15,7 +15,6 @@ buildDunePackage {
uri
ipaddr
ipaddr-sexp
tls
ca-certs
logs
lwt_ssl

4
pkgs/development/ocaml-modules/conduit/lwt.nix
View File

@@ -1,4 +1,4 @@
{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }:
{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib0 }:
buildDunePackage {
pname = "conduit-lwt";
@@ -6,7 +6,7 @@ buildDunePackage {
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ conduit lwt sexplib ];
propagatedBuildInputs = [ conduit lwt sexplib0 ];
meta = conduit.meta // {
description = "Network connection establishment library for Lwt";

8
pkgs/development/ocaml-modules/conduit/mirage.nix
View File

@@ -1,6 +1,6 @@
{ buildDunePackage, conduit-lwt
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
, ppx_sexp_conv, sexplib0, uri, cstruct, mirage-flow
, mirage-flow-combinators, mirage-crypto-rng-mirage, mirage-time, mirage-clock
, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
, tcpip, ca-certs-nss
}:
@@ -13,8 +13,8 @@ buildDunePackage {
nativeBuildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
sexplib uri cstruct mirage-clock mirage-flow
mirage-flow-combinators mirage-random mirage-time
sexplib0 uri cstruct mirage-clock mirage-flow
mirage-flow-combinators mirage-crypto-rng-mirage mirage-time
dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage
ipaddr ipaddr-sexp tcpip ca-certs-nss
];

8
pkgs/development/ocaml-modules/dns/certify.nix
View File

@@ -1,6 +1,6 @@
{ buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
, mirage-random, mirage-time, mirage-clock
, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt
, mirage-time, mirage-clock
, logs, mirage-crypto-pk, mirage-crypto-rng-mirage, mirage-crypto-ec, lwt
, tcpip
}:
@@ -8,7 +8,6 @@ buildDunePackage {
pname = "dns-certify";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
dns
@@ -16,12 +15,11 @@ buildDunePackage {
dns-mirage
randomconv
x509
mirage-random
mirage-time
mirage-clock
logs
mirage-crypto-pk
mirage-crypto-rng
mirage-crypto-rng-mirage
mirage-crypto-ec
lwt
tcpip

5
pkgs/development/ocaml-modules/dns/cli.nix
View File

@@ -1,6 +1,6 @@
{ buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec
, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
, mirage-crypto-rng, ohex, ptime, mtime, logs, fmt, ipaddr, lwt
, randomconv, alcotest
}:
@@ -10,7 +10,6 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (dns) version src;
duneVersion = "3";
# no need to propagate as this is primarily
# an executable package
@@ -28,7 +27,7 @@ buildDunePackage {
mirage-crypto
mirage-crypto-pk
mirage-crypto-rng
hex
ohex
ptime
mtime
logs

4
pkgs/development/ocaml-modules/dns/client-lwt.nix
View File

@@ -1,5 +1,5 @@
{ buildDunePackage, dns, dns-client, lwt
, mirage-crypto-rng, mtime
, mirage-crypto-rng-lwt, mtime
, ipaddr, alcotest
, ca-certs
, happy-eyeballs
@@ -21,7 +21,7 @@ buildDunePackage {
happy-eyeballs-lwt
tls-lwt
mtime
mirage-crypto-rng
mirage-crypto-rng-lwt
];
checkInputs = [ alcotest ];
doCheck = true;

4
pkgs/development/ocaml-modules/dns/client-mirage.nix
View File

@@ -1,5 +1,5 @@
{ buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
, mirage-random
, mirage-crypto-rng-mirage
, domain-name, ipaddr
, ca-certs-nss
, happy-eyeballs
@@ -17,7 +17,7 @@ buildDunePackage {
domain-name
ipaddr
lwt
mirage-random
mirage-crypto-rng-mirage
mirage-time
mirage-clock
ca-certs-nss

10
pkgs/development/ocaml-modules/dns/default.nix
View File

@@ -2,7 +2,6 @@
, buildDunePackage
, fetchurl
, alcotest
, cstruct
, domain-name
, duration
, gmap
@@ -13,20 +12,21 @@
, ptime
, fmt
, base64
, ohex
}:
buildDunePackage rec {
pname = "dns";
version = "8.0.0";
version = "9.0.0";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.13";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
hash = "sha256-CIIGG8W/p1FasmyEyoBiMjrFkxs/iuKVJ5SwySfYhU4=";
hash = "sha256-HvXwTLVKw0wHV+xftL/z+yNA6UjxUTSdo/cC+s3qy/Y=";
};
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
propagatedBuildInputs = [ fmt logs ptime domain-name gmap ipaddr lru duration metrics base64 ohex ];
doCheck = true;
checkInputs = [ alcotest ];

3
pkgs/development/ocaml-modules/dns/dnssec.nix
View File

@@ -1,5 +1,4 @@
{ buildDunePackage
, cstruct
, dns
, mirage-crypto
, mirage-crypto-pk
@@ -14,10 +13,8 @@ buildDunePackage {
pname = "dnssec";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
cstruct
dns
mirage-crypto
mirage-crypto-pk

1
pkgs/development/ocaml-modules/dns/mirage.nix
View File

@@ -4,7 +4,6 @@ buildDunePackage {
pname = "dns-mirage";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
dns

1
pkgs/development/ocaml-modules/dns/resolver.nix
View File

@@ -20,7 +20,6 @@ buildDunePackage {
pname = "dns-resolver";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
dns

1
pkgs/development/ocaml-modules/dns/server.nix
View File

@@ -17,7 +17,6 @@ buildDunePackage {
pname = "dns-server";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
dns

5
pkgs/development/ocaml-modules/dns/stub.nix
View File

@@ -1,13 +1,12 @@
{ buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig
, dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
, mirage-random, tcpip, metrics
, mirage-crypto-rng-mirage, tcpip, metrics
}:
buildDunePackage {
pname = "dns-stub";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
dns
@@ -21,7 +20,7 @@ buildDunePackage {
lwt
mirage-time
mirage-clock
mirage-random
mirage-crypto-rng-mirage
tcpip
metrics
];

5
pkgs/development/ocaml-modules/dns/tsig.nix
View File

@@ -1,13 +1,12 @@
{ buildDunePackage, dns, mirage-crypto, base64, alcotest }:
{ buildDunePackage, dns, digestif, base64, alcotest }:
buildDunePackage {
pname = "dns-tsig";
inherit (dns) version src;
duneVersion = "3";
propagatedBuildInputs = [
mirage-crypto
digestif
dns
base64
];

10
pkgs/development/ocaml-modules/erm_xmpp/default.nix
View File

@@ -1,21 +1,21 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild
, erm_xml, mirage-crypto, mirage-crypto-rng, base64
, erm_xml, mirage-crypto, mirage-crypto-rng, base64, digestif
}:
stdenv.mkDerivation rec {
version = "0.3+20220404";
version = "0.3+20241009";
pname = "ocaml${ocaml.version}-erm_xmpp";
src = fetchFromGitHub {
owner = "hannesm";
repo = "xmpp";
rev = "e54d54e142ac9770c37e144693473692bf473530";
sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U=";
rev = "54418f77abf47b175e9c1b68a4f745a12b640d6a";
sha256 = "sha256-AbzZjNkW1VH/FOnzNruvelZeo3IYg/Usr3enQEknTQs=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];
buildInputs = [ camlp4 ];
propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ];
propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 digestif ];
strictDeps = true;

8
pkgs/development/ocaml-modules/git/default.nix
View File

@@ -2,19 +2,19 @@
, alcotest, mirage-crypto-rng, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum
, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
, result, bigstringaf, optint, mirage-flow, domain-name, emile
, bigstringaf, optint, mirage-flow, domain-name, emile
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner
}:
buildDunePackage rec {
pname = "git";
version = "3.16.1";
version = "3.17.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
hash = "sha256-wDW9zM2eTS9IxtnNxl5h/BCDjs8dim8qN2riCoqSSAM=";
hash = "sha256-7yANBBLtGlOFJdBQEpiJDguJPgIFKAlNajrhI1n9AmU=";
};
buildInputs = [
@@ -22,7 +22,7 @@ buildDunePackage rec {
];
propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore fmt
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
ke logs lwt ocamlgraph uri rresult bigstringaf optint mirage-flow
domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
];
nativeCheckInputs = [

2
pkgs/development/ocaml-modules/git/paf.nix
View File

@@ -9,7 +9,6 @@
, lwt
, mirage-clock
, mirage-time
, result
, rresult
, tls
, uri
@@ -34,7 +33,6 @@ buildDunePackage {
ca-certs-nss
fmt
lwt
result
rresult
ipaddr
logs

16
pkgs/development/ocaml-modules/git/unix.nix
View File

@@ -1,12 +1,12 @@
{ buildDunePackage, git
, rresult, result, bigstringaf
, rresult, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
, mirage-clock, mirage-clock-unix, astring, cmdliner
, decompress, domain-name, ipaddr, mtime
, tcpip, awa-mirage, mirage-flow, mirage-unix
, tcpip, mirage-flow, mirage-unix
, alcotest, alcotest-lwt, base64, cstruct
, ke, mirage-crypto-rng, git-binary
, ptime, mimic, ca-certs-nss, tls, tls-mirage
, mimic, tls
, cacert, happy-eyeballs-lwt, git-mirage
}:
@@ -17,19 +17,17 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
buildInputs = [
awa
awa-mirage
cmdliner
mirage-clock
tcpip
];
propagatedBuildInputs = [
rresult result bigstringaf
rresult bigstringaf
fmt bos fpath digestif logs lwt
astring decompress
domain-name ipaddr mirage-flow mirage-unix
cstruct ptime mimic ca-certs-nss
tls tls-mirage git happy-eyeballs-lwt
cstruct mimic
tls git happy-eyeballs-lwt
git-mirage mirage-clock-unix
];
checkInputs = [

13
pkgs/development/ocaml-modules/hkdf/default.nix
View File

@@ -1,19 +1,18 @@
{ lib, buildDunePackage, fetchurl, cstruct, mirage-crypto, alcotest }:
{ lib, buildDunePackage, fetchurl, digestif, alcotest, ohex }:
buildDunePackage rec {
pname = "hkdf";
version = "1.0.4";
version = "2.0.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
hash = "sha256-uSbW2krEWquZlzXdK7/R91ETFnENeRr6NhAGtv42/Vs=";
url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
hash = "sha256-VLBxJ5viTTn1nK0QNIAGq/8961x0/RGHZN/C/7ITWNM=";
};
propagatedBuildInputs = [ cstruct mirage-crypto ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ digestif ];
checkInputs = [ alcotest ohex ];
doCheck = true;
meta = with lib; {

4
pkgs/development/ocaml-modules/http-mirage-client/default.nix
View File

@@ -16,13 +16,13 @@
buildDunePackage rec {
pname = "http-mirage-client";
version = "0.0.6";
version = "0.0.7";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
hash = "sha256-rtl76NJRYwSRNgN57v0KwUlcDsGQ2MR+y5ZDVf4Otjs=";
hash = "sha256-GKPJKVtHEbt8L922y/G1oewqGVBO4f313XadzImMtFM=";
};
propagatedBuildInputs = [

2
pkgs/development/ocaml-modules/janestreet/0.15.nix
View File

@@ -246,7 +246,7 @@ with self;
pname = "cohttp_async_websocket";
hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8";
meta.description = "Websocket library for use with cohttp and async";
propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ];
propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ];
};
cohttp_static_handler = janePackage {

2
pkgs/development/ocaml-modules/janestreet/0.16.nix
View File

@@ -264,7 +264,7 @@ with self;
pname = "cohttp_async_websocket";
hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE=";
meta.description = "Websocket library for use with cohttp and async";
propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ];
propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ];
};
cohttp_static_handler = janePackage {

1
pkgs/development/ocaml-modules/janestreet/0.17.nix
View File

@@ -402,6 +402,7 @@ with self;
hash = "sha256-0InGCF34LWQes9S4OgbR6w+6cylThYuj1Dj0aQyTnuY=";
meta.description = "Websocket library for use with cohttp and async";
propagatedBuildInputs = [
async_ssl
async_websocket
cohttp-async
ppx_jane

3
pkgs/development/ocaml-modules/letsencrypt/app.nix
View File

@@ -11,12 +11,10 @@
, bos
, fpath
, randomconv
, cstruct
}:
buildDunePackage {
pname = "letsencrypt-app";
duneVersion = "3";
minimalOCamlVersion = "4.08";
inherit (letsencrypt)
@@ -37,7 +35,6 @@ buildDunePackage {
bos
fpath
randomconv
cstruct
];
meta = letsencrypt.meta // {

15
pkgs/development/ocaml-modules/letsencrypt/default.nix
View File

@@ -1,9 +1,9 @@
{ buildDunePackage
, lib
, fetchurl
, asn1-combinators
, uri
, base64
, digestif
, logs
, fmt
, lwt
@@ -12,23 +12,21 @@
, mirage-crypto-pk
, x509
, yojson
, ounit
, ounit2
, ptime
, domain-name
, cstruct
}:
buildDunePackage rec {
pname = "letsencrypt";
version = "0.5.1";
version = "1.0.0";
src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz";
hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w=";
hash = "sha256-koNG19aoLY28Hb7GyuPuJUyrCAE59n2vjbH4z0ykGvA=";
};
minimalOCamlVersion = "4.08";
duneVersion = "3";
buildInputs = [
fmt
@@ -41,17 +39,16 @@ buildDunePackage rec {
yojson
lwt
base64
digestif
mirage-crypto
mirage-crypto-ec
mirage-crypto-pk
asn1-combinators
x509
uri
cstruct
];
doCheck = true;
checkInputs = [ ounit ];
checkInputs = [ ounit2 ];
meta = {
description = "ACME implementation in OCaml";

1
pkgs/development/ocaml-modules/letsencrypt/dns.nix
View File

@@ -10,7 +10,6 @@
buildDunePackage {
pname = "letsencrypt-dns";
duneVersion = "3";
minimalOCamlVersion = "4.08";
inherit (letsencrypt)

2
pkgs/development/ocaml-modules/letsencrypt/mirage.nix
View File

@@ -10,8 +10,6 @@ buildDunePackage {
inherit (letsencrypt) version src;
duneVersion = "3";
propagatedBuildInputs = [ emile http-mirage-client letsencrypt paf ];
meta = letsencrypt.meta // {

16
pkgs/development/ocaml-modules/mirage-crypto/default.nix
View File

@@ -1,23 +1,22 @@
{ lib, fetchurl, buildDunePackage, ounit2, dune-configurator, eqaf-cstruct, pkg-config
{ lib, fetchurl, buildDunePackage, ohex, ounit2, dune-configurator, eqaf-cstruct
, withFreestanding ? false
, ocaml-freestanding
}:
buildDunePackage rec {
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.13";
pname = "mirage-crypto";
version = "0.11.3";
version = "1.1.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
sha256 = "sha256-v7Uw+hac2QXrx+JEnzQHz71nAjrAspG4tvShQ3pdlbE=";
hash = "sha256-xxiXZ6fq1UkjyrAg85zQw0r31LBId2k52U8Cir9TY1M=";
};
doCheck = true;
checkInputs = [ ounit2 ];
checkInputs = [ ohex ounit2 ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [
eqaf-cstruct
@@ -25,11 +24,6 @@ buildDunePackage rec {
ocaml-freestanding
];
# Compatibility with eqaf 0.10
postPatch = ''
substituteInPlace src/dune --replace-warn eqaf.cstruct eqaf-cstruct
'';
meta = with lib; {
homepage = "https://github.com/mirage/mirage-crypto";
description = "Simple symmetric cryptography for the modern age";

10
pkgs/development/ocaml-modules/mirage-crypto/ec.nix
View File

@@ -3,12 +3,12 @@
, mirage-crypto
, dune-configurator
, pkg-config
, cstruct
, mirage-crypto-rng
, mirage-crypto-pk
, hex
, alcotest
, asn1-combinators
, ohex
, ounit2
, ppx_deriving_yojson
, ppx_deriving
, yojson
@@ -23,14 +23,11 @@ buildDunePackage rec {
src
version;
duneVersion = "3";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
dune-configurator
];
propagatedBuildInputs = [
cstruct
mirage-crypto
mirage-crypto-rng
] ++ lib.optionals withFreestanding [
@@ -41,9 +38,10 @@ buildDunePackage rec {
doCheck = true;
checkInputs = [
hex
alcotest
asn1-combinators
ohex
ounit2
ppx_deriving_yojson
ppx_deriving
yojson

14
pkgs/development/ocaml-modules/mirage-crypto/pk.nix
View File

@@ -1,21 +1,17 @@
{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng
, cstruct, sexplib0, zarith, eqaf-cstruct, gmp }:
{ buildDunePackage, ohex, ounit2, randomconv, mirage-crypto, mirage-crypto-rng
, sexplib0, zarith, gmp }:
buildDunePackage rec {
pname = "mirage-crypto-pk";
inherit (mirage-crypto) version src;
postPatch = ''
substituteInPlace pk/dune --replace-warn eqaf.cstruct eqaf-cstruct
'';
buildInputs = [ gmp ];
propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
zarith eqaf-cstruct sexplib0 ];
propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng
zarith sexplib0 ];
doCheck = true;
checkInputs = [ ounit2 randomconv ];
checkInputs = [ ohex ounit2 randomconv ];
meta = mirage-crypto.meta // {
description = "Simple public-key cryptography for the modern age";

8
pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
View File

@@ -1,18 +1,18 @@
{ buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime
{ buildDunePackage, mirage-crypto-rng, duration, mirage-runtime
, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix
, logs, lwt
, ohex
}:
buildDunePackage rec {
pname = "mirage-crypto-rng-mirage";
inherit (mirage-crypto-rng) version src;
duneVersion = "3";
doCheck = true;
checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ohex ];
propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime
propagatedBuildInputs = [ duration mirage-crypto-rng mirage-runtime
mirage-time mirage-clock logs lwt ];
meta = mirage-crypto-rng.meta // {

10
pkgs/development/ocaml-modules/mirage-crypto/rng.nix
View File

@@ -1,5 +1,5 @@
{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator
, cstruct, duration, logs }:
{ buildDunePackage, mirage-crypto, ohex, ounit2, randomconv, dune-configurator
, digestif, duration, logs }:
buildDunePackage rec {
pname = "mirage-crypto-rng";
@@ -7,12 +7,10 @@ buildDunePackage rec {
inherit (mirage-crypto) version src;
doCheck = true;
checkInputs = [ ounit2 randomconv ];
checkInputs = [ ohex ounit2 randomconv ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs ];
strictDeps = true;
propagatedBuildInputs = [ digestif mirage-crypto duration logs ];
meta = mirage-crypto.meta // {
description = "Cryptographically secure PRNG";

3
pkgs/development/ocaml-modules/mrmime/default.nix
View File

@@ -57,7 +57,8 @@ buildDunePackage rec {
jsonm
mirage-crypto-rng
];
doCheck = true;
# Checks are not compatible with mirage-crypto-rng ≥ 1.0
doCheck = false;
meta = {
description = "Parser and generator of mail in OCaml";

25
pkgs/development/ocaml-modules/ohex/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{
lib,
fetchurl,
buildDunePackage,
alcotest,
}:
buildDunePackage rec {
pname = "ohex";
version = "0.2.0";
src = fetchurl {
url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${version}.tar.gz";
hash = "sha256-prV7rbo0sAx3S2t4YtjniJEVq43uLXK8ZMsqoMzn2Ow=";
};
doCheck = true;
checkInputs = [ alcotest ];
meta = {
description = "Hexadecimal encoding and decoding";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.vbgl ];
};
}

2
pkgs/development/ocaml-modules/opium/default.nix
View File

@@ -23,7 +23,6 @@
buildDunePackage rec {
pname = "opium";
minimalOCamlVersion = "4.08";
duneVersion = "3";
inherit (rock) src version;
@@ -57,5 +56,6 @@ buildDunePackage rec {
homepage = "https://github.com/rgrinberg/opium";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.pmahoney ];
broken = true; # Not compatible with mirage-crypto ≥ 1.0
};
}

3
pkgs/development/ocaml-modules/otr/default.nix
View File

@@ -13,8 +13,6 @@ buildDunePackage rec {
hash = "sha256:0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq";
};
duneVersion = "3";
propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk
astring base64 ];
@@ -25,5 +23,6 @@ buildDunePackage rec {
description = "Off-the-record messaging protocol, purely in OCaml";
license = licenses.bsd2;
maintainers = with maintainers; [ sternenseemann ];
broken = true; # Not compatible with mirage-crypto ≥ 1.0
};
}

4
pkgs/development/ocaml-modules/paf/default.nix
View File

@@ -24,11 +24,11 @@
buildDunePackage rec {
pname = "paf";
version = "0.6.0";
version = "0.7.0";
src = fetchurl {
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
hash = "sha256-uvNezux0V4mwbxU07zCfCYXOgCYKPxshOKiiAjLef9k=";
hash = "sha256-w2lGs+DYY08BUKumWFxPFTLQKvdRPu7H1FdQOIjDQyE=";
};
minimalOCamlVersion = "4.08";

13
pkgs/development/ocaml-modules/pbkdf/default.nix
View File

@@ -1,25 +1,24 @@
{ lib
, buildDunePackage
, fetchzip
, cstruct
, digestif
, mirage-crypto
, alcotest
, ohex
}:
buildDunePackage rec {
pname = "pbkdf";
version = "1.2.0";
duneVersion = "3";
version = "2.0.0";
src = fetchzip {
url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz";
sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI=";
hash = "sha256-D2dXpf1D/wsJrcajU3If37tuLYjahoA/+QoXZKr1vQs=";
};
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ cstruct mirage-crypto ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ digestif mirage-crypto ];
checkInputs = [ alcotest ohex ];
doCheck = true;
meta = {

12
pkgs/development/ocaml-modules/randomconv/default.nix
View File

@@ -1,18 +1,16 @@
{ lib, buildDunePackage, fetchurl, cstruct }:
{ lib, buildDunePackage, fetchurl }:
buildDunePackage rec {
pname = "randomconv";
version = "0.1.3";
version = "0.2.0";
duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz";
sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v";
url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-${version}.tbz";
hash = "sha256-sxce3wfjQaRGj5L/wh4qiGO4LtXDb3R3zJja8F1bY+o=";
};
propagatedBuildInputs = [ cstruct ];
meta = {
homepage = "https://github.com/hannesm/randomconv";
description = "Convert from random bytes to random native numbers";

1
pkgs/development/ocaml-modules/riot/default.nix
View File

@@ -47,5 +47,6 @@ buildDunePackage rec {
changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = [ ];
broken = true; # Not compatible with mirage-crypto ≥ 1.0
};
}

8
pkgs/development/ocaml-modules/tcpip/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, buildDunePackage, fetchurl
, pkg-config
, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-time
, mirage-crypto-rng-mirage, mirage-time
, macaddr, macaddr-cstruct, fmt
, lwt, lwt-dllist, logs, duration, randomconv, ethernet
, alcotest, mirage-flow, mirage-vnetif, pcap-format
@@ -13,11 +13,11 @@
buildDunePackage rec {
pname = "tcpip";
version = "8.1.0";
version = "8.2.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
hash = "sha256-hrpdkvkHi93GUxL2O19M40/SVw12VDOyOiJquE11qcA=";
hash = "sha256-kW5oirqJdnbERNuBKfSWOtc5+NG+Yx2eAJxiKLS31u0=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ buildDunePackage rec {
cstruct-lwt
mirage-net
mirage-clock
mirage-random
mirage-crypto-rng-mirage
mirage-time
ipaddr-cstruct
macaddr

3
pkgs/development/ocaml-modules/tls/async.nix
View File

@@ -1,4 +1,4 @@
{ buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }:
{ buildDunePackage, tls, async, cstruct-async, core, mirage-crypto-rng-async }:
buildDunePackage rec {
pname = "tls-async";
@@ -12,7 +12,6 @@ buildDunePackage rec {
propagatedBuildInputs = [
async
core
cstruct
cstruct-async
mirage-crypto-rng-async
tls

10
pkgs/development/ocaml-modules/tls/default.nix
View File

@@ -1,22 +1,21 @@
{ lib, fetchurl, buildDunePackage
, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509
, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509
, ipaddr
, alcotest, cstruct-unix, ounit2
, alcotest, ounit2
}:
buildDunePackage rec {
pname = "tls";
version = "0.17.5";
version = "1.0.1";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
hash = "sha256-iRCIV786b4VyKSWo1KP1nCkdY4wPLi/EXw/a+JKuSBk=";
hash = "sha256-2uS1/8gD6ILphIBCWP+KrKe4N9hVbeaEABldpccKjYM=";
};
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
cstruct
domain-name
fmt
logs
@@ -33,7 +32,6 @@ buildDunePackage rec {
doCheck = true;
checkInputs = [
alcotest
cstruct-unix
ounit2
];

3
pkgs/development/ocaml-modules/tls/lwt.nix
View File

@@ -1,4 +1,4 @@
{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, x509 }:
{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt }:
buildDunePackage rec {
pname = "tls-lwt";
@@ -13,6 +13,5 @@ buildDunePackage rec {
lwt
mirage-crypto-rng-lwt
tls
x509
];
}

3
pkgs/development/ocaml-modules/tls/mirage.nix
View File

@@ -1,5 +1,5 @@
{ buildDunePackage, tls
, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509
, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime
}:
buildDunePackage {
@@ -16,7 +16,6 @@ buildDunePackage {
mirage-kv
ptime
tls
x509
];
meta = tls.meta // {

14
pkgs/development/ocaml-modules/x509/default.nix
View File

@@ -1,24 +1,22 @@
{ lib, fetchurl, buildDunePackage
, alcotest, cstruct-unix
, alcotest
, asn1-combinators, domain-name, fmt, gmap, pbkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, ipaddr
, logs, base64
, logs, base64, ohex
}:
buildDunePackage rec {
minimalOCamlVersion = "4.08";
pname = "x509";
version = "0.16.5";
duneVersion = "3";
version = "1.0.2";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz";
hash = "sha256-FJ4lpf6jf2GfsmkL7lwA8BydzzHTNfj/yqs5p1OMzZk=";
hash = "sha256-LrUYbLLJTNCWvEZtRXUv5LHdEya2oNTtAbrfm7EE2Bg=";
};
checkInputs = [ alcotest cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ohex ];
doCheck = true;

11
pkgs/development/python-modules/dlib/default.nix
View File

@@ -3,7 +3,7 @@
buildPythonPackage,
dlib,
python,
pytest,
pytestCheckHook,
more-itertools,
sse4Support ? stdenv.hostPlatform.sse4_1Support,
avxSupport ? stdenv.hostPlatform.avxSupport,
@@ -24,7 +24,7 @@ buildPythonPackage {
patches = [ ./build-cores.patch ];
nativeCheckInputs = [
pytest
pytestCheckHook
more-itertools
];
@@ -34,13 +34,6 @@ buildPythonPackage {
--replace "pytest==3.8" "pytest"
'';
# although AVX can be enabled, we never test with it. Some Hydra machines
# fail because of this, however their build results are probably used on hardware
# with AVX support.
checkPhase = ''
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
setupPyBuildFlags = [
"--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
"--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}"

96
pkgs/development/python-modules/guidata/default.nix Normal file
View File

@@ -0,0 +1,96 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
numpy,
qtpy,
h5py,
requests,
tomli,
# tests
pytestCheckHook,
qt6,
pyqt6,
# passthru.tests
guidata,
pyside6,
qt5,
pyqt5,
pyside2,
}:
buildPythonPackage rec {
pname = "guidata";
version = "3.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "PlotPyStack";
repo = "guidata";
rev = "refs/tags/v${version}";
hash = "sha256-KfeA6XNbzHZM4dyvAYlPOQIwWHwFT3Akj34zmgf8tb8=";
};
build-system = [
setuptools
];
dependencies = [
numpy
qtpy
h5py
requests
tomli
];
nativeCheckInputs = [
pytestCheckHook
# Not propagating this, to allow one to choose to choose a pyqt / pyside
# implementation.
pyqt6
];
preCheck = ''
export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"
export QT_QPA_PLATFORM=offscreen
'';
pythonImportsCheck = [ "guidata" ];
passthru = {
tests = {
# Should be compatible with all of these Qt implementations
withPyQt6 = guidata.override {
pyqt6 = pyqt6;
qt6 = qt6;
};
withPySide6 = guidata.override {
pyqt6 = pyside6;
qt6 = qt6;
};
withPyQt5 = guidata.override {
pyqt6 = pyqt5;
qt6 = qt5;
};
withPySide2 = guidata.override {
pyqt6 = pyside2;
qt6 = qt5;
};
};
};
meta = {
description = "Python library generating graphical user interfaces for easy dataset editing and display";
homepage = "https://github.com/PlotPyStack/guidata";
changelog = "https://github.com/PlotPyStack/guidata/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ doronbehar ];
};
}

117
pkgs/development/python-modules/plotpy/default.nix Normal file
View File

@@ -0,0 +1,117 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
cython_0,
setuptools,
# dependencies
guidata,
numpy,
pillow,
pythonqwt,
scikit-image,
scipy,
tifffile,
# tests
pytestCheckHook,
qt6,
pyqt6,
# passthru.tests
plotpy,
pyside6,
qt5,
pyqt5,
pyside2,
}:
buildPythonPackage rec {
pname = "plotpy";
version = "2.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "PlotPyStack";
repo = "PlotPy";
rev = "refs/tags/v${version}";
hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE=";
};
build-system = [
cython_0
setuptools
];
# Both numpy versions are supported, see:
# https://github.com/PlotPyStack/PlotPy/blob/v2.6.2/pyproject.toml#L8-L9
postConfigure = ''
substituteInPlace pyproject.toml \
--replace-fail 'numpy >= 2.0.0' numpy
'';
dependencies = [
guidata
numpy
pillow
pythonqwt
scikit-image
scipy
tifffile
];
nativeCheckInputs = [
pytestCheckHook
# Not propagating this, to allow one to choose to choose a pyqt / pyside
# implementation.
pyqt6
];
preCheck = ''
export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"
export QT_QPA_PLATFORM=offscreen
# https://github.com/NixOS/nixpkgs/issues/255262
cd $out
'';
pythonImportsCheck = [
"plotpy"
"plotpy.tests"
];
passthru = {
tests = {
# Upstream doesn't officially supports all of them, although they use
# qtpy, see: https://github.com/PlotPyStack/PlotPy/issues/20 . When this
# package was created, all worked besides withPySide2, with which there
# was a peculiar segmentation fault during the tests. In anycase, PySide2
# shouldn't be used for modern applications.
withPyQt6 = plotpy.override {
pyqt6 = pyqt6;
qt6 = qt6;
};
withPySide6 = plotpy.override {
pyqt6 = pyside6;
qt6 = qt6;
};
withPyQt5 = plotpy.override {
pyqt6 = pyqt5;
qt6 = qt5;
};
withPySide2 = plotpy.override {
pyqt6 = pyside2;
qt6 = qt5;
};
};
};
meta = {
description = "Curve and image plotting tools for Python/Qt applications";
homepage = "https://github.com/PlotPyStack/PlotPy";
changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ doronbehar ];
};
}

60
pkgs/development/python-modules/pythonqwt/default.nix Normal file
View File

@@ -0,0 +1,60 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
numpy,
qtpy,
# tests
pyqt6,
qt6,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pythonqwt";
version = "0.12.7";
pyproject = true;
src = fetchFromGitHub {
owner = "PlotPyStack";
repo = "PythonQwt";
rev = "refs/tags/v${version}";
hash = "sha256-Am7XYumq9PAOmT2ZTC+AAE4VM6/yNF11WLXoTFSbDh4=";
};
build-system = [
setuptools
];
dependencies = [
qtpy
numpy
];
nativeCheckInputs = [
pytestCheckHook
# Not propagating this, to allow one to choose to either choose a pyqt /
# pyside implementation
pyqt6
];
preCheck = ''
export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"
export QT_QPA_PLATFORM=offscreen
'';
pythonImportsCheck = [ "qwt" ];
meta = {
description = "Qt plotting widgets for Python (pure Python reimplementation of Qwt C++ library)";
homepage = "https://github.com/PlotPyStack/PythonQwt";
changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.lgpl21Only;
maintainers = with lib.maintainers; [ doronbehar ];
};
}

29
pkgs/development/python-modules/torch/0001-cmake.py-propagate-cmakeFlags-from-environment.patch
View File

@@ -1,29 +0,0 @@
From c5d4087519eae6f41c80bbd8ffbcc9390db44c7f Mon Sep 17 00:00:00 2001
From: SomeoneSerge <else+aalto@someonex.net>
Date: Thu, 10 Oct 2024 19:19:18 +0000
Subject: [PATCH] cmake.py: propagate cmakeFlags from environment
---
tools/setup_helpers/cmake.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
index 4b605fe5975..ea1d6a1ef46 100644
--- a/tools/setup_helpers/cmake.py
+++ b/tools/setup_helpers/cmake.py
@@ -332,6 +332,12 @@ class CMake:
file=sys.stderr,
)
print(e, file=sys.stderr)
+
+ # Nixpkgs compat:
+ if "cmakeFlags" in os.environ:
+ import shlex
+ args.extend(shlex.split(os.environ["cmakeFlags"]))
+
# According to the CMake manual, we should pass the arguments first,
# and put the directory as the last element. Otherwise, these flags
# may not be passed correctly.
--
2.46.0

4
pkgs/development/python-modules/torch/bin.nix
View File

@@ -35,7 +35,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "2.4.1";
version = "2.5.0";
in
buildPythonPackage {
inherit version;
@@ -45,7 +45,7 @@ buildPythonPackage {
format = "wheel";
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13");
disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13");
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;

89
pkgs/development/python-modules/torch/binary-hashes.nix
View File

@@ -7,81 +7,66 @@
version:
builtins.getAttr version {
"2.4.1" = {
x86_64-linux-38 = {
name = "torch-2.4.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-y09QL5ELR+HjZsz3sjHawpZ9LvtH1LjLM/xjtLxe7tg=";
};
"2.5.0" = {
x86_64-linux-39 = {
name = "torch-2.4.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-mYatNVXd//Vekl2CmPiytJEGp9xg+BGiB2pEX+RFjis=";
name = "torch-2.5.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
hash = "sha256-Z3RdahkVnJ436sN6HAicTZ9ZTNcsIV2mFN9A/OEw3Sc=";
};
x86_64-linux-310 = {
name = "torch-2.4.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-ml8LEDz+hAs1aEFqpQZ/bnuf7GfZxWWf1DsSB0UP6XU=";
name = "torch-2.5.0-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
hash = "sha256-uLcj9Hqgb9/rGnqsXf+PpZlL+qT9PK0GAbvw1bHBUEk=";
};
x86_64-linux-311 = {
name = "torch-2.4.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-kU0Sjlq8u+ecobnrUxGxhURPGy1xF99VX+QYSH7PuJQ=";
name = "torch-2.5.0-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
hash = "sha256-Xj9Ke6gSUXwsFlmFe1GV8oeiiPvQUKWr+TEeA9vhoos=";
};
x86_64-linux-312 = {
name = "torch-2.4.1-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
hash = "sha256-q0kWELFVUeCNp0urKdCTPmvxC6tE+31LEyjx6EXAWlM=";
};
aarch64-darwin-38 = {
name = "torch-2.4.1-cp38-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-none-macosx_11_0_arm64.whl";
hash = "sha256-X8HU1+0mXvhTV5yvJyaG0e2Hzr3NBPKkmPgA/8U9q3E=";
name = "torch-2.5.0-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torch-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
hash = "sha256-EcKB2WiMNu3tBq6PYNa5fgEIMe+upKSyJErUNn4jLtc=";
};
aarch64-darwin-39 = {
name = "torch-2.4.1-cp39-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-none-macosx_11_0_arm64.whl";
hash = "sha256-o43igD7mBQMJqsAyZ2U2w9O2qYBCSFN+OOCY0OFIF+w=";
name = "torch-2.5.0-cp39-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-none-macosx_11_0_arm64.whl";
hash = "sha256-7YScLRFY+FkflMFEeO4cPeq8H0OKAD1VwFdGJMAWJ/E=";
};
aarch64-darwin-310 = {
name = "torch-2.4.1-cp310-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-none-macosx_11_0_arm64.whl";
hash = "sha256-02qO8QD1v/Ppw86pNLng1+onfLghDHFS00qabFgw6t0=";
name = "torch-2.5.0-cp310-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-none-macosx_11_0_arm64.whl";
hash = "sha256-uK9pC351HUG9Je8uqkauNUqngTgOHk006wMb+oP0tRI=";
};
aarch64-darwin-311 = {
name = "torch-2.4.1-cp311-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-none-macosx_11_0_arm64.whl";
hash = "sha256-3d29iwZudDk0pCALPVQmekbbAhBodtIc8x99p6lvmOo=";
name = "torch-2.5.0-cp311-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-none-macosx_11_0_arm64.whl";
hash = "sha256-2nchfs0y5UxiSXmVR+7aEF67qow8dFtZGlMg4rwkNYU=";
};
aarch64-darwin-312 = {
name = "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl";
hash = "sha256-crSE1bbOwac1vz+locSIPQF0hpjF6c/b60/6t8eYfg0=";
};
aarch64-linux-38 = {
name = "torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-Vq0qdgt6eIJyWh7r9WV6u7O1FE6ya8tHtSBZNXRjxUg=";
name = "torch-2.5.0-cp312-none-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-none-macosx_11_0_arm64.whl";
hash = "sha256-w6vjoAPA1XgGUi9z1euXdmg2onTYCcnKPrPnXSSIvz4=";
};
aarch64-linux-39 = {
name = "torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-FJUTLzD3Iq8aCRlQCIuuo4P+OZA9sGsg5pNv2ZQCgD4=";
name = "torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-5CMassS3SgvmnicQ4/kRAs55yuCeb7saYe9yRsUHA+Q=";
};
aarch64-linux-310 = {
name = "torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-+iewSNMhmM2m6c/wv3aOhoPZh0OQO35dKx9QmN7R00M=";
name = "torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-UPz/n1ucUQL5+PXLPRK9TZ8SZmUOS4wU9QpexYnh7qU=";
};
aarch64-linux-311 = {
name = "torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-ML4oRNDJORYaEQc7+69kXxx8tD9i9GzG5N8cEZ+yp5g=";
name = "torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-IFoOy/hfTHhXz99Paw4HMWvZKe2SSCVp6PRSRABVmIQ=";
};
aarch64-linux-312 = {
name = "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-NhCUMrEL1xY8mzDOiW88LMobhrl2X5VqFZTw/0MJHio=";
name = "torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-2.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
hash = "sha256-V+B/GKTe9Sz+UETKqGG8PeRJcXn67iNvO5V7Qn/80OQ=";
};
};
}

21
pkgs/development/python-modules/torch/default.nix
View File

@@ -38,7 +38,7 @@
darwin,
numactl,
# Propagated build inputs
# dependencies
astunparse,
fsspec,
filelock,
@@ -87,8 +87,6 @@
tensorboard,
protobuf,
pythonOlder,
# ROCm dependencies
rocmSupport ? config.rocmSupport,
rocmPackages_5,
@@ -225,11 +223,9 @@ in
buildPythonPackage rec {
pname = "torch";
# Don't forget to update torch-bin to the same version.
version = "2.4.1";
version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.8.0";
outputs = [
"out" # output standard python package
"dev" # output libtorch headers
@@ -243,17 +239,11 @@ buildPythonPackage rec {
repo = "pytorch";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-x/zM/57syr46CP1TfGaefSjzvNm4jJbWFZGVGyzPMg8=";
hash = "sha256-z41VAN4l/6hyHsxNOnJORy5EQK93kSMkDHRVQrdxv7k=";
};
patches =
[
# Allow setting PYTHON_LIB_REL_PATH with an environment variable.
# https://github.com/pytorch/pytorch/pull/128419
./passthrough-python-lib-rel-path.patch
./0001-cmake.py-propagate-cmakeFlags-from-environment.patch
]
++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
# pthreadpool added support for Grand Central Dispatch in April
# 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
@@ -537,6 +527,9 @@ buildPythonPackage rec {
++ lib.optionals MPISupport [ mpi ]
++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
pythonRelaxDeps = [
"sympy"
];
dependencies = [
astunparse
cffi

12
pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch
View File

@@ -1,12 +0,0 @@
diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
index 5481ce46031c..d50d9d547399 100644
--- a/tools/setup_helpers/cmake.py
+++ b/tools/setup_helpers/cmake.py
@@ -231,6 +231,7 @@ def generate(
"SELECTED_OP_LIST",
"TORCH_CUDA_ARCH_LIST",
"TRACING_BASED",
+ "PYTHON_LIB_REL_PATH",
)
}
)

7
pkgs/development/python-modules/torch/prefetch.sh
View File

@@ -5,23 +5,20 @@ set -eou pipefail
version=$1
linux_cuda_version="cu121"
linux_cuda_version="cu124"
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
darwin_bucket="https://download.pytorch.org/whl/cpu"
url_and_key_list=(
"x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
"x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
"x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl"
"aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
"aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
"aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
"aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
"aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
"aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
"aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
"aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
"aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
@@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do
name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`)
echo " $key = {" >> $hashfile
echo " name = \"$name\";" >> $hashfile

4
pkgs/development/python-modules/torchaudio/bin.nix
View File

@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "torchaudio";
version = "2.4.1";
version = "2.5.0";
format = "wheel";
src =
@@ -33,7 +33,7 @@ buildPythonPackage rec {
in
fetchurl srcs;
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13");
disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13");
buildInputs =
[

89
pkgs/development/python-modules/torchaudio/binary-hashes.nix
View File

@@ -7,81 +7,66 @@
version:
builtins.getAttr version {
"2.4.1" = {
x86_64-linux-38 = {
name = "torchaudio-2.4.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-/PvxFpkpX2WwRYHNBDcv4CojmAbrfSXaJ0bzXeD10tk=";
};
"2.5.0" = {
x86_64-linux-39 = {
name = "torchaudio-2.4.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-cbuwbBAYeZ2zoLzAlN0IuAvCi7e18nq4sOLziwFLEcY=";
name = "torchaudio-2.5.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
hash = "sha256-EPFw0hJ5l68BebIfOHjJiR54Sx5VtWNsHRnfq1tSYlU=";
};
x86_64-linux-310 = {
name = "torchaudio-2.4.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-2oyHyAocE3akjcM+7zCwO73x3yWgW9KxxiC4gRx7Gb4=";
name = "torchaudio-2.5.0-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
hash = "sha256-PV0jpAEMHbJGhC+ahhHNK4teEQ1dR3jME9pZfvfDqV8=";
};
x86_64-linux-311 = {
name = "torchaudio-2.4.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-AbBO25E1p9YPoBAPwB/7QKCFgBD1ma5kGPQOCeiOaBs=";
name = "torchaudio-2.5.0-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
hash = "sha256-Y+Qe6UgenV9ViG2tBHPsTuIhKl5Ruc1lU/2dWKYvZ+E=";
};
x86_64-linux-312 = {
name = "torchaudio-2.4.1-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
hash = "sha256-a3TXBquoHbX4OMpBTwPT9lmOqIC3IQYGXbycXTwGP+E=";
};
aarch64-darwin-38 = {
name = "torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-TqD9ABQv55XHW8wgowOYG1byMnx/fTIbQqj+8deKr6k=";
name = "torchaudio-2.5.0-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
hash = "sha256-qSgxhlE7+HATg8a8w+1tYk2kK7/WLzHHJrmulH9R7zc=";
};
aarch64-darwin-39 = {
name = "torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-OtzlUIUJArmqbNI3jM1yCsnsjPMeLrqXQ8zIT/y+dtY=";
name = "torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-hVc/ZtwJSX0oK79Abo8rA+WSnrO9wfdqnZvEZkTUB7E=";
};
aarch64-darwin-310 = {
name = "torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-ZhkJdRkJNAsk9jdBDf7AKoiIZ4FsPbGe1PQQKuEFJEo=";
name = "torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-q2m9/rRDQVnhaKSiwWGNHWWloUqR0X0hJW6pYPM0Bf0=";
};
aarch64-darwin-311 = {
name = "torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-YK8VMYFdImWeVBLqQBvtVSoWw4mTjElmTkRuTP1d3AY=";
name = "torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-mC7ASUonx/Pn5oyRzJLm4a1vhv7e7sYnCWBRMJYysUk=";
};
aarch64-darwin-312 = {
name = "torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl";
hash = "sha256-lTlGz2EP/Ve7P90ijv+iES+lHF3+NqlmEe/8kHSj074=";
};
aarch64-linux-38 = {
name = "torchaudio-2.4.1-cp38-cp38-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-linux_aarch64.whl";
hash = "sha256-dNGc+co9rTlK/Ku35vftmrn1nyVA1QKCbH7D4zmFJR0=";
name = "torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-macosx_11_0_arm64.whl";
hash = "sha256-yDXadxcBsG++jhnOZD1eWH/TheX02PFAVRzgSQCxuWs=";
};
aarch64-linux-39 = {
name = "torchaudio-2.4.1-cp39-cp39-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-linux_aarch64.whl";
hash = "sha256-NsfnvGs1jL9Ct2nIAgZ4D6FJfRQamFxrPndo3kRSTpo=";
name = "torchaudio-2.5.0-cp39-cp39-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp39-cp39-linux_aarch64.whl";
hash = "sha256-qr+MTOkZwuJKzklkHqQpNgAYgWNxo9RwQn/AKrERVsU=";
};
aarch64-linux-310 = {
name = "torchaudio-2.4.1-cp310-cp310-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-linux_aarch64.whl";
hash = "sha256-VEMRedmpzPP+6umKrOB9ifrp/XKOK8hlbvvXDn7cxvg=";
name = "torchaudio-2.5.0-cp310-cp310-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp310-cp310-linux_aarch64.whl";
hash = "sha256-nf7tzvPkMBDz7C2ATI9i/kmrCe8cGeZzYyWTlmGik70=";
};
aarch64-linux-311 = {
name = "torchaudio-2.4.1-cp311-cp311-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-linux_aarch64.whl";
hash = "sha256-dkCq/7IFbhLykGGHsDoiIooJCMh9ApX930sLkjNKKQs=";
name = "torchaudio-2.5.0-cp311-cp311-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp311-cp311-linux_aarch64.whl";
hash = "sha256-w1IB79KCRBUtbtvekndcEPOfWl2TRiAvB7FVTceNJaI=";
};
aarch64-linux-312 = {
name = "torchaudio-2.4.1-cp312-cp312-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-linux_aarch64.whl";
hash = "sha256-W2L8exbtcIsMB9Q5MTd5fpL2P8O9VwVgfZe6app88/A=";
name = "torchaudio-2.5.0-cp312-cp312-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.0-cp312-cp312-linux_aarch64.whl";
hash = "sha256-WTJY8z3h+hbr5XGMlxfa82lUYNSKAYgZSlxXSnEIOMs=";
};
};
}

4
pkgs/development/python-modules/torchaudio/default.nix
View File

@@ -76,14 +76,14 @@ let
in
buildPythonPackage rec {
pname = "torchaudio";
version = "2.4.1";
version = "2.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "audio";
rev = "refs/tags/v${version}";
hash = "sha256-zQqIIzOW9vboP5XQSOUWB0edz6XJvz06RqbcYPO9K24=";
hash = "sha256-Swh+HnkGRzjQFt9mYO+qBq4BDTbmLGSkOrN2ZUQdNUI=";
};
patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ];

7
pkgs/development/python-modules/torchaudio/prefetch.sh
View File

@@ -5,23 +5,20 @@ set -eou pipefail
version=$1
linux_cuda_version="cu121"
linux_cuda_version="cu124"
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
darwin_bucket="https://download.pytorch.org/whl/cpu"
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-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-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-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchaudio-${version}-cp312-cp312-linux_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-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-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
"aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-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-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-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
@@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do
name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name"))
hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name"))
echo " $key = {" >>$hashfile
echo " name = \"$name\";" >>$hashfile

4
pkgs/development/python-modules/torchvision/bin.nix
View File

@@ -23,7 +23,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "0.19.1";
version = "0.20.0";
in
buildPythonPackage {
inherit version;
@@ -34,7 +34,7 @@ buildPythonPackage {
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13");
disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13");
# Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support.
buildInputs =

89
pkgs/development/python-modules/torchvision/binary-hashes.nix
View File

@@ -7,81 +7,66 @@
version:
builtins.getAttr version {
"0.19.1" = {
x86_64-linux-38 = {
name = "torchvision-0.19.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
hash = "sha256-MFL5ci3Dn9fwJrRKb73vk6so95UgBwEs6E0xPWeWQBE=";
};
"0.20.0" = {
x86_64-linux-39 = {
name = "torchvision-0.19.1-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
hash = "sha256-FFMN7gzEx8BgJPC9zJV/d94NK5DptyIZ3NYh+ilSXQA=";
name = "torchvision-0.20.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp39-cp39-linux_x86_64.whl";
hash = "sha256-UP9Puz3JlN21FK7WvZLJDMF1sWjGWYg4014qxTqaCos=";
};
x86_64-linux-310 = {
name = "torchvision-0.19.1-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
hash = "sha256-uMxL84G3VSKZW2AeB6G0M7X9kl3D40p/ps0i9EnWU3k=";
name = "torchvision-0.20.0-cp310-cp310-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp310-cp310-linux_x86_64.whl";
hash = "sha256-k5Ni8WH31mqPKrExODqzeZhFjjCO4sYsnRzSdR37KEI=";
};
x86_64-linux-311 = {
name = "torchvision-0.19.1-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
hash = "sha256-U2QXNAaUspzFTDCFB9CYsAy9zB/oaAcqNLVTvtc9nTA=";
name = "torchvision-0.20.0-cp311-cp311-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp311-cp311-linux_x86_64.whl";
hash = "sha256-O0R4ODFuAqqSFSklZbp5wT0//rBjGgkAxby4uB7iJtc=";
};
x86_64-linux-312 = {
name = "torchvision-0.19.1-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
hash = "sha256-+wzQYi40nfhK1zutjrvqaxx08DPa3YTZqAz0opGSfq4=";
};
aarch64-darwin-38 = {
name = "torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl";
hash = "sha256-TE5PWyTqawh7Au1JKrHiG7ozUsRXfi3vFCSM/GBzIzg=";
name = "torchvision-0.20.0-cp312-cp312-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.0%2Bcu124-cp312-cp312-linux_x86_64.whl";
hash = "sha256-hGajClfLUfO0GtC+QKxc8/GijZMnMKHEEWyD0yHQfjw=";
};
aarch64-darwin-39 = {
name = "torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-cx9DTZFYZ2niVbXXDtGkRX4KE5SpX0qs8OHn4h+AwJg=";
name = "torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-macosx_11_0_arm64.whl";
hash = "sha256-anDIHqUGjdex40Dr6rtlNkV22LmBlFTP34EikM8D5Fo=";
};
aarch64-darwin-310 = {
name = "torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-VOhRMJnm9YY1bHD4CdNPORr3GtGC/gccwyiiivLEBgg=";
name = "torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-8WTVRZZRhv/WYBTjSpZnBtEshBmDAt1GdIyuRZhGCaQ=";
};
aarch64-darwin-311 = {
name = "torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-QFFCgrSJbWJ2W44m1wkcMuF8NYF9AOxL4jYuo7o9F4c=";
name = "torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-macosx_11_0_arm64.whl";
hash = "sha256-oV3mJmo2vNENifbz17pOLdVnp6Ct1hbrxuZa6iB5Dl0=";
};
aarch64-darwin-312 = {
name = "torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl";
hash = "sha256-J+zid/8PbNx/7QYnJ5xjLcsuWBh9p3HsoksPvPP4WQ0=";
};
aarch64-linux-38 = {
name = "torchvision-0.19.1-cp38-cp38-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-linux_aarch64.whl";
hash = "sha256-TRC8kIPE1frdft17cpcAp75I2rT2InjfO8c/pI5IoVU=";
name = "torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-macosx_11_0_arm64.whl";
hash = "sha256-rA7bpTT7BxsrA6L9XLv5t8JZiW0XodDYMLPFt9+uB4I=";
};
aarch64-linux-39 = {
name = "torchvision-0.19.1-cp39-cp39-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-linux_aarch64.whl";
hash = "sha256-4ygwm4ZwouiJsv52ocJ0SgmcEcmE2pqCI1e9nevWmaU=";
name = "torchvision-0.20.0-cp39-cp39-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp39-cp39-linux_aarch64.whl";
hash = "sha256-jWzqirC/cuy3GwfND+g26s9aX6mPZinSJhIS6Ql3uWM=";
};
aarch64-linux-310 = {
name = "torchvision-0.19.1-cp310-cp310-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-linux_aarch64.whl";
hash = "sha256-ewYxFhZL5S/G3rR2Lef4yQv6OmX41crxf44tWq3HWgQ=";
name = "torchvision-0.20.0-cp310-cp310-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp310-cp310-linux_aarch64.whl";
hash = "sha256-4IT1Dsvb56nML8UeoDZ641/eRuhKlkv0BGyxx/634+Y=";
};
aarch64-linux-311 = {
name = "torchvision-0.19.1-cp311-cp311-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-linux_aarch64.whl";
hash = "sha256-1xpqb+OlKByjSH1MVq1KrSD/cPgvHXx5vLbnsMKvAMg=";
name = "torchvision-0.20.0-cp311-cp311-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp311-cp311-linux_aarch64.whl";
hash = "sha256-Vdf0PvkS68TaS7pzoLvzh9OKa+nNUhZ5wPQFb5Vktpg=";
};
aarch64-linux-312 = {
name = "torchvision-0.19.1-cp312-cp312-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-linux_aarch64.whl";
hash = "sha256-wHv0PCoUXXkuzZ0FA9bHNXcUfs5QjUVgDYqsd+TN/Pk=";
name = "torchvision-0.20.0-cp312-cp312-linux_aarch64.whl";
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.0-cp312-cp312-linux_aarch64.whl";
hash = "sha256-+NAhNIms+xODafJFWmiTiAwZSoGV44HBn4crJ38mVMM=";
};
};
}

4
pkgs/development/python-modules/torchvision/default.nix
View File

@@ -26,7 +26,7 @@ let
inherit (cudaPackages) backendStdenv;
pname = "torchvision";
version = "0.19.1";
version = "0.20.0";
in
buildPythonPackage {
inherit pname version;
@@ -35,7 +35,7 @@ buildPythonPackage {
owner = "pytorch";
repo = "vision";
rev = "refs/tags/v${version}";
hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30=";
hash = "sha256-aQ1HhWtkhA2EYPCV2vEW10kcP0m0TLNsgjA0Yiwpm9U=";
};
nativeBuildInputs = [

7
pkgs/development/python-modules/torchvision/prefetch.sh
View File

@@ -5,22 +5,19 @@ set -eou pipefail
version=$1
linux_cuda_version="cu121"
linux_cuda_version="cu124"
linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
darwin_bucket="https://download.pytorch.org/whl/cpu"
url_and_key_list=(
"x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
"x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"
"x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl"
"aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
"aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
"aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
"aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
"aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl"
"aarch64-linux-38 $darwin_bucket/torchvision-${version}-cp38-cp38-linux_aarch64.whl torchvision-${version}-cp38-cp38-linux_aarch64.whl"
"aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-linux_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl"
"aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-linux_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl"
"aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-linux_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl"
@@ -36,7 +33,7 @@ for url_and_key in "${url_and_key_list[@]}"; do
name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`)
echo " $key = {" >> $hashfile
echo " name = \"$name\";" >> $hashfile

Some files were not shown because too many files have changed in this diff Show More