0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-03-20 00:16:05 +00:00 committed by GitHub
commit 47fbdfd4fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
119 changed files with 3988 additions and 386 deletions

View file

@ -156,6 +156,7 @@ let
makeScope makeScopeWithSplicing makeScopeWithSplicing' makeScope makeScopeWithSplicing makeScopeWithSplicing'
extendMkDerivation; extendMkDerivation;
inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate; inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
inherit (self.generators) mkLuaInline;
inherit (self.meta) addMetaAttrs dontDistribute setName updateName inherit (self.meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
hiPrioSet licensesSpdx getLicenseFromSpdxId getLicenseFromSpdxIdOr hiPrioSet licensesSpdx getLicenseFromSpdxId getLicenseFromSpdxIdOr

View file

@ -743,6 +743,8 @@ in rec {
"nil" "nil"
else if isInt v || isFloat v || isString v || isBool v then else if isInt v || isFloat v || isString v || isBool v then
toJSON v toJSON v
else if isPath v || isDerivation v then
toJSON "${v}"
else if isList v then else if isList v then
(if v == [ ] then "{}" else (if v == [ ] then "{}" else
"{${introSpace}${concatItems (map (value: "${toLua innerArgs value}") v)}${outroSpace}}") "{${introSpace}${concatItems (map (value: "${toLua innerArgs value}") v)}${outroSpace}}")
@ -752,8 +754,6 @@ in rec {
"(${v.expr})" "(${v.expr})"
else if v == { } then else if v == { } then
"{}" "{}"
else if isDerivation v then
''"${toString v}"''
else else
"{${introSpace}${concatItems ( "{${introSpace}${concatItems (
mapAttrsToList (key: value: "[${toJSON key}] = ${toLua innerArgs value}") v mapAttrsToList (key: value: "[${toJSON key}] = ${toLua innerArgs value}") v

View file

@ -834,6 +834,15 @@ rec {
}; };
}; };
# A value produced by `lib.mkLuaInline`
luaInline = mkOptionType {
name = "luaInline";
description = "inline lua";
descriptionClass = "noun";
check = x: x._type or null == "lua-inline";
merge = mergeEqualOption;
};
uniq = unique { message = ""; }; uniq = unique { message = ""; };
unique = { message }: type: mkOptionType rec { unique = { message }: type: mkOptionType rec {

View file

@ -9205,6 +9205,11 @@
github = "gytis-ivaskevicius"; github = "gytis-ivaskevicius";
githubId = 23264966; githubId = 23264966;
}; };
GZGavinZhao = {
name = "Gavin Zhao";
github = "GZGavinZhao";
githubId = 74938940;
};
h3cth0r = { h3cth0r = {
name = "Hector Miranda"; name = "Hector Miranda";
email = "hector.miranda@tec.mx"; email = "hector.miranda@tec.mx";
@ -10543,6 +10548,12 @@
githubId = 94313; githubId = 94313;
name = "Xianyi Lin"; name = "Xianyi Lin";
}; };
izelnakri = {
email = "contact@izelnakri.com";
github = "izelnakri";
githubId = 1190931;
name = "Izel Nakri";
};
izorkin = { izorkin = {
email = "Izorkin@gmail.com"; email = "Izorkin@gmail.com";
github = "Izorkin"; github = "Izorkin";
@ -14238,6 +14249,17 @@
githubId = 7910815; githubId = 7910815;
name = "Alex McGrath"; name = "Alex McGrath";
}; };
lykos153 = {
email = "silvio.ankermann@cloudandheat.com";
github = "Lykos153";
githubId = 6453662;
name = "Silvio Ankermann";
keys = [
{
fingerprint = "8D47 6294 7205 541C 62A4 9C88 F422 6CA3 971C 4E97";
}
];
};
lyn = { lyn = {
name = "Lyn"; name = "Lyn";
matrix = "@lynatic:catgirl.cloud"; matrix = "@lynatic:catgirl.cloud";
@ -22027,6 +22049,11 @@
githubId = 91412114; githubId = 91412114;
keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ]; keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ];
}; };
silvanshade = {
github = "silvanshade";
githubId = 11022302;
name = "silvanshade";
};
Silver-Golden = { Silver-Golden = {
name = "Brendan Golden"; name = "Brendan Golden";
email = "github+nixpkgs@brendan.ie"; email = "github+nixpkgs@brendan.ie";
@ -22551,6 +22578,13 @@
githubId = 47164123; githubId = 47164123;
name = "Spoonbaker"; name = "Spoonbaker";
}; };
sportshead = {
email = "me@sportshead.dev";
github = "sportshead";
githubId = 32637656;
name = "sportshead";
keys = [ { fingerprint = "A6B6 D031 782E BDF7 631A 8E7E A874 DB2C BFD3 CFD0"; } ];
};
sprock = { sprock = {
email = "rmason@mun.ca"; email = "rmason@mun.ca";
github = "sprock"; github = "sprock";

View file

@ -1018,8 +1018,9 @@ with lib.maintainers;
rocm = { rocm = {
members = [ members = [
Madouura
Flakebi Flakebi
GZGavinZhao
LunNova
mschwaig mschwaig
]; ];
githubTeams = [ "rocm-maintainers" ]; githubTeams = [ "rocm-maintainers" ];

View file

@ -232,6 +232,13 @@ merging is handled.
definitions cannot be merged. The regular expression is processed definitions cannot be merged. The regular expression is processed
using `builtins.match`. using `builtins.match`.
### Specialised types {#sec-option-types-specialised}
`types.luaInline`
: A string wrapped using `lib.mkLuaInline`. Allows embedding lua expressions
inline within generated lua. Multiple definitions cannot be merged.
## Submodule types {#sec-option-types-submodule} ## Submodule types {#sec-option-types-submodule}
Submodules are detailed in [Submodule](#section-option-types-submodule). Submodules are detailed in [Submodule](#section-option-types-submodule).

View file

@ -402,6 +402,31 @@ have a predefined type and string generator already declared under
: Outputs the given attribute set as an Elixir map, instead of the : Outputs the given attribute set as an Elixir map, instead of the
default Elixir keyword list default Elixir keyword list
`pkgs.formats.lua { asBindings ? false, multiline ? true, columnWidth ? 100, indentWidth ? 2, indentUsingTabs ? false }`
: A function taking an attribute set with values
`asBindings` (default `false`)
: Whether to treat attributes as variable bindings
`multiline` (default `true`)
: Whether to procude a multiline output. The output may still wrap across
multiple lines if it would otherwise exceed `columnWidth`.
`columnWidth` (default `100`)
: The column width to use to attempt to wrap lines.
`indentWidth` (default `2`)
: The width of a single indentation level.
`indentUsingTabs` (default `false`)
: Whether the indentation should use tabs instead of spaces.
`pkgs.formats.php { finalVariable }` []{#pkgs-formats-php} `pkgs.formats.php { finalVariable }` []{#pkgs-formats-php}
: A function taking an attribute set with values : A function taking an attribute set with values

View file

@ -1592,6 +1592,9 @@
"sec-option-types-string": [ "sec-option-types-string": [
"index.html#sec-option-types-string" "index.html#sec-option-types-string"
], ],
"sec-option-types-specialised": [
"index.html#sec-option-types-specialised"
],
"sec-option-types-submodule": [ "sec-option-types-submodule": [
"index.html#sec-option-types-submodule" "index.html#sec-option-types-submodule"
], ],

View file

@ -19,6 +19,7 @@ let
kernel = config.system.modulesTree; kernel = config.system.modulesTree;
firmware = config.hardware.firmware; firmware = config.hardware.firmware;
allowMissing = false; allowMissing = false;
inherit (config.boot.initrd) extraFirmwarePaths;
}; };
@ -484,6 +485,14 @@ in
''; '';
}; };
boot.initrd.extraFirmwarePaths = mkOption {
default = [ ];
type = types.listOf types.str;
description = ''
Other firmware files (relative to `"''${config.hardware.firmware}/lib/firmware"`) to include in the final initrd we are building.
'';
};
boot.initrd.checkJournalingFS = mkOption { boot.initrd.checkJournalingFS = mkOption {
default = true; default = true;
type = types.bool; type = types.bool;

View file

@ -104,7 +104,7 @@ let
"sleep.target" "sleep.target"
"hybrid-sleep.target" "hybrid-sleep.target"
"systemd-hibernate.service" "systemd-hibernate.service"
"systemd-hibernate-clear.service" ] ++ (lib.optional cfg.package.withEfi "systemd-hibernate-clear.service") ++ [
"systemd-hybrid-sleep.service" "systemd-hybrid-sleep.service"
"systemd-suspend.service" "systemd-suspend.service"
"systemd-suspend-then-hibernate.service" "systemd-suspend-then-hibernate.service"
@ -130,11 +130,13 @@ let
"systemd-ask-password-wall.service" "systemd-ask-password-wall.service"
# Varlink APIs # Varlink APIs
] ++ lib.optionals cfg.package.withBootloader [
"systemd-bootctl@.service" "systemd-bootctl@.service"
"systemd-bootctl.socket" "systemd-bootctl.socket"
] ++ [
"systemd-creds@.service" "systemd-creds@.service"
"systemd-creds.socket" "systemd-creds.socket"
] ++ lib.optional cfg.package.withTpm2Tss [ ] ++ lib.optional cfg.package.withTpm2Units [
"systemd-pcrlock@.service" "systemd-pcrlock@.service"
"systemd-pcrlock.socket" "systemd-pcrlock.socket"
] ++ [ ] ++ [

View file

@ -105,6 +105,7 @@ let
kernel = config.system.modulesTree; kernel = config.system.modulesTree;
firmware = config.hardware.firmware; firmware = config.hardware.firmware;
allowMissing = false; allowMissing = false;
inherit (config.boot.initrd) extraFirmwarePaths;
}; };
initrdBinEnv = pkgs.buildEnv { initrdBinEnv = pkgs.buildEnv {

View file

@ -27,13 +27,13 @@
options = { options = {
systemd.tpm2.enable = lib.mkEnableOption "systemd TPM2 support" // { systemd.tpm2.enable = lib.mkEnableOption "systemd TPM2 support" // {
default = config.systemd.package.withTpm2Tss; default = config.systemd.package.withTpm2Units;
defaultText = "systemd.package.withTpm2Tss"; defaultText = "systemd.package.withTpm2Units";
}; };
boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // { boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // {
default = config.boot.initrd.systemd.package.withTpm2Tss; default = config.boot.initrd.systemd.package.withTpm2Units;
defaultText = "boot.initrd.systemd.package.withTpm2Tss"; defaultText = "boot.initrd.systemd.package.withTpm2Units";
}; };
}; };

View file

@ -36,7 +36,7 @@ Before adding a new package, please consider the following questions:
If any of these questions' answer is no, then you should probably not add the package. If any of these questions' answer is no, then you should probably not add the package.
This is section describes a general framework of understanding and exceptions might apply. This section describes a general framework of understanding and exceptions might apply.
Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project. Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project.

View file

@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
publisher = "RooVeterinaryInc"; publisher = "RooVeterinaryInc";
name = "roo-cline"; name = "roo-cline";
version = "3.8.6"; version = "3.9.2";
hash = "sha256-t3QUqe0qYizrJQcsEmYYmNYS/cpYiHQXJHtzHk9MGS8="; hash = "sha256-zRVppwnYpw03L+socmxAtLnkD72Ag7Wz9B4BbxpdFrk=";
}; };
meta = { meta = {

View file

@ -12,7 +12,8 @@ let
pname = "1password"; pname = "1password";
versions = builtins.fromJSON (builtins.readFile ./versions.json); versions = builtins.fromJSON (builtins.readFile ./versions.json);
inherit (versions.${channel} or (throw "unknown channel ${channel}")) version; hostOs = if stdenv.hostPlatform.isLinux then "linux" else "darwin";
version = versions."${channel}-${hostOs}" or (throw "unknown channel-os ${channel}-${hostOs}");
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);

View file

@ -1,20 +1,20 @@
{ {
"stable": { "stable": {
"x86_64-linux": { "x86_64-linux": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.60.x64.tar.gz", "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.68.x64.tar.gz",
"hash": "sha256-QCoV66LvGo6vA5fjuE3fG+LwehKVMPmgaDghh9YEvmA=" "hash": "sha256-6MekdtKnjvrP0dai6VfBEFJ+oKf2WvPp+sU/kVIzCTw="
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.60.arm64.tar.gz", "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.68.arm64.tar.gz",
"hash": "sha256-E5TniXur9ATJ3ER/zTFc6EiBrH/kbNvIao0ADLyBZZE=" "hash": "sha256-2SpfkLu/4K1t2ILwOBMVAXeW7rbEzsjofn8naM1Szfc="
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://downloads.1password.com/mac/1Password-8.10.60-x86_64.zip", "url": "https://downloads.1password.com/mac/1Password-8.10.68-x86_64.zip",
"hash": "sha256-2Nv4CHKLgCFbU1TeJQhIq8YdkJSQJXtUw2S17B8cS4s=" "hash": "sha256-t/glPvEGJH+IcYyrnW0fMSEeLB8mKqGqmZ8wnVFCJpo="
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://downloads.1password.com/mac/1Password-8.10.60-aarch64.zip", "url": "https://downloads.1password.com/mac/1Password-8.10.68-aarch64.zip",
"hash": "sha256-drJiM8EiUM3M54+KPQdLvAmSfBH5YPqQk14yjHzoBtM=" "hash": "sha256-bhmuy8gUVCv+hYSIpYXgm8a0f1+JtyKb4g5cUIJCb28="
} }
}, },
"beta": { "beta": {

View file

@ -30,8 +30,8 @@ mk_url() {
} }
cleanup() { cleanup() {
if [[ -f ${GPG_KEYRING-} ]]; then if [[ -d ${TMP_GNUPGHOME-} ]]; then
rm "${GPG_KEYRING}" rm -r "${TMP_GNUPGHOME}"
fi fi
if [[ -f ${JSON_HEAP-} ]]; then if [[ -f ${JSON_HEAP-} ]]; then
@ -42,14 +42,14 @@ cleanup() {
trap cleanup EXIT trap cleanup EXIT
# Get channel versions from versions.json # Get channel versions from versions.json
declare -A version=( declare -A versions
["stable"]=$(jq -r '.stable.version' versions.json) while IFS='=' read -r key value; do
["beta"]=$(jq -r '.beta.version' versions.json) versions["${key}"]="${value}"
) done < <(jq -r 'to_entries[] | "\(.key)=\(.value)"' versions.json)
# TMP_GNUPGHOME=$(mktemp -dt 1password-gui.gnupghome.XXXXXX)
GPG_KEYRING=$(mktemp -t 1password.kbx.XXXXXX) export GNUPGHOME="${TMP_GNUPGHOME}"
gpg --no-default-keyring --keyring "${GPG_KEYRING}" \ gpg --no-default-keyring --keyring trustedkeys.kbx \
--keyserver keyserver.ubuntu.com \ --keyserver keyserver.ubuntu.com \
--receive-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22 --receive-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
@ -57,7 +57,8 @@ JSON_HEAP=$(mktemp -t 1password-gui.jsonheap.XXXXXX)
for channel in stable beta; do for channel in stable beta; do
for os in linux darwin; do for os in linux darwin; do
for arch in x86_64 aarch64; do for arch in x86_64 aarch64; do
url=$(mk_url ${os} ${channel} ${arch} "${version[${channel}]}") version="${versions[${channel}-${os}]}"
url=$(mk_url ${os} ${channel} ${arch} ${version})
nix store prefetch-file --json "${url}" | jq " nix store prefetch-file --json "${url}" | jq "
{ {
\"${channel}\": { \"${channel}\": {
@ -71,7 +72,7 @@ for channel in stable beta; do
# For some reason 1Password PGP signs only Linux binaries. # For some reason 1Password PGP signs only Linux binaries.
if [[ ${os} == "linux" ]]; then if [[ ${os} == "linux" ]]; then
gpgv --keyring "${GPG_KEYRING}" \ gpgv \
$(nix store prefetch-file --json "${url}.sig" | jq -r .storePath) \ $(nix store prefetch-file --json "${url}.sig" | jq -r .storePath) \
$(jq -r --slurp ".[-1].[].[].storePath" "${JSON_HEAP}") $(jq -r --slurp ".[-1].[].[].storePath" "${JSON_HEAP}")
fi fi

View file

@ -1,9 +1,6 @@
{ {
"stable": { "stable-linux": "8.10.68",
"version": "8.10.60" "stable-darwin": "8.10.68",
}, "beta-linux":"8.10.68-12.BETA",
"beta-darwin": "8.10.68-12.BETA"
"beta": {
"version": "8.10.68-12.BETA"
}
} }

View file

@ -5,16 +5,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "helm-dt"; pname = "helm-dt";
version = "0.4.4"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware-labs"; owner = "vmware-labs";
repo = "distribution-tooling-for-helm"; repo = "distribution-tooling-for-helm";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-jSX18FJCQORHFIUBROWZqAO5EBPXFvN/k0NRfkdkUFM="; hash = "sha256-/TRhi4YgEB5RwRZXuwGCCqHz3SoBfs1SdKLBWg1yed0=";
}; };
vendorHash = "sha256-8HefE1a3pcbBgq/bC0mnhWzSa5xTi2dbqw0tyJ9EyTI="; vendorHash = "sha256-54QB8dZSqSpDb4z7di5K6d8/fFbXftKfQJAljV50/Jk=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -866,6 +866,15 @@
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-ZZtfVgxp7YXNRXpeUisLzweQhHzgYOuQDAp1MsxAVhg=" "vendorHash": "sha256-ZZtfVgxp7YXNRXpeUisLzweQhHzgYOuQDAp1MsxAVhg="
}, },
"nexus": {
"hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=",
"homepage": "https://registry.terraform.io/providers/datadrivers/nexus",
"owner": "datadrivers",
"repo": "terraform-provider-nexus",
"rev": "v2.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-wOpR+AJYW7YiARSIACta8Tr4bmGLUONRTEBLxHyHZZk="
},
"nomad": { "nomad": {
"hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=", "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",
"homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
@ -1066,11 +1075,11 @@
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
}, },
"rancher2": { "rancher2": {
"hash": "sha256-9I5awIsF/hQ4l4u518GoaUS+ik89mVPSkhHd9itE2eU=", "hash": "sha256-LJgYGgJ7PLRq3WlT2rAnnM8svn4EGghLy3rY7lpmJxI=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2", "homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher", "owner": "rancher",
"repo": "terraform-provider-rancher2", "repo": "terraform-provider-rancher2",
"rev": "v6.0.0", "rev": "v6.1.4",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA="
}, },
@ -1300,11 +1309,11 @@
"vendorHash": "sha256-0B2XRpvUk0mgDu3inz37LLJijwH3aQyoSb8IaHr6was=" "vendorHash": "sha256-0B2XRpvUk0mgDu3inz37LLJijwH3aQyoSb8IaHr6was="
}, },
"tencentcloud": { "tencentcloud": {
"hash": "sha256-UO3Gjz5+h4YIj62gCJccFWW8k7qNbmmBzFlT1WWdXl8=", "hash": "sha256-vWMEaA64/h1dhXJDw2kqoWgpp79ZuWP25rvfd6GiReg=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack", "owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud", "repo": "terraform-provider-tencentcloud",
"rev": "v1.81.171", "rev": "v1.81.174",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },

View file

@ -11,6 +11,7 @@
rootModules, rootModules,
kmod, kmod,
allowMissing ? false, allowMissing ? false,
extraFirmwarePaths ? [ ],
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation {
firmware firmware
rootModules rootModules
allowMissing allowMissing
extraFirmwarePaths
; ;
allowedReferences = [ "out" ]; allowedReferences = [ "out" ];
} }

View file

@ -87,6 +87,15 @@ for module in $(< ~-/closure); do
done || : done || :
done done
for path in $extraFirmwarePaths; do
mkdir -p $(dirname $out/lib/firmware/$path)
for name in "$path" "$path.xz" "$path.zst" ""; do
if cp -v --parents --no-preserve=mode lib/firmware/$name "$out" 2>/dev/null; then
break
fi
done
done
if test -e lib/firmware/edid ; then if test -e lib/firmware/edid ; then
echo "lib/firmware/edid found, copying." echo "lib/firmware/edid found, copying."
mkdir -p "$out/lib/firmware" mkdir -p "$out/lib/firmware"

View file

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ab-av1"; pname = "ab-av1";
version = "0.9.1"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexheretic"; owner = "alexheretic";
repo = "ab-av1"; repo = "ab-av1";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc="; hash = "sha256-rj02Opkwi4M249Ya4uBl4u1l8Mx+FBcRcxDgD6ng9kg=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-y+5rW3LruV1WeJXizbhHs01jkWrYsMXZkn1NG0Xz3bg="; cargoHash = "sha256-Vi38eNn+SnhQx7Gp1T2RPIBeu3bUAZ74dr0mMG5Mha0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "acpi"; pname = "acpi";
version = "1.7"; version = "1.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
}; };
meta = with lib; { meta = with lib; {

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "alterx"; pname = "alterx";
version = "0.0.3"; version = "0.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "alterx"; repo = "alterx";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-A01XROFB2NkArfFtRMv/r9Nu5QoKMTOVzVIUnFoVe78="; hash = "sha256-IjCK0TVZOBegNdfpqOFoOTuj8KtmCuIqNPvcIa1vSo0=";
}; };
vendorHash = "sha256-efwU41kFR8QYa2cevvj4pYAXgCisJ4OHaRIhWVnETvc="; vendorHash = "sha256-aTA5KGeYmJnbVRbEhT9LigQoJFLD17q9spzBV4BGhNw=";
meta = with lib; { meta = with lib; {
description = "Fast and customizable subdomain wordlist generator using DSL"; description = "Fast and customizable subdomain wordlist generator using DSL";

View file

@ -2,32 +2,44 @@
lib, lib,
python3, python3,
fetchFromGitLab, fetchFromGitLab,
fetchPypi,
}: }:
let
tzdata = python3.pkgs.tzdata.overrideAttrs rec {
version = "2023.4";
src = fetchPypi {
pname = "tzdata";
inherit version;
hash = "sha256-3VTJTylHZVIsdzmWSbT+/ZVSJHmmZKDOyH9BvrxhSMk=";
};
};
in
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "annextimelog"; pname = "annextimelog";
version = "0.13.1"; version = "0.14.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "nobodyinperson"; owner = "nobodyinperson";
repo = "annextimelog"; repo = "annextimelog";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-VgeILw8WfqVrmsU/kBw+jHTOt2a6sVT7YgP2pKRp2AY="; hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
setuptools setuptools
wheel wheel
poetry-core poetry-core
]; ] ++ [ tzdata ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
rich rich
]; ];
meta = with lib; { meta = with lib; {
description = "Git Annex-backed Time Tracking"; description = "git-annex based cli time tracker";
homepage = "https://gitlab.com/nobodyinperson/annextimelog"; homepage = "https://gitlab.com/nobodyinperson/annextimelog";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ matthiasbeyer ]; maintainers = with maintainers; [ matthiasbeyer ];

View file

@ -0,0 +1,50 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
pkg-config,
libudev-zero,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bitbox-bridge";
version = "1.6.1";
src = fetchFromGitHub {
owner = "BitBoxSwiss";
repo = "bitbox-bridge";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-+pMXWXGHyyBx3N0kiro9NS0mPmSQzzBmp+pkoBLH7z0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-6vD0XjGH1PXjiRjgnHWSZSixXOc2Yecui8U5FAGefBU=";
postPatch = ''
rm .cargo/config.toml
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
libudev-zero
];
meta = {
description = "A bridge service that connects web wallets like Rabby to BitBox02";
homepage = "https://github.com/BitBoxSwiss/bitbox-bridge";
downloadPage = "https://bitbox.swiss/download/";
changelog = "https://github.com/BitBoxSwiss/bitbox-bridge/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
izelnakri
tensor5
];
mainProgram = "bitbox-bridge";
platforms = lib.platforms.unix;
};
})

