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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-07 00:18:50 +00:00
committed by GitHub
parent 4b8fb67ce7 3ed93ea844
commit 6f9d8a2ebc
126 changed files with 2035 additions and 1706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.devcontainer/devcontainer.json
+3 -1
View File
@@ -5,7 +5,9 @@
"ghcr.io/devcontainers/features/nix:1": {
// fails in the devcontainer sandbox, enable sandbox via config instead
"multiUser": false,
"packages": "nixpkgs.nixd,nixpkgs.nixfmt",
// TODO: nixfmt-rfc-style → nixfmt (once it's in a stable release)
// https://github.com/NixOS/nixpkgs/issues/425583
"packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style",
"useAttributePath": true,
"extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
}
README.md
+1 -1
View File
@@ -2,7 +2,7 @@
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg" width="500px" alt="NixOS logo">
</picture>
</a>
ci/eval/compare/default.nix
+3 -4
View File
@@ -73,12 +73,11 @@ let
;
# Attrs
# - keys: "added", "changed" and "removed"
# - keys: "added", "changed", "removed" and "rebuilds"
# - values: lists of `packagePlatformPath`s
diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
rebuilds = diffAttrs.added ++ diffAttrs.changed;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
changed-paths =
let
@@ -90,7 +89,7 @@ let
in
writeText "changed-paths.json" (
builtins.toJSON {
attrdiff = lib.mapAttrs (_: extractPackageNames) diffAttrs;
attrdiff = lib.mapAttrs (_: extractPackageNames) { inherit (diffAttrs) added changed removed; };
inherit
rebuildsByPlatform
rebuildsByKernel
ci/eval/default.nix
+2 -1
View File
@@ -218,7 +218,8 @@ let
reduce .[] as $item ({}; {
added: (.added + $item.added),
changed: (.changed + $item.changed),
removed: (.removed + $item.removed)
removed: (.removed + $item.removed),
rebuilds: (.rebuilds + $item.rebuilds)
})
' > $out/combined-diff.json
ci/eval/diff.nix
+18 -1
View File
@@ -18,13 +18,20 @@ let
added: [ <keys only in the second object> ],
removed: [ <keys only in the first object> ],
changed: [ <keys with different values between the two objects> ],
rebuilds: [ <keys in the second object with values not present at all in first object> ],
}
*/
diff =
old: new:
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
oldOutputs = lib.pipe old [
(lib.mapAttrsToList (_: lib.attrValues))
lib.concatLists
(lib.flip lib.genAttrs (_: true))
];
in
old: new: {
{
added = filterKeys (n: _: !(old ? ${n})) new;
removed = filterKeys (n: _: !(new ? ${n})) old;
changed = filterKeys (
@@ -35,6 +42,16 @@ let
# Filter out attributes that are the same as the new value
&& (v != (new.${n}))
) old;
# A "rebuild" is every attrpath ...
rebuilds = filterKeys (
_: pkg:
# ... that has at least one output ...
lib.any (
output:
# ... which has not been built in "old" already.
!(oldOutputs ? ${output})
) (lib.attrValues pkg)
) new;
};
getAttrs =
nixos/modules/services/security/kanidm.nix
+2
View File
@@ -671,6 +671,8 @@ in
};
config = mkIf (cfg.enableClient || cfg.enableServer || cfg.enablePam) {
warnings = lib.optionals (cfg.package.eolMessage != "") [ cfg.package.eolMessage ];
assertions =
let
entityList =
nixos/tests/all-tests.nix
+12 -2
View File
@@ -772,8 +772,18 @@ in
k3s = handleTest ./k3s { };
kafka = handleTest ./kafka { };
kanboard = runTest ./web-apps/kanboard.nix;
kanidm = runTest ./kanidm.nix;
kanidm-provisioning = runTest ./kanidm-provisioning.nix;
kanidm =
kanidmVersion:
runTest {
imports = [ ./kanidm.nix ];
_module.args = { inherit kanidmVersion; };
};
kanidm-provisioning =
kanidmVersion:
runTest {
imports = [ ./kanidm-provisioning.nix ];
_module.args = { inherit kanidmVersion; };
};
karma = runTest ./karma.nix;
kavita = runTest ./kavita.nix;
kbd-setfont-decompress = runTest ./kbd-setfont-decompress.nix;
nixos/tests/kanidm-provisioning.nix
+9 -7
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ kanidmVersion, pkgs, ... }:
let
certs = import ./common/acme/server/snakeoil-certs.nix;
serverDomain = certs.domain;
@@ -13,6 +13,8 @@ let
provisionAdminPassword = "very-strong-password-for-admin";
provisionIdmAdminPassword = "very-strong-password-for-idm-admin";
provisionIdmAdminPassword2 = "very-strong-alternative-password-for-idm-admin";
kanidmPackage = pkgs."kanidmWithSecretProvisioning_${kanidmVersion}";
in
{
name = "kanidm-provisioning";
@@ -22,7 +24,7 @@ in
{ pkgs, lib, ... }:
{
services.kanidm = {
package = pkgs.kanidmWithSecretProvisioning_1_6;
package = kanidmPackage;
enableServer = true;
serverSettings = {
origin = "https://${serverDomain}";
@@ -273,11 +275,11 @@ in
users.users.kanidm.shell = pkgs.bashInteractive;
environment.systemPackages = with pkgs; [
kanidm
openldap
ripgrep
jq
environment.systemPackages = [
kanidmPackage
pkgs.openldap
pkgs.ripgrep
pkgs.jq
];
};
nixos/tests/kanidm.nix
+9 -7
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ kanidmVersion, pkgs, ... }:
let
certs = import ./common/acme/server/snakeoil-certs.nix;
serverDomain = certs.domain;
@@ -13,6 +13,8 @@ let
cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
cp ${certs."${serverDomain}".key} $out/snakeoil.key
'';
kanidmPackage = pkgs."kanidm_${kanidmVersion}";
in
{
name = "kanidm";
@@ -25,7 +27,7 @@ in
{ pkgs, ... }:
{
services.kanidm = {
package = pkgs.kanidm_1_6;
package = kanidmPackage;
enableServer = true;
serverSettings = {
origin = "https://${serverDomain}";
@@ -44,10 +46,10 @@ in
users.users.kanidm.shell = pkgs.bashInteractive;
environment.systemPackages = with pkgs; [
kanidm
openldap
ripgrep
environment.systemPackages = [
kanidmPackage
pkgs.openldap
pkgs.ripgrep
];
};
@@ -55,7 +57,7 @@ in
{ nodes, ... }:
{
services.kanidm = {
package = pkgs.kanidm_1_6;
package = kanidmPackage;
enableClient = true;
clientSettings = {
uri = "https://${serverDomain}";
nixos/tests/qtile/default.nix
-1
View File
@@ -31,7 +31,6 @@
services.xserver.windowManager.qtile = {
enable = true;
configFile = "${config-deriv}/config.py";
extraPackages = ps: [ ps.qtile-extras ];
};
services.displayManager.defaultSession = lib.mkForce "qtile";
pkgs/applications/editors/vim/plugins/aliases.nix
+1
View File
@@ -48,6 +48,7 @@ mapAliases (
solarized = vim-colors-solarized;
spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
colors-solarized = vim-colors-solarized;
caw = caw-vim;
chad = chadtree;
pkgs/applications/editors/vim/plugins/generated.nix
-13
View File
@@ -13797,19 +13797,6 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
sparkup = buildVimPlugin {
pname = "sparkup";
version = "2012-06-11";
src = fetchFromGitHub {
owner = "chrisgeo";
repo = "sparkup";
rev = "6fbfceef890e705c47b42b27be743ffed6f9296e";
sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm";
};
meta.homepage = "https://github.com/chrisgeo/sparkup/";
meta.hydraPlatforms = [ ];
};
specs-nvim = buildVimPlugin {
pname = "specs.nvim";
version = "2025-01-18";
pkgs/applications/editors/vim/plugins/vim-plugin-names
-1
View File
@@ -1059,7 +1059,6 @@ https://github.com/sQVe/sort.nvim/,HEAD,
https://github.com/chikatoike/sourcemap.vim/,,
https://github.com/liuchengxu/space-vim/,,
https://github.com/FireIsGood/spaceman.nvim/,HEAD,
https://github.com/chrisgeo/sparkup/,,
https://github.com/cxwx/specs.nvim/,HEAD,
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
https://github.com/ravibrock/spellwarn.nvim/,HEAD,
pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-uHUnCg8hkJQI0QSZZ5Kbj/S7ktY9ANdQqHCvBB+p1EA=";
hash = "sha256-fI+HzioLDxACH0anSkYOw47jpocVQp7m9xHh6APehis=";
};
nativeBuildInputs = [
pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
version = "5.24.0";
hash = "sha256-Skc+ib3gY2cLVepOjbBkpwPuUG9C29bh5BOxQOAZNtc=";
version = "5.25.0";
hash = "sha256-jkTFfyeFJ4ygsKJj41tWDJ91XitSs2onW4ni3rMNJE8=";
};
meta = {
description = "Material Design Icons for Visual Studio Code";
pkgs/applications/networking/browsers/chromium/info.json
+137 -137
View File
@@ -802,27 +802,27 @@
}
},
"ungoogled-chromium": {
"version": "138.0.7204.183",
"version": "139.0.7258.66",
"deps": {
"depot_tools": {
"rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
"hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
"rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
"hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
},
"gn": {
"rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b",
"hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
"rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
"hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo="
},
"ungoogled-patches": {
"rev": "138.0.7204.183-1",
"hash": "sha256-fJv7R8d/vmPROQUaxxqGoFtEqdEioOJuQ1Cnie7auJI="
"rev": "139.0.7258.66-1",
"hash": "sha256-/8zIJk1RxmFPt81qKCXpEEOrH2Jg6cdHGPdtp0zxdHE="
},
"npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
"npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "e90faf484ddbc033fc9bf337621761d3dd5c5289",
"hash": "sha256-/UFIed+S9XLmR3p8KVnIncxl3a7bIqKPLh6vcEMvAsE=",
"rev": "a62d329947691f76c376a873eae39f56381103c8",
"hash": "sha256-RWqOw0Kogz2GwbICet7NdcGnZMrkkE4bu70jU+tbYFQ=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -832,28 +832,28 @@
},
"src/third_party/compiler-rt/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
"rev": "57196dd146582915c955f6d388e31aea93220c51",
"hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4="
"rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
"hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
},
"src/third_party/libc++/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
"rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
"hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko="
"rev": "2c359c239b138a20a03f798e47889448ef131c22",
"hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
},
"src/third_party/libc++abi/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
"rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
"hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk="
"rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
"hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
},
"src/third_party/libunwind/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
"rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
"hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY="
"rev": "5bbf35ae6801f579c523893176789774c0726e22",
"hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
},
"src/third_party/llvm-libc/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
"rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
"hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A="
"rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
"hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
},
"src/chrome/test/data/perf/canvas_bench": {
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -872,18 +872,18 @@
},
"src/docs/website": {
"url": "https://chromium.googlesource.com/website.git",
"rev": "d21d90790d8ea421b317c4cb52a0d94133422796",
"hash": "sha256-X9GIZkPokZ8ojNVDScDQL8D0tJGsaQMg8ncenuBzFHk="
"rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
"hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
},
"src/media/cdm/api": {
"url": "https://chromium.googlesource.com/chromium/cdm.git",
"rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1",
"hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4="
"rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
"hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8="
},
"src/net/third_party/quiche/src": {
"url": "https://quiche.googlesource.com/quiche.git",
"rev": "3b42119c3e4be5d4720c3c1b384106fa43e9b5e3",
"hash": "sha256-UYyBMjv6ATIwBXYngGof85pBCHXb/jYXetVo0oBrHf8="
"rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
"hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
},
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -897,8 +897,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "e1dc0a7ab5d1f1f2edaa7e41447d873895e083bf",
"hash": "sha256-tkHvTkqbm4JtWnh41iu0aJ9Jo34hYc7aOKuuMQmST4c="
"rev": "0145c376fadde16390298681252785f98ae90185",
"hash": "sha256-8ztvupTvp5v8lTq3eo/viR9X85qm+bw8299jxr6XslE="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -912,14 +912,19 @@
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
"rev": "c9d2e24d1a6da00165a0b5908ea4ba05c2e5f0b2",
"hash": "sha256-EFhi4dELfyq6FcB+YFlzKfoXz44i5ieFK1KUlFzqE1I="
"rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
"hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
},
"src/third_party/anonymous_tokens/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
"rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
"hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
},
"src/third_party/readability/src": {
"url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
"rev": "04fd32f72b448c12b02ba6c40928b67e510bac49",
"hash": "sha256-yUf4UTwcJ7H0tuN+e6c92F4UUSXjmTNOIKqNZA4+zAo="
},
"src/third_party/content_analysis_sdk/src": {
"url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
"rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
@@ -927,13 +932,13 @@
},
"src/third_party/dav1d/libdav1d": {
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
"rev": "8d956180934f16244bdb58b39175824775125e55",
"hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4="
"rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
"hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "1fde167ae683982d77b9ca7e1308bf9f498291e8",
"hash": "sha256-PbDTKSU19jn2hLDoazceYB/Rd6/qu6npPSrjOdeXFuU="
"rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
"hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -942,8 +947,8 @@
},
"src/third_party/dawn/third_party/dxc": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
"rev": "d72e2b1a15d22fc825e2f3c939f1baac43281ae9",
"hash": "sha256-0LfNcR1FXy5GcL2yHHA6A7EJIWtZU1U/2xSq/eysUa0="
"rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
"hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
},
"src/third_party/dawn/third_party/dxheaders": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -962,13 +967,13 @@
},
"src/third_party/dawn/third_party/webgpu-cts": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
"rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
"hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
"rev": "2a8d4a83f751286302ce34573409ad75cc318508",
"hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
},
"src/third_party/dawn/third_party/webgpu-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
"rev": "60cd9020309b87a30cd7240aad32accd24262a5e",
"hash": "sha256-+Kf4yPBhM6y2kYTZud9vCavT/BBOzDBsph5+/bUuwkM="
"rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
"hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
},
"src/third_party/highway/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -982,13 +987,13 @@
},
"src/third_party/boringssl/src": {
"url": "https://boringssl.googlesource.com/boringssl.git",
"rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
"hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM="
"rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
"hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
},
"src/third_party/breakpad/breakpad": {
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
"rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
"hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo="
"rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
"hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
},
"src/third_party/cast_core/public/src": {
"url": "https://chromium.googlesource.com/cast_core/public",
@@ -997,8 +1002,8 @@
},
"src/third_party/catapult": {
"url": "https://chromium.googlesource.com/catapult.git",
"rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
"hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0="
"rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
"hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
},
"src/third_party/ced/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1022,8 +1027,8 @@
},
"src/third_party/cpuinfo/src": {
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
"rev": "39ea79a3c132f4e678695c579ea9353d2bd29968",
"hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg="
"rev": "d7427551d6531037da216d20cd36feb19ed4905f",
"hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
},
"src/third_party/crc32c/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1032,23 +1037,23 @@
},
"src/third_party/cros_system_api": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
"rev": "fe88d943e5f328b34e38b91296db39650f6ec6f3",
"hash": "sha256-WlSxI1J+HjAD2UaQjW3oOQpZDnMn/ROpTLYTP4efTi4="
"rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
"hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
},
"src/third_party/crossbench": {
"url": "https://chromium.googlesource.com/crossbench.git",
"rev": "feff46a3cd49eb39667205cdfa2b490bcffc9ba1",
"hash": "sha256-YomhvLtDFkGWyivN81gRxtOh9U32Zt6+/obTwccJuRo="
"rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
"hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
},
"src/third_party/depot_tools": {
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
"rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
"hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A="
"rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
"hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "634ef4ab735f8fc717eb17935d5a0f1b9831d852",
"hash": "sha256-DwkvDbYKdHfpfKXYaszcK/54Zi2Q52dd9QAUR+Ex+b4="
"rev": "bc417052ebef6175721d690a4910e717d92181be",
"hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1062,8 +1067,8 @@
},
"src/third_party/eigen3/src": {
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
"rev": "ae3aba99db4c829b4cc4d9fdd54321dedd814dc4",
"hash": "sha256-dWWjpQ6M7udOQqUV6P9go3R3O4J2XYpvkngJjRDY4v8="
"rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
"hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
},
"src/third_party/farmhash/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1092,8 +1097,8 @@
},
"src/third_party/fontconfig/src": {
"url": "https://chromium.googlesource.com/external/fontconfig.git",
"rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
"hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y="
"rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
"hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
},
"src/third_party/fp16/src": {
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -1107,13 +1112,8 @@
},
"src/third_party/freetype/src": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
"rev": "738905b34bd1f5a8ff51bd2bc8e38a2d8be9bfd6",
"hash": "sha256-j5FPldhIOzsOsFBAMyNh44FTeOD8Gm3scoi3B3hhgKQ="
},
"src/third_party/freetype-testing/src": {
"url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
"rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
"hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
"rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
"hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
},
"src/third_party/fxdiv/src": {
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1127,13 +1127,13 @@
},
"src/third_party/ink/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
"rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e",
"hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc="
"rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
"hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA="
},
"src/third_party/ink_stroke_modeler/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
"rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689",
"hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU="
"rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
"hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY="
},
"src/third_party/instrumented_libs": {
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
@@ -1157,8 +1157,8 @@
},
"src/third_party/googletest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
"rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
"hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0="
"rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
"hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
},
"src/third_party/hunspell_dictionaries": {
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1187,8 +1187,8 @@
},
"src/third_party/fuzztest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
"rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
"hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas="
"rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
"hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
},
"src/third_party/domato/src": {
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1202,8 +1202,8 @@
},
"src/third_party/libaom/source/libaom": {
"url": "https://aomedia.googlesource.com/aom.git",
"rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
"hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc="
"rev": "0ddc6630b3723b14b164752d46c27752f078ddd3",
"hash": "sha256-cs1+5vBEFPqzi1vbxiSgujrLIoaXZROZaRJq2gRdUrE="
},
"src/third_party/crabbyavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
@@ -1212,8 +1212,8 @@
},
"src/third_party/nearby/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
"rev": "959322177f40f2e0f1ecacd8a1aea2805e67b62b",
"hash": "sha256-qFLs3gMV0v6c0gjyn29D6pRxSAKumpzAWVgHabPFWRw="
"rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
"hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
},
"src/third_party/securemessage/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1222,8 +1222,8 @@
},
"src/third_party/jetstream/main": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
"rev": "539ab943598b505832a25a2222aa8957f1a20d6f",
"hash": "sha256-mE6IoHpLV0LUWEeeiWycXtOhIbhkPvVdLvsPSyv4xPk="
"rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
"hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
},
"src/third_party/jetstream/v2.2": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1232,8 +1232,8 @@
},
"src/third_party/speedometer/main": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
"rev": "dd661c033abdde11022779f40375c52632a9f43a",
"hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4="
"rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
"hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
},
"src/third_party/speedometer/v3.1": {
"url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -1317,8 +1317,8 @@
},
"src/third_party/libvpx/source/libvpx": {
"url": "https://chromium.googlesource.com/webm/libvpx.git",
"rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
"hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4="
"rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
"hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
},
"src/third_party/libwebm/source": {
"url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1332,8 +1332,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
"rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
"hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c="
"rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
"hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1352,8 +1352,8 @@
},
"src/third_party/nasm": {
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
"rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
"hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs="
"rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
"hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY="
},
"src/third_party/neon_2_sse/src": {
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
@@ -1367,8 +1367,8 @@
},
"src/third_party/openscreen/src": {
"url": "https://chromium.googlesource.com/openscreen",
"rev": "8cc5a0e8f6695263d44206cf5930641979cb3179",
"hash": "sha256-YlcvSDSCHHqDA43+hd5hpajZrIGqpn3KxhMJD8Wf+rs="
"rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
"hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
},
"src/third_party/openscreen/src/buildtools": {
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1382,13 +1382,13 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
"rev": "cf433ae5520d061db56391155b59b34e67484f39",
"hash": "sha256-FF0iXahVfqbi4OOdH9PPgCTAIQT/q0nlT/H70pubCMQ="
"rev": "849572b5c41e5bf59dc88bf54c41067faa9b5b00",
"hash": "sha256-lTUkzpzIskbEL7b2xBWT8s9YNyu1AZ235SBo5AfQtpg="
},
"src/third_party/perfetto": {
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
"rev": "dd35b295cd359ba094404218414955f961a0d6ae",
"hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4="
"rev": "18d4fdc15d027a989db705592585b924f93f1d42",
"hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1427,13 +1427,13 @@
},
"src/third_party/search_engines_data/resources": {
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
"rev": "09fd22f3a4fb77ab03b7734e0c03ff7d7f97ef88",
"hash": "sha256-x7zGPqha12Og/AjQp1mkO0MNydM4xXvIcaapNziW0Kw="
"rev": "273082bef7b1bc05eddb5079b83702938e40c677",
"hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "a46d5732d9fca93eaec23e502e2eef814b707e6b",
"hash": "sha256-k0vE2K9KfeYsTVZchvKEA8M7GJQcekbuO5wHJeycBZo="
"rev": "cbc694239b06ecf694676aba22d5263dbc23ee5e",
"hash": "sha256-5vIwNP9RbtUVtgKKDiZd6NVkR2Ed3DUqZWESTUM+fIs="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1447,13 +1447,13 @@
},
"src/third_party/sqlite/src": {
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
"rev": "0a1397d274701c5d39e661e948160da2b9a8db1e",
"hash": "sha256-jqelU2bFZ4XwI5dpkusvgUobmRyYo/41ZKqbEmOdpis="
"rev": "cc08c79629643fdd5b592f1391e738815f5577b6",
"hash": "sha256-1Q2+NyCJb0GIMC30YNbVqVYHnP62tmKqBRfr9Xw5Z4A="
},
"src/third_party/swiftshader": {
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
"rev": "a8133cbb3c8969e3c1e6b3cea2c02ec8312ef9ca",
"hash": "sha256-Fd6T9zFJVPJaF2sbBy+uK0Ia0C6AIZsDbNvPSkbuTJM="
"rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
"hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
},
"src/third_party/text-fragments-polyfill/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1462,18 +1462,18 @@
},
"src/third_party/tflite/src": {
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
"rev": "151774faba661a5985a8264653f4457c70a56dea",
"hash": "sha256-qpwF2+/dw1u24O5+4bW74R43AgGN//NZwzEmlkyHlr0="
"rev": "e6c5574b82d7950f978447704a70971c478f0f50",
"hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
},
"src/third_party/vulkan-deps": {
"url": "https://chromium.googlesource.com/vulkan-deps",
"rev": "5912cbdd295c2bacb5798432a7b1cac9d20c0725",
"hash": "sha256-kIj8sncNg6dJzg1fgORev/o164G3kMXCGHzlzb09n0U="
"rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
"hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
},
"src/third_party/glslang/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
"rev": "93231001597dad1149a5d035af30eda50b9e6b6c",
"hash": "sha256-0PocroQj02mdpmFVXr6XB7mVVNzQOaBXm/2GNacZLF0="
"rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
"hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
},
"src/third_party/spirv-cross/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1482,38 +1482,38 @@
},
"src/third_party/spirv-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
"rev": "c9aad99f9276817f18f72a4696239237c83cb775",
"hash": "sha256-/KfUxWDczLQ/0DOiFC4Z66o+gtoF/7vgvAvKyv9Z9OA="
"rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
"hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
},
"src/third_party/spirv-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
"rev": "01021466b5e71deaac9054f56082566c782bfd51",
"hash": "sha256-04CWBDu4Q+H7EtVTealNyGx0Hml7OjIf0FfK0IuzisY="
"rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
"hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
},
"src/third_party/vulkan-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
"rev": "75ad707a587e1469fb53a901b9b68fe9f6fbc11f",
"hash": "sha256-vB49bFCx9VVEtpwIFcxdqYT+Pk4DgjoPz4rzPfmuRps="
"rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
"hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
},
"src/third_party/vulkan-loader/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
"rev": "c913466fdc5004584890f89ff91121bdb2ffd4ba",
"hash": "sha256-D5S1xQbsJ4Ov+3u84Mxj3L/3elyW78jpKRbYo8FpD28="
"rev": "342da33fdec78d269657194c9082835d647d2e68",
"hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
},
"src/third_party/vulkan-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
"rev": "60b640cb931814fcc6dabe4fc61f4738c56579f6",
"hash": "sha256-snLYtiXK1eBZYsc7X18/wk4TnhmkSqquWxyjmw9IF2A="
"rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
"hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
},
"src/third_party/vulkan-utility-libraries/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
"rev": "49ac28931f28bffaa3cd73dc4ad997284d574962",
"hash": "sha256-2mi5gtacSDxtZB8a3oGZqgLhwntSLXlEzDq6W14RHp4="
"rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
"hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
},
"src/third_party/vulkan-validation-layers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
"rev": "f7ceb1d01a292846db77ec87786be84d6fd568d9",
"hash": "sha256-K0KZ8wXTCVRBBN9AWy63ukmE6QkQHKcRgo+YluOhjyc="
"rev": "e086a717059f54c94d090998628250ae8f238fd6",
"hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
},
"src/third_party/vulkan_memory_allocator": {
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1547,8 +1547,8 @@
},
"src/third_party/webdriver/pylib": {
"url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git",
"rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
"hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw="
"rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
"hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo="
},
"src/third_party/webgl/src": {
"url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git",
@@ -1557,18 +1557,18 @@
},
"src/third_party/webgpu-cts/src": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
"rev": "905c7cbfeaac1cf3feb4c6056dd6f3dbaa06b074",
"hash": "sha256-eMDb0nG9HDiesd8KPajbMej8JTll4JkIf17KMnKvW1s="
"rev": "2a8d4a83f751286302ce34573409ad75cc318508",
"hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
},
"src/third_party/webpagereplay": {
"url": "https://chromium.googlesource.com/webpagereplay.git",
"rev": "18172a359f6dab8e3f70b6c5c8c7c55d3e97537a",
"hash": "sha256-qJnO3fFJhaQA77v1lTJ4B7cbXivquTcSvx/m+OcI3No="
"rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
"hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "e4445e46a910eb407571ec0b0b8b7043562678cf",
"hash": "sha256-72NbtdYbyMxSGULvOGsZqLj4kvT79pu+TKcnEmcj/Pc="
"rev": "23d8e44f84822170bee4425760b44237959423e5",
"hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1577,8 +1577,8 @@
},
"src/third_party/weston/src": {
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
"rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe",
"hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A="
"rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
"hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8="
},
"src/third_party/xdg-utils": {
"url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git",
@@ -1587,8 +1587,8 @@
},
"src/third_party/xnnpack/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
"rev": "f82ad65ca52cb4d39b73088468a5fe00f56fb47c",
"hash": "sha256-aavq+i8EpQmIMPaym6JxwBFjbpqKtHshXUkdBIXDtpw="
"rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
"hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
},
"src/third_party/zstd/src": {
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -1597,8 +1597,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "54f355e9ad22c93162d7d9d94c849c729d64bee7",
"hash": "sha256-/2cw/iZ9zbCMMiANUfsWpxYUzA3FDfUIrjoJh/jc0XI="
"rev": "b07b4e9376489c7f7c0ff2af5eceb4261b3bb784",
"hash": "sha256-MnrieVgkvlkWKZ0O790gDSCrgF9c+XEk/XLHQDzMqVY="
}
}
}
pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
-1
View File
@@ -4,7 +4,6 @@ clang_use_chrome_plugins=false
disable_fieldtrial_testing_config=true
enable_hangout_services_extension=false
enable_mdns=false
enable_nacl=false
enable_remoting=false
enable_reporting=false
enable_service_discovery=false
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "141.0-1",
"packageVersion": "141.0.2-1",
"source": {
"rev": "141.0-1",
"hash": "sha256-sgs/96soNX6kHWzXSZW0Hkh5lBoMffRMhlOa3BJoY6I="
"rev": "141.0.2-1",
"hash": "sha256-M4RQcpIk4jjcSUFwMI5fPi7frMOEM4+FSpbqNiXxOVc="
},
"firefox": {
"version": "141.0",
"hash": "sha512-vWmYvOknxbXBhlN71BR1/J44CYKc6tsid7s4LQLTeA0qXldJSHVnp1t8njcm+XZixOwokkvEkcWj8h4uxIKNYw=="
"version": "141.0.2",
"hash": "sha512-bRVSvGTZFeeEpdVgyLs1pTCPNevNJVKwJ/gPlQx/DGJ8ykaweWz24X2PUMgub3Cj7BFHHODgWHlPUAt7FeF7Qw=="
}
}
pkgs/applications/networking/cluster/terraform-providers/providers.json
+27 -27
View File
@@ -54,13 +54,13 @@
"vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
},
"alicloud": {
"hash": "sha256-OXLqn7D4Len8EYxwl/coKeh+bBAx4uVzfgiNFJ1Tcrg=",
"hash": "sha256-ITu569Um+3Y7FPCBNALvePAjCCIf/3+Hu0831o7rZCU=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.254.0",
"rev": "v1.256.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g="
"vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM="
},
"ansible": {
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
@@ -225,13 +225,13 @@
"vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA="
},
"buildkite": {
"hash": "sha256-XhO780RsMUx5J/GJ8xcFjN97b6XJ8eHuQjOQiuFUWHY=",
"hash": "sha256-pF46n0PJ2ru7s/1S6mznpJnlZx+3BQmPj5dlttjta+Q=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v1.22.1",
"rev": "v1.23.0",
"spdx": "MIT",
"vendorHash": "sha256-UgGfLh7kDOQK/EwuHQM0HoAaN95WyPWwypGPboPY9+s="
"vendorHash": "sha256-PuhOICFZJi6Fnu0cwrXc5YtJ3m5D1tC8C1wj6m9cfPY="
},
"ccloud": {
"hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
@@ -417,11 +417,11 @@
"vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI="
},
"doppler": {
"hash": "sha256-2sgNPQvk0jylCEiZ0Cja54YbmqHSj+AgLANSLMVAqgw=",
"hash": "sha256-4BhccP7//s4GkKhwqsc8kyqWUUH/SuwsahbutAinyVw=",
"homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler",
"owner": "DopplerHQ",
"repo": "terraform-provider-doppler",
"rev": "v1.18.0",
"rev": "v1.20.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
},
@@ -525,11 +525,11 @@
"vendorHash": "sha256-eE9AY/79xQSbRl5kA0rwS8Oz8I9jaxT/KlVd0v0GAa8="
},
"google": {
"hash": "sha256-YwSl33ST8kvnVg5hr7PCSfEO0xRDRVvTEU3KEMfiIIg=",
"hash": "sha256-pDYqzdPUnCKpbQqe58o4CU605gdF8vovPR3fCAdf4zQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v6.45.0",
"rev": "v6.46.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
},
@@ -705,11 +705,11 @@
"vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="
},
"kafka": {
"hash": "sha256-Onyy+KgmgLYk3J1P4rhHDJ7uEb+9jbywkY7lbfdQ2Vs=",
"hash": "sha256-Z+WRuLumEjN6fGa91pKrFzc4I/5XwNFLh3rJ9Dob3x8=",
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
"owner": "Mongey",
"repo": "terraform-provider-kafka",
"rev": "v0.12.0",
"rev": "v0.12.1",
"spdx": "MIT",
"vendorHash": "sha256-kkaNv+c6IGAW+amSSycjBmUCFXBeQrcF5Jmvtl8bXAE="
},
@@ -840,11 +840,11 @@
"vendorHash": "sha256-oipY2hwgRrntCxxHPyH06e8p+0fKfAQwhh2iBI4RGHQ="
},
"minio": {
"hash": "sha256-hvttrw+7wqcCRyYdGhQvRvP1oDbAGmtR5UpcGx8LMgk=",
"hash": "sha256-TLWbbWYTjnvxT1LaV3FsL31xHHov8LpDYhA/nchMyMo=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
"rev": "v3.6.2",
"rev": "v3.6.3",
"spdx": "AGPL-3.0",
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
@@ -1021,11 +1021,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-L4ZqC11Uz7DhzAxcGfCfOEf3s9Fg+YFVa3Imy9GuYBU=",
"hash": "sha256-Aw7z5qq5xEOUkjDgKCh3S7DBpAZSk8ayaic+Ts9DaDs=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v3.27.2",
"rev": "v3.27.3",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1129,11 +1129,11 @@
"vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg="
},
"rootly": {
"hash": "sha256-Lpysy/BQHYEWhTNcLvBY6C6o1G/PhKzxPe4qUHhPWmM=",
"hash": "sha256-1Sfxg72KHhpWg0NgkYeJ1oQ/MVOi0PL3nWd1KL3jNig=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v3.5.1",
"rev": "v3.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-75GQmp/ybD+VugrrB8qTbP3OPHy3eyBGe5u7CM7CRcc="
},
@@ -1336,29 +1336,29 @@
"vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg="
},
"temporalcloud": {
"hash": "sha256-r5bkK+7phHxxImAQEgwekRiUuLxNzVGYSsb5OH8cx5c=",
"hash": "sha256-dsOBLWHDWMO2/VKQOvJP5WgdAS3Zo9mkqRbfEDvzQRk=",
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
"owner": "temporalio",
"repo": "terraform-provider-temporalcloud",
"rev": "v0.9.1",
"rev": "v0.9.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4="
},
"tencentcloud": {
"hash": "sha256-0sTuheQh9mpwGPsqXLH3dcLvTQcy7xti+y1k1eflL2k=",
"hash": "sha256-X5MhgP1ZxoaEAeUIIrTpF/YLfnsoy0k2RbNRXQzWKq4=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.13",
"rev": "v1.82.15",
"spdx": "MPL-2.0",
"vendorHash": null
},
"tfe": {
"hash": "sha256-Gut7HzjBZIrv9PLNBkSwnGfBKymlJ07GTFKtwiLIGSg=",
"hash": "sha256-wKHlkU/MmLoLjl3LbzYWK10Xl8c5Sb5ItvzoeJ1R/d0=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
"rev": "v0.68.1",
"rev": "v0.68.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tf78FT9JD5IVswgDB3Yug1NZQvo8NDqjPEAfF3gg93w="
},
@@ -1517,12 +1517,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-W67wzWkbSaoRbntJhlErhQ5lOIyJdoIZFJUsBnzLP5o=",
"hash": "sha256-uVfwAoU2bOfy/ZBSK5kwGP2uWDVlS7NCdk4Uv8ZRgII=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.146.0",
"rev": "v0.148.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-DXZi6ncn/X4sx2i8xM7ItxGCuRwLi391LLJ7NlZkxFg="
"vendorHash": "sha256-EvEUTx/Y+LpIaDUY8LsXT+aMtLiNpYH8Z7XnNWLLCM4="
}
}
pkgs/build-support/fetchbitbucket/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ lib.makeOverridable (
fetchzip (
{
inherit name;
url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
url = "https://bitbucket.org/${owner}/${repo}/get/${lib.strings.escapeURL rev}.tar.gz";
meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
}
// removeAttrs args [
pkgs/build-support/fetchbitbucket/tests.nix
+18
View File
@@ -0,0 +1,18 @@
{ testers, fetchFromBitbucket, ... }:
{
withEncodedWhitespace = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
name = "withWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
rev = "tag%20with%20encoded%20spaces";
sha256 = "sha256-Nf1Cvbx7Sbab8EeSSBU5baLBiuFYiQtITED+f4tfjC0=";
};
withoutWhitespace = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
name = "withoutWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
rev = "main";
sha256 = "sha256-eTd773gE1z4+Fl2YPBbbsrADD4Dr7sFGoOWgphXUhtE=";
};
}
pkgs/by-name/ai/air-formatter/cargo-lock.patch
-84
View File
@@ -1,84 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index df5a6e9..0cf72e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,7 +382,7 @@ dependencies = [
"anyhow",
"biome_rowan",
"rustc-hash",
- "tower-lsp 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-lsp",
]
[[package]]
@@ -1369,7 +1369,7 @@ dependencies = [
"time",
"tokio",
"tokio-util",
- "tower-lsp 0.20.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp",
"tracing",
"tracing-subscriber",
"tree-sitter",
@@ -1406,7 +1406,7 @@ dependencies = [
"serde_json",
"tokio",
"tokio-util",
- "tower-lsp 0.20.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp",
"tracing",
"url",
]
@@ -2311,29 +2311,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-[[package]]
-name = "tower-lsp"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"
-dependencies = [
- "async-trait",
- "auto_impl",
- "bytes",
- "dashmap 5.5.3",
- "futures",
- "httparse",
- "lsp-types",
- "memchr",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
- "tower",
- "tower-lsp-macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing",
-]
-
[[package]]
name = "tower-lsp"
version = "0.20.0"
@@ -2352,21 +2329,10 @@ dependencies = [
"tokio",
"tokio-util",
"tower",
- "tower-lsp-macros 0.9.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp-macros",
"tracing",
]
-[[package]]
-name = "tower-lsp-macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
[[package]]
name = "tower-lsp-macros"
version = "0.9.0"
pkgs/by-name/ai/air-formatter/package.nix
+3 -6
View File
@@ -7,19 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "air-formatter";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "posit-dev";
repo = "air";
tag = finalAttrs.version;
hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE=";
hash = "sha256-FGucu5emmBtxVloun7Kh+MWKZDYdKw+75L7g3GqQ7Tw=";
};
# Remove duplicate entries from cargo lock
cargoPatches = [ ./cargo-lock.patch ];
cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";
cargoHash = "sha256-+cksQnHNXGyqbu+CoGhCEmQux7zfLIt5K5rWABfppDo=";
useNextest = true;
pkgs/by-name/bi/bitwuzla/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bitwuzla";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = finalAttrs.version;
hash = "sha256-4Gf06aZ3iBEu0bNZAGgWCXVgKA0ew37Zf6XArnlVAXw=";
hash = "sha256-v5r+BWXUUbKtkos6qmGMC9MMytS/h759SHY6lsTHU1k=";
};
strictDeps = true;
pkgs/by-name/ca/cargo-codspeed/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-codspeed";
version = "3.0.2";
version = "3.0.5";
src = fetchFromGitHub {
owner = "CodSpeedHQ";
repo = "codspeed-rust";
rev = "v${version}";
hash = "sha256-u/6pQSmm069IVXfk7Jy7zCYiGz8yNRz8z3XrBG/1Td0=";
hash = "sha256-vQGPROaTkEwvKw+4aPpS1whUwfeqBcYWJTIKm4KnIiw=";
};
cargoHash = "sha256-OdP01hgJfkxV9htGEoUs/xgbyWDEiyxT3NQLbAlt4K8=";
cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M=";
nativeBuildInputs = [
curl
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.457";
version = "3.2.458";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-OxnnIu5+5V3c2gMtgHeUm1LRVMoR8X5MI4cnzgqwUnI=";
hash = "sha256-0tIDwUKYK4HIdvSu0xr01avwedlEKOF+COvfUHYn00o=";
};
pythonRelaxDeps = [
pkgs/by-name/fa/faudio/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "faudio";
version = "25.07";
version = "25.08";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
tag = finalAttrs.version;
hash = "sha256-ZMU3ntvnUHbeWQ5k5ZSnSLBABGm/F/rSAUM4blorpts=";
hash = "sha256-yhKmY5aysu1wIx0BDdQ6fyf5qn9XCwtNCIjDeJjBGg8=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/fo/fosrl-pangolin/package.nix
+127 -25
View File
@@ -3,28 +3,58 @@
fetchFromGitHub,
esbuild,
buildNpmPackage,
makeWrapper,
formats,
inter,
databaseType ? "sqlite",
environmentVariables ? { },
}:
buildNpmPackage rec {
assert lib.assertOneOf "databaseType" databaseType [
"sqlite"
"pg"
];
let
db =
isLong:
if (databaseType == "sqlite") then
"sqlite"
else if isLong then
"postgresql"
else
"pg";
in
buildNpmPackage (finalAttrs: {
pname = "pangolin";
version = "1.2.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "fosrl";
repo = "pangolin";
tag = version;
hash = "sha256-2yrim4pr8cgIh/FBuGIuK+ycwImpMiz+m21H5qYARmU=";
tag = finalAttrs.version;
hash = "sha256-Cy5COyZAH0NPQDMpKUmweYWkyupDC2sNf2CP+EJ5GiE=";
};
npmDepsHash = "sha256-fi4e79Bk1LC/LizBJ+EhCjDzLR5ZocgVyWbSXsEJKdw=";
nativeBuildInputs = [ esbuild ];
# Replace the googleapis.com Inter font with a local copy from nixpkgs
# based on
# https://github.com/NixOS/nixpkgs/blob/f7bf574774e466b984063a44330384cdbca67d6c/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix
npmDepsHash = "sha256-OGqYmOO6pizcOrdaoSGgjDQgqpjU0SIw3ceh57eyjr4=";
nativeBuildInputs = [
esbuild
makeWrapper
];
prePatch = ''
cat > server/db/index.ts << EOF
export * from "./${db false}";
EOF
'';
# Replace the googleapis.com Inter font with a local copy from Nixpkgs.
# Based on pkgs.nextjs-ollama-llm-ui.
postPatch = ''
substituteInPlace src/app/layout.tsx --replace-fail \
"{ Figtree, Inter } from \"next/font/google\"" \
"{ Inter } from \"next/font/google\"" \
"localFont from \"next/font/local\""
substituteInPlace src/app/layout.tsx --replace-fail \
@@ -34,33 +64,105 @@ buildNpmPackage rec {
cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
'';
preBuild = ''
npx drizzle-kit generate --dialect sqlite --schema ./server/db/schemas/ --out init
'';
preBuild = "npx drizzle-kit generate --dialect ${db true} --schema ./server/db/${db false}/schema.ts --name migration --out init";
npmBuildScript = "build:${db false}";
postBuild = "npm run build:cli";
preInstall = "mkdir -p $out/{bin,share/pangolin}";
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r .next/standalone/* $out/
cp -r .next/standalone/.next $out/
cp -r node_modules $out/share/pangolin
cp -r .next/static $out/.next/static
cp -r dist $out/dist
cp -r init $out/dist/init
cp -r .next/standalone/.next $out/share/pangolin
cp .next/standalone/package.json $out/share/pangolin
cp -r .next/static $out/share/pangolin/.next/static
cp -r public $out/share/pangolin/public
cp -r dist $out/share/pangolin/dist
cp -r init $out/share/pangolin/dist/init
cp server/db/names.json $out/share/pangolin/dist/names.json
cp server/db/names.json $out/dist/names.json
cp -r public $out/public
cp -r node_modules $out/
runHook postInstall
'';
preFixup =
let
defaultConfig = (formats.yaml { }).generate "pangolin-default-config" {
app.dashboard_url = "https://pangolin.example.test";
domains.domain1.base_domain = "example.test";
gerbil.base_endpoint = "pangolin.example.test";
server.secret = "A secret string used for encrypting sensitive data. Must be at least 8 characters long.";
};
variablesMapped =
isServer:
(lib.concatMapAttrsStringSep " " (name: value: "--set ${name} ${value}") (
{
NODE_OPTIONS = "enable-source-maps";
NODE_ENV = "development";
ENVIRONMENT = "prod";
}
// environmentVariables
))
# If we're running Pangolin, test if we have a .nix_skip_setup file in the public
# and .next directories. If we don't, clean them up and re-create them.
+ lib.optionalString isServer " --run '${
(lib.concatMapStringsSep " && "
(
dir:
"test -f ${dir}/.nix_skip_setup || { rm -${lib.optionalString (dir == ".next") "r"}f ${dir} && ${
if (dir == ".next") then "cp -rd" else "ln -s"
} ${placeholder "out"}/share/pangolin/${dir} .; }"
)
[
".next"
"public"
"node_modules"
]
)
# Also deploy a small config (if none exists) and run the
# database migrations before running the server.
} && test -f config/config.yml || { install -Dm600 ${defaultConfig} config/config.yml && { test -z $EDITOR && { echo \"Please edit $(pwd)/config/config.yml\" and run the server again. && exit 255; } || $EDITOR config/config.yml; }; } && command ${placeholder "out"}/bin/migrate-pangolin-database'";
in
lib.concatMapStrings
(
attr:
"makeWrapper $out/share/pangolin/dist/${attr.mjs}.mjs $out/bin/${attr.command} ${
variablesMapped (attr.mjs == "server")
}\n"
)
[
{
mjs = "cli";
command = "pangctl";
}
{
mjs = "migrations";
command = "migrate-pangolin-database";
}
{
mjs = "server";
command = "pangolin";
}
];
passthru = { inherit databaseType; };
meta = {
description = "Tunneled reverse proxy server with identity and access control";
homepage = "https://github.com/fosrl/pangolin";
changelog = "https://github.com/fosrl/pangolin/releases/tag/${version}";
changelog = "https://github.com/fosrl/pangolin/releases/tag/${finalAttrs.version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ jackr ];
maintainers = with lib.maintainers; [
jackr
sigmasquadron
];
platforms = lib.platforms.linux;
mainProgram = "pangolin";
};
}
})
pkgs/by-name/gi/gildas/package.nix
+3 -3
View File
@@ -24,8 +24,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "jul25b";
version = "20250701_b";
srcVersion = "aug25a";
version = "20250801_a";
pname = "gildas";
src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
];
hash = "sha256-TU9UdvyzlIWGJWAAJIIGBO5NgXuKDYTdjHhFHRwTagU=";
hash = "sha256-SqUE/cu23+i7QuGw7LFnLfP1hViUW4moJKfshu/3yXI=";
};
nativeBuildInputs = [
pkgs/tools/misc/grc/default.nix → pkgs/by-name/gr/grc/package.nix
+7 -7
View File
@@ -1,18 +1,18 @@
{
lib,
python3Packages,
fetchFromGitHub,
buildPythonApplication,
installShellFiles,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "grc";
version = "1.13";
format = "other";
src = fetchFromGitHub {
owner = "garabik";
repo = pname;
repo = "grc";
rev = "v${version}";
sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
};
@@ -39,20 +39,20 @@ buildPythonApplication rec {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html";
description = "Generic text colouriser";
longDescription = ''
Generic Colouriser is yet another colouriser (written in Python) for
beautifying your logfiles or output of commands.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
azahi
lovek323
peterhoeg
];
platforms = platforms.unix;
platforms = lib.platforms.unix;
mainProgram = "grc";
};
}
pkgs/by-name/hy/hydra/package.nix
+4 -3
View File
@@ -102,6 +102,7 @@ let
NetAmazonS3
NetPrometheus
NetStatsd
NumberBytesHuman
PadWalker
ParallelForkManager
PerlCriticCommunity
@@ -130,14 +131,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2025-07-17";
version = "0-unstable-2025-08-05";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "b812bb5017cac055fa56ffeac5440b6365830d67";
hash = "sha256-XmoecWRUvUX8jf0U0cGyP4AfLHb0D2D4Ec69jqwrWVI=";
rev = "79ba8fdd04ba53826aa9aaba6e25fd0d6952b3b3";
hash = "sha256-h8UNR3LVrD313iX1OazDwIcMLksh0p6oJv9msEfjS0E=";
};
outputs = [
pkgs/by-name/jd/jdd/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "jdd";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "mahyarmirrashed";
repo = "jdd";
tag = "v${finalAttrs.version}";
hash = "sha256-JeF6dsExfQ+d5F8RWmfGbr7CIl6akOTlLI2jxx/dES0=";
hash = "sha256-3keJrKbR3+J3z22W8Xoabz9YhvjRRBBMo59l/eJo7Hs=";
};
vendorHash = "sha256-KEg5X2wHx7KPHEL1zJd/DeDnR69FyB6pajpHIYdep2k=";
pkgs/by-name/ju/jujutsu/package.nix
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jujutsu";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "jj-vcs";
repo = "jj";
tag = "v${finalAttrs.version}";
hash = "sha256-4zDHSpi7Kk7rramrWFOlBelZnOxt0zgXIrHucYQUOz0=";
hash = "sha256-TFKUz8hUCRM9RPkp9CBvKnd4e+TnR8H5t9/N76cAKzI=";
};
cargoHash = "sha256-QmMc7pG2FMJBI9AIGPRRh2juFoz7gRFw5CQIcNK6QZI=";
cargoHash = "sha256-QWbAXqOysIZ7vUeBqAL/iP2QJBHgkZwjsUIregPNezg=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ju/julec/package.nix
+8 -4
View File
@@ -21,23 +21,23 @@ let
in
clangStdenv.mkDerivation (finalAttrs: {
pname = "julec";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "julelang";
repo = "jule";
tag = "jule${finalAttrs.version}";
name = "jule-${finalAttrs.version}";
hash = "sha256-gFlca9XdRNv2CI3jfMiWejcmGGzabP0VGs4vlvFs72o=";
hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k=";
};
irSrc = fetchFromGitHub {
owner = "julelang";
repo = "julec-ir";
# revision determined by the upstream commit hash in julec-ir/README.md
rev = "4a3bf4fc84b53aa607855df6635d95d3e310f7ad";
rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f";
name = "jule-ir-${finalAttrs.version}";
hash = "sha256-Wl5AYRGYcQpj/R9nynxNC5r1HK1EmImwkLokdZfp9sE=";
hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE=";
};
dontConfigure = true;
@@ -65,6 +65,10 @@ clangStdenv.mkDerivation (finalAttrs: {
-Wno-everything \
-fwrapv \
-ffloat-store \
-fno-fast-math \
-fno-rounding-math \
-ffp-contract=fast \
-fexcess-precision=standard \
-DNDEBUG \
-fomit-frame-pointer \
-fno-strict-aliasing \
pkgs/by-name/ju/just-lsp/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "just-lsp";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "terror";
repo = "just-lsp";
tag = finalAttrs.version;
hash = "sha256-0bt/kovzOgqAaIKArrh0G9ncuD1J7K3OINg9Dpa7fXs=";
hash = "sha256-cHDkcUsrrz71GqchkKT4yU1h6WzrT/zZPs95MJvb2tU=";
};
cargoHash = "sha256-DU8E3r9pjLYYxCEq+6dT2hrV2gDyGbtWD/N0aQFVyZI=";
cargoHash = "sha256-0CgwovZ9AtQs5AHulKxe1jHxG+EcyrCUyoEpxV/oDxY=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/jx/jx/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "jx";
version = "3.16.1";
version = "3.16.16";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-pvFSvaPdqq2uBDdn723TyGzz0MxNjM/MtI/1llcAxFI=";
sha256 = "sha256-42PqWzRCgA0DmCxUYs8pvOwwdXVdiUTQ59JKFWHgg8A=";
};
vendorHash = "sha256-qCcwCsinzkjN+g7wxn60JoFBGk6Swydi93w3dZNpsZY=";
pkgs/by-name/ka/kanidm/1_5.nix
-1
View File
@@ -2,6 +2,5 @@ import ./generic.nix {
version = "1.5.0";
hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
patchDir = ./patches/1_5;
unsupported = true;
}
pkgs/by-name/ka/kanidm/1_6.nix
+1 -1
View File
@@ -2,5 +2,5 @@ import ./generic.nix {
version = "1.6.4";
hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";
cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";
patchDir = ./patches/1_6;
eolDate = "2025-09-01";
}
pkgs/by-name/ka/kanidm/1_7.nix
+5
View File
@@ -0,0 +1,5 @@
import ./generic.nix {
version = "1.7.1";
hash = "sha256-CG4s6fYxTM2I/kFjD905g8/DSFkyB+0pnGVXgyRXtlE=";
cargoHash = "sha256-9bE3hSCFBJF8f3Lm5SzEuDtEpJBbCBijUDfqGiPnRsc=";
}
pkgs/by-name/ka/kanidm/README.md
+1
View File
@@ -19,6 +19,7 @@ For example, when upgrading from 1.4 -> 1.5
1. `cp -r pkgs/by-name/ka/kanidm/patches/1_4 pkgs/by-name/ka/kanidm/patches/1_5`
1. Update `1_5.nix` hashes/paths, and as needed for upstream changes, `generic.nix`
1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default
1. Update the previous release, e.g. `1_4.nix` and set `eolDate = "YYYY-MM-DD"` where the date is 30 days from release of 1.5.
1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported
### Update default
pkgs/by-name/ka/kanidm/generic.nix
+51 -54
View File
@@ -2,9 +2,8 @@
version,
hash,
cargoHash,
patchDir,
extraMeta ? { },
unsupported ? false,
eolDate ? null,
}:
{
@@ -35,8 +34,24 @@
let
arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic";
versionUnderscored = builtins.replaceStrings [ "." ] [ "_" ] (
lib.versions.majorMinor kanidm.version
);
provisionPatches = [
(./. + "/provision-patches/${versionUnderscored}/oauth2-basic-secret-modify.patch")
(./. + "/provision-patches/${versionUnderscored}/recover-account.patch")
];
upgradeNote = ''
Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the
next version with `services.kanidm.package = pkgs.kanidm_1_x;`
See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html
'';
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning");
inherit version cargoHash;
@@ -49,16 +64,13 @@ rustPlatform.buildRustPackage rec {
inherit hash;
};
KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
env.KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
patches = lib.optionals enableSecretProvisioning [
"${patchDir}/oauth2-basic-secret-modify.patch"
"${patchDir}/recover-account.patch"
];
patches = lib.optionals enableSecretProvisioning provisionPatches;
postPatch =
let
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
format = (formats.toml { }).generate "${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml";
socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket";
profile = {
cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";
@@ -70,23 +82,11 @@ rustPlatform.buildRustPackage rec {
server_admin_bind_path = socket_path;
server_config_path = "/etc/kanidm/server.toml";
server_ui_pkg_path = "@htmx_ui_pkg_path@";
}
// lib.optionalAttrs (lib.versionOlder version "1.5") {
admin_bind_path = socket_path;
default_config_path = "/etc/kanidm/server.toml";
default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
}
// lib.optionalAttrs (lib.versions.majorMinor version == "1.3") {
web_ui_pkg_path = "@web_ui_pkg_path@";
};
in
''
cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg"
''
+ lib.optionalString (lib.versions.majorMinor version == "1.3") ''
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml --replace-fail '@web_ui_pkg_path@' "$out/ui/pkg"
cp ${format profile} libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml
substituteInPlace libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg"
'';
nativeBuildInputs = [
@@ -108,9 +108,6 @@ rustPlatform.buildRustPackage rec {
postBuild = ''
mkdir -p $out/ui
cp -r server/core/static $out/ui/hpkg
''
+ lib.optionalString (lib.versions.majorMinor version == "1.3") ''
cp -r server/web_ui/pkg $out/ui/pkg
'';
# Upstream runs with the Rust equivalent of -Werror,
@@ -139,48 +136,48 @@ rustPlatform.buildRustPackage rec {
passthru = {
tests = {
inherit (nixosTests) kanidm kanidm-provisioning;
kanidm = nixosTests.kanidm versionUnderscored;
kanidm-provisioning = nixosTests.kanidm-provisioning versionUnderscored;
};
updateScript = lib.optionals (!enableSecretProvisioning) (nix-update-script {
# avoid spurious releases and tags such as "debs"
extraArgs = [
"-vr"
"v([0-9\\.]*)"
"v(${lib.versions.major kanidm.version}\\.${lib.versions.minor kanidm.version}\\.[0-9]*)"
"--override-filename"
"pkgs/by-name/ka/kanidm/${
builtins.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor kanidm.version)
}.nix"
"pkgs/by-name/ka/kanidm/${versionUnderscored}.nix"
];
});
inherit enableSecretProvisioning;
withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; };
eolMessage = lib.optionalString (eolDate != null) ''
kanidm ${lib.versions.majorMinor version} is deprecated and will reach end-of-life on ${eolDate}
${upgradeNote}
'';
};
# can take over 4 hours on 2 cores and needs 16GB+ RAM
requiredSystemFeatures = [ "big-parallel" ];
meta =
with lib;
{
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";
description = "Simple, secure and fast identity management platform";
homepage = "https://github.com/kanidm/kanidm";
license = licenses.mpl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [
adamcstephens
Flakebi
];
knownVulnerabilities = lib.optionals unsupported [
''
kanidm ${version} has reached EOL.
meta = {
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";
description = "Simple, secure and fast identity management platform";
homepage = "https://github.com/kanidm/kanidm";
license = lib.licenses.mpl20;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [
adamcstephens
Flakebi
];
knownVulnerabilities = lib.optionals unsupported [
''
kanidm ${lib.versions.majorMinor version} has reached end-of-life.
Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the next version with `services.kanidm.package = pkgs.kanidm_1_x;`
See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html
''
];
}
// extraMeta;
}
${upgradeNote}
''
];
};
})
pkgs/by-name/ka/kanidm/patches/1_5/oauth2-basic-secret-modify.patch → pkgs/by-name/ka/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch
View File
pkgs/by-name/ka/kanidm/patches/1_5/recover-account.patch → pkgs/by-name/ka/kanidm/provision-patches/1_5/recover-account.patch
View File
pkgs/by-name/ka/kanidm/patches/1_6/oauth2-basic-secret-modify.patch → pkgs/by-name/ka/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch
View File
pkgs/by-name/ka/kanidm/patches/1_6/recover-account.patch → pkgs/by-name/ka/kanidm/provision-patches/1_6/recover-account.patch
View File
pkgs/by-name/ka/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch
+159
View File
@@ -0,0 +1,159 @@
From fc26fe5ac9e9cd65af82609c5a4966c8f756ea0f Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Fri, 21 Mar 2025 16:07:54 +0100
Subject: [PATCH 1/2] oauth2 basic secret modify
---
server/core/src/actors/v1_write.rs | 42 +++++++++++++++++++++++++++++
server/core/src/https/v1.rs | 6 ++++-
server/core/src/https/v1_oauth2.rs | 29 ++++++++++++++++++++
server/lib/src/server/migrations.rs | 16 +++++++++++
4 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs
index 732e826c8..a2b8e503f 100644
--- a/server/core/src/actors/v1_write.rs
+++ b/server/core/src/actors/v1_write.rs
@@ -324,6 +324,48 @@ impl QueryServerWriteV1 {
.and_then(|_| idms_prox_write.commit().map(|_| ()))
}
+ #[instrument(
+ level = "info",
+ skip_all,
+ fields(uuid = ?eventid)
+ )]
+ pub async fn handle_oauth2_basic_secret_write(
+ &self,
+ client_auth_info: ClientAuthInfo,
+ filter: Filter<FilterInvalid>,
+ new_secret: String,
+ eventid: Uuid,
+ ) -> Result<(), OperationError> {
+ // Given a protoEntry, turn this into a modification set.
+ let ct = duration_from_epoch_now();
+ let mut idms_prox_write = self.idms.proxy_write(ct).await?;
+ let ident = idms_prox_write
+ .validate_client_auth_info_to_ident(client_auth_info, ct)
+ .map_err(|e| {
+ admin_error!(err = ?e, "Invalid identity");
+ e
+ })?;
+
+ let modlist = ModifyList::new_purge_and_set(
+ Attribute::OAuth2RsBasicSecret,
+ Value::SecretValue(new_secret),
+ );
+
+ let mdf =
+ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write)
+ .map_err(|e| {
+ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write");
+ e
+ })?;
+
+ trace!(?mdf, "Begin modify event");
+
+ idms_prox_write
+ .qs_write
+ .modify(&mdf)
+ .and_then(|_| idms_prox_write.commit())
+ }
+
#[instrument(
level = "info",
skip_all,
diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs
index 30de387b8..a11aa8ecd 100644
--- a/server/core/src/https/v1.rs
+++ b/server/core/src/https/v1.rs
@@ -4,7 +4,7 @@ use axum::extract::{Path, State};
use axum::http::{HeaderMap, HeaderValue};
use axum::middleware::from_fn;
use axum::response::{IntoResponse, Response};
-use axum::routing::{delete, get, post, put};
+use axum::routing::{delete, get, post, put, patch};
use axum::{Extension, Json, Router};
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
use compact_jwt::{Jwk, Jws, JwsSigner};
@@ -3129,6 +3129,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {
"/v1/oauth2/:rs_name/_basic_secret",
get(super::v1_oauth2::oauth2_id_get_basic_secret),
)
+ .route(
+ "/v1/oauth2/:rs_name/_basic_secret",
+ patch(super::v1_oauth2::oauth2_id_patch_basic_secret),
+ )
.route(
"/v1/oauth2/:rs_name/_scopemap/:group",
post(super::v1_oauth2::oauth2_id_scopemap_post)
diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs
index f399539bc..ffad9921e 100644
--- a/server/core/src/https/v1_oauth2.rs
+++ b/server/core/src/https/v1_oauth2.rs
@@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret(
.map_err(WebError::from)
}
+#[utoipa::path(
+ patch,
+ path = "/v1/oauth2/{rs_name}/_basic_secret",
+ request_body=ProtoEntry,
+ responses(
+ DefaultApiResponse,
+ ),
+ security(("token_jwt" = [])),
+ tag = "v1/oauth2",
+ operation_id = "oauth2_id_patch_basic_secret"
+)]
+/// Overwrite the basic secret for a given OAuth2 Resource Server.
+#[instrument(level = "info", skip(state, new_secret))]
+pub(crate) async fn oauth2_id_patch_basic_secret(
+ State(state): State<ServerState>,
+ Extension(kopid): Extension<KOpId>,
+ VerifiedClientInformation(client_auth_info): VerifiedClientInformation,
+ Path(rs_name): Path<String>,
+ Json(new_secret): Json<String>,
+) -> Result<Json<()>, WebError> {
+ let filter = oauth2_id(&rs_name);
+ state
+ .qe_w_ref
+ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid)
+ .await
+ .map(Json::from)
+ .map_err(WebError::from)
+}
+
#[utoipa::path(
patch,
path = "/v1/oauth2/{rs_name}",
diff --git a/server/lib/src/server/migrations.rs b/server/lib/src/server/migrations.rs
index fd0bca8db..8621714f2 100644
--- a/server/lib/src/server/migrations.rs
+++ b/server/lib/src/server/migrations.rs
@@ -171,6 +171,22 @@ impl QueryServer {
reload_required = true;
};
+ // secret provisioning: allow idm_admin to modify OAuth2RsBasicSecret.
+ write_txn.internal_modify_uuid(
+ UUID_IDM_ACP_OAUTH2_MANAGE_V1,
+ &ModifyList::new_append(
+ Attribute::AcpCreateAttr,
+ Attribute::OAuth2RsBasicSecret.into(),
+ ),
+ )?;
+ write_txn.internal_modify_uuid(
+ UUID_IDM_ACP_OAUTH2_MANAGE_V1,
+ &ModifyList::new_append(
+ Attribute::AcpModifyPresentAttr,
+ Attribute::OAuth2RsBasicSecret.into(),
+ ),
+ )?;
+
// Execute whatever operations we have batched up and ready to go. This is needed
// to preserve ordering of the operations - if we reloaded after a remigrate then
// we would have skipped the patch level fix which needs to have occurred *first*.
--
2.49.0
pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch
+122
View File
@@ -0,0 +1,122 @@
From 229165abe5be596fc2be8e285884813a1b5a38c8 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Fri, 21 Mar 2025 16:08:15 +0100
Subject: [PATCH 2/2] recover account
---
server/core/src/actors/internal.rs | 5 +++--
server/core/src/admin.rs | 6 +++---
server/daemon/src/main.rs | 23 ++++++++++++++++++++++-
server/daemon/src/opt.rs | 7 +++++++
4 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs
index 420e72c6c..e252bca51 100644
--- a/server/core/src/actors/internal.rs
+++ b/server/core/src/actors/internal.rs
@@ -172,17 +172,18 @@ impl QueryServerWriteV1 {
#[instrument(
level = "info",
- skip(self, eventid),
+ skip(self, password, eventid),
fields(uuid = ?eventid)
)]
pub(crate) async fn handle_admin_recover_account(
&self,
name: String,
+ password: Option<String>,
eventid: Uuid,
) -> Result<String, OperationError> {
let ct = duration_from_epoch_now();
let mut idms_prox_write = self.idms.proxy_write(ct).await?;
- let pw = idms_prox_write.recover_account(name.as_str(), None)?;
+ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?;
idms_prox_write.commit().map(|()| pw)
}
diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs
index 90ccb1927..85e31ddef 100644
--- a/server/core/src/admin.rs
+++ b/server/core/src/admin.rs
@@ -24,7 +24,7 @@ pub use kanidm_proto::internal::{
#[derive(Serialize, Deserialize, Debug)]
pub enum AdminTaskRequest {
- RecoverAccount { name: String },
+ RecoverAccount { name: String, password: Option<String> },
ShowReplicationCertificate,
RenewReplicationCertificate,
RefreshReplicationConsumer,
@@ -309,8 +309,8 @@ async fn handle_client(
let resp = async {
match req {
- AdminTaskRequest::RecoverAccount { name } => {
- match server_rw.handle_admin_recover_account(name, eventid).await {
+ AdminTaskRequest::RecoverAccount { name, password } => {
+ match server_rw.handle_admin_recover_account(name, password, eventid).await {
Ok(password) => AdminTaskResponse::RecoverAccount { password },
Err(e) => {
error!(err = ?e, "error during recover-account");
diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs
index c3b40faa0..2a57a307c 100644
--- a/server/daemon/src/main.rs
+++ b/server/daemon/src/main.rs
@@ -923,13 +923,34 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode {
.await;
}
}
- KanidmdOpt::RecoverAccount { name, commonopts } => {
+ KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => {
info!("Running account recovery ...");
let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();
+ let password = if *from_environment {
+ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE") {
+ Ok(path) => match tokio::fs::read_to_string(&path).await {
+ Ok(contents) => Some(contents),
+ Err(e) => {
+ error!("Failed to read password file '{}': {}", path, e);
+ return ExitCode::FAILURE;
+ }
+ },
+ Err(_) => match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") {
+ Ok(val) => Some(val),
+ Err(_) => {
+ error!("Neither KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE nor KANIDM_RECOVER_ACCOUNT_PASSWORD was set");
+ return ExitCode::FAILURE;
+ }
+ }
+ }
+ } else {
+ None
+ };
submit_admin_req(
config.adminbindpath.as_str(),
AdminTaskRequest::RecoverAccount {
name: name.to_owned(),
+ password,
},
output_mode,
)
diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs
index f1b45a5b3..ca19fb6a5 100644
--- a/server/daemon/src/opt.rs
+++ b/server/daemon/src/opt.rs
@@ -236,6 +236,13 @@ enum KanidmdOpt {
#[clap(value_parser)]
/// The account name to recover credentials for.
name: String,
+ /// Use a password given via an environment variable.
+ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE` takes precedence and reads the desired
+ /// password from the given file
+ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD` directly takes a
+ /// password - beware that this will leave the password in the environment
+ #[clap(long = "from-environment")]
+ from_environment: bool,
#[clap(flatten)]
commonopts: CommonOpt,
},
--
2.49.0
pkgs/by-name/ko/komga/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation rec {
pname = "komga";
version = "1.23.0";
version = "1.23.1";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
sha256 = "sha256-OkRTa0yMmxT95yey/7EIYulJ4zr/fZEWMIygzppr5Lw=";
sha256 = "sha256-yDmkM4ayyAanX3NmjfHZdp6Ya1CAVVOonwfQa2XeGY8=";
};
nativeBuildInputs = [
pkgs/by-name/la/lazygit/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
}:
buildGoModule rec {
pname = "lazygit";
version = "0.54.0";
version = "0.54.1";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazygit";
tag = "v${version}";
hash = "sha256-MOkqNbvrhbjcdNTNujy2gDsaLbl1eWeRWPx0KavHhas=";
hash = "sha256-MTuVeKlytI7jp3pi2nuJqebG7DcEprfNQo9jf+c7Obg=";
};
vendorHash = null;
pkgs/by-name/ma/marp-cli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "marp-cli";
version = "4.2.1";
version = "4.2.2";
src = fetchFromGitHub {
owner = "marp-team";
repo = "marp-cli";
rev = "v${version}";
hash = "sha256-M1ixUaL/CvzeDi59TA3+1qdn6/t2P/BvrINi0i3BCUM=";
hash = "sha256-9ivc/LuadZLjxAfk9Q57uUVEEXGLbgwTjKdc/v8dDxo=";
};
npmDepsHash = "sha256-+17trU4goJgimTYPXbZQVwZyDtyOJIRtXjzduAxxR4o=";
npmDepsHash = "sha256-glIMWRHZV/5bt3LcWOQctZ4JoqKlmhWu85NyUr9aDLs=";
npmPackFlags = [ "--ignore-scripts" ];
makeCacheWritable = true;
pkgs/by-name/ma/matrix-authentication-service/package.nix
+11 -5
View File
@@ -18,21 +18,21 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-authentication-service";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "element-hq";
repo = "matrix-authentication-service";
tag = "v${finalAttrs.version}";
hash = "sha256-JimVGDHL4pwN0ALdZVJjkzgdOMTlXo4okiH8b7aALJg=";
hash = "sha256-BLEbEDZRh7fgcnkH/YUHPPdKM1FtZdjvsL1rJ57BP3w=";
};
cargoHash = "sha256-5Db3veAs2Zk1EzCp0M8krkUEtfiuJwbAUpUODquYXlA=";
cargoHash = "sha256-1jLiCCZUj/rBHd1huqZdmgKayoSZoOt3tptyZlOcWJA=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
hash = "sha256-m0W9S/NcbwVMsqSBh5GIHawQR1kRsEEQCnHGbSGNq74=";
hash = "sha256-+n9P2P88G3neHJqmJi/VWpaQ/UkUzBtihfeKy5lju4U=";
};
npmRoot = "frontend";
@@ -88,7 +88,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [
# avoid unstable pre‐releases
"--version-regex"
"^v([0-9.]+)$"
];
};
meta = {
description = "OAuth2.0 + OpenID Provider for Matrix Homeservers";
pkgs/by-name/ma/matrix-conduit/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-conduit";
version = "0.10.6";
version = "0.10.7";
src = fetchFromGitLab {
owner = "famedly";
repo = "conduit";
tag = "v${finalAttrs.version}";
hash = "sha256-VefM22YY00yOJpk6S6RRoRDbOhTRZ7MfeZHzI0MCPKQ=";
hash = "sha256-UI/xrdM4ztH9vhEwSOwl4jTF5jU3FBwgXY7h+0prIOI=";
};
cargoHash = "sha256-4Lf6OHWwpNMQGXHp5UFJjQlS/FpKq+pM5Lao+AVzwYs=";
cargoHash = "sha256-Capftx1mpo7xWb4w1pBgM7rBsRj1YqUrQCia9MkIOX0=";
# Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
preBuild = ''
pkgs/by-name/md/mdfried/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdfried";
version = "0.12.4";
version = "0.12.6";
src = fetchFromGitHub {
owner = "benjajaja";
repo = "mdfried";
tag = "v${finalAttrs.version}";
hash = "sha256-V4mSMBvezkIp7+95W3DiGYIFiNPC3g535j3gnske3eU=";
hash = "sha256-0xfdVZLqjlBvlpQYAYVTR2tAn6IjD0rgEBScYe5L4g4=";
};
cargoHash = "sha256-xAoe6IeI9VBnofC/yuOAbKjsWyHV5AG4KwmyptQzRsQ=";
cargoHash = "sha256-jDv6H846Po4Q4ungaC7e/311dgQ8M1L/bQayR5NgZv4=";
doCheck = true;
pkgs/by-name/md/mdns-scanner/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdns-scanner";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "CramBL";
repo = "mdns-scanner";
tag = "v${finalAttrs.version}";
hash = "sha256-iZc+KY/b7xQKm9bBJ+bRmcu6zFJAXcCRy72gDrBKRzQ=";
hash = "sha256-OEpBu7RF28jC1X5JMsUkgVRNacfCUkjfxy5oi8b64QY=";
};
cargoHash = "sha256-L2g49bTh+Il+fWfb7kgNqbxd0Y+qnO7Q4laB2pFlXbw=";
cargoHash = "sha256-6h4vLrPMUjqqLyxyKBl9BS2kiC00MrEqa/AgkPgG3gM=";
meta = {
homepage = "https://github.com/CramBL/mdns-scanner";
pkgs/by-name/mi/micronaut/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "micronaut";
version = "4.9.1";
version = "4.9.2";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-BzqOyUTJTvpp/LDZ/jUyvgknRvytAT8Z+K4TTgsnxSc=";
sha256 = "sha256-9TWTihFiEdpGduj14FYQI1SWTlIh6eexwLvVucXMHdY=";
};
nativeBuildInputs = [
pkgs/by-name/oc/ocm/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "ocm";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "openshift-online";
repo = "ocm-cli";
rev = "v${version}";
sha256 = "sha256-NNhHd4++o2nJjG4okx5dWUng9Z2b032goaLq+1eZ+KI=";
sha256 = "sha256-fN7nrWxF4eFaEd5iNpVJWoK23S76jjh20834b/MVlPo=";
};
vendorHash = "sha256-KlpQO2xi6edysM45ks2m7/3kkEfxACvK/hzrLpHnEic=";
vendorHash = "sha256-q/Se4jq1a25QX9TzVkPbOi7AeT2hossCX4dh9gMqCx0=";
# Strip the final binary.
ldflags = [
pkgs/by-name/op/opencode/package.nix
+4 -8
View File
@@ -7,7 +7,6 @@
models-dev,
nix-update-script,
testers,
tree-sitter,
writableTmpDirAsHomeHook,
}:
@@ -27,12 +26,12 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "0.3.122";
version = "0.3.132";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-JsyUXRfMQ40qQwtaW0Ebh/HlHqzb2D8AvsyJm5Yjm8E=";
hash = "sha256-g++ByI4akYfOTHLhrgm3us77N0jeZwuQIt1mHOLh0GM=";
};
tui = buildGoModule {
@@ -41,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
modRoot = "packages/tui";
vendorHash = "sha256-nBwYVaBau1iTnPY3d5F/5/ENyjMCikpQYNI5whEJwBk=";
vendorHash = "sha256-qsOL6gsZwEm7YcYO/zoyJAnVmciCjPYqPavV77psybU=";
subPackages = [ "cmd/opencode" ];
@@ -108,8 +107,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
};
buildInputs = [ tree-sitter ];
nativeBuildInputs = [
bun
models-dev
@@ -135,13 +132,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook preBuild
bun build \
--define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \
--define OPENCODE_VERSION="'${finalAttrs.version}'" \
--compile \
--minify \
--target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
--outfile=opencode \
./packages/opencode/src/index.ts \
${finalAttrs.tui}/bin/tui
runHook postBuild
'';
pkgs/by-name/pa/payloadsallthethings/mkdocs.patch
+21
View File
@@ -0,0 +1,21 @@
diff --git a/mkdocs.yml b/mkdocs.yml
index 1c4cd92..9af93f0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -59,14 +59,9 @@ markdown_extensions:
anchor_linenums: true
- pymdownx.tasklist:
custom_checkbox: true
- - pymdownx.emoji:
- emoji_index: !!python/name:material.extensions.emoji.twemoji
- emoji_generator: !!python/name:material.extensions.emoji.to_svg
# - mdx_truly_sane_lists:
# nested_indent: 2
# truly_sane: True
-
+
plugins:
- search
- - git-revision-date-localized
- - social
\ No newline at end of file
pkgs/by-name/pa/payloadsallthethings/package.nix
+40 -7
View File
@@ -2,24 +2,54 @@
lib,
fetchFromGitHub,
stdenvNoCC,
python3Packages,
yq,
}:
let
inherit (python3Packages) mkdocs mkdocs-material pymdown-extensions;
in
stdenvNoCC.mkDerivation {
pname = "payloadsallthethings";
version = "3.0-unstable-2024-01-21";
version = "2025.1";
src = fetchFromGitHub {
owner = "swisskyrepo";
repo = "PayloadsAllTheThings";
rev = "97cfeee270395a838802fa1fcb8a4d5ffc6d6b48";
hash = "sha256-LRS60v0o5nPSLfGFH6P0Y5roN8Mk5/KyRF4SWTv/7Hw=";
tag = "4.2";
hash = "sha256-LBPlGfmIyzgRhUdAJmPxjDB7D8iRHcSA8Tf5teMnFzA=";
};
patches = [ ./mkdocs.patch ];
nativeBuildInputs = [
mkdocs
mkdocs-material
pymdown-extensions
yq
];
outputs = [
"out"
"doc"
];
buildPhase = ''
yq -yi '.docs_dir = "source"' mkdocs.yml
mkdir overrides
mv mkdocs.yml ..
cd ..
mkdocs build --theme material
'';
installPhase = ''
runHook preInstall
mkdir -p $doc/share/payloadsallthethings
cp -r site/* $doc/share/payloadsallthethings
mkdir -p $out/share/payloadsallthethings
rm CONTRIBUTING.md mkdocs.yml custom.css
cp -a * $out/share/payloadsallthethings
rm source/CONTRIBUTING.md source/custom.css
cp -r source/* $out/share/payloadsallthethings
runHook postInstall
'';
@@ -27,7 +57,10 @@ stdenvNoCC.mkDerivation {
homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings";
description = "List of useful payloads and bypass for Web Application Security and Pentest/CTF";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ shard7 ];
maintainers = with lib.maintainers; [
shard7
felbinger
];
platforms = lib.platforms.all;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
};
pkgs/by-name/po/positron-bin/package.nix
+4 -4
View File
@@ -22,7 +22,7 @@
}:
let
pname = "positron-bin";
version = "2025.07.0-204";
version = "2025.08.0-130";
in
stdenv.mkDerivation {
inherit version pname;
@@ -31,17 +31,17 @@ stdenv.mkDerivation {
if stdenv.hostPlatform.isDarwin then
fetchurl {
url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg";
hash = "sha256-f1EQw6fKH4pgVG7+YcLPv6FawJ2TN507hYLD0pn+PlM=";
hash = "sha256-FMnDXhIj6j/ToLtjUiJObu/SRUb9eTnffC9DBbb2azE=";
}
else if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb";
hash = "sha256-SxjQPZ2wUmSIYOxBB6AS6Ue7ajXzMkY32nHdkZkNhBA=";
hash = "sha256-zNt+40BLHR48g0ZhY8KDpPVdzcOCW7Isl3JA4nlBisc=";
}
else
fetchurl {
url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb";
hash = "sha256-f27LC4+SXnkyePw/fw8r9JYsOQKVoIiFkAet/QtwbNg=";
hash = "sha256-vjEOQw3+AoAHA+zR3w56h1kKuNMsA+WLK6xKEVvMqSU=";
};
buildInputs = [
pkgs/by-name/ra/ranger/package.nix
+3 -3
View File
@@ -17,14 +17,14 @@
python3Packages.buildPythonApplication {
pname = "ranger";
version = "1.9.3-unstable-2025-06-04";
version = "1.9.3-unstable-2025-08-03";
format = "setuptools";
src = fetchFromGitHub {
owner = "ranger";
repo = "ranger";
rev = "7e38143eaa91c82bed8f309aa167b1e6f2607576";
hash = "sha256-O0DjecncpN+Bv8Ng+keuvU9iVtWAV4a50p959pMvkww=";
rev = "760fb03dccdfaeb2e08f3a7f4f867f913af2d74f";
hash = "sha256-lnnJz4/xtJZhxOPfJqZq/o7ke9DpaLCcr5dh2M2AbGg=";
};
LC_ALL = "en_US.UTF-8";
pkgs/by-name/se/seamly2d/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation rec {
pname = "seamly2d";
version = "2025.7.21.216";
version = "2025.8.4.217";
src = fetchFromGitHub {
owner = "FashionFreedom";
repo = "Seamly2D";
tag = "v${version}";
hash = "sha256-rS+2dwRx5tZySfjSHOmr/PJxJntjcwbM9O99dCsMgnI=";
hash = "sha256-PaGYpGZJGXPXJdfkS0siXGKxhSSdGCzDxAYdGv/lPvA=";
};
buildInputs = [
pkgs/by-name/sm/smpmgr/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "smpmgr";
version = "0.13.0";
version = "0.13.1";
pyproject = true;
src = fetchFromGitHub {
owner = "intercreate";
repo = "smpmgr";
tag = version;
hash = "sha256-7EzJaHVAqXDlVNHzXzk4P+Oj0BzXZB7tGv7tCeYekuM=";
hash = "sha256-1m1cuPrQqZl392l1lN5XIKZN2qUhJvv9gCMnELEtoUA=";
};
build-system = with python3Packages; [
pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "sqlite3-to-mysql";
version = "2.4.1";
version = "2.4.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "techouse";
repo = "sqlite3-to-mysql";
tag = "v${version}";
hash = "sha256-sX70CmNt4mhZSyzh1x/FEovMpjiJMLFIfxgVIS9CuMY=";
hash = "sha256-wyUJW7G92O3jnwSL5zFy/k/jI6c1H23xYcq7S8wAmsc=";
};
build-system = with python3Packages; [
pkgs/by-name/te/temporal/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "temporal";
version = "1.28.0";
version = "1.28.1";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-LH6utz2SCupF0juXVL+NFO/DQ+inQbOYSyoyTMl5a+w=";
hash = "sha256-I1Xh9F9c/h6GZxyE75Q3WN7BPN79QuKlB0XKR30vuwg=";
};
vendorHash = "sha256-ycS7uXXNQ6NHuiL796Chc4G2TVNgovn2sXn3k1Ls87Y=";
vendorHash = "sha256-T90mj+EVqlHJVGaUOGwD8acHTbYH6g8NEzKGFwjKu4M=";
excludedPackages = [ "./build" ];
pkgs/by-name/ti/tinymist/package.nix
+3 -3
View File
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.13.20";
version = "0.13.22";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
tag = "v${finalAttrs.version}";
hash = "sha256-XMOh7dYOyYPwzhf3+g2CeuZZ3nNr9ku3XO9V+WK0JHk=";
hash = "sha256-OLFffYjgo+go6fEQNM2TVdZL9cHVuA8Tgv73a3ex3JM=";
};
cargoHash = "sha256-FRiN2xEI1JOXW4dFgCqvQ4aG1oAfQTPDFG0blkM35NQ=";
cargoHash = "sha256-IyGYBbb8ilK+8fsFAm1N2A0Cw0qrbTqG20TgQs+1yaA=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ty/ty/package.nix
+3 -3
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.1-alpha.16";
version = "0.0.1-alpha.17";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-hpDzl1TJRCfr5l76HwK90WAbAgeDR48eRNs9knj87lk=";
hash = "sha256-JcUsppjlY0p0jJd+bsvKJwnP2yrjFoRybhipNXGWLsk=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
cargoHash = "sha256-/SoF87aZHypzEsetgmALmNTheEH/CodZEPW2I5+F/a4=";
cargoHash = "sha256-IVR33Bgnv4YGElqV5ccJ2961XbLSBMEEQdtJAUhc9Ew=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ve/veloren/package.nix
+2 -3
View File
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage {
env = {
# Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264
RUSTC_BOOTSTRAP = true;
RUSTC_BREAK_ON_ICE = true;
# Set version info, required by veloren-common
NIX_GIT_TAG = "v${version}";
@@ -94,8 +93,8 @@ rustPlatform.buildRustPackage {
postInstall = ''
# Icons
install -Dm644 assets/voxygen/net.veloren.veloren.desktop -t "$out/share/applications"
install -Dm644 assets/voxygen/net.veloren.veloren.png "$out/share/pixmaps"
install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml "$out/share/metainfo"
install -Dm644 assets/voxygen/net.veloren.veloren.png -t "$out/share/pixmaps"
install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml -t "$out/share/metainfo"
# Assets directory
mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/"
'';
pkgs/by-name/vo/vopono/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "vopono";
version = "0.10.13";
version = "0.10.14";
src = fetchCrate {
inherit pname version;
hash = "sha256-xcxOdQyTNpC8Jhy8sE4AZPoFYTd/1gGdwMjc2W4S8Jc=";
hash = "sha256-EfbRSQtJA2ktpFzWnJWbUFLajdpaDdbpKeOykrorl2Q=";
};
cargoHash = "sha256-ZDnSI30pVyvBcVe8Yeug42LxPcdVK1axeBWcpaaXYJQ=";
cargoHash = "sha256-j7KFlFaxgXvrEzuknBTzfYgU1S57YhvVXkP73u888rc=";
meta = with lib; {
description = "Run applications through VPN connections in network namespaces";
pkgs/by-name/xp/xpipe/package.nix
+2 -2
View File
@@ -39,7 +39,7 @@ let
hash =
{
x86_64-linux = "sha256-LMScG1cbcvMuMcb+R5lFU3eXsVWJ5ApMBtFi69OjyRs=";
x86_64-linux = "sha256-r6vrE3rdFFYIQDCxLn/K/IEQZMWi6ic7Hsa3jGQnlhU=";
}
.${system} or throwSystem;
@@ -48,7 +48,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "xpipe";
version = "17.3";
version = "17.4";
src = fetchzip {
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
pkgs/by-name/xr/xray/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "xray";
version = "25.7.26";
version = "25.8.3";
src = fetchFromGitHub {
owner = "XTLS";
repo = "Xray-core";
rev = "v${version}";
hash = "sha256-oPB4OngMDUk+HURDoUhIZ6SGQ0gII740PjgjP2fUK/k=";
hash = "sha256-6BzAp0vm8OkthX1s8xfneX3BkAuXpCtLmGn8yqcRLA8=";
};
vendorHash = "sha256-AmY9q0I0S7Xki9mgCJn/nV4Y9Ra6MDgnma2iPnoWQhg=";
pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
+1
View File
@@ -29,6 +29,7 @@ prevAttrs: {
'';
postFixup = prevAttrs.postFixup or "" + ''
mv "''${!outputDev}/share" "''${!outputDev}/lib"
moveToOutput lib/stubs "$stubs"
ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"
pkgs/development/libraries/mesa/common.nix
+2 -2
View File
@@ -5,14 +5,14 @@
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
rec {
pname = "mesa";
version = "25.1.7";
version = "25.2.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
hash = "sha256-dseMHUifLsszSAGCaZwgOwhj0/yfbRlBVVHQz25NdjY=";
hash = "sha256-is5CWcyC0O4Jn08makxowDAiloxYJmMrfuxecu12fyQ=";
};
meta = {
pkgs/development/libraries/mesa/default.nix
+49 -74
View File
@@ -26,6 +26,7 @@
ninja,
pkg-config,
python3Packages,
runCommand,
rust-bindgen,
rust-cbindgen,
rustPlatform,
@@ -44,41 +45,43 @@
enablePatentEncumberedCodecs ? true,
withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light,
# We enable as many drivers as possible here, to build cross tools
# and support emulation use cases (emulated x86_64 on aarch64, etc)
galliumDrivers ? [
"asahi" # Apple AGX, built on non-aarch64 for cross tools
"asahi" # Apple AGX
"crocus" # Intel legacy
"d3d12" # WSL emulated GPU (aka Dozen)
"etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
"freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
"i915" # Intel extra legacy
"iris" # new Intel (Broadwell+)
"lima" # ARM Mali 4xx
"llvmpipe" # software renderer
"nouveau" # Nvidia
"panfrost" # ARM Mali Midgard and up (T/G series), built on non-ARM for cross tools
"panfrost" # ARM Mali Midgard and up (T/G series)
"r300" # very old AMD
"r600" # less old AMD
"radeonsi" # new AMD (GCN+)
"softpipe" # older software renderer
"svga" # VMWare virtualized GPU
"virgl" # QEMU virtualized GPU (aka VirGL)
"zink" # generic OpenGL over Vulkan, experimental
]
++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [
"etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
"freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
"lima" # ARM Mali 4xx
"vc4" # Broadcom VC4 (Raspberry Pi 0-3)
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
"tegra" # Nvidia Tegra SoCs
"v3d" # Broadcom VC5 (Raspberry Pi 4)
]
++ lib.optionals stdenv.hostPlatform.isx86 [
"crocus" # Intel legacy, x86 only
"i915" # Intel extra legacy, x86 only
"vc4" # Broadcom VC4 (Raspberry Pi 0-3)
"virgl" # QEMU virtualized GPU (aka VirGL)
"zink" # generic OpenGL over Vulkan, experimental
],
vulkanDrivers ? [
"amd" # AMD (aka RADV)
"asahi" # Apple AGX, built on non-aarch64 for cross tools
"asahi" # Apple AGX
"broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
"freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
"gfxstream" # Android virtualized GPU
"imagination-experimental" # PowerVR Rogue (currently N/A)
"intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
"intel" # new Intel (aka ANV)
"microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
"nouveau" # Nouveau (aka NVK)
"panfrost" # ARM Mali Midgard and up (T/G series)
"swrast" # software renderer (aka Lavapipe)
]
++
@@ -88,16 +91,7 @@
# QEMU virtualized GPU (aka VirGL)
# Requires ATOMIC_INT_LOCK_FREE == 2.
"virtio"
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
"broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
"freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
"imagination-experimental" # PowerVR Rogue (currently N/A)
"panfrost" # ARM Mali Midgard and up (T/G series)
]
++ lib.optionals stdenv.hostPlatform.isx86 [
"intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
],
],
eglPlatforms ? [
"x11"
"wayland"
@@ -115,41 +109,28 @@
}:
let
rustDeps = [
{
pname = "paste";
version = "1.0.14";
hash = "sha256-+J1h7New5MEclUBvwDQtTYJCHKKqAEOeQkuKy+g0vEc=";
}
{
pname = "proc-macro2";
version = "1.0.86";
hash = "sha256-9fYAlWRGVIwPp8OKX7Id84Kjt8OoN2cANJ/D9ZOUUZE=";
}
{
pname = "quote";
version = "1.0.33";
hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY=";
}
{
pname = "syn";
version = "2.0.68";
hash = "sha256-nGLBbxR0DFBpsXMngXdegTm/o13FBS6QsM7TwxHXbgQ=";
}
{
pname = "unicode-ident";
version = "1.0.12";
hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8=";
}
rustDeps = lib.importJSON ./wraps.json;
fetchDep =
dep:
fetchCrate {
inherit (dep) pname version hash;
unpack = false;
};
toCommand = dep: "ln -s ${dep} $out/${dep.pname}-${dep.version}.tar.gz";
packageCacheCommand = lib.pipe rustDeps [
(builtins.map fetchDep)
(builtins.map toCommand)
(lib.concatStringsSep "\n")
];
copyRustDep = dep: ''
cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version}
cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/
packageCache = runCommand "mesa-rust-package-cache" { } ''
mkdir -p $out
${packageCacheCommand}
'';
copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps);
needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
common = import ./common.nix { inherit lib fetchFromGitLab; };
@@ -175,8 +156,6 @@ stdenv.mkDerivation {
exit 42
fi
done
${copyRustDeps}
'';
outputs = [
@@ -209,6 +188,8 @@ stdenv.mkDerivation {
PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH
'';
env.MESON_PACKAGE_CACHE_DIR = packageCache;
mesonFlags = [
"--sysconfdir=/etc"
@@ -223,13 +204,6 @@ stdenv.mkDerivation {
(lib.mesonEnable "gbm" true)
(lib.mesonBool "libgbm-external" true)
(lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
# Only used by xf86-video-vmware, which has more features than VMWare's KMS driver,
# so we're keeping it for now. Should be removed when that's no longer the case.
# See: https://github.com/NixOS/nixpkgs/pull/392492
(lib.mesonEnable "gallium-xa" true)
(lib.mesonBool "teflon" true) # TensorFlow frontend
# Enable all freedreno kernel mode drivers. (For example, virtio can be
@@ -237,9 +211,6 @@ stdenv.mkDerivation {
# is ignored when freedreno is not being built.
(lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl")
# Enable Intel RT stuff when available
(lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
# Required for OpenCL
(lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")
@@ -247,15 +218,19 @@ stdenv.mkDerivation {
(lib.mesonBool "gallium-rusticl" true)
(lib.mesonOption "gallium-rusticl-enable-drivers" "auto")
# meson auto_features enables this, but we do not want it
(lib.mesonEnable "android-libbacktrace" false)
(lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
# Enable more sensors in gallium-hud
(lib.mesonBool "gallium-extra-hud" true)
# Disable valgrind on targets where it's not available
(lib.mesonEnable "valgrind" withValgrind)
# Enable Intel RT stuff when available
(lib.mesonEnable "intel-rt" (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64))
# meson auto_features enables these, but we do not want them
(lib.mesonEnable "gallium-mediafoundation" false) # Windows only
(lib.mesonEnable "android-libbacktrace" false) # Android only
(lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
]
++ lib.optionals enablePatentEncumberedCodecs [
(lib.mesonOption "video-codecs" "all")
pkgs/development/libraries/mesa/opencl.patch
+10 -23
View File
@@ -1,23 +1,23 @@
diff --git a/meson.build b/meson.build
index c150bff74ff..37fa7f0531b 100644
index 393f3ac1b93..fbc90b5645e 100644
--- a/meson.build
+++ b/meson.build
@@ -1850,7 +1850,7 @@ endif
@@ -1836,7 +1836,7 @@ endif
dep_clang = null_dep
if with_clc or with_gallium_clover
if with_clc
- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
+ llvm_libdir = get_option('clang-libdir')
dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
diff --git a/meson_options.txt b/meson_options.txt
index 82324617884..4bde97a8568 100644
diff --git a/meson.options b/meson.options
index b1cdb06fcc9..3e8861979ae 100644
--- a/meson.options
+++ b/meson.options
@@ -738,3 +738,10 @@ option(
'none', 'dri2'
],
@@ -856,3 +856,10 @@ option(
value : false,
description : 'Build virtgpu_kumquat (only useful with gfxstream currently)'
)
+
+option(
@@ -26,24 +26,11 @@ index 82324617884..4bde97a8568 100644
+ value : '',
+ description : 'Locations to search for clang libraries.'
+)
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index ab2c83556a8..a59e88e122f 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -56,7 +56,7 @@ if with_opencl_icd
configuration : _config,
input : 'mesa.icd.in',
output : 'mesa.icd',
- install : true,
+ install : false,
install_tag : 'runtime',
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
)
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
index 35833dc7423..41a95927cab 100644
index 2b214adbbf5..7f919397ad5 100644
--- a/src/gallium/targets/rusticl/meson.build
+++ b/src/gallium/targets/rusticl/meson.build
@@ -63,7 +63,7 @@ configure_file(
@@ -64,7 +64,7 @@ configure_file(
configuration : _config,
input : 'rusticl.icd.in',
output : 'rusticl.icd',
pkgs/development/libraries/mesa/update-wraps.py
+50
View File
@@ -0,0 +1,50 @@
import base64
import binascii
import configparser
import json
import pathlib
import sys
import urllib.parse
def to_sri(hash: str):
raw = binascii.unhexlify(hash)
b64 = base64.b64encode(raw).decode()
return f"sha256-{b64}"
def main(dir: str):
result = []
for file in (pathlib.Path(dir) / "subprojects").glob("*.wrap"):
name = file.stem
parser = configparser.ConfigParser()
_ = parser.read(file)
sections = parser.sections()
if "wrap-file" not in sections:
continue
url = parser.get("wrap-file", "source_url")
if "crates.io" not in url:
continue
parsed = urllib.parse.urlparse(url)
path = parsed.path.split("/")
assert path[4] == name
version = path[5]
hash = to_sri(parser.get("wrap-file", "source_hash"))
result.append({
"pname": name,
"version": version,
"hash": hash,
})
here = pathlib.Path(__file__).parent
with (here / "wraps.json").open("w") as fd:
json.dump(result, fd, indent=4)
_ = fd.write("\n")
if __name__ == '__main__':
main(*sys.argv[1:])
pkgs/development/libraries/mesa/wraps.json
+137
View File
@@ -0,0 +1,137 @@
[
{
"pname": "errno",
"version": "0.3.12",
"hash": "sha256-zqFO+TVeO+qwY3A6qdqxWv0l8GZ8NBMQweUnS7HQ2hg="
},
{
"pname": "quote",
"version": "1.0.35",
"hash": "sha256-KR7Jq179k0qvUDpkZsXVJRU10QjudHRyw5d8xazIaO8="
},
{
"pname": "pest",
"version": "2.8.0",
"hash": "sha256-GY23RTHVjHCjYcQiAe/efiWR6XbVGMr3ZipH3Fcg57Y="
},
{
"pname": "equivalent",
"version": "1.0.1",
"hash": "sha256-VEOAfW3/aTc9Qzq571N4rY31DKYpjK8V3m5S4kqvVNU="
},
{
"pname": "syn",
"version": "2.0.87",
"hash": "sha256-JapM40bQOm3NaN2LQBC8t05U5iyQxXPzlMRurpmroy0="
},
{
"pname": "remain",
"version": "0.2.12",
"hash": "sha256-GtXgESMMrSdNBTJGDFq2mCjqR651aBtCqEFmPv/695Q="
},
{
"pname": "unicode-ident",
"version": "1.0.12",
"hash": "sha256-M1S5rD+uH/Z1XLbbU2g622YWNPZ1V5Qt6k+s6+wP7ks="
},
{
"pname": "cfg-if",
"version": "1.0.0",
"hash": "sha256-uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0="
},
{
"pname": "bitflags",
"version": "2.9.1",
"hash": "sha256-G45WmF7GLRfpwQAdyJyI7NfcCOR+ul7Hwpx7Xu7N6Wc="
},
{
"pname": "pest_derive",
"version": "2.8.0",
"hash": "sha256-1yXZz9eeh9zMk0Gi7znRtvY1PWjEszwXf+u+GkAsl8U="
},
{
"pname": "rustc-hash",
"version": "2.1.1",
"hash": "sha256-NXcD1BNltLJ8WQ4+2R6rsbZj8HxMCECV5gy+1DYt/w0="
},
{
"pname": "ucd-trie",
"version": "0.1.6",
"hash": "sha256-7WRikv/IGI746k0eDgFQ+xWlwuEq2bj8GRrnqKfzxLk="
},
{
"pname": "indexmap",
"version": "2.2.6",
"hash": "sha256-Fo+3Fd2kchXjYJEsCWZJ0j1Yvzkqxi9zkZ6DF0XkDyY="
},
{
"pname": "paste",
"version": "1.0.14",
"hash": "sha256-3jFFrwgCTeqfqZFPOBoXuPxgNN+wDzqEAT9/9D8p7Uw="
},
{
"pname": "hashbrown",
"version": "0.14.1",
"hash": "sha256-ff2mKhL1Xa6uUBX4GwuuoUU5HLRSD4bCSPxhXXJkDRI="
},
{
"pname": "libc",
"version": "0.2.168",
"hash": "sha256-Wq6ymB4GBsoR15cY+LsBFk8dbtdQgBgtOr8Bfm0kS20="
},
{
"pname": "thiserror-impl",
"version": "2.0.11",
"hash": "sha256-Jq/BuuqKmJM37rUrbnKgOXgM5Fw+38ycW50RL+6xc8I="
},
{
"pname": "once_cell",
"version": "1.8.0",
"hash": "sha256-aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y="
},
{
"pname": "rustix",
"version": "1.0.7",
"hash": "sha256-xx6D1q/n/2SJDsa3HWppu4phCreM42SzNSh2u0yAEmY="
},
{
"pname": "pest_generator",
"version": "2.8.0",
"hash": "sha256-230Bcmvoq2arMvnfRnrosRSJBmhbvnXILR5l1/Wz+EE="
},
{
"pname": "thiserror",
"version": "2.0.11",
"hash": "sha256-1FLyhLc+bXbdNnWKDIaEsdW+MfkridB/1YIhdXMiBvw="
},
{
"pname": "proc-macro2",
"version": "1.0.86",
"hash": "sha256-XnGejfZl3w0cj7/SOAFXRHNhUdREXsCDa45iiq4QO3c="
},
{
"pname": "zerocopy",
"version": "0.8.13",
"hash": "sha256-Z5FKtFHzv9Lmnl6dLvOFhITnB01j8gT9Fm7DkbVN4h0="
},
{
"pname": "roxmltree",
"version": "0.20.0",
"hash": "sha256-bCC2eTtcL6ZVOyUBVLeNbQ2zfnJwCuNfrZOHpG9IfJc="
},
{
"pname": "zerocopy-derive",
"version": "0.8.13",
"hash": "sha256-eYjXOkMDyiid8DMWvEkOk0rM83Gva8dFOTzzwsXE8l0="
},
{
"pname": "pest_meta",
"version": "2.8.0",
"hash": "sha256-f5+DJHBJSQbR/KUyn4q1eRzGC+sjDHSBXf9UHL0rXKA="
},
{
"pname": "log",
"version": "0.4.27",
"hash": "sha256-E9wt81HjICeDof4NRDdfcpX/tASSZ7DzAYNG3BIqHZQ="
}
]
pkgs/development/php-packages/apcu/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
}:
let
version = "5.1.24";
version = "5.1.26";
in
buildPecl {
inherit version;
@@ -16,7 +16,7 @@ buildPecl {
owner = "krakjoe";
repo = "apcu";
rev = "v${version}";
sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo=";
sha256 = "sha256-zJTrFckl7caKAF5/IL9RpVhbwsFZiol6w2GVpNdDdPg=";
};
buildInputs = [ pcre2 ];
pkgs/development/python-modules/anthropic/default.nix
+6
View File
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
stdenv,
# build-system
hatch-fancy-pypi-readme,
@@ -80,6 +81,11 @@ buildPythonPackage rec {
disabledTests = [
# Test require network access
"test_copy_build_request"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Hangs
# https://github.com/anthropics/anthropic-sdk-python/issues/1008
"test_get_platform"
];
disabledTestPaths = [
pkgs/development/python-modules/apprise/default.nix
+2 -2
View File
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.9.3";
version = "1.9.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9YNmfqNbiJnNRjGMbLJvD69qRgWxGRdMJSOgElkMZaY=";
hash = "sha256-SDEiruGaiaewdezUjvEa4315dE9660ULz5hammwoyYg=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/development/python-modules/awscrt/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.27.4";
version = "0.27.5";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-yyPLdnyi48AAfImbKJ1mjSiusFVTTfNadBhHE19s2Rw=";
hash = "sha256-2TYEuzld19s3aWvLtHDtK9E/cgSExsTJ9GzzpoIF9xk=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.40.0";
version = "1.40.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-rMdc3VGb1sBtx5xT/GvU/+L3L34uN0rpysEGsfi6XuE=";
hash = "sha256-0IyFSdOam+ft9PRs6j2IdzPWI9CexUHwocbiOgZXLuE=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/dvc-studio-client/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "dvc-studio-client";
version = "0.21.0";
version = "0.22.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc-studio-client";
tag = version;
hash = "sha256-SCRMBZKOt8JtDi5aGgk6TCxetvG3QU1jOv6U5/6ChTE=";
hash = "sha256-pMjLbtsUD0fj4OcJI8FufQRYe7HJ0S8z1jYK0Ri7uWA=";
};
build-system = [ setuptools-scm ];
@@ -41,7 +41,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to post data from DVC/DVCLive to Iterative Studio";
homepage = "https://github.com/iterative/dvc-studio-client";
changelog = "https://github.com/iterative/dvc-studio-client/releases/tag/${version}";
changelog = "https://github.com/iterative/dvc-studio-client/releases/tag/${src.tag}";
license = licenses.asl20;
maintainers = with maintainers; [ melling ];
};
pkgs/development/python-modules/enterpriseattack/default.nix
+8 -7
View File
@@ -2,27 +2,28 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
requests,
setuptools,
setuptools-scm,
ujson,
}:
buildPythonPackage rec {
pname = "enterpriseattack";
version = "0.1.8";
version = "1.0.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "xakepnz";
repo = "enterpriseattack";
tag = "v.${version}";
hash = "sha256-cxbGc9iQe94Th6MSUldI17oVCclFhUM78h1w+6KXzm4=";
tag = "v${version}";
hash = "sha256-9tEJVz6eO02/iwOHIjhcASfSd2t2W06JGzxSqepUYjk=";
};
build-system = [ setuptools ];
build-system = [
setuptools
setuptools-scm
];
dependencies = [
requests
pkgs/development/python-modules/essentials-openapi/default.nix
+2 -2
View File
@@ -18,14 +18,14 @@
}:
buildPythonPackage rec {
pname = "essentials-openapi";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Neoteroi";
repo = "essentials-openapi";
tag = "v${version}";
hash = "sha256-aag66YafLDSLBcXyRNcTyiqf3U4hx2gjimxhKVns/zc=";
hash = "sha256-HckCdDQ7wNg+uHLwAaoBIxg2cfubkcFC1mhviOeFdDg=";
};
nativeBuildInputs = [ hatchling ];
pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+4 -5
View File
@@ -5,24 +5,23 @@
marshmallow,
packaging,
pytestCheckHook,
pythonOlder,
setuptools,
validators,
}:
buildPythonPackage rec {
pname = "faraday-agent-parameters-types";
version = "1.8.0";
version = "1.8.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "faraday_agent_parameters_types";
inherit version;
hash = "sha256-ZyTaQN6T+F8QKPuTfGcEtdKM/2hvtekghG4UwtER02A=";
hash = "sha256-o4N1op+beeoM0GGtcQGWNfFt6SMDohiNnOyD8lWzuk0=";
};
pythonRelaxDeps = [ "validators" ];
postPatch = ''
substituteInPlace setup.py \
--replace-warn '"pytest-runner",' ""
pkgs/development/python-modules/faraday-plugins/default.nix
+4 -5
View File
@@ -8,9 +8,9 @@
html2text,
lxml,
markdown,
pandas,
pytestCheckHook,
python-dateutil,
pythonOlder,
pytz,
requests,
setuptools,
@@ -21,16 +21,14 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.24.1";
version = "1.25.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_plugins";
tag = version;
hash = "sha256-CTBEerFfqE9zRTe6l7IDKXOP+WVEPYdNMuMk2PBkkdw=";
hash = "sha256-VkpwTHPpM1cS5HT5zE3gB25zWOTIVaZdPKNgQFJHO/Q=";
};
postPatch = ''
@@ -47,6 +45,7 @@ buildPythonPackage rec {
html2text
lxml
markdown
pandas
python-dateutil
pytz
requests
pkgs/development/python-modules/gftools/default.nix
+2 -2
View File
@@ -62,14 +62,14 @@ let
in
buildPythonPackage rec {
pname = "gftools";
version = "0.9.87";
version = "0.9.88";
pyproject = true;
src = fetchFromGitHub {
owner = "googlefonts";
repo = "gftools";
tag = "v${version}";
hash = "sha256-xHgF4+wyoM3IAehdtIaDNpx7HpfwKDt0CVYGUvMKvDY=";
hash = "sha256-eCMjxqMxJ2xzPyLHoby0gmrcJVTECzUZmLywpKarDXI=";
};
postPatch = ''
pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-network-connectivity";
version = "2.8.1";
version = "2.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "google_cloud_network_connectivity";
hash = "sha256-U8czLn5ttFuJ2VynJ0R/fJlK9r0zC43qpP1aU8coorA=";
hash = "sha256-oIB9RPDCs90QBuujdkbM6QIi9NEj6ray6Nkp5MyDHrU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/hf-xet/default.nix
+3 -3
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "hf-xet";
version = "1.1.5";
version = "1.1.7";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "xet-core";
tag = "v${version}";
hash = "sha256-udjZcXTH+Mc4Gvj6bSPv1xi4MyXrLeCYav+7CzKWyhY=";
hash = "sha256-jOw9ltijM4KB3MyJ5z3XpIpNc2D9DVEP3CyyT6r8xlY=";
};
sourceRoot = "${src.name}/hf_xet";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src
sourceRoot
;
hash = "sha256-PTzYubJHFvhq6T3314R4aqBAJlwehOqF7SbpLu4Jo6E=";
hash = "sha256-WoMs7GeELuhZitv59aD6X43wiscSFMKKW7mYxaPZ/mQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/langgraph-checkpoint/default.nix
+6
View File
@@ -57,6 +57,12 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# assert 1.0000000000000004 == 1.0000000000000002
# https://github.com/langchain-ai/langgraph/issues/5845
"test_embed_with_path"
];
passthru.updateScript = gitUpdater {
rev-prefix = "checkpoint==";
};
pkgs/development/python-modules/lightning-utilities/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "lightning-utilities";
version = "0.15.1";
version = "0.15.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "utilities";
tag = "v${version}";
hash = "sha256-GQVd81PHtAY9nr+YSVQli91AxbXSQFH0IALcZBMiu5o=";
hash = "sha256-0unIL5jylunxTJxFTN+Q4aCFtD5zIHRNWEAWSbw+Fsk=";
};
postPatch = ''
pkgs/development/python-modules/llama-cloud-services/default.nix
+6 -4
View File
@@ -8,7 +8,7 @@
llama-cloud,
llama-index-core,
platformdirs,
poetry-core,
hatchling,
pydantic,
pytest-asyncio,
pytestCheckHook,
@@ -17,19 +17,21 @@
buildPythonPackage rec {
pname = "llama-cloud-services";
version = "0.6.53";
version = "0.6.54";
pyproject = true;
src = fetchFromGitHub {
owner = "run-llama";
repo = "llama_cloud_services";
tag = "v${version}";
hash = "sha256-b64yOpjOrcV+6isCVo3CQ/pbzrG8GBZe1rvBiUIJ+Y8=";
hash = "sha256-bTJkpMWuQzlsooOXUBNhMvPgYH0h4NvA8uOW6Mg6q8s=";
};
sourceRoot = "${src.name}/py";
pythonRelaxDeps = [ "llama-cloud" ];
build-system = [ poetry-core ];
build-system = [ hatchling ];
dependencies = [
click
pkgs/development/python-modules/llama-parse/default.nix
+5 -10
View File
@@ -3,28 +3,23 @@
buildPythonPackage,
fetchPypi,
llama-cloud-services,
poetry-core,
pythonOlder,
hatchling,
}:
buildPythonPackage rec {
pname = "llama-parse";
version = "0.6.46";
version = "0.6.54";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "llama_parse";
inherit version;
hash = "sha256-YFQ/90Es+9JwNSLlmtuJE+2pZr5+keOVvxFNY1T05e8=";
hash = "sha256-xwezEVIVXJuuhOMW+reQu8jIX02IJc5e44br632yWPE=";
};
build-system = [ poetry-core ];
build-system = [ hatchling ];
dependencies = [
llama-cloud-services
];
dependencies = [ llama-cloud-services ];
pythonImportsCheck = [ "llama_parse" ];
pkgs/development/python-modules/llm-anthropic/default.nix
+3 -3
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "llm-anthropic";
version = "0.17";
version = "0.18";
pyproject = true;
src = fetchFromGitHub {
owner = "simonw";
repo = "llm-anthropic";
tag = version;
hash = "sha256-2fatBKZMttC5flzfC7MWCpduc3m6IOVWZiW1K2dYqis=";
hash = "sha256-eyB68wPc4ALnEypUXN20ru7UfS6yKLp2NJohH3Av9Ls=";
};
build-system = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
meta = {
description = "LLM access to models by Anthropic, including the Claude series";
homepage = "https://github.com/simonw/llm-anthropic";
changelog = "https://github.com/simonw/llm-anthropic/releases/tag/${version}/CHANGELOG.md";
changelog = "https://github.com/simonw/llm-anthropic/releases/tag/${src.tag}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ aos ];
};
pkgs/development/python-modules/mypy-boto3/default.nix
+18 -18
View File
@@ -58,8 +58,8 @@ rec {
"sha256-E2wUtUSMX4Lyj+HioQD6km3sGGETjgzujJbEewOHc5M=";
mypy-boto3-acm-pca =
buildMypyBoto3Package "acm-pca" "1.40.0"
"sha256-QuPE++0Y/KxuL8yNLyUGXWExZ4UqTnXhoi/RGavS4AE=";
buildMypyBoto3Package "acm-pca" "1.40.1"
"sha256-GZMeU5qLmE7eM6zSuS3e63ytY8C1jlnjUVkJmAiAoCo=";
mypy-boto3-amp =
buildMypyBoto3Package "amp" "1.40.0"
@@ -146,8 +146,8 @@ rec {
"sha256-2oQp9Va82Feyyf7ZEz7wv+y4mOK3TpZ586qvzCZwK/E=";
mypy-boto3-auditmanager =
buildMypyBoto3Package "auditmanager" "1.40.0"
"sha256-ZA24MbNdmMcTygsXnfPg//NYdCh3THEs30DqP8f660A=";
buildMypyBoto3Package "auditmanager" "1.40.1"
"sha256-p8jnTJigD8QuLe3vjZwE7ZyGgBblpSdM0II0Cr/xFS8=";
mypy-boto3-autoscaling =
buildMypyBoto3Package "autoscaling" "1.40.0"
@@ -470,8 +470,8 @@ rec {
"sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
mypy-boto3-eks =
buildMypyBoto3Package "eks" "1.40.0"
"sha256-bfQxrWlOJQJVJ/pSyzdkaj5vN3tE8PbH2ioeJmEetpc=";
buildMypyBoto3Package "eks" "1.40.3"
"sha256-vkqLHrhHhU4CsvLez2MDUHWwlU91i4i+DVEs5TM3Rp8=";
mypy-boto3-elastic-inference =
buildMypyBoto3Package "elastic-inference" "1.36.0"
@@ -682,8 +682,8 @@ rec {
"sha256-E1l57KrYP3ggjLVj94kzBB85CFF7HtldUMHGZP7aUEo=";
mypy-boto3-iotsitewise =
buildMypyBoto3Package "iotsitewise" "1.40.0"
"sha256-0gyUqA8uLDn2hJeD+UrThCNCMLbWtu6EL7pyTu9P4WA=";
buildMypyBoto3Package "iotsitewise" "1.40.2"
"sha256-BXLPMwfbqcpaRnAuxrmG4pWUsVFHUW+foMvB1gh5Ye4=";
mypy-boto3-iotthingsgraph =
buildMypyBoto3Package "iotthingsgraph" "1.40.0"
@@ -802,8 +802,8 @@ rec {
"sha256-Skch80b9xDgcLwq2CGrS8xEhKZPEMJGT6qB9f0Z5XwY=";
mypy-boto3-lightsail =
buildMypyBoto3Package "lightsail" "1.40.0"
"sha256-uUQ1OmrXriVMWYxXneBusgAGW69GqWH+46NNesBVFus=";
buildMypyBoto3Package "lightsail" "1.40.1"
"sha256-1+1UINrLuBwQrBxgjLWI4xJF7GiQDiHI6OjB6Kkct+Y=";
mypy-boto3-location =
buildMypyBoto3Package "location" "1.40.0"
@@ -1086,8 +1086,8 @@ rec {
"sha256-1yLtNpzjAZzF2L87OvTsXN7VhwyQt3KA1YpRxPPjNG8=";
mypy-boto3-rds =
buildMypyBoto3Package "rds" "1.40.0"
"sha256-HjJ4R9cZKbxTWMOiehyIFQbmgFia8ASewDZdFHRCE20=";
buildMypyBoto3Package "rds" "1.40.3"
"sha256-SqXuOk/U9ux5cuzqazNit8ANMmnLimv1/xPYBxymN+Y=";
mypy-boto3-rds-data =
buildMypyBoto3Package "rds-data" "1.40.0"
@@ -1174,8 +1174,8 @@ rec {
"sha256-WRLXguy8jlRl+jw472aPmJXdcZg1mPZ/dfhETIVNLiU=";
mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.40.0"
"sha256-PqrAOf1Fyfqv1lHodtWSOqp4EACQ7OyGTEzNii5EoXc=";
buildMypyBoto3Package "sagemaker" "1.40.3"
"sha256-vElJCfM082uVc+dQZ7JXv+2eGOJJocUhl9rUPVKbMr0=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.0"
@@ -1222,8 +1222,8 @@ rec {
"sha256-9lCTZdXU/jJgcDutzvWhxFRV7UVOXwPzVzpQI8wXZkQ=";
mypy-boto3-securityhub =
buildMypyBoto3Package "securityhub" "1.40.0"
"sha256-GMplq6ieQG/dToRm88z/3wsDe9F2vn2uD9dqj+UO4v0=";
buildMypyBoto3Package "securityhub" "1.40.1"
"sha256-wNGHpSbcxVrb4UYCLDQHJKZ0+2qB7PKaBM9GSN9dF/k=";
mypy-boto3-securitylake =
buildMypyBoto3Package "securitylake" "1.40.0"
@@ -1286,8 +1286,8 @@ rec {
"sha256-7UFz5HOt4iKYrd25ODXrrs6OI4bMZbxS7uE++psmn5U=";
mypy-boto3-sns =
buildMypyBoto3Package "sns" "1.40.0"
"sha256-bK9q8bzKer0SmRJedJHJpK4o5SMkQalN3cVPnUG5Fp0=";
buildMypyBoto3Package "sns" "1.40.1"
"sha256-4G2J2xDIM2QJY2XGMKFE1Zyj4P22Y7vWtzvRgW0eU9s=";
mypy-boto3-sqs =
buildMypyBoto3Package "sqs" "1.40.0"
pkgs/development/python-modules/nixpkgs-updaters-library/default.nix
+9 -9
View File
@@ -9,18 +9,19 @@
# dependencies
aiohttp,
attrs,
frozendict,
inject,
joblib,
loguru,
nix,
nix-prefetch-git,
nonbloat-db,
nurl,
platformdirs,
pydantic,
typer,
# tests
writableTmpDirAsHomeHook,
pytestCheckHook,
aioresponses,
pytest-asyncio,
@@ -29,16 +30,16 @@
}:
buildPythonPackage rec {
pname = "nixpkgs-updaters-library";
version = "1.2.0";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.12";
disabled = pythonOlder "3.13";
src = fetchFromGitHub {
owner = "PerchunPak";
repo = "nixpkgs-updaters-library";
tag = "v${version}";
hash = "sha256-MCMqqAGl6OTOapC3K0DNTOmg2Lv2KqXenEgB5sIZR5U=";
hash = "sha256-0N88valEw+QElMjy84TBKGuqqh9anKhHdW0jQfQ4qd4=";
};
postPatch = ''
@@ -52,18 +53,17 @@ buildPythonPackage rec {
dependencies = [
aiohttp
attrs
frozendict
inject
joblib
loguru
nonbloat-db
platformdirs
pydantic
typer
nix-prefetch-git
nurl
];
nativeCheckInputs = [
writableTmpDirAsHomeHook
aioresponses
pytest-asyncio
pytest-cov-stub
pkgs/development/python-modules/onvif-zeep-async/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "onvif-zeep-async";
version = "4.0.1";
version = "4.0.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "openvideolibs";
repo = "python-onvif-zeep-async";
tag = "v${version}";
hash = "sha256-adEU/SAJac1sOCZS0xb64T41Eak7/uxh6aq2xKUgjZ4=";
hash = "sha256-1reP3BKfFh45L2WUrXS3e/DX22oZTMS6AwVlz6JHFAU=";
};
build-system = [ setuptools ];
@@ -42,7 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "ONVIF Client Implementation in Python";
homepage = "https://github.com/hunterjm/python-onvif-zeep-async";
changelog = "https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v${version}";
changelog = "https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "onvif-cli";
pkgs/development/python-modules/openai-agents/default.nix
+2 -2
View File
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "openai-agents";
version = "0.2.3";
version = "0.2.4";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "openai_agents";
hash = "sha256-ldStGUxcDPGkADjLcB7ujs2q92mNh7sT48LFz/gMS00=";
hash = "sha256-B7fXWbkphGBhaeuqLCTlVfHJPduJfXLyND8s6feEc+Y=";
};
build-system = [
pkgs/development/python-modules/openai/default.nix
+2 -2
View File
@@ -51,14 +51,14 @@
buildPythonPackage rec {
pname = "openai";
version = "1.99.0";
version = "1.99.1";
pyproject = true;
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
tag = "v${version}";
hash = "sha256-MpGIK9ERp6ZIkHdnjMTO7Rzh/2p2i4Wq6HjEc8pTJIU=";
hash = "sha256-TFzLfCT71BSbKg7LSqpFAsutKYAeQ6ALy7AE4ldeHr8=";
};
postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';

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