Switch to flake

NixOS · Feb 15, 2021 · 3755455 · 3755455
1 parent 2fb808f
commit 3755455
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 9 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -16,8 +16,16 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 
+    - name: Installing nixFlakes
+      run: |
+        nix-env -iA nixpkgs.nixFlakes
+        echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf
+        echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
+
     - name: Building planet.nixos.org
-      run: nix-shell --run "venus-planet planet.ini && ./fix.sh"
+      run: |
+        nix develop --command venus-planet planet.ini
+        nix develop --command ./fix.sh
 
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,8 +17,16 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 
+    - name: Installing nixFlakes
+      run: |
+        nix-env -iA nixpkgs.nixFlakes
+        echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf
+        echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
+
     - name: Building planet.nixos.org
-      run: nix-shell --run "venus-planet planet.ini && ./fix.sh"
+      run: |
+        nix develop --command venus-planet planet.ini
+        nix develop --command ./fix.sh
 
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.1

diff --git a/.github/workflows/pulls.yml b/.github/workflows/pulls.yml
@@ -15,8 +15,16 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 
+    - name: Installing nixFlakes
+      run: |
+        nix-env -iA nixpkgs.nixFlakes
+        echo 'experimental-features = nix-command flakes' | sudo tee -a /etc/nix/nix.conf
+        echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
+
     - name: Building planet.nixos.org
-      run: nix-shell --run "venus-planet planet.ini && ./fix.sh"
+      run: |
+        nix develop --command venus-planet planet.ini
+        nix develop --command ./fix.sh
 
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.1

diff --git a/default.nix b/default.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,18 @@
+{
+  description = "The planet.nixos.org";
+
+  inputs.nixpkgs = { url = "nixpkgs/nixos-20.09"; };
+
+  outputs =
+    { self
+    , nixpkgs
+    }:
+    let
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+    in {
+      defaultPackage."${system}" = pkgs.mkShell {
+        buildInputs = with pkgs; [ venus entr python3 ];
+      };
+    };
+}