View file

@ -51,7 +51,7 @@ buildNpmPackage rec {
npmFlags = [ "--legacy-peer-deps" ]; npmFlags = [ "--legacy-peer-deps" ];
npmRebuildFlags = [ npmRebuildFlags = [
# FIXME one of the esbuild versions fails to download @esbuild/linux-x64 # we'll run npm rebuild manually later
"--ignore-scripts" "--ignore-scripts"
]; ];
@ -60,6 +60,11 @@ buildNpmPackage rec {
shopt -s globstar shopt -s globstar
rm -r node_modules/**/prebuilds rm -r node_modules/**/prebuilds
shopt -u globstar shopt -u globstar
# FIXME one of the esbuild versions fails to download @esbuild/linux-x64
rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild
npm rebuild --verbose
''; '';
postBuild = '' postBuild = ''

View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bloop"; pname = "bloop";
version = "2.0.8"; version = "2.0.9";
platform = platform =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 = sha256 =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"sha256-ItPt5qjfRgtPNg6a/Zlc0ASfdvGXMMKV7SqNEOQ9u28=" "sha256-mslCzvJ+z5VNQkVa9HXjw2bUBprMgs3bAy3RmEt8OlI="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
"sha256-zUSDUwZY1id/WFuC87Wa4eB48X4rmXvVC1/b2v5bhw4=" "sha256-XdMPo9O7ADhInmGFIOHihl1z4yPKAyDjCH7m3tCtKNo="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
"sha256-1wsGL1G8/+xMvYNwe7EOyqEuEKDKiwA7yyyjfbGgxJQ=" "sha256-sJM00f2KBI6fnVj3U/h/pYAFT7QjZkfJ7ubDfFlRJ0Q="
else else
throw "unsupported platform"; throw "unsupported platform";
}; };

