Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -1974,6 +1974,11 @@
|
||||
githubId = 13426784;
|
||||
name = "arcnmx";
|
||||
};
|
||||
arcstur = {
|
||||
github = "arcstur";
|
||||
githubId = 24514392;
|
||||
name = "arcstur";
|
||||
};
|
||||
arcticlimer = {
|
||||
email = "vinigm.nho@gmail.com";
|
||||
github = "viniciusmuller";
|
||||
|
||||
@@ -349,7 +349,6 @@ in
|
||||
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
|
||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
add_header X-XSS-Protection "1; mode=block" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
add_header Referrer-Policy "same-origin" always;
|
||||
'';
|
||||
|
||||
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-HXyY96fP9WjGWIe6ggQvygBnTEKRLUb5Qy18Vbjn160=";
|
||||
hash = "sha256-xk2maMEa07yFPbLiDGc9N6AbzxjTyfVNy/k7wWSMOHE=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-2b04CLmbOxXsTzheEUacqZuBtA/rSZqRMLor0lT2gsU=";
|
||||
hash = "sha256-vcN419nPIrFOT8EaznFzThst6exfMGRrcmxyuQttxXg=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-/eKZ3bkZ2jFr8cTpNLO6t8wsRfLyhLkQHMrkTWtCWb8=";
|
||||
hash = "sha256-WoBfg35mGTIA8YZEk67iYNinF+Q/XEatiVr6x1HdvBk=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-JRVrV2yYSfuwuBcM2MDJZz5vNRYHG4n6I/GozgdDOgk=";
|
||||
hash = "sha256-e75eRgs0FTBnwFbH1vFxFc+aLK+O9TdxgXbV5YnsQLE=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "continue";
|
||||
publisher = "Continue";
|
||||
version = "1.1.76";
|
||||
version = "1.2.2";
|
||||
}
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
@@ -1123,8 +1123,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-database-client2";
|
||||
publisher = "cweijan";
|
||||
version = "8.3.9";
|
||||
hash = "sha256-HryTXKCBF7i9zV3JELAM+NF3JW97XWCoSqTRPNr8yjQ=";
|
||||
version = "8.4.0";
|
||||
hash = "sha256-ly54itCpVdirU6GmK2GM7A749wt2SbHR/TidutTwCUE=";
|
||||
};
|
||||
meta = {
|
||||
description = "Database Client For Visual Studio Code";
|
||||
|
||||
@@ -41,7 +41,6 @@ lib:
|
||||
ethtool,
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
findutils,
|
||||
@@ -55,7 +54,7 @@ lib:
|
||||
kmod,
|
||||
lib,
|
||||
libseccomp,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
nixosTests,
|
||||
overrideBundleAttrs ? { }, # An attrSet/function to override the `k3sBundle` derivation.
|
||||
overrideCniPluginsAttrs ? { }, # An attrSet/function to override the `k3sCNIPlugins` derivation.
|
||||
@@ -69,10 +68,11 @@ lib:
|
||||
socat,
|
||||
sqlite,
|
||||
stdenv,
|
||||
systemd,
|
||||
systemdMinimal,
|
||||
util-linuxMinimal,
|
||||
yq-go,
|
||||
zstd,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
# k3s is a kinda weird derivation. One of the main points of k3s is the
|
||||
@@ -328,7 +328,7 @@ let
|
||||
}).overrideAttrs
|
||||
overrideContainerdAttrs;
|
||||
in
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k3s";
|
||||
version = k3sVersion;
|
||||
pos = builtins.unsafeGetAttrPos "k3sVersion" attrs;
|
||||
@@ -345,15 +345,13 @@ buildGoModule rec {
|
||||
# Nix prefers dynamically linked binaries over static binary.
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"$LDFLAGS $STATIC" -o' \
|
||||
'"$LDFLAGS" -o' \
|
||||
--replace "STATIC=\"-extldflags \'-static\'\"" \
|
||||
""
|
||||
--replace-fail '"$LDFLAGS $STATIC" -o' \
|
||||
'"$LDFLAGS" -o'
|
||||
|
||||
# Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate':
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"''${GO}" generate' \
|
||||
--replace-fail '"''${GO}" generate' \
|
||||
'GOFLAGS="" \
|
||||
GOOS="${pkgsBuildBuild.go.GOOS}" \
|
||||
GOARCH="${pkgsBuildBuild.go.GOARCH}" \
|
||||
@@ -381,7 +379,7 @@ buildGoModule rec {
|
||||
|
||||
k3sKillallDeps = [
|
||||
bash
|
||||
systemd
|
||||
systemdMinimal
|
||||
procps
|
||||
coreutils
|
||||
gnugrep
|
||||
@@ -389,10 +387,10 @@ buildGoModule rec {
|
||||
gnused
|
||||
];
|
||||
|
||||
buildInputs = k3sRuntimeDeps;
|
||||
buildInputs = finalAttrs.k3sRuntimeDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
makeBinaryWrapper
|
||||
rsync
|
||||
yq-go
|
||||
zstd
|
||||
@@ -439,23 +437,20 @@ buildGoModule rec {
|
||||
# wildcard to match the arm64 build too
|
||||
install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s
|
||||
wrapProgram $out/bin/k3s \
|
||||
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
|
||||
--prefix PATH : ${lib.makeBinPath finalAttrs.k3sRuntimeDeps} \
|
||||
--prefix PATH : "$out/bin"
|
||||
ln -s $out/bin/k3s $out/bin/kubectl
|
||||
ln -s $out/bin/k3s $out/bin/crictl
|
||||
ln -s $out/bin/k3s $out/bin/ctr
|
||||
install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh
|
||||
wrapProgram $out/bin/k3s-killall.sh \
|
||||
--prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)}
|
||||
--prefix PATH : ${lib.makeBinPath (finalAttrs.k3sRuntimeDeps ++ finalAttrs.k3sKillallDeps)}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
inherit airgap-images;
|
||||
@@ -464,13 +459,16 @@ buildGoModule rec {
|
||||
k3sRepo = k3sRepo;
|
||||
k3sRoot = k3sRoot;
|
||||
k3sBundle = k3sBundle;
|
||||
mkTests =
|
||||
version:
|
||||
tests =
|
||||
let
|
||||
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
|
||||
mkTests =
|
||||
version:
|
||||
let
|
||||
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
|
||||
in
|
||||
lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
|
||||
in
|
||||
lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
|
||||
tests = passthru.mkTests k3sVersion;
|
||||
mkTests k3sVersion;
|
||||
updateScript = updateScript;
|
||||
imagesList = throw "k3s.imagesList was removed";
|
||||
airgapImages = throw "k3s.airgapImages was renamed to k3s.airgap-images";
|
||||
@@ -481,4 +479,4 @@ buildGoModule rec {
|
||||
// (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
})
|
||||
|
||||
@@ -261,13 +261,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-v+hbbmGAbCY+DlgQPzZmiknQ/88icn6ja6UIecoMDbU=",
|
||||
"hash": "sha256-j1zPlyljBpBgOxFA2hOQAvPAl9sR5UpN899kshXf4GA=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.35.1",
|
||||
"rev": "v1.36.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q="
|
||||
"vendorHash": "sha256-O/MSx6iZ0SkCsMLKMr1cetkPaePoVq62UTOhiPTzF6g="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-EsbktS0pP+tJtIPHckMmgdeIBLyL9T+lVyoDzJAzi98=",
|
||||
@@ -534,13 +534,13 @@
|
||||
"vendorHash": "sha256-KWXHXLIt0fI9k3XRhch8VLLnVXwkSH2uUS5APfCcNdI="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-lmn6hHVJ65Q65bATLV8XeyGOh9lsMcOprJt7vbGBCeE=",
|
||||
"hash": "sha256-l08jmxkWsTrk32cJM28OuwSZgSKIB3EPODaUf7821uY=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.0.1",
|
||||
"rev": "v7.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-l5UkyXzoy3lY5bAus6pHnYKa6QniebN6nmQ5gANxr/Y="
|
||||
"vendorHash": "sha256-9tXElUSD6WSfEn6Urt0GZFkxGXj/iUO83ZkKw3GfAgo="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
||||
+2
-2
@@ -42,14 +42,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "6.1.1";
|
||||
version = "6.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gCakI7r0xyJt8rGtaz6vXuG022alezcipNIkyzZEvoA=";
|
||||
hash = "sha256-ElbKzv+QMqH62BGAvNjDDNp7NSJYIEvoDzxKCbEdwqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.9.3";
|
||||
version = "3.9.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrefine";
|
||||
repo = "openrefine";
|
||||
rev = version;
|
||||
hash = "sha256-wV5ur31JEGcMSLRHQq/H6GlsdpEzTH6ZxBkE9Sj6TkU=";
|
||||
hash = "sha256-548vOJf0mlk1AuuMjEXpsiVjft6UbJrUxh5mSca8Xbw=";
|
||||
};
|
||||
|
||||
npmPkg = buildNpmPackage {
|
||||
@@ -55,7 +55,7 @@ maven.buildMavenPackage {
|
||||
|
||||
mvnJdk = jdk;
|
||||
mvnParameters = "-pl !packaging";
|
||||
mvnHash = "sha256-pAL+Zhm0qnE1vEvivlXt2cIzIoPFoge5CRrsbfIoGNs=";
|
||||
mvnHash = "sha256-SV5nfyUeyRul/YfZZXor8O37ARdCtKkrHCLzQrmr96s=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -122,7 +122,10 @@ maven.buildMavenPackage {
|
||||
description = "Power tool for working with messy data and improving it";
|
||||
homepage = "https://openrefine.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
maintainers = with maintainers; [
|
||||
ris
|
||||
arcstur
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # maven dependencies
|
||||
|
||||
@@ -191,7 +191,7 @@ let
|
||||
outputHash = "";
|
||||
}
|
||||
else
|
||||
throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty urls_}";
|
||||
throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}";
|
||||
|
||||
resolvedUrl =
|
||||
let
|
||||
|
||||
@@ -330,9 +330,9 @@ rec {
|
||||
writeBash =
|
||||
name: argsOrScript:
|
||||
if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
|
||||
makeScriptWriter (argsOrScript // { interpreter = "${lib.getExe pkgs.bash}"; }) name
|
||||
makeScriptWriter (argsOrScript // { interpreter = "${lib.getExe pkgs.bashNonInteractive}"; }) name
|
||||
else
|
||||
makeScriptWriter { interpreter = "${lib.getExe pkgs.bash}"; } name argsOrScript;
|
||||
makeScriptWriter { interpreter = "${lib.getExe pkgs.bashNonInteractive}"; } name argsOrScript;
|
||||
|
||||
/**
|
||||
Like writeScriptBin but the first line is a shebang to bash
|
||||
|
||||
@@ -15,13 +15,13 @@ telegram-desktop.override {
|
||||
inherit withWebkit;
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
|
||||
pname = "64gram-unwrapped";
|
||||
version = "1.1.77";
|
||||
version = "1.1.78";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
repo = "tdesktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qpL/OCcFi9WRfFhfDLbaHzybTBG5WmcV1I+jsFJISYM=";
|
||||
hash = "sha256-3iMDkosa19iVd3b1dS+xONZZokFnvjuehHFN05NsCTY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "0.30.6";
|
||||
version = "0.30.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xzXx+pe1WUe0Bxlig04fwgXF/ewKaehezQk4npJ/zic=";
|
||||
hash = "sha256-oJ/Tg/9ou1VFL2jILLDJF4kKbNPqCPHwriW6D63MD5M=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-snyfsRyNOx6bsz506Nde2ofcBgVQOlNvYGuwFoHKOzI=";
|
||||
vendorHash = "sha256-rdHpv4al6Hc9q1atE9xLDOiJTV97G0L3wgUHbNhzdms=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "apl386";
|
||||
version = "0-unstable-2024-01-10";
|
||||
version = "0-unstable-2025-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abrudz";
|
||||
repo = "APL386";
|
||||
rev = "43ebc6349506b0e7ab5c49f6b08f8afe66c4d9c5";
|
||||
hash = "sha256-MLHSYHFyI9eKdrE/yM7u4vu4Dz6riEk7XQTUuAXPfzM=";
|
||||
rev = "c5bca014b6610ee170985c3ce32a8bb14dbd7b94";
|
||||
hash = "sha256-5aiydx8TyJG0H0F261Xg5fGWBbAIZCtVHgWs7B6+83w=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "astroterm";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "da-luce";
|
||||
repo = "astroterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XSJq2M+rOZf18ueF1jjApOR140mkMZOm/IFzA7M5x4M=";
|
||||
hash = "sha256-3UXFB4NNKn2w1dYlQzhFyxWwa7/1qkCXPNdBqHK+eQ8=";
|
||||
};
|
||||
|
||||
bsc5File = fetchurl {
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
stdenv,
|
||||
lib,
|
||||
makeBinaryWrapper,
|
||||
runtimeShell,
|
||||
fetchurl,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -10,11 +9,18 @@
|
||||
jdk23,
|
||||
dpkg,
|
||||
writeShellScript,
|
||||
bash,
|
||||
tor,
|
||||
zip,
|
||||
gnupg,
|
||||
coreutils,
|
||||
|
||||
# Used by the bundled webcam-app
|
||||
libv4l,
|
||||
|
||||
# Used by the testing package bisq2-webcam-app
|
||||
callPackage,
|
||||
socat,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -44,8 +50,18 @@ let
|
||||
hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
|
||||
};
|
||||
};
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
coreutils
|
||||
tor
|
||||
];
|
||||
|
||||
libraryPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
libv4l
|
||||
];
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
inherit version;
|
||||
|
||||
pname = "bisq2";
|
||||
@@ -137,21 +153,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
install -D -m 777 ${bisq-launcher ""} $out/bin/bisq2
|
||||
substituteAllInPlace $out/bin/bisq2
|
||||
wrapProgram $out/bin/bisq2 --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
tor
|
||||
]
|
||||
}
|
||||
wrapProgram $out/bin/bisq2 --prefix PATH : ${binPath} --prefix LD_LIBRARY_PATH : ${libraryPath}
|
||||
|
||||
install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq2-hidpi
|
||||
substituteAllInPlace $out/bin/bisq2-hidpi
|
||||
wrapProgram $out/bin/bisq2-hidpi --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
tor
|
||||
]
|
||||
}
|
||||
wrapProgram $out/bin/bisq2-hidpi --prefix PATH : ${binPath} --prefix LD_LIBRARY_PATH : ${libraryPath}
|
||||
|
||||
for n in 16 24 32 48 64 96 128 256; do
|
||||
size=$n"x"$n
|
||||
@@ -162,6 +168,15 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# The bisq2.webcam-app package is for maintainers to test scanning QR codes.
|
||||
passthru.webcam-app = callPackage ./webcam-app.nix {
|
||||
inherit
|
||||
jdk
|
||||
libraryPath
|
||||
;
|
||||
bisq2 = finalAttrs.finalPackage.out;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Decentralized bitcoin exchange network";
|
||||
homepage = "https://bisq.network";
|
||||
@@ -176,4 +191,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
# bisq2 contains a separate Java app which is used to scan Bitcoin Lightning QR codes.
|
||||
# bisq2 communicates with the webcam app via a local TCP connection using a simple one-way protocol.
|
||||
# Since the webcam app dynamically loads native code, this package is for maintainers to test QR code scanning without having to spend bitcoin to execute a trade.
|
||||
# This package is exposed as an attribute of the bisq2 package; bisq2.webcam-app.
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
makeBinaryWrapper,
|
||||
jdk,
|
||||
writeShellScript,
|
||||
unzip,
|
||||
bisq2,
|
||||
socat,
|
||||
libraryPath,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.0.0";
|
||||
|
||||
launcher = writeShellScript "bisq2-webcam-app-launcher" ''
|
||||
${socat}/bin/socat TCP-LISTEN:8000,keepalive,fork STDIO &
|
||||
socat_pid=$!
|
||||
LD_LIBRARY_PATH=${libraryPath} "${lib.getExe jdk}" -classpath @out@/lib/app/webcam-app-${version}-all.jar:${bisq2}/lib/app/* bisq.webcam.WebcamAppLauncher "$@"
|
||||
kill $socat_pid
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
pname = "bisq2-webcam-app";
|
||||
src = bisq2;
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
# Extract the webcam app from Bisq2.
|
||||
|
||||
unzip ${bisq2}/lib/app/desktop.jar 'webcam-app/*'
|
||||
unzip webcam-app/webcam-app-1.0.0.zip
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/app $out/bin
|
||||
cp webcam-app-${version}-all.jar $out/lib/app/
|
||||
install -D -m 777 ${launcher} $out/bin/bisq2-webcam-app
|
||||
substituteAllInPlace $out/bin/bisq2-webcam-app
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bngblaster";
|
||||
version = "0.9.23";
|
||||
version = "0.9.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtbrick";
|
||||
repo = "bngblaster";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qo48OW02IMAAxMYTYguv5jKvy/GPq1WKgcluSrMIt2E=";
|
||||
hash = "sha256-flPMDpAEAICLR9TYz0vD62e26pJH2p/3u20sOEuKNx4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "butane";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "butane";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xb5CDuwGpYJgnG0KzlvkzTyeqo1d2fUcXh0a2hbCEd0=";
|
||||
hash = "sha256-A6B7p2Db+7xlNIeiZYV53yiwcq6oaTv0CKGZNkkWcxU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-dist";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axodotdev";
|
||||
repo = "cargo-dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J4zAjbyHHLxdObos/drDH5sDVmQE8h1WFqmfG8ac3uQ=";
|
||||
hash = "sha256-+Nzli2SDzG+CBNSZ5z2mAuucS2a3WS7HqtUJs2JxIbo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aPI8NtcLnLrQ0AC2E09QtH5RfXJ8cBtBrVfB3AwbgKc=";
|
||||
cargoHash = "sha256-QjWBuI3hZkDNqyCNfFpz6qvZUYHEKRQZ4gbZGxkMaiw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "castxml";
|
||||
version = "0.6.11";
|
||||
version = "0.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CastXML";
|
||||
repo = "CastXML";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qT7uIZU6DoEQqqhaHEPzPUAFF+KCT4Ybtl8zk495Jko=";
|
||||
hash = "sha256-81I+Uh2HrEenp9iAW+TO+MUyXhXRMVDI+BZuVA4C/pE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ];
|
||||
|
||||
@@ -16,16 +16,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "centrifugo";
|
||||
version = "6.2.4";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GjL5zGyAv127IFs4/ytEUFU65mz7rR/fQ5nHX2qtTdE=";
|
||||
hash = "sha256-BXZaiIR4+nF17aoiT35IW+GBIQSOplAMd8Kp1dLnT74=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GpCZIZCUjfL/atDOM4FKjlloFWtkAoK+dS73K7b0YfA=";
|
||||
vendorHash = "sha256-WK9p648fqNEpk9TmuDwSukKodGEOKd7DgulktRjZfLk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddnet";
|
||||
version = "19.3";
|
||||
version = "19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddnet";
|
||||
repo = "ddnet";
|
||||
tag = version;
|
||||
hash = "sha256-8mCkzZPdLFGIlOkMiNDOxiQeEHa+k0BX9PMIPbjmW5k=";
|
||||
hash = "sha256-x/QHTjtFX2j3CA9YAg7c09WTRnW0Y+1keu52RMLSSoA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dokuwiki";
|
||||
version = "2025-05-14a";
|
||||
version = "2025-05-14b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dokuwiki";
|
||||
repo = "dokuwiki";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-kgoBwxmc5LKKup6+UQ96lbrMTbtNAwFE5wLxyw3+cEg=";
|
||||
sha256 = "sha256-J7B+mvvGtAPK+WjlkHyadG61vli+zZfozfEmEynYQaE=";
|
||||
};
|
||||
|
||||
preload = writeText "preload.php" ''
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.2.3";
|
||||
version = "11.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WGto21WkPkSytiYuEmx/C9wUMwKebO9kJTAR7m8GNWA=";
|
||||
hash = "sha256-5uzq7zQHWJGi+YU9diRNSlSHIguypTXgOmtgAbF5TBU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WP1LCvN54mfLGOAJRKCPBV09MkWkKOow+LofpxiwI58=";
|
||||
vendorHash = "sha256-7jZRZ2qlQ7V5Y+aHScR31rahfoYF0p2yiiFiFHgDqa0=";
|
||||
composerNoPlugins = false;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fstl";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "fstl-app";
|
||||
repo = "fstl";
|
||||
rev = "v" + version;
|
||||
hash = "sha256-6V1L5aUZQl4zAkXD7yY8Ap0+QXgogQNxaTyZAxHFqM4=";
|
||||
hash = "sha256-puDYXANiyTluSlmnT+gnNPA5eCcw0Ny6md6Ock6pqLc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gale";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kesomannen";
|
||||
repo = "gale";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LdMuAQ7eTPiEZRxxjGdycrI53JwJQ3grK5QORPhfo50=";
|
||||
hash = "sha256-zgwxr04MGs8EqrZBY5y8F1GNiaJbJUvpND52oLXtCrk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-0wWU9Tf5NlYXrflIDghEwyjeR8j96CK0TATU1tWO418=";
|
||||
cargoHash = "sha256-+ZZwYpYvIYmZFg9PA7kD/mBU1TrpEQIsoMmHSWyX+Xc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.78.0";
|
||||
version = "2.79.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hrOyXAyWfJPNRKYPBsE1yaBdyvI4q9rJW2XgtBeZv20=";
|
||||
hash = "sha256-ACnRcuHbIsG43bXqqpxPMA1BcFb9TckfiLNJeyxAwkk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2wOh1Jw+dVBD7omzDzWPwDFJ9jHqSG/3+fd4e/1zVIk=";
|
||||
vendorHash = "sha256-+O+cTsm9HzAJKDoNMMtcXr6iwRsqFtRLu0VTLe5/rSA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.25.1";
|
||||
version = "2.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r8BCzQUO72d0FMw8gVjFVhiU5Ch/or4B7L6sxDADKQ4=";
|
||||
sha256 = "sha256-I+Px9nTp+uBsmC575yHTetsJjMI+CJvckMJ/y4R0g78=";
|
||||
};
|
||||
vendorHash = "sha256-dpTueiGR0sibaTnVJxHLTTK7cp8MbAO992qIsXBKufM=";
|
||||
vendorHash = "sha256-Jbu0XKAcNca/Y60msRkQ6wsd+TDYwjl6cCAWS+2Q+HE=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomtree";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vbatts";
|
||||
repo = "go-mtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MDX16z4H1fyuV5atEsZHReJyvC+MRdeA54DORCFtpqI=";
|
||||
hash = "sha256-SCjmyvZZGI/vQg2Ok4vw6v4Om8pNgdWDBwWVB/LIKaA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hcxdumptool";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZerBea";
|
||||
repo = "hcxdumptool";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-emSIUSE8r0PX1qhkuIQcyh9+rBB+jBA6pmt+n4WugWk=";
|
||||
hash = "sha256-ABbhhojg4PJlK7xwPW8m7ExQym6hrZmKBsqxnGrjA8A=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprland-per-window-layout";
|
||||
version = "2.16";
|
||||
version = "2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coffebar";
|
||||
repo = "hyprland-per-window-layout";
|
||||
rev = version;
|
||||
hash = "sha256-+1gmLNWuV5DhXjC6aRD1rHIOpX+OCX1Ak45pi+ixIFw=";
|
||||
hash = "sha256-wn1xFLi7CYb9A8fR0MaGYrOeIYuF8PCxbGcyQx33H6Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k8YNGqKw5MPHdXye8loqGkexY75jjkJSnzaWmye945I=";
|
||||
cargoHash = "sha256-67ewLuhAVaZbUuAwWDZE51dS4T3EkWfYxS40IbvupiM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Per window keyboard layout (language) for Hyprland wayland compositor";
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "JuliaMono-ttf";
|
||||
version = "0.060";
|
||||
version = "0.061";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz";
|
||||
stripRoot = false;
|
||||
hash = "sha256-PmMGro8K4OwtKBIBhe/RKpi+MveSfhpQsiJfF+iUBzI=";
|
||||
hash = "sha256-3DSjrTipIwP6HJF+flGCY9ArhWMJv6piBiiExRP6c7I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kaitai-struct-compiler";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip";
|
||||
sha256 = "sha256-oY1OiEq619kLmQPMRQ4sjuBnTXgJ2WfvsEj1JrxUGPA=";
|
||||
sha256 = "sha256-j9TEilijqgIiD0GbJfGKkU1FLio9aTopIi1v8QT1b+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -15,12 +15,12 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = extraCommandLineArgs;
|
||||
|
||||
version = "0.2.13";
|
||||
version = "0.2.38";
|
||||
pname = "kiro";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
# workbench.action.showAboutDialog (Help: About)
|
||||
vscodeVersion = "1.94.0";
|
||||
vscodeVersion = "1.100.3";
|
||||
|
||||
executableName = "kiro";
|
||||
longName = "Kiro";
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202508150626--distro-linux-x64-tar-gz/202508150626-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-ORgN7gOyHGkO/ewqy62H0oNweZz7ViUAuEtXM1WgYIE="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213--distro-linux-x64-tar-gz/202509032213-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-nqOtD7Ef7dLYHzAM2jTybV/paUPjPYBJpa2AM0lnyIE="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202508150626-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-8lIiMfDxp8VuRG/tiuojtOksc6oGT0+ZPpSAriRmKYU="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-IdLKALVT5yj6oTJnOnqAqMzN29ZzI2XFMm61YwwaT/Q="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202508150626-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-2WGLIspDErwa1CZmSTTFa4aNCi6T/8x3vDNalNsm4xQ="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-bqBNm0O6jZS5R+xyuxRys1Sgw3e6QiyHDJ3BKC8UzIo="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "labelle";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labelle-org";
|
||||
repo = "labelle";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WrY8kDOZ4I1GPCpXvN4bapbJsIIsYzq0LT7jNaQyzXw=";
|
||||
hash = "sha256-p+V6ihFDxhG7t4LiwTJVfJTk6rxJxGHqxTdplbLZR2Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyssh";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Adembc";
|
||||
repo = "lazyssh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0R/H+HaJ13dQhLbFgLAvv4MhXADT3UqWeyTgegKjFxM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/RgjcAy2H9sWMWDA3QxMkT4LkzxvZqOZzKeR9u9bsH0=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
"-X=main.gitCommit=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/lazyssh
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Terminal-based SSH manager";
|
||||
homepage = "https://github.com/Adembc/lazyssh";
|
||||
changelog = "https://github.com/Adembc/lazyssh/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ kpbaks ];
|
||||
mainProgram = "lazyssh";
|
||||
};
|
||||
})
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/V694xQAsZpag54Q/FWeW4yWHadz33XqBIFk0K/G98w=";
|
||||
hash = "sha256-kQw4s9EPKSaVPJRSiMXcW0KNUaXGaYrio/3z3ud0lLA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" ];
|
||||
|
||||
cargoHash = "sha256-jgRSBnmrS25qOXkpR4ieBlfUt1LfPdhEOHpePQUVxcI=";
|
||||
cargoHash = "sha256-urw26D0aKXvW98LjrK9rYEeMsv4L6qVSlGaNptFw5M0=";
|
||||
|
||||
# maa-cli would only search libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
|
||||
@@ -29,6 +29,11 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-qpgDErV1VVzaUHHQX4ReXCPihdrSKI/4HtbDeQIblR8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3"
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
poetry-core
|
||||
setuptools-rust
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2025-07-21T05-28-08Z";
|
||||
version = "2025-08-13T08-35-41Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-qKlUWppr2zuFkMFoqo1x7xB6PnRYXnkN+31xZKlvuho=";
|
||||
hash = "sha256-X4SNccBm+Fr1wiiElDFCCXwcPc6xVTGx+xIBL2nsbnE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0ERiUx114EyoooPIVMCjiDkPb4/D0ZC/YuG14+30NPw=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mtail";
|
||||
version = "3.2.12";
|
||||
version = "3.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G2yDTIAz39PwmJkHHMZDKfocmJgio8sArxkQwMCOdf8=";
|
||||
hash = "sha256-LGfRIjTPt5gwn7yjkoYWj/GbWkMnX+zFPyV3bq85/30=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+Ym+vn7yHUSS7So7m53cCUNSmznwgyvg+Xj4nKUbD7U=";
|
||||
vendorHash = "sha256-w5upL0GAtphsFMm+JlGHNri5PX6hVTw0W9f3wbEL2OA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gotools # goyacc
|
||||
|
||||
@@ -25,15 +25,15 @@
|
||||
writeScript,
|
||||
}:
|
||||
let
|
||||
id = "243289393";
|
||||
id = "289869947";
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "multiviewer-for-f1";
|
||||
version = "1.43.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
|
||||
sha256 = "sha256-wdA5f/80GkKP6LrrP2E6M9GY5bl6rg7Spz7NWB7cQjg=";
|
||||
url = "https://releases.multiviewer.dev/download/${id}/multiviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-H+tt2FiT1UxkWBxpuyOIUjRMOMl7kN/SFH/WqoRdVUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -83,13 +83,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share
|
||||
mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1
|
||||
mv -t $out/share usr/share/* usr/lib/multiviewer
|
||||
|
||||
makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \
|
||||
makeWrapper "$out/share/multiviewer/multiviewer" $out/bin/multiviewer \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [ libudev0-shim ]
|
||||
}:\"$out/share/Multiviewer for F1\""
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/multiviewer\""
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -125,6 +123,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ babeuh ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "multiviewer-for-f1";
|
||||
mainProgram = "multiviewer";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
|
||||
version = "1.2.0-unstable-2024-11-02";
|
||||
version = "1.2.0-unstable-2025-09-06";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "network-manager-iodine";
|
||||
rev = "dd633f80913ae637d6f496bae1b7bac8c297860c";
|
||||
sha256 = "sAndI8jjCcRENDGz4V3AKswybzC8PDzYPaEN1mLcti8=";
|
||||
rev = "2a630d5c492521378160882864eb88277f6315cb";
|
||||
sha256 = "vSvvJVWtV+BHM3rDtgUWYlIOfhP80J3uDHPMwd0vvbM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "1.39.0";
|
||||
version = "1.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "nixpacks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FHpAZizgqizVhIwmMPbddpC7iOYpq0RGLoysWfKvJhc=";
|
||||
hash = "sha256-vF0vkUuvQR5z3v7LJmzpuvyLjuDjUL3HFIUzRKPojCs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ecT+/EMKZjI89aEW1w9Qjdc8srkVIYgmCtjwI55BI1I=";
|
||||
cargoHash = "sha256-lVdGIQxRREG7EYtQAzXzBx3Mg5bRopIe5rlGkNY3kTI=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,16 +8,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nnd";
|
||||
version = "0.45";
|
||||
version = "0.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al13n321";
|
||||
repo = "nnd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SiGy/Kzb47bRo9HenXb+bBUFzWRMkWAyuIAiGZhbI1A=";
|
||||
hash = "sha256-8VMucVBkB0Xkom9dJuINW2cjZ3RiYEm8xBsld5OT0zs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bSWgJZR6H8IUH2ZIjj6G3H7jCAdaAghu3jtd3dbh/7M=";
|
||||
cargoHash = "sha256-JRRZsFiZuMLW2evsmKAiZxU5KQzIGd+uGhlY0qtyrB4=";
|
||||
|
||||
meta = {
|
||||
description = "Debugger for Linux";
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "openstack-rs";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gtema";
|
||||
repo = "openstack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ywj0K9MdckVuKxjt1za+IyK4SoeyTXoXbDRXLqEkic0=";
|
||||
hash = "sha256-wK4CDG0W8cI+64wbK4PMvDy50b0WAktmJo+7Wf1ucjQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e2wt5BS+RQOpo3T5HOutvKGv4lHiIoTk9tEqMs4f5Dw=";
|
||||
cargoHash = "sha256-q1Q4GBWmdjIpjyN2wH9baxtgwvF6gG0aaqqVDn1ji44=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "paq";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gregl83";
|
||||
repo = "paq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oB805M37oLLV2Nttchwzd6V2AUqCo8JFhj6Mfg/JfH0=";
|
||||
hash = "sha256-vqJxFmPKQQil0iZOSfmy09/GkI3i1PorztIQPzg0UfE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ziYcaUGYxp+gR5v/yxQElNGLugo3bJtjVwCaHiFkMpw=";
|
||||
cargoHash = "sha256-PpwYqwetylyYh6DKn2WiZrMOJmbnkv/cY5u51AVNVno=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
let
|
||||
version = "2.63.1";
|
||||
version = "2.64.1";
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit version;
|
||||
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "pyfa-org";
|
||||
repo = "Pyfa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kpTJ7cgS/W0mUtplERiEYJA+FszPILCI+0AVbk6MVAA=";
|
||||
hash = "sha256-qqfJ8nYI1y74sGJDbwrq0mT03em62BmU+y6GPmUUIIo=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rosa";
|
||||
version = "1.2.55";
|
||||
version = "1.2.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openshift";
|
||||
repo = "rosa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IarqpS3KY6cL5Njkd14APfPcUqicNzODIZz6CiuCzIk=";
|
||||
hash = "sha256-3smmsco9xgOv+xCo9QIAudbHjZ1s3sKLEQmLXXaylYQ=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shpool";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shell-pool";
|
||||
repo = "shpool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dh2Law70RbGkD9dlbhes47CTgwPoEnN5WmxL10arCtk=";
|
||||
hash = "sha256-T7Ij8rxlF5AAEgVzT+C+X8sX0ebhY19NSFm3DB6LnXs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace-fail '/usr/bin/shpool' "$out/bin/shpool"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-PCcRtpw+l7a9P2V7O4DGE6uatJ0TfGJyLUxbqiBY1Ro=";
|
||||
cargoHash = "sha256-uOz2yswKMrhtBqPRjlu9AIcR68jfIaWrXwtBeMb/GW0=";
|
||||
|
||||
buildInputs = [
|
||||
linux-pam
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 0194c34ed2..0d58655f70 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1419,14 +1419,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
-version = "0.9.5"
|
||||
-source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
|
||||
+version = "0.9.16"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
|
||||
dependencies = [
|
||||
+ "autocfg",
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-utils",
|
||||
- "lazy_static",
|
||||
- "memoffset 0.6.4",
|
||||
- "scopeguard",
|
||||
+ "memoffset 0.9.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3118,15 +3118,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "memoffset"
|
||||
-version = "0.6.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
|
||||
-dependencies = [
|
||||
- "autocfg",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.7.1"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 2ff2094d67..a3ace4459a 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -435,7 +435,7 @@ zstd = "0.11.2"
|
||||
|
||||
[patch.crates-io]
|
||||
# for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
|
||||
-crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
|
||||
+# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
|
||||
|
||||
# We include the following crates as our dependencies above from crates.io:
|
||||
#
|
||||
@@ -5,28 +5,28 @@
|
||||
rustPlatform,
|
||||
udev,
|
||||
protobuf,
|
||||
rocksdb_8_3,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
clang,
|
||||
libclang,
|
||||
rocksdb,
|
||||
# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
|
||||
solanaPkgs ? [
|
||||
"cargo-build-bpf"
|
||||
"cargo-test-bpf"
|
||||
"cargo-build-sbf"
|
||||
"cargo-test-sbf"
|
||||
"solana"
|
||||
"solana-bench-tps"
|
||||
"solana-faucet"
|
||||
"solana-gossip"
|
||||
"solana-install"
|
||||
"agave-install"
|
||||
"solana-keygen"
|
||||
"solana-ledger-tool"
|
||||
"agave-ledger-tool"
|
||||
"solana-log-analyzer"
|
||||
"solana-net-shaper"
|
||||
"solana-validator"
|
||||
"agave-validator"
|
||||
"solana-test-validator"
|
||||
]
|
||||
++ [
|
||||
@@ -36,37 +36,26 @@
|
||||
],
|
||||
}:
|
||||
let
|
||||
version = "1.18.26";
|
||||
hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A=";
|
||||
rocksdb = rocksdb_8_3;
|
||||
version = "2.3.8";
|
||||
hash = "sha256-CqkedeQk66VXG6lQAIVGd7ci0KPltf2Qq69iErBAQGo=";
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "solana-cli";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solana-labs";
|
||||
repo = "solana";
|
||||
owner = "anza-xyz";
|
||||
repo = "agave";
|
||||
tag = "v${version}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
# The `crossbeam-epoch@0.9.5` crate used by the solana crates is their own fork,
|
||||
# which exists due to performance-related reasons.
|
||||
# The `solana-cli` build fails because this forked `crossbeam-epoch` crate contains a
|
||||
# symlink that points outside of the crate into the root of the repository.
|
||||
# This characteristic already existed in upstream `crossbeam-epoch@0.9.5`.
|
||||
#
|
||||
# As `buildRustPackage` vendors the dependencies of the `solana-cli` during the `buildPhase`,
|
||||
# which occurs after the `patchPhase`, this `crossbeam-epoch` is not patchable in this build.
|
||||
# The remaining solution is to make use of `cargoPatches` to remove the fork and bump to `crossbeam-epoch@0.9.16`,
|
||||
# which is the first version that removed the `build.rs`.
|
||||
cargoPatches = [ ./crossbeam-epoch.patch ];
|
||||
|
||||
cargoHash = "sha256-adzcLrOiUUYhz57gme/hEmD4E3kVcKCp0/jSoavZfjw=";
|
||||
cargoHash = "sha256-J7gyR7K1hauV+VrzoNzRrooLuSkjk8U6A3aFn9O2yFY=";
|
||||
|
||||
strictDeps = true;
|
||||
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
|
||||
RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code";
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
||||
# Even tho the tests work, a shit ton of them try to connect to a local RPC
|
||||
# or access internet in other ways, eventually failing due to Nix sandbox.
|
||||
@@ -82,6 +71,8 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
clang
|
||||
libclang
|
||||
rustPlatform.bindgenHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
|
||||
@@ -97,10 +88,9 @@ rustPlatform.buildRustPackage rec {
|
||||
--bash <($out/bin/solana completion --shell bash) \
|
||||
--fish <($out/bin/solana completion --shell fish)
|
||||
|
||||
mkdir -p $out/bin/sdk/bpf
|
||||
cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
|
||||
mkdir -p $out/bin/sdk/sbf
|
||||
cp -a ./sdk/sbf/* $out/bin/sdk/sbf
|
||||
mkdir -p $out/bin/platform-tools-sdk
|
||||
cp -r ./platform-tools-sdk/sbf $out/bin/platform-tools-sdk
|
||||
|
||||
mkdir -p $out/bin/deps
|
||||
find . -name libsolana_program.dylib -exec cp {} $out/bin/deps \;
|
||||
find . -name libsolana_program.rlib -exec cp {} $out/bin/deps \;
|
||||
@@ -126,6 +116,7 @@ rustPlatform.buildRustPackage rec {
|
||||
netfox
|
||||
happysalada
|
||||
aikooo7
|
||||
JacoMalan1
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.38.0";
|
||||
version = "2.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = "static-web-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SrE8CzdD2nZSRHJGb7cm0JWVFKUmIlWKnN9q94jG4hM=";
|
||||
hash = "sha256-fcD1jd9kwm/jCYdvNGEnanLO/wUKeYy5OqOeQE2lGP4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xJKpEv2q+7I1hb5eVNh9hAfixnrAWtYYLm2WfBZ/IJ8=";
|
||||
cargoHash = "sha256-rfhRMQb7MX2722wcMk35qATav6WFFULy3Ix3WcC7r4M=";
|
||||
|
||||
# Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
|
||||
preCheck = ''
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "2.0.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TandoorRecipes";
|
||||
repo = "recipes";
|
||||
tag = version;
|
||||
hash = "sha256-tFnfuRYg9lq7hveGZqpRVHNaXxS6BUs88/BHnUXe4mA=";
|
||||
hash = "sha256-FCCXzWaWjmsWidg1MgUIJtH+KN/gA1d7KBLRj3/1Fec=";
|
||||
};
|
||||
|
||||
yarnHash = "sha256-6+GmYibzujV1vE0FqMctGscRkrendpvczDdMK++qtTU=";
|
||||
yarnHash = "sha256-vwPwJK+nGuhjJC5BdijAKOv7sgrdev63PWhuZXMD1E0=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://tandoor.dev/";
|
||||
changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ jvanbruegge ];
|
||||
maintainers = with lib.maintainers; [
|
||||
jvanbruegge
|
||||
ryand56
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "304.250825.0";
|
||||
version = "304.250901.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-5nEC9zTmPhlv8+7a2UAuZpGSmOC+lMPzCbc2InvAo2k=";
|
||||
hash = "sha256-fzNmkJZQ+BLWlNZS1F7C6kCeigFmd3ztsd+ROPAq2u0=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "6.1.1";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-jlxHJRJp8ZzTRn6P/GffBPWlgRsboTYLi9/Rh/XQZGU=";
|
||||
hash = "sha256-XEznvrqQCUiZD8sYRLngNMZL/q1+W8yI2tINu+BsgmI=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs-slim ];
|
||||
|
||||
@@ -14,21 +14,21 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "0.5.42";
|
||||
version = "0.5.47";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
|
||||
hash = "sha256-QPUbJTpdvXQvI7zcNnQLrojOLCp+kpcPMc5aHknM5Tk=";
|
||||
hash = "sha256-Ocqwh+kH4tLMTMthbezDB0o00TTF/d6n8CzQxR919hA=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
|
||||
hash = "sha256-DFIDiTLT3JzAdBN9qgXbU2rbYa2oO1AxNO+R3gizyVI=";
|
||||
hash = "sha256-Fkouq/jv0Ddv1EjREtiGjMAEqdNoxwv4nqqp/nwf+zg=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
|
||||
hash = "sha256-NDIk0UsW7gOkhJJ7YDY2R1ZJ26uirG1TYPO+nGzR61M=";
|
||||
hash = "sha256-RizYZaNdaXCkfiFXblB34btqmu6xo3owKkSuOrgopIo=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
@@ -50,9 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib}
|
||||
mv runtime $out/lib/runtime
|
||||
|
||||
mv ui $out/ui
|
||||
mv unison $out/unison
|
||||
|
||||
makeWrapper $out/unison/unison $out/bin/ucm \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
@@ -61,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
} \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ less ]}" \
|
||||
--add-flags "--runtime-path $out/lib/runtime/bin/unison-runtime" \
|
||||
--set UCM_WEB_UI "$out/ui"
|
||||
'';
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-90YQOur7UhXxDBkGLSMnXQK7iQ6+Z8Mqx9PEG6FEXBs=";
|
||||
hash = "sha256-6b0IXzTawRWdm2blOpMAIDqzzv/S7O3c+5k7xOhRFvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wl-screenrec";
|
||||
version = "0.1.7";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "russelltg";
|
||||
repo = "wl-screenrec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O3DNiLiZ1Rh5vesJX+cLv6cVcOVVUfWX914034R3ASQ=";
|
||||
hash = "sha256-sLuhVeyzFp6sFKGK7Y7DPAPk7IdFAqAtjm56zhrX3fA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-shby6XE8xg5gqBoWlQn/Q0E+AmbyC8hFRp+EaBYS3Fs=";
|
||||
cargoHash = "sha256-atfWEAo6tMLEzFtiLlxp8fyVKa1cF/4SZFMYStDYZwU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -2,23 +2,33 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pkg-config,
|
||||
xorg,
|
||||
boost,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xlayoutdisplay";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-courtis";
|
||||
repo = "xlayoutdisplay";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-A37jFhVTW/3QNEf776Oi3ViRK+ebOPRTsEQqdmNhA7E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/alex-courtis/xlayoutdisplay/pull/34
|
||||
(fetchpatch2 {
|
||||
name = "cpp-version.patch";
|
||||
url = "https://github.com/alex-courtis/xlayoutdisplay/commit/56983b45070edde78cc816d9cff4111315e94a7a.patch";
|
||||
hash = "sha256-zd28Nkw8Kmm20zGT6wvdBHcHfE4p+RFotUO9zJwPQMc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = with xorg; [
|
||||
libX11
|
||||
@@ -34,12 +44,12 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement";
|
||||
homepage = "https://github.com/alex-courtis/xlayoutdisplay";
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ dtzWill ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "xlayoutdisplay";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "zoekt";
|
||||
version = "3.7.2-2-unstable-2025-08-21";
|
||||
version = "3.7.2-2-unstable-2025-09-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "zoekt";
|
||||
rev = "fb492e2d3a2d0857e9d219fd2f7b12c7403876bb";
|
||||
hash = "sha256-FIc8YViahZs5r0FBMJR+Io/dkUSE4S9pwC9fqZODlGE=";
|
||||
rev = "4e4a529c3b63c7d4c7897ba736f1cd52cc163134";
|
||||
hash = "sha256-aRQQAG0qZOrkdbQoQRXeddhMmQaB+/ESD6Ba+q4UIlI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "82";
|
||||
version = "83";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardpixel";
|
||||
repo = "unite-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ceo0HQupiihD6GW6/PUbjuArOXtPtAmUPxmNi7DS8E0=";
|
||||
hash = "sha256-L920BTDEQd/XP+Qa/f4VniCTJhVGgjipCcTAYPdfXg8=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -18,10 +18,11 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
(case (range "8.12" "9.1") "20240715")
|
||||
(case (range "8.12" "9.1") "20250903")
|
||||
(case (range "8.7" "8.11") "20200624")
|
||||
] null;
|
||||
release = {
|
||||
"20250903".sha256 = "sha256-ap1OvcvCAuqmFDwhPwMBosHs3cm5NxPW/w1J8AzWduk=";
|
||||
"20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI="; # coq 8.9 - 8.20
|
||||
"20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk="; # coq 8.7 - 8.19
|
||||
"20230608".sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY="; # coq 8.7 - 8.18
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
buildDunePackage,
|
||||
ocaml,
|
||||
coqPackages,
|
||||
version ? if lib.versionAtLeast ocaml.version "4.08" then "20240715" else "20231231",
|
||||
version ? if lib.versionAtLeast ocaml.version "4.08" then "20250903" else "20231231",
|
||||
}:
|
||||
|
||||
let
|
||||
fetched = coqPackages.metaFetch ({
|
||||
release."20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk=";
|
||||
release."20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI=";
|
||||
release."20250903".sha256 = "sha256-ap1OvcvCAuqmFDwhPwMBosHs3cm5NxPW/w1J8AzWduk=";
|
||||
releaseRev = v: "${v}";
|
||||
location = {
|
||||
domain = "gitlab.inria.fr";
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioapcaccess";
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxincs";
|
||||
repo = "aioapcaccess";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nI8hfHfSLMOKPcG5idYqqa/msJuR/Xt+JmgzdftlN28=";
|
||||
hash = "sha256-gCi0vo4w3jr4w5neQS9v821rdfE+SqnUkrOrEQUET7E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Module for working with apcaccess";
|
||||
homepage = "https://github.com/yuxincs/aioapcaccess";
|
||||
changelog = "https://github.com/yuxincs/aioapcaccess/releases/tag/v${version}";
|
||||
changelog = "https://github.com/yuxincs/aioapcaccess/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosmtplib";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "cole";
|
||||
repo = "aiosmtplib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DHZyed94XgixMTeKQ7Lj4oykL42HMmEMSdNGRHCiRvM=";
|
||||
hash = "sha256-LpD2bSgpClUpNguZaRy11WEwQviiCjqMJlRl6CRp50o=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
datetime,
|
||||
fetchPypi,
|
||||
nvdlib,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
@@ -15,21 +14,16 @@ buildPythonPackage rec {
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rYkA/+YfFhrS/WSx+jUWCsXDjp03aMoMiGdXeK3Kf4M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/'typing'/d" setup.py
|
||||
'';
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
datetime
|
||||
dependencies = [
|
||||
nvdlib
|
||||
pydantic
|
||||
typing-extensions
|
||||
@@ -43,6 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Developer tools for AVID";
|
||||
homepage = "https://github.com/avidml/avidtools";
|
||||
changelog = "https://github.com/avidml/avidtools/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -2,29 +2,29 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
pillow,
|
||||
numpy,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "blurhash";
|
||||
version = "1.1.4";
|
||||
format = "setuptools";
|
||||
version = "1.1.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcy";
|
||||
repo = "blurhash-python";
|
||||
# There are no tags: https://github.com/halcy/blurhash-python/issues/4
|
||||
rev = "22e081ef1c24da1bb5c5eaa2c1d6649724deaef8";
|
||||
sha256 = "1qq6mhydlp7q3na4kmaq3871h43wh3pyfyxr4b79bia73wjdylxf";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lTPn2GTD7eQ9XkZyuttFqEvNgzcx6b7OdeMc5WOXrJs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/^addopts/d' setup.cfg
|
||||
'';
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
pillow
|
||||
numpy
|
||||
@@ -32,10 +32,11 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "blurhash" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/halcy/blurhash-python/releases/tag/${src.tag}";
|
||||
description = "Pure-Python implementation of the blurhash algorithm";
|
||||
homepage = "https://github.com/halcy/blurhash-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,20 +3,55 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
versioningit,
|
||||
numpy,
|
||||
scipy,
|
||||
h5py,
|
||||
dill,
|
||||
matplotlib,
|
||||
blinker,
|
||||
aiohttp,
|
||||
python,
|
||||
plotly,
|
||||
python-socketio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YfnBA1rCD05B4XOS611qgi4ab3xKoYs108mwhj/I+sg=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"mpld3" # not packaged
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
versioningit
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
h5py
|
||||
dill
|
||||
matplotlib
|
||||
blinker
|
||||
aiohttp
|
||||
python
|
||||
plotly
|
||||
python-socketio
|
||||
# mpld3 # not packaged
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -9,24 +9,25 @@
|
||||
pyyaml,
|
||||
requests,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
finalAttrs = {
|
||||
pname = "duden";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radomirbosak";
|
||||
repo = "duden";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wjFIlwd4qG6aG9w0VPus6BGqghwIlPC6a8m0eagvIYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
crayons
|
||||
pyxdg
|
||||
@@ -35,6 +36,12 @@ let
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_online_attributes.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "duden" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ec2-metadata";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ec2_metadata";
|
||||
inherit version;
|
||||
hash = "sha256-sGayaAkcpANp/dZEuQo07L/XgiW85vDiafC/nOOrG3U=";
|
||||
hash = "sha256-1Ca89aIVQ+B57Ov+0qoSNuUIgaGJENcya2J9WGE3mD8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
@@ -10,6 +11,7 @@
|
||||
qt6,
|
||||
qtpy,
|
||||
pyqt6,
|
||||
mesa,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
}:
|
||||
@@ -17,9 +19,9 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "echo";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glue-viz";
|
||||
@@ -28,15 +30,18 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-Uikzn9vbLctiZ6W0uA6hNvr7IB/FhCcHk+JxBW7yrA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
qt6.qtconnectivity
|
||||
qt6.qtbase
|
||||
qt6.qttools
|
||||
@@ -45,11 +50,14 @@ buildPythonPackage rec {
|
||||
qtpy
|
||||
];
|
||||
|
||||
# collecting ... qt.qpa.xcb: could not connect to display
|
||||
# qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found.
|
||||
doCheck = false;
|
||||
doCheck = lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook;
|
||||
|
||||
preCheck = ''
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
mesa.llvmpipeHook
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
];
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonargparse";
|
||||
version = "4.40.2";
|
||||
version = "4.41.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "omni-us";
|
||||
repo = "jsonargparse";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3Zs2F46tGcvIF9UOGI/P079BZLJJyEyP9LDPRfvSk4E=";
|
||||
hash = "sha256-uNgtxQuAkOB651lbPPWQg0p4T8G1dgFbx/EyO/sJSjs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -82,7 +82,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Module to implement minimal boilerplate CLIs derived from various sources";
|
||||
homepage = "https://github.com/omni-us/jsonargparse";
|
||||
changelog = "https://github.com/omni-us/jsonargparse/blob/v${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/omni-us/jsonargparse/blob/${src.tag}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.4.20";
|
||||
version = "0.4.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XAN0DTKZcT8SAwPNI6lDrpmgvr1a5KsTAeRvw7OYVCo=";
|
||||
hash = "sha256-qkbl+KD98/qJ6ldlXBAktZggy3c7IygowY8sMvI/O9o=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
version = "0.5.2";
|
||||
version = "0.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_file";
|
||||
inherit version;
|
||||
hash = "sha256-BJ2XGsTJNu2/SDKRW6cSjP7o9erUNSZnkrce3Yf1MFw=";
|
||||
hash = "sha256-XnZvMll2IuZlKUZBAZFFSK1oN3CgpdK9ye6E6zoRAzI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
@@ -8,6 +9,7 @@
|
||||
pytestCheckHook,
|
||||
pillow,
|
||||
nix-update-script,
|
||||
typst,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -22,6 +24,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-lkO4BTo3duNAsppTjteeBuzgSJL/UnKVW2QXgrfVrqM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# make hermetic
|
||||
substituteInPlace mpl_typst/config.py \
|
||||
--replace-fail \
|
||||
"get_typst_compiler(name: str, default=Path('typst'))" \
|
||||
"get_typst_compiler(name: str, default=Path('${lib.getExe typst}'))"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
@@ -36,11 +46,25 @@ buildPythonPackage rec {
|
||||
numpy
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "-v" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mpl_typst"
|
||||
"mpl_typst.as_default"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# runs typst and gets "error: failed to download package"
|
||||
"test_draw_path"
|
||||
"test_draw_image_lenna"
|
||||
"test_draw_image_spy"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optional stdenv.hostPlatform.isDarwin [
|
||||
# fatal error when matplotlib creates a canvas
|
||||
"mpl_typst/backend_test.py"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvdlib";
|
||||
version = "0.8.1";
|
||||
version = "0.8.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Vehemont";
|
||||
repo = "nvdlib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8Tg9JN63+zGRUppIXBQ46mKeDq+nLNQvAjtCwcTuC1g=";
|
||||
hash = "sha256-FjeYJMMccao9KJMcJBKtt5QhpQEEbcPyNunj+VqMdx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pure-protobuf";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
|
||||
format = "pyproject";
|
||||
# < 3.10 requires get-annotations which isn't packaged yet
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "eigenein";
|
||||
repo = "protobuf";
|
||||
tag = version;
|
||||
hash = "sha256-k67AvY9go62BZN7kCg+kFo9+bQB3wGJVbLra5pOhkPU=";
|
||||
hash = "sha256-Gr5fKpagSUzH34IKHb+pBta4q71AqYa/KG9XW2AxZqk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycyphal";
|
||||
version = "1.24.3";
|
||||
version = "1.24.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenCyphal";
|
||||
repo = "pycyphal";
|
||||
tag = version;
|
||||
hash = "sha256-aa7PJ6QkqwwPwQvYc6QKaxtm1Mnz3d7SLEik55qN6/Y=";
|
||||
hash = "sha256-yrGKmJW4W8bPazKHWkwgNWDPiQYg1KTEuI7hC3yOWek=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyechonest";
|
||||
version = "9.0.0";
|
||||
format = "setuptools";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web";
|
||||
homepage = "https://github.com/echonest/pyechonest";
|
||||
};
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.31.6";
|
||||
version = "0.32.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
tag = version;
|
||||
hash = "sha256-G5Ljg7t+j17qkqsliH5qwRIIsC8gQuxviaopHGkhquQ=";
|
||||
hash = "sha256-2UiEzS2Bq0Yjng5d2+rytnoRrBQmpuPHpJmdmhuqvlI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schedula";
|
||||
version = "1.5.62";
|
||||
version = "1.5.64";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinci1it2000";
|
||||
repo = "schedula";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-erEUdiKV1MRwjVy3SKFneJVHp6gWEok7EWdv6v6HFGM=";
|
||||
hash = "sha256-huMhJTMiTVrKyZ5z0dFfw61GHyLbpHNtZGXP4gmUdTs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ssdp";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codingjoe";
|
||||
repo = "ssdp";
|
||||
tag = version;
|
||||
hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M=";
|
||||
hash = "sha256-HsU67vsJvoVyOy2QEq8leYcjl1EVdQ039jN1QyL0XgU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)";
|
||||
homepage = "https://github.com/codingjoe/ssdp";
|
||||
changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}";
|
||||
changelog = "https://github.com/codingjoe/ssdp/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "ssdp";
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.30.1";
|
||||
version = "3.30.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "ietf-tools";
|
||||
repo = "xml2rfc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QnsAm4ezDUBv/ogYIBn2FBUaYZlPNFgVrtbeGAAzwcs=";
|
||||
hash = "sha256-yCCENooemgSLRVW+JkE8UVEcPke2SbEbW9r2nhhSLbY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'ruby-zoom'
|
||||
@@ -1,24 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
djinni (2.2.4)
|
||||
fagin (~> 1.2, >= 1.2.1)
|
||||
fagin (1.2.1)
|
||||
hilighter (1.2.3)
|
||||
json_config (1.1.0)
|
||||
ruby-zoom (5.3.0)
|
||||
djinni (~> 2.2, >= 2.2.4)
|
||||
fagin (~> 1.2, >= 1.2.1)
|
||||
hilighter (~> 1.2, >= 1.2.3)
|
||||
json_config (~> 1.0, >= 1.0.0)
|
||||
scoobydoo (~> 1.0, >= 1.0.0)
|
||||
scoobydoo (1.0.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
ruby-zoom
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.2
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
bundlerEnv,
|
||||
ruby,
|
||||
bundlerUpdateScript,
|
||||
}:
|
||||
|
||||
bundlerEnv {
|
||||
pname = "ruby-zoom";
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "ruby-zoom";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quickly open CLI search results in your favorite editor";
|
||||
homepage = "https://gitlab.com/mjwhitta/zoom";
|
||||
license = with licenses; gpl3;
|
||||
maintainers = with maintainers; [
|
||||
vmandela
|
||||
nicknovitski
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
{
|
||||
djinni = {
|
||||
dependencies = [ "fagin" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "18zk80jk70xq1bnsvzcgxb13x9fqdb5g4m02b2f6mvqm4cyw26pl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.4";
|
||||
};
|
||||
fagin = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0psyydh4hf2s1kz0r50aiyjf5v2pqhkbmy0gicxzaj5n17q2ga24";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
};
|
||||
hilighter = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03zm49g96dfpan5fhblcjxrzv7ldwan57sn0jcllkcmrqfd0zlyz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
};
|
||||
json_config = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0slb618n1ipn47j6dsxbfv2j9pl06dxn2i651llix09d529m7zwa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
ruby-zoom = {
|
||||
dependencies = [
|
||||
"djinni"
|
||||
"fagin"
|
||||
"hilighter"
|
||||
"json_config"
|
||||
"scoobydoo"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0iqxc0rzypsxy4wbxnvgvk98dbcsrcczq3xi9xd4wz4ggwq564l3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.3.0";
|
||||
};
|
||||
scoobydoo = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "162p75nc9x078kqcpdsrsd7kngs6jc5n4injz3kzpwf0jgbbm8n7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
}
|
||||
@@ -2126,6 +2126,7 @@ mapAliases {
|
||||
rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
|
||||
rr-unstable = rr; # Added 2022-09-17
|
||||
rtx = mise; # Added 2024-01-05
|
||||
ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
|
||||
runCommandNoCC = runCommand;
|
||||
runCommandNoCCLocal = runCommandLocal;
|
||||
run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
|
||||
|
||||
@@ -10194,8 +10194,6 @@ with pkgs;
|
||||
stalwartEnterprise = true;
|
||||
};
|
||||
|
||||
ruby-zoom = callPackage ../tools/text/ruby-zoom { };
|
||||
|
||||
inherit (callPackages ../servers/monitoring/sensu-go { })
|
||||
sensu-go-agent
|
||||
sensu-go-backend
|
||||
|
||||
@@ -563,6 +563,7 @@ mapAliases ({
|
||||
pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
|
||||
pydns = py3dns; # added 2024-10-25
|
||||
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
|
||||
pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
|
||||
pyephember = throw "pyephember was removed because Home Assistant switched to pyephember2"; # added 2025-05-07
|
||||
pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
|
||||
pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
|
||||
|
||||
@@ -4571,7 +4571,9 @@ self: super: with self; {
|
||||
|
||||
ecdsa = callPackage ../development/python-modules/ecdsa { };
|
||||
|
||||
echo = callPackage ../development/python-modules/echo { };
|
||||
echo = callPackage ../development/python-modules/echo {
|
||||
inherit (pkgs) mesa;
|
||||
};
|
||||
|
||||
ecoaliface = callPackage ../development/python-modules/ecoaliface { };
|
||||
|
||||
@@ -9663,7 +9665,9 @@ self: super: with self; {
|
||||
|
||||
mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { };
|
||||
|
||||
mpl-typst = callPackage ../development/python-modules/mpl-typst { };
|
||||
mpl-typst = callPackage ../development/python-modules/mpl-typst {
|
||||
inherit (pkgs) typst;
|
||||
};
|
||||
|
||||
mplcursors = callPackage ../development/python-modules/mplcursors { };
|
||||
|
||||
@@ -12875,8 +12879,6 @@ self: super: with self; {
|
||||
|
||||
pyecharts = callPackage ../development/python-modules/pyecharts { };
|
||||
|
||||
pyechonest = callPackage ../development/python-modules/pyechonest { };
|
||||
|
||||
pyeclib = callPackage ../development/python-modules/pyeclib { };
|
||||
|
||||
pyecoforest = callPackage ../development/python-modules/pyecoforest { };
|
||||
|
||||
Reference in New Issue
Block a user