From 1009efb436c36100bfcc5ad9597b106198fb6764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 30 Aug 2021 23:14:00 +0200 Subject: Remove libspf2 flake for stock one --- flakes/opendmarc/flake.lock | 39 --------------------------------------- flakes/opendmarc/flake.nix | 10 ++-------- 2 files changed, 2 insertions(+), 47 deletions(-) (limited to 'flakes/opendmarc') diff --git a/flakes/opendmarc/flake.lock b/flakes/opendmarc/flake.lock index 92551af..4503c79 100644 --- a/flakes/opendmarc/flake.lock +++ b/flakes/opendmarc/flake.lock @@ -15,44 +15,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1609246779, - "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "libspf2": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "flakes/libspf2", - "lastModified": 1629758991, - "narHash": "sha256-J0mMj/lPMR+QaqvAzUpOUWELYoyKCpI20T4YZHerAEs=", - "ref": "master", - "rev": "5e2ec9fb8628136e7f9f618c68c0e42ab086b80e", - "revCount": 866, - "type": "git", - "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" - }, - "original": { - "dir": "flakes/libspf2", - "type": "git", - "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" - } - }, "myuids": { "locked": { "dir": "flakes/myuids", @@ -88,7 +50,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "libspf2": "libspf2", "myuids": "myuids", "nixpkgs": "nixpkgs" } diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix index 469cf74..f1877b6 100644 --- a/flakes/opendmarc/flake.nix +++ b/flakes/opendmarc/flake.nix @@ -6,18 +6,12 @@ type = "git"; dir = "flakes/myuids"; }; - inputs.libspf2 = { - url = "https://git.immae.eu/perso/Immae/Config/Nix.git"; - type = "git"; - dir = "flakes/libspf2"; - inputs.nixpkgs.follows = "nixpkgs"; - }; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.nixpkgs.url = "github:NixOS/nixpkgs"; - outputs = { self, myuids, libspf2, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system: + outputs = { self, myuids, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system: let - pkgs = import nixpkgs { inherit system; overlays = [ libspf2.overlay ]; }; + pkgs = import nixpkgs { inherit system; overlays = []; }; in rec { packages.opendmarc = pkgs.callPackage ./. {}; defaultPackage = packages.opendmarc; -- cgit v1.2.3