View file

@ -87,14 +87,14 @@ in
let let
bolt = stdenv.mkDerivation (finalAttrs: { bolt = stdenv.mkDerivation (finalAttrs: {
pname = "bolt-launcher"; pname = "bolt-launcher";
version = "0.9.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdamCake"; owner = "AdamCake";
repo = "bolt"; repo = "bolt";
rev = finalAttrs.version; tag = finalAttrs.version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-LIlRDcUWbQwIhFjtqYF+oVpTOPZ7IT0vMgysEVyJ1k8="; hash = "sha256-fNCi2Wu+oOL6p8IBm6bHZ/rcaFmqoKs2DnXQ+ZA9McE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -154,8 +154,8 @@ let
desktopName = "Bolt Launcher"; desktopName = "Bolt Launcher";
genericName = finalAttrs.pname; genericName = finalAttrs.pname;
comment = "An alternative launcher for RuneScape"; comment = "An alternative launcher for RuneScape";
exec = "${finalAttrs.pname}-${finalAttrs.version}"; exec = "bolt-launcher";
icon = finalAttrs.pname; icon = "bolt-launcher";
categories = [ "Game" ]; categories = [ "Game" ];
}) })
]; ];

View file

@ -15,17 +15,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "broot"; pname = "broot";
version = "1.44.7"; version = "1.45.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Canop"; owner = "Canop";
repo = "broot"; repo = "broot";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GaOPC1lIu48qFo99AQ99f49e8qH/TEQubpluptLc0jY="; hash = "sha256-Hif+ynwOxiZBAiNdbaU5SpI9s0yNxtH0qXXMfGO21H0=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-J7zc1aTH62nL96cSb9CiIk8uJdR7nk9EnERiAfMvqNM="; cargoHash = "sha256-Cw0Bh8S04oUlbbn3O3+uBoHEgh82XIcGQSGqkZFOc78=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -8,19 +8,19 @@
buildGoModule rec { buildGoModule rec {
pname = "carapace-bridge"; pname = "carapace-bridge";
version = "1.2.3"; version = "1.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "carapace-sh"; owner = "carapace-sh";
repo = "carapace-bridge"; repo = "carapace-bridge";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-RMItv9HAPsxnb0NGlDjqY8Of4cxf8xU1c8ZE8Ajz0ao="; hash = "sha256-/HjoE6yaawo1hCemnvtfK3wj4SBSW91D4oyuZ5qxV4M=";
}; };
# buildGoModule try to run `go mod vendor` instead of `go work vendor` on the # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the
# workspace if proxyVendor is off # workspace if proxyVendor is off
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-R2sk5yqhF+5pVWxCnEx+EKTvNPzg32/JguLMu6R3ETM="; vendorHash = "sha256-zfV5IcpwtK3n76jWs4ldMlpEqbyNmmXZWDj+fh66luw=";
postPatch = '' postPatch = ''
substituteInPlace cmd/carapace-bridge/main.go \ substituteInPlace cmd/carapace-bridge/main.go \

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cloud-nuke"; pname = "cloud-nuke";
version = "0.38.2"; version = "0.39.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
tag = "v${version}"; tag = "v${version}";
hash = "sha256-hQFuHEIxsvyCmP4DR9MsrWmPbo3BFU3k5nYNsQVNy/U="; hash = "sha256-r9/5A1f6GSDgF5/GM4UKxoCYUsc5xsZpTwDGDUySDfQ=";
}; };
vendorHash = "sha256-ExZZHCGmU9r1DrJ3alN6Y39P6rfFymQSpK8b+ZD7h0s="; vendorHash = "sha256-AiPy/lmqrNeDWM7/pXmzHCbSWZdqdXnZNATlyi6oAGc=";
nativeBuildInputs = [ nativeBuildInputs = [
makeBinaryWrapper makeBinaryWrapper

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "clusterctl"; pname = "clusterctl";
version = "1.9.5"; version = "1.9.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = "cluster-api"; repo = "cluster-api";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4n+7/4ZMD0VzlD4PzEWVDut+rt8/4Vz3gAgCDAj+SVs="; hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls=";
}; };
vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ=";

