mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge staging-next into staging
This commit is contained in:
commit
11a016be8f
49 changed files with 355 additions and 240 deletions
|
@ -24725,6 +24725,12 @@
|
|||
github = "uku3lig";
|
||||
githubId = 61147779;
|
||||
};
|
||||
ulic-youthlic = {
|
||||
name = "youthlic";
|
||||
email = "ulic.youthlic+nixpkgs@gmail.com";
|
||||
github = "ulic-youthlic";
|
||||
githubId = 121918198;
|
||||
};
|
||||
ulinja = {
|
||||
email = "julian@lobbes.dev";
|
||||
github = "ulinja";
|
||||
|
|
|
@ -34,14 +34,18 @@ in
|
|||
description = ''
|
||||
A set of environment variables used in the global environment.
|
||||
These variables will be set on shell initialisation (e.g. in /etc/profile).
|
||||
|
||||
The value of each variable can be either a string or a list of
|
||||
strings. The latter is concatenated, interspersed with colon
|
||||
characters.
|
||||
|
||||
Setting a variable to `null` does nothing. You can override a
|
||||
variable set by another module to `null` to unset it.
|
||||
'';
|
||||
type = with lib.types; attrsOf (oneOf [ (listOf (oneOf [ int str path ])) int str path ]);
|
||||
type = with lib.types; attrsOf (nullOr (oneOf [ (listOf (oneOf [ int str path ])) int str path ]));
|
||||
apply = let
|
||||
toStr = v: if lib.isPath v then "${v}" else toString v;
|
||||
in lib.mapAttrs (n: v: if lib.isList v then lib.concatMapStringsSep ":" toStr v else toStr v);
|
||||
in attrs: lib.mapAttrs (n: v: if lib.isList v then lib.concatMapStringsSep ":" toStr v else toStr v) (lib.filterAttrs (n: v: v != null) attrs);
|
||||
};
|
||||
|
||||
environment.profiles = lib.mkOption {
|
||||
|
|
|
@ -21,6 +21,9 @@ in
|
|||
list of strings. The latter is concatenated, interspersed with
|
||||
colon characters.
|
||||
|
||||
Setting a variable to `null` does nothing. You can override a
|
||||
variable set by another module to `null` to unset it.
|
||||
|
||||
Note, due to limitations in the PAM format values may not
|
||||
contain the `"` character.
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ in
|
|||
hashedPassword = lib.mkOption {
|
||||
default = "";
|
||||
description = ''
|
||||
Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.
|
||||
Create the password with: {command}`echo -n 'thisismypassword' | nix run nixpkgs#libargon2 -- "$(head -c 20 /dev/random | base64)" -e`
|
||||
'';
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
maintainers = [ nequissimus ];
|
||||
};
|
||||
|
||||
nodes.machine = { pkgs, ... }:
|
||||
nodes.machine = { pkgs, lib, ... }: lib.mkMerge [
|
||||
{
|
||||
boot.kernelPackages = pkgs.linuxPackages;
|
||||
environment.etc.plainFile.text = ''
|
||||
|
@ -17,8 +17,15 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
environment.sessionVariables = {
|
||||
TERMINFO_DIRS = "/run/current-system/sw/share/terminfo";
|
||||
NIXCON = "awesome";
|
||||
SHOULD_NOT_BE_SET = "oops";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
environment.sessionVariables = {
|
||||
SHOULD_NOT_BE_SET = lib.mkForce null;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
testScript = ''
|
||||
machine.succeed('[ -L "/etc/plainFile" ]')
|
||||
|
@ -32,5 +39,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
"echo ''${TERMINFO_DIRS}"
|
||||
)
|
||||
assert "awesome" in machine.succeed("echo ''${NIXCON}")
|
||||
machine.fail("printenv SHOULD_NOT_BE_SET")
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "openhantek6022";
|
||||
version = "3.3.3";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenHantek";
|
||||
repo = "OpenHantek6022";
|
||||
rev = version;
|
||||
sha256 = "sha256-y2pNLAa0P/r0YEdKjQ3iP66cqtTWERG8lTOZDR64WTk=";
|
||||
sha256 = "sha256-FT+DyfD5WHBblRXWXFnyB2xwoIgoh84oB+QN32wx78c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,20 +2,19 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
z3,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vampire";
|
||||
version = "4.6.1";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vprover";
|
||||
repo = "vampire";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z71nxjak3ibp842r8iv37w1x3cbkrmjs88lpvxqb4sgrbyk38zd";
|
||||
tag = "v${version}casc2024";
|
||||
hash = "sha256-NHAlPIy33u+TRmTuFoLRlPCvi3g62ilTfJ0wleboMNU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -29,21 +28,6 @@ stdenv.mkDerivation rec {
|
|||
"CXX:=$(CXX)"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/vprover/vampire/pull/54
|
||||
(fetchpatch {
|
||||
name = "fix-apple-cygwin-defines.patch";
|
||||
url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch";
|
||||
sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza";
|
||||
})
|
||||
# https://github.com/vprover/vampire/pull/55
|
||||
(fetchpatch {
|
||||
name = "fix-wait-any.patch";
|
||||
url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch";
|
||||
sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true
|
||||
'';
|
||||
|
@ -51,19 +35,27 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
rm -rf z3
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m0755 -D vampire_z3_rel* $out/bin/vampire
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://vprover.github.io/";
|
||||
description = "Vampire Theorem Prover";
|
||||
mainProgram = "vampire";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "brush";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reubeno";
|
||||
repo = "brush";
|
||||
tag = "brush-shell-v${version}";
|
||||
hash = "sha256-hPF2nXYXAM+5Lz2VJw9vZ6RFZ40y+YkO94Jc/sLUYsg=";
|
||||
hash = "sha256-ZQ1IiWkM888CWEtwWJ+dMjJO1sGvBTA8E6f9v9JLh/w=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-A4v4i6U6BwUMNTI/TO7wTQvNVtQYKGiQfDXOCy8hFTE=";
|
||||
cargoHash = "sha256-Vg5efRierCc7sT+7b94/4i4+3L5CoOrDoeMx/Rzg5mE=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
|
|
@ -24,19 +24,19 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "citations";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "citations";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns=";
|
||||
hash = "sha256-aJp9UrfRXAsnHFGgMTHGRgCvlPEa62r9/0hEp5YKRzE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-bqZZIA7sE0viAhI5GUFIVCXTkK+U9aWPvCPCug5SR94=";
|
||||
hash = "sha256-ZoflXdou6S7CYFF5x1pB71Ur08X1W6wPaJIm1sYsI2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crystal-dock";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dangvd";
|
||||
repo = "crystal-dock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-to6+sGPhc3kKVq78HljjxeMPWQcNbJjr5FMFcREGAX8=";
|
||||
hash = "sha256-edTBlqCJkw9ER06yZeXvJXQeQ5bJn//ss5ceYwt0QUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cura-appimage";
|
||||
version = "5.9.1";
|
||||
version = "5.10.0";
|
||||
|
||||
# Give some good names so the intermediate packages are easy
|
||||
# to recognise by name in the Nix store.
|
||||
|
@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
|
||||
hash = "sha256-kkZGmpskFXEtTYHh62/Zyk6JBZsH5mSiQwzqrfjCrqU=";
|
||||
hash = "sha256-8Km249t0m4YnOsyXyjJJD0y4n9kUCrA/AcsqBcrVf5Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
|
59
pkgs/by-name/di/dioxionary/package.nix
Normal file
59
pkgs/by-name/di/dioxionary/package.nix
Normal file
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dioxionary";
|
||||
version = "1.1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vaaandark";
|
||||
repo = "dioxionary";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7Kex5o518L7v5EAhlr4BGoT7LynTe5JmDU8Urn0H3vA=";
|
||||
# enable fetchSubmodules since the tests require dictionaries from the submodules
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3Cny2OtEoevlUilL0/xtYbyHcuBsFGEFZG6EX35PL+M=";
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [ openssl.dev ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd dioxionary \
|
||||
--bash <($out/bin/dioxionary completion bash) \
|
||||
--zsh <($out/bin/dioxionary completion zsh) \
|
||||
--fish <($out/bin/dioxionary completion fish)
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# skip these tests since they require internet access
|
||||
"--skip=dict::online::test::look_up_online_by_chinese"
|
||||
"--skip=dict::online::test::look_up_online_by_english"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Rusty stardict. Enables terminal-based word lookup and vocabulary memorization using offline or online dictionaries";
|
||||
homepage = "https://github.com/vaaandark/dioxionary";
|
||||
changelog = "https://github.com/vaaandark/dioxionary/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ ulic-youthlic ];
|
||||
mainProgram = "dioxionary";
|
||||
};
|
||||
})
|
|
@ -17,16 +17,16 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.201.1";
|
||||
version = "0.202.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-nsA/tJXRuL1Ql0N1OR5DeFjXI0PUtSa65hXH6C0Uxds=";
|
||||
hash = "sha256-J2rYM+lQ9I3d9zK0Ez458+52V+h1VuX+zmTc1sPzlHU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NUDGqBmRL7L7/RDy68YG+nAz9Sj1Ink0tAbx9or/h1Q=";
|
||||
vendorHash = "sha256-QIFWrrF0Rl4N/Qac7yevf35tAPAAB9HUbiyth/mlI1U=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
@ -52,7 +52,7 @@ buildGo124Module rec {
|
|||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-iaQNLbbNvklSAEGAveOqStruL+LOpHdmGQqtERkagWU=";
|
||||
hash = "sha256-xv7RG/Am/SXXMhETCpQZPzXIpi2uMwyE/TY/UXWJLsA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,99 +3,99 @@
|
|||
"alpha": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.41.tar.xz"
|
||||
"factorio_linux_2.0.43.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_alpha_x64-2.0.43.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
|
||||
"sha256": "971c293f46d2e021be762eb23c45c17746aa5b8ec74e30fef5f46fa32bb7e1aa",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.43/alpha/linux64",
|
||||
"version": "2.0.43"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.41.tar.xz"
|
||||
"factorio_linux_2.0.42.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_alpha_x64-2.0.42.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
|
||||
"sha256": "c99a4349d4e29e0fd16ecbd710958232d454d3a412ec23b4ff2bd93a31e306ff",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.42/alpha/linux64",
|
||||
"version": "2.0.42"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-demo_linux_2.0.40.tar.xz"
|
||||
"factorio-demo_linux_2.0.42.tar.xz"
|
||||
],
|
||||
"name": "factorio_demo_x64-2.0.40.tar.xz",
|
||||
"name": "factorio_demo_x64-2.0.42.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "91ab921f8599c575f6090f5539090fb2eb42eb0d8bc83f366da078d995c639e6",
|
||||
"sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.40/demo/linux64",
|
||||
"version": "2.0.40"
|
||||
"url": "https://factorio.com/get-download/2.0.42/demo/linux64",
|
||||
"version": "2.0.42"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-demo_linux_2.0.27.tar.xz"
|
||||
"factorio-demo_linux_2.0.42.tar.xz"
|
||||
],
|
||||
"name": "factorio_demo_x64-2.0.27.tar.xz",
|
||||
"name": "factorio_demo_x64-2.0.42.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "75938e76d0e730273616e2441ae3c3bc238bb3cfa38d34a43e5fb25a3d1f2323",
|
||||
"sha256": "eb06c7521f7ed557e6642a7954b0395ee5c993367e1f97c65f0336a94abbba42",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.27/demo/linux64",
|
||||
"version": "2.0.27"
|
||||
"url": "https://factorio.com/get-download/2.0.42/demo/linux64",
|
||||
"version": "2.0.42"
|
||||
}
|
||||
},
|
||||
"expansion": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.41.tar.xz"
|
||||
"factorio-space-age_linux_2.0.43.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_expansion_x64-2.0.43.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
|
||||
"sha256": "43d98f9dfa4edc15a622b9881f71673902710ef8aa12cccc7f6e8ccd7962488e",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.43/expansion/linux64",
|
||||
"version": "2.0.43"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.41.tar.xz"
|
||||
"factorio-space-age_linux_2.0.42.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_expansion_x64-2.0.42.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
|
||||
"sha256": "41c8c8dacad22f5d94399cd5272a3311e38917937bd1a4d102aac7286afc580e",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.42/expansion/linux64",
|
||||
"version": "2.0.42"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.41.tar.xz",
|
||||
"factorio_headless_x64_2.0.41.tar.xz"
|
||||
"factorio-headless_linux_2.0.43.tar.xz",
|
||||
"factorio_headless_x64_2.0.43.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_headless_x64-2.0.43.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
|
||||
"sha256": "bde6e167330c4439ce7df3ac519ea445120258ef676f1f6ad31d0c2816d3aee3",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/headless/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.43/headless/linux64",
|
||||
"version": "2.0.43"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.41.tar.xz",
|
||||
"factorio_headless_x64_2.0.41.tar.xz"
|
||||
"factorio-headless_linux_2.0.42.tar.xz",
|
||||
"factorio_headless_x64_2.0.42.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.41.tar.xz",
|
||||
"name": "factorio_headless_x64-2.0.42.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
|
||||
"sha256": "b5b8b8bdc915e67dbc1710cd3d6aa6802d397b7c0f47db07da8acf39d5bd6376",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.41/headless/linux64",
|
||||
"version": "2.0.41"
|
||||
"url": "https://factorio.com/get-download/2.0.42/headless/linux64",
|
||||
"version": "2.0.42"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,16 +5,17 @@
|
|||
nix-update-script,
|
||||
testers,
|
||||
immich-go,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "immich-go";
|
||||
version = "0.22.1";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simulot";
|
||||
repo = "immich-go";
|
||||
rev = "${version}";
|
||||
hash = "sha256-6bLjHKkEghbY+UQFrgbfeHwOjtks1HjXbDXEr7DuJbU=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-C7QfuCJNraOan6N67k7k30hKwJUDzRCNvWpJM3N328s=";
|
||||
|
||||
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
|
||||
# The intention here is to write the information into files in the `src`'s
|
||||
|
@ -31,27 +32,31 @@ buildGoModule rec {
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jED1K2zHv60zxMY4P7Z739uzf7PtlsnvZyStOSLKi4M=";
|
||||
vendorHash = "sha256-J8vqii0X6GGmOCJ6L9lILz9NQEPa7Idg/ULrdRqBS9U=";
|
||||
|
||||
# options used by upstream:
|
||||
# https://github.com/simulot/immich-go/blob/0.13.2/.goreleaser.yaml
|
||||
# https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-extldflags=-static"
|
||||
"-X main.version=${version}"
|
||||
"-X github.com/simulot/immich-go/app.Version=${version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X main.commit=$(cat COMMIT)"
|
||||
ldflags+=" -X main.date=$(cat SOURCE_DATE)"
|
||||
ldflags+=" -X github.com/simulot/immich-go/Commit=$(cat COMMIT)"
|
||||
ldflags+=" -X github.com/simulot/immich-go/Date=$(cat SOURCE_DATE)"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.versionTest = testers.testVersion {
|
||||
package = immich-go;
|
||||
command = "immich-go -version";
|
||||
command = "immich-go --version";
|
||||
version = version;
|
||||
};
|
||||
};
|
||||
|
@ -66,6 +71,6 @@ buildGoModule rec {
|
|||
mainProgram = "immich-go";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ kai-tub ];
|
||||
changelog = "https://github.com/simulot/immich-go/releases/tag/${version}";
|
||||
changelog = "https://github.com/simulot/immich-go/releases/tag/${src.tag}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libjodycode";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "jbruchon";
|
||||
repo = "libjodycode";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sVEa2gNvgRJK1Ycmv4inbViTBPQFjzcZ8XHlAdsNzOk=";
|
||||
hash = "sha256-doTGeIElftC4SAcn3MTQ+DffQFMv1Elo28i/MFxjFzk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
let
|
||||
pname = "nezha";
|
||||
version = "1.9.11";
|
||||
version = "1.10.4";
|
||||
|
||||
frontendName = lib.removePrefix "nezha-theme-";
|
||||
|
||||
|
@ -58,7 +58,7 @@ buildGo124Module {
|
|||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qGWOy4nKgCXt2AzQB/tbllRifuXxfZCt9ITE+KtThDU=";
|
||||
hash = "sha256-9dw1MT3v7ZCpC/MrlZDJmZ9EdTNVIbE0b45ao3eXO7o=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
@ -97,7 +97,7 @@ buildGo124Module {
|
|||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-VEWev+RPt7WSa8UsiADxUndeCmnUmhQddriJ2tQoNxA=";
|
||||
vendorHash = "sha256-ftVcbO1QYIEYUwPqxAHE/7TNBwzgN5BNyu5+rTnOgIs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.37.0";
|
||||
version = "0.39.0";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA=";
|
||||
hash = "sha256-eBHDJVbPL4Lw1TDOOJT4rzvSb+F7J6EdsLbL4co69nk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
|
|
@ -52,13 +52,13 @@ let
|
|||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2025.2.0";
|
||||
version = "2025.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZVrdkIeVUAKb4617BCcfvs0HqFmctPb7zriDJplyUns=";
|
||||
hash = "sha256-D/j1RzKhRvdqMxcHg/NPZSoroN3etzh6/V38XV9W1cs=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
|
@ -66,7 +66,7 @@ let
|
|||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||
npmDepsHash = "sha256-MOxOzaP6p6Q61ZuDVzbYJvMXpCQ1pzQx86Yl24yt4SQ=";
|
||||
npmDepsHash = "sha256-6qjG0p7pLtTd9CBVVzoeUPv6Vdr5se1wuI5qcKJH2Os=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"importlib-metadata"
|
||||
"kombu"
|
||||
"markdown"
|
||||
"phonenumberslite"
|
||||
"pillow"
|
||||
"protobuf"
|
||||
"pycryptodome"
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-mollie";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-mollie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sI4uHMACCf9HmcJUxJlkGgT70ra/bRs6XorghX99iJo=";
|
||||
hash = "sha256-6VwS8yzueeZ7Yf8U98nljFlFPNVJt6ncd9Qr8nz/SWE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
42
pkgs/by-name/pr/pretix/plugins/servicefees/package.nix
Normal file
42
pkgs/by-name/pr/pretix/plugins/servicefees/package.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
django,
|
||||
pretix-plugin-build,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-servicefees";
|
||||
version = "1.13.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-servicefees";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oZXJd7Pj9dPfSZ1FqTxT6FlNA8cJDWIPPLS8nN+l7ZM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
django
|
||||
pretix-plugin-build
|
||||
setuptools
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
make
|
||||
'';
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
pythonImportsCheck = [ "pretix_servicefees" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows to charge a flat fee on all orders";
|
||||
homepage = "https://github.com/pretix/pretix-servicefees";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
|
@ -7,15 +7,15 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pretix-avgchart";
|
||||
version = "unstable-2023-11-27";
|
||||
pname = "pretix-stretchgoals";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rixx";
|
||||
repo = "pretix-avgchart";
|
||||
rev = "219816c7ec523a5c23778523b2616ac0c835cb3a";
|
||||
hash = "sha256-1V/0PUvStgQeBQ0v6GoofAgyPmWs3RD+v5ekmAO9vFU=";
|
||||
repo = "pretix-stretchgoals";
|
||||
rev = "177238920a863f71cf03f174e2841f5b630574e9";
|
||||
hash = "sha256-Sbbxg6viRdALjZwqEmN2Js/qbMShe5xMg00jUccnhsA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -31,7 +31,7 @@ buildPythonPackage {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Display the average ticket sales price over time";
|
||||
homepage = "https://github.com/rixx/pretix-avgchart";
|
||||
homepage = "https://github.com/rixx/pretix-stretchgoals";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
@ -58,5 +58,6 @@ pythonPackages.buildPythonApplication rec {
|
|||
license = licenses.mit;
|
||||
homepage = "https://github.com/dbohdan/remarshal";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
mainProgram = "remarshal";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17,11 +17,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "Reposilite";
|
||||
version = "3.5.21";
|
||||
version = "3.5.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
|
||||
hash = "sha256-jE9wCShscLp3rUbybd35kBL4UvvENExuUlJXr55qnow=";
|
||||
hash = "sha256-6wrvV4o81Y5nO3i0mRS/ERgNG3IqH95VdrJEYOm0z3E=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem";
|
||||
homepage = "https://github.com/dzikoysk/reposilite";
|
||||
|
|
7
pkgs/by-name/re/reposilite/plugins.json
Normal file
7
pkgs/by-name/re/reposilite/plugins.json
Normal file
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"checksum": "sha256-Esxe2RBeJla2o8qLT5bLSLGCtsakM5nKk2rTd+eOleE=",
|
||||
"groovy": "sha256-Jt2LX9P9PMOY6An2k73CNKbQ8Zi/8wz0a4YTsRS7v7E=",
|
||||
"migration": "sha256-j71SqHQZN6O1fmbCLqqyBL58bGe6WQf0brjRgGEEW+c=",
|
||||
"prometheus": "sha256-AjwuA58XutkCJK4/b44CSNS3GAM6GZKkAlvVwBEF93k=",
|
||||
"swagger": "sha256-I4I3PCgAUYbUlJHLj6yb+3UME+G8/5+EaUXG4HbMS58="
|
||||
}
|
|
@ -1,7 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
generateSplicesForMkScope,
|
||||
makeScopeWithSplicing',
|
||||
}:
|
||||
let
|
||||
pluginHashes = lib.importJSON ./plugins.json;
|
||||
in
|
||||
makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "reposilitePlugins";
|
||||
f =
|
||||
|
@ -39,11 +43,5 @@ makeScopeWithSplicing' {
|
|||
)
|
||||
) { };
|
||||
}
|
||||
// builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) {
|
||||
checksum = "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=";
|
||||
groovy = "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=";
|
||||
migration = "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=";
|
||||
prometheus = "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=";
|
||||
swagger = "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA=";
|
||||
};
|
||||
// builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) pluginHashes;
|
||||
}
|
||||
|
|
20
pkgs/by-name/re/reposilite/update.sh
Executable file
20
pkgs/by-name/re/reposilite/update.sh
Executable file
|
@ -0,0 +1,20 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latestVersion=$(list-git-tags --url=https://github.com/dzikoysk/reposilite | grep -E '^[0-9.]+$' | sort --reverse --version-sort | head -n 1)
|
||||
|
||||
update-source-version reposilite "$latestVersion"
|
||||
|
||||
jq -r 'keys[]' ./pkgs/by-name/re/reposilite/plugins.json | while read -r plugin; do
|
||||
tmpfile=$(mktemp)
|
||||
curl -o "$tmpfile" "https://maven.reposilite.com/releases/com/reposilite/plugin/$plugin-plugin/$latestVersion/$plugin-plugin-$latestVersion-all.jar"
|
||||
hash=$(nix-hash --sri --flat --type sha256 "$tmpfile")
|
||||
|
||||
updatedContent=$(jq ".$plugin = \"$hash\"" ./pkgs/by-name/re/reposilite/plugins.json)
|
||||
echo -E "$updatedContent" > ./pkgs/by-name/re/reposilite/plugins.json
|
||||
done
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
librepo,
|
||||
polkit,
|
||||
bubblewrap,
|
||||
pcre,
|
||||
pcre2,
|
||||
check,
|
||||
python3,
|
||||
json_c,
|
||||
|
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||
libarchive
|
||||
libsolv
|
||||
librepo
|
||||
pcre
|
||||
pcre2
|
||||
check
|
||||
|
||||
# libdnf # vendored unstable branch
|
||||
|
|
4
pkgs/by-name/so/sonarr/deps.json
generated
4
pkgs/by-name/so/sonarr/deps.json
generated
|
@ -955,8 +955,8 @@
|
|||
},
|
||||
{
|
||||
"pname": "SixLabors.ImageSharp",
|
||||
"version": "3.1.6",
|
||||
"hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA="
|
||||
"version": "3.1.7",
|
||||
"hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.Annotations",
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
applyPatches,
|
||||
}:
|
||||
let
|
||||
version = "4.0.13.2932";
|
||||
version = "4.0.14.2939";
|
||||
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
|
||||
# the already patched lockfile to `fetchYarnDeps`.
|
||||
src = applyPatches {
|
||||
|
@ -29,7 +29,7 @@ let
|
|||
owner = "Sonarr";
|
||||
repo = "Sonarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BR7CU8q+L2CY2UqR9n0cbX9R7ergzRPPvSrLl7Cn7EU=";
|
||||
hash = "sha256-gtEDrAosI0Kyk712Kf8QDuloUBq9AArKdukX/PKAo8M=";
|
||||
};
|
||||
patches =
|
||||
[
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "svu";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caarlos0";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eZjwZBmc+rOk4nlsWPVmL7FXXmiJYTCSdeDl/CfZZQk=";
|
||||
sha256 = "sha256-jnUVl34luj6kUyx27+zWFxKZMD+R1uzu78oJV7ziSag=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lqE5S13VQ7WLow6tXcFOWcK/dw7LvvEDpgRTQ8aJGeg=";
|
||||
vendorHash = "sha256-P5Ys4XjT5wKCbnxl3tKjpouiSZBFf/zfXKrV8MaGyMU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -32,7 +32,7 @@ let
|
|||
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
|
||||
|
||||
pname = "tabby";
|
||||
version = "0.24.0";
|
||||
version = "0.26.0";
|
||||
|
||||
availableAccelerations = flatten [
|
||||
(optional cudaSupport "cuda")
|
||||
|
@ -121,12 +121,12 @@ rustPlatform.buildRustPackage {
|
|||
owner = "TabbyML";
|
||||
repo = "tabby";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-poWUfPp/7w6dNjh6yoP5oTbaP4lL91hb1+zQG8tjUDE=";
|
||||
hash = "sha256-OIt0UtknzPikGowfYWMufBXl0Ktt6zsZKqRMx63UqR4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-CTn/b42FI+Y6qy3MKVESIbIlsXmIkZBlxUXnRtHWZcc=";
|
||||
cargoHash = "sha256-wkd2EVCyWkUEo/gqNuX+P5wDeNmx0Jrd7UhhvIZwAFU=";
|
||||
|
||||
# Don't need to build llama-cpp-server (included in default build)
|
||||
# We also don't add CUDA features here since we're using the overridden llama-cpp package
|
||||
|
|
|
@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec {
|
|||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-+PaSLq++tKA6dy4CI1EYrEDdXi2TI9XHjvMLfwDp/HA=";
|
||||
|
||||
cargoBuildFlags = [ "--package trippy" ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
local INSTALL="$out/bin/trip"
|
||||
installShellCompletion --cmd trip \
|
||||
|
|
|
@ -8,38 +8,38 @@
|
|||
"fetchurlAttrSet": {
|
||||
"docker-credential-up": {
|
||||
"aarch64-darwin": {
|
||||
"hash": "sha256-OeFMycBwFtZStrXduaGRY0VCB/EFWndzkx7IgGsB+XQ=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_arm64.tar.gz"
|
||||
"hash": "sha256-AYOZmdNaiGZLwvbyl6DaubWyXDqZcSbWP1/jJ3Idx6Q=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_arm64.tar.gz"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"hash": "sha256-XTtcnxJ+N9DPBunyBd9mk5JSN12H//73aZiiWZ5JNEM=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_arm64.tar.gz"
|
||||
"hash": "sha256-r4chc5wMENvoEHtSIGw1fSys6ixZmg1WqfR+0ovdCDg=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_arm64.tar.gz"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"hash": "sha256-QmFB1w1CgrjE1ON4FHuyjyXyvmplNhmcFH+3Xew5nsE=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/darwin_amd64.tar.gz"
|
||||
"hash": "sha256-x4b3j1fyS3P5ouJTDovgJcZVaNzxvqiZn++p5d6WDRI=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_amd64.tar.gz"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"hash": "sha256-Xa26xnlJ2s7rjMyV+Xo7A/OjAjsAg3fZ21rTCkLHOAM=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/docker-credential-up/linux_amd64.tar.gz"
|
||||
"hash": "sha256-uZPfsXNz3Z0cdBV9hJ4x7HPSXFVDiXqDf/NA1CMBa/M=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_amd64.tar.gz"
|
||||
}
|
||||
},
|
||||
"up": {
|
||||
"aarch64-darwin": {
|
||||
"hash": "sha256-Md+lA+JqVaA60hJLQBDKfQYBbUwMQBVT/kPsgSCEuIY=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_arm64.tar.gz"
|
||||
"hash": "sha256-CcJi11DZivlcelg6nKYUyWstTUqQ6r9EIt6dhWI3fbQ=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_arm64.tar.gz"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"hash": "sha256-fCuvg8kQg9GozlrQfYHGZtPGYVJgJccW1LkYUxMF4DI=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_arm64.tar.gz"
|
||||
"hash": "sha256-QKdkDzoVzxbO677nl8tMoJA4/oqV4V8/h72HikOzxTc=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_arm64.tar.gz"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"hash": "sha256-nzRUk4FG4oHb6IPHHKBfUlJJvn74RM632Vmo+SF/EHg=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/darwin_amd64.tar.gz"
|
||||
"hash": "sha256-xfvMty4OkVFG+UkIfOgD6ZOOXILbPGTjApKH0oJKsKY=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_amd64.tar.gz"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"hash": "sha256-FpILjL2IV4EJ7UfLuBPHUfCDxx0a86+P5AZm3yinHuA=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.161.gfb781f0d/bundle/up/linux_amd64.tar.gz"
|
||||
"hash": "sha256-/5/+dPh6V/69RrqPj/0D4bECX2/2pqQJjo/dNgi/EgE=",
|
||||
"url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_amd64.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -49,5 +49,5 @@
|
|||
"x86_64-darwin",
|
||||
"x86_64-linux"
|
||||
],
|
||||
"version": "0.39.0-0.rc.0.161.gfb781f0d"
|
||||
"version": "0.39.0-0.rc.0.249.g7b07f31c"
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
|
@ -9,11 +9,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zenmonitor";
|
||||
version = "unstable-2024-05-21";
|
||||
version = "unstable-2024-12-19";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.exozy.me";
|
||||
owner = "a";
|
||||
src = fetchFromGitLab {
|
||||
owner = "shdwchn10";
|
||||
repo = "zenmonitor3";
|
||||
rev = "a09f0b25d33967fd32f3831304be049b008cdabf";
|
||||
sha256 = "sha256-5N1Hhv2s0cv4Rujw4wFGHyIy7NyKAFThVvAo+xXqSyk=";
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, electron_32
|
||||
, python3
|
||||
, electron_35
|
||||
, makeDesktopItem
|
||||
, makeShellWrapper
|
||||
, copyDesktopItems
|
||||
|
@ -9,16 +10,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zulip";
|
||||
version = "5.11.1";
|
||||
version = "5.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zulip";
|
||||
repo = "zulip-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68=";
|
||||
npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
@ -27,6 +28,7 @@ buildNpmPackage rec {
|
|||
nativeBuildInputs = [
|
||||
makeShellWrapper
|
||||
copyDesktopItems
|
||||
(python3.withPackages (ps: with ps; [ distutils ]))
|
||||
];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
@ -34,8 +36,8 @@ buildNpmPackage rec {
|
|||
runHook preBuild
|
||||
|
||||
npm run pack -- \
|
||||
-c.electronDist=${electron_32}/libexec/electron \
|
||||
-c.electronVersion=${electron_32.version}
|
||||
-c.electronDist=${electron_35}/libexec/electron \
|
||||
-c.electronVersion=${electron_35.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
@ -48,7 +50,7 @@ buildNpmPackage rec {
|
|||
|
||||
install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png
|
||||
|
||||
makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
|
||||
makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
|
||||
--add-flags "$out/share/lib/zulip/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
|
|
@ -49,6 +49,7 @@ mapAliases {
|
|||
"@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01
|
||||
"@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30
|
||||
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
|
||||
"@prisma/language-server" = throw "@prisma/language-server has been removed because it was broken"; # added 2025-03-23
|
||||
"@shopify/cli" = throw "@shopify/cli has been removed because it was broken"; # added 2025-03-12
|
||||
"@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
|
||||
"@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
"@babel/cli" = "babel";
|
||||
"@commitlint/cli" = "commitlint";
|
||||
"@gitbeaker/cli" = "gitbeaker";
|
||||
"@prisma/language-server" = "prisma-language-server";
|
||||
"@uppy/companion" = "companion";
|
||||
"@webassemblyjs/repl-1.11.1" = "wasm";
|
||||
"@webassemblyjs/wasm-strip" = "wasm-strip";
|
||||
|
|
|
@ -132,7 +132,6 @@
|
|||
, "postcss-cli"
|
||||
, "prebuild-install"
|
||||
, "prettier"
|
||||
, "@prisma/language-server"
|
||||
, "pscid"
|
||||
, "pulp"
|
||||
, "purescript-language-server"
|
||||
|
|
40
pkgs/development/node-packages/node-packages.nix
generated
40
pkgs/development/node-packages/node-packages.nix
generated
|
@ -61563,46 +61563,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"@prisma/language-server" = nodeEnv.buildNodePackage {
|
||||
name = "_at_prisma_slash_language-server";
|
||||
packageName = "@prisma/language-server";
|
||||
version = "6.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-6.5.0.tgz";
|
||||
sha512 = "Cot58P6uJ9IJ5MHJBakSLe87jSj2zC54jJuBjYQ9rJFsNy4Y/bQ605BC1TbxXqJjgpzrYOjTbkLCCU/XIG7PbA==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@prisma/config-6.5.0"
|
||||
sources."@prisma/prisma-schema-wasm-6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60"
|
||||
sources."@prisma/schema-files-loader-6.5.0"
|
||||
sources."@types/js-levenshtein-1.1.3"
|
||||
sources."debug-4.4.0"
|
||||
sources."esbuild-0.25.1"
|
||||
sources."esbuild-register-3.6.0"
|
||||
sources."fs-extra-11.3.0"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."js-levenshtein-1.1.6"
|
||||
sources."jsonfile-6.1.0"
|
||||
sources."klona-2.0.6"
|
||||
sources."ms-2.1.3"
|
||||
sources."universalify-2.0.1"
|
||||
sources."vscode-jsonrpc-8.1.0"
|
||||
sources."vscode-languageserver-8.1.0"
|
||||
sources."vscode-languageserver-protocol-3.17.3"
|
||||
sources."vscode-languageserver-textdocument-1.0.11"
|
||||
sources."vscode-languageserver-types-3.17.3"
|
||||
sources."vscode-uri-3.1.0"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Prisma Language Server";
|
||||
homepage = "https://github.com/prisma/language-tools#readme";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
pscid = nodeEnv.buildNodePackage {
|
||||
name = "pscid";
|
||||
packageName = "pscid";
|
||||
|
|
|
@ -9,29 +9,29 @@
|
|||
|
||||
# dependencies
|
||||
albucore,
|
||||
eval-type-backport,
|
||||
numpy,
|
||||
opencv-python,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
scikit-image,
|
||||
scipy,
|
||||
|
||||
# optional dependencies
|
||||
huggingface-hub,
|
||||
pillow,
|
||||
torch,
|
||||
|
||||
# tests
|
||||
deepdiff,
|
||||
pytestCheckHook,
|
||||
pytest-mock,
|
||||
torch,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
torchvision,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "albumentations";
|
||||
version = "2.0.0";
|
||||
version = "2.0.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "albumentations-team";
|
||||
repo = "albumentations";
|
||||
tag = version;
|
||||
hash = "sha256-8WEOI2J2H4PNhyb9LoIUMofGKx9AHPiPddkQCSdh8/A=";
|
||||
hash = "sha256-WqU25I1DxBqZAXd2+sNMUv/HOL4towlGTnFnpCGmMgY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -53,17 +53,16 @@ buildPythonPackage rec {
|
|||
|
||||
dependencies = [
|
||||
albucore
|
||||
eval-type-backport
|
||||
numpy
|
||||
opencv-python
|
||||
pydantic
|
||||
pyyaml
|
||||
scikit-image
|
||||
scipy
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
hub = [ huggingface-hub ];
|
||||
pytorch = [ torch ];
|
||||
text = [ pillow ];
|
||||
};
|
||||
|
||||
|
@ -71,14 +70,16 @@ buildPythonPackage rec {
|
|||
deepdiff
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
scikit-image
|
||||
scikit-learn
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_pca_inverse_transform"
|
||||
# this test hangs up
|
||||
"test_transforms"
|
||||
# test hangs
|
||||
"test_keypoint_remap_methods"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "albumentations" ];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
diff --git a/albumentations/__init__.py b/albumentations/__init__.py
|
||||
index 0b3b531..7c69c65 100644
|
||||
index 44ee9b9..ea3bc50 100644
|
||||
--- a/albumentations/__init__.py
|
||||
+++ b/albumentations/__init__.py
|
||||
@@ -7,7 +7,3 @@ from .augmentations import *
|
||||
from .core.composition import *
|
||||
from .core.serialization import *
|
||||
from .core.transforms_interface import *
|
||||
@@ -22,7 +22,3 @@ from .core.transforms_interface import *
|
||||
|
||||
with suppress(ImportError):
|
||||
from .pytorch import *
|
||||
-
|
||||
-# Perform the version check after all other initializations
|
||||
-if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}:
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "5.2.1";
|
||||
version = "5.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2CShbIS5hq+queeHHlE53Vf8sl4HQySp1ZU8mz67Qbc=";
|
||||
hash = "sha256-1DJ4ZPL1Px1BKP9RHY/evoIwLzxG0aQNq9gteBi4RZs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -31,14 +31,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylance";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LIrRO5v7XjTLW7ghFTAcrklN2Zlx8tOaUaSqhfFIlnQ=";
|
||||
hash = "sha256-mAVHpQfuAr4RQ8ZwsJHwKtlAtWO3ssm0ic6Y2/c1tZk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
@ -50,7 +50,7 @@ buildPythonPackage rec {
|
|||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-ZyfrIouMGlrgDNcoxmPZpDmLEKEX9oROAsYwOQXCQnI=";
|
||||
hash = "sha256-auL8d8gu2V7kCb4LKdP7mmJZys4YLi2s856/aE73e7Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -53,5 +53,6 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
homepage = "https://github.com/dbohdan/remarshal";
|
||||
maintainers = with maintainers; [ offline ];
|
||||
mainProgram = "remarshal";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
torch,
|
||||
tqdm,
|
||||
transformers,
|
||||
typing-extensions,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
|
@ -25,14 +26,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentence-transformers";
|
||||
version = "3.4.1";
|
||||
version = "4.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UKPLab";
|
||||
repo = "sentence-transformers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TNqCukHdjQYxK/UkAV/lm+TTAm5NyoZjVPUyHPyE3Ko=";
|
||||
hash = "sha256-Hjf82IIkFO8e+xDK1lMp1DrkuUb6TSVQtVpmT/He/VI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -45,6 +46,7 @@ buildPythonPackage rec {
|
|||
torch
|
||||
tqdm
|
||||
transformers
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
|
@ -78,6 +80,7 @@ buildPythonPackage rec {
|
|||
"test_model_card_reuse"
|
||||
"test_nanobeir_evaluator"
|
||||
"test_paraphrase_mining"
|
||||
"test_pretrained_model"
|
||||
"test_save_and_load"
|
||||
"test_simple_encode"
|
||||
"test_tokenize"
|
||||
|
@ -88,9 +91,10 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/cross_encoder/test_cross_encoder.py"
|
||||
"tests/cross_encoder/test_train_stsb.py"
|
||||
"tests/evaluation/test_information_retrieval_evaluator.py"
|
||||
"tests/test_compute_embeddings.py"
|
||||
"tests/test_cross_encoder.py"
|
||||
"tests/test_model_card_data.py"
|
||||
"tests/test_multi_process.py"
|
||||
"tests/test_pretrained_stsb.py"
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wolf-comm";
|
||||
version = "0.0.23";
|
||||
version = "0.0.47";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janrothkegel";
|
||||
repo = "wolf-comm";
|
||||
tag = version;
|
||||
hash = "sha256-LpehooW3vmohiyMwOQTFNLiNCsaLKelWQxQk8bl+y1k=";
|
||||
hash = "sha256-/34smUrsWKNEd5OPPIsDnW3zfq6nhKX3Yp+UBk+Nibw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -2,19 +2,18 @@
|
|||
lib,
|
||||
stdenv,
|
||||
kernel,
|
||||
fetchFromGitea,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zenpower";
|
||||
version = "unstable-2022-11-04";
|
||||
version = "unstable-2025-02-28";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.exozy.me";
|
||||
owner = "a";
|
||||
src = fetchFromGitLab {
|
||||
owner = "shdwchn10";
|
||||
repo = "zenpower3";
|
||||
rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f";
|
||||
sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI=";
|
||||
rev = "138fa0637b46a0b0a087f2ba4e9146d2f9ba2475";
|
||||
sha256 = "sha256-kLtkG97Lje+Fd5FoYf+UlSaEyxFaETtXrSjYzFnHkjY=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
buildHomeAssistantComponent rec {
|
||||
owner = "xZetsubou";
|
||||
domain = "localtuya";
|
||||
version = "2025.3.1";
|
||||
version = "2025.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xZetsubou";
|
||||
repo = "hass-localtuya";
|
||||
rev = version;
|
||||
hash = "sha256-DZ0TS6vdMDBCYP661GeRm+pAmm387/+/DayIBkeuPQA=";
|
||||
hash = "sha256-6JE2hVD650YE7pSrLt+Ie1QpvHcG0bJ2yrTpwTukBG0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue