flake.nix: init

vaibhavsagar · Feb 4, 2024 · b8a42e7 · b8a42e7
1 parent 1eb79ec
commit b8a42e7
Show file tree

Hide file tree

Showing 30 changed files with 229 additions and 115 deletions.
diff --git a/callcc/default.nix b/callcc/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/chart-diagrams/default.nix b/chart-diagrams/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/codensity/default.nix b/codensity/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/continuations/default.nix b/continuations/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/default.nix b/default.nix
@@ -1,33 +1,10 @@
-let
-  pkgs    = import ./pkgs.nix;
-  nixpkgs = import pkgs.nixpkgs {};
-  notebooks = map (folder: {
-    name = folder;
-    path = import (./. + "/${folder}");
-  });
-in nixpkgs.linkFarm "notebooks" (notebooks [
-  "callcc"
-  "chart-diagrams"
-  "codensity"
-  "continuations"
-  "deriving-via"
-  "docker"
-  "dragon-curve"
-  "efficient-combinator-parsers"
-  "git-from-scratch"
-  "graphviz"
-  "hamt"
-  "hs-updater"
-  "intmap"
-  "lambda"
-  "mph"
-  "refactoring-tarjan"
-  "revisiting-monadic-parsing-haskell"
-  "revisiting-poor-mans-concurrency"
-  "smt"
-  "solver"
-  "tarjan"
-  "trees-that-shrink"
-  "typeclasses"
-  "zulip-api"
-])
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).defaultNix
diff --git a/deriving-via/default.nix b/deriving-via/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/docker/default.nix b/docker/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
   NB_USER = "jovyan";
   NB_UID = "1000";

diff --git a/dragon-curve/default.nix b/dragon-curve/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/efficient-combinator-parsers/default.nix b/efficient-combinator-parsers/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,57 @@
+{
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.nix-filter.url = "github:numtide/nix-filter";
+  inputs.ihaskell.url = "github:IHaskell/IHaskell";
+  inputs.ihaskell.flake = false;
+  inputs.flake-compat.url = "github:edolstra/flake-compat";
+
+  nixConfig = {
+    extra-substituters = [
+      "https://ihaskell.cachix.org"
+      "https://vaibhavsagar.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "ihaskell.cachix.org-1:WoIvex/Ft/++sjYW3ntqPUL3jDGXIKDpX60pC8d5VLM="
+      "vaibhavsagar.cachix.org-1:PxFckJ8oAzgF4sdFJ855Fw38yCVbXmzJ98Cc6dGzcE0="
+    ];
+  };
+
+  outputs = {self, nixpkgs, flake-utils, nix-filter, ...}:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs { inherit system; };
+      notebook = folder: {
+        name = folder;
+        path = import (./. + "/${folder}") { inherit system; };
+      };
+      notebooks = map notebook [
+        "callcc"
+        "chart-diagrams"
+        "codensity"
+        "continuations"
+        "deriving-via"
+        "docker"
+        "dragon-curve"
+        "efficient-combinator-parsers"
+        "git-from-scratch"
+        "graphviz"
+        "hamt"
+        "hs-updater"
+        "intmap"
+        "lambda"
+        "mph"
+        "refactoring-tarjan"
+        "revisiting-monadic-parsing-haskell"
+        "revisiting-poor-mans-concurrency"
+        "smt"
+        "solver"
+        "tarjan"
+        "trees-that-shrink"
+        "typeclasses"
+        "zulip-api"
+      ];
+    in {
+      packages = builtins.listToAttrs (map (n: {name = n.name; value = n.path;}) notebooks);
+      defaultPackage = pkgs.linkFarm "notebooks" notebooks;
+    });
+}
diff --git a/git-from-scratch/default.nix b/git-from-scratch/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
   cleanSource = name: type: let
       baseName = baseNameOf (toString name);

diff --git a/graphviz/default.nix b/graphviz/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [ jupyterlab ];

diff --git a/hamt/default.nix b/hamt/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [jupyterlab];

diff --git a/hs-updater/default.nix b/hs-updater/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -13,7 +14,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [ jupyterlab ];

diff --git a/intmap/default.nix b/intmap/default.nix
@@ -1,3 +1,4 @@
+{ system ? builtins.currentSystem }:
 let
   pkgs = import ../pkgs.nix;
   overlay = sel: sup: {
@@ -12,7 +13,7 @@ let
       };
     };
   };
-  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
   jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
 in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   extraEnvironmentBinaries = [ jupyterlab ];