View file

@ -7,6 +7,7 @@
# passthru # passthru
conduit, conduit,
python3Packages,
nix-update-script, nix-update-script,
mpiSupport ? false, mpiSupport ? false,
@ -50,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
tests = { tests = {
withMpi = conduit.override { mpiSupport = true; }; withMpi = conduit.override { mpiSupport = true; };
pythonModule = python3Packages.conduit;
pythonModuleWithMpi = python3Packages.conduit-mpi;
}; };
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };

View file

@ -9,18 +9,18 @@
}: }:
let let
commitHash = "9d021bf61a094a5eac6ae3084ceed2dda4700a73"; # matches tag release commitHash = "d5bc935e4801a02fdbd953f8f0ae7989eaef50cf"; # matches tag release
shortCommitHash = builtins.substring 0 7 commitHash; shortCommitHash = builtins.substring 0 7 commitHash;
in in
buildGoModule rec { buildGoModule rec {
pname = "copywrite"; pname = "copywrite";
version = "0.21.0"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "copywrite"; repo = "copywrite";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-TGis7rreRen+vk3tUDehRkyas4xrBBxKlA70+VqoGWY="; hash = "sha256-gPVlHgFlLxoAj4pkg3OxD4CGQaLdAL312/Zn/pJ+7fg=";
}; };
vendorHash = "sha256-Qxp6BwN/Y6Xb1BwFGT/T8WYsXGPgN27mzoTE0i6cS1Q="; vendorHash = "sha256-Qxp6BwN/Y6Xb1BwFGT/T8WYsXGPgN27mzoTE0i6cS1Q=";

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ddns-go"; pname = "ddns-go";
version = "6.9.0"; version = "6.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jeessy2"; owner = "jeessy2";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-eHJVd7PHUrswF1j4MrsUmle0vB8/CtH43p5ILZGljrs="; hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE=";
}; };
vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY="; vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY=";

View file

@ -9,16 +9,16 @@
buildGoModule rec { buildGoModule rec {
pname = "diffoci"; pname = "diffoci";
version = "0.1.5"; version = "0.1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "reproducible-containers"; owner = "reproducible-containers";
repo = "diffoci"; repo = "diffoci";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZVWnfg5uWYuqsNd4X6t1gWBGMfdcirSp7QZZDhqAfaI="; hash = "sha256-rCSLHlHUWS0wEnN8R2v1h+kQ7K62VQPfZmySHGSFZlQ=";
}; };
vendorHash = "sha256-qb4HvK4UbJbtP/ypeptV/MMbhOu5UZDaGartq/RGpDM="; vendorHash = "sha256-udVigglpCgdYzJe9vdGZiQepZeOplQjqKB4Za8a+u6k=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dumbpipe"; pname = "dumbpipe";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "n0-computer"; owner = "n0-computer";
repo = "dumbpipe"; repo = "dumbpipe";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-nYM/QAG57491NqTAkqF1p3DeuVKDPvh6MUqYP/gAWyc="; hash = "sha256-xQHVEJ+EgsrboXbPg7pGXXMjyedSLooqkTt/yYZACSo=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-lg/FmeCYL9WVvvEMnkQj1WaxFH+7rBBxgL9zfwSdaVE="; cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

View file

@ -8,14 +8,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "exabgp"; pname = "exabgp";
version = "4.2.22"; version = "4.2.25";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Exa-Networks"; owner = "Exa-Networks";
repo = "exabgp"; repo = "exabgp";
tag = version; tag = version;
hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4="; hash = "sha256-YBxRDcm4Qt44W3lBHDwdvZq2pXEujbqJDh24JbXthMg=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "BGP swiss army knife of networking"; description = "BGP swiss army knife of networking";
homepage = "https://github.com/Exa-Networks/exabgp"; homepage = "https://github.com/Exa-Networks/exabgp";
changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.rev}/CHANGELOG.rst"; changelog = "https://github.com/Exa-Networks/exabgp/blob/${src.tag}/CHANGELOG.rst";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ maintainers = with maintainers; [
hexa hexa

View file

@ -18,6 +18,11 @@ buildGoModule rec {
vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM="; vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM=";
# Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason.
#
# Disabling to avoid flakiness.
doCheck = false;
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };

View file

@ -33,14 +33,14 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcft"; pname = "fcft";
version = "3.2.0"; version = "3.3.1";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dnkl"; owner = "dnkl";
repo = "fcft"; repo = "fcft";
rev = version; rev = version;
hash = "sha256-VMNjTOil50/GslSzZnBPkSoy0Vg0729ndaEAeXk00GI="; hash = "sha256:08fr6zcqk4qp1k3r0di6v60qfyd3q5k9jnxzlsx2p1lh0nils0xa";
}; };
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];

View file

@ -27,7 +27,7 @@
}: }:
let let
version = "1.20.2"; version = "1.21.0";
# build stimuli file for PGO build and the script to generate it # build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result # independently of the foot's build, so we can cache the result
@ -104,7 +104,7 @@ stdenv.mkDerivation {
owner = "dnkl"; owner = "dnkl";
repo = "foot"; repo = "foot";
rev = version; rev = version;
hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ="; hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4";
}; };
separateDebugInfo = true; separateDebugInfo = true;

View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "2.68.1"; version = "2.69.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-yJwRC25QQKWeRrp0ItovuBCrTla3dezArzFvnkZchFg="; hash = "sha256-T5H84RH5uBXXNCiyd27ZjDu4g5UBK4yUjZWQAFp3cH0=";
}; };
vendorHash = "sha256-QmZBdnxcVywCGpaBAZZRO0LDr6WidaFXGpaAkWfn+gs="; vendorHash = "sha256-BJK8XzCdbbyzj1rEJtnE6hKOy7Q9xSrkicBPzxz9gkw=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "grpc-client-cli"; pname = "grpc-client-cli";
version = "1.21.3"; version = "1.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vadimi"; owner = "vadimi";
repo = "grpc-client-cli"; repo = "grpc-client-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-c+mwQJczF8BG3NnpZpBZNGzGQxs8/ptApvESQhiUpfA="; sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng=";
}; };
vendorHash = "sha256-1SRp5NmE+NbRtUZ3s4yL6CJUMs+dlm6oN00gKV9QY0U="; vendorHash = "sha256-iZh/Ax9Gf3YNUgk2vNvTewuq97nUE3POaOb9/poVrCY=";
meta = with lib; { meta = with lib; {
description = "generic gRPC command line client"; description = "generic gRPC command line client";

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hcl2json"; pname = "hcl2json";
version = "0.6.5"; version = "0.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tmccombs"; owner = "tmccombs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LU74vm36NuA1ApJWtEf/ub3los6yVR8yiQTfM0Wnvyo="; sha256 = "sha256-zd8+ZDuC+qBienADiTVhW8o+BH8spBTCDHIK2PwK3YY=";
}; };
vendorHash = "sha256-nm+KvpcOUTR9Nm0eQtqCWxMiFTvL5xKLhsPaJlsVpkQ="; vendorHash = "sha256-GMy6jGXAjykg+61RbPbQ9ZI0odhPls6uLhtw2sKLUmY=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -5,10 +5,10 @@
}: }:
let let
pname = "heptabase"; pname = "heptabase";
version = "1.53.4"; version = "1.53.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
hash = "sha256-dDwz9bn5UZJ3aQYy2SJYKSSaZJzj/B+zRmfwxgsUjBc="; hash = "sha256-wy69dT/Iyt1jZKMh8/yCGk7+Z/NQt8R2d8jHXOZSvgQ=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

View file

