fix NUR integration (hopefully)

This commit is contained in:
2024-07-15 00:17:59 +00:00
parent e8547cc849
commit 2ac9c2cb68
4 changed files with 27 additions and 9 deletions

View File

@@ -1,5 +1,7 @@
# Nix User Repository (NUR)
# - <https://github.com/nix-community/NUR>
# this file, as viewed by NUR consumers:
# - <https://nur.nix-community.org/repos/colinsane/>
#
# this file is not reachable from the top-level of my nixos configs (i.e. toplevel flake.nix)
# nor is it intended for anyone who wants to reference my config directly
@@ -29,7 +31,21 @@
{ pkgs ? import <nixpkgs> {} }:
let
sanePkgs = import ../../pkgs { inherit pkgs; };
sanePkgs = builtins.removeAttrs (import ../../pkgs { inherit pkgs; }).sane [
# XXX(2024-07-14): these packages fail NUR check, due to weird Import-From-Derivation things (bugs?).
# see: <https://github.com/NixOS/nix/issues/9052>
"linux-exynos5-mainline"
"linux-megous"
"linux-postmarketos-allwinner"
"linux-postmarketos-exynos5"
"mobile-nixos"
"nixpkgs"
"nixpkgs-staging"
"nixpkgs-next"
"nixpkgs-wayland"
"sops-nix"
"uninsane-dot-org"
];
in
({
overlays.pkgs = import ../../overlays/pkgs.nix;

View File

@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Libre SCP firmware for Allwinner sunxi SoCs";
homepage = "https://github.com/crust-firmware/crust";
license = with licenses; [ bsd3 gpl2Only mit ];
maintainers = with maintainers; [ colinsane noneucat ];
maintainers = with maintainers; [ colinsane ];
platforms = platforms.all;
};
})

View File

@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, fetchFromGitea
, fetchYarnDeps
, mkYarnModules
, nodejs
, zip
@@ -26,14 +27,15 @@ let
browserpass-extension-yarn-modules = mkYarnModules {
inherit version;
pname = "${pname}-modules";
packageJSON = ./package.json;
packageJSON = "${src}/src/package.json";
yarnLock = "${src}/src/yarn.lock";
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
# the following also works, but because it's IFD it's not allowed by some users, like NUR.
# packageJSON = "${src}/src/package.json";
# yarnLock = "${src}/src/yarn.lock";
hash = "sha256-JOmvjMGtnMn6YfwiMpaePO86O6/E5a1jvNQ9PloG8ec=";
};
};
in stdenv.mkDerivation {
inherit pname version src;
inherit pname src version;
nativeBuildInputs = [ nodejs zip ];

View File

@@ -2,7 +2,7 @@
NIX_FILES_TOP=/home/colin/nixos
cd $NIX_FILES_TOP/integrations/nur
# TODO: should include `-I nixpkgs=</path/to/an/unpatched/nixpkgs>`
NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa linux\* --meta --xml \
NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa \* --meta --xml \
--allowed-uris https://static.rust-lang.org \
--option restrict-eval true \
--option allow-import-from-derivation true \