From e13f9d7765c11b290336c76ddd99179a33e6bbf1 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Mon, 30 Sep 2024 12:23:04 -0700 Subject: [PATCH] Update nixPaths (#10) --- .github/workflows/build.yml | 6 +++--- ci.nix | 5 ++++- default.nix | 2 +- flake.lock | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e3fe3c..8308afb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,9 +34,9 @@ jobs: cachixName: - nginx nixPath: - - nixpkgs=channel:nixos-unstable - - nixpkgs=channel:nixpkgs-unstable - - nixpkgs=channel:nixos-23.05 + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixpkgs-unstable.tar.gz + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.05.tar.gz runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/ci.nix b/ci.nix index 22b1352..f84dd96 100644 --- a/ci.nix +++ b/ci.nix @@ -15,7 +15,10 @@ with builtins; let isReserved = n: n == "lib" || n == "overlays" || n == "modules"; isDerivation = p: isAttrs p && p ? type && p.type == "derivation"; - isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true; + isBuildable = p: let + licenseFromMeta = p.meta.license or []; + licenseList = if builtins.isList licenseFromMeta then licenseFromMeta else [licenseFromMeta]; + in !(p.meta.broken or false) && builtins.all (license: license.free or true) licenseList; isCacheable = p: !(p.preferLocalBuild or false); shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false; diff --git a/default.nix b/default.nix index a700ee1..4f7855d 100644 --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ { pkgs ? import { } }: { - # The `lib`, `modules`, and `overlay` names are special + # The `lib`, `modules`, and `overlays` names are special lib = import ./lib { inherit pkgs; }; # functions modules = import ./modules; # NixOS modules overlays = import ./overlays; # nixpkgs overlays diff --git a/flake.lock b/flake.lock index a804412..78cf35d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1624561540, - "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=", + "lastModified": 1712449641, + "narHash": "sha256-U9DDWMexN6o5Td2DznEgguh8TRIUnIl9levmit43GcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11", + "rev": "600b15aea1b36eeb43833a50b0e96579147099ff", "type": "github" }, "original": {