@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "hurl"; pname = "hurl";
version = "6.0.0"; version = "6.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Orange-OpenSource"; owner = "Orange-OpenSource";
repo = "hurl"; repo = "hurl";
tag = version; tag = version;
hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo="; hash = "sha256-fj9OKS8IFKbxwzjhnta44hAXPy90fBOAV35K13YtaOs=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-sq0m6wkryfmthkPHMY0ZOXNhdNKnnsPLa/6tTsuWCS0="; cargoHash = "sha256-aGj/vQCf1nBLmQYYxdR8437irLP+3W3z0F8tyVTrKZk=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "imgpkg"; pname = "imgpkg";
version = "0.44.2"; version = "0.45.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "carvel-dev"; owner = "carvel-dev";
repo = "imgpkg"; repo = "imgpkg";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-UZhmuSUqm8EPCSc0CONgpISINgMJh3uNUx0v52eQNIc="; hash = "sha256-DuLxNH0fcVPvZYG4AYtaT8kJysTLRNX2tB6UBhQoP9Q=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -5,7 +5,7 @@
}: }:
let let
version = "0.4.2"; version = "0.6.2";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit version; inherit version;
@ -15,11 +15,11 @@ rustPlatform.buildRustPackage {
owner = "sectordistrict"; owner = "sectordistrict";
repo = "intentrace"; repo = "intentrace";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ="; hash = "sha256-hmQLedKyrk07RPloe39HKtZPJJjDUqLb/D4dvJfuWrM=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Z3T4mupwUqOSP+iAmy7Ps1EZlyV9cDvnfXBZwH1NFaA="; cargoHash = "sha256-XSo9XqO3DiW3PXUW8RxTWqIxN1jx8WJKw16soP7kM1s=";
meta = { meta = {
description = "Prettified Linux syscall tracing tool (like strace)"; description = "Prettified Linux syscall tracing tool (like strace)";

View file

@ -6,15 +6,15 @@
buildGoModule rec { buildGoModule rec {
pname = "jumppad"; pname = "jumppad";
version = "0.17.1"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jumppad-labs"; owner = "jumppad-labs";
repo = "jumppad"; repo = "jumppad";
rev = version; rev = version;
hash = "sha256-SoiF5y0Vc2T8qT75cII3HqNSEZhWAzKEk3xw4BGICpo="; hash = "sha256-V+FDPNNNP7HMg0Somoj3EhGuhhq/Du8JcCBE/Ut2V1s=";
}; };
vendorHash = "sha256-mJKawveIoDu2v+GxIoljmFbCwle9d1SQiHzsoerP66I="; vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "jx"; pname = "jx";
version = "3.11.56"; version = "3.11.66";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jenkins-x"; owner = "jenkins-x";
repo = "jx"; repo = "jx";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zBv6j27UYRcMqDLINe8zEqANmlSks3OqwGzTSFisnP4="; sha256 = "sha256-Ejm5Y1xyh9/d79PYYMeKQVtAhT9knFCVcwNAWoBk840=";
}; };
vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc="; vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc=";

View file

@ -0,0 +1,4 @@
{
python3Packages,
}:
python3Packages.toPythonApplication python3Packages.kubernetes-validate

View file

@ -0,0 +1,56 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
importlib-resources,
jsonschema,
packaging,
pyyaml,
referencing,
typing-extensions,
pytestCheckHook,
versionCheckHook,
}:
buildPythonPackage rec {
pname = "kubernetes-validate";
version = "1.31.0";
pyproject = true;
src = fetchFromGitHub {
owner = "willthames";
repo = "kubernetes-validate";
tag = "v${version}";
hash = "sha256-vxsftuipw0rHQIngxKlPHwBIW+rYAjfnEEaJDKmPyfQ=";
};
build-system = [
setuptools
];
dependencies = [
importlib-resources
jsonschema
packaging
pyyaml
referencing
typing-extensions
];
nativeCheckInputs = [
pytestCheckHook
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
pythonImportsCheck = [ "kubernetes_validate" ];
meta = {
description = "Module to validate Kubernetes resource definitions against the declared Kubernetes schemas";
homepage = "https://github.com/willthames/kubernetes-validate";
changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lykos153 ];
mainProgram = "kubernetes-validate";
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubevpn"; pname = "kubevpn";
version = "2.3.13"; version = "2.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KubeNetworks"; owner = "KubeNetworks";
repo = "kubevpn"; repo = "kubevpn";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/b4JOWU4WZgkUUiOSox/ly3t8Ehp1dAY6kVyDabjMFE="; hash = "sha256-IZna+DOavIkhGuNfVq31Hvuq5J0rylCAmNActjbA/io=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "labwc-menu-generator"; pname = "labwc-menu-generator";
version = "0.1.0-unstable-2025-02-12"; version = "0.1.0-unstable-2025-03-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "labwc"; owner = "labwc";
repo = "labwc-menu-generator"; repo = "labwc-menu-generator";
rev = "a6e96b496aff6b54bcdaacfcd24720d46d6a683a"; rev = "f1aa43d776b702f29b7d1e32440f233927a1dfa9";
hash = "sha256-Ju/lH7mZuIsulkQ5lpgfBl9BUs0mAOobS9aBuVlMIqI="; hash = "sha256-tjfFE2RJVOhJFw29+CZkLApVS4BTjGpT3cI2WStYAOo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -3,26 +3,29 @@
stdenv, stdenv,
cmake, cmake,
fetchFromGitHub, fetchFromGitHub,
tbb_2022_0,
useTBB ? true,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "libblake3"; pname = "libblake3";
version = "1.6.1"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BLAKE3-team"; owner = "BLAKE3-team";
repo = "BLAKE3"; repo = "BLAKE3";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-YJ3rRzpmF6oS8p377CEoRteARCD1lr/L7/fbN5poUXw="; hash = "sha256-08D5hnU3I0VJ+RM/TNk2LxsEAvOLuO52+08zlKssXbc=";
}; };
sourceRoot = finalAttrs.src.name + "/c"; sourceRoot = finalAttrs.src.name + "/c";
nativeBuildInputs = [ nativeBuildInputs = [ cmake ];
cmake
]; buildInputs = lib.optionals useTBB [ tbb_2022_0 ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "BLAKE3_USE_TBB" useTBB)
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
]; ];
@ -33,7 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
asl20 asl20
cc0 cc0
]; ];
maintainers = with lib.maintainers; [ fgaz ]; maintainers = with lib.maintainers; [
fgaz
silvanshade
];
platforms = lib.platforms.all; platforms = lib.platforms.all;
}; };
}) })

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server"; pname = "lua-language-server";
version = "3.13.6"; version = "3.13.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luals"; owner = "luals";
repo = "lua-language-server"; repo = "lua-language-server";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-LaetDI9kNPRY4+m3gSsh6vbysRjUKHl+zunuyedjZGY="; hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -6,12 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mdbook-pdf-outline"; pname = "mdbook-pdf-outline";
version = "0.1.4"; version = "0.1.6";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit version;
hash = "sha256-STi+54iT+5+Xi0IzGXv2dxVS91+T6fjg3xmbJjekpPE="; pname = "mdbook_pdf_outline";
hash = "sha256-GPTDlgYpfPtcq+rJCjxgexfViYiqHoVZ8iQkyWXNogw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +27,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/HollowMan6/mdbook-pdf"; homepage = "https://github.com/HollowMan6/mdbook-pdf";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ nix-julia ]; maintainers = with maintainers; [ hollowman6 ];
}; };
} }

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mill"; pname = "mill";
version = "0.12.8"; version = "0.12.9";
src = fetchurl { src = fetchurl {
url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar"; url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar";
hash = "sha256-l+DaOvk7Tajla9IirLfEIij6thZcKI4Zk7wYLnnsiU8="; hash = "sha256-Ntqzivy8dfsRlBclPNsWOZ4h1Xk7D3UJV7GLVGIEcAU=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -23,17 +23,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mise"; pname = "mise";
version = "2025.2.7"; version = "2025.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jdx"; owner = "jdx";
repo = "mise"; repo = "mise";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PvZCKi6fvEc0J5SzDazMkf2SS3+r0DTXM6NWCPi95J0="; hash = "sha256-wp/C7RrMcpk/BFath9zZbEMzhQWFYagnT2zimnPRpPI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-qVs1PogSDfMCVgfvgqLltqiGl7yvO+d4Ly0oeQpSftw="; cargoHash = "sha256-49C4MzvGUiO16kNEKoHtlvkOxG16jsD2iW5upaVuYGI=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "mod"; pname = "mod";
version = "0.7.1"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marwan-at-work"; owner = "marwan-at-work";
repo = "mod"; repo = "mod";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QkLARUN/NiN0D6VEhosdFJSce6DP+sWRWFwAEocZaOQ="; sha256 = "sha256-P0FE0Sl4IXH6DAETnlBwQ2CR0X0AP9Z0noW99By7mxU=";
}; };
vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; vendorHash = "sha256-GiE2RNAxbKpIekn54bfYlNvIcQo8D3ysmPSvxQhujYI=";
doCheck = false; doCheck = false;

View file

@ -0,0 +1,5 @@
{ netbird }:
netbird.override {
ui = true;
}

View file

