Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-01-23 00:14:03 +00:00
committed by GitHub
88 changed files with 707 additions and 7728 deletions
+13
View File
@@ -529,6 +529,13 @@
githubId = 124545;
name = "Anthony Cowley";
};
acuteaangle = {
name = "Summer Tea";
email = "zestypurple@protonmail.com";
github = "acuteaangle";
githubId = 79724236;
keys = [ { fingerprint = "46C0 9BA8 A20E 5C50 1E1E 0597 0B6D 17F7 2BC4 7F61"; } ];
};
acuteenvy = {
matrix = "@acuteenvy:matrix.org";
github = "acuteenvy";
@@ -955,6 +962,12 @@
name = "Alex James";
keys = [ { fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; } ];
};
ALameLlama = {
email = "NicholasACiechanowski@gmail.com";
name = "Nicholas Ciechanowski";
github = "ALameLlama";
githubId = 55490546;
};
alanpearce = {
email = "alan@alanpearce.eu";
github = "alanpearce";
@@ -639,7 +639,7 @@ in
${lib.escapeShellArg cfg.name} \
admin
${php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick
${php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick --skip-external-dependencies
'';
serviceConfig = {
+1 -1
View File
@@ -75,7 +75,7 @@ import ./make-test-python.nix (
services.caddy = {
package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
hash = "sha256-BorJJWICgAWU7DrpDZJWifMnIYtGWldt/4S1VELwGJI=";
hash = "sha256-WPmJPnyOrAnuJxvn3ywswqvLGV8SZzzn3gU1Tbtpao4=";
};
configFile = pkgs.writeText "Caddyfile" ''
{
@@ -90,13 +90,13 @@
"vendorHash": "sha256-gF8aLRn2OCOzGRS6jb+K6M1cSbXPcQoVrIqrrRc7sMg="
},
"auth0": {
"hash": "sha256-BBMWsBMuR361tDVGMtQB97Fd7PsuZYK6qBwacG569vA=",
"hash": "sha256-4ZHTy4mBQ+ZgiUOZQEku8n+AfMmA9azioyAPeWUUae0=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.9.1",
"rev": "v1.10.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ez/qfjqPu8IOHcc5q2OpHm0zO762DXsWvg2vLM8hVas="
"vendorHash": "sha256-mvudiybfS6eLemCTXUJSIV4mD+GzR7Ed2H+lfA0de8E="
},
"avi": {
"hash": "sha256-ErZE6MA8Pn8KDDZLX2/yoeqck78vDAcFYdMhYMbcYuI=",
@@ -1255,13 +1255,13 @@
"vendorHash": "sha256-Q/fFd3ahIY1L2s8vE8KY/DtahS948qnoaFLQBQfyNH4="
},
"talos": {
"hash": "sha256-7VBoihwejNDRnIYsFS/dAiCE+JaMALkuVVqHaKQYUGU=",
"hash": "sha256-49woELLSpheuyGnXuwamZwsHdOfjwSB4v8/INzSrMRU=",
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
"owner": "siderolabs",
"repo": "terraform-provider-talos",
"rev": "v0.7.0",
"rev": "v0.7.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-4jsFsHuKMujOkBMA/+rGcYmHinWLuhon10CoO01DZsY="
"vendorHash": "sha256-iEi3zkr4kIZ1FTAft/Fy//v7xtlX/8uSrnbuxgFTDyA="
},
"temporalcloud": {
"hash": "sha256-nAOHdok/nK33zyEYmyB2nA+y2/mpkigZk4WTyl2F7XA=",
@@ -184,9 +184,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.10.4";
hash = "sha256-wJg/BfKWgDzv9HKOsNaq+l2jG37VbOtmBF+QEhNLQ1k=";
vendorHash = "sha256-YFsPxDlD7SqHo0x2UQnsJ5jDTp2JXdhEgDvtIpWVQ9o=";
version = "1.10.5";
hash = "sha256-6Y9r3VxL3DRvUaU6hLE+SdqjfIF+PAlXEYBPBc571QE=";
vendorHash = "sha256-xyFguSjqUweZyoO97nkjLfJWS+eifNV7hpJUjh/6Z54=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;
@@ -52,13 +52,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "remmina";
version = "1.4.37";
version = "1.4.39";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${finalAttrs.version}";
hash = "sha256-ZxQqRtJl4U33qSHbuYHN72r+VKx1ckfFH2iZQHl6qVE=";
hash = "sha256-gsQtPa6NLQC3nMfemmZv416hyqFg8Z1GDMALhNaPAOw=";
};
nativeBuildInputs = [
+199 -111
View File
@@ -1,119 +1,207 @@
{ lib, writeTextFile, buildPackages }:
# All possible values as defined by the spec, version 1.4.
# Please keep in spec order for easier maintenance.
# When adding a new value, don't forget to update the Version field below!
# See https://specifications.freedesktop.org/desktop-entry-spec/latest
lib.makeOverridable ({ name # The name of the desktop file
, type ? "Application"
# version is hardcoded
, desktopName # The name of the application
, genericName ? null
, noDisplay ? null
, comment ? null
, icon ? null
# we don't support the Hidden key - if you don't need something, just don't install it
, onlyShowIn ? []
, notShowIn ? []
, dbusActivatable ? null
, tryExec ? null
, exec ? null
, path ? null
, terminal ? null
, actions ? {} # An attrset of [internal name] -> { name, exec?, icon? }
, mimeTypes ? [] # The spec uses "MimeType" as singular, use plural here to signify list-ness
, categories ? []
, implements ? []
, keywords ? []
, startupNotify ? null
, startupWMClass ? null
, url ? null
, prefersNonDefaultGPU ? null
# not supported until version 1.5, which is not supported by our desktop-file-utils as of 2022-02-23
# , singleMainWindow ? null
, extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions
{
lib,
writeTextFile,
buildPackages,
}:
let
# There are multiple places in the FDO spec that make "boolean" values actually tristate,
# e.g. StartupNotify, where "unset" is literally defined as "do something reasonable".
# So, handle null values separately.
boolOrNullToString = value:
if value == null then null
else if builtins.isBool value then lib.boolToString value
else throw "makeDesktopItem: value must be a boolean or null!";
# Multiple values are represented as one string, joined by semicolons.
# Technically, it's possible to escape semicolons in values with \;, but this is currently not implemented.
renderList = key: value:
if !builtins.isList value then throw "makeDesktopItem: value for ${key} must be a list!"
else if builtins.any (item: lib.hasInfix ";" item) value then throw "makeDesktopItem: values in ${key} list must not contain semicolons!"
else if value == [] then null
else builtins.concatStringsSep ";" value;
# The [Desktop Entry] section of the desktop file, as an attribute set.
# Please keep in spec order.
mainSection = {
"Type" = type;
"Version" = "1.4";
"Name" = desktopName;
"GenericName" = genericName;
"NoDisplay" = boolOrNullToString noDisplay;
"Comment" = comment;
"Icon" = icon;
"OnlyShowIn" = renderList "onlyShowIn" onlyShowIn;
"NotShowIn" = renderList "notShowIn" notShowIn;
"DBusActivatable" = boolOrNullToString dbusActivatable;
"TryExec" = tryExec;
"Exec" = exec;
"Path" = path;
"Terminal" = boolOrNullToString terminal;
"Actions" = renderList "actions" (builtins.attrNames actions);
"MimeType" = renderList "mimeTypes" mimeTypes;
"Categories" = renderList "categories" categories;
"Implements" = renderList "implements" implements;
"Keywords" = renderList "keywords" keywords;
"StartupNotify" = boolOrNullToString startupNotify;
"StartupWMClass" = startupWMClass;
"URL" = url;
"PrefersNonDefaultGPU" = boolOrNullToString prefersNonDefaultGPU;
# "SingleMainWindow" = boolOrNullToString singleMainWindow;
} // extraConfig;
/**
A utility builder to create a desktop entry file at a predetermined location (by default, $out/share/applications).
# Render a single attribute pair to a Key=Value line.
# FIXME: this isn't entirely correct for arbitrary strings, as some characters
# need to be escaped. There are currently none in nixpkgs though, so this is OK.
renderLine = name: value: if value != null then "${name}=${value}" else null;
# Examples
# Render a full section of the file from an attrset.
# Null values are intentionally left out.
renderSection = sectionName: attrs:
lib.pipe attrs [
(lib.mapAttrsToList renderLine)
(builtins.filter (v: v != null))
(builtins.concatStringsSep "\n")
(section: ''
[${sectionName}]
${section}
'')
];
```nix
makeDesktopItem {
name = "Eclipse";
exec = "eclipse";
icon = "eclipse";
comment = "Integrated Development Environment";
desktopName = "Eclipse IDE";
genericName = "Integrated Development Environment";
categories = [ "Development" ];
}
=> «derivation /nix/store/sh017x5n50i2qwns2na1sxdp7zb2zgcw-Eclipse.desktop.drv»
```
mainSectionRendered = renderSection "Desktop Entry" mainSection;
# Type
# Convert from javaCase names as used in Nix to PascalCase as used in the spec.
preprocessAction = { name, icon ? null, exec ? null }: {
"Name" = name;
"Icon" = icon;
"Exec" = exec;
};
renderAction = name: attrs: renderSection "Desktop Action ${name}" (preprocessAction attrs);
actionsRendered = lib.mapAttrsToList renderAction actions;
```
makeDesktopItem :: AttrSet -> Derivation
```
extension = if type == "Directory" then "directory" else "desktop";
content = [ mainSectionRendered ] ++ actionsRendered;
in
writeTextFile {
name = "${name}.${extension}";
destination = "/share/applications/${name}.${extension}";
text = builtins.concatStringsSep "\n" content;
checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"'';
})
# Input
`attrs`
: An AttrSet with the following definitions. See https://specifications.freedesktop.org/desktop-entry-spec/1.4/recognized-keys.html#id-1.7.6 for definitions.
- `name` (string): The name of the desktop file (excluding the .desktop or .directory file extensions)
- `destination` (string): The directory that will contain the desktop entry file (Default: "/share/applications")
- `type` ("Application" | "Link" | "Directory"): The `Type` of the desktop entry
- `desktopName` (string): The `Name` of the desktop entry
- `genericName` (string): The `GenericName` of the desktop entry
- `noDisplay` (bool): The `NoDisplay` of the desktop entry
- `comment` (string): The `Comment` of the desktop entry
- `icon` (string): The `Icon` of the desktop entry
- `onlyShowIn` (string[]): The `OnlyShowIn` of the desktop entry
- `notShowIn` (string[]): The `NotShowIn` of the desktop entry
- `dbusActivatable` (bool): The `DBusActivatable` of the desktop entry
- `tryExec` (string): The `TryExec` of the desktop entry
- `exec` (string): The `Exec` of the desktop entry
- `path` (string): The `Path` of the desktop entry
- `terminal` (bool): The `Terminal` of the desktop entry
- `actions` (AttrSet): An attrset of [internal name] -> { name, exec?, icon? } representing the `Actions` of the desktop entry
- `mimeTypes` (string[]): The `MimeType` of the desktop entry
- `categories` (string[]): The `Categories` of the desktop entry; see https://specifications.freedesktop.org/menu-spec/1.0/category-registry.html for possible values
- `implements` (string[]): The `Implements` of the desktop entry
- `keywords` (string[]): The `Keywords` of the desktop entry
- `startupNotify` (bool): The `StartupNotify` of the desktop entry
- `startupWMClass` (string): The `StartupWMClass` of the desktop entry
- `url` (string): The `URL` of the Link-type desktop entry
- `prefersNonDefaultGPU` (bool): The `PrefersNonDefaultGPU` (non-standard) of the desktop entry
- `extraConfig` (AttrSet): Additional values to be added literally to the final item, e.g. vendor extensions
# Output
A derivation that contains the output desktop entry file.
# Developer Note
All possible values are as defined by the spec, version 1.4.
Please keep in spec order for easier maintenance.
When adding a new value, don't forget to update the Version field below!
See https://specifications.freedesktop.org/desktop-entry-spec/latest
*/
lib.makeOverridable (
{
name, # The name of the desktop file
destination ? "/share/applications",
type ? "Application",
# version is hardcoded
desktopName, # The name of the application
genericName ? null,
noDisplay ? null,
comment ? null,
icon ? null,
# we don't support the Hidden key - if you don't need something, just don't install it
onlyShowIn ? [ ],
notShowIn ? [ ],
dbusActivatable ? null,
tryExec ? null,
exec ? null,
path ? null,
terminal ? null,
actions ? { }, # An attrset of [internal name] -> { name, exec?, icon? }
mimeTypes ? [ ], # The spec uses "MimeType" as singular, use plural here to signify list-ness
categories ? [ ],
implements ? [ ],
keywords ? [ ],
startupNotify ? null,
startupWMClass ? null,
url ? null,
prefersNonDefaultGPU ? null,
# not supported until version 1.5, which is not supported by our desktop-file-utils as of 2022-02-23
# singleMainWindow ? null,
extraConfig ? { }, # Additional values to be added literally to the final item, e.g. vendor extensions
}:
let
# There are multiple places in the FDO spec that make "boolean" values actually tristate,
# e.g. StartupNotify, where "unset" is literally defined as "do something reasonable".
# So, handle null values separately.
boolOrNullToString =
value:
if value == null then
null
else if builtins.isBool value then
lib.boolToString value
else
throw "makeDesktopItem: value must be a boolean or null!";
# Multiple values are represented as one string, joined by semicolons.
# Technically, it's possible to escape semicolons in values with \;, but this is currently not implemented.
renderList =
key: value:
if !builtins.isList value then
throw "makeDesktopItem: value for ${key} must be a list!"
else if builtins.any (item: lib.hasInfix ";" item) value then
throw "makeDesktopItem: values in ${key} list must not contain semicolons!"
else if value == [ ] then
null
else
builtins.concatStringsSep ";" value;
# The [Desktop Entry] section of the desktop file, as an attribute set.
# Please keep in spec order.
mainSection = {
"Type" = type;
"Version" = "1.4";
"Name" = desktopName;
"GenericName" = genericName;
"NoDisplay" = boolOrNullToString noDisplay;
"Comment" = comment;
"Icon" = icon;
"OnlyShowIn" = renderList "onlyShowIn" onlyShowIn;
"NotShowIn" = renderList "notShowIn" notShowIn;
"DBusActivatable" = boolOrNullToString dbusActivatable;
"TryExec" = tryExec;
"Exec" = exec;
"Path" = path;
"Terminal" = boolOrNullToString terminal;
"Actions" = renderList "actions" (builtins.attrNames actions);
"MimeType" = renderList "mimeTypes" mimeTypes;
"Categories" = renderList "categories" categories;
"Implements" = renderList "implements" implements;
"Keywords" = renderList "keywords" keywords;
"StartupNotify" = boolOrNullToString startupNotify;
"StartupWMClass" = startupWMClass;
"URL" = url;
"PrefersNonDefaultGPU" = boolOrNullToString prefersNonDefaultGPU;
# "SingleMainWindow" = boolOrNullToString singleMainWindow;
} // extraConfig;
# Render a single attribute pair to a Key=Value line.
# FIXME: this isn't entirely correct for arbitrary strings, as some characters
# need to be escaped. There are currently none in nixpkgs though, so this is OK.
renderLine = name: value: if value != null then "${name}=${value}" else null;
# Render a full section of the file from an attrset.
# Null values are intentionally left out.
renderSection =
sectionName: attrs:
lib.pipe attrs [
(lib.mapAttrsToList renderLine)
(builtins.filter (v: v != null))
(builtins.concatStringsSep "\n")
(section: ''
[${sectionName}]
${section}
'')
];
mainSectionRendered = renderSection "Desktop Entry" mainSection;
# Convert from javaCase names as used in Nix to PascalCase as used in the spec.
preprocessAction =
{
name,
icon ? null,
exec ? null,
}:
{
"Name" = name;
"Icon" = icon;
"Exec" = exec;
};
renderAction = name: attrs: renderSection "Desktop Action ${name}" (preprocessAction attrs);
actionsRendered = lib.mapAttrsToList renderAction actions;
extension = if type == "Directory" then "directory" else "desktop";
content = [ mainSectionRendered ] ++ actionsRendered;
in
writeTextFile {
name = "${name}.${extension}";
destination = "${destination}/${name}.${extension}";
text = builtins.concatStringsSep "\n" content;
checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"'';
}
)
-7285
View File
File diff suppressed because it is too large Load Diff
+5 -10
View File
@@ -40,23 +40,18 @@
rustPlatform.buildRustPackage rec {
pname = "alvr";
version = "20.11.1";
version = "20.12.1";
src = fetchFromGitHub {
owner = "alvr-org";
repo = "ALVR";
tag = "v${version}";
fetchSubmodules = true; #TODO devendor openvr
hash = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8=";
hash = "sha256-T7KyGZwnJ9t4Bh8KFy190IV3igWCG+yn+OW9a6mgmYI=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"openxr-0.18.0" = "sha256-v8sY9PROrqzkpuq3laIn2hPaX+DY7Fbca6i/Xiacd1g=";
"settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-DE88nMC6qpbPJsBpdyITv6igMgwy4g40VCgFQQuRRTA=";
patches = [
(substituteAll {
@@ -130,7 +125,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -Dm755 ${src}/alvr/xtask/resources/alvr.desktop $out/share/applications/alvr.desktop
install -Dm644 ${src}/resources/alvr.png $out/share/icons/hicolor/256x256/apps/alvr.png
install -Dm644 ${src}/resources/ALVR-Icon.svg $out/share/icons/hicolor/scalable/apps/alvr.svg
# Install SteamVR driver
mkdir -p $out/{libexec,lib/alvr,share}
+4 -4
View File
@@ -10,12 +10,12 @@
stdenv,
}:
let
version = "2.9.0";
version = "2.9.1";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
tag = "v${version}";
hash = "sha256-3QcpmPUhZZ8oN/CUbCh/A1D0B59o1RxWPyMbA/WoRcU=";
hash = "sha256-28ahonJ0qeynoqf02gws0LstaL4E08dywSJ8s3tgEDI=";
};
in
buildGoModule {
@@ -26,10 +26,10 @@ buildGoModule {
owner = "caddyserver";
repo = "caddy";
tag = "v${version}";
hash = "sha256-ea1Cch0LOGVGO9CVvS61EHVwJule4HZRizpQYP1QA2w=";
hash = "sha256-XW1cBW7mk/aO/3IPQK29s4a6ArSKjo7/64koJuzp07I=";
};
vendorHash = "sha256-HEQCNOv4vO5QsbmoT0acRoaJ4sB0dzF1zcR38778nBI=";
vendorHash = "sha256-qrlpuqTnFn/9oMTMovswpS1eAI7P9gvesoMpsIWKcY8=";
subPackages = [ "cmd/caddy" ];
+6
View File
@@ -7,6 +7,7 @@
cubeb,
curl,
fetchFromGitHub,
fetchpatch,
fmt_9,
gamemode,
glm,
@@ -65,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
# > SPIRV-Tools-opt
./0000-spirv-tools-opt-cmakelists.patch
./0001-glslang-cmake-target.patch
(fetchpatch {
name = "fix-building-against-boost-187.patch";
url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch";
hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI=";
})
];
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "charasay";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "latipun7";
repo = pname;
rev = "v${version}";
hash = "sha256-7z5+7yrx5X5rdBMNj9oWBZ2IX0s88c1SLhgz2IDDEn8=";
hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4=";
};
cargoHash = "sha256-5htNU8l+amh+C8EL1K4UcXzf5Pbhhjd5RhxrucJoj/M=";
cargoHash = "sha256-K6roydkLHvs+xg2LjrSHw8IcYEyOFcrsh4u6Fz7yYKQ=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.31151";
version = "0.1.31425";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tmoDo/DvFiP6SfnQU5iNF2By5HxIuK//hj1n5+Q+cps=";
sha256 = "sha256-UrJnUkzlmQMUJqiKC7OqfKC2X5cnWj3Ns42YUdbYc3E=";
};
vendorHash = "sha256-60edYYhbSPiJWmuQXXEt+xCnSxsHf8Q38RgyWwdP6vQ=";
vendorHash = "sha256-kK5q9hZg4N8LFfaA7PhAxBepH1Wor3xRoy/d3YPGrmI=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.99.2";
version = "1.101.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-zX+mzbfucrXdFN4+j+nAptn3HVLPKVUd55cQRHrpIJg=";
hash = "sha256-4pGdb7CZTYjaGgrwRwI9mtmqJaFY7AwGk36PLASUDFU=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
hash = "sha256-au62bMELa27diNeQKTwgaGv9r80eO9pWv68F/WoYfGo=";
hash = "sha256-XNGSO9czfF+fCMNoF6BIboQeKKvysyF6e7sC7lY+1Ds=";
};
vendorHash = "sha256-luq42qdNb9vqNXMNkYQeNH+KeYwrehwtrDkNNx7P9Y8=";
vendorHash = "sha256-89fq5ANspfHw7aU6b3L7Kdt0Y7oVLpUYxhHmnVdLP/Q=";
subPackages = [ "cmd/clusterctl" ];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.37";
version = "0.8.38";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-yx1Fjsad7mjFmv/BFGZwH9xbidGXLT0FKI/cgMi2bU8=";
hash = "sha256-2WxtuFrEeYErkUQaT7laPzSjEYAszbb4zHRH7/hWXD0=";
};
vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs=";
vendorHash = "sha256-qft+39m583ifp/seEErSGprh9JGpFFvm/EyzCVUmIwQ=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -66,13 +66,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cyrus-imapd";
version = "3.10.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "cyrusimap";
repo = "cyrus-imapd";
tag = "cyrus-imapd-${finalAttrs.version}";
hash = "sha256-dyybRqmrVX+ERGpToS5JjGC6S/B0t967dLCWfeUrLKA=";
hash = "sha256-jMSTduQmLB55smBmbJ32eLqiC24ufQyX/FT9d18lDCo=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dbmate";
version = "2.24.2";
version = "2.25.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
tag = "v${version}";
hash = "sha256-Ot8lHwrI848tI8ZGRmw3StLhB5ypTUWZQRCEpW95zGs=";
hash = "sha256-bXiLg3l9Uj1QdEyF6JfKqHMZP7Zi1Q88SsvrX2CueM4=";
};
vendorHash = "sha256-zu9ilKGWVTNJAOtYIUoHC4yXbBgwmmp2Idv8ZKRZ+b8=";
vendorHash = "sha256-PpEWupCSyxzei8faGzJzWyfcrvgF9IiPRyjxasJ2XlM=";
doCheck = false;
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "dotenvx";
version = "1.32.1";
version = "1.33.0";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
tag = "v${version}";
hash = "sha256-yXCggSKHL+gDgKrcytlYdhCzIhROEzPmNvZQHcwy408=";
hash = "sha256-/0bxY4D3jq6shXEHf13CkGdEGRS8cVQOSaLiIaehq5g=";
};
npmDepsHash = "sha256-GsdUwT/nHoA0N2BFkWu2I4VmyD1GRN+XWzvoaffXBP8=";
npmDepsHash = "sha256-JtoOXDS44fG4ctzN1ZSi+WOXye2p5mjKczSXbvGPIEw=";
dontNpmBuild = true;
@@ -1,15 +0,0 @@
diff --git a/dstat b/dstat
index 3ac7087..c5f089d 100755
--- a/dstat
+++ b/dstat
@@ -66,9 +66,7 @@ if sys.version_info < (2, 3):
pluginpath = [
os.path.expanduser('~/.dstat/'), # home + /.dstat/
- os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/', # binary path + /plugins/
- '/usr/share/dstat/',
- '/usr/local/share/dstat/',
+ os.path.abspath(os.path.dirname(sys.argv[0])) + '/../share/dstat/', # binary path + /../share/dstat/
]
class Options:
-48
View File
@@ -1,48 +0,0 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "dstat";
format = "other";
version = "0.7.4";
src = fetchFromGitHub {
owner = "dstat-real";
repo = "dstat";
rev = "v${version}";
sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v";
};
propagatedBuildInputs = with python3Packages; [ six ];
patches = [
./fix_pluginpath.patch
# this fixes another bug with python3
(fetchpatch {
url = "https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch";
sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn";
})
];
makeFlags = [ "prefix=$(out)" ];
# remove deprecation warnings
preFixup = ''
sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat
sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat
'';
meta = with lib; {
homepage = "http://dag.wieers.com/home-made/dstat/";
description = "Versatile resource statistics tool";
mainProgram = "dstat";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ ];
changelog = "https://github.com/dstat-real/dstat/blob/v${version}/ChangeLog";
};
}
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "3.1.0";
version = "3.1.2";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = "v${version}";
hash = "sha256-8yVh//dBsBFtZ7t6VGtNBOgUpfpDMhIVB5ab5H54BTE=";
hash = "sha256-EWLk4VHeA32VErULJwPHKLRMb5qaET7fnpBxLx5f7YE=";
};
vendorHash = "sha256-a/z68Keac2ILCNQD8c0pKQ0PiLiVcbOnMj/84q/+N4c=";
vendorHash = "sha256-GNUkU/cmu8j6naFAHIEZ56opJnj8p2Sb8M7TduTbJcU=";
doCheck = false;
@@ -10,6 +10,7 @@
ffmpeg,
freeimage,
freetype,
gettext,
harfbuzz,
icu,
libgit2,
@@ -31,8 +32,15 @@ stdenv.mkDerivation (finalAttrs: {
./001-add-nixpkgs-retroarch-cores.patch
];
postPatch = ''
# ldd-based detection fails for cross builds
substituteInPlace CMake/Packages/FindPoppler.cmake \
--replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' ""
'';
nativeBuildInputs = [
cmake
gettext # msgfmt
pkg-config
];
+2 -2
View File
@@ -12,13 +12,13 @@
llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
pname = "fex";
version = "2412";
version = "2501";
src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${version}";
hash = "sha256-VwcfxdRMjE/yoe5q0p3j4FdEMOJdtq17moxiGWO+CN0=";
hash = "sha256-9YOKLck4LIhTiAz+aCkOR3Eo1v02GK/YTQ98MuBSihI=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.13.219";
version = "2.13.231";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-i4Ql8WEzz+33gmmMwGEaF8/nlkMoXWayEcsGIJaVdTQ=";
hash = "sha256-sjYEkRT5CnInu+Fl/elyuDyjG1PYccyJFWjipQNzwf8=";
};
vendorHash = "sha256-qjL3G0/x8mdgIZqHgJPri4ZUjsPhbopPvLRaXhfjkHs=";
vendorHash = "sha256-ooaEQJyfOIR2DyJH6U+GLBmDh/6g7RQpxdnzlK2rw8Y=";
ldflags = [
"-s"
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gitlab-release-cli";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "release-cli";
rev = "v${version}";
hash = "sha256-6h9hVk1x3zkhvZrEu5XUjLRIFj+VXF8qtd3AAdVmyE0=";
hash = "sha256-jdgCRH5Jq/WZujV6es6J7AyLVtvX1oVegCeTXoV5TTM=";
};
vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.50.4";
version = "2.51.1";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-pJUMdCnvgfm/re442QhuQs4UCdPicitLu1NTS+I61IY=";
sha256 = "sha256-+KbO2Ch0SB+TP7/So2bCsHOS7ousAl5mD/w2EXj4jzg=";
};
preCheck = ''
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "goflow";
version = "3.4.5";
version = "3.5.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2tQADlAajuiNtygdu2SCu2EF3NAuloQL0ROBMUZudZU=";
sha256 = "sha256-dNu/z48wzUExGsfpKSWmLwhtqbs/Xi+4PFKRjTxt9DI=";
};
vendorHash = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg=";
vendorHash = "sha256-8Vz6zNxFAFjg6VGYaoYbFEp+fJXu3jrC7HJFxdQRkjw=";
meta = with lib; {
description = "NetFlow/IPFIX/sFlow collector in Go";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "hishtory";
version = "0.324";
version = "0.327";
src = fetchFromGitHub {
owner = "ddworken";
repo = pname;
rev = "v${version}";
hash = "sha256-CcRRMHUvLVrJ0fWsAH+SUxcSB2koOShlqBnnhKtrCts=";
hash = "sha256-bt+k3JWkuxpY2ZSHFvKxOyUwcBtQrsTH/uf1Lw0r+uo=";
};
vendorHash = "sha256-A975ensuezz75I4KrFcl8wi9HjZqlfEHeJVAyA69V9k=";
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "infrastructure-agent";
version = "1.59.0";
version = "1.60.1";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = version;
hash = "sha256-Kf7C4vJXjoJB+B695DQA3XWtm8IuBby8sKqH7F68Oy8=";
hash = "sha256-ZLRaNEERDu2oVcZJ3xUrqJZ7eIt1bB8vihdweXFMLTg=";
};
vendorHash = "sha256-0WLL15CXRi/flp4EV3Qt0wO1VaUmAokzsChpiqjs+YQ=";
vendorHash = "sha256-5w2pzyS5z6Zxg77UoE/c3saPHOo8+70zqlrBQb6V5FU=";
ldflags = [
"-s"
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "juicefs";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "juicedata";
repo = pname;
rev = "v${version}";
hash = "sha256-DQ3JdP1HKWORPkcP4HJ32eg6aaockZfG+FQhBJnZCFQ=";
hash = "sha256-qe8uhSSLeOsr0FmgoOVeZeIpP4Bv5/Viz5N90PGdc9o=";
};
vendorHash = "sha256-fHmLTAn4W8KMtZ1Ov4gBQTUpzHqQnipGSQs5hr1MD3w=";
vendorHash = "sha256-TIcxqMMsihV3Rf8WpQM/Ct9CNs3gBKBIx6myXHfca+s=";
excludedPackages = [ "sdk/java/libjfs" ];
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "k0sproject";
repo = "k0sctl";
tag = "v${version}";
hash = "sha256-hArlgDBfqsnla55cctIMQjzY6GJJNLaFXC9EVyzrNms=";
hash = "sha256-/PwJg+bwgoKXxpn/afbk+eATtvqVANh+bfBER1gW0Fo=";
};
vendorHash = "sha256-fwE7eZrqWnlHO7vtBZOxqzCJvyguKX7Pt9KL0yjfCUA=";
vendorHash = "sha256-0KaLwu91U5LcvJIoC7FDvhfRlfNIjOp1LokykclOgBY=";
ldflags = [
"-s"
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "kubectl-linstor";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "piraeusdatastore";
repo = "kubectl-linstor";
tag = "v${version}";
hash = "sha256-1wXhrnQlOIg2mJi6DhHGcb+OxSblDq+V95pZ5bl72R4=";
hash = "sha256-Fmy925eGGmXGoIT3EXmZDnHyu6nN7Rkgl2vQOhesqD4=";
};
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
+6 -3
View File
@@ -8,19 +8,22 @@
rustPlatform.buildRustPackage rec {
pname = "lianad";
version = "8.0"; # keep in sync with liana
version = "9.0"; # keep in sync with liana
src = fetchFromGitHub {
owner = "wizardsardine";
repo = "liana";
rev = "v${version}";
hash = "sha256-2aIaRZNIRgFdA+NVnzOkEE3kYA15CoNBrsNGBhIz0nU=";
hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0=";
};
cargoHash = "sha256-/EkDAZPNka+vRWsAo4i/65lufUu8N/m8cfBsOInjaxQ=";
useFetchCargoVendor = true;
cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI=";
buildInputs = [ udev ];
buildAndTestSubdir = "lianad";
postInstall = ''
install -Dm0644 ./contrib/lianad_config_example.toml $out/etc/liana/config.toml
'';
+2 -2
View File
@@ -81,13 +81,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "4525";
version = "4529";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-U+JkD61ThCJUSnG2MMR61BSijyoQNg1mPLSKgSgNBCk=";
hash = "sha256-YqXL6nxUQrF/RI9GEzlBo6iiaLFYba0cXsVVqM/aGTw=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
+3 -3
View File
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-+c/eXcOzl42Sc5V9hUr3FNcdnL8z28wreIbKrz6c45s=";
hash = "sha256-D++znvzK8hoHOrsLBQTGqkTS/E8Y6IdiZ5fidd2HZmw=";
};
projectFile = "CarCareTracker.sln";
@@ -22,7 +22,7 @@ buildDotnetModule rec {
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
makeWrapperArgs = [
"--set DOTNET_CONTENTROOT ${placeholder "out"}/lib/lubelogger"
"--set DOTNET_WEBROOT ${placeholder "out"}/lib/lubelogger/wwwroot"
];
executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
-13
View File
@@ -1,16 +1,10 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
darwin,
cmake,
}:
let
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
in
rustPlatform.buildRustPackage rec {
pname = "lune";
version = "0.8.9";
@@ -30,11 +24,6 @@ rustPlatform.buildRustPackage rec {
cmake # required for libz-ng-sys
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
SystemConfiguration
];
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
rm .cargo/config.toml
@@ -64,7 +53,5 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/lune-org/lune/blob/${src.rev}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ lammermann ];
# note: Undefined symbols for architecture x86_64
broken = stdenv.hostPlatform.isDarwin;
};
}
@@ -61,6 +61,25 @@ class BuildAttr:
return cls(Path(file or "default.nix"), attr)
def discover_git(location: Path) -> str | None:
current = location.resolve()
previous = None
while current.is_dir() and current != previous:
dotgit = current / ".git"
if dotgit.is_dir():
return str(current)
elif dotgit.is_file(): # this is a worktree
with dotgit.open() as f:
dotgit_content = f.read().strip()
if dotgit_content.startswith("gitdir: "):
return dotgit_content.split("gitdir: ")[1]
previous = current
current = current.parent
return None
@dataclass(frozen=True)
class Flake:
path: Path | str
@@ -84,11 +103,15 @@ class Flake:
assert m is not None, f"got no matches for {flake_str}"
attr = m.group("attr")
nixos_attr = f"nixosConfigurations.{attr or hostname_fn() or 'default'}"
path = m.group("path")
if ":" in path:
return cls(path, nixos_attr)
path_str = m.group("path")
if ":" in path_str:
return cls(path_str, nixos_attr)
else:
return cls(Path(path), nixos_attr)
path = Path(path_str)
git_repo = discover_git(path)
if git_repo is not None:
return cls(f"git+file://{git_repo}", nixos_attr)
return cls(path, nixos_attr)
@classmethod
def from_arg(cls, flake_arg: Any, target_host: Remote | None) -> Self | None:
@@ -4,6 +4,8 @@ from pathlib import Path
from typing import Any
from unittest.mock import patch
from pytest import MonkeyPatch
import nixos_rebuild.models as m
from .helpers import get_qualified_name
@@ -30,7 +32,7 @@ def test_build_attr_to_attr() -> None:
)
def test_flake_parse() -> None:
def test_flake_parse(tmpdir: Path, monkeypatch: MonkeyPatch) -> None:
assert m.Flake.parse("/path/to/flake#attr") == m.Flake(
Path("/path/to/flake"), "nixosConfigurations.attr"
)
@@ -40,15 +42,31 @@ def test_flake_parse() -> None:
assert m.Flake.parse("/path/to/flake", lambda: "hostname") == m.Flake(
Path("/path/to/flake"), "nixosConfigurations.hostname"
)
assert m.Flake.parse(".#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
assert m.Flake.parse("#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
assert m.Flake.parse(".") == m.Flake(Path("."), "nixosConfigurations.default")
# change directory to tmpdir
with monkeypatch.context() as patch_context:
patch_context.chdir(tmpdir)
assert m.Flake.parse(".#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
assert m.Flake.parse("#attr") == m.Flake(Path("."), "nixosConfigurations.attr")
assert m.Flake.parse(".") == m.Flake(Path("."), "nixosConfigurations.default")
assert m.Flake.parse("path:/to/flake#attr") == m.Flake(
"path:/to/flake", "nixosConfigurations.attr"
)
assert m.Flake.parse("github:user/repo/branch") == m.Flake(
"github:user/repo/branch", "nixosConfigurations.default"
)
git_root = tmpdir / "git_root"
git_root.mkdir()
(git_root / ".git").mkdir()
assert m.Flake.parse(str(git_root)) == m.Flake(
f"git+file://{git_root}", "nixosConfigurations.default"
)
work_tree = tmpdir / "work_tree"
work_tree.mkdir()
(work_tree / ".git").write_text("gitdir: /path/to/git", "utf-8")
assert m.Flake.parse(str(work_tree)) == m.Flake(
"git+file:///path/to/git", "nixosConfigurations.default"
)
def test_flake_to_attr() -> None:
@@ -61,7 +79,7 @@ def test_flake_to_attr() -> None:
@patch(get_qualified_name(platform.node), autospec=True)
def test_flake_from_arg(mock_node: Any) -> None:
def test_flake_from_arg(mock_node: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
mock_node.return_value = "hostname"
# Flake string
@@ -73,9 +91,11 @@ def test_flake_from_arg(mock_node: Any) -> None:
assert m.Flake.from_arg(False, None) is None
# True
assert m.Flake.from_arg(True, None) == m.Flake(
Path("."), "nixosConfigurations.hostname"
)
with monkeypatch.context() as patch_context:
patch_context.chdir(tmpdir)
assert m.Flake.from_arg(True, None) == m.Flake(
Path("."), "nixosConfigurations.hostname"
)
# None when we do not have /etc/nixos/flake.nix
with patch(
@@ -6,6 +6,7 @@ from typing import Any
from unittest.mock import ANY, call, patch
import pytest
from pytest import MonkeyPatch
import nixos_rebuild.models as m
import nixos_rebuild.nix as n
@@ -51,7 +52,8 @@ def test_build(mock_run: Any, monkeypatch: Any) -> None:
autospec=True,
return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "),
)
def test_build_flake(mock_run: Any) -> None:
def test_build_flake(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None:
monkeypatch.chdir(tmpdir)
flake = m.Flake.parse(".#hostname")
assert n.build_flake(
@@ -165,7 +167,10 @@ def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: Any) -> None:
autospec=True,
return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "),
)
def test_build_remote_flake(mock_run: Any, monkeypatch: Any) -> None:
def test_build_remote_flake(
mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path
) -> None:
monkeypatch.chdir(tmpdir)
flake = m.Flake.parse(".#hostname")
build_host = m.Remote("user@host", [], None)
monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts")
@@ -287,7 +292,7 @@ def test_copy_closure(monkeypatch: Any) -> None:
@patch(get_qualified_name(n.run_wrapper, n), autospec=True)
def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None:
# Flake
flake = m.Flake.parse(".#attr")
flake = m.Flake.parse(f"{tmpdir}#attr")
n.edit(flake, {"commit_lock_file": True})
mock_run.assert_called_with(
[
@@ -297,7 +302,7 @@ def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None:
"edit",
"--commit-lock-file",
"--",
".#nixosConfigurations.attr",
f"{tmpdir}#nixosConfigurations.attr",
],
check=False,
)
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "okms-cli";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "ovh";
repo = "okms-cli";
tag = "v${version}";
hash = "sha256-y7Oy2vCxq5nXOUZxawz5737/io1+e/jNjuv7bH97yKA=";
hash = "sha256-inDE/Vexn7efzxfa/ali+mhyioBWjDPRlDznYyChTtI=";
};
vendorHash = "sha256-pJGhaNsJ69SDI+sBN4ELxckkX6v6DNC4U49bCff6Fsg=";
vendorHash = "sha256-l8Z5cAfWHWz8mBVioltuNg+jaNwySU/Y4z3z2X86h/s=";
ldflags = [
"-s"
+3 -3
View File
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "opcr-policy";
version = "0.2.19";
version = "0.2.22";
src = fetchFromGitHub {
owner = "opcr-io";
repo = "policy";
rev = "v${version}";
sha256 = "sha256-A5dqKbQhdJlSOU7qxC8xrCCSXK5yGmDsoVWfgWKl2TE=";
sha256 = "sha256-I7KjJpm7dw8rWl1Da53bK/iJvdWY1dHKKfdz6e64wVk=";
};
vendorHash = "sha256-ASR8Y/L8ub0w36fO+UpJ5ZpijP+YCLVbRtnhzvMNj9U=";
vendorHash = "sha256-cmhg//MlRsScn0yCInp6g/HG4SawMO9qhfaD14ODzyE=";
ldflags = [
"-s"
+7 -4
View File
@@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.5.4";
version = "0.5.5";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-vlaJv4CbhjbJbiNZHKsedS2vBXp44oE/7ZALgkPASHI=";
hash = "sha256-4g+dt1dbN/ulERW3WLjTJ0++JD5NLREXjGu6ngPdxAI=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-g47tK6BC6CE0hqdZbToQMB5QeNdufhO12xPrAjbfMTk=";
npmDepsHash = "sha256-cIocYy91JfcZM35ZiT6onEsz89qAZ+7jCjpjg6lV4pc=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@@ -89,19 +89,21 @@ python312.pkgs.buildPythonApplication rec {
flask-cors
fpdf2
ftfy
gcp-storage-emulator
google-api-python-client
google-auth-httplib2
google-auth-oauthlib
google-cloud-storage
google-generativeai
googleapis-common-protos
iso-639
langchain
langchain-chroma
langchain-community
langdetect
langfuse
ldap3
markdown
moto
nltk
openai
opencv-python-headless
@@ -137,6 +139,7 @@ python312.pkgs.buildPythonApplication rec {
sentence-transformers
soundfile
tiktoken
transformers
unstructured
uvicorn
validators
+3 -3
View File
@@ -7,7 +7,7 @@
let
pname = "openfga-cli";
version = "0.6.2";
version = "0.6.3";
in
buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
owner = "openfga";
repo = "cli";
rev = "v${version}";
hash = "sha256-vTL34d5fj9VFB2RRYBwwRHNPFNQ7Dxr2+3jnhQr67pI=";
hash = "sha256-PHUXwDZta+utlUkkb4XRnhTgFlwMgOTD1/iboP+LMqY=";
};
vendorHash = "sha256-nNIo11bhQVLTePUnhVu9Vz9/6/jU1fkqMMjJrKq1t1Q=";
vendorHash = "sha256-hTt9Ut7+4LX+4SqC64feRGm6gLmrKswYt/XNqpTlQzo=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -7,7 +7,7 @@
let
pname = "openfga";
version = "1.8.3";
version = "1.8.4";
in
buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
owner = "openfga";
repo = "openfga";
rev = "v${version}";
hash = "sha256-f8yTmk542u/YPSq3oOa9REkHDGr32tP8OOs+ctNBt2E=";
hash = "sha256-esamtNfmQajcxE/+pt7vf7+EsMojl9WL8mS4J6A5FiM=";
};
vendorHash = "sha256-cuq7W465azHuVqnlzE0dD84R7F8/ErKt9wE4kjyI3Yc=";
vendorHash = "sha256-NCRWUoElBs2jsUBNVqDiBdtsMFx8N6S7VkwHIL2cj1o=";
nativeBuildInputs = [ installShellFiles ];
+6 -3
View File
@@ -4,20 +4,21 @@
rustPlatform,
pkg-config,
openssl,
curl,
}:
rustPlatform.buildRustPackage rec {
pname = "pay-respects";
version = "0.6.10";
version = "0.6.11";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "iff";
repo = "pay-respects";
rev = "v${version}";
hash = "sha256-cyd0MF5pxa3FhSUmjNtiIwAWrE0/rqtOm8dJxqdwPSk=";
hash = "sha256-4m8/sp6r2Xb2SsNcatMv0+mWHBx+XKD0LEzrEwuWIEA=";
};
cargoHash = "sha256-7j6rRCMazMFbPnzt4/0Lz1BDJP3xtq1ycb+41f2qhe0=";
cargoHash = "sha256-obuMixkXqWUuZFqs3mJyMpHx4RY70ZpE3H9GzqFmt6k=";
nativeBuildInputs = [
pkg-config
@@ -25,6 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
curl
];
meta = {
@@ -34,6 +36,7 @@ rustPlatform.buildRustPackage rec {
maintainers = with lib.maintainers; [
sigmasquadron
bloxx12
ALameLlama
];
mainProgram = "pay-respects";
};
+88
View File
@@ -0,0 +1,88 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
pkg-config,
autoPatchelfHook,
blisp,
dfu-util,
fontconfig,
glib,
gtk3,
openssl,
systemd,
libGL,
libxkbcommon,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "pineflash";
version = "0.5.5";
src = fetchFromGitHub {
owner = "Spagett1";
repo = "pineflash";
tag = version;
hash = "sha256-4tcwEok36vuXbtlZNUkLNw1kHFQPBEJM/gWRhRWNLPg=";
};
cargoHash = "sha256-l01It6mUflENlADW6PpOQvK1o4qOjbTsMLB6n+OIl0U=";
nativeBuildInputs = [
pkg-config
] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [
blisp
dfu-util
fontconfig
glib
gtk3
openssl
systemd
];
runtimeDependencies = [
libGL
libxkbcommon
];
postPatch =
''
substituteInPlace src/submodules/flash.rs \
--replace-fail 'let command = Command::new("pkexec")' 'let command = Command::new("/run/wrappers/bin/pkexec")'
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace src/submodules/flash.rs \
--replace-fail 'let blisppath = "blisp";' 'let blisppath = "${lib.getExe blisp}";' \
--replace-fail 'let dfupath = "dfu-util";' 'let dfupath = "${lib.getExe' dfu-util "dfu-util"}";'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/submodules/flash.rs \
--replace-fail 'Command::new("blisp")' 'Command::new("${lib.getExe blisp}")' \
--replace-fail 'Command::new("dfu-util")' 'Command::new("${lib.getExe' dfu-util "dfu-util"}")'
'';
postInstall = ''
mkdir -p "$out/share/applications"
cp ./assets/Pineflash.desktop "$out/share/applications/Pineflash.desktop"
mkdir -p "$out/share/pixmaps"
cp ./assets/pine64logo.png "$out/share/pixmaps/pine64logo.png"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "GUI tool to flash IronOS to the Pinecil V1 and V2";
homepage = "https://github.com/Spagett1/pineflash";
changelog = "https://github.com/Spagett1/pineflash/releases/tag/${version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [
acuteaangle
];
mainProgram = "pineflash";
};
}
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "pulsarctl";
version = "4.0.1.1";
version = "4.0.1.2";
src = fetchFromGitHub {
owner = "streamnative";
repo = "pulsarctl";
rev = "v${version}";
hash = "sha256-AwV+B4B/Jsa1UAWy90FzTwTdpA5GZvnsAk+F+Kxx5Xk=";
hash = "sha256-3VONhrKViblh0LXy/hMVgzCN54JkDYw3v/YrqXuk6l8=";
};
vendorHash = "sha256-wNUTJn7Ar+GlePEhdr6xeolAiltJdAoIs5o5uDo8Ibs=";
+2 -2
View File
@@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quantlib";
version = "1.36";
version = "1.37";
outputs = [
"out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "lballabio";
repo = "QuantLib";
rev = "v${finalAttrs.version}";
hash = "sha256-u1ePmtgv+kAvH2/yTuxJFcafbfULZ8daHj4gKmKzV78=";
hash = "sha256-Q8Bz94yd4A0VCDldtiichFKgiZMN4dHHJJep/tcE/z0=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "release-plz";
version = "0.3.112";
version = "0.3.113";
src = fetchFromGitHub {
owner = "MarcoIeni";
repo = "release-plz";
rev = "release-plz-v${version}";
hash = "sha256-qoaFZTKtQSmFuCJ8c9ShhnzVHrFFKVOdEn5rXVN2TL0=";
hash = "sha256-m33tBLNOU2+vjIICU0ggnNxLvD/fxJVSxT6bRih9e7U=";
};
cargoHash = "sha256-sY732QvV9hVwPdi3llUol/DP017/mlCCivRF9by8HH0=";
cargoHash = "sha256-d7CltWp1RfQ8cJ6eLXF8spaWXBBEtla46FiRrzG5EVg=";
nativeBuildInputs = [
installShellFiles
+12 -6
View File
@@ -28,6 +28,8 @@
systemdLibs,
testers,
validatePkgConfig,
vulkan-headers,
vulkan-loader,
wayland,
wayland-scanner,
xorg,
@@ -51,7 +53,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sdl3";
version = "3.1.8";
version = "3.2.0";
outputs = [
"lib"
@@ -62,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL";
tag = "preview-${finalAttrs.version}";
hash = "sha256-yfnW5y99EegifRavvZWmXPH2NFPKWoe90RmGDGk6PI4=";
tag = "release-${finalAttrs.version}";
hash = "sha256-gVLZPuXtMdFhylxh3+LC/SJCaQiOwZpbVcBGctyGGYY=";
};
postPatch =
@@ -136,7 +138,11 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = finalAttrs.dlopenPropagatedBuildInputs;
dlopenPropagatedBuildInputs =
lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL
[
vulkan-headers
vulkan-loader
]
++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL
++ lib.optional x11Support xorg.libX11;
cmakeFlags = [
@@ -213,13 +219,13 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"'preview-(.*)'"
"'release-(.*)'"
];
};
};
meta = {
description = "Cross-platform development library (Preview version)";
description = "Cross-platform development library";
homepage = "https://libsdl.org";
changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.zlib;
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20250113-1";
version = "20250122";
src = fetchFromGitHub {
owner = "bepaald";
repo = "signalbackup-tools";
rev = version;
hash = "sha256-aunXBPPWHTlgWVNwsBZAZJi+/dE/BwFC1kfBj0AXMos=";
hash = "sha256-rsA0i87zC6hyQa8xIyveID/nNwAD2YMG3BHYtWKxg1I=";
};
nativeBuildInputs = [
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "simple64-netplay-server";
version = "2024.12.3";
version = "2025.01.1";
src = fetchFromGitHub {
owner = "simple64";
repo = "simple64-netplay-server";
tag = "v${version}";
hash = "sha256-u5KiP9O5wyNuYP1EdWs1xSEaz0Ey9dI9nX+YiavaEdw=";
hash = "sha256-mE6cm1/xxQvcQykKDfO9dDK3J6TOE3POaDuYB0tNRPk=";
};
vendorHash = "sha256-1gySXbp1N0lnWToVQU3N9zQxl9Z0e9ICCeAIKwSoxaY=";
vendorHash = "sha256-lcKOAPCyWKNg+l1YjziaMTn4DjLB0P+dz3FqyAy0sFk=";
meta = {
description = "Dedicated server for simple64 netplay";
+3 -3
View File
@@ -37,14 +37,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "slint-lsp";
version = "1.9.1";
version = "1.9.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-/Upnl3VcR5ynT70gWMGAs/xvolMKsZeaGd+TWgxl/Pg=";
hash = "sha256-1yXyf/9St03B8mZPfw8GVUIFOX/nWbwwCs/8ON3uBDw=";
};
cargoHash = "sha256-JgKK+NyRF3mIRarHmwCk2b1HsBUXZX/l2e843exZk2g=";
cargoHash = "sha256-iuLTqrYq3mXjZ1bUQvEwWUNOxdg21Yn5NWmiQTAtdIA=";
nativeBuildInputs = [
cmake
+3 -3
View File
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tabby-agent";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "TabbyML";
repo = "tabby";
tag = "v${finalAttrs.version}";
hash = "sha256-TP0KEGH8w9kdTj5yxCsAn4LRS1gj3Dnz96GA8DDSJJU=";
hash = "sha256-VuyfKIfOJ6+LTiNCO/SQMHk81KffF/dUfxMGT2go6RM=";
};
nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-fpzl2w0o5bJhppVUl6vRNqAVQNMPLK0+JX/KYEtUGGA=";
hash = "sha256-RMa4fuR6L1BM+QmLsZ7i42jtGAQXkVQvv1hh0lr+Ky8=";
};
passthru.updateScript = nix-update-script {
+3 -3
View File
@@ -15,16 +15,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.12.6";
version = "1.12.7";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-+LrdQ3IWBOFc5qN0o9QYAiZ4VK+KhTD3MVtIhUBg+sQ=";
hash = "sha256-26YNDXZUMQA3AuRPTxB+X8hg2IEYvAGBHvzIAxSL3nk=";
};
npmDepsHash = "sha256-5ULVVMmCnujrJmeZPDUIkuce4Gy6lMo+IwjAud/5cmE=";
npmDepsHash = "sha256-Vu7VAV8hoQKqa8d2hMaNlBB4e8HA0h4ySc1qsYn8M6o=";
nativeBuildInputs = [
makeWrapper
+2 -2
View File
@@ -21,13 +21,13 @@
}:
stdenv.mkDerivation rec {
pname = "ustreamer";
version = "6.21";
version = "6.22";
src = fetchFromGitHub {
owner = "pikvm";
repo = "ustreamer";
rev = "v${version}";
hash = "sha256-65qaHgKQjzyGEbimEe8oJ83FzKUG23/cHUbZ/YdT72A=";
hash = "sha256-6qVDxci2uFV2Z93vqbpwxZ3yAVZ5NHGOPDOYRr2b1l8=";
};
buildInputs =
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "veracrypt";
version = "1.26.15";
version = "1.26.18";
src = fetchurl {
url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2";
hash = "sha256-upcCUDDiG5sjMbfrCJcBFjwyr0t+BFNfM1uvjXSnSRY=";
hash = "sha256-fWmvHvYCgHQi50CsjMKaGHFzw4vPYZLl7GqL3tO5XBw=";
};
patches = [
+3 -3
View File
@@ -14,7 +14,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "yabai";
version = "7.1.5";
version = "7.1.6";
src =
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
"aarch64-darwin" = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
hash = "sha256-o+9Z3Kxo1ff1TZPmmE6ptdOSsruQzxZm59bdYvhRo3c=";
hash = "sha256-6cHOHL73BB2UaZKLPxnc6n0bo7XwhxehDj+m+s1dGqk=";
};
"x86_64-darwin" = fetchFromGitHub {
owner = "koekeishiya";
repo = "yabai";
rev = "v${finalAttrs.version}";
hash = "sha256-6HBWJvjVWagtHrfjWaYSRcnQOuwTBVeVxo3wc+jSlyE=";
hash = "sha256-yigpGy4n7QS1WvWyxESmSPNWqGWh7Mqp/NrmvdMhPdY=";
};
};
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-filemanager-app";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/apps/lomiri-filemanager-app";
rev = "v${finalAttrs.version}";
hash = "sha256-XA1Gdb0Kpc3BEifmgHhQ38moKkCkYbhpr8wptnddZlk=";
tag = "v${finalAttrs.version}";
hash = "sha256-qOzQba1NJBH1hE3XYQQowfkggLlaZl6Vz8uVW7dCzWI=";
};
postPatch = ''
@@ -2,7 +2,6 @@
stdenvNoCC,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
testers,
cmake,
@@ -15,24 +14,15 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-schemas";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-schemas";
rev = finalAttrs.version;
hash = "sha256-hCKsjZ2xW+Jimm8IT6E6ZaPGwXydiNTxyaHxY0gOEpg=";
tag = finalAttrs.version;
hash = "sha256-AI/tpTzhnzKygG/zgszQAmvbaM8VdU+Chs9bjd9Jx9A=";
};
patches = [
# Remove when version > 0.1.6
(fetchpatch {
name = "0001-lomiri-schemas-Declare-no-compilers-needed.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-schemas/-/commit/6eec0513d2348dcfe49ce5969a091584888a79e5.patch";
hash = "sha256-pbHNeP28WQ9wDdRkgsS8WY24ZKLS3G3h4gEd22DPuH8=";
})
];
strictDeps = true;
nativeBuildInputs = [
+3 -7
View File
@@ -7,7 +7,6 @@
fftw,
fftwSinglePrec,
hdf5,
ilmbase,
libjpeg,
libpng,
libtiff,
@@ -20,24 +19,21 @@ let
in
stdenv.mkDerivation rec {
pname = "vigra";
version = "unstable-2022-01-11";
version = "1.12.1";
src = fetchFromGitHub {
owner = "ukoethe";
repo = "vigra";
rev = "093d57d15c8c237adf1704d96daa6393158ce299";
sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og=";
tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] version}";
hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8=";
};
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
fftw
fftwSinglePrec
hdf5
ilmbase
libjpeg
libpng
libtiff
@@ -23,6 +23,10 @@ buildPecl rec {
php.extensions.pdo
];
# Fix GCC 14 build.
# from incompatible pointer type [-Wincompatible-pointer-types]
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre2 ];
@@ -0,0 +1,55 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
wheel,
flake8,
fs,
google-cloud-storage,
google-crc32c,
pytest,
pytestCheckHook,
pytest-cov,
requests,
}:
buildPythonPackage rec {
pname = "gcp-storage-emulator";
version = "2024.08.03";
pyproject = true;
src = fetchFromGitHub {
owner = "oittaa";
repo = "gcp-storage-emulator";
rev = "v${version}";
hash = "sha256-Lp9Wvod0wSE2+cnvLXguhagT30ax9TivyR8gC/kB7w0=";
};
build-system = [
setuptools
wheel
];
nativeCheckInputs = [
flake8
fs
google-cloud-storage
google-crc32c
pytest
pytestCheckHook
pytest-cov
requests
];
pythonImportsCheck = [
"gcp_storage_emulator"
];
meta = {
description = "Local emulator for Google Cloud Storage";
homepage = "https://github.com/oittaa/gcp-storage-emulator";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ drupol ];
};
}
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.12.4";
version = "0.12.5";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
tag = "v${version}";
hash = "sha256-h2XoHb3ukh6MKQG2v0TZg81mcwNGk4cfK8CWjzhM8W4=";
hash = "sha256-g+OffaeDCYj01e1lFudlDL1+8fXy4Rs9r0z8exVaxxk=";
};
pythonRelaxDeps = [ "hishel" ];
@@ -10,29 +10,32 @@
boto3,
langchain-core,
numpy,
pydantic,
# tests
langchain-standard-tests,
langchain-tests,
pytest-asyncio,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "langchain-aws";
version = "0.2.1";
version = "0.2.11";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-aws";
tag = "v${version}";
hash = "sha256-LHhyEkgu1sjOk4E4WMy4vYGyikqdVD3WvRPjoAP1CfA=";
hash = "sha256-tEkwa+rpitGxstci754JH5HCqD7+WX0No6ielJJnbxk=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "--snapshot-warn-unused" "" \
--replace-fail "--cov=langchain_aws" ""
substituteInPlace tests/unit_tests/{test_standard.py,chat_models/test_bedrock_converse.py} \
--replace-fail "langchain_standard_tests" "langchain_tests"
'';
sourceRoot = "${src.name}/libs/aws";
@@ -43,6 +46,7 @@ buildPythonPackage rec {
boto3
langchain-core
numpy
pydantic
];
pythonRelaxDeps = [
@@ -51,7 +55,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
langchain-standard-tests
langchain-tests
pytest-asyncio
pytestCheckHook
];
@@ -4,6 +4,7 @@
fetchFromGitHub,
chromadb,
langchain-core,
langchain-tests,
numpy,
poetry-core,
pytestCheckHook,
@@ -12,14 +13,14 @@
buildPythonPackage rec {
pname = "langchain-chroma";
version = "0.1.4";
version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-chroma==${version}";
hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc=";
hash = "sha256-9YxWLc8SaxTl7LwbK0FGzl2WtkWJzTHxm3VRYFGB5To=";
};
sourceRoot = "${src.name}/libs/partners/chroma";
@@ -28,20 +29,18 @@ buildPythonPackage rec {
build-system = [ poetry-core ];
pythonRelaxDeps = [
"chromadb"
"numpy"
];
pythonRelaxDeps = [ "numpy" ];
dependencies = [
langchain-core
chromadb
langchain-core
numpy
];
pythonImportsCheck = [ "langchain_chroma" ];
nativeCheckInputs = [
langchain-tests
pytest-asyncio
pytestCheckHook
];
@@ -9,8 +9,9 @@
# dependencies
aiohttp,
dataclasses-json,
langchain-core,
httpx-sse,
langchain,
langchain-core,
langsmith,
pydantic-settings,
pyyaml,
@@ -24,7 +25,7 @@
# tests
httpx,
langchain-standard-tests,
langchain-tests,
lark,
pandas,
pytest-asyncio,
@@ -38,14 +39,14 @@
buildPythonPackage rec {
pname = "langchain-community";
version = "0.3.6";
version = "0.3.15";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-core==${version}";
hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
tag = "langchain-community==${version}";
hash = "sha256-2/Zrl/wED/zm1m+NqgAD4AdrEh/LjFOeQoOSSM05e+s=";
};
sourceRoot = "${src.name}/libs/community";
@@ -61,8 +62,9 @@ buildPythonPackage rec {
dependencies = [
aiohttp
dataclasses-json
langchain-core
httpx-sse
langchain
langchain-core
langsmith
pydantic-settings
pyyaml
@@ -80,7 +82,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
httpx
langchain-standard-tests
langchain-tests
lark
pandas
pytest-asyncio
@@ -13,6 +13,7 @@
packaging,
pyyaml,
tenacity,
typing-extensions,
# optional-dependencies
pydantic,
@@ -21,6 +22,8 @@
freezegun,
grandalf,
httpx,
langchain-core,
langchain-tests,
numpy,
pytest-asyncio,
pytest-mock,
@@ -34,14 +37,14 @@
buildPythonPackage rec {
pname = "langchain-core";
version = "0.3.15";
version = "0.3.31";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-core==${version}";
hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0=";
hash = "sha256-u+Za7NtXVP0Mg6K65CuRLx8OrVpBXEe1ayP0uMUNJG4=";
};
sourceRoot = "${src.name}/libs/core";
@@ -56,6 +59,7 @@ buildPythonPackage rec {
packaging
pyyaml
tenacity
typing-extensions
];
optional-dependencies = {
@@ -64,10 +68,14 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_core" ];
# avoid infinite recursion
doCheck = false;
nativeCheckInputs = [
freezegun
grandalf
httpx
langchain-tests
numpy
pytest-asyncio
pytest-mock
@@ -78,13 +86,10 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/unit_tests" ];
# don't add langchain-standard-tests to nativeCheckInputs
# to avoid circular import
preCheck = ''
export PYTHONPATH=${src}/libs/standard-tests:$PYTHONPATH
'';
passthru = {
tests.pytest = langchain-core.overridePythonAttrs (_: {
doCheck = true;
});
# Updates to core tend to drive updates in everything else
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
@@ -135,6 +140,7 @@ buildPythonPackage rec {
"test_schemas"
# AssertionError: assert [+ received] == [- snapshot]
"test_graph_sequence_map"
"test_representation_of_runnables"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Langchain-core the following tests due to the test comparing execution time with magic values.
@@ -11,7 +11,7 @@
ollama,
# testing
langchain-standard-tests,
langchain-tests,
pytestCheckHook,
pytest-asyncio,
syrupy,
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "langchain-ollama";
version = "0.2.0";
version = "0.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-ollama==${version}";
hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE=";
hash = "sha256-Ex8GndMHPHwSSMKu1JxnfGpRj55fh3TR19b3E+KrLUs=";
};
sourceRoot = "${src.name}/libs/partners/ollama";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
langchain-standard-tests
langchain-tests
pytestCheckHook
pytest-asyncio
syrupy
@@ -13,7 +13,7 @@
# tests
freezegun,
langchain-standard-tests,
langchain-tests,
lark,
pandas,
pytest-asyncio,
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "langchain-openai";
version = "0.2.5";
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-openai==${version}";
hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg=";
hash = "sha256-WvHSeWdBuxbfMNmfoNMzEbhJ5rirQ4JwlWUa0Tgrlrg=";
};
sourceRoot = "${src.name}/libs/partners/openai";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
freezegun
langchain-standard-tests
langchain-tests
lark
pandas
pytest-asyncio
@@ -83,6 +83,7 @@ buildPythonPackage rec {
"test_chat_openai_get_num_tokens"
"test_get_num_tokens_from_messages"
"test_get_token_ids"
"test_init_o1"
"test_openai_get_num_tokens"
];
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
@@ -16,16 +17,22 @@
# tests
numpy,
pytest-asyncio,
pytest-socket,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "langchain-standard-tests";
pname = "langchain-tests";
version = "0.3.8";
pyproject = true;
# this is an internal library, so there are no tags
# sync source with langchain-core for easy updates
inherit (langchain-core) src version;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-tests==${version}";
hash = "sha256-IZJo4EZFVKinBQdacM5xQ8ip3qTB64eqwZ9n+Z5mzWY=";
};
sourceRoot = "${src.name}/libs/standard-tests";
build-system = [ poetry-core ];
@@ -33,16 +40,17 @@ buildPythonPackage rec {
dependencies = [
httpx
langchain-core
pytest-asyncio
pytest-socket
syrupy
];
buildInputs = [ pytest ];
pythonImportsCheck = [ "langchain_standard_tests" ];
pythonImportsCheck = [ "langchain_tests" ];
nativeBuildInputs = [
numpy
pytest-asyncio
pytestCheckHook
];
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "langchain-text-splitters";
version = "0.3.2";
version = "0.3.5";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-text-splitters==${version}";
hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
hash = "sha256-2IoNUixZ/+o6ONJpqFa3Z5CLpxj6b6z8dh89kxh2rP4=";
};
sourceRoot = "${src.name}/libs/text-splitters";
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
# build-system
poetry-core,
@@ -12,7 +11,6 @@
# dependencies
aiohttp,
httpx-sse,
langchain-core,
langchain-text-splitters,
langsmith,
@@ -21,7 +19,6 @@
requests,
sqlalchemy,
tenacity,
async-timeout,
# optional-dependencies
numpy,
@@ -43,14 +40,14 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.3.7";
version = "0.3.15";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain==${version}";
hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
hash = "sha256-lANGoMABH1f9Tl/GgMMr7eTCji9q3uqD+Mwjr4nd2Dg=";
};
sourceRoot = "${src.name}/libs/langchain";
@@ -66,7 +63,6 @@ buildPythonPackage rec {
dependencies = [
aiohttp
httpx-sse
langchain-core
langchain-text-splitters
langsmith
@@ -75,7 +71,7 @@ buildPythonPackage rec {
requests
sqlalchemy
tenacity
] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
];
optional-dependencies = {
numpy = [ numpy ];
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "lcn-frontend";
version = "0.2.3";
version = "0.2.4";
pyproject = true;
src = fetchPypi {
pname = "lcn_frontend";
inherit version;
hash = "sha256-j5NE/AFGHC5z44I2afMCGUDY9gqjPZPJ5nDBHf52tJY=";
hash = "sha256-pjpzOUhNCEYncCk+u/1u5gXot+5rEAvSfdL21fO6LMY=";
};
postPatch = ''
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20250121";
version = "1.0.2.20250122";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LVbIYZ0rkGmZKbtnenZF5elK9wnr3A+b24NZXX3pxUM=";
hash = "sha256-FQXZsqPxWyF5II+tzOzWT/gED+GfZgiVefBPG/6wwT4=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1306";
version = "3.0.1308";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-OjfILXbxfqs11g9o70tS584hMju7Sn69VmWfAvQsq90=";
hash = "sha256-gT0ociYhvrjS+JOOOSBFeL3VE5gUZFcjpSa0kT/hVD0=";
};
build-system = [ setuptools ];
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.5.3";
version = "4.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-sa9gOZ9k9HFddExRlXVAaL/rmJgbkv6wwV0BbJk3n4c=";
hash = "sha256-XySMp5DvwkHEbsmj1+50TMcopnz1KoR592ZZG+UfoaQ=";
};
build-system = [ setuptools ];
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
fetchpatch,
fetchPypi,
pytestCheckHook,
pythonOlder,
@@ -19,6 +20,13 @@ buildPythonPackage rec {
hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90=";
};
patches = [
(fetchpatch {
url = "https://github.com/scrapy/w3lib/commit/44dcf9160c3f207658d6ce808307c80c9ca835a2.patch";
hash = "sha256-fUQ2oWpAJeslgemt+EUxKLH3Ywpg441FCOBLFJCZ+Ac=";
})
];
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.353";
version = "3.2.355";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-rr41j/WwzM4Jo4pO9y1hsBTlQ68Kt+gOzWTE1bQbHEU=";
hash = "sha256-yBm4v7YczngDFf7jSSVrlMbwIWYFMt6xdJe5qG6i4+I=";
};
patches = [ ./flake8-compat-5.x.patch ];
@@ -86,7 +86,10 @@ stdenv.mkDerivation {
license = licenses.asl20;
description = "Command-line tool to interact with the Scala language";
mainProgram = "scala-cli";
maintainers = [ maintainers.kubukoz ];
maintainers = with maintainers; [
kubukoz
agilesteel
];
inherit platforms;
};
+10 -10
View File
@@ -14,21 +14,21 @@ let
channels = {
stable = {
version = "2.18.2";
version = "2.18.3";
hash = {
x86_64-linux = "sha256-/bfn6eE0aFGbpmtcgDmtTaGsIVQTQC59mmxRcKW67mI=";
x86_64-darwin = "sha256-skRiwGEvN6NZn5P+KPlSko3oO3ljC0+1lQvMv+mhCU4=";
aarch64-linux = "sha256-Txs8LYK712zgHl3nQZ58I91zXiMokfYHpDD6V295TjY=";
aarch64-darwin = "sha256-RGm0Yh2P1IUc5+0G2iRu+6dVIZUlFW4rIODLaEhc0vA=";
x86_64-linux = "sha256-ehQvvtEiaFyTZWG1BlFbX2lx7uTG7GrsnZ6cv2m57zY=";
x86_64-darwin = "sha256-pR8kgbIakBaXhcnCOV9Y84ryX9trFe2Y8Mfx4YV2Nvs=";
aarch64-linux = "sha256-4rAwZ/YXRDeuOnlEhV+jo0LrIrYN5KkKN44rS2T3xdg=";
aarch64-darwin = "sha256-r+IqiXPUQHq1Ta60PNLQ+uvXJyjXUWKjXcJyujsAhtk=";
};
};
mainline = {
version = "2.18.2";
version = "2.18.3";
hash = {
x86_64-linux = "sha256-/bfn6eE0aFGbpmtcgDmtTaGsIVQTQC59mmxRcKW67mI=";
x86_64-darwin = "sha256-skRiwGEvN6NZn5P+KPlSko3oO3ljC0+1lQvMv+mhCU4=";
aarch64-linux = "sha256-Txs8LYK712zgHl3nQZ58I91zXiMokfYHpDD6V295TjY=";
aarch64-darwin = "sha256-RGm0Yh2P1IUc5+0G2iRu+6dVIZUlFW4rIODLaEhc0vA=";
x86_64-linux = "sha256-ehQvvtEiaFyTZWG1BlFbX2lx7uTG7GrsnZ6cv2m57zY=";
x86_64-darwin = "sha256-pR8kgbIakBaXhcnCOV9Y84ryX9trFe2Y8Mfx4YV2Nvs=";
aarch64-linux = "sha256-4rAwZ/YXRDeuOnlEhV+jo0LrIrYN5KkKN44rS2T3xdg=";
aarch64-darwin = "sha256-r+IqiXPUQHq1Ta60PNLQ+uvXJyjXUWKjXcJyujsAhtk=";
};
};
};
+4 -3
View File
@@ -2,7 +2,7 @@
stdenv,
lib,
stdenvNoCC,
fetchzip,
fetchgit,
sourceData,
versionData,
buildFreebsd,
@@ -25,8 +25,9 @@ lib.packagesFromDirectoryRecursive {
__attrsFailEvaluation = true;
};
ports = fetchzip {
url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz";
ports = fetchgit {
url = "https://git.FreeBSD.org/ports.git";
rev = "dde3b2b456c3a4bdd217d0bf3684231cc3724a0a";
sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E=";
};
@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "smokeping_prober";
version = "0.8.1";
version = "0.9.0";
ldflags =
let
@@ -31,9 +31,9 @@ buildGoModule rec {
owner = "SuperQ";
repo = "smokeping_prober";
rev = "v${version}";
sha256 = "sha256-CqUkJLyxCuBDbfPLSXuGNlyg5POh6jYyXUxQ9tF+w3s=";
sha256 = "sha256-TOt0YKgzcASQVY0ohoIwRJhjoH/Q0cuPabaItPnhv+w=";
};
vendorHash = "sha256-iKAT10pD2ctVIBdDw/AmHYtoZDW9XC8ruIxqlVoAuWY=";
vendorHash = "sha256-m6jOZx4zuVl1Bay4OCvPTF/pRFXfBfitWfQ+S10xe9I=";
doCheck = true;
+1
View File
@@ -315,6 +315,7 @@ mapAliases {
dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool";
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
+2
View File
@@ -10775,6 +10775,7 @@ with pkgs;
vigra = callPackage ../development/libraries/vigra {
hdf5 = hdf5.override { usev110Api = true; };
openexr = openexr_3;
};
vte-gtk4 = vte.override {
@@ -13973,6 +13974,7 @@ with pkgs;
imagemagick = lowPrio (callPackage ../applications/graphics/ImageMagick {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
openexr = openexr_3;
});
imagemagickBig = lowPrio (imagemagick.override {
+1
View File
@@ -333,6 +333,7 @@ mapAliases ({
keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
ldap = python-ldap; # added 2022-09-16
lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
langchain-standard-tests = langchain-tests; # added 2025-01-22
langchainplus-sdk = langsmith; # added 2023-08-01
lazr_config = lazr-config; # added 2023-11-03
lazr_delegates = lazr-delegates; # added 2023-11-03
+3 -1
View File
@@ -5083,6 +5083,8 @@ self: super: with self; {
gcovr = callPackage ../development/python-modules/gcovr { };
gcp-storage-emulator = callPackage ../development/python-modules/gcp-storage-emulator { };
gcsa = callPackage ../development/python-modules/gcsa { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
@@ -7108,7 +7110,7 @@ self: super: with self; {
langchain-openai = callPackage ../development/python-modules/langchain-openai { };
langchain-standard-tests = callPackage ../development/python-modules/langchain-standard-tests { };
langchain-tests = callPackage ../development/python-modules/langchain-tests { };
langchain-text-splitters = callPackage ../development/python-modules/langchain-text-splitters { };