mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
Merge staging-next into staging
This commit is contained in:
commit
e4e28b07ad
@ -18,8 +18,8 @@
|
||||
/.github/workflows/check-nix-format.yml @infinisil
|
||||
/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
|
||||
/.github/workflows/codeowners-v2.yml @infinisil
|
||||
/ci/OWNERS @infinisil
|
||||
/ci @infinisil @philiptaron @NixOS/Security
|
||||
/ci/OWNERS @infinisil @philiptaron
|
||||
|
||||
# Development support
|
||||
/.editorconfig @Mic92 @zowoq
|
||||
@ -296,10 +296,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
/pkgs/applications/editors/kakoune @philiptaron
|
||||
|
||||
# Neovim
|
||||
/pkgs/applications/editors/neovim @figsoda @teto
|
||||
/pkgs/applications/editors/neovim @NixOS/neovim
|
||||
|
||||
# VimPlugins
|
||||
/pkgs/applications/editors/vim/plugins @figsoda
|
||||
/pkgs/applications/editors/vim/plugins @NixOS/neovim
|
||||
|
||||
# VsCode Extensions
|
||||
/pkgs/applications/editors/vscode/extensions
|
||||
|
@ -7,7 +7,7 @@ let
|
||||
inherit (builtins) head length;
|
||||
inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs warn warnIf;
|
||||
inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
|
||||
inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl;
|
||||
inherit (lib.lists) filter foldr foldl' concatMap elemAt all partition groupBy take foldl;
|
||||
in
|
||||
|
||||
rec {
|
||||
@ -644,8 +644,7 @@ rec {
|
||||
filterAttrs =
|
||||
pred:
|
||||
set:
|
||||
listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
|
||||
|
||||
removeAttrs set (filter (name: ! pred name set.${name}) (attrNames set));
|
||||
|
||||
/**
|
||||
Filter an attribute set recursively by removing all attributes for
|
||||
|
@ -47,6 +47,7 @@ let
|
||||
evalModules
|
||||
extends
|
||||
filter
|
||||
filterAttrs
|
||||
fix
|
||||
fold
|
||||
foldAttrs
|
||||
@ -1102,6 +1103,25 @@ runTests {
|
||||
};
|
||||
};
|
||||
|
||||
testFilterAttrs = {
|
||||
expr = filterAttrs (n: v: n != "a" && (v.hello or false) == true) {
|
||||
a.hello = true;
|
||||
b.hello = true;
|
||||
c = {
|
||||
hello = true;
|
||||
world = false;
|
||||
};
|
||||
d.hello = false;
|
||||
};
|
||||
expected = {
|
||||
b.hello = true;
|
||||
c = {
|
||||
hello = true;
|
||||
world = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# code from example
|
||||
testFoldlAttrs = {
|
||||
expr = {
|
||||
|
@ -172,3 +172,6 @@ to the team without an approval by at least one existing member.
|
||||
Various utility scripts, which are mainly useful for nixpkgs maintainers,
|
||||
are available under `./scripts/`. See its [README](./scripts/README.md)
|
||||
for further information.
|
||||
|
||||
# nixpkgs-merge-bot
|
||||
To streamline autoupdates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again.
|
||||
|
@ -3903,6 +3903,13 @@
|
||||
github = "CHN-beta";
|
||||
githubId = 35858462;
|
||||
};
|
||||
ChocolateLoverRaj = {
|
||||
email = "paranjperajas@gmail.com";
|
||||
github = "ChocolateLoverRaj";
|
||||
githubId = 52586855;
|
||||
matrix = "@chocolateloverraj:matrix.org";
|
||||
name = "Rajas Paranjpe";
|
||||
};
|
||||
cholli = {
|
||||
email = "christoph.hollizeck@hey.com";
|
||||
github = "Daholli";
|
||||
|
@ -1,9 +1,13 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
cfg = config.services.lighthouse;
|
||||
in {
|
||||
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.lighthouse = {
|
||||
beacon = lib.mkOption {
|
||||
@ -190,7 +194,13 @@ in {
|
||||
};
|
||||
|
||||
network = lib.mkOption {
|
||||
type = lib.types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ];
|
||||
type = lib.types.enum [
|
||||
"mainnet"
|
||||
"gnosis"
|
||||
"chiado"
|
||||
"sepolia"
|
||||
"holesky"
|
||||
];
|
||||
default = "mainnet";
|
||||
description = ''
|
||||
The network to connect to. Mainnet is the default ethereum network.
|
||||
@ -205,19 +215,19 @@ in {
|
||||
default = "";
|
||||
example = "";
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "lighthouse" { };
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (cfg.beacon.enable || cfg.validator.enable) {
|
||||
|
||||
environment.systemPackages = [ pkgs.lighthouse ] ;
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
networking.firewall = lib.mkIf cfg.beacon.enable {
|
||||
allowedTCPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ];
|
||||
allowedUDPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ];
|
||||
};
|
||||
|
||||
|
||||
systemd.services.lighthouse-beacon = lib.mkIf cfg.beacon.enable {
|
||||
description = "Lighthouse beacon node (connect to P2P nodes and verify blocks)";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
@ -227,7 +237,7 @@ in {
|
||||
# make sure the chain data directory is created on first run
|
||||
mkdir -p ${cfg.beacon.dataDir}/${cfg.network}
|
||||
|
||||
${pkgs.lighthouse}/bin/lighthouse beacon_node \
|
||||
${lib.getExe cfg.package} beacon_node \
|
||||
--disable-upnp \
|
||||
${lib.optionalString cfg.beacon.disableDepositContractSync "--disable-deposit-contract-sync"} \
|
||||
--port ${toString cfg.beacon.port} \
|
||||
@ -262,7 +272,10 @@ in {
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
RemoveIPC = true;
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@ -275,7 +288,7 @@ in {
|
||||
# make sure the chain data directory is created on first run
|
||||
mkdir -p ${cfg.validator.dataDir}/${cfg.network}
|
||||
|
||||
${pkgs.lighthouse}/bin/lighthouse validator_client \
|
||||
${lib.getExe cfg.package} validator_client \
|
||||
--network ${cfg.network} \
|
||||
--beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \
|
||||
--datadir ${cfg.validator.dataDir}/${cfg.network} \
|
||||
@ -305,8 +318,14 @@ in {
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -30,10 +30,7 @@ with lib;
|
||||
default = null;
|
||||
description = ''
|
||||
Basic Auth password file for a vhost.
|
||||
Can be created via: {command}`htpasswd -c <filename> <username>`.
|
||||
|
||||
WARNING: The generate file contains the users' passwords in a
|
||||
non-cryptographically-securely hashed way.
|
||||
Can be created by running {command}`nix-shell --packages apacheHttpd --run 'htpasswd -B -c FILENAME USERNAME'`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -345,10 +345,7 @@ with lib;
|
||||
default = null;
|
||||
description = ''
|
||||
Basic Auth password file for a vhost.
|
||||
Can be created via: {command}`htpasswd -c <filename> <username>`.
|
||||
|
||||
WARNING: The generate file contains the users' passwords in a
|
||||
non-cryptographically-securely hashed way.
|
||||
Can be created by running {command}`nix-shell --packages apacheHttpd --run 'htpasswd -B -c FILENAME USERNAME'`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmidiarp";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/qmidiarp/code";
|
||||
sha256 = "sha256-oUdgff2xsXTis+C2Blv0tspWNIMGSODrKxWDpMDYnEU=";
|
||||
sha256 = "sha256-xTDI1QtgOOMexzFKvYWhlfpXv8uXaoD4o+G6XF8/Cw8=";
|
||||
rev = "qmidiarp-${version}";
|
||||
};
|
||||
|
||||
|
@ -18767,4 +18767,16 @@ final: prev:
|
||||
};
|
||||
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
|
||||
};
|
||||
|
||||
fastaction-nvim = buildVimPlugin {
|
||||
pname = "fastaction.nvim";
|
||||
version = "2024-10-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chaitanyabsprip";
|
||||
repo = "fastaction.nvim";
|
||||
rev = "77ae921e6fa6a8e2705768fa89b89b0e45840b94";
|
||||
sha256 = "sha256-2UuEORFTj4+gbuEm1D2FHXrRiU3pDsS5NG50Q9I1wuk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/";
|
||||
};
|
||||
}
|
||||
|
@ -320,6 +320,7 @@ https://github.com/google/executor.nvim/,HEAD,
|
||||
https://github.com/jinh0/eyeliner.nvim/,HEAD,
|
||||
https://github.com/fenetikm/falcon/,,
|
||||
https://github.com/brooth/far.vim/,,
|
||||
https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD,
|
||||
https://github.com/pteroctopus/faster.nvim/,HEAD,
|
||||
https://github.com/konfekt/fastfold/,,
|
||||
https://github.com/lilydjwg/fcitx.vim/,fcitx5,
|
||||
|
@ -31,21 +31,21 @@ let
|
||||
archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "12cfks56pz1fljv4zrh4q2k6vai2rpdyw5lbap9y8wa9f5pz0m55";
|
||||
x86_64-darwin = "0zxmlpilh83grcv6jk2avlxiy2w0a1vbwmv0fjzy6nvdma91j7lj";
|
||||
aarch64-linux = "1gx5xg54mmkiglwmv8fjppqb8bj0fqn9yg0r5q9kzdhh9702dxsg";
|
||||
aarch64-darwin = "13wnraa13msz7rxzwk232rwrnbmwx0dpq13aq68zjz80clsf4jgp";
|
||||
armv7l-linux = "06kngg0scrk8sz3j874iffyci70ng8j8l1v83k572vw847956850";
|
||||
x86_64-linux = "1dysz5yajm9v8p8x19lmbhbfij5k99h9m39ifvn1908dhgyc5d36";
|
||||
x86_64-darwin = "175sxw1z6mzs5adcgy2902irp0yb666lgmrckbd3dr7rqfav9d36";
|
||||
aarch64-linux = "04pf8b42kh23pii9qahsdf3979icvqbhadr5m8x79y16hv1h2h8j";
|
||||
aarch64-darwin = "1766h2awzh8wjwzkc7r1ymsjyh4j7rfb7nj6bpigy2b2dyfp53w2";
|
||||
armv7l-linux = "1zmqrvqq07vkhmb9shbrh2jjkv3rpvi3pv0b1cg690jfixnsyk04";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.95.0";
|
||||
version = "1.95.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "912bb683695358a54ae0c670461738984cbb5b95";
|
||||
rev = "65edc4939843c90c34d61f4ce11704f09d3e5cb6";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@ -69,7 +69,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "1chk0xwsiw6pm6ihjlp9695n0l1wfipwv4h04v5dmm9dcwlarp1m";
|
||||
sha256 = "05w76c50j85b7hc0q8gjzssy142ncbns0kmcyqydaqrzj8n41jd8";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simgrid";
|
||||
version = "3.35";
|
||||
version = "3.36";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WaFANZiPfiN/utfNZbwyH5mxgJNWafPMCcL863V8w0g=";
|
||||
sha256 = "sha256-7w4ObbMem1Y8Lh9MOcdCSEktTDRkvVKmKlS9adm15oE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boost ];
|
||||
|
@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "binsider";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "binsider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VnWLslelEAXuSy7XnxrdgSkXqTrd+Ni7lQFsB2P+ILs=";
|
||||
hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eBZ7zUOucarzdxTjHecUxGqUsKTQPaaotOfs/v0MxHk=";
|
||||
cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE=";
|
||||
|
||||
buildNoDefaultFeatures = !stdenv.isLinux;
|
||||
|
||||
|
@ -6,12 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "departure-mono";
|
||||
version = "1.350";
|
||||
version = "1.422";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/rektdeckard/departure-mono/releases/download/v${finalAttrs.version}/DepartureMono-${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-MMmS1yjhy50fgMK5h0526YKRfQJuOcEAHqxn9rhUwCc=";
|
||||
hash = "sha256-9CcXd7PLxkzQt0oT/asZO9mowtXtjPBfuKphfGgM/y8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
29
pkgs/by-name/ea/easyeda2kicad/package.nix
Normal file
29
pkgs/by-name/ea/easyeda2kicad/package.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
python3Packages,
|
||||
lib,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "easyeda2kicad";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-p4G+bRB29uBohqQpI3PrkwyZId5McJ1t2Ru26hBPSks=";
|
||||
};
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
setuptools
|
||||
pydantic
|
||||
requests
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert any LCSC components (including EasyEDA) to KiCad library";
|
||||
homepage = "https://github.com/uPesy/easyeda2kicad.py";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ ChocolateLoverRaj ];
|
||||
mainProgram = "easyeda2kicad";
|
||||
};
|
||||
}
|
2712
pkgs/by-name/en/envision-unwrapped/Cargo.lock
generated
2712
pkgs/by-name/en/envision-unwrapped/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -31,23 +31,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "envision-unwrapped";
|
||||
version = "0-unstable-2024-09-28";
|
||||
version = "0-unstable-2024-10-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gabmus";
|
||||
repo = "envision";
|
||||
rev = "56d500a9f914ce2ddad038223711192e4d1dcbe1";
|
||||
hash = "sha256-8wU2sjhH026l6a11XZ5Qdu5x/EbI+ZqwE7AixsYMCFk=";
|
||||
rev = "c40a4ad05a8e6ea99eed4a7d7d2098a08686e065";
|
||||
hash = "sha256-C/m5Hx52fFyuVI87EmHpe5YqjwDWoyveiXA0sJTt2NQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y=";
|
||||
"openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-I9UDCKrqU6TWcmHsSFwt1elplPwU+XTgyXiN2wtw5y0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,7 +15,7 @@ buildFHSEnv {
|
||||
pkgs:
|
||||
[ pkgs.envision-unwrapped ]
|
||||
++ (with pkgs; [
|
||||
glibc
|
||||
stdenv.cc.libc
|
||||
gcc
|
||||
])
|
||||
++ (
|
||||
@ -24,7 +24,7 @@ buildFHSEnv {
|
||||
)
|
||||
++ (
|
||||
# OpenComposite dependencies
|
||||
pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost186 ]
|
||||
pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs
|
||||
)
|
||||
++ (
|
||||
# Monado dependencies
|
||||
@ -59,27 +59,12 @@ buildFHSEnv {
|
||||
[ pkgs.zlib ])
|
||||
++ (
|
||||
# WiVRn dependencies
|
||||
# TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged
|
||||
(with pkgs; [
|
||||
avahi
|
||||
cmake
|
||||
cli11
|
||||
ffmpeg
|
||||
git
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
pkgs.wivrn.buildInputs
|
||||
++ pkgs.wivrn.nativeBuildInputs
|
||||
++ (with pkgs; [
|
||||
glib
|
||||
libmd
|
||||
libdrm
|
||||
libpulseaudio
|
||||
libva
|
||||
ninja
|
||||
nlohmann_json
|
||||
openxr-loader
|
||||
pipewire
|
||||
systemdLibs # udev
|
||||
vulkan-loader
|
||||
vulkan-headers
|
||||
x264
|
||||
])
|
||||
++ (with pkgs; [
|
||||
android-tools # For adb installing WiVRn APKs
|
||||
@ -93,11 +78,7 @@ buildFHSEnv {
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/metainfo
|
||||
ln -s ${envision-unwrapped}/share/envision $out/share
|
||||
ln -s ${envision-unwrapped}/share/icons $out/share
|
||||
ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications
|
||||
ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo
|
||||
ln -s ${envision-unwrapped}/share $out/share
|
||||
'';
|
||||
|
||||
runScript = "envision";
|
||||
|
@ -28,14 +28,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gzdoom";
|
||||
version = "4.13.1";
|
||||
version = "4.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZDoom";
|
||||
repo = "gzdoom";
|
||||
rev = "g${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-pp05tcXFM2NqAPtOtsUprWyV6RE8MQoRSXyp56yELVI=";
|
||||
hash = "sha256-3nkdpJ3XO58YHtjVTwxdSdCL6CnMcih6mTnI7FXLm34=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
@ -7,11 +7,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jreleaser-cli";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
|
||||
hash = "sha256-LkkVxC3/0s468O84sgp7cNX53QRzdmUjCw+cgSWa5U0=";
|
||||
hash = "sha256-/FDoAYf+Uy+VcWT9KpW1IEqOCvCOOyV+8/cugpeUR7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -7,12 +7,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "latexminted";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vJziNgVYcnJfmAnok2OeYZEOwGtGfhZyup3D3+BuZsU=";
|
||||
hash = "sha256-bxv7dKSnlJ5njvCgAKjRVJeoE2BluP1nx9QFZ/2JYeg=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "marwaita-mint";
|
||||
version = "21";
|
||||
version = "22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = "marwaita-mint";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RzQmBD4nlnzZN1BCS6EOqbuSxmjHPAgf/uv99xgAUYU=";
|
||||
hash = "sha256-hKpiEq2Xofp64p5HbznNc4biDALsIN1M98px1sTluFA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -9,14 +9,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita-pop_os";
|
||||
version = "17.0";
|
||||
pname = "marwaita-yellow";
|
||||
version = "20.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = "1f3561f1231d0e9e931f93c5d59df19ed2205ce0";
|
||||
hash = "sha256-WbCIMEWF5853TQyhq8aRoWzpsmjObm9hEc4I0pxDNOM=";
|
||||
repo = "marwaita-yellow";
|
||||
rev = version;
|
||||
hash = "sha256-ClM2lvFFLNz+pF/pY7j/V5L24egB3oxpkH8cpZMSu5g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "22";
|
||||
version = "22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Aa6qJGLQ+MLn/QeZzjMj/O5vEp/Cr/g7n8JFFlSgfOc=";
|
||||
hash = "sha256-LJwobpyQ2KVaJ4jkkg+ISAhjaHLWqYYVuX1z0YJdX6g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mgitstatus";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fboender";
|
||||
repo = "multi-git-status";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-jzoX7Efq9+1UdXQdhLRqBlhU3cBrk5AZblg9AYetItg=";
|
||||
hash = "sha256-DToyP6TD9up0k2/skMW3el6hNvKD+c8q2zWpk0QZGRA=";
|
||||
};
|
||||
|
||||
installFlags = [
|
||||
|
@ -1,46 +1,73 @@
|
||||
{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, darwin
|
||||
, libuv, lua, pkg-config
|
||||
, unibilium
|
||||
, libvterm-neovim
|
||||
, tree-sitter
|
||||
, fetchurl
|
||||
, buildPackages
|
||||
, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
|
||||
, fixDarwinDylibNames
|
||||
, glibcLocales ? null, procps ? null
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
removeReferencesTo,
|
||||
cmake,
|
||||
gettext,
|
||||
msgpack-c,
|
||||
darwin,
|
||||
libuv,
|
||||
lua,
|
||||
pkg-config,
|
||||
unibilium,
|
||||
libvterm-neovim,
|
||||
tree-sitter,
|
||||
fetchurl,
|
||||
buildPackages,
|
||||
treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; },
|
||||
fixDarwinDylibNames,
|
||||
glibcLocales ? null,
|
||||
procps ? null,
|
||||
|
||||
# now defaults to false because some tests can be flaky (clipboard etc), see
|
||||
# also: https://github.com/neovim/neovim/issues/16233
|
||||
, nodejs ? null, fish ? null, python3 ? null
|
||||
nodejs ? null,
|
||||
fish ? null,
|
||||
python3 ? null,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs:
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
nvim-lpeg-dylib = luapkgs: if stdenv.hostPlatform.isDarwin
|
||||
then (luapkgs.lpeg.overrideAttrs (oa: {
|
||||
nvim-lpeg-dylib =
|
||||
luapkgs:
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
let
|
||||
luaLibDir = "$out/lib/lua/${lib.versions.majorMinor luapkgs.lua.luaversion}";
|
||||
in
|
||||
(luapkgs.lpeg.overrideAttrs (oa: {
|
||||
preConfigure = ''
|
||||
# neovim wants clang .dylib
|
||||
sed -i makefile -e "s/CC = gcc/CC = clang/"
|
||||
sed -i makefile -e "s/-bundle/-dynamiclib/"
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "CC = gcc" "CC = clang" \
|
||||
--replace-fail "-bundle" "-dynamiclib" \
|
||||
--replace-fail "lpeg.so" "lpeg.dylib"
|
||||
'';
|
||||
preBuild = ''
|
||||
# there seems to be implicit calls to Makefile from luarocks, we need to
|
||||
# add a stage to build our dylib
|
||||
make macosx
|
||||
mkdir -p $out/lib
|
||||
mv lpeg.so $out/lib/lpeg.dylib
|
||||
mkdir -p ${luaLibDir}
|
||||
mv lpeg.dylib ${luaLibDir}/lpeg.dylib
|
||||
'';
|
||||
postInstall = ''
|
||||
rm -f ${luaLibDir}/lpeg.so
|
||||
'';
|
||||
nativeBuildInputs =
|
||||
oa.nativeBuildInputs
|
||||
++ (
|
||||
lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
||||
);
|
||||
oa.nativeBuildInputs ++ (lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames);
|
||||
}))
|
||||
else luapkgs.lpeg;
|
||||
requiredLuaPkgs = ps: (with ps; [
|
||||
else
|
||||
luapkgs.lpeg;
|
||||
requiredLuaPkgs =
|
||||
ps:
|
||||
(
|
||||
with ps;
|
||||
[
|
||||
(nvim-lpeg-dylib ps)
|
||||
luabitop
|
||||
mpack
|
||||
] ++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
luv
|
||||
coxpcall
|
||||
busted
|
||||
@ -52,18 +79,22 @@ stdenv.mkDerivation (finalAttrs:
|
||||
neovimLuaEnv = lua.withPackages requiredLuaPkgs;
|
||||
neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs;
|
||||
codegenLua =
|
||||
if lua.luaOnBuild.pkgs.isLuaJIT
|
||||
then
|
||||
let deterministicLuajit =
|
||||
lua.luaOnBuild.override {
|
||||
if lua.luaOnBuild.pkgs.isLuaJIT then
|
||||
let
|
||||
deterministicLuajit = lua.luaOnBuild.override {
|
||||
deterministicStringIds = true;
|
||||
self = deterministicLuajit;
|
||||
};
|
||||
in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ])
|
||||
else lua.luaOnBuild;
|
||||
in
|
||||
deterministicLuajit.withPackages (ps: [
|
||||
ps.mpack
|
||||
(nvim-lpeg-dylib ps)
|
||||
])
|
||||
else
|
||||
lua.luaOnBuild;
|
||||
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.10.2";
|
||||
|
||||
@ -86,12 +117,22 @@ in {
|
||||
dontFixCmake = true;
|
||||
|
||||
inherit lua;
|
||||
treesitter-parsers = treesitter-parsers //
|
||||
{ markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } //
|
||||
{ markdown_inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }
|
||||
;
|
||||
treesitter-parsers =
|
||||
treesitter-parsers
|
||||
// {
|
||||
markdown = treesitter-parsers.markdown // {
|
||||
location = "tree-sitter-markdown";
|
||||
};
|
||||
}
|
||||
// {
|
||||
markdown_inline = treesitter-parsers.markdown // {
|
||||
language = "markdown_inline";
|
||||
location = "tree-sitter-markdown-inline";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
[
|
||||
libuv
|
||||
libvterm-neovim
|
||||
# This is actually a c library, hence it's not included in neovimLuaEnv,
|
||||
@ -103,9 +144,12 @@ in {
|
||||
neovimLuaEnv
|
||||
tree-sitter
|
||||
unibilium
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ]
|
||||
;
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
glibcLocales
|
||||
procps
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -125,18 +169,27 @@ in {
|
||||
];
|
||||
|
||||
# extra programs test via `make functionaltest`
|
||||
nativeCheckInputs = let
|
||||
pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
|
||||
in [
|
||||
nativeCheckInputs =
|
||||
let
|
||||
pyEnv = python3.withPackages (
|
||||
ps: with ps; [
|
||||
pynvim
|
||||
msgpack
|
||||
]
|
||||
);
|
||||
in
|
||||
[
|
||||
fish
|
||||
nodejs
|
||||
pyEnv # for src/clint.py
|
||||
];
|
||||
|
||||
# nvim --version output retains compilation flags and references to build tools
|
||||
postPatch = ''
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS "";
|
||||
'' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
''
|
||||
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
sed -i runtime/CMakeLists.txt \
|
||||
-e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
|
||||
sed -i src/nvim/po/CMakeLists.txt \
|
||||
@ -146,14 +199,21 @@ in {
|
||||
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
|
||||
'';
|
||||
# check that the above patching actually works
|
||||
outputChecks = let
|
||||
outputChecks =
|
||||
let
|
||||
disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
|
||||
in {
|
||||
out = { inherit disallowedRequisites; };
|
||||
debug = { inherit disallowedRequisites; };
|
||||
in
|
||||
{
|
||||
out = {
|
||||
inherit disallowedRequisites;
|
||||
};
|
||||
debug = {
|
||||
inherit disallowedRequisites;
|
||||
};
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
cmakeFlags =
|
||||
[
|
||||
# Don't use downloaded dependencies. At the end of the configurePhase one
|
||||
# can spot that cmake says this option was "not used by the project".
|
||||
# That's because all dependencies were found and
|
||||
@ -167,22 +227,27 @@ in {
|
||||
"-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit"
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
preConfigure =
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
|
||||
'' + ''
|
||||
''
|
||||
+ ''
|
||||
mkdir -p $out/lib/nvim/parser
|
||||
'' + lib.concatStrings (lib.mapAttrsToList
|
||||
(language: grammar: ''
|
||||
''
|
||||
+ lib.concatStrings (
|
||||
lib.mapAttrsToList (language: grammar: ''
|
||||
ln -s \
|
||||
${tree-sitter.buildGrammar {
|
||||
${
|
||||
tree-sitter.buildGrammar {
|
||||
inherit (grammar) src;
|
||||
version = "neovim-${finalAttrs.version}";
|
||||
language = grammar.language or language;
|
||||
location = grammar.location or null;
|
||||
}}/parser \
|
||||
}
|
||||
}/parser \
|
||||
$out/lib/nvim/parser/${language}.so
|
||||
'')
|
||||
finalAttrs.treesitter-parsers);
|
||||
'') finalAttrs.treesitter-parsers
|
||||
);
|
||||
|
||||
shellHook = ''
|
||||
export VIMRUNTIME=$PWD/runtime
|
||||
@ -207,8 +272,15 @@ in {
|
||||
# Contributions committed after b17d96 are licensed under Apache 2.0 unless
|
||||
# those contributions were copied from Vim (identified in the commit logs
|
||||
# by the vim-patch token). See LICENSE for details."
|
||||
license = with lib.licenses; [ asl20 vim ];
|
||||
maintainers = with lib.maintainers; [ manveru rvolosatovs ];
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
vim
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
manveru
|
||||
rvolosatovs
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
)
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentype-sanitizer";
|
||||
version = "9.1.0";
|
||||
version = "9.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "khaledhosny";
|
||||
repo = "ots";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gsNMPNPcfHyOgjJnIrJ5tLYHbCfIfTowEhcaGOUPb2Q=";
|
||||
hash = "sha256-QRbF2GUDQsp8i6qVYlafSb9HaaozRuJ8dn1mhMMLeLc=";
|
||||
};
|
||||
|
||||
mesonFlags = [ "-Dcpp_std=c++14" ];
|
||||
|
82
pkgs/by-name/sh/shadcn/package.nix
Normal file
82
pkgs/by-name/sh/shadcn/package.nix
Normal file
@ -0,0 +1,82 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
testers,
|
||||
shadcn,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "shadcn";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shadcn-ui";
|
||||
repo = "ui";
|
||||
rev = "shadcn@${finalAttrs.version}";
|
||||
hash = "sha256-OBLKCj+v5KgYslJGuwLgJHjgcrxLPiiyO5/ucrJ14Ws=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [ "shadcn" ];
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
pnpmWorkspaces
|
||||
;
|
||||
hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
nodejs
|
||||
pnpm_9.configHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm run shadcn:build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp -r {packages,node_modules} $out/lib
|
||||
|
||||
# cleanup
|
||||
rm -r $out/lib/packages/{cli,shadcn/src}
|
||||
find $out/lib/packages/shadcn -name '*.ts' -delete
|
||||
|
||||
makeWrapper ${lib.getExe nodejs} $out/bin/shadcn \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/packages/shadcn/dist/index.js
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = shadcn;
|
||||
command = "shadcn --version";
|
||||
version = finalAttrs.version;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/shadcn-ui/ui/blob/${finalAttrs.src.rev}/packages/shadcn/CHANGELOG.md#${
|
||||
builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
|
||||
}";
|
||||
description = "Beautifully designed components that you can copy and paste into your apps";
|
||||
homepage = "https://ui.shadcn.com/docs/cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "shadcn";
|
||||
maintainers = with lib.maintainers; [ getpsyched ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
@ -43,7 +43,7 @@ let
|
||||
++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zxtune";
|
||||
version = "5072";
|
||||
version = "5075";
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "zxtune";
|
||||
repo = "zxtune";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-cbSz5fi2HYE7ScYFhopXcp9Ct4dMFughF2TKkY1K4uQ=";
|
||||
hash = "sha256-EhzkNrUU/GEYyLZE5TUIMVaALfqZ3n/0khoZV47GV88=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jython";
|
||||
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
|
||||
sha256 = "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ=";
|
||||
sha256 = "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -20,19 +20,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qwlroots";
|
||||
version = "0.1.0";
|
||||
version = "0.3.0-wlroots0.17-0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vioken";
|
||||
repo = "qwlroots";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ev4oCKR43XaYNTavj9XI3RAtB6RFprChpBFsrA2nVsM=";
|
||||
hash = "sha256-ObXegiJ4LT8bTUxNVJ9wBKN5oILWPDYTsuCy+OCsh3k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
@ -58,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6"))
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
description = "Qt and QML bindings for wlroots";
|
||||
homepage = "https://github.com/vioken/qwlroots";
|
||||
|
@ -1,47 +1,32 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtquick3d
|
||||
, qtdeclarative
|
||||
, qwlroots
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlr-protocols
|
||||
, pixman
|
||||
, libdrm
|
||||
, nixos-artwork
|
||||
, libinput
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylib";
|
||||
version = "0.1.1";
|
||||
version = "0.3.0-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vioken";
|
||||
repo = "waylib";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-3IdrChuXQyQGhJ/7kTqmkV0PyuSNP53Y0Po01Fc9Qi0=";
|
||||
hash = "sha256-5IWe8VFpLwDSja4to/ugVS80s5+bcAbM6/fg1HPP52Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-on-qt-6_7.patch";
|
||||
url = "https://github.com/vioken/waylib/commit/09875ebedb074089ec57e71cbc8d8011f555be70.patch";
|
||||
hash = "sha256-ulXlLxn7TOlXSl4N5mjXCy3PJhxVeyDwbwKeV9J/FSI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace examples/tinywl/OutputDelegate.qml \
|
||||
--replace "/usr/share/wallpapers/deepin/desktop.jpg" \
|
||||
"${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"
|
||||
'';
|
||||
|
||||
depsBuildBuild = [
|
||||
# To find wayland-scanner
|
||||
pkg-config
|
||||
@ -51,36 +36,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquick3d
|
||||
qtdeclarative
|
||||
qwlroots
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlr-protocols
|
||||
pixman
|
||||
libdrm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qwlroots
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "INSTALL_TINYWL" true)
|
||||
libinput
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = {
|
||||
description = "Wrapper for wlroots based on Qt";
|
||||
homepage = "https://github.com/vioken/waylib";
|
||||
license = with lib.licenses; [ gpl3Only lgpl3Only asl20 ];
|
||||
outputsToInstall = [ "out" ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ rewine ];
|
||||
};
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowithings";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "joostlek";
|
||||
repo = "python-withings";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pTDHbnL5MfcsQFiaRnKTDAoJ1JwwxRUTB6fQsXjIFl0=";
|
||||
hash = "sha256-OCdnHV2g6v5uPjtva9K3AtxEkY3oWSHJbZrhlinQU2Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -62,6 +62,7 @@ buildPythonPackage rec {
|
||||
"--ignore=ax/core/tests/test_utils.py"
|
||||
"--ignore=ax/early_stopping/tests/test_strategies.py"
|
||||
# broken with sqlalchemy 2
|
||||
"--ignore=ax/core/tests/test_experiment.py"
|
||||
"--ignore=ax/service/tests/test_ax_client.py"
|
||||
"--ignore=ax/service/tests/test_scheduler.py"
|
||||
"--ignore=ax/service/tests/test_with_db_settings_base.py"
|
||||
@ -79,11 +80,11 @@ buildPythonPackage rec {
|
||||
];
|
||||
pythonImportsCheck = [ "ax" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/facebook/Ax/releases/tag/${version}";
|
||||
description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments";
|
||||
homepage = "https://ax.dev/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
@ -58,6 +58,11 @@ buildPythonPackage rec {
|
||||
++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [
|
||||
# stuck tests on hydra
|
||||
"test_moo_predictive_entropy_search"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.isAarch64) [
|
||||
# Numerical error slightly above threshold
|
||||
# AssertionError: Tensor-likes are not close!
|
||||
"test_model_list_gpytorch_model"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "botorch" ];
|
||||
@ -65,11 +70,11 @@ buildPythonPackage rec {
|
||||
# needs lots of undisturbed CPU time or prone to getting stuck
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/pytorch/botorch/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Bayesian Optimization in PyTorch";
|
||||
homepage = "https://botorch.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "enaml";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "nucleic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DYLDQ9QwdK/a8eY0bFX31UNgxm8FUOaeNAnisFcyFNI=";
|
||||
hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,9 +8,6 @@
|
||||
pybind11,
|
||||
setuptools,
|
||||
|
||||
# nativeBuildInputs
|
||||
protobuf-core,
|
||||
|
||||
# buildInputs
|
||||
abseil-cpp,
|
||||
protobuf,
|
||||
@ -48,10 +45,6 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf-core # `protoc` required
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
abseil-cpp
|
||||
gtestStatic
|
||||
|
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
numpy,
|
||||
packaging,
|
||||
protobuf,
|
||||
@ -14,7 +15,7 @@ buildPythonPackage rec {
|
||||
pname = "onnxconverter-common";
|
||||
version = "1.14.0";
|
||||
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
@ -23,7 +24,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "protobuf" ];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
packaging
|
||||
protobuf
|
||||
|
@ -2,32 +2,32 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydexcom";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gagebenne";
|
||||
repo = "pydexcom";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gMUdVdO2Yy41Nl+mn9dEegb6/IRBwoBviPhuz3CMfS8=";
|
||||
hash = "sha256-cf3AhqaA5aij2NCeFqruoeE0ovJSgZgEnVHcE3iXJ1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
dependencies = [ requests ];
|
||||
|
||||
# Tests are interacting with the Dexcom API
|
||||
doCheck = false;
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
description = "Python API to interact with Dexcom Share service";
|
||||
homepage = "https://github.com/gagebenne/pydexcom";
|
||||
changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -3,22 +3,25 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysyncobj";
|
||||
version = "0.3.12";
|
||||
format = "setuptools";
|
||||
version = "0.3.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakwc";
|
||||
repo = "PySyncObj";
|
||||
rev = "refs/tags/${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Tests require network features
|
||||
doCheck = false;
|
||||
|
||||
@ -26,10 +29,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for replicating your class";
|
||||
mainProgram = "syncobj_admin";
|
||||
homepage = "https://github.com/bakwc/PySyncObj";
|
||||
changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/bakwc/PySyncObj/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "syncobj_admin";
|
||||
};
|
||||
}
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ipmi";
|
||||
version = "0.5.5";
|
||||
version = "0.5.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "kontron";
|
||||
repo = "python-ipmi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G5FcFHtyN8bXMjj/yfJgzcfmV1mxQ9lu3GM3XMeTWVU=";
|
||||
hash = "sha256-vwjVUkTeVC1On1I1BtM0kBbne6CbX/6Os1+HA8WN9jU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
33
pkgs/development/python-modules/scienceplots/default.nix
Normal file
33
pkgs/development/python-modules/scienceplots/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
matplotlib,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "SciencePlots";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2NGX40EPh+va0LnCZeqrWWCU+wgtlxI+g19rwygAq1Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ matplotlib ];
|
||||
|
||||
pythonImportsCheck = [ "scienceplots" ];
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with lib; {
|
||||
description = "Matplotlib styles for scientific plotting";
|
||||
homepage = "https://github.com/garrettj403/SciencePlots";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kilimnik ];
|
||||
};
|
||||
}
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spotifyaio";
|
||||
version = "0.7.1";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "joostlek";
|
||||
repo = "python-spotify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L5S7adnOOJQ0b+yUcL8rw9XkZS0meN2gN1Bi2WYOJks=";
|
||||
hash = "sha256-R77bdJidZrsaQZjgCr7OLDab2NpJ10575j8rgmFjn2g=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -35,7 +35,7 @@ let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
|
@ -7,66 +7,66 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"2.5.0" = {
|
||||
"2.5.1" = {
|
||||
x86_64-linux-39 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-1oG4vj/cLNQREjENs8OQT3xqCaeuKNBCrgrzrwHI/No=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-nd4w85nKIhN0Vcyk1HFA37f0F24tFqlyn8BE7r+tsTo=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-aylm7emv/i/WngdlaRynI+yHDgw0x3YfTVuOMYOD/a8=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-v2SEv+W8T5KkoaG/VTBBUF4ZqRH3FwZTMOsGGv4OFNc=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-gEZ2i39tNbhdEBtLOMuoqi881RlSvEwGpJWA8s5oIpE=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-I9Biv3B3aj0E2+dNuVDbKlJF4bpPJyCKh/DXQ7DQboY=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp311-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-MfjDlmCWL5rk7uyZXjBJtUkutzYN1PBzd2WO9Nco+kw=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp312-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-jHEt9hEBlk6xGRCoRlFAEfC29ZIMVdv1Z7/4o0Fj1bE=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-x09z2hefp+qiFnqwtJPyZ65IGmwAckniZ0y9C69KXME=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-JpsQw0Qwqo6WQ9vgNdxSXEqbHWcc09vI7Lyu0oCuMi0=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-1bMgPxkbxAeDyZSI0ud23Pk6xDGllJHWJ6HKWzriCyI=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
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=";
|
||||
name = "torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-NtG+mSgbb2Atljm9CvPuAAbnqrFvZxjYb3CdOVtvJiw=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -223,7 +223,7 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "torch";
|
||||
# Don't forget to update torch-bin to the same version.
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@ -239,7 +239,7 @@ buildPythonPackage rec {
|
||||
repo = "pytorch";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-z41VAN4l/6hyHsxNOnJORy5EQK93kSMkDHRVQrdxv7k=";
|
||||
hash = "sha256-17lgAcqJN+vir+Zvffy5cXRmNjd5Y80ev8b8pOj9F+g=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
format = "wheel";
|
||||
|
||||
src =
|
||||
|
@ -7,66 +7,66 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"2.5.0" = {
|
||||
"2.5.1" = {
|
||||
x86_64-linux-39 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-rHPCnEhWhGO+vGC0srILAdLt3bH1E15mFT8a+F458/0=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-CXWT7fMvCoRQq6eCK4CX0vJHb+lsCrmTMdEsNHADGAs=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-6Yk43MROuquL2DeVRXhM/d/COuF3hziUSLf/mRjcPfk=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-mQJZjgMwrurQvBVFg3gE6yaFSbm0zkGuPKUbI4SQTok=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-pAoOSyOFZKGb8TjGTVk8e1LZfIc3hD2F1soJIWJBrmY=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-kBKR13Cu6x9Rkgu1qnP/gum38mNUo8e5DYD/C06aUEQ=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-cAU1Sqfdqe+QjhPCVm7h/gvW1/W64Fg7XlMBbNIp/DQ=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-8cv9/Ru9++conUenTzb/bF2HwyBWBiAv71p/tpP2HPA=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-0pNJlElV6wYed0/k2e6kaBxbyf9C6jmod/jxTeHk7QA=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-mzhyxd1QgL5jIpCNYjZVgaHdklDj3W1HurP1sIVKXR8=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-S6JHaacr1oaQP+rxBAyJXXEK8v+80l7nqXlO4oVWGyY=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
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=";
|
||||
name = "torchaudio-2.5.1-cp312-cp312-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-a7ZUFkBfQOALIHASV8FudJO/3XGI4C6HzFs4nDHBDCw=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -76,14 +76,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "audio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Swh+HnkGRzjQFt9mYO+qBq4BDTbmLGSkOrN2ZUQdNUI=";
|
||||
hash = "sha256-BRn4EZ7bIujGA6b/tdMu9yDqJNEaf/f1Kj45aLHC/JI=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ];
|
||||
|
@ -23,7 +23,7 @@ let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
|
@ -7,66 +7,66 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"0.20.0" = {
|
||||
"0.20.1" = {
|
||||
x86_64-linux-39 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-C/Tizgi8dJVzTcVAlTxlmQ5C67fJ7Sfi/3lRVLrvXMA=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-OgVeTpBAsSmHjVfDnbVfEX+XWJn/MN1wyPJiHZEXDb4=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-pffrXvIvNKfRj8vCe2wB993lzVMN8xHNvdMRafkcvZg=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-0QU+xQVFSefawmE7FRv/4yPzySSTnSlt9NfTSSWq860=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-LNWEBpeLgTGIz06RNbIYd1tX4LuG1KiPAzmHS4oiSBk=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-SHj++5bvKT0GwnIQkYrcg8OZ2fqvNM2lpj4Sn3cjKPE=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-NEsznhXmu7We4HAHcmFtCv79IJkgx2KxYENo2MNFgyI=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-GjElb/lF1k8Aa7MGgTp8laUx/ha/slNcg33UwQRTPXo=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp39-cp39-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-q8uABd6Nw5Pb0TEOy2adxoq2ZLkQevbWmKY0HR0/LDw=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp310-cp310-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-dfik1RpZPEurbJv311vdiGkbAKU7B2VmeLxVo6dT3XM=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp311-cp311-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-pA12Y0WSdjnaMixpOTTl+RsboiGIRscQS4aN6iMUzo4=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
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=";
|
||||
name = "torchvision-0.20.1-cp312-cp312-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-n4U7pEl6xGkYFa1BtSPuI89bpPh7HOhp1wQFLiM8qLc=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ let
|
||||
inherit (cudaPackages) backendStdenv;
|
||||
|
||||
pname = "torchvision";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -35,7 +35,7 @@ buildPythonPackage {
|
||||
owner = "pytorch";
|
||||
repo = "vision";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aQ1HhWtkhA2EYPCV2vEW10kcP0m0TLNsgjA0Yiwpm9U=";
|
||||
hash = "sha256-BXvi4LoO2LZtNSE8lvFzcN4H2nN2fRg5/s7KRci7rMM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whenever";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -29,12 +29,12 @@ buildPythonPackage rec {
|
||||
owner = "ariebovenberg";
|
||||
repo = "whenever";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Y2+ZQhQpUf747OlzhQRdT1B3jZgCr0BViJ6ujPJWo3w=";
|
||||
hash = "sha256-BstdrsOl1cGGxs5akpSoRQtuTfqmxNSlbLIZWu1d/Lc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-B1weEmW+Q7VxwnLxv9QH75I6IgEICTd70ci/I14ehLY=";
|
||||
hash = "sha256-KWB0PRYKiGNBUKYZn8bCHUjh+oFe818PgKtPdNy1CZA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squirrel-sql";
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
|
||||
sha256 = "sha256-Y7eG2otbLjtXvs3mRXWL8jJywuhBQ9i/MfWJXvkxnuU=";
|
||||
sha256 = "sha256-uQuzh9CyGNJsbYvQiQAYmIyBgpIzXALg8dTFB1USkr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rush";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-57gBYfZsKdK1moXBC52KgxKv/MIeQK6tDu+fznXLZ+Y=";
|
||||
sha256 = "sha256-Jm80iJq2pwO/CJCItSN8gUo5ThxRQsG0Z5TYVtWSEts=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mnc";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
vendorHash = "sha256-H0KmGTWyjZOZLIEWophCwRYPeKLxBC050RI7cMXNbPs=";
|
||||
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
owner = "~anjan";
|
||||
repo = "mnc";
|
||||
rev = version;
|
||||
sha256 = "sha256-S7MBIxuYI+cc8OMQULt7VS7ouPqhq0Jk+rz6E5GyKac=";
|
||||
sha256 = "sha256-eCj7wmHxPF2j2x4yHKN7TE122TCv1++azgdoQArabBM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-exploitdb";
|
||||
version = "0.4.6";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vulsio";
|
||||
repo = "go-exploitdb";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xQQnMlj5dxvvGPqzMyMVloJQe5qY2EPQkYaw3RpgxjI=";
|
||||
hash = "sha256-7S6DuPCsT3mP4/W5Lsyg4RS7Km8dmYkrUhvSjlRhahc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1HvhphLJH0572au2iSXVjN35JCpZr1hesnMrIpdOBRc=";
|
||||
vendorHash = "sha256-uqXNRfWWNvpDC3q+eDX3NOQIHz0di4/Vjh7r8OMsTr4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tboot";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-faTdvjjTFXZEoHeVQ1HMTfU+215yruiliFQcQbc/1VA=";
|
||||
sha256 = "sha256-TIs/xLxLBkKBN0a0CRB2KMmCq8QgICH1++i485WDU3A=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl trousers zlib ];
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "runit";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
|
||||
sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
|
||||
sha256 = "sha256-le9NKGi5eMcXn+R5AeXFeOEc8nPSkr1iCL06fMsCkpA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ansifilter";
|
||||
version = "2.20";
|
||||
version = "2.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
|
||||
hash = "sha256-Neydcaf05WATN5N8dzSzKm40bA8FT00xY3aCPP5nkGc=";
|
||||
hash = "sha256-XqfP39B1LVoWklnaAFwYuQN2KANv2J2LgmJLrOycE5A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kdiff3";
|
||||
version = "1.11.2";
|
||||
version = "1.11.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-kYU3dcP6qVIkaOwSPNbedGYqy21RFkdZlqyk3Cw778g=";
|
||||
hash = "sha256-rt573JqpZ1rukP0qNScFLtMbMJGNQuaQelksunzmp8M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
|
||||
|
@ -738,6 +738,7 @@ mapAliases {
|
||||
marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
|
||||
marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
|
||||
marwaita-ubuntu = lib.warn "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
|
||||
marwaita-pop_os = lib.warn "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
|
||||
masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
|
||||
mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
|
||||
mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
|
||||
|
@ -15323,7 +15323,7 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
ocaml-ng = callPackage ./ocaml-packages.nix { } // { __attrsFailEvaluation = true; };
|
||||
ocaml-ng = callPackage ./ocaml-packages.nix { };
|
||||
ocaml = ocamlPackages.ocaml;
|
||||
|
||||
ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages;
|
||||
@ -27214,8 +27214,6 @@ with pkgs;
|
||||
inherit (kdePackages) breeze-icons;
|
||||
};
|
||||
|
||||
marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
|
||||
|
||||
matcha-gtk-theme = callPackage ../data/themes/matcha { };
|
||||
|
||||
materia-theme = callPackage ../data/themes/materia-theme { };
|
||||
|
@ -9340,13 +9340,9 @@ self: super: with self; {
|
||||
|
||||
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
|
||||
|
||||
onnx = callPackage ../development/python-modules/onnx {
|
||||
protobuf-core = pkgs.protobuf;
|
||||
};
|
||||
onnx = callPackage ../development/python-modules/onnx { };
|
||||
|
||||
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
|
||||
inherit (pkgs) protobuf;
|
||||
};
|
||||
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { };
|
||||
|
||||
onnxmltools = callPackage ../development/python-modules/onnxmltools { };
|
||||
|
||||
@ -14112,6 +14108,8 @@ self: super: with self; {
|
||||
|
||||
schwifty = callPackage ../development/python-modules/schwifty { };
|
||||
|
||||
scienceplots = callPackage ../development/python-modules/scienceplots { };
|
||||
|
||||
scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { };
|
||||
|
||||
scikit-bio = callPackage ../development/python-modules/scikit-bio { };
|
||||
|
Loading…
Reference in New Issue
Block a user