@ -12,13 +12,9 @@
libX11, libX11,
libXcursor, libXcursor,
libXxf86vm, libXxf86vm,
Cocoa,
IOKit,
Kernel,
UserNotifications,
WebKit,
ui ? false, ui ? false,
netbird-ui, netbird-ui,
versionCheckHook,
}: }:
let let
modules = modules =
@ -33,43 +29,35 @@ let
signal = "netbird-signal"; signal = "netbird-signal";
}; };
in in
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "netbird"; pname = "netbird";
version = "0.37.1"; version = "0.38.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netbirdio"; owner = "netbirdio";
repo = "netbird"; repo = "netbird";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-5+R0Y/xPgnVH53p1vtY65tOqePWQVOMR4oY1yOOFHK4="; hash = "sha256-8uxRR8XkomUB9dMN9h1M4/K09wxy5E+XhXVbNc0g6xQ=";
}; };
vendorHash = "sha256-DGvDkkdM8WaaR5FQwZgKn2n1JEDeqUegZxeAIxniJ5A="; vendorHash = "sha256-m5ou5p2/ubDDMLr0M2F+9qgkqKjhXRJ6HpizwxJhmtU=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
buildInputs = buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [
lib.optionals (stdenv.hostPlatform.isLinux && ui) [ gtk3
gtk3 libayatana-appindicator
libayatana-appindicator libX11
libX11 libXcursor
libXcursor libXxf86vm
libXxf86vm ];
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [
Cocoa
IOKit
Kernel
UserNotifications
WebKit
];
subPackages = lib.attrNames modules; subPackages = lib.attrNames modules;
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/netbirdio/netbird/version.version=${version}" "-X github.com/netbirdio/netbird/version.version=${finalAttrs.version}"
"-X main.builtBy=nix" "-X main.builtBy=nix"
]; ];
@ -100,31 +88,38 @@ buildGoModule rec {
) modules ) modules
) )
+ lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' + lib.optionalString (stdenv.hostPlatform.isLinux && ui) ''
mkdir -p $out/share/pixmaps install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/pixmaps/netbird.png"
cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png install -Dm644 "$src/client/ui/build/netbird.desktop" "$out/share/applications/netbird.desktop"
mkdir -p $out/share/applications
cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop
substituteInPlace $out/share/applications/netbird.desktop \ substituteInPlace $out/share/applications/netbird.desktop \
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
''; '';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
versionCheckProgramArg = "version";
# Disabled for the `netbird-ui` version because it does a network request.
doInstallCheck = !ui;
passthru = { passthru = {
tests.netbird = nixosTests.netbird; tests = {
tests.netbird-ui = netbird-ui; nixos = nixosTests.netbird;
withUI = netbird-ui;
};
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };
meta = with lib; { meta = {
homepage = "https://netbird.io"; homepage = "https://netbird.io";
changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; changelog = "https://github.com/netbirdio/netbird/releases/tag/v${finalAttrs.version}";
description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
license = licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
vrifox vrifox
saturn745 saturn745
]; ];
mainProgram = if ui then "netbird-ui" else "netbird"; mainProgram = if ui then "netbird-ui" else "netbird";
}; };
} })

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "owntracks-recorder"; pname = "owntracks-recorder";
version = "0.9.9"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "owntracks"; owner = "owntracks";
repo = "recorder"; repo = "recorder";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-6oCWzTiQgpp75xojd2ZFsrg+Kd5/gex1BPQVOWHfMuk="; hash = "sha256-E4hdsUAg8NHjmUrlr8cskezib4qMv+wF32cThe2/kBc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "patch2pr"; pname = "patch2pr";
version = "0.32.0"; version = "0.33.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bluekeyes"; owner = "bluekeyes";
repo = "patch2pr"; repo = "patch2pr";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WYNvHwikY6ULEar2ZBvsALEgHuZarrwBjk3ZaGhvlk8="; hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ=";
}; };
vendorHash = "sha256-Y7WpJ6h76+5BJonmDldXYzUxLH6YYl9zlitoqX3H/mk="; vendorHash = "sha256-VzskPOd1nlrkiwGsS5OoXP0v8LQbqS+NumV2WoahFvY=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

View file

@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./postfix-script-shell.patch ./postfix-script-shell.patch
./post-install-script.patch ./post-install-script.patch
./postfix-3.0-no-warnings.patch
./relative-symlinks.patch ./relative-symlinks.patch
# glibc 2.34 compat # glibc 2.34 compat

View file

@ -0,0 +1,86 @@
diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-script
--- postfix-3.0.3/conf/postfix-script 2014-06-27 18:05:15.000000000 +0400
+++ postfix-3.0.3-new/conf/postfix-script 2016-01-09 17:51:38.545733631 +0300
@@ -84,24 +84,6 @@
exit 1
}
-# If this is a secondary instance, don't touch shared files.
-
-instances=`test ! -f $def_config_directory/main.cf ||
- $command_directory/postconf -qc $def_config_directory \
- -h multi_instance_directories | sed 'y/,/ /'` || {
- $FATAL cannot execute $command_directory/postconf!
- exit 1
-}
-
-check_shared_files=1
-for name in $instances
-do
- case "$name" in
- "$def_config_directory") ;;
- "$config_directory") check_shared_files=; break;;
- esac
-done
-
#
# Parse JCL
#
@@ -262,22 +244,6 @@
-prune \( -perm -020 -o -perm -002 \) \
-exec $WARN group or other writable: {} \;
- # Check Postfix root-owned directory tree owner/permissions.
-
- todo="$config_directory/."
- test -n "$check_shared_files" && {
- todo="$daemon_directory/. $meta_directory/. $todo"
- test "$shlib_directory" = "no" ||
- todo="$shlib_directory/. $todo"
- }
- todo=`echo "$todo" | tr ' ' '\12' | sort -u`
-
- find $todo ! -user root \
- -exec $WARN not owned by root: {} \;
-
- find $todo \( -perm -020 -o -perm -002 \) \
- -exec $WARN group or other writable: {} \;
-
# Check Postfix mail_owner-owned directory tree owner/permissions.
find $data_directory/. ! -user $mail_owner \
@@ -302,18 +268,11 @@
# Check Postfix setgid_group-owned directory and file group/permissions.
todo="$queue_directory/public $queue_directory/maildrop"
- test -n "$check_shared_files" &&
- todo="$command_directory/postqueue $command_directory/postdrop $todo"
find $todo \
-prune ! -group $setgid_group \
-exec $WARN not owned by group $setgid_group: {} \;
- test -n "$check_shared_files" &&
- find $command_directory/postqueue $command_directory/postdrop \
- -prune ! -perm -02111 \
- -exec $WARN not set-gid or not owner+group+world executable: {} \;
-
# Check non-Postfix root-owned directory tree owner/content.
for dir in bin etc lib sbin usr
@@ -334,15 +293,6 @@
find corrupt -type f -exec $WARN damaged message: {} \;
- # Check for non-Postfix MTA remnants.
-
- test -n "$check_shared_files" -a -f /usr/sbin/sendmail -a \
- -f /usr/lib/sendmail && {
- cmp -s /usr/sbin/sendmail /usr/lib/sendmail || {
- $WARN /usr/lib/sendmail and /usr/sbin/sendmail differ
- $WARN Replace one by a symbolic link to the other
- }
- }
exit 0
;;

View file

@ -9,7 +9,7 @@
}: }:
let let
mainProgram = "proton-mail"; mainProgram = "proton-mail";
version = "1.7.1"; version = "1.8.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
sha256 = "sha256-h5OQBZrG8whhsilS7qQU8txFKzjpl+Q27fcUOBYUzbQ="; sha256 = "sha256-ti00RSMnSwrGNUys7mO0AmK+OSq4SZmCsfPKm7RRm2g=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "4.4.3"; version = "4.4.4";
propagatedBuildInputs = with libsForQt5; [ propagatedBuildInputs = with libsForQt5; [
qtbase qtbase
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
owner = "mavlink"; owner = "mavlink";
repo = "qgroundcontrol"; repo = "qgroundcontrol";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-pHs9pRL5fAeRtDcNPCdqy4oPYyJ0mbJjLDlotFfjOl4="; hash = "sha256-+BsI79p0XJ1nCjEtaCVgHbD+jseVGLQZOll79xZ5THo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "r2modman"; pname = "r2modman";
version = "3.1.56"; version = "3.1.57";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ebkr"; owner = "ebkr";
repo = "r2modmanPlus"; repo = "r2modmanPlus";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-38PHTI/sAKLf70b/uBPYlJvbkogijiyuUvn7veGGZTY="; hash = "sha256-1b24tclqXGx85BGFYL9cbthLScVWau2OmRh9YElfCLs=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {

View file

@ -14,17 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "rattler-build"; pname = "rattler-build";
version = "0.38.0"; version = "0.39.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prefix-dev"; owner = "prefix-dev";
repo = "rattler-build"; repo = "rattler-build";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-l8pMUgSU0L1GhB3FiwDVcSEJCpnfE46bCsyNsZSG0mQ="; hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-TgUPeoOua9oqPPDb+SAlYztd1ZBEFvsSrCYCQGXKhgU="; cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4=";
doCheck = false; # test requires network access doCheck = false; # test requires network access

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl"; pname = "renode-dts2repl";
version = "0-unstable-2025-03-05"; version = "0-unstable-2025-03-17";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antmicro"; owner = "antmicro";
repo = "dts2repl"; repo = "dts2repl";
rev = "3aa8ca84d3cba6043ebf9158b9fa1ce77beb7ea8"; rev = "1039408cd06b7630bef0ef2d04d64d14e9a00641";
hash = "sha256-k2gaDI5eymAqhqW9XErR2QlU7VNoquAYi+8L1U6Lcg0="; hash = "sha256-Ho7H4gb48PfkuF0q4My9E4MHIny1cfqWeLwZpVb0L1E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,39 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
}:
stdenv.mkDerivation rec {
pname = "rp";
version = "2.1.4";
nativeBuildInputs = [
cmake
ninja
];
buildInputs = lib.optionals (stdenv.isLinux) [ stdenv.cc.libc.static ];
src = fetchFromGitHub {
owner = "0vercl0k";
repo = "rp";
rev = "a60f8117443e421bb572df890341b5a0f982c267";
hash = "sha256-lkyuV+yC3NTsdipyJkoxgh1N8/+15N15nQpjItUgyb0=";
};
sourceRoot = "${src.name}/src";
installPhase = ''
mkdir -p $out/bin
cp rp-${if stdenv.isDarwin then "osx" else "lin"} $out/bin/rp
'';
meta = with lib; {
description = "Fast C++ ROP gadget finder for PE/ELF/Mach-O x86/x64/ARM/ARM64 binaries";
homepage = "https://github.com/0vercl0k/rp";
license = licenses.mit;
maintainers = with maintainers; [ sportshead ];
platforms = platforms.all;
mainProgram = "rp";
};
}

View file

@ -8,6 +8,7 @@
cargo, cargo,
rustc, rustc,
clippy, clippy,
gcc,
makeWrapper, makeWrapper,
}: }:
let let
@ -47,6 +48,7 @@ rustPlatform.buildRustPackage {
cargo cargo
rustc rustc
clippy clippy
gcc
] ]
} }
''; '';

