From 647c61580d428df2addd1552b568d8f5227156e8 Mon Sep 17 00:00:00 2001 From: L-Nafaryus Date: Fri, 11 Oct 2024 16:12:15 +0500 Subject: [PATCH] hydraJobs: exclude inscure and unfree packages flake: update lock --- flake.lock | 129 ++++++++++-------- flake.nix | 3 +- lib/default.nix | 2 + .../catarina/services/radio.nix | 1 + 4 files changed, 77 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 7e08858..238355c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1727353582, - "narHash": "sha256-2csMEEOZhvowVKZNBHk1kMJqk72ZMrPj9LQYCzP6EKs=", + "lastModified": 1728429239, + "narHash": "sha256-k1KRRgmfKNhO9eU55FMkkzkneqAlwz5oLC5NSiEfGxs=", "owner": "rustsec", "repo": "advisory-db", - "rev": "cb905e6e405834bdff1eb1e20c9b10edb5403889", + "rev": "acb7ce45817b13dd34cb32540ff18be4e1f3ba09", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1727303518, - "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", "owner": "Aylur", "repo": "ags", - "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "crane": { "locked": { - "lastModified": 1727824512, - "narHash": "sha256-DvFQd58W20BEqh0BUt33eZhzPKBXGO/r9aiSFIVMaWU=", + "lastModified": 1728344376, + "narHash": "sha256-lxTce2XE6mfJH8Zk6yBbqsbu9/jpwdymbSH5cCbiVOA=", "owner": "ipetkov", "repo": "crane", - "rev": "a376dd1efac7bce448857c62961c6311be26cb09", + "rev": "fd86b78f5f35f712c72147427b1eb81a9bd55d0b", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "crane_2": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1728344376, + "narHash": "sha256-lxTce2XE6mfJH8Zk6yBbqsbu9/jpwdymbSH5cCbiVOA=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "fd86b78f5f35f712c72147427b1eb81a9bd55d0b", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1726523340, - "narHash": "sha256-Av5mdR2lAGUVdA6DJ8Anon3/FZg3DX4gl1Ff72rCpKU=", + "lastModified": 1728499310, + "narHash": "sha256-6qa+IU6PaQa/swQ9wRn4J1pFprundzruJiV0aTDou/Q=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b76c529f377100516c40c5b6e239a4525fdcabe0", + "rev": "586ff3bb752711bbf6d54475295f0da98ead5ee4", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1727850538, - "narHash": "sha256-nFqdD4P7aDANhEGG7pRbNVf7AYosK6XCpZhx25Nar1M=", + "lastModified": 1728643944, + "narHash": "sha256-LRlsDN/0aqEDlM0cHM5mW1FVBepvTBEsWPYijOqpTWM=", "ref": "refs/heads/master", - "rev": "79de647d2aa3ddfe70fa3450cc066b3ed6c717d7", - "revCount": 9, + "rev": "c707ca5a360242bf0ae27dd14f8c58b8624a00e5", + "revCount": 13, "type": "git", "url": "https://vcs.elnafo.ru/L-Nafaryus/elnafo-radio" }, @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1726986637, - "narHash": "sha256-webLScPFCax18Z2lQHhaWzqqQRvV2Y1lOADqUa7VQbU=", + "lastModified": 1728542061, + "narHash": "sha256-2YAnVU67qimQGO71rCBWcv7RrRK5gYgysXe3NVomuwQ=", "owner": "nix-community", "repo": "fenix", - "rev": "f5a9b01cd81b46228b3737669e8275b1f2da7d35", + "rev": "b135535125e24270dddddc8cfab455533492e4ad", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "rust-analyzer-src": [] }, "locked": { - "lastModified": 1727764514, - "narHash": "sha256-tvN9v5gTxLI5zOKsNvYl1aUxIitHm8Nj3vKdXNfJo50=", + "lastModified": 1728628307, + "narHash": "sha256-GRMRHZyU+R0RqKPFFgi7BBMDIRFPnHaAhOIxlqyvbZQ=", "owner": "nix-community", "repo": "fenix", - "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", + "rev": "b0a014d5b9dba793ebc205bcf12a93b5f6a4c66c", "type": "github" }, "original": { @@ -207,6 +207,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -305,11 +321,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728598744, + "narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e", "type": "github" }, "original": { @@ -368,7 +384,7 @@ "nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -390,11 +406,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -421,11 +437,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -466,11 +482,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1727843841, - "narHash": "sha256-iMjPPKQ/04D7okDwIo8aZjTn0KSirXq0civDpSnosDQ=", + "lastModified": 1728593423, + "narHash": "sha256-xM3+7mvWwM5i+RXD97wQ/fSoQDFidVxNszIfKIv9msE=", "owner": "nix-community", "repo": "nixvim", - "rev": "dfbd272170805486383433114a5ed66ec9e9f040", + "rev": "af650ba9401501352d6eaaced192bbb4abfaec87", "type": "github" }, "original": { @@ -488,11 +504,11 @@ ] }, "locked": { - "lastModified": 1727599661, - "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "lastModified": 1728513479, + "narHash": "sha256-yAR9M1jvuAoahYNxo3RNnPMcua1TAIPurFKmH2/g3lg=", "owner": "NuschtOS", "repo": "search", - "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "rev": "5cb7ef512ec20a5b7d60fc70dba014560559698a", "type": "github" }, "original": { @@ -544,6 +560,7 @@ }, "purescript-overlay": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "elnafo-radio", "dream2nix", @@ -552,11 +569,11 @@ "slimlock": "slimlock" }, "locked": { - "lastModified": 1696022621, - "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", + "lastModified": 1724504251, + "narHash": "sha256-TIw+sac0NX0FeAneud+sQZT+ql1G/WEb7/Vb436rUXM=", "owner": "thomashoneyman", "repo": "purescript-overlay", - "rev": "047c7933abd6da8aa239904422e22d190ce55ead", + "rev": "988b09676c2a0e6a46dfa3589aa6763c90476b8a", "type": "github" }, "original": { @@ -631,11 +648,11 @@ ] }, "locked": { - "lastModified": 1688610262, - "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", + "lastModified": 1688756706, + "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", "owner": "thomashoneyman", "repo": "slimlock", - "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", + "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", "type": "github" }, "original": { @@ -652,11 +669,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -724,11 +741,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1727585736, - "narHash": "sha256-vEkcyKdFpfWbrtZlB5DCjNCmI2GudIJuHstWo3F9gL8=", + "lastModified": 1728322634, + "narHash": "sha256-cUnwLCSc59Sx3E+meVlVUMfyROr0aToWPID7UA6PZvg=", "owner": "wez", "repo": "wezterm", - "rev": "a2f2c07a29f5c98f6736cde0c86b24887f9fd48a", + "rev": "ed430415ee69279ea692358525196ad7d4c965b8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7fddce6..042353c 100644 --- a/flake.nix +++ b/flake.nix @@ -91,8 +91,7 @@ nixosConfigurations = import ./nixosConfigurations {inherit lib inputs bonModules bonLib self;}; hydraJobs = { - # filter broken packages ? - packages = lib.filterAttrsRecursive (name: value: !bonLib.isBroken value) self.packages; + packages = lib.filterAttrsRecursive (name: value: !bonLib.isBroken value && !bonLib.isInsecure value && !bonLib.isUnfree value) self.packages; }; templates = { diff --git a/lib/default.nix b/lib/default.nix index 1541a20..871ba92 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -33,6 +33,8 @@ }); isBroken = derivation: derivation ? meta && derivation.meta ? broken && derivation.meta.broken; + isInsecure = derivation: derivation ? meta && derivation.meta ? insecure && derivation.meta.insecure; + isUnfree = derivation: derivation ? meta && derivation.meta ? unfree && derivation.meta.unfree; functionType = lib.types.mkOptionType { name = "function"; diff --git a/nixosConfigurations/catarina/services/radio.nix b/nixosConfigurations/catarina/services/radio.nix index 16b3c7c..a59d9f6 100644 --- a/nixosConfigurations/catarina/services/radio.nix +++ b/nixosConfigurations/catarina/services/radio.nix @@ -111,6 +111,7 @@ ["author" "L-Nafaryus"] ["discord" "https://discord.gg/ZWUChw5wzm"] ["git" "https://vcs.elnafo.ru/L-Nafaryus/elnafo-radio"] + ["matrix" "https://matrix.to/#/#elnafo:elnafo.ru"] ]; }; stations = [