mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -32,6 +32,7 @@ let
|
||||
|
||||
# Linux
|
||||
"aarch64-linux"
|
||||
"arc-linux"
|
||||
"armv5tel-linux"
|
||||
"armv6l-linux"
|
||||
"armv7a-linux"
|
||||
@@ -143,6 +144,7 @@ in
|
||||
vc4 = filterDoubles predicates.isVc4;
|
||||
or1k = filterDoubles predicates.isOr1k;
|
||||
m68k = filterDoubles predicates.isM68k;
|
||||
arc = filterDoubles predicates.isArc;
|
||||
s390 = filterDoubles predicates.isS390;
|
||||
s390x = filterDoubles predicates.isS390x;
|
||||
loongarch64 = filterDoubles predicates.isLoongArch64;
|
||||
|
||||
@@ -239,6 +239,10 @@ rec {
|
||||
config = "m68k-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
arc = {
|
||||
config = "arc-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
s390 = {
|
||||
config = "s390-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
@@ -229,6 +229,11 @@ rec {
|
||||
family = "m68k";
|
||||
};
|
||||
};
|
||||
isArc = {
|
||||
cpu = {
|
||||
family = "arc";
|
||||
};
|
||||
};
|
||||
isS390 = {
|
||||
cpu = {
|
||||
family = "s390";
|
||||
|
||||
@@ -382,6 +382,12 @@ rec {
|
||||
family = "or1k";
|
||||
};
|
||||
|
||||
arc = {
|
||||
bits = 32;
|
||||
significantByte = littleEndian;
|
||||
family = "arc";
|
||||
};
|
||||
|
||||
loongarch64 = {
|
||||
bits = 64;
|
||||
significantByte = littleEndian;
|
||||
|
||||
@@ -163,6 +163,7 @@ lib.runTests (
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [
|
||||
"aarch64-linux"
|
||||
"arc-linux"
|
||||
"armv5tel-linux"
|
||||
"armv6l-linux"
|
||||
"armv7a-linux"
|
||||
|
||||
@@ -491,13 +491,13 @@ def install_bootloader() -> None:
|
||||
config_file += option_from_config('term_margin', ['style', 'graphicalTerminal', 'margin'])
|
||||
config_file += option_from_config('term_margin_gradient', ['style', 'graphicalTerminal', 'marginGradient'])
|
||||
|
||||
config_file += textwrap.dedent('''
|
||||
# @distroName@ boot entries start here
|
||||
config_file += textwrap.dedent(f'''
|
||||
# {config('distroName')} boot entries start here
|
||||
''')
|
||||
|
||||
for (profile, gens) in profiles:
|
||||
group_name = 'default profile' if profile == 'system' else f"profile '{profile}'"
|
||||
config_file += f'/+@distroName@ {group_name}\n'
|
||||
config_file += f'/+{config('distroName')} {group_name}\n'
|
||||
|
||||
isFirst = True
|
||||
|
||||
@@ -506,7 +506,7 @@ def install_bootloader() -> None:
|
||||
isFirst = False
|
||||
|
||||
config_file_path = os.path.join(limine_install_dir, 'limine.conf')
|
||||
config_file += '\n# @distroName@ boot entries end here\n\n'
|
||||
config_file += f'\n# {config('distroName')} boot entries end here\n\n'
|
||||
|
||||
config_file += str(config('extraEntries'))
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ let
|
||||
efi = config.boot.loader.efi;
|
||||
limineInstallConfig = pkgs.writeText "limine-install.json" (
|
||||
builtins.toJSON {
|
||||
inherit (config.system.nixos) distroName;
|
||||
nixPath = config.nix.package;
|
||||
efiBootMgrPath = pkgs.efibootmgr;
|
||||
liminePath = cfg.package;
|
||||
@@ -432,7 +433,6 @@ in
|
||||
replacements = {
|
||||
python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);
|
||||
configPath = limineInstallConfig;
|
||||
inherit (config.system.nixos) distroName;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
}:
|
||||
rec {
|
||||
version = "9.2.0272";
|
||||
|
||||
@@ -17,7 +21,7 @@ rec {
|
||||
enableParallelBuilding = true;
|
||||
enableParallelInstalling = false;
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
hardeningDisable = if stdenv.cc.isClang then [ "strictflexarrays1" ] else [ "fortify" ];
|
||||
|
||||
# Use man from $PATH; escape sequences are still problematic.
|
||||
postPatch = ''
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
common = callPackage ./common.nix { };
|
||||
common = callPackage ./common.nix { inherit stdenv; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "vim";
|
||||
|
||||
@@ -81,7 +81,7 @@ let
|
||||
endif
|
||||
'';
|
||||
|
||||
common = callPackage ./common.nix { };
|
||||
common = callPackage ./common.nix { inherit stdenv; };
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.101";
|
||||
hash = "sha256-L16rJFwOIK8afKXhZ2ekEEoRIRYfHoHTUHP0+iEL1BI=";
|
||||
version = "2.1.107";
|
||||
hash = "sha256-3RhHJzkY2Lkp5zI8NWXueUfiqd+RuKLfSqcLF4fxvSA=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -35,17 +35,17 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-eDSGfF05h5HPTZNeV9l/SBV+9fIV9iVnommM5P/cGgA=";
|
||||
x86_64-darwin = "sha256-gHNXSWjbS+xqxjNYaoE7WSeo1Vf2+au/x68RVObJtp0=";
|
||||
aarch64-linux = "sha256-PkZiq6STbt1Rb/g9XKeE3tktcrSRyQn/ah1QQxrOITg=";
|
||||
aarch64-darwin = "sha256-T7An1+qkBO2QncPvoyymjerwLwti2/MgwmOJJCb2Nhw=";
|
||||
armv7l-linux = "sha256-+KfjkiqMBGg9x/Qnd4FHiW0kw0dIQ56DSGUm8SBTc8o=";
|
||||
x86_64-linux = "sha256-zoe2E9xlpAME4QD8IagicbAj71g3cA9XlymQQQMFJLo=";
|
||||
x86_64-darwin = "sha256-gKpy6+wkcO+znxLdkGMOetpVyhs3SViQyRtCc6yc5XY=";
|
||||
aarch64-linux = "sha256-KQR6zD+3m+OgeICSs3LkWo7kC2OxqF6Xax8BRTa6QYQ=";
|
||||
aarch64-darwin = "sha256-VZufcJ/g1LPtlQruUwI8Pe5c8LNiAIUHY5+gNnyaPTQ=";
|
||||
armv7l-linux = "sha256-0TxKXKQppxcURimXgC40wmqMgiX3DBMJAMc+qjMQCck=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.115.0";
|
||||
version = "1.116.0";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -53,7 +53,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "41dd792b5e652393e7787322889ed5fdc58bd75b";
|
||||
rev = "560a9dba96f961efea7b1612916f89e5d5d4d679";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -86,7 +86,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-2CQBU7TfYNO4m1Mf6Q0QXFt8C2txJgcN9kd7wX355J4=";
|
||||
hash = "sha256-HqcaLktkhw3BoEgyFwnMmP7/vuSl1OXZygrQreKeHnM=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
setuptools,
|
||||
tkinter,
|
||||
wrapGAppsHook3,
|
||||
pypresence,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
@@ -49,6 +50,9 @@ buildPythonApplication rec {
|
||||
# display_mirror dependencies
|
||||
jinja2
|
||||
pywebview
|
||||
|
||||
# discord rich presence dependencie
|
||||
pypresence
|
||||
];
|
||||
|
||||
# override $HOME directory:
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asccli";
|
||||
version = "1.1.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rudrankriyam";
|
||||
repo = "App-Store-Connect-CLI";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-fO4U5no+o5h8dNO5aQQWJtOcRGBDF+JZ2C0g0YLlJuc=";
|
||||
hash = "sha256-pwfsjVaZaYLLOaIRameDIDZPlwHS6IJrgnTtZqZFwio=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asusctl";
|
||||
version = "6.3.6";
|
||||
version = "6.3.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HkqVNhxbz/JBVmGBeYvdWRttvAcvP05iSfp2VZPR+x8=";
|
||||
hash = "sha256-jBO9AzQt4T4VU8aMcC9ALI7xBesAZC4beEyZ4+0cPPU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PTktA8e5pR+vl0trH0MhBXhcsxU+d/WtBMSKeSztgSY=";
|
||||
cargoHash = "sha256-f/rD2zEvGwyyBFSih7G9vdwFepehYS1u38vBlKGZBFM=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "b4";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-5IxEu1efraux/D8Vvxh0r9chvBpj+6EMlvVovB9HzLM=";
|
||||
hash = "sha256-uBXyrtIohxjP4qFMdkIaALxPCRjqMrRd0WRcmZ/dpp0=";
|
||||
};
|
||||
|
||||
# tests make dns requests and fails
|
||||
|
||||
@@ -27,13 +27,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pds";
|
||||
version = "0.4.208";
|
||||
version = "0.4.219";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluesky-social";
|
||||
repo = "pds";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/porufe1XVtjEFMOv40+1G1n5WgaAJIvOv/KWkKgxuQ=";
|
||||
hash = "sha256-zXNg1rtXN9qdTBvRlSiPlRu6k1Pv3T8nhROsEarev5U=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/service";
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-TZ+lUdICkLZfHPvU1qEUeB3wasBKJpGo2lMk4eeyjas=";
|
||||
hash = "sha256-rZpimxX4oDXIaUdAkkNPEff6qYJ9C8KptsPWJKwPiFo=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -17,8 +17,6 @@ stdenv.mkDerivation {
|
||||
|
||||
paths = [ budgie-desktop ] ++ plugins;
|
||||
|
||||
passAsFile = [ "paths" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
gobject-introspection.setupHook
|
||||
@@ -36,7 +34,7 @@ stdenv.mkDerivation {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
for i in $(cat $pathsPath); do
|
||||
for i in "''${paths[@]}"; do
|
||||
${lndir}/bin/lndir -silent $i $out
|
||||
done
|
||||
'';
|
||||
@@ -50,6 +48,8 @@ stdenv.mkDerivation {
|
||||
)
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
inherit (budgie-desktop.meta)
|
||||
description
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.104",
|
||||
"buildDate": "2026-04-12T01:53:39Z",
|
||||
"version": "2.1.107",
|
||||
"buildDate": "2026-04-14T04:25:18Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "185aabd6d16dacb01a6dd41fc8d8ae5ea78ac8a6a3683caa05b759c47b24de60",
|
||||
"size": 201461744
|
||||
"checksum": "af95a2929cea1ac50feb32ac76bcaa9bf4791fdd25c3186ad7b514da0788deaf",
|
||||
"size": 202518512
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "f1ad0ee6ff3401aceb922cf85ccaf6672a8b894ced23d63ca149d918c01a471d",
|
||||
"size": 202959872
|
||||
"checksum": "cdfae1d314063e17f7a6fbc153bd9f4f6727e565517b5b9453635acf87f028bb",
|
||||
"size": 204016640
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "f0a79ec304334503a563c6d4618b0ea1fcbbe477a047dd3955e2078a3c5559c1",
|
||||
"size": 233835072
|
||||
"checksum": "b3f1d3acde0a247c67a93638208911dd2f676743d16cb3f9bd3987ffb3498a00",
|
||||
"size": 234883648
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "f5fe84d4b8a5a322b83a8ae63ac117adb143d2a9a0bfd73a201a5201d6423869",
|
||||
"size": 233523840
|
||||
"checksum": "8abe3909c55b3afafa8939d28c2cc2fcf73ba9424a46b4f435bbadda7e0eb00d",
|
||||
"size": 234576512
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "86010c0217add5c852cf6af9db4dceaf582a3a327b1d6a4b5cd040583fcbc7ce",
|
||||
"size": 226888128
|
||||
"checksum": "2827a84aa631859be0d3a100f97b9549879bb5098bf311caff4f8ed72c282035",
|
||||
"size": 227936704
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "c31bb2fb8133a5f3281f496bbf3188a6e7ab685d6fa83d90ab7779c8db7a937b",
|
||||
"size": 227838400
|
||||
"checksum": "2a47436fae6444bedbbf2f34ba3cae11244761bd61c10bcf568078bec4c2caa0",
|
||||
"size": 228891072
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "dd575768c8815d26a7771e4648ddc1100cb9f284d761e3c081d9e4b69b3a96a7",
|
||||
"size": 243137184
|
||||
"checksum": "d8cddb8c37da11a5a68e1cbde922b472974e93b459d1e4270be6d5856592685f",
|
||||
"size": 244154016
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "395469d75b80a3b1c3dadbb7ca5c93adaf8732c5fc96f1f1ca0b6a3548909141",
|
||||
"size": 239837344
|
||||
"checksum": "ffa590ddd68e10803c6ea708a1a28ecd24dbe2e24c6a245d286f2d266589ae79",
|
||||
"size": 240854688
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
4
pkgs/by-name/cl/claude-code/package-lock.json
generated
4
pkgs/by-name/cl/claude-code/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.104",
|
||||
"version": "2.1.107",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.104",
|
||||
"version": "2.1.107",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.104";
|
||||
version = "2.1.107";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Cjf7xYaIPR0xrwEG91/HIt0/2sU+t2mXbadzP2VFucU=";
|
||||
hash = "sha256-FpJ7grsXbBJxzbqSZTN6uICd1sGxizMEpHbs1n9yW3s=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-o9eaCZpAuoa9pCpEOmIKK3MlvBXSCuSENrbqXV21X1Q=";
|
||||
npmDepsHash = "sha256-OVmbHfANAqNe6QLzQaSH1oZP50InstIW6RmN2crvQJw=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curl-impersonate";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "lexiforest";
|
||||
repo = "curl-impersonate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8zfHsV08wa+2NInhRT3/ihAVhyBMoRC7K0Rdmehr+xM=";
|
||||
hash = "sha256-ca6YZBYN9WMaXL9nFC5TdX/rRTclu6i0ssQlSBMlteM=";
|
||||
};
|
||||
|
||||
# Disable blanket -Werror to fix build on `gcc-13` related to minor
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kak-tree-sitter-unwrapped";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hadronized";
|
||||
repo = "kak-tree-sitter";
|
||||
rev = "kak-tree-sitter-v${finalAttrs.version}";
|
||||
hash = "sha256-PGQlL7HuZRE2WGGAQr7VBfKt5NvuaIUiYNX9qhpJWK4=";
|
||||
hash = "sha256-8J6bqQkeDfJOyd9WusT+H35J6AMVcCIEr0BCrwGKVXI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ink1qZD/ujLi/PlJRej5rByBka5a6pPVMP+Y1YlTE1c=";
|
||||
cargoHash = "sha256-rEF2BaadWuM0OtesiXV3IZ8bRpcpdRekUnvBAWM7Dwc=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
unzip,
|
||||
mono,
|
||||
makeWrapper,
|
||||
writeText,
|
||||
icoutils,
|
||||
replaceVars,
|
||||
xsel,
|
||||
@@ -17,7 +18,38 @@
|
||||
makeDesktopItem,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
let
|
||||
# KeePass looks for plugins in under directory in which KeePass.exe is
|
||||
# located. It follows symlinks where looking for that directory, so
|
||||
# buildEnv is not enough to bring KeePass and plugins together.
|
||||
#
|
||||
# This derivation patches KeePass to search for plugins in specified
|
||||
# plugin derivations in the Nix store and nowhere else.
|
||||
pluginLoadPathsPatch =
|
||||
let
|
||||
inherit (builtins) toString;
|
||||
inherit (lib.strings)
|
||||
readFile
|
||||
concatStrings
|
||||
replaceStrings
|
||||
unsafeDiscardStringContext
|
||||
;
|
||||
inherit (lib.lists) map length;
|
||||
inherit (lib) add;
|
||||
|
||||
outputLc = toString (add 7 (length plugins));
|
||||
patchTemplate = readFile ./keepass-plugins.patch;
|
||||
loadTemplate = readFile ./keepass-plugins-load.patch;
|
||||
loads = concatStrings (
|
||||
map (
|
||||
p: replaceStrings [ "$PATH$" ] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate
|
||||
) plugins
|
||||
);
|
||||
in
|
||||
writeText "load-paths.patch" (
|
||||
replaceStrings [ "$OUTPUT_LC$" "$DO_LOADS$" ] [ outputLc loads ] patchTemplate
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keepass";
|
||||
version = "2.60";
|
||||
@@ -47,39 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
# KeePass looks for plugins in under directory in which KeePass.exe is
|
||||
# located. It follows symlinks where looking for that directory, so
|
||||
# buildEnv is not enough to bring KeePass and plugins together.
|
||||
#
|
||||
# This derivation patches KeePass to search for plugins in specified
|
||||
# plugin derivations in the Nix store and nowhere else.
|
||||
pluginLoadPathsPatch =
|
||||
let
|
||||
inherit (builtins) toString;
|
||||
inherit (lib.strings)
|
||||
readFile
|
||||
concatStrings
|
||||
replaceStrings
|
||||
unsafeDiscardStringContext
|
||||
;
|
||||
inherit (lib.lists) map length;
|
||||
inherit (lib) add;
|
||||
|
||||
outputLc = toString (add 7 (length plugins));
|
||||
patchTemplate = readFile ./keepass-plugins.patch;
|
||||
loadTemplate = readFile ./keepass-plugins-load.patch;
|
||||
loads = concatStrings (
|
||||
map (
|
||||
p: replaceStrings [ "$PATH$" ] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate
|
||||
) plugins
|
||||
);
|
||||
in
|
||||
replaceStrings [ "$OUTPUT_LC$" "$DO_LOADS$" ] [ outputLc loads ] patchTemplate;
|
||||
|
||||
passAsFile = [ "pluginLoadPathsPatch" ];
|
||||
postPatch = ''
|
||||
sed -i 's/\r*$//' KeePass/Forms/MainForm.cs
|
||||
patch -p1 <$pluginLoadPathsPatchPath
|
||||
patch -p1 <${pluginLoadPathsPatch}
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From fe256f79a66e1098707dd1e5b79ed4920d7a13c4 Mon Sep 17 00:00:00 2001
|
||||
From: Henri Menke <henri@henrimenke.de>
|
||||
Date: Thu, 9 Apr 2026 07:12:04 +0000
|
||||
Subject: [PATCH] Makefile: add STATIC and DYNAMIC build variables
|
||||
|
||||
---
|
||||
libutempter/Makefile | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libutempter/Makefile b/libutempter/Makefile
|
||||
index 5634d03..7014ca4 100644
|
||||
--- a/libutempter/Makefile
|
||||
+++ b/libutempter/Makefile
|
||||
@@ -27,7 +27,15 @@ SONAME = $(SHAREDLIB).$(MAJOR)
|
||||
STATICLIB = lib$(PROJECT).a
|
||||
MAP = lib$(PROJECT).map
|
||||
|
||||
-TARGETS = $(PROJECT) $(SHAREDLIB)
|
||||
+STATIC ?= 0
|
||||
+DYNAMIC ?= 1
|
||||
+TARGETS = $(PROJECT)
|
||||
+ifeq ($(DYNAMIC),1)
|
||||
+TARGETS += $(SHAREDLIB)
|
||||
+endif
|
||||
+ifeq ($(STATIC),1)
|
||||
+TARGETS += $(STATICLIB)
|
||||
+endif
|
||||
|
||||
INSTALL = install
|
||||
libdir = /usr/lib
|
||||
@@ -81,9 +89,14 @@ install:
|
||||
$(DESTDIR)$(includedir) $(DESTDIR)$(man3dir)
|
||||
$(INSTALL) -p -m2711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/
|
||||
$(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/
|
||||
+ifeq ($(DYNAMIC),1)
|
||||
$(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
|
||||
ln -fns $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
|
||||
ln -fns $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
|
||||
+endif
|
||||
+ifeq ($(STATIC),1)
|
||||
+ $(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/
|
||||
+endif
|
||||
$(INSTALL) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/
|
||||
for n in lib$(PROJECT) utempter_add_record utempter_remove_record \
|
||||
utempter_remove_added_record utempter_set_helper; do \
|
||||
@@ -1,22 +1,35 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libutempter";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-ln/vNy85HeUBhDrYdXDGz12r2WUfAPF4MJD7wSsqNMs=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "altlinux";
|
||||
repo = "libutempter";
|
||||
tag = "${finalAttrs.version}-alt1";
|
||||
hash = "sha256-CiRZiEXzfOrtx1XXdMG2QZqzRtvY5mdA4SwTHRxkLUI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libutempter";
|
||||
|
||||
buildInputs = [ glib ];
|
||||
|
||||
patches = [ ./exec_path.patch ];
|
||||
patches = [
|
||||
./exec_path.patch
|
||||
(fetchpatch {
|
||||
name = "build-overwrite-already-existing-symlinks-during-ins.patch";
|
||||
url = "https://github.com/altlinux/libutempter/commit/717116b93d496a19f7f8abf8702517de0053f66e.patch";
|
||||
hash = "sha256-4YaxgbORNm+rlp0YzYKj5a7/zJl1dxo72i/Rei9qulg=";
|
||||
})
|
||||
./Makefile-add-STATIC-and-DYNAMIC-build-variables.patch # https://github.com/altlinux/libutempter/pull/9
|
||||
];
|
||||
|
||||
patchFlags = [ "-p2" ];
|
||||
|
||||
@@ -24,12 +37,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace Makefile --replace 2711 0711
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"libdir=\${out}/lib"
|
||||
"libexecdir=\${out}/lib"
|
||||
"includedir=\${out}/include"
|
||||
"mandir=\${out}/share/man"
|
||||
];
|
||||
makeFlags =
|
||||
lib.optionals stdenv.hostPlatform.isStatic [
|
||||
"DYNAMIC=0"
|
||||
"STATIC=1"
|
||||
]
|
||||
++ [
|
||||
"libdir=\${out}/lib"
|
||||
"libexecdir=\${out}/lib"
|
||||
"includedir=\${out}/include"
|
||||
"mandir=\${out}/share/man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/altlinux/libutempter";
|
||||
|
||||
@@ -63,13 +63,13 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "lutris-unwrapped";
|
||||
version = "0.5.20";
|
||||
version = "0.5.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ycAlVV5CkLLsk/m17R8k6x40av1wcEVQU2GMbOuc7Bs=";
|
||||
hash = "sha256-4mNknvfJQJEPZjQoNdKLQcW4CI93D6BUDPj8LtD940A=";
|
||||
};
|
||||
|
||||
pyproject = false;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mitex";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitex-rs";
|
||||
repo = "mitex";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ec/vocq+gU3zbFU2zNTLuHWmte9t8riYlgpS8BzxJBE=";
|
||||
hash = "sha256-LoGgRiIQQEKvyYIVjvEjg7OuzDl5hmPsrnunDMPfPLI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AKQrIehctDlG06R21Ia14IC7Yj2/mq/VKPOyIdDBS2g=";
|
||||
cargoHash = "sha256-Y/RCUAPohQ7lKPUM07zXM/2/RQpqUmF7cr19GUVVk4Y=";
|
||||
|
||||
nativeBuildInputs = [ typst ];
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.21.0";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zlZ2muIEL/azEwdFMxXDO2XPpunYt42Vv1JYOmlN1k4=";
|
||||
hash = "sha256-tP5NkuKmne+XthBnN36uorwMuM7yuJLvo4zzc1K1JBQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7gb962ejpgy9fLL+JVA8i6NLeltfIqtZvxwtnigTGvI=";
|
||||
vendorHash = "sha256-Ux9fyezBXWVjmpa8WsEHvOUo/pokzFXvdpDAtNh0T/8=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
@@ -30,6 +30,9 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# Tests are currently broken upstream because they were neglected after some
|
||||
# sort of a refactor. This is not a packaging problem.
|
||||
doCheck = false;
|
||||
preCheck = ''
|
||||
# Test all packages.
|
||||
unset subPackages
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.43.0.10492-121068a07";
|
||||
version = "1.43.1.10611-1e34174b1";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "sha256-YrIH51MyyL6gPWneAaV4sMUDygau5ytZnOBgQ1YCcLo=";
|
||||
sha256 = "sha256-UIMx+0tbQk1c5JH/hc7117aRIyGM6ogd8IBAhQt+MnM=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-HA779rkjy8QBlW2+IsRmgu4t5PT2Gy0oaqcJm+9zCYE=";
|
||||
sha256 = "sha256-pr1+VSObX0sBl/AddeG/+2dIbNdc+EtnvCzy4nTXVn8=";
|
||||
};
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
50
pkgs/by-name/rf/rfc-reader/package.nix
Normal file
50
pkgs/by-name/rf/rfc-reader/package.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rfc-reader";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ozan2003";
|
||||
repo = "rfc_reader";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hm8BVIMxRlyiVptvuS8vk2eO3hHboj5CRefWcMEhzvs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ro0BVMbShxo/EsPBOCBOgYDsOkDnxpyTZlk2eAJ2IWA=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
# The version command triggers logging unconditionally, have to create a temp directory
|
||||
command = "HOME=$(mktemp -d) rfc_reader --version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "RFC viewer with TUI";
|
||||
homepage = "https://github.com/ozan2003/rfc_reader";
|
||||
changelog = "https://github.com/ozan2003/rfc_reader/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ frantathefranta ];
|
||||
mainProgram = "rfc_reader";
|
||||
};
|
||||
})
|
||||
@@ -26,18 +26,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rnote";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bNe9PW7hkSmdU6HTDwD7bMbHZFs8fRDrIEC9f6xjliI=";
|
||||
hash = "sha256-uOfFZuxxU8StirS5E/Tm8Lg58u8s4USgA9BeEUKw3xE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-15TOc+X0E/uGVUfgIOM6pEIp2LZUmDrM7BRzdbLarbc=";
|
||||
hash = "sha256-N3mh/hGQ/Pu01uGL5e8BZvrrEm3u7cnJHSqt5FHynKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rustls-ffi";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustls";
|
||||
repo = "rustls-ffi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mqC5uKkFIVVZW+7Z+8PF2lhx/6TVsKX4DW6oQuMMtDw=";
|
||||
hash = "sha256-OrseS6PxAGhO+mdlRrjQAZ5L5GbNekeVg+IW5VyL928=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-ugU2tfG9VUvOhMeOQ4A+MBQIEw+bYb2dZllXrztQtrg=";
|
||||
hash = "sha256-eNY6mpEFFJEdaJyHY8RHOerg/cDa3QbPjsNj3iZNqJ0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"permission_handler": "sha256-b2igh231BkLe/vkCACVyWg8SxR5V6wjmhPljEs9Ue3o=",
|
||||
"permission_handler_windows": "sha256-b2igh231BkLe/vkCACVyWg8SxR5V6wjmhPljEs9Ue3o=",
|
||||
"sideswap_logger": "sha256-cTJfSODRmIJXctLQ++BfvJ6OKflau94AjQdXg7j95B0=",
|
||||
"sideswap_websocket": "sha256-vsG5eUFu/WJvY3y6jaWD/5GfULwpqh3bO4EZmmBSkbs=",
|
||||
"sideswap_logger": "sha256-lkkWj0/L+iJStyO6lQJHaGvsweq0jdbfjLQnqV/z3iA=",
|
||||
"sideswap_websocket": "sha256-F/4QG3j2t0oy8PRzrElg/UpEREyiMfNRElh941lJQf4=",
|
||||
"window_size": "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="
|
||||
}
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsideswap-client";
|
||||
version = "0-unstable-2025-06-24";
|
||||
version = "0-unstable-2026-02-16";
|
||||
|
||||
# This version is pinned in https://github.com/sideswap-io/sideswapclient/blob/v1.8.0/deploy/build_linux.sh
|
||||
src = fetchFromGitHub {
|
||||
owner = "sideswap-io";
|
||||
repo = "sideswap_rust";
|
||||
rev = "91791efbceb3fac4774d1e42a519e70b14b876cf";
|
||||
hash = "sha256-SUAmmKnL/thGLfPU22UxzO+LVXgrHh+lZVdXuAJ4q1E=";
|
||||
rev = "9b0eea90b18007621eb15282d0064976dfedfa91";
|
||||
hash = "sha256-vnuDIcdHRmTdx/6iRd1g0AQqvvm3ZJs2e8yyx78UDZ4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bbNFi0cmFFf66IDKi0V8HC/lSU3JLRpgZ+NHeMJog8c=";
|
||||
cargoHash = "sha256-GzAR58UYictCfC6U9mcBZUcejy6jP9brLuKB2yVgccM=";
|
||||
|
||||
# sideswap_client uses vergen to detect Git commit hash at build time. It
|
||||
# tries to access .git directory which is not present in Nix build dir.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
flutter332,
|
||||
flutter341,
|
||||
callPackage,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -11,7 +11,7 @@
|
||||
gitUpdater,
|
||||
runCommand,
|
||||
sideswap,
|
||||
yq,
|
||||
yq-go,
|
||||
dart,
|
||||
}:
|
||||
|
||||
@@ -20,15 +20,15 @@ let
|
||||
libsideswap-client = callPackage ./libsideswap-client.nix { };
|
||||
in
|
||||
|
||||
flutter332.buildFlutterApplication rec {
|
||||
flutter341.buildFlutterApplication (finalAttrs: {
|
||||
pname = "sideswap";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sideswap-io";
|
||||
repo = "sideswapclient";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+zaQJCMKQZOrZ7i6CzgGTa+rJqpglaufUvYWSWMWTEw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E+njx//oCr85nwF8rvuOjDTNvs5177+lh9uy5LEvTVE=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
@@ -53,11 +53,11 @@ flutter332.buildFlutterApplication rec {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "sideswap";
|
||||
exec = meta.mainProgram;
|
||||
exec = finalAttrs.meta.mainProgram;
|
||||
desktopName = "SideSwap";
|
||||
genericName = "L-USDT Wallet";
|
||||
icon = "sideswap";
|
||||
comment = meta.description;
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [
|
||||
"Finance"
|
||||
"Network"
|
||||
@@ -78,11 +78,11 @@ flutter332.buildFlutterApplication rec {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
nativeBuildInputs = [ yq ];
|
||||
inherit (sideswap) src;
|
||||
inherit (finalAttrs) src;
|
||||
nativeBuildInputs = [ yq-go ];
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
|
||||
'';
|
||||
|
||||
# Usage: nix-shell maintainers/scripts/update.nix --argstr package sideswap
|
||||
@@ -129,4 +129,4 @@ flutter332.buildFlutterApplication rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ starius ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "2.0.55";
|
||||
version = "2.0.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvndrsslr";
|
||||
repo = "sketchybar-app-font";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gr0+wPvVeRF4GztRPIsdOhknoq5xjaj8lcLnClIzZ/U=";
|
||||
hash = "sha256-Q140vSaHkyddxUQut/r8LGuBvTel6kpcpZwqWRP0h8s=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "ttop";
|
||||
version = "1.5.7";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inv2004";
|
||||
repo = "ttop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JdUoVP/R3epkx53kMdIflDEuFuJRzCxQY1BgsyVItqM=";
|
||||
hash = "sha256-qq+8LEP6rHL3opwsQixwNnMbbk0TN+mIrrdCjuKnAfA=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
@@ -24,12 +24,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uhhyou-plugins";
|
||||
version = "0.69.0";
|
||||
version = "0.70.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryukau";
|
||||
repo = "VSTPlugins";
|
||||
rev = "UhhyouPlugins${finalAttrs.version}";
|
||||
hash = "sha256-s1HQD7ZWmqD1yux/IKG8oUt7UA0TrAuPEsVSOXFcIE4=";
|
||||
hash = "sha256-NkNP7kmOBLcXBA65PEwC0I/NIGzZm8wnAvDM74Cfsws=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vacuum-go";
|
||||
version = "0.25.5";
|
||||
version = "0.25.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WvAgKJBVLZbFZ0VDG2a9cq0tZXZcaDZ5ECy9zyS2BXY=";
|
||||
hash = "sha256-q3IPA212G7Iu2x9l73Pqa7Y9QzvsMR4IWjpUsvjroP0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V09ZrfPnRVNuGhutvn/WhNYTumZbDj+wKviz53Q27dE=";
|
||||
vendorHash = "sha256-R5CuUIn/nHbGSvNQxPrAmVK3z4Nr7fMbss0MCidmYjQ=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
||||
@@ -22,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'CFLAGS=' 'CFLAGS=-std=gnu99 ' \
|
||||
--replace-fail 'pkg-config' "$PKG_CONFIG"
|
||||
'';
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "worktrunk";
|
||||
version = "0.34.2";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-sixty";
|
||||
repo = "worktrunk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wTUC26fTyRbtHJe5fA052qoKWl1K2EESMoswigjbu0A=";
|
||||
hash = "sha256-z+Wb0xgu15cSSYB3hPhp6qVwUUXmLJcP788LiQLowqs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9hAoUXj4+DwBR+52KZ0uFN84thwjxQYZ6wW0KvVs5sA=";
|
||||
cargoHash = "sha256-nBbLlM4Y5IOSeGrgiu7Bm9PcTSarXiqFbC2RnTrhWeE=";
|
||||
|
||||
cargoBuildFlags = [ "--package=worktrunk" ];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
flutter338,
|
||||
flutter341,
|
||||
keybinder3,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
@@ -16,6 +16,7 @@
|
||||
libxtst,
|
||||
libx11,
|
||||
libxkbcommon,
|
||||
xorgproto,
|
||||
libayatana-appindicator,
|
||||
gtk3,
|
||||
desktop-file-utils,
|
||||
@@ -25,13 +26,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wox-launcher";
|
||||
repo = "Wox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1g38ry6+iWiRBLVbgLNaotc/jlsG5LLVYvzJbmEjIdA=";
|
||||
hash = "sha256-Qav2RhmhJQr2D1D3okshIrnnQuOh7V1gWbZwXR3LBAc=";
|
||||
};
|
||||
|
||||
metaCommon = {
|
||||
@@ -41,7 +42,7 @@ let
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
ui-flutter = flutter338.buildFlutterApplication {
|
||||
ui-flutter = flutter341.buildFlutterApplication {
|
||||
pname = "wox-ui-flutter";
|
||||
inherit version src;
|
||||
|
||||
@@ -49,9 +50,19 @@ let
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace linux/runner/my_application.cc \
|
||||
--replace-fail "X11/Xkeysym.h" "X11/keysym.h"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ keybinder3 ];
|
||||
buildInputs = [
|
||||
keybinder3
|
||||
xorgproto
|
||||
libx11
|
||||
libxtst
|
||||
];
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "wox";
|
||||
@@ -79,8 +90,8 @@ let
|
||||
sourceRoot
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-8EovIVJ+uAo9XJIIgRrpkQrcmNkKC2Ruja2md7NFZ4A=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-cbuVQV8ih8rztERFLUHGnK63MBz8+QVmzeegYLDwcj4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@@ -160,7 +171,7 @@ buildGoModule {
|
||||
sed -i '/^ "path"$/d' plugin/host/host_python.go
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-JA6D0i6lgWYGz8jS4m5yO4JCawbEaVpGGFoQ1QnNqpg=";
|
||||
vendorHash = "sha256-IDcIEZVCJp1ls5c2fblgX+I+MhfRDXqFbf0GhgcFiTo=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -306,6 +306,12 @@
|
||||
"source": "hosted",
|
||||
"version": "0.3.5"
|
||||
},
|
||||
"flutter_driver": {
|
||||
"dependency": "transitive",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_highlight": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -388,6 +394,12 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"fuchsia_remote_debug_protocol": {
|
||||
"dependency": "transitive",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"get": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -498,6 +510,12 @@
|
||||
"source": "hosted",
|
||||
"version": "4.1.2"
|
||||
},
|
||||
"integration_test": {
|
||||
"dependency": "direct dev",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"intl": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -642,11 +660,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
|
||||
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.17.0"
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -798,6 +816,16 @@
|
||||
"source": "hosted",
|
||||
"version": "6.0.3"
|
||||
},
|
||||
"process": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "process",
|
||||
"sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.5"
|
||||
},
|
||||
"protocol_handler": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -924,6 +952,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"sync_http": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sync_http",
|
||||
"sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.3.1"
|
||||
},
|
||||
"syncfusion_flutter_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1028,11 +1066,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
|
||||
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.7"
|
||||
"version": "0.7.6"
|
||||
},
|
||||
"tuple": {
|
||||
"dependency": "transitive",
|
||||
@@ -1244,6 +1282,16 @@
|
||||
"source": "hosted",
|
||||
"version": "3.0.3"
|
||||
},
|
||||
"webdriver": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "webdriver",
|
||||
"sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"win32": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
|
||||
@@ -81,7 +81,7 @@ in
|
||||
hash = "sha256-ziXSYQpflSKsj1P7t7goC1wCGZHpvZE3BoycYp2f+1Y=";
|
||||
};
|
||||
php85 = mkPhp {
|
||||
version = "8.5.4";
|
||||
hash = "sha256-KskpopprfvS4rOyYGkF7kb339Uj1l99mXMVqueqV/HU=";
|
||||
version = "8.5.5";
|
||||
hash = "sha256-7iYr7/YcQxll0flxkoVLNiCK3qw4mDw0mLs1AK6HKDw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ in
|
||||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.52.1";
|
||||
version = "2.52.2";
|
||||
name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
|
||||
|
||||
outputs = [
|
||||
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-I459UyBbFABK3X7rQpPJTW+/cJez7+987lUZ5cEhqQQ=";
|
||||
hash = "sha256-Bd4rRIdLotraV1X4mM+1N4PDFz+RtGNo+i3MxYSXKrs=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
@@ -118,12 +118,11 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
name = "fix_ftbfs_riscv64.patch";
|
||||
})
|
||||
|
||||
# Fix webkitgtk_4_1 build
|
||||
# WebKitDOMDOMWindow.cpp:1085:10: error: variable has incomplete type 'void'
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=310915
|
||||
# Fix FTBFS on platforms that don't use Skia
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=312160
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/40c315ca7b3ad6ae5c98d72a6927b3a75b43cb46.patch";
|
||||
hash = "sha256-xGPi5p2XhDxpd4NtZMrd1JbHvV2fey6V3eH0fgy6ifY=";
|
||||
url = "https://github.com/WebKit/WebKit/commit/36df921c686c07f2b20e3eed20afad5471b96897.patch";
|
||||
hash = "sha256-iYOs1V/p02XHtytw+r1+TyW08pk6PgUH76U1fXG8w34=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -1,74 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
ocaml,
|
||||
findlib,
|
||||
ocamlbuild,
|
||||
camlp-streams,
|
||||
buildDunePackage,
|
||||
ctypes,
|
||||
mariadb,
|
||||
libmysqlclient,
|
||||
dune-configurator,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-mariadb";
|
||||
version = "1.1.6";
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "mariadb";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
|
||||
sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
|
||||
url = "https://github.com/ocaml-community/ocaml-mariadb/releases/download/${finalAttrs.version}/mariadb-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-mYktFTUDaA///SzTMgQDNXtYiXxnkMrf4EujijpmjMY=";
|
||||
};
|
||||
|
||||
patches =
|
||||
lib.lists.map
|
||||
(
|
||||
x:
|
||||
fetchpatch {
|
||||
url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch";
|
||||
inherit (x) hash;
|
||||
}
|
||||
)
|
||||
[
|
||||
{
|
||||
path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5";
|
||||
hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
|
||||
}
|
||||
{
|
||||
path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581";
|
||||
hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg=";
|
||||
}
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.ml --replace '#use "topfind"' \
|
||||
'#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
ocamlbuild
|
||||
];
|
||||
buildInputs = [
|
||||
mariadb
|
||||
libmysqlclient
|
||||
camlp-streams
|
||||
ocamlbuild
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ ctypes ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
|
||||
|
||||
meta = {
|
||||
description = "OCaml bindings for MariaDB";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcc32 ];
|
||||
homepage = "https://github.com/andrenth/ocaml-mariadb";
|
||||
inherit (ocaml.meta) platforms;
|
||||
broken = !(lib.versionAtLeast ocaml.version "4.07");
|
||||
homepage = "https://github.com/ocaml-community/ocaml-mariadb";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
31
pkgs/development/ocaml-modules/yamlx/default.nix
Normal file
31
pkgs/development/ocaml-modules/yamlx/default.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchurl,
|
||||
ppx_deriving,
|
||||
testo,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "yamlx";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mjambon/yamlx/releases/download/${finalAttrs.version}/yamlx-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-Ihar37R1dUFMXSgNGEJu5z6ysFMcrg1Hd74hNLletwE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ppx_deriving ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ testo ];
|
||||
|
||||
minimalOCamlVersion = "4.14";
|
||||
|
||||
meta = {
|
||||
description = "Pure-OCaml YAML 1.2 parser with a lossless, comment-preserving AST";
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
license = lib.licenses.agpl3Only;
|
||||
homepage = "https://github.com/mjambon/yamlx";
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "audio";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnu-octave";
|
||||
repo = "octave-audio";
|
||||
tag = "release-${version}";
|
||||
sha256 = "sha256-v7FKj9GSlX86zpOcw1xKxy150ivUxpjU/rvg+3OGs2s=";
|
||||
sha256 = "sha256-Qy9It6IiLJTvTlet3L/EP7qL58U0AUKHilmSKa2nATU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "datatypes";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pr0m1th3as";
|
||||
repo = "datatypes";
|
||||
tag = "release-${version}";
|
||||
sha256 = "sha256-0RhZm/UzICbAAn1uCSQSgq8+6GnOuTB6TD9NoIEdvXA=";
|
||||
sha256 = "sha256-qgFYyRMrdWhbHBvOEsDAetpllr5yyhtoEB+7Ri6zbSI=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
|
||||
|
||||
@@ -3,31 +3,44 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gdcm,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "dicom";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnu-octave";
|
||||
repo = "octave-dicom";
|
||||
tag = "release-${version}";
|
||||
sha256 = "sha256-NNdcnIeHXDRmZZp0WvwGtfMJ4BSR6+aK6FVS0BG51U8=";
|
||||
sha256 = "sha256-6FcHxNUOTvSzYqknD89G3IyKVQs/dH+heoA/5Sx4lyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
cmake
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gdcm
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
preAutoreconf = ''
|
||||
pushd src
|
||||
# Removed these so autoreconf actually fires for our environment.
|
||||
rm config.*
|
||||
'';
|
||||
postAutoreconf = ''
|
||||
popd
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -62,14 +62,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gftools";
|
||||
version = "0.9.994";
|
||||
version = "0.9.995";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "gftools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9JTYmInM9kCZHjZQxtvs+qDwmrgJVUmJ+XAp3afIAYQ=";
|
||||
hash = "sha256-XnlA5u6GP8K+xxazfxMrh16Utxs9uhfxoZFV81yFOfA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "jupyter-ydoc";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "jupyter_ydoc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-k6qrkXnrz6gunqh6bx5/fLLfBBQOYJVOnJifP3aRmLI=";
|
||||
hash = "sha256-HlYSPlYiHyVwJhsRY10SgotKa9ejlj0hlxbS+chtaBI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,18 +2,23 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
wheel,
|
||||
torch,
|
||||
iopath,
|
||||
cudaPackages,
|
||||
|
||||
# build-system
|
||||
ninja,
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
iopath,
|
||||
torch,
|
||||
|
||||
config,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
}:
|
||||
|
||||
assert cudaSupport -> torch.cudaSupport;
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "pytorch3d";
|
||||
version = "0.7.9";
|
||||
pyproject = true;
|
||||
@@ -21,20 +26,27 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "pytorch3d";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-k+hqAy0T5ZReJ8jWuKJ/VTzjqd4qo8rrcFo8y4LJhhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
|
||||
nativeBuildInputs = lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
build-system = [
|
||||
ninja
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
dependencies = [
|
||||
torch
|
||||
iopath
|
||||
];
|
||||
buildInputs = [ (lib.getOutput "cxxdev" torch) ];
|
||||
|
||||
dependencies = [
|
||||
iopath
|
||||
torch
|
||||
];
|
||||
buildInputs = [
|
||||
(lib.getOutput "cxxdev" torch)
|
||||
];
|
||||
|
||||
env = {
|
||||
FORCE_CUDA = cudaSupport;
|
||||
@@ -43,6 +55,10 @@ buildPythonPackage rec {
|
||||
TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
export MAX_JOBS=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pytorch3d" ];
|
||||
|
||||
passthru.tests.rotations-cuda =
|
||||
@@ -61,10 +77,11 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "FAIR's library of reusable components for deep learning with 3D data";
|
||||
homepage = "https://github.com/facebookresearch/pytorch3d";
|
||||
changelog = "https://github.com/facebookresearch/pytorch3d/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
pbsds
|
||||
SomeoneSerge
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2285,6 +2285,8 @@ let
|
||||
|
||||
yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { };
|
||||
|
||||
yamlx = callPackage ../development/ocaml-modules/yamlx { };
|
||||
|
||||
yojson = callPackage ../development/ocaml-modules/yojson { };
|
||||
|
||||
yojson_2 = yojson.overrideAttrs (_: {
|
||||
|
||||
@@ -250,6 +250,7 @@ in
|
||||
loongarch64-linux = mapTestOnCross systems.examples.loongarch64-linux linuxCommon;
|
||||
|
||||
m68k = mapTestOnCross systems.examples.m68k linuxCommon;
|
||||
arc = mapTestOnCross systems.examples.arc linuxCommon;
|
||||
s390x = mapTestOnCross systems.examples.s390x linuxCommon;
|
||||
|
||||
# (Cross-compiled) Linux on x86
|
||||
|
||||
Reference in New Issue
Block a user