View file

@ -13,16 +13,16 @@
buildGoModule rec { buildGoModule rec {
pname = "step-ca"; pname = "step-ca";
version = "0.28.2"; version = "0.28.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smallstep"; owner = "smallstep";
repo = "certificates"; repo = "certificates";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-iyv/cMRoJ5fYBVdQZ52zDTLdeESzNMJWXbgsDbU+p5Q="; hash = "sha256-5W39Nc6WuxhrXbEfPWMaWWAUX6UnjYqlEAPlDCeYgrY=";
}; };
vendorHash = "sha256-N3MZXs/eJ+vvgsoq6s3vz22j3/CUyUhcwTc/nNU5Axo="; vendorHash = "sha256-AuMYdZa1QpmMQZxlv+lmoWtszQkVdwXOTXxY8CWaUbI=";
ldflags = [ ldflags = [
"-w" "-w"

View file

@ -12,16 +12,16 @@
buildGoModule rec { buildGoModule rec {
pname = "step-kms-plugin"; pname = "step-kms-plugin";
version = "0.12.1"; version = "0.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smallstep"; owner = "smallstep";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-AFHqkHPa4+/VbeSq9TZA0mUXyXLAfXFAFVkKqnEfg7k="; hash = "sha256-6+5xZGzLsXu+283aOCeRmzxvjsk5PXTpbszVYuSSuGA=";
}; };
vendorHash = "sha256-u2CXNOaDn4dYWarOW3f11rsqo52hMpRntBhmNf1+axc="; vendorHash = "sha256-S8T2GMFOVYqG2+8jdDRNJfAN057HagUA3HR0/UBpBR0=";
proxyVendor = true; proxyVendor = true;

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ticker"; pname = "ticker";
version = "4.8.0"; version = "4.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "achannarasappa"; owner = "achannarasappa";
repo = pname; repo = pname;
tag = "v${version}"; tag = "v${version}";
hash = "sha256-L7vqZVfj7Ns8xCFU0ruhosReM4RMhIbIHXrMbQ8YI6I="; hash = "sha256-2qg7/gzogvK8eIj9NzFELoeXrtJGC5pS4LvR2msOuHY=";
}; };
vendorHash = "sha256-o3hVRHyrJpmYgephoZ2JlVLGSqZtRQAp48OzoIMY3do="; vendorHash = "sha256-o3hVRHyrJpmYgephoZ2JlVLGSqZtRQAp48OzoIMY3do=";

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "toxiproxy"; pname = "toxiproxy";
version = "2.11.0"; version = "2.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shopify"; owner = "Shopify";
repo = "toxiproxy"; repo = "toxiproxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1z4a69KnBurTrudqXiOPgrlICICu1ts86WrnFUlRWXE="; sha256 = "sha256-CqJr3h2n+fzN6Ves38H7fYXd5vlpDVfF3kg4Tr8ThPc=";
}; };
vendorHash = "sha256-LQV+TFFcrq4Px580yOWU+8EuGt/7bFJYi35He2es6Q8="; vendorHash = "sha256-4nKWTjB9aV5ILgHVceV76Ip0byBxlEY5TTAQwNLvL2s=";
excludedPackages = [ "test/e2e" ]; excludedPackages = [ "test/e2e" ];

View file

@ -5,48 +5,49 @@
ncurses, ncurses,
readline, readline,
autoreconfHook, autoreconfHook,
pkg-config,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "udftools"; pname = "udftools";
version = "2.0"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pali"; owner = "pali";
repo = "udftools"; repo = "udftools";
rev = version; tag = version;
sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; hash = "sha256-SUdwJpJfbs6LhcyNMPJUhhpp/3htwT/EVep7+4PRgto=";
}; };
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ buildInputs = [
ncurses ncurses
readline readline
]; ];
nativeBuildInputs = [ autoreconfHook ];
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
env.NIX_CFLAGS_COMPILE = "-std=gnu90"; env.NIX_CFLAGS_COMPILE = "-std=gnu99";
preConfigure = '' preConfigure = ''
sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c
sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c
sed -e '27i#include <string.h>' -i include/udf_endian.h
sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c
sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c
sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c
sed -e '46i#include <sys/sysmacros.h>' -i mkudffs/main.c sed -e '46i#include <sys/sysmacros.h>' -i mkudffs/main.c
sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am
''; '';
postFixup = '' meta = {
sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules
'';
meta = with lib; {
description = "UDF tools"; description = "UDF tools";
maintainers = with maintainers; [ raskin ]; homepage = "https://github.com/pali/udftools";
platforms = platforms.linux; maintainers = with lib.maintainers; [ raskin ];
license = licenses.gpl2Plus; platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
}; };
} }

View file

@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv"; pname = "uv";
version = "0.6.6"; version = "0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "uv"; repo = "uv";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-KsPfAOEpD47/kqcN9M7lOtS8hSr0dXP3Y3b4x9yh1as="; hash = "sha256-PURQ/iDg9dvogwh/A2utmg8ufiPXafI+6jsT6UL9JsY=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-vcddP6EaNhJNK6UZUPxrABieJf2BPTAIs8r2uppP7N0="; cargoHash = "sha256-eZqyHzkLPjNtDe8X++2GaWYynJ3AYYCk3SlBtEJS6yM=";
buildInputs = [ buildInputs = [
rust-jemalloc-sys rust-jemalloc-sys

View file

@ -47,6 +47,7 @@ callPackage vscode-generic {
homepage = "https://codeium.com/windsurf"; homepage = "https://codeium.com/windsurf";
license = lib.licenses.unfree; license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
sarahec
xiaoxiangmoe xiaoxiangmoe
]; ];
platforms = [ platforms = [

View file

@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "youtrack"; pname = "youtrack";
version = "2025.1.62967"; version = "2025.1.66652";
src = fetchzip { src = fetchzip {
url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
hash = "sha256-6uKlbyVtYF4UZVi2bgX2iZSfqJJEEZ86FJ55TXnbQ1o="; hash = "sha256-2w/7NR2GPqP6tLvzU9xIO3OXzwqa06BzHWBnmMDFvbQ=";
}; };
nativeBuildInputs = [ makeBinaryWrapper ]; nativeBuildInputs = [ makeBinaryWrapper ];

View file

@ -39,7 +39,7 @@ let
cleanArgs args cleanArgs args
// { // {
pname = "astal-${name}"; pname = "astal-${name}";
version = "0-unstable-2025-03-07"; version = "0-unstable-2025-03-17";
__structuredAttrs = true; __structuredAttrs = true;
strictDeps = true; strictDeps = true;
@ -47,8 +47,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Aylur"; owner = "Aylur";
repo = "astal"; repo = "astal";
rev = "e14e19c220575446c4a0e815705c88b28e3850e0"; rev = "e5a8e3b60e41d06450284baf7008abe4ac27a53d";
hash = "sha256-SJ/m4Go4tSj8BnKLGwnLT6yN2pdlewepuXPmaDrzuK4="; hash = "sha256-8gWNDDVS7TqLiS+eR1XhfMHBeknmTzLQ3ItB40OK3p0=";
}; };
sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}";

View file

