Merge staging-next into staging
This commit is contained in:
@@ -18195,12 +18195,6 @@
|
||||
githubId = 61601147;
|
||||
name = "basti n00b0ss";
|
||||
};
|
||||
n0emis = {
|
||||
email = "nixpkgs@n0emis.network";
|
||||
github = "n0emis";
|
||||
githubId = 22817873;
|
||||
name = "Ember Keske";
|
||||
};
|
||||
n3oney = {
|
||||
name = "Michał Minarowski";
|
||||
email = "nixpkgs@neoney.dev";
|
||||
@@ -29179,6 +29173,12 @@
|
||||
githubId = 17357089;
|
||||
name = "Soham Sen";
|
||||
};
|
||||
yureka-wdz = {
|
||||
email = "yureka@wdz.de";
|
||||
github = "yureka-wdz";
|
||||
githubId = 255085068;
|
||||
name = "Yureka (WDZ)";
|
||||
};
|
||||
yuriaisaka = {
|
||||
email = "yuri.aisaka+nix@gmail.com";
|
||||
github = "yuriaisaka";
|
||||
|
||||
@@ -836,16 +836,6 @@ with lib.maintainers;
|
||||
shortName = "coqui-ai TTS";
|
||||
};
|
||||
|
||||
wdz = {
|
||||
members = [
|
||||
n0emis
|
||||
johannwagner
|
||||
yuka
|
||||
];
|
||||
scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
|
||||
shortName = "WDZ GmbH";
|
||||
};
|
||||
|
||||
windows = {
|
||||
members = [
|
||||
RossSmyth
|
||||
|
||||
@@ -824,5 +824,8 @@ in
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ netali ] ++ lib.teams.wdz.members;
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
netali
|
||||
johannwagner
|
||||
];
|
||||
}
|
||||
|
||||
@@ -245,5 +245,5 @@ in
|
||||
})
|
||||
];
|
||||
|
||||
meta.maintainers = lib.teams.wdz.members;
|
||||
meta.maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
}
|
||||
|
||||
@@ -420,5 +420,5 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ yuka ];
|
||||
meta.maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
{
|
||||
name = "fastnetmon-advanced";
|
||||
meta.maintainers = lib.teams.wdz.members;
|
||||
meta.maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
|
||||
nodes = {
|
||||
bird =
|
||||
|
||||
@@ -6,7 +6,7 @@ let
|
||||
in
|
||||
{
|
||||
name = "librenms";
|
||||
meta.maintainers = lib.teams.wdz.members;
|
||||
meta.maintainers = with lib.maintainers; [ johannwagner ];
|
||||
|
||||
nodes.librenms = {
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
{
|
||||
name = "peering-manager";
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ yuka ];
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
@@ -314,8 +314,9 @@ let
|
||||
in
|
||||
|
||||
(toVimPlugin (
|
||||
stdenv.mkDerivation {
|
||||
name = "nvim-treesitter-grammar-${name}";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nvim-treesitter-grammar-${name}";
|
||||
inherit (grammar) version;
|
||||
|
||||
origGrammar = grammar;
|
||||
grammarName = name;
|
||||
@@ -349,7 +350,7 @@ let
|
||||
platforms = lib.platforms.all;
|
||||
}
|
||||
// grammar.meta;
|
||||
}
|
||||
})
|
||||
));
|
||||
|
||||
/*
|
||||
|
||||
@@ -494,8 +494,11 @@ rec {
|
||||
|
||||
toVimPlugin =
|
||||
drv:
|
||||
let
|
||||
drv-name = drv.name or "${drv.pname}-${drv.version}";
|
||||
in
|
||||
drv.overrideAttrs (oldAttrs: {
|
||||
name = "vimplugin-${oldAttrs.name}";
|
||||
name = "vimplugin-${drv-name}";
|
||||
# dont move the "doc" folder since vim expects it
|
||||
forceShare = [
|
||||
"man"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-01-05";
|
||||
version = "0-unstable-2026-01-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "bb6896e8cfd7346b0ddecb43752c854f1c7866f1";
|
||||
hash = "sha256-tmIQz7bVuIR1htedyCpOBPn3icr1uiOQ01iFJRhxi9s=";
|
||||
rev = "48ddb5671398cd0b96901f0ba7ec2543df8548eb";
|
||||
hash = "sha256-xZJG4Bjh3Nkb7IOGIBZmcRF92eFT3C/dNTSJ0RAFFTA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -191,13 +191,13 @@
|
||||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"cloudamqp_cloudamqp": {
|
||||
"hash": "sha256-2axehrpi72BFymgCICkXMjDdBsLplAh+eDqmo/bvvJY=",
|
||||
"hash": "sha256-rUKpwJISR2OiSMkj+zo0+mXOLjyUrJ9yqvKVfj2j/1w=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.41.0",
|
||||
"rev": "v1.41.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-sb3hfseEj7cm76MdYColhDtKzN0aKUDm7DT+7nZIuk8="
|
||||
"vendorHash": "sha256-l30Jv7FYOLNrlC9f89pqziq29jkSjuWz/N26m98rMak="
|
||||
},
|
||||
"cloudflare_cloudflare": {
|
||||
"hash": "sha256-QBGgXdwmF6S2hmFGHPCBA+v8VBiOxX1T199ws0AKVhk=",
|
||||
@@ -1310,11 +1310,11 @@
|
||||
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-hyQUHz7FWysK+AdCG6FrDch8hEFHWtB8Hp8q2B5tGAs=",
|
||||
"hash": "sha256-VgmXFRmwgCkGMwcle0zop41pr+uuj4ILlNXIcHQ9n0g=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.82.51",
|
||||
"rev": "v1.82.54",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
+397
-397
File diff suppressed because it is too large
Load Diff
@@ -61,7 +61,9 @@ python3Packages.buildPythonPackage rec {
|
||||
homepage = "https://github.com/pierky/arouteserver";
|
||||
changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst";
|
||||
license = with lib.licenses; [ gpl3Only ];
|
||||
maintainers = with lib.maintainers; [ marcel ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [
|
||||
marcel
|
||||
johannwagner
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/rtbrick/bngblaster/";
|
||||
changelog = "https://github.com/rtbrick/bngblaster/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ johannwagner ];
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -76,8 +76,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/camunda/camunda-modeler";
|
||||
description = "Integrated modeling solution for BPMN, DMN and Forms based on bpmn.io";
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ vringar ];
|
||||
maintainers = with lib.maintainers; [
|
||||
vringar
|
||||
johannwagner
|
||||
];
|
||||
license = lib.licenses.mit;
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "camunda-modeler";
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.80.0";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-gb0EG0vSNhC8O1JxjCP9nX74LkR8geGsNe8w6LH85xk=";
|
||||
hash = "sha256-vaIloTD994jbGSEiU1NbVpIiWZCV/Rj0NjOvbD7smgU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-ks7sBfYmdFUrjFGB/hXvZzHjkQT5LBh64hiC5SpEhF8=";
|
||||
cargoHash = "sha256-wCLngmqsIPT1ZEipP+cwBysCGaoZNpfIA0gfxcHNmBo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.57.0";
|
||||
version = "2.57.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bdzD+od+KyEqkFixqGf/7O//1nHO9i0jzg65NRDIN7I=";
|
||||
hash = "sha256-svv6JPRgiXzzjL/CjtEybo0A1B8jr1K0xRO9lCBj1J4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://fastnetmon.com";
|
||||
changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}";
|
||||
license = lib.licenses.eupl12;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
mainProgram = "fernglas";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grandorgue";
|
||||
version = "3.16.1-1";
|
||||
version = "3.16.3-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrandOrgue";
|
||||
repo = "grandorgue";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-GaO05zFurxnOOUjUpeR5j0lP4EYR/EgxFpdgwfYHG9M=";
|
||||
hash = "sha256-A6Gc9kCtohz1nWj/fmYsyXM0X3uJxEmDK2N2Dr5CW1U=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin-fixes.patch ];
|
||||
|
||||
@@ -30,7 +30,9 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "iperf3d";
|
||||
homepage = "https://github.com/wobcom/iperf3d";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ netali ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [
|
||||
netali
|
||||
johannwagner
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -157,6 +157,6 @@ py.pkgs.buildPythonPackage rec {
|
||||
description = "Internet Routing Registry database server, processing IRR objects in the RPSL format";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/irrdnet/irrd";
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,9 +7,7 @@
|
||||
|
||||
with rPackages;
|
||||
let
|
||||
buildRPackage' = args: buildRPackage ({ name = "${args.pname}-${args.version}"; } // args);
|
||||
|
||||
jaspGraphs = buildRPackage' {
|
||||
jaspGraphs = buildRPackage {
|
||||
pname = "jaspGraphs";
|
||||
version = "0.19.2-unstable-2025-07-25";
|
||||
|
||||
@@ -41,7 +39,7 @@ let
|
||||
hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI=";
|
||||
};
|
||||
|
||||
jaspBase = buildRPackage' {
|
||||
jaspBase = buildRPackage {
|
||||
pname = "jaspBase";
|
||||
version = jasp-version;
|
||||
|
||||
@@ -82,7 +80,7 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
stanova = buildRPackage' {
|
||||
stanova = buildRPackage {
|
||||
pname = "stanova";
|
||||
version = "0.3-unstable-2021-06-06";
|
||||
|
||||
@@ -102,7 +100,7 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
bstats = buildRPackage' {
|
||||
bstats = buildRPackage {
|
||||
pname = "bstats";
|
||||
version = "0.0.0.9004-unstable-2023-09-08";
|
||||
|
||||
@@ -120,7 +118,7 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
flexplot = buildRPackage' {
|
||||
flexplot = buildRPackage {
|
||||
pname = "flexplot";
|
||||
version = "0.25.5";
|
||||
|
||||
@@ -153,7 +151,7 @@ let
|
||||
};
|
||||
|
||||
# conting has been removed from CRAN
|
||||
conting' = buildRPackage' {
|
||||
conting' = buildRPackage {
|
||||
pname = "conting";
|
||||
version = "1.7.9999";
|
||||
|
||||
@@ -180,7 +178,7 @@ let
|
||||
hash,
|
||||
deps,
|
||||
}:
|
||||
buildRPackage' {
|
||||
buildRPackage {
|
||||
inherit pname version;
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-source";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyworktree";
|
||||
version = "1.20.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "lazyworktree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-V+FViC68RCoVhIQdFX46er3t27colvyY3iyiKIiMEm8=";
|
||||
hash = "sha256-qF9196fzKgU9iS7wlOBCYqxtxsauri7CWBEAPCVxo9g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0O8i84mzAYq/VUWn0vbHf218hwXRMAvlfKnBUYXo8Ck=";
|
||||
vendorHash = "sha256-Ch/SsuHrCIFefIuQgK0fp5qSg9JX1zPwLEDsMDYIqxE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -28,11 +28,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lbdb";
|
||||
version = "0.56";
|
||||
version = "0.57";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.spinnaker.de/lbdb/download/lbdb-${version}.tar.gz";
|
||||
sha256 = "sha256-uqaiO2E5TXkreyIeGWHZulcQYUyTJOj1mzXBJsK0504=";
|
||||
sha256 = "sha256-IS/i5A317T5Ulrxegh5LBoOmyVI7iIXn6HtjS8+SOog=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -43,6 +43,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/rtbrick/libdict/releases/tag/${finalAttrs.version}";
|
||||
description = "C library of key-value data structures";
|
||||
license = lib.licenses.bsd2;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -128,8 +128,10 @@ phpPackage.buildComposerProject2 rec {
|
||||
description = "Auto-discovering PHP/MySQL/SNMP based network monitoring";
|
||||
homepage = "https://www.librenms.org/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ netali ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [
|
||||
netali
|
||||
johannwagner
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
nixos-icons,
|
||||
buildPackages,
|
||||
customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png",
|
||||
withChainloading ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -52,8 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
]
|
||||
++ lib.optionals withChainloading [
|
||||
rustPackages.rustc
|
||||
rustPackages.cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
@@ -70,9 +67,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeFlags = [
|
||||
"ARCH=${stdenv.cc.targetPrefix}"
|
||||
"RELEASE=1"
|
||||
"CHAINLOADING=1"
|
||||
]
|
||||
++ lib.optional (customLogo != null) "LOGO=custom"
|
||||
++ lib.optional withChainloading "CHAINLOADING=1";
|
||||
++ lib.optional (customLogo != null) "LOGO=custom";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -10,20 +10,15 @@
|
||||
nix-update-script,
|
||||
testers,
|
||||
matrix-continuwuity,
|
||||
enableBlurhashing ? true,
|
||||
# upstream continuwuity enables jemalloc by default, so we follow suit
|
||||
enableJemalloc ? true,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
enableLiburing ? stdenv.hostPlatform.isLinux,
|
||||
liburing,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
rocksdb' =
|
||||
(rocksdb.override {
|
||||
inherit enableLiburing;
|
||||
# rocksdb does not support prefixed jemalloc, which is required on darwin
|
||||
enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin;
|
||||
enableJemalloc = !stdenv.hostPlatform.isDarwin;
|
||||
jemalloc = rust-jemalloc-sys-unprefixed;
|
||||
}).overrideAttrs
|
||||
(
|
||||
@@ -77,17 +72,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-continuwuity";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "forgejo.ellis.link";
|
||||
owner = "continuwuation";
|
||||
repo = "continuwuity";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g2KidOlYvJgGsiX2qq9pmJjLmzVgbJHv8VaulYIiKKo=";
|
||||
hash = "sha256-9gDVhBuWBiXkzOxx0DyJFRV32QFwkKKpORb4I4xtdKw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nOawYriRWw6O890J6V/InKlijCO6CqwvIuOOTjorJns=";
|
||||
cargoHash = "sha256-seJ9zaFMfSm/77n33SJ60/Ux1ovWUbkyi5M8x3kuBhU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -97,11 +92,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildInputs = [
|
||||
bzip2
|
||||
zstd
|
||||
]
|
||||
++ lib.optional enableJemalloc [
|
||||
rust-jemalloc-sys-unprefixed
|
||||
]
|
||||
++ lib.optional enableLiburing liburing;
|
||||
liburing
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
@@ -109,31 +102,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
|
||||
};
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
# See https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/Cargo.toml
|
||||
# for available features.
|
||||
# We enable all default features except jemalloc, blurhashing, and io_uring, which
|
||||
# we guard behind our own (default-enabled) flags.
|
||||
buildFeatures = [
|
||||
"brotli_compression"
|
||||
"direct_tls"
|
||||
"element_hacks"
|
||||
"gzip_compression"
|
||||
"media_thumbnail"
|
||||
"release_max_log_level"
|
||||
"systemd"
|
||||
"url_preview"
|
||||
"zstd_compression"
|
||||
"bindgen-runtime"
|
||||
"ldap"
|
||||
]
|
||||
++ lib.optional enableBlurhashing "blurhashing"
|
||||
++ lib.optional enableJemalloc [
|
||||
"jemalloc"
|
||||
"jemalloc_conf"
|
||||
]
|
||||
++ lib.optional enableLiburing "io_uring";
|
||||
|
||||
passthru = {
|
||||
rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-01-11";
|
||||
version = "0-unstable-2026-01-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "5771ec68d0d780820d7bdf94671db72bb78a29e2";
|
||||
hash = "sha256-+S7TqNGSS4cZ3b8NEt+2o34cw8sCTXcHlL3d5vsuOWU=";
|
||||
rev = "db79e08e389c7d10994b5d5b99165c3e124da958";
|
||||
hash = "sha256-Z1EcHBDZSz6xUN4S9TSzRTbRLXoRQPuWx+a6myxxDMA=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -36,15 +36,12 @@ let
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
|
||||
|
||||
bun install \
|
||||
--filter=./packages/web \
|
||||
--force \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts \
|
||||
--no-progress \
|
||||
--production
|
||||
bun install \
|
||||
--cpu="*" \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts \
|
||||
--no-progress \
|
||||
--os="*"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -61,7 +58,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-E6QV2ruzEmglBZaQMKtAdKdVpxOiwDX7bMQM8jRsiqs=";
|
||||
outputHash = "sha256-E78Hb4ByMfYL/IZG911dX6XRRKNJ0UbQUWMSv0dclFo=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
@@ -116,5 +113,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ delafthi ];
|
||||
badPlatforms = [
|
||||
# error: Invalid DNS result order
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "opencode";
|
||||
version = "1.1.20";
|
||||
version = "1.1.21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CiOc6gHlZBbwciA1r27axE4fF+ARz4NPkjUFXO77Gdo=";
|
||||
hash = "sha256-8ykONBWMiq9EACHOsdx1AFPoj53Tsxi3EbUDVciH5Ok=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -66,7 +66,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-PFtYvhQJLWj2kHQPj6PsPjy7mKUS07dJ03A2IWd943w=";
|
||||
outputHash = "sha256-gl/5eA4nPLQ2clOcAf0D8/ocjRO4xBm5AQtqrcSdkTw=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
description = "MAC Address CLI Toolkit";
|
||||
homepage = "https://github.com/thatmattlove/oui";
|
||||
license = with lib.licenses; [ bsd3 ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ johannwagner ];
|
||||
mainProgram = "oui";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,8 +32,8 @@ bundlerApp {
|
||||
maintainers = with lib.maintainers; [
|
||||
nicknovitski
|
||||
liberodark
|
||||
johannwagner
|
||||
];
|
||||
teams = with lib.teams; [ wdz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
license = lib.licenses.asl20;
|
||||
description = "BGP sessions management tool";
|
||||
mainProgram = "peering-manager";
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ yureka-wdz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plocate";
|
||||
version = "1.1.23";
|
||||
version = "1.1.24";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sesse.net/plocate";
|
||||
rev = version;
|
||||
sha256 = "sha256-TWQ2mVzosB6sGNUXI2D9GGqgaRZcmiL9GSGrrusck5Q=";
|
||||
sha256 = "sha256-VvHptw/PG2uWflTmGNCj1PXIguXv9Bikz8qj2hRMnaQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
nodejs_20,
|
||||
makeWrapper,
|
||||
jre,
|
||||
fetchzip,
|
||||
@@ -40,9 +39,7 @@ let
|
||||
# Build the Quint CLI from source
|
||||
quint-cli = buildNpmPackage {
|
||||
pname = "quint-cli";
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [ nodejs_20 ];
|
||||
inherit version src nodejs;
|
||||
|
||||
sourceRoot = "${src.name}/quint";
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "scaleway-cli";
|
||||
version = "2.49.0";
|
||||
version = "2.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "scaleway-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l9SEM9SNLt2K4QsrYkLA+eZQTe5nXl/Ds2v84qltwTE=";
|
||||
hash = "sha256-4c8ikz/ksulr1tfsIQDKbPYK3PwlmO0rtOn4n6ak3ZM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4k90jyi3IPtL4maFGEiQmrQnC8tQOa8X8JJiUulh9y0=";
|
||||
vendorHash = "sha256-WIBeWQy4nterTEi8wqsy1bhlH6opXJDvtdxXU2jEv+Y=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -20,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-11ecQFiBaWOZcbS5Qqf/41heiJM1wSttx0eMoVQImZc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.is32bit [
|
||||
# Fix 32bit build
|
||||
# https://sourceware.org/git/?p=systemtap.git;a=commit;h=94efb7c4eb02de0e3565cb165b53963602d3dcb6
|
||||
# does not apply with fetchpatch because of gitweb encoding issues
|
||||
./systemtap-elaborate-fix-32bit-build.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cpio
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
From 94efb7c4eb02de0e3565cb165b53963602d3dcb6 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Sun, 30 Nov 2025 20:58:01 +0000
|
||||
Subject: [PATCH] elaborate.cxx: fix 32-bit build
|
||||
|
||||
Without the change the build fails on i686-linux as:
|
||||
|
||||
elaborate.cxx:5119:33: error:
|
||||
format '%ld' expects argument of type 'long int',
|
||||
but argument 2 has type 'int64_t' {aka 'long long int'} [-Werror=format=]
|
||||
5119 | session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
---
|
||||
elaborate.cxx | 2 +-
|
||||
po/cs.po | 2 +-
|
||||
po/en.po | 2 +-
|
||||
po/fr.po | 2 +-
|
||||
po/pl.po | 2 +-
|
||||
po/systemtap.pot | 2 +-
|
||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/elaborate.cxx b/elaborate.cxx
|
||||
index 93ecffa1a..3ad3614e7 100644
|
||||
--- a/elaborate.cxx
|
||||
+++ b/elaborate.cxx
|
||||
@@ -5116,7 +5116,7 @@ const_folder::visit_defined_op (defined_op* e)
|
||||
// Don't be greedy... we'll only collapse one at a time so type
|
||||
// resolution can have another go at it.
|
||||
relaxed_p = false;
|
||||
- session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
|
||||
+ session.print_warning (_F("Collapsing unresolved @define to %lld [stapprobes]", (long long)value), e->tok);
|
||||
literal_number* n = new literal_number (value);
|
||||
n->tok = e->tok;
|
||||
n->visit (this);
|
||||
diff --git a/po/cs.po b/po/cs.po
|
||||
index df6412772..92fdef7ad 100644
|
||||
--- a/po/cs.po
|
||||
+++ b/po/cs.po
|
||||
@@ -2039,7 +2039,7 @@ msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
|
||||
|
||||
#: elaborate.cxx:5119
|
||||
#, fuzzy, c-format
|
||||
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
|
||||
+msgid "Collapsing unresolved @define to %lld [stapprobes]"
|
||||
msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
|
||||
|
||||
#: elaborate.cxx:5127
|
||||
diff --git a/po/en.po b/po/en.po
|
||||
index 8847639e8..1db2292bd 100644
|
||||
--- a/po/en.po
|
||||
+++ b/po/en.po
|
||||
@@ -2050,7 +2050,7 @@ msgstr ""
|
||||
|
||||
#: elaborate.cxx:5119
|
||||
#, c-format
|
||||
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
|
||||
+msgid "Collapsing unresolved @define to %lld [stapprobes]"
|
||||
msgstr ""
|
||||
|
||||
#: elaborate.cxx:5127
|
||||
diff --git a/po/fr.po b/po/fr.po
|
||||
index b8677707b..55e409919 100644
|
||||
--- a/po/fr.po
|
||||
+++ b/po/fr.po
|
||||
@@ -2090,7 +2090,7 @@ msgstr ""
|
||||
|
||||
#: elaborate.cxx:5119
|
||||
#, c-format
|
||||
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
|
||||
+msgid "Collapsing unresolved @define to %lld [stapprobes]"
|
||||
msgstr ""
|
||||
|
||||
#: elaborate.cxx:5127
|
||||
diff --git a/po/pl.po b/po/pl.po
|
||||
index e3b6700ee..0b35880c1 100644
|
||||
--- a/po/pl.po
|
||||
+++ b/po/pl.po
|
||||
@@ -1977,7 +1977,7 @@ msgstr ""
|
||||
|
||||
#: elaborate.cxx:5119
|
||||
#, c-format
|
||||
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
|
||||
+msgid "Collapsing unresolved @define to %lld [stapprobes]"
|
||||
msgstr ""
|
||||
|
||||
#: elaborate.cxx:5127
|
||||
diff --git a/po/systemtap.pot b/po/systemtap.pot
|
||||
index 32ddb2290..4ec0d9a8c 100644
|
||||
--- a/po/systemtap.pot
|
||||
+++ b/po/systemtap.pot
|
||||
@@ -1973,7 +1973,7 @@ msgstr ""
|
||||
|
||||
#: elaborate.cxx:5119
|
||||
#, c-format
|
||||
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
|
||||
+msgid "Collapsing unresolved @define to %lld [stapprobes]"
|
||||
msgstr ""
|
||||
|
||||
#: elaborate.cxx:5127
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "worker-build";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qhqMGvjVFgTmYXXrsMF5pJJebARXPqD7q/KmUtG0zqQ=";
|
||||
hash = "sha256-OWtlW9aJwDIfwRK6y1ajx8OLL1mMhbr6RDPuk+8Pyo0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YJHcziwrdK0mlmGS46IYIwVfy/DCsKgCB3/aq14brt4=";
|
||||
cargoHash = "sha256-dcew0BCU1NqADquJ08MWLskrNox8LP/fA2QIC6LqETQ=";
|
||||
|
||||
buildAndTestSubdir = "worker-build";
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.218.6";
|
||||
version = "0.219.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fNwJWC48DqUECadQ12p+iCHR7pIueFFdu6QRdomJ6/o=";
|
||||
hash = "sha256-x0N+xGoWNQOXI/b6hityYy6ZbcAPTrzGKMbgCxDcHhM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-+8L4BaR7J+j7ytQ7JM8XbuAYDKzq8Hv3oKQFnN0TdK0=";
|
||||
cargoHash = "sha256-adHfP57EpqCOo8HSpuG1JTV6qNljz282PYgR32cCuxE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,10 +8,19 @@
|
||||
qtbase,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kwayland";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/plasma/kwayland/-/commit/0954a179d4ef72597efea44a91071eb9a55a385f.diff";
|
||||
hash = "sha256-TB9ZIYV58E41rA8mP5MXjIKZUOdH/rZfOYsgUlV+QLk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wayland-scanner
|
||||
|
||||
@@ -27,6 +27,5 @@ buildPecl {
|
||||
description = "PHP bindings to RRD tool system";
|
||||
license = lib.licenses.bsd0;
|
||||
homepage = "https://github.com/php/pecl-processing-rrd";
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,6 +45,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/job/aggregate6";
|
||||
license = with lib.licenses; [ bsd2 ];
|
||||
maintainers = with lib.maintainers; [ marcel ];
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,6 +27,5 @@ buildPythonPackage rec {
|
||||
description = "Access logger for ASGI servers";
|
||||
homepage = "https://github.com/Kludex/asgi-logger";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -123,6 +123,13 @@ buildPythonPackage rec {
|
||||
"test_stamping_headers_in_options"
|
||||
"test_stamping_with_replace"
|
||||
|
||||
# Celery tries to look up group ID (e.g. 30000)
|
||||
# which does not reliably succeed in the sandbox on linux,
|
||||
# so it throws a security error as if we were running as root.
|
||||
# https://github.com/celery/celery/blob/0527296acb1f1790788301d4395ba6d5ce2a9704/celery/platforms.py#L807-L814
|
||||
"test_regression_worker_startup_info"
|
||||
"test_check_privileges"
|
||||
|
||||
# Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review)
|
||||
"test_check_privileges_without_c_force_root_and_no_group_entry"
|
||||
]
|
||||
|
||||
@@ -69,6 +69,8 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# AssertionError: [Chex] Assertion assert_trees_all_close failed
|
||||
"test_collection_mixed_async"
|
||||
# flaky under load
|
||||
"test_async_execution"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -36,6 +36,5 @@ buildPythonPackage rec {
|
||||
'';
|
||||
changelog = "https://github.com/netinvent/command_runner/releases/tag/${src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -75,6 +75,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/alisaifee/coredis";
|
||||
changelog = "https://github.com/alisaifee/coredis/blob/${src.tag}/HISTORY.rst";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,6 +33,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/alex-oleshkevich/imia/releases/tag/v${version}";
|
||||
homepage = "https://github.com/alex-oleshkevich/imia";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,17 +5,25 @@
|
||||
fetchpatch2,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
hatchling,
|
||||
|
||||
# build-system
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
packaging,
|
||||
importlib-resources,
|
||||
typing-extensions,
|
||||
|
||||
# optional-dependencies
|
||||
pydicom,
|
||||
pillow,
|
||||
h5py,
|
||||
scipy,
|
||||
git,
|
||||
|
||||
addBinToPathHook,
|
||||
gitMinimal,
|
||||
pytest-doctestplus,
|
||||
pytest-httpserver,
|
||||
pytest-xdist,
|
||||
@@ -42,8 +50,8 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -53,19 +61,20 @@ buildPythonPackage (finalAttrs: {
|
||||
++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]
|
||||
++ lib.optionals (pythonOlder "3.13") [ typing-extensions ];
|
||||
|
||||
optional-dependencies = rec {
|
||||
all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd;
|
||||
optional-dependencies = lib.fix (self: {
|
||||
all = self.dicom ++ self.dicomfs ++ self.minc2 ++ self.spm ++ self.zstd;
|
||||
dicom = [ pydicom ];
|
||||
dicomfs = [ pillow ] ++ dicom;
|
||||
dicomfs = [ pillow ] ++ self.dicom;
|
||||
minc2 = [ h5py ];
|
||||
spm = [ scipy ];
|
||||
zstd = [
|
||||
# TODO: pyzstd
|
||||
];
|
||||
};
|
||||
});
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
addBinToPathHook
|
||||
gitMinimal
|
||||
pytest-doctestplus
|
||||
pytest-httpserver
|
||||
pytest-xdist
|
||||
@@ -78,10 +87,6 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_deprecator_maker"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://nipy.org/nibabel";
|
||||
changelog = "https://github.com/nipy/nibabel/blob/${finalAttrs.version}/Changelog";
|
||||
|
||||
@@ -43,6 +43,5 @@ buildPythonPackage rec {
|
||||
isc
|
||||
bsdOriginal
|
||||
];
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ let
|
||||
hash = "sha256-ji7SppKdiszaXs8yCSIPkJj4Ld++XWNw9FuxLoFLfFo=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydicom";
|
||||
version = "3.0.1";
|
||||
pyproject = true;
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydicom";
|
||||
repo = "pydicom";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SvRevQehRaSp+vCtJRQVEJiC5noIJS+bGG1/q4p7/XU=";
|
||||
};
|
||||
|
||||
@@ -60,7 +60,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ optional-dependencies.pixeldata;
|
||||
++ finalAttrs.passthru.optional-dependencies.pixeldata;
|
||||
|
||||
passthru.pydicom-data = test_data;
|
||||
|
||||
@@ -105,16 +105,8 @@ buildPythonPackage rec {
|
||||
description = "Python package for working with DICOM files";
|
||||
mainProgram = "pydicom";
|
||||
homepage = "https://pydicom.github.io";
|
||||
changelog = "https://github.com/pydicom/pydicom/releases/tag/v${version}";
|
||||
changelog = "https://github.com/pydicom/pydicom/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
badPlatforms = [
|
||||
# > 200 tests are failing with errors like:
|
||||
# AttributeError: 'FileDataset' object has no attribute 'BitsStored'
|
||||
# AttributeError: 'FileDataset' object has no attribute 'Rows'
|
||||
# AttributeError: The dataset has no 'Pixel Data', 'Float Pixel Data' or 'Double Float Pixel Data' element, no pixel data to decode
|
||||
# pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header.
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,6 +38,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/peering-manager/pyixapi/";
|
||||
changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,6 +46,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/bebleo/smtpdfix";
|
||||
changelog = "https://github.com/bebleo/smtpdfix/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,6 +43,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/muicss/starlette-wtf/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/muicss/starlette-wtf";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,6 +34,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/LaunchPlatform/wtforms-bootstrap5";
|
||||
changelog = "https://github.com/LaunchPlatform/wtforms-bootstrap5/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,7 +56,8 @@ let
|
||||
maintainers ? [ ],
|
||||
}:
|
||||
buildRPackage {
|
||||
name = "${name}-${version}";
|
||||
pname = name;
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
urls = mkUrls (args // { inherit name version; });
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
}:
|
||||
|
||||
{
|
||||
name,
|
||||
buildInputs ? [ ],
|
||||
requireX ? false,
|
||||
...
|
||||
@@ -78,6 +77,6 @@ stdenv.mkDerivation (
|
||||
}
|
||||
// attrs
|
||||
// {
|
||||
name = "r-" + name;
|
||||
name = "r-${attrs.name or "${attrs.pname}-${attrs.version}"}";
|
||||
}
|
||||
)
|
||||
|
||||
@@ -22,6 +22,6 @@ buildGoModule rec {
|
||||
mainProgram = "junos_exporter";
|
||||
homepage = "https://github.com/czerwonk/junos_exporter";
|
||||
license = lib.licenses.mit;
|
||||
teams = [ lib.teams.wdz ];
|
||||
maintainers = with lib.maintainers; [ johannwagner ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@ let
|
||||
in
|
||||
rec {
|
||||
openconnect = common {
|
||||
version = "9.12-unstable-2025-01-14";
|
||||
version = "9.12-unstable-2025-11-03";
|
||||
src = fetchFromGitLab {
|
||||
owner = "openconnect";
|
||||
repo = "openconnect";
|
||||
rev = "f17fe20d337b400b476a73326de642a9f63b59c8";
|
||||
hash = "sha256-OBEojqOf7cmGtDa9ToPaJUHrmBhq19/CyZ5agbP7WUw=";
|
||||
rev = "0dcdff87db65daf692dc323732831391d595d98d";
|
||||
hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -16,18 +16,23 @@ let
|
||||
{
|
||||
name = lib.showAttrPath path;
|
||||
value = {
|
||||
${if value ? "meta" then "meta" else null} = value.meta;
|
||||
${if value ? "name" then "name" else null} = value.name;
|
||||
${if value ? "outputName" then "outputName" else null} = value.outputName;
|
||||
inherit (value)
|
||||
meta
|
||||
name
|
||||
outputName
|
||||
system
|
||||
;
|
||||
${if value ? "outputs" then "outputs" else null} = lib.listToAttrs (
|
||||
lib.map (x: {
|
||||
name = x;
|
||||
value = null;
|
||||
}) value.outputs
|
||||
);
|
||||
${if value ? "pname" then "pname" else null} = value.pname;
|
||||
${if value ? "system" then "system" else null} = value.system;
|
||||
${if value ? "version" then "version" else null} = value.version;
|
||||
# TODO: Remove the following two fallbacks when all packages have been fixed.
|
||||
# Note: pname and version are *required* by repology, so do not change to
|
||||
# the optional pattern from above.
|
||||
pname = value.pname or value.name;
|
||||
version = value.version or "";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user