gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2025-01-14 12:05:49 +00:00
committed by GitHub
parent 1c7f731c6d deb4f62a8a
commit 4de88b4823
39 changed files with 284 additions and 5692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
+10
View File
@@ -0,0 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
};
}
pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+18
View File
@@ -0,0 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "0dz8zpb1la98y63x7qs00s28bzn10ycipwsf6a5lvyhzzgpl253a"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "04qsn75xzfl29fksnb0rzcj7cfdi84smmhn9v47l423zbgr30pfv"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "1bk8skws87561n06mkwh92c93v5rinf8nmwydn06p8crz9ggp5q6"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-images.txt",
"sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
}
}
pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+15
View File
@@ -0,0 +1,15 @@
{
k3sVersion = "1.32.0+k3s1";
k3sCommit = "cca8facaa33a3ec7897349a8740fd96029590c31";
k3sRepoSha256 = "0l8mciwv2wr266zxv9zc5wpgf92gqvzg4d08z4g63wbvsi7zflzh";
k3sVendorHash = "sha256-3hY67A6GbzB2ki5GB7GmmmGG5A4cup17zhkUNiN1chk=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.6.0-k3s1";
k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
containerdVersion = "1.7.23-k3s2";
containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm";
criCtlVersion = "1.31.0-k3s2";
}
pkgs/applications/networking/cluster/k3s/default.nix
+10 -1
View File
@@ -12,7 +12,6 @@ let
extraArgs = builtins.removeAttrs args [ "callPackage" ];
in
{
# 1_29 can be built with the same builder as 1_30
k3s_1_29 = common (
(import ./1_29/versions.nix)
// {
@@ -42,4 +41,14 @@ in
];
}
) extraArgs;
k3s_1_32 = common (
(import ./1_32/versions.nix)
// {
updateScript = [
./update-script.sh
"32"
];
}
) extraArgs;
}
pkgs/by-name/as/ast-grep/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.32.3";
version = "0.33.0";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-DJrcXykSYArG5cP3Nm3JEeBpu9a4Mbben4/DApIKZN4=";
hash = "sha256-oqG76KzyN5TnE27yxrHeEYjLwrnDMvwbOzOnN6TWvxc=";
};
cargoHash = "sha256-frAoaoKOoFRfb9qtjPehtUSqKU25+pbMff4iRPXS/Qo=";
cargoHash = "sha256-O3FKn90QVDk1TXJtjmaiDuXr+pwIjsAmadi+aypXeLA=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/at/attic-client/Cargo.lock
Generated
-5581
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/at/attic-client/package.nix
+2 -3
View File
@@ -39,10 +39,9 @@ rustPlatform.buildRustPackage {
]
);
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM=";
useFetchCargoVendor = true;
ATTIC_DISTRIBUTOR = "nixpkgs";
NIX_INCLUDE_PATH = "${lib.getDev nix}/include";
pkgs/by-name/da/dashy-ui/package.nix
+20 -3
View File
@@ -5,7 +5,11 @@
fetchYarnDeps,
yarnConfigHook,
yarnBuildHook,
nodejs,
yarn,
fixup-yarn-lock,
prefetch-yarn-deps,
nodejs_20,
nodejs-slim_20,
yq-go,
settings ? { },
}:
@@ -41,9 +45,22 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
yarnConfigHook
# This is required to fully pin the NodeJS version, since yarn*Hooks pull in the latest LTS in nixpkgs
# The yarn override is the only one technically required (fixup-yarn-lock and prefetch-yarn-deps' node version doesn't affect the end result),
# but they've been overridden for the sake of consistency/in case future updates to dashy/node would cause issues with differing major versions
(yarnConfigHook.override {
fixup-yarn-lock = fixup-yarn-lock.override {
nodejs-slim = nodejs-slim_20;
};
prefetch-yarn-deps = prefetch-yarn-deps.override {
nodejs-slim = nodejs-slim_20;
};
yarn = yarn.override {
nodejs = nodejs_20;
};
})
yarnBuildHook
nodejs
nodejs_20
# For yaml parsing
yq-go
];
pkgs/by-name/dr/drat-trim/package.nix
+14
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
}:
stdenv.mkDerivation {
@@ -15,12 +16,25 @@ stdenv.mkDerivation {
hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA=";
};
patches = [
# gcc-14 build fix: https://github.com/marijnheule/drat-trim/pull/40
(fetchpatch {
name = "gcc-14-fix.patch";
url = "https://github.com/marijnheule/drat-trim/commit/8186a7dc083a3951ba87e5ff35d36f1ea2c03f0d.patch";
hash = "sha256-jgsOYcRYD2VGdOrXW9D8Jh80Nqd+Kp3d2IU+bNK1yGg=";
})
];
postPatch = ''
substituteInPlace Makefile --replace gcc cc
'';
installPhase = ''
runHook preInstall
install -Dt $out/bin drat-trim lrat-check
runHook postInstall
'';
meta = with lib; {
pkgs/by-name/en/envision/package.nix
+1
View File
@@ -94,6 +94,7 @@ let
x264
glslang
libdrm
libnotify
openssl
])
);
pkgs/by-name/ge/gerrit/package.nix
+3 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.11.0";
version = "3.11.1";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
hash = "sha256-wFUks4yGzO4obPWIIfCgL+/ZF37RDgXKvlOMSFvU5Bk=";
hash = "sha256-7gJyvFOisukzd2Vmqci7CiJqegYQSYQZvnSvR+Y9HM4=";
};
buildCommand = ''
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
flokli
zimbatm
felixsinger
];
platforms = platforms.unix;
};
pkgs/by-name/go/goread/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "goread";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = "TypicalAM";
repo = "goread";
rev = "v${version}";
hash = "sha256-8QjroS0aKALcrDJkpihD70iJJBdiVP4Q2j2n3BsY71w=";
hash = "sha256-2C/PejWCwLdWu9n2hpbm3u/UrD56JCJqG+A7xnn/bP4=";
};
vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI=";
vendorHash = "sha256-3H2n/VsJHZ/69YR6P38B36mFz85cNHaTtT9N0YQOVew=";
env.TEST_OFFLINE_ONLY = 1;
pkgs/by-name/mi/mise/package.nix
+3 -3
View File
@@ -20,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2025.1.0";
version = "2025.1.6";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-q6kzDs2YBeO3H/4LuKszkelT1SKfe5yK8j5yG41WHQQ=";
hash = "sha256-eMKrRrthV37ndsF47jjNxigsJ5WDsCDCit9J88l5dHE=";
};
cargoHash = "sha256-c/PgxIdLrKfDdeHL3HNuhvmgtSsFr/lhMPR6r2NVWBg=";
cargoHash = "sha256-Mh7vyIVkQ0N1dYD4KVue0eiBm+z0JFPt89qYpu+wVd0=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/on/onboard/package.nix
+9 -3
View File
@@ -1,6 +1,7 @@
{
fetchurl,
fetchpatch,
stdenv,
lib,
substituteAll,
aspellWithDicts,
@@ -79,6 +80,7 @@ python3.pkgs.buildPythonApplication rec {
intltool
pkg-config
wrapGAppsHook3
python3.pkgs.setuptools
];
buildInputs = [
@@ -140,9 +142,10 @@ python3.pkgs.buildPythonApplication rec {
chmod -x ./scripts/sokSettings.py
patchShebangs .
patchShebangs --host Onboard/ onboard-settings onboard
substituteInPlace setup.py \
--replace-fail "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \
--replace "/etc" "$out/etc"
substituteInPlace ./Onboard/LanguageSupport.py \
@@ -177,10 +180,13 @@ python3.pkgs.buildPythonApplication rec {
# setuptools to get distutils with python 3.12
installPhase = ''
${(python3.withPackages (p: [ p.setuptools ])).interpreter} setup.py install --prefix="$out"
runHook preInstall
${
(python3.pythonOnBuildForHost.withPackages (p: [ p.setuptools ])).interpreter
} setup.py install --prefix="$out"
cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
glib-compile-schemas $out/share/glib-2.0/schemas/
runHook postInstall
'';
# Remove ubuntu icons.
pkgs/by-name/pl/pluto/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pluto";
version = "5.21.0";
version = "5.21.1";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
hash = "sha256-jz1hne6Lwow1a2Ckfp4C1/gD57V2kYFdik9DQ/EkjLI=";
hash = "sha256-BGfTgL5xAudgGAyINVq9eyyUHRb6iZ/eEO5qxUl5cI0=";
};
vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak=";
vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k=";
ldflags = [
"-w"
pkgs/by-name/ra/rattler-build/package.nix
+35 -13
View File
@@ -1,51 +1,73 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
versionCheckHook,
openssl,
pkg-config,
installShellFiles,
buildPackages,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "rattler-build";
version = "0.33.1";
version = "0.34.1";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "rattler-build";
rev = "refs/tags/v${version}";
hash = "sha256-yceScRfZuMVnNVNVg3Xs+jU3spdFn0hPMmwMLaYzkNE=";
tag = "v${version}";
hash = "sha256-HDRQveWOJKGBWxN7ZyIECo1HBfz+vSaLW7ueSok+d64=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-eJH7a+9asSPDv0gBwvLc4zssJGCY2jAfVKKOWb3oQ/Q=";
cargoHash = "sha256-b44bL/xVUwBdqwr/jawZbyV+yHsGR3hREm4nvHDMCWA=";
doCheck = false; # test requires network access
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
doInstallCheck = true;
nativeBuildInputs = [
pkg-config
installShellFiles
];
cargoBuildFlags = [ "--bin rattler-build" ]; # other bin like `generate-cli-docs` shouldn't be distributed.
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
''
installShellCompletion --cmd rattler-build \
--bash <(${emulator} $out/bin/rattler-build completion --shell bash) \
--fish <(${emulator} $out/bin/rattler-build completion --shell fish) \
--zsh <(${emulator} $out/bin/rattler-build completion --shell zsh)
''
);
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = [ "-V" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Universal package builder for Windows, macOS and Linux";
homepage = "https://github.com/prefix-dev/rattler-build";
homepage = "https://rattler.build/";
changelog = "https://github.com/prefix-dev/rattler-build/releases/tag/v${version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ genga898 ];
maintainers = with lib.maintainers; [
genga898
xiaoxiangmoe
];
mainProgram = "rattler-build";
};
}
pkgs/by-name/su/supabase-cli/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "2.2.1";
version = "2.6.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-m7v31fG3ASbOFGv+IsV5IwnKyr+31i4yAAVpawvFHpo=";
hash = "sha256-kMVVb5f8SEo/fc+PmRh1QskIxzbG+Y9gOufVvq5mN30=";
};
vendorHash = "sha256-QIt7a+NVd3hubxKOA2kGjouBO5ve7qmIRTIVRpsXmdk=";
vendorHash = "sha256-H4o38npYbF77NSO7EALjoH3EXdUCjIPDboWEhWE4hXo=";
ldflags = [
"-s"
pkgs/by-name/sy/systemctl-tui/package.nix
+14 -12
View File
@@ -1,30 +1,32 @@
{
lib,
rustPlatform,
fetchCrate,
stdenv,
darwin,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
testers,
systemctl-tui,
}:
rustPlatform.buildRustPackage rec {
pname = "systemctl-tui";
version = "0.3.8";
version = "0.3.9";
src = fetchCrate {
inherit pname version;
hash = "sha256-i2PKSvjsrITLp3a3EgfFF3IR464mkkDnh8ITLO+o0hU=";
src = fetchFromGitHub {
owner = "rgwood";
repo = "systemctl-tui";
tag = "v${version}";
hash = "sha256-LuE0+HxTWROFbqEqqM6464U236/7qxed7xMUkSNUK68=";
};
cargoHash = "sha256-6cFK1wMO5VICfi3tN140XH9inQOkkSfHVogKhTHtQb8=";
cargoHash = "sha256-R1JV5Hp10I9DO6I2k8sQC2IXJ+U7iJ2iAzb391e895c=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script;
tests.version = testers.testVersion { package = systemctl-tui; };
};
meta = {
pkgs/by-name/te/terragrunt/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.71.1";
version = "0.71.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
tag = "v${version}";
hash = "sha256-146fSTiDzISvtE8tu/pKiXwfoVu2UOgdBQxw0mWyHmY=";
hash = "sha256-R05Tv6crYMXnmUzBDaTAR1LNpd8CV0RK54U9nUN5q+4=";
};
nativeBuildInputs = [ go-mockery ];
@@ -22,7 +22,7 @@ buildGoModule rec {
make generate-mocks
'';
vendorHash = "sha256-atdOaJcMH9lc9kiosMHm7TDRjp3tWnWvOZdzlNmjO/k=";
vendorHash = "sha256-G7J0J5Gghl+yKaCrIbgen45xKUl1ALb0CcIV9HfBdZ8=";
doCheck = false;
pkgs/by-name/tf/tfsec/package.nix
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.28.12";
version = "1.28.13";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "tfsec";
tag = "v${version}";
hash = "sha256-ul4KKwTWFg5FxmLhyrQAQWfuCoSVDc6eIchbLwpG/xI=";
hash = "sha256-4auh0MPLSAkygbVZC2PbEcA21PNmBNkr4fA1m1H9kyU=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorHash = "sha256-yi124OllfSchKSaj+OlxG/7UQcBLdx8JUlnu/a8MSOU=";
vendorHash = "sha256-cGVHDq4exa1dZxEemCWNLA5H201SXwW0madYCWHwtxM=";
subPackages = [
"cmd/tfsec"
pkgs/by-name/th/the-legend-of-edgar/package.nix
+14 -6
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
SDL2,
SDL2_image,
SDL2_mixer,
@@ -14,15 +15,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "the-legend-of-edgar";
version = "1.36-unstable-2023-07-11";
version = "1.37";
src = fetchFromGitHub {
owner = "riksweeney";
repo = "edgar";
rev = "8344b385b65e8226455c7e88bd5aca57caa3c520";
hash = "sha256-dOLKMsyQkVZ7gBiURfr/tFbu3xSqei8A/M2HSZgAFnI=";
rev = finalAttrs.version;
hash = "sha256-hhzDNnoQCwHOwknABTz4a9AQ7MkU9vayi2tZvJtK1PQ=";
};
patches = [
# Fix _FORTIFY_SOURCE startup crash:
# https://github.com/riksweeney/edgar/pull/67
(fetchpatch {
url = "https://github.com/riksweeney/edgar/commit/cec80a04d765fd2f6563d1cf060ad5000f9efe0a.patch";
hash = "sha256-RJpIt7M3c989nXkWRTY+dIUGqqttyTTGx8s5u/iTWX4=";
})
];
nativeBuildInputs = [
pkg-config
gettext
@@ -46,9 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
"BIN_DIR=${placeholder "out"}/bin/"
];
hardeningDisable = [
"fortify"
];
enableParallelBuilding = true;
meta = {
homepage = "https://www.parallelrealities.co.uk/games/edgar";
pkgs/by-name/ti/tile38/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "tile38";
version = "1.34.0";
version = "1.34.1";
src = fetchFromGitHub {
owner = "tidwall";
repo = pname;
rev = version;
hash = "sha256-C8vVmmIDHc5aaiS0kK6LbB0DAZADAH79LXtMsQ019Xk=";
hash = "sha256-uIVQXGKCwVEgrQyOheZzgDTVEdEVDSx8KIHbROqQaOs=";
};
vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY=";
vendorHash = "sha256-2Ze1gbPReVHLqqIwT00Zj0ne7FeZUpno75WhETY8zKM=";
subPackages = [
"cmd/tile38-cli"
pkgs/by-name/ti/tippecanoe/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe";
version = "2.73.0";
version = "2.74.0";
src = fetchFromGitHub {
owner = "felt";
repo = "tippecanoe";
rev = finalAttrs.version;
hash = "sha256-IQEtfLRWe0/R6FSGzyar+qcpng0nm3LcyBb352TLZrs=";
hash = "sha256-LOy9q2Qc47DQxPkAt2mmlmrJUcoL+hBpm0dFI4oZo/0=";
};
buildInputs = [
pkgs/by-name/va/vacuum-go/package.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildGoModule rec {
pname = "vacuum-go";
version = "0.15.0";
version = "0.15.3";
src = fetchFromGitHub {
owner = "daveshanley";
repo = "vacuum";
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
tag = "v${version}";
hash = "sha256-OsujmYu0QNyfyj6W8+aPcV4xsjpwZDWSJC7WjIw+rOc=";
hash = "sha256-SI32ODbd3X4zMhS3LI4vwVn9/gwgabWZ/8Nx+L3KPYE=";
};
vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog=";
pkgs/by-name/ze/zed-editor/package.nix
+3 -3
View File
@@ -93,13 +93,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.168.2";
version = "0.168.3";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
tag = "v${version}";
hash = "sha256-ar1JpLbfKdFZFszCCmYMzTQx6yhVIFFT+EbeA7H5H2g=";
hash = "sha256-YGHbka8kCKOquY2I17N8oS7ckhX/uY6QXJ21+kQjQBg=";
};
patches = [
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-Vw/WUOLiIOuULSMT57G8MsubQR63J+oh88lmlPNkRYs=";
cargoHash = "sha256-pZK2PzR39fMAiqhfA0WtZnIRzAVbqxnViQnWKmZoRV0=";
nativeBuildInputs =
[
pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+7 -2
View File
@@ -13,11 +13,12 @@
gtk4,
libadwaita,
wayland,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "elementary-dock";
version = "8.0.1";
version = "8.0.2";
outputs = [
"out"
@@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "elementary";
repo = "dock";
rev = finalAttrs.version;
hash = "sha256-Q4Y9FVqzPXoz2Nti1qB5SOJQ0tETPcv2fZPOMkJaND8=";
hash = "sha256-bixNYpPdWU2FndiCPX7SxNTz2MEttRuj35NaWn3GJrI=";
};
depsBuildBuild = [ pkg-config ];
@@ -50,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
wayland
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Elegant, simple, clean dock";
homepage = "https://github.com/elementary/dock";
pkgs/development/libraries/gdal/default.nix
+2 -2
View File
@@ -83,13 +83,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
version = "3.10.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${finalAttrs.version}";
hash = "sha256-pb2xKTmJB7U1jIG80ENmZrR7vFw6YDoees43u/JhU3Y=";
hash = "sha256-4XUDHN1RJPgURwTFPFu/9QRqW6XhLMydti9CRO6p7SI=";
};
nativeBuildInputs =
pkgs/development/ocaml-modules/elpi/default.nix
+2 -1
View File
@@ -8,7 +8,7 @@
, ppxlib, ppx_deriving
, ppxlib_0_15, ppx_deriving_0_15
, coqPackages
, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.6"
, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.7"
else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0"
else "1.15.2"
}:
@@ -17,6 +17,7 @@ let p5 = camlp5; in
let camlp5 = p5.override { legacy = true; }; in
let fetched = coqPackages.metaFetch ({
release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc=";
release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
pkgs/development/python-modules/cleanlab/default.nix
+4 -3
View File
@@ -44,11 +44,12 @@ buildPythonPackage rec {
};
patches = [
# https://github.com/cleanlab/cleanlab/pull/1224
# https://github.com/cleanlab/cleanlab/pull/1224 (merged)
# TODO: remove this patch when updating to the next release (2.8.0)
(fetchpatch {
name = "numpy2-compatibility";
url = "https://github.com/GaetanLepage/cleanlab/commit/7d4cef11cf8d58b0ca7dba78f4c64995ed709274.patch";
hash = "sha256-1mLEITYj30F9tJh8tajWnpGC5FANh8he/lgw1f+LAsI=";
url = "https://github.com/cleanlab/cleanlab/commit/bed10f5bdf538358e760ad98a0965f9b447b45ad.patch";
hash = "sha256-czSK05wrLfSpJF2j+YwcDeDIKspkcCEB2hKlX5H3Gns=";
})
];
pkgs/development/python-modules/eris/default.nix
+29
View File
@@ -0,0 +1,29 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
aiocoap,
pycryptodome,
}:
buildPythonPackage rec {
pname = "eris";
version = "1.0.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-aiPmf759Cd3SeKfQtqgszcKkhZPM4dNY2x9YxJFPRh0=";
};
build-system = [ setuptools ];
dependencies = [
aiocoap
pycryptodome
];
meta = {
description = "Python implementation of the Encoding for Robust Immutable Storage (ERIS)";
homepage = "https://eris.codeberg.page/python-eris/";
license = [ lib.licenses.agpl3Plus ];
maintainers = with lib.maintainers; [ ehmry ];
};
}
pkgs/development/python-modules/pathvalidate/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pathvalidate";
version = "3.2.1";
version = "3.2.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9dB7HiN0GHBAYSofzSvLKRn42xgN8lTJWBu5C/kDN30=";
hash = "sha256-WbW5J44wOC1tITSXYjBD6+Y/EOKQVb5EGanATHIXOcs=";
};
build-system = [ setuptools-scm ];
pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pipenv-poetry-migrate";
version = "0.5.12";
version = "0.6.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "yhino";
repo = "pipenv-poetry-migrate";
tag = "v${version}";
hash = "sha256-E93A3EfbCb+oOYB61CGhBLwB5m6pvZaSXt9wdnUBSFQ=";
hash = "sha256-M31bOvKGUlkzfZRQAxTkxhX8m9cCzEvsNZdyIyipwGI=";
};
nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/qdrant-client/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "qdrant-client";
version = "1.12.1";
version = "1.12.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "qdrant";
repo = "qdrant-client";
tag = "v${version}";
hash = "sha256-rElbGIXnhkHaAvtneEMhyyhySFlT4UT/vhhIlRD3xT0=";
hash = "sha256-oQrT3J+A0FvggAYhZ25MwOpfN3WryTG/Tkgygc7g3Ew=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/rmsd/default.nix
+15 -5
View File
@@ -2,23 +2,33 @@
buildPythonPackage,
lib,
fetchPypi,
numpy,
scipy,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "rmsd";
version = "1.6.2";
format = "setuptools";
propagatedBuildInputs = [ scipy ];
version = "1.6.4";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-E5QIJRqYivSeMxdSOGNt0sbJ6ExHcyLRZ91X6saduto=";
hash = "sha256-dhLsFGts45PitSVZxXw5FND3EOeHHWYrH8PZJEYoq+M=";
};
build-system = [ setuptools ];
dependencies = [
numpy
scipy
];
pythonImportsCheck = [ "rmsd" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Calculate root-mean-square deviation (RMSD) between two sets of cartesian coordinates";
mainProgram = "calculate_rmsd";
pkgs/development/python-modules/stable-baselines3/default.nix
+5 -3
View File
@@ -22,14 +22,16 @@
}:
buildPythonPackage rec {
pname = "stable-baselines3";
version = "2.4.0";
# TODO: To this date, the latest release (2.4.1) is not compatible with numpy 2 and does not build
# successfully on nixpkgs
version = "2.4.1-unstable-2025-01-07";
pyproject = true;
src = fetchFromGitHub {
owner = "DLR-RM";
repo = "stable-baselines3";
tag = "v${version}";
hash = "sha256-OFmjAkUS0wrns5CkWjqR7zTjKLVPI/NrpVIKJhLAwYM=";
rev = "b7c64a1aa4dd2fd3efed96e7a9ddb4d1f5c96112";
hash = "sha256-oyTOBRZsKkhhGKwwBN9HCV0t8+MkJYpWsTRdS+upMeI=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/uxsim/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
}:
buildPythonPackage rec {
pname = "uxsim";
version = "1.7.1";
version = "1.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "toruseo";
repo = "UXsim";
tag = "v${version}";
hash = "sha256-lN9kcpNVSPNRWwF9rltweqHJpzqsYrKeP0KEQRwiltk=";
hash = "sha256-5up44edivGWj0nQOOL3+lqjdOBBfxk01nFokG5ht+5Y=";
};
patches = [ ./add-qt-plugin-path-to-env.patch ];
pkgs/development/tools/ocaml/merlin/4.x.nix
+11 -9
View File
@@ -20,14 +20,15 @@
"4.12.1" = "4.7-412";
"4.13.0" = "4.7-413";
"4.13.1" = "4.7-413";
"4.14.0" = "4.17.1-414";
"4.14.1" = "4.17.1-414";
"4.14.2" = "4.17.1-414";
"4.14.0" = "4.18-414";
"4.14.1" = "4.18-414";
"4.14.2" = "4.18-414";
"5.0.0" = "4.14-500";
"5.1.0" = "4.17.1-501";
"5.1.1" = "4.17.1-501";
"5.2.0" = "5.2.1-502";
"5.2.1" = "5.2.1-502";
"5.2.0" = "5.3-502";
"5.2.1" = "5.3-502";
"5.3.0" = "5.4.1-503";
}
."${ocaml.version}",
}:
@@ -38,11 +39,12 @@ let
"4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
"4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
"4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4=";
"4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0=";
"4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY=";
"4.17.1-414" = "sha256-vz+AbvSGMgU4YdVLc73vlTm6QhivAh2LCsrY435kX8Y=";
"4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; # Used by ocaml-lsp
"4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; # Used by ocaml-lsp
"4.18-414" = "sha256-9tb3omYUHjWMGoaWEsgTXIWRhdVH6julya17tn/jDME=";
"4.17.1-501" = "sha256-N2cHqocfCeljlFbT++S4miHJrXXHdOlMu75n+EKwpQA=";
"5.2.1-502" = "sha256-XALccbLTG2GYUcFKlluRxlCk281Jv1YATu5h4MWNWEw=";
"5.3-502" = "sha256-LOpG8SOX+m4x7wwNT14Rwc/ZFu5JQgaUAFyV67OqJLw=";
"5.4.1-503" = "sha256-SbO0x3jBISX8dAXnN5CwsxLV15dJ3XPUg4tlYqJTMCI=";
};
in
pkgs/top-level/all-packages.nix
+3 -4
View File
@@ -14058,8 +14058,9 @@ with pkgs;
k3s_1_29
k3s_1_30
k3s_1_31
k3s_1_32
;
k3s = k3s_1_31;
k3s = k3s_1_32;
kapow = libsForQt5.callPackage ../applications/misc/kapow { };
@@ -14686,9 +14687,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
ffmpeg = ffmpeg-full;
};
obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { };
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -4212,6 +4212,8 @@ self: super: with self; {
eradicate = callPackage ../development/python-modules/eradicate { };
eris = callPackage ../development/python-modules/eris { };
es-client = callPackage ../development/python-modules/es-client { };
esig = callPackage ../development/python-modules/esig { };