@ -11,13 +11,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awkward-cpp"; pname = "awkward-cpp";
version = "44"; version = "45";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "awkward_cpp"; pname = "awkward_cpp";
inherit version; inherit version;
hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g="; hash = "sha256-hgFM9bGqu63qKBnG5gVe5JilA+yiNO3Bn/UCkos08WI=";
}; };
build-system = [ build-system = [

View file

@ -1,6 +1,5 @@
{ {
lib, lib,
stdenv,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
@ -26,14 +25,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awkward"; pname = "awkward";
version = "2.7.4"; version = "2.8.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "scikit-hep"; owner = "scikit-hep";
repo = "awkward"; repo = "awkward";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg="; hash = "sha256-dr8DUY6T6fvtMASdM9U+XQN0dVP8AKvwa1gwHfOz3Dw=";
}; };
build-system = [ build-system = [
@ -62,31 +61,15 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = disabledTests = [
[ # pyarrow.lib.ArrowInvalid
# pyarrow.lib.ArrowInvalid "test_recordarray"
"test_recordarray" ];
]
++ lib.optionals (pythonAtLeast "3.13") [
# AttributeError: 'FrameLocalsProxy' object has no attribute 'clear'
"test_numexpr"
];
disabledTestPaths = disabledTestPaths = [
[ # Need to be run on a GPU platform.
# Need to be run on a GPU platform. "tests-cuda"
"tests-cuda" ];
]
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# Fatal Python error: Segmentation fault at:
# numba/typed/typedlist.py", line 344 in append
"tests/test_0118_numba_cpointers.py"
"tests/test_0397_arrays_as_constants_in_numba.py"
"tests/test_1677_array_builder_in_numba.py"
"tests/test_2055_array_builder_check.py"
"tests/test_2349_growablebuffer_in_numba.py"
"tests/test_2408_layoutbuilder_in_numba.py"
];
meta = { meta = {
description = "Manipulate JSON-like data with NumPy-like idioms"; description = "Manipulate JSON-like data with NumPy-like idioms";

View file

@ -0,0 +1,65 @@
{
lib,
stdenv,
pkgs,
buildPythonPackage,
setuptools,
numpy,
pip,
mpiSupport ? false,
}:
let
conduit = pkgs.conduit.override { inherit mpiSupport; };
in
buildPythonPackage {
inherit (conduit)
pname
version
src
nativeBuildInputs
buildInputs
;
pyproject = true;
# Needed for cmake to find openmpi
strictDeps = false;
postPatch = ''
substituteInPlace setup.py \
--replace-fail \
"'-j2'" \
"f'-j{os.environ.get(\"NIX_BUILD_CORES\")}'"
'';
dontUseCmakeConfigure = true;
env.ENABLE_MPI = mpiSupport;
build-system = [
setuptools
];
dependencies = [
numpy
pip
];
pythonImportsCheck = [ "conduit" ];
# No python tests
doCheck = false;
meta = {
description = "Python bindings for the conduit library";
inherit (conduit.meta)
homepage
changelog
license
platforms
;
maintainers = with lib.maintainers; [ GaetanLepage ];
# Cross-compilation is broken
broken = stdenv.hostPlatform != stdenv.buildPlatform;
};
}

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "configparser"; pname = "configparser";
version = "7.1.0"; version = "7.2.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jaraco"; owner = "jaraco";
repo = "configparser"; repo = "configparser";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-6B1I/kS60opMDpCzy2tnlnV65Qo500G0zPHP1I5TDWA="; hash = "sha256-ZPoHnmD0YjY3+dUW1NKDJjNOVrUFNOjQyMqamOsS2RQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
poetry-core, poetry-core,
@ -52,6 +53,9 @@ buildPythonPackage rec {
pythonRelaxDeps = [ pythonRelaxDeps = [
# Boto @ 1.35 has outstripped the version requirement # Boto @ 1.35 has outstripped the version requirement
"boto3" "boto3"
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
@ -64,10 +68,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_aws" ]; pythonImportsCheck = [ "langchain_aws" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-aws==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
poetry-core, poetry-core,
@ -41,6 +42,12 @@ buildPythonPackage rec {
build-system = [ poetry-core ]; build-system = [ poetry-core ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ dependencies = [
azure-identity azure-identity
langchain-core langchain-core
@ -65,10 +72,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-azure-dynamic-sessions==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
chromadb, chromadb,
langchain-core, langchain-core,
langchain-tests, langchain-tests,
@ -29,7 +30,12 @@ buildPythonPackage rec {
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];
pythonRelaxDeps = [ "numpy" ]; pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
"numpy"
];
dependencies = [ dependencies = [
chromadb chromadb
@ -50,10 +56,11 @@ buildPythonPackage rec {
"test_chroma_update_document" "test_chroma_update_document"
]; ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-chroma==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
pdm-backend, pdm-backend,
@ -56,7 +57,10 @@ buildPythonPackage rec {
]; ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"langchain" # Can fail during updates where building sees the old langchain # Each component release requests the exact latest langchain and -core.
# That prevents us from updating individul components.
"langchain"
"langchain-core"
"numpy" "numpy"
"pydantic-settings" "pydantic-settings"
"tenacity" "tenacity"
@ -98,12 +102,6 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/unit_tests" ]; pytestFlagsArray = [ "tests/unit_tests" ];
passthru = {
inherit (langchain-core) updateScript;
# updates the wrong fetcher rev attribute
skipBulkUpdate = true;
};
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
disabledTests = [ disabledTests = [
@ -124,6 +122,13 @@ buildPythonPackage rec {
"test_group_dependencies" "test_group_dependencies"
]; ];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^langchain-community==(.*)"
];
};
meta = { meta = {
changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-community==${version}"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-community==${version}";
description = "Community contributed LangChain integrations"; description = "Community contributed LangChain integrations";

View file

@ -30,7 +30,7 @@
syrupy, syrupy,
# passthru # passthru
writeScript, nix-update-script,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -94,28 +94,13 @@ buildPythonPackage rec {
tests.pytest = langchain-core.overridePythonAttrs (_: { tests.pytest = langchain-core.overridePythonAttrs (_: {
doCheck = true; doCheck = true;
}); });
# Updates to core tend to drive updates in everything else
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
set -u -o pipefail +e updateScript = nix-update-script {
# Common core extraArgs = [
nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core "--version-regex"
nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters "^langchain-core==([0-9.]+)$"
nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain ];
nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community };
# Extensions
nix-update --commit --version-regex 'langchain-aws==(.*)' python3Packages.langchain-aws
nix-update --commit --version-regex 'langchain-azure-dynamic-sessions==(.*)' python3Packages.langchain-azure-dynamic-sessions
nix-update --commit --version-regex 'langchain-chroma==(.*)' python3Packages.langchain-chroma
nix-update --commit --version-regex 'langchain-huggingface==(.*)' python3Packages.langchain-huggingface
nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb
nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai
'';
# updates the wrong fetcher rev attribute
skipBulkUpdate = true;
}; };
disabledTests = disabledTests =

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
pdm-backend, pdm-backend,
@ -31,7 +32,11 @@ buildPythonPackage rec {
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];
pythonRelaxDeps = [ "langchain-core" ]; pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ dependencies = [
langchain-core langchain-core
@ -47,9 +52,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_groq" ]; pythonImportsCheck = [ "langchain_groq" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898 "--version-regex"
"^langchain-groq==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
poetry-core, poetry-core,
@ -44,6 +45,12 @@ buildPythonPackage rec {
build-system = [ poetry-core ]; build-system = [ poetry-core ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ dependencies = [
huggingface-hub huggingface-hub
langchain-core langchain-core
@ -71,10 +78,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_huggingface" ]; pythonImportsCheck = [ "langchain_huggingface" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-huggingface==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
poetry-core, poetry-core,
@ -37,6 +38,9 @@ buildPythonPackage rec {
build-system = [ poetry-core ]; build-system = [ poetry-core ];
pythonRelaxDeps = [ pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
"numpy" "numpy"
]; ];
@ -60,10 +64,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_mongodb" ]; pythonImportsCheck = [ "langchain_mongodb" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-mongodb==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -35,6 +35,12 @@ buildPythonPackage rec {
build-system = [ poetry-core ]; build-system = [ poetry-core ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ dependencies = [
langchain-core langchain-core
ollama ollama
@ -57,8 +63,6 @@ buildPythonPackage rec {
"langchain-ollama==(.*)" "langchain-ollama==(.*)"
]; ];
}; };
# updates the wrong fetcher rev attribute
passthru.skipBulkUpdate = true;
meta = { meta = {
changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}";

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
pdm-backend, pdm-backend,
@ -47,6 +48,12 @@ buildPythonPackage rec {
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ dependencies = [
langchain-core langchain-core
openai openai
@ -89,10 +96,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_openai" ]; pythonImportsCheck = [ "langchain_openai" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-openai==([0-9.]+)$"
];
}; };
meta = { meta = {

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
pdm-backend, pdm-backend,
@ -37,6 +38,13 @@ buildPythonPackage rec {
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
"numpy"
];
dependencies = [ dependencies = [
httpx httpx
langchain-core langchain-core
@ -54,6 +62,13 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^langchain-tests==([0-9.]+)$"
];
};
meta = { meta = {
description = "Build context-aware reasoning applications"; description = "Build context-aware reasoning applications";
homepage = "https://github.com/langchain-ai/langchain"; homepage = "https://github.com/langchain-ai/langchain";

View file

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
nix-update-script,
# build-system # build-system
pdm-backend, pdm-backend,
@ -31,6 +32,12 @@ buildPythonPackage rec {
build-system = [ pdm-backend ]; build-system = [ pdm-backend ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
# That prevents us from updating individul components.
"langchain-core"
];
dependencies = [ langchain-core ]; dependencies = [ langchain-core ];
pythonImportsCheck = [ "langchain_text_splitters" ]; pythonImportsCheck = [ "langchain_text_splitters" ];
@ -43,10 +50,11 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/unit_tests" ]; pytestFlagsArray = [ "tests/unit_tests" ];
passthru = { passthru.updateScript = nix-update-script {
inherit (langchain-core) updateScript; extraArgs = [
# updates the wrong fetcher rev attribute "--version-regex"
skipBulkUpdate = true; "^langchain-test-splitters==([0-9.]+)$"
];
}; };
meta = { meta = {

Some files were not shown because too many files have changed in this diff Show more