yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'chore(deps): update nixpkgs digest to f21e454' (#3445) from renovate/nixpkgs-digest into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3445
This commit is contained in:
Mic92
2025-05-04 07:16:50 +00:00
parent 2d97119a3b d0ff114f6b
commit 6d75a5596e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -118,10 +118,10 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 315532800, "lastModified": 315532800,
"narHash": "sha256-+Elxpf3FLkgKfh81xrEjVolpJEn8+fKWqEJ3ZXbAbS4=", "narHash": "sha256-pxwYhAgOyComW58BCfboADZWr4b5oS8hP9E9fQ489HM=",
"rev": "29335f23bea5e34228349ea739f31ee79e267b88", "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre791229.29335f23bea5/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre793694.f21e4546e3ed/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",

7
pkgs/clan-cli/default.nix
View File

@@ -41,7 +41,12 @@ let
allDependencies = lib.importJSON ./clan_cli/nix/allowed-packages.json; allDependencies = lib.importJSON ./clan_cli/nix/allowed-packages.json;
generateRuntimeDependenciesMap = generateRuntimeDependenciesMap =
deps: deps:
lib.filterAttrs (_: pkg: !pkg.meta.unsupported or false) (lib.genAttrs deps (name: pkgs.${name})); lib.filterAttrs (
attr: pkg:
!pkg.meta.unsupported or false
# Currently fails to build because of swift
&& !(stdenv.hostPlatform.system == "aarch64-linux" && attr == "age-plugin-se")
) (lib.genAttrs deps (name: pkgs.${name}));
testRuntimeDependenciesMap = generateRuntimeDependenciesMap allDependencies; testRuntimeDependenciesMap = generateRuntimeDependenciesMap allDependencies;
testRuntimeDependencies = lib.attrValues testRuntimeDependenciesMap; testRuntimeDependencies = lib.attrValues testRuntimeDependenciesMap;
bundledRuntimeDependenciesMap = generateRuntimeDependenciesMap includedRuntimeDeps; bundledRuntimeDependenciesMap = generateRuntimeDependenciesMap includedRuntimeDeps;