mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0983fe3e50
@ -1,17 +1,20 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, options
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
escapeShellArgs
|
||||
getExe
|
||||
mkOption
|
||||
optionals
|
||||
types
|
||||
;
|
||||
;
|
||||
|
||||
inherit (utils) escapeSystemdExecArgs;
|
||||
|
||||
cfg = config.services.prometheus.exporters.fastly;
|
||||
in
|
||||
@ -39,17 +42,19 @@ in
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
LoadCredential = "fastly-api-token:${cfg.tokenPath}";
|
||||
Environment = [ "FASTLY_API_TOKEN=%d/fastly-api-token" ];
|
||||
ExecStart = escapeSystemdExecArgs (
|
||||
[
|
||||
(getExe pkgs.prometheus-fastly-exporter)
|
||||
"-listen"
|
||||
"${cfg.listenAddress}:${toString cfg.port}"
|
||||
]
|
||||
++ optionals (cfg.configFile != null) [
|
||||
"--config-file"
|
||||
cfg.configFile
|
||||
]
|
||||
++ cfg.extraFlags
|
||||
);
|
||||
};
|
||||
script = let
|
||||
call = escapeShellArgs ([
|
||||
"${pkgs.prometheus-fastly-exporter}/bin/fastly-exporter"
|
||||
"-listen" "${cfg.listenAddress}:${toString cfg.port}"
|
||||
] ++ optionals (cfg.configFile != null) [
|
||||
"--config-file" cfg.configFile
|
||||
] ++ cfg.extraFlags);
|
||||
in ''
|
||||
export FASTLY_API_TOKEN="$(cat $CREDENTIALS_DIRECTORY/fastly-api-token)"
|
||||
${call}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ let
|
||||
++ optional cfg.btrfs.enable btrfs-progs
|
||||
++ optional cfg.ext4.enable e2fsprogs
|
||||
++ optional cfg.xfs.enable xfsprogs
|
||||
++ cfg.extraPackages
|
||||
;
|
||||
hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems);
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
@ -79,6 +80,14 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of additional packages to be available within cloud-init jobs.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
description = ''
|
||||
Structured cloud-init configuration.
|
||||
@ -163,7 +172,7 @@ in
|
||||
{ text = cfg.config; }
|
||||
;
|
||||
|
||||
systemd.network.enable = cfg.network.enable;
|
||||
systemd.network.enable = mkIf cfg.network.enable true;
|
||||
|
||||
systemd.services.cloud-init-local = {
|
||||
description = "Initial cloud-init job (pre-networking)";
|
||||
|
||||
@ -20,6 +20,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
networking.hostId = "deadbeef"; # needed for zfs
|
||||
security.polkit.enable = true;
|
||||
environment.systemPackages = with pkgs; [ virt-manager ];
|
||||
|
||||
# This adds `resolve` to the `hosts` line of /etc/nsswitch.conf; NSS modules placed after it
|
||||
# will not be consulted. Therefore this tests that the libvirtd NSS modules will be
|
||||
# be placed early enough for name resolution to work.
|
||||
services.resolved.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -314,10 +314,9 @@ let
|
||||
tokenPath = pkgs.writeText "token" "abc123";
|
||||
};
|
||||
|
||||
# noop: fastly's exporter can't start without first talking to fastly
|
||||
# see: https://github.com/peterbourgon/fastly-exporter/issues/87
|
||||
exporterTest = ''
|
||||
succeed("true");
|
||||
wait_for_unit("prometheus-fastly-exporter.service")
|
||||
wait_for_open_port(9118)
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -408,12 +408,12 @@
|
||||
|
||||
codesnap-nvim =
|
||||
let
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistricky";
|
||||
repo = "codesnap.nvim";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nS/bAWsBQ1L4M9437Yp6FdmHoogzalKlLIAXnRZyMp0=";
|
||||
hash = "sha256-fBeojxvi++3ShqxvFQ5/sv8WbpVrN7+XRPZWWrbpEL4=";
|
||||
};
|
||||
codesnap-lib = rustPlatform.buildRustPackage {
|
||||
pname = "codesnap-lib";
|
||||
@ -421,7 +421,7 @@
|
||||
|
||||
sourceRoot = "${src.name}/generator";
|
||||
|
||||
cargoHash = "sha256-FTQl5WIGEf+RQKYJ4BbIE3cCeN+NYUp7VXIrpxB05tU=";
|
||||
cargoHash = "sha256-lDy+FUph4CognY0oN7qhFsbnoC3gxguwq5YVtsiP1lo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "surelog";
|
||||
version = "1.82";
|
||||
version = "1.83";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iW2mQPmKfbAWaiEURyVly5IjJ3YpXjVBkm/UbUuwb6k=";
|
||||
hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag=";
|
||||
fetchSubmodules = false; # we use all dependencies from nix
|
||||
};
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "UHDM";
|
||||
# When updating this package, also consider updating science/logic/surelog
|
||||
version = "1.82";
|
||||
version = "1.83";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sl83l6nLN/bluED5bnFShviD1Vv8hmRazxIcLUg/ego=";
|
||||
hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok=";
|
||||
fetchSubmodules = false; # we use all dependencies from nix
|
||||
};
|
||||
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
, makeWrapper}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "memento";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ripose-jp";
|
||||
repo = "Memento";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk=";
|
||||
hash = "sha256-3WOtf7cgYxAMlNPSBmTzaQF1HN9mU61giLp2woBAidY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miriway";
|
||||
version = "0-unstable-2024-05-17";
|
||||
version = "0-unstable-2024-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Miriway";
|
||||
repo = "Miriway";
|
||||
rev = "5be8f60326181b22e111f02918ae5778cf1a89b0";
|
||||
hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk=";
|
||||
rev = "2e88df729fb4961fa81dc9848291fe73c5657c03";
|
||||
hash = "sha256-a5c48U+FaHns52/wQQxYQMSXjjqGzaMh1gs3HTOM7Ys=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2024.6.0";
|
||||
version = "2024.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE=";
|
||||
hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20;
|
||||
|
||||
npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8=";
|
||||
npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
The theme name uses `default` as fallback for tweaks when they aren't
|
||||
set, which not only is not a valid tweak name, but can lead to confusion
|
||||
and inconsistencies (See: https://github.com/catppuccin/nix/pull/261).
|
||||
---
|
||||
sources/build/context.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sources/build/context.py b/sources/build/context.py
|
||||
index 3d43c01..6167f14 100644
|
||||
--- a/sources/build/context.py
|
||||
+++ b/sources/build/context.py
|
||||
@@ -45,7 +45,8 @@ class BuildContext:
|
||||
return f"{self.output_root}/{self.build_id()}"
|
||||
|
||||
def build_id(self) -> str:
|
||||
- return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}"
|
||||
+ tweaks = f"+{self.tweaks.id()}" if self.tweaks.id() != "" else ""
|
||||
+ return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}" + tweaks
|
||||
|
||||
def apply_suffix(self, suffix: Suffix) -> str:
|
||||
if suffix.test(self):
|
||||
@@ -59,6 +60,7 @@ class BuildContext:
|
||||
Subsitution(find=f"\\${key}: {default}", replace=f"${key}: {value}"),
|
||||
)
|
||||
|
||||
+
|
||||
IS_DARK = Suffix(true_value="-Dark", test=lambda ctx: ctx.flavor.dark)
|
||||
IS_LIGHT = Suffix(true_value="-Light", test=lambda ctx: not ctx.flavor.dark)
|
||||
IS_WINDOW_NORMAL = Suffix(
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -37,6 +37,8 @@ stdenvNoCC.mkDerivation {
|
||||
hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-inconsistent-theme-name.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3
|
||||
sassc
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
pkg-config,
|
||||
lxc,
|
||||
buildGo122Module,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
acl,
|
||||
libcap,
|
||||
dqlite,
|
||||
@ -13,21 +13,22 @@
|
||||
udev,
|
||||
installShellFiles,
|
||||
nixosTests,
|
||||
gitUpdater,
|
||||
callPackage,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGo122Module rec {
|
||||
pname = "lxd-unwrapped-lts";
|
||||
# major/minor are used in updateScript to pin to LTS
|
||||
version = "5.21.0";
|
||||
version = "5.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
|
||||
hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "lxd";
|
||||
rev = "refs/tags/lxd-${version}";
|
||||
hash = "sha256-6php6dThpyADOY+2PZ38WxK2jPKd61D0OCwTKjAhAUg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
vendorHash = "sha256-iGW2FQjuqANadFuMHa+2VXiUgoU0VFBJYUyh0pMIdWY=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace shared/usbid/load.go \
|
||||
@ -87,11 +88,16 @@ buildGo122Module rec {
|
||||
installShellCompletion --bash --name lxd ./scripts/bash/lxd-client
|
||||
'';
|
||||
|
||||
passthru.tests.lxd = nixosTests.lxd;
|
||||
passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/canonical/lxd.git";
|
||||
rev-prefix = "lxd-5.21";
|
||||
passthru = {
|
||||
tests.lxd = nixosTests.lxd;
|
||||
tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"lxd-(5.21.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -32,13 +32,13 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.1.47";
|
||||
version = "0.1.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4=";
|
||||
hash = "sha256-rMStHUFC88TXIH/1c9bCOU0csnEZHOhWKBlLKarmCmE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
picom.overrideAttrs (previousAttrs: {
|
||||
pname = "picom-pijulius";
|
||||
version = "8.2-unstable-2024-06-13";
|
||||
version = "8.2-unstable-2024-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pijulius";
|
||||
repo = "picom";
|
||||
rev = "a0e818855daba0d2f11a298f7fd238f8a6049167";
|
||||
hash = "sha256-w1SWYhPfFGX2EumEe8UBZA3atW4jvW54GsMYLGg59Ys=";
|
||||
rev = "b8fe9323e7606709d692976a7fe7d2455b328bc6";
|
||||
hash = "sha256-bXeoWg1ZukXv+6ZNeRc8gGNsbtBztyW5lpfK0lQK+DE=";
|
||||
};
|
||||
|
||||
buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
pciutils,
|
||||
procps,
|
||||
python3,
|
||||
qemu,
|
||||
qemu_full,
|
||||
socat,
|
||||
spice-gtk,
|
||||
swtpm,
|
||||
@ -42,7 +42,7 @@ let
|
||||
pciutils
|
||||
procps
|
||||
python3
|
||||
qemu
|
||||
qemu_full
|
||||
socat
|
||||
swtpm
|
||||
util-linux
|
||||
@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
-e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \
|
||||
-e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \
|
||||
-e 's/Icon=.*qemu.svg/Icon=qemu/' \
|
||||
-e 's,\[ -x "\$(command -v smbd)" \],true,' \
|
||||
quickemu
|
||||
'';
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2024-06-27";
|
||||
version = "0-unstable-2024-07-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82";
|
||||
hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY=";
|
||||
rev = "1675a26fbf06d3085759ccd63b102b3ce8583c3a";
|
||||
hash = "sha256-4GPEufI5j03jCN3N8AUtQIKAsFjPi4DbfNcdoMnbNQ0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -1,46 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
zlib,
|
||||
bzip2,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
ncurses,
|
||||
python3,
|
||||
readline,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "spades";
|
||||
version = "3.15.5";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ablab/spades/releases/download/v${finalAttrs.version}/SPAdes-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ablab";
|
||||
repo = "spades";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-k2+ddJIgGE41KGZODovU9VdurbWerEtdqNrFDwyuFjo=";
|
||||
};
|
||||
sourceRoot = "SPAdes-${finalAttrs.version}/src";
|
||||
|
||||
env.CXXFLAGS = toString [
|
||||
# GCC 13: error: 'uint32_t' does not name a type
|
||||
"-include cstdint"
|
||||
sourceRoot = "source/src";
|
||||
|
||||
patches = [
|
||||
# https://github.com/ablab/spades/pull/1314
|
||||
(fetchpatch {
|
||||
name = "copytree.patch";
|
||||
url = "https://github.com/ablab/spades/commit/af1f756a46c5da669897b841d4f753af1eaa9588.patch";
|
||||
hash = "sha256-tkT7hb0TqsbLkcTs9u43nzvV8bVdh3G9VKYqFFLrQv8=";
|
||||
stripLen = 3;
|
||||
extraPrefix = "projects/";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DZLIB_ENABLE_TESTS=OFF"
|
||||
"-DSPADES_BUILD_INTERNAL=OFF"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# The CMakeListsInternal.txt file should be empty in the release tarball
|
||||
echo "" > CMakeListsInternal.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
bzip2
|
||||
ncurses
|
||||
python3
|
||||
readline
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "St. Petersburg genome assembler, a toolkit for assembling and analyzing sequencing data";
|
||||
license = lib.licenses.gpl2Only;
|
||||
changelog = "https://github.com/ablab/spades/blob/${finalAttrs.version}/changelog.md";
|
||||
downloadPage = "https://github.com/ablab/spades";
|
||||
homepage = "http://ablab.github.io/spades";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ bzizou ];
|
||||
broken = stdenv.hostPlatform.isMusl;
|
||||
};
|
||||
})
|
||||
|
||||
@ -3,30 +3,27 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "1.1.2";
|
||||
in
|
||||
buildGoModule {
|
||||
buildGoModule rec {
|
||||
pname = "superfile";
|
||||
inherit version;
|
||||
version = "1.1.3";
|
||||
|
||||
src =
|
||||
fetchFromGitHub {
|
||||
owner = "MHNightCat";
|
||||
repo = "superfile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA=";
|
||||
}
|
||||
+ "/src";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yorukot";
|
||||
repo = "superfile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z1jcRzID20s7tEDUaEcnOYBfv/BPZtcXz9fy3V5iPPg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo=";
|
||||
vendorHash = "sha256-OzPH7dNu/V4HDGSxrvYxu3s+hw36NiulFZs0BJ44Pjk=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md";
|
||||
ldflags = ["-s" "-w"];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pretty fancy and modern terminal file manager";
|
||||
homepage = "https://github.com/MHNightCat/superfile";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ momeemt ];
|
||||
homepage = "https://github.com/yorukot/superfile";
|
||||
changelog = "https://github.com/yorukot/superfile/blob/${src.rev}/changelog.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [momeemt];
|
||||
mainProgram = "superfile";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "treefmt";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = "treefmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ckvpb2at7lg7AB0XNtIxeo8lWXX+04MVHHKoUs876dg=";
|
||||
hash = "sha256-059lZJ68jGJQYYNqVXetntPrquMY7BZrYHNdL5jmq3M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2024.01";
|
||||
version = "2024.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakudo";
|
||||
repo = "rakudo";
|
||||
rev = version;
|
||||
hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0=";
|
||||
hash = "sha256-6XWfM7KJB+lMf/YFLaQ71DMa8owZtjjuMEyWY++CJnM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2024.05";
|
||||
version = "2024.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-6bVglWmnohGR0Hrib8X5ZEfy+clxP89NSEMgbljpuQs=";
|
||||
hash = "sha256-y+xtJ4YbzPr1168tu+148Co7Ke/iC68aOQBwTINlp2Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2024.01";
|
||||
version = "2024.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raku";
|
||||
repo = "nqp";
|
||||
rev = version;
|
||||
hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c=";
|
||||
hash = "sha256-FqZPUtzlS+ZSlyuCFMWHofLXPuXCWAT6Oak0g3o8cgM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libadwaita";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "GNOME";
|
||||
repo = "libadwaita";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA=";
|
||||
hash = "sha256-0Zu6knxP6GiqJMtwd8uRN72Lf7JfwB6JWjS1ggeANPM=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidfuzz";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A=";
|
||||
hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tagparser";
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "tagparser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-83Xxj1CQsghbAsQ/3GKIYCz9lBNEBvLlx1iOKbszn8A=";
|
||||
hash = "sha256-Plq6iimXStrveSw+SfzuXUuLlQ06ugO21e97fXivqYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.136";
|
||||
version = "1.34.137";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-7Lzngq4ZA30fJmc8/DA1hJPJZY6grwbdWKmZvpY6snU=";
|
||||
hash = "sha256-3kGgypTy0MbaIS9lz9T8WOTxhjO/n2xTXa6MgRmnB58=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.136";
|
||||
version = "1.34.137";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-uXvs5Eq8nxbB/LAi0/A8ItQR6j3LRzAgejGOuObvY+c=";
|
||||
hash = "sha256-e9q7P0pJWRhBswGgg8TwbHZdzsAO1xEAivsKLfmp1N4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faster-whisper";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SYSTRAN";
|
||||
repo = "faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc=";
|
||||
hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libknot";
|
||||
version = "3.3.6";
|
||||
version = "3.3.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-N96gdO5sezMyKt0QdX7ORg5DnEVSqb1j+WohvOHdYYU=";
|
||||
hash = "sha256-3t/YYP7Hnua3fZ4PPN59BcPKHWukygUlcBGfNPOjJAE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.13.11";
|
||||
version = "1.13.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N1PcyaVvPBX9ahHedR7pow6jAKwVOMmKqddWhYLtT8w=";
|
||||
hash = "sha256-zcFcF0a3gyY3WmRiRlQntO8hjbkUm2Cxumn2aKHchvY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,19 +4,30 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
isPy27,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
scikit-learn,
|
||||
pytestCheckHook,
|
||||
torch,
|
||||
torchvision,
|
||||
tqdm,
|
||||
|
||||
# optional-dependencies
|
||||
faiss,
|
||||
tensorboard,
|
||||
|
||||
# tests
|
||||
cudaSupport,
|
||||
pytestCheckHook,
|
||||
torchvision
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-metric-learning";
|
||||
version = "2.5.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -27,14 +38,30 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1y7VCnzgwFOMeMloVdYyszNhf/zZlBJUjuF4qgA5c0A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
torch
|
||||
scikit-learn
|
||||
torchvision
|
||||
tqdm
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
with-hooks = [
|
||||
# TODO: record-keeper
|
||||
faiss
|
||||
tensorboard
|
||||
];
|
||||
with-hooks-cpu = [
|
||||
# TODO: record-keeper
|
||||
faiss
|
||||
tensorboard
|
||||
];
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMP
|
||||
export TEST_DEVICE=cpu
|
||||
@ -43,29 +70,35 @@ buildPythonPackage rec {
|
||||
|
||||
# package only requires `unittest`, but use `pytest` to exclude tests
|
||||
nativeCheckInputs = [
|
||||
faiss
|
||||
pytestCheckHook
|
||||
];
|
||||
torchvision
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# TypeError: setup() missing 1 required positional argument: 'world_size'
|
||||
"TestDistributedLossWrapper"
|
||||
# require network access:
|
||||
"TestInference"
|
||||
"test_get_nearest_neighbors"
|
||||
"test_tuplestoweights_sampler"
|
||||
"test_untrained_indexer"
|
||||
"test_metric_loss_only"
|
||||
"test_pca"
|
||||
# flaky
|
||||
"test_distributed_classifier_loss_and_miner"
|
||||
]
|
||||
++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||
# RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
|
||||
"test_global_embedding_space_tester"
|
||||
"test_with_same_parent_label_tester"
|
||||
];
|
||||
disabledTests = [
|
||||
# network access
|
||||
"test_tuplestoweights_sampler"
|
||||
"test_metric_loss_only"
|
||||
"test_add_to_indexer"
|
||||
"test_get_nearest_neighbors"
|
||||
"test_list_of_text"
|
||||
"test_untrained_indexer"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# AttributeError: module 'torch.distributed' has no attribute 'init_process_group'
|
||||
"test_single_proc"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
# crashes with SIGBART
|
||||
"test_accuracy_calculator_and_faiss_with_torch_and_numpy"
|
||||
"test_accuracy_calculator_large_k"
|
||||
"test_custom_knn"
|
||||
"test_global_embedding_space_tester"
|
||||
"test_global_two_stream_embedding_space_tester"
|
||||
"test_index_type"
|
||||
"test_k_warning"
|
||||
"test_many_tied_distances"
|
||||
"test_query_within_reference"
|
||||
"test_tied_distances"
|
||||
"test_with_same_parent_label_tester"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Metric learning library for PyTorch";
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
hash = "sha256-X5XBYTD+DIbHFBMWkLGosZUORexYt83mML/akUzrnFk=";
|
||||
hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorHash = "sha256-XH3kSfnlwmbOLkWJCjKmU1ghCkarn23M0q0vJQHkCe0=";
|
||||
vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY=";
|
||||
|
||||
# https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
|
||||
ldflags = [ "-X main.version=v${version}" ];
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{ lib
|
||||
, mkYarnPackage
|
||||
, fetchYarnDeps
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
, fixup-yarn-lock
|
||||
, makeWrapper
|
||||
, nodejs
|
||||
, stdenv
|
||||
, yarn
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaml-language-server";
|
||||
version = "1.15.0";
|
||||
|
||||
@ -15,21 +19,54 @@ mkYarnPackage rec {
|
||||
hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
fixup-yarn-lock
|
||||
yarn
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nodejs
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror "$offlineCache"
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
|
||||
patchShebangs node_modules
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn --offline build
|
||||
yarn --offline compile
|
||||
yarn --offline build:libs
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
yarn --offline --production install
|
||||
|
||||
mkdir -p $out/bin $out/lib/node_modules/yaml-language-server
|
||||
cp -r . $out/lib/node_modules/yaml-language-server
|
||||
ln -s $out/lib/node_modules/yaml-language-server/bin/yaml-language-server $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Language Server for YAML Files";
|
||||
|
||||
@ -2,56 +2,56 @@
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.109.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82",
|
||||
"sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/alpha/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
|
||||
"version": "1.1.109"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.109.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82",
|
||||
"sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/alpha/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
|
||||
"version": "1.1.109"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.109.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw",
|
||||
"sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/demo/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/demo/linux64",
|
||||
"version": "1.1.109"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.109.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw",
|
||||
"sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/demo/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/demo/linux64",
|
||||
"version": "1.1.109"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.109.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw",
|
||||
"sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/headless/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/headless/linux64",
|
||||
"version": "1.1.109"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.107.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.109.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw",
|
||||
"sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.107/headless/linux64",
|
||||
"version": "1.1.107"
|
||||
"url": "https://factorio.com/get-download/1.1.109/headless/linux64",
|
||||
"version": "1.1.109"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,5 +16,5 @@ mkKdeDerivation rec {
|
||||
|
||||
extraNativeBuildInputs = [qttools qtsvg];
|
||||
|
||||
meta.license = [lib.licenses.gpl2];
|
||||
meta.license = [lib.licenses.gpl2Only];
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
|
||||
|
||||
let
|
||||
os = if stdenv.isDarwin then "osx" else "linux";
|
||||
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Lidarr \
|
||||
--add-flags "$out/share/${pname}-${version}/Lidarr.dll" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
curl sqlite libmediainfo icu openssl ]}
|
||||
curl sqlite libmediainfo icu openssl zlib ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.38.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-h++IXL1y6f52mSBRP3TiqLMKkFXP/QKaNlpM2PCgT5k=";
|
||||
hash = "sha256-+JpL6LadrD5FDxtiv+YNkfqylYEp/1aSlkLIaFXl5mw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-OsG9FCdlSQYWrne/jaklNIsCT0M4+vt8DxZ9CGPfbzM=";
|
||||
npmDepsHash = "sha256-HMRYbVw4mfxOoPaAzquCEBy97hUC3tR6s1Z8MppJgzY=";
|
||||
|
||||
buildInputs = lib.optionals withSystemd [
|
||||
systemdMinimal
|
||||
|
||||
@ -25,13 +25,13 @@ buildPythonPackage rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2024.7.1";
|
||||
version = "2024.7.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "yt_dlp";
|
||||
hash = "sha256-6wAZR0/95peTeMB1VfoBFzz1W96QsXKgGBtXFnk6rvI=";
|
||||
hash = "sha256-KwyGtXnUoETq88SwDj17JNgubiaGn6EcKI6kOVs4f0E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.10.0";
|
||||
version = "11.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t8TuFjNpsVE5Xq3EloUAJH8ZqiCbZlIm9yzWTGr+E98=";
|
||||
hash = "sha256-G2mVr0TB5BBzBdo4YcE3gH2jU9iZ9UuTgrYlqsEhQXs=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-npnZ/eTfA6GVga6p9XKMMU6YbECN657QMMEQA/pgLfc=";
|
||||
vendorHash = "sha256-aXt/Ehh1G9k0rYGOrdbpddVB4faGTkOy0zWSz2X8BtI=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@ -12785,7 +12785,9 @@ self: super: with self; {
|
||||
|
||||
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
|
||||
|
||||
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
|
||||
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning {
|
||||
inherit (pkgs.config) cudaSupport;
|
||||
};
|
||||
|
||||
pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user