Move flake at top-level for it to work correctly

colis-anr · Apr 28, 2023 · 13bfeab · 13bfeab
1 parent 25852d4
commit 13bfeab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/nix/with-nixpkgs.nix → .nix/with-nixpkgs.nix b/.github/nix/with-nixpkgs.nix → .nix/with-nixpkgs.nix
@@ -4,9 +4,9 @@
     in {
       packages.with-nixpkgs = pkgs.stdenv.mkDerivation {
         name = "morbig";
-        ## NOTE: The use of `../..` matters because the path is taken as relative to
-        ## the current file, and therefore to `.github/nix/`.
-        src = ../..;
+        ## NOTE: The use of `./..` matters because the path is taken as relative to
+        ## the current file, and therefore to `.nix/`.
+        src = ./..;
 
         nativeBuildInputs = with opkgs; [
           ## Basic ones, always necessary

diff --git a/.github/nix/with-opam-nix.nix → .nix/with-opam-nix.nix b/.github/nix/with-opam-nix.nix → .nix/with-opam-nix.nix
@@ -1,10 +1,10 @@
 { ... }: {
   perSystem = { inputs', pkgs, ... }:
-    ## NOTE: The use of `../..` matters because the path is taken as relative to
-    ## the current file, and therefore to `.github/nix/`.
+    ## NOTE: The use of `./..` matters because the path is taken as relative to
+    ## the current file, and therefore to `.nix/`.
     let
       scope =
-        inputs'.opam-nix.lib.buildOpamProject { inherit pkgs; } "morbig" ../.. {
+        inputs'.opam-nix.lib.buildOpamProject { inherit pkgs; } "morbig" ./.. {
           ocaml-base-compiler = "*";
         };
     in { packages.with-opam-nix = scope.morbig // { inherit scope; }; };

diff --git a/.github/nix/flake.lock → flake.lock b/.github/nix/flake.lock → flake.lock
diff --git a/.github/nix/flake.nix → flake.nix b/.github/nix/flake.nix → flake.nix
@@ -16,8 +16,8 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        ./with-nixpkgs.nix
-        ./with-opam-nix.nix
+        .nix/with-nixpkgs.nix
+        .nix/with-opam-nix.nix
         inputs.pre-commit-hooks.flakeModule
       ];