From 66f9d079052557a97449e66568c6f5d13d89854f Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 14 Sep 2022 19:49:03 +0200 Subject: [PATCH] flakify complete --- flake.lock | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 6 ++-- 2 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e1a38d4 --- /dev/null +++ b/flake.lock @@ -0,0 +1,92 @@ +{ + "nodes": { + "affection-src": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1663174424, + "narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=", + "ref": "refs/heads/master", + "rev": "81a76d4eb34eaadee3585a2a1476db785858896c", + "revCount": 291, + "type": "git", + "url": "https://gitea.nek0.eu/nek0/affection" + }, + "original": { + "type": "git", + "url": "https://gitea.nek0.eu/nek0/affection" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1663173135, + "narHash": "sha256-QL4JZYUlbt0ex78w30XJ0h9idUMj0DBxppyDsoxEPjE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5d1ddac9493642d7311a064351e643de9a0e24ee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1663175074, + "narHash": "sha256-pmujinSiECRsgOWpGlKtTwPEtCv8Y7OYYHgfg/tYdJw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ee55809e3162f9157a7579b59d4b9caf6e931686", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "affection-src": "affection-src", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 4ff71dc..77d3069 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - affection.url = "git+https://gitea.nek0.eu/nek0/affection"; + affection-src.url = "git+https://gitea.nek0.eu/nek0/affection"; }; - outputs = { self, nixpkgs, flake-utils, affection }: + outputs = { self, nixpkgs, flake-utils, affection-src }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -21,7 +21,7 @@ in { packages.${packageName} = # (ref:haskell-package-def) haskellPackages.callCabal2nix packageName self rec { - affection = affection; + affection = affection-src.defaultPackage.${system}; }; defaultPackage = self.packages.${system}.${packageName};