Adiciona suporte a aarch64-linux (#15)

PedroRegisPOAR · web-flow · commit 7e6be20d4510 · 2023-09-01T13:48:29.000-03:00
* Inicia suport a aarch64-linux

* Usa inherit system;

* Add coreutils

* Refatora inputs

* Refatora outputs e cached devShell

* Refatora outputs e cached devShell, fix

* Fix echo

* Fix devShells.default

* Testa instalação igual a do org

* Testa instalação igual a do org, 2
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -18,16 +18,10 @@ jobs:
 
     - name: Instala nix single user
       run: |
-        test -d /nix || sudo mkdir -m 0755 /nix \
-        && sudo -k chown "$USER": /nix \
-        && BASE_URL='https://raw.githubusercontent.com/ES-Nix/get-nix/' \
-        && SHA256=5443257f9e3ac31c5f0da60332d7c5bebfab1cdf \
-        && NIX_RELEASE_VERSION='2.10.2' \
-        && curl -fsSL "${BASE_URL}""$SHA256"/get-nix.sh | sh -s -- ${NIX_RELEASE_VERSION} \
-        && . "$HOME"/.nix-profile/etc/profile.d/nix.sh \
-        && . ~/."$(ps -ocomm= -q $$)"rc \
-        && export TMPDIR=/tmp \
-        && nix flake --version
+        wget -qO- http://ix.io/4Cj0 | sh \
+        && . "$HOME"/."$(basename $SHELL)"rc \
+        && nix flake --version \
+        && direnv --version
         echo "$HOME"/.nix-profile/bin >> $GITHUB_PATH
 
     # Remove podman via apt-get
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,16 +20,10 @@ jobs:
 
     - name: Instala nix single user
       run: |
-        test -d /nix || sudo mkdir -m 0755 /nix \
-        && sudo -k chown "$USER": /nix \
-        && BASE_URL='https://raw.githubusercontent.com/ES-Nix/get-nix/' \
-        && SHA256=5443257f9e3ac31c5f0da60332d7c5bebfab1cdf \
-        && NIX_RELEASE_VERSION='2.10.2' \
-        && curl -fsSL "${BASE_URL}""$SHA256"/get-nix.sh | sh -s -- ${NIX_RELEASE_VERSION} \
-        && . "$HOME"/.nix-profile/etc/profile.d/nix.sh \
-        && . ~/."$(ps -ocomm= -q $$)"rc \
-        && export TMPDIR=/tmp \
-        && nix flake --version
+        wget -qO- http://ix.io/4Cj0 | sh \
+        && . "$HOME"/."$(basename $SHELL)"rc \
+        && nix flake --version \
+        && direnv --version
         echo "$HOME"/.nix-profile/bin >> $GITHUB_PATH
 
     # Remove podman via apt-get
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .direnv/
 .idea/
+.profiles/
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,31 +2,55 @@
   description = "This is a nix with flakes package";
 
   inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+
     flake-utils.url = "github:numtide/flake-utils";
     podman-rootless.url = "github:ES-Nix/podman-rootless/from-nixpkgs";
+
+    podman-rootless.inputs.nixpkgs.follows = "nixpkgs";
+    flake-utils.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, flake-utils, podman-rootless }:
+  outputs = attrs@{
+    self,
+    nixpkgs,
+    flake-utils,
+    podman-rootless
+  }:
     flake-utils.lib.eachDefaultSystem (system:
       let
 
         pkgsAllowUnfree = import nixpkgs {
-          system = "x86_64-linux";
+          inherit system;
           config = { allowUnfree = true; };
         };
+
+        # https://gist.github.com/tpwrules/34db43e0e2e9d0b72d30534ad2cda66d#file-flake-nix-L28
+        pleaseKeepMyInputs = pkgsAllowUnfree.writeTextDir "bin/.please-keep-my-inputs"
+          (builtins.concatStringsSep " " (builtins.attrValues attrs));
       in
       {
 
-        devShell = pkgsAllowUnfree.mkShell {
+        devShells.default = pkgsAllowUnfree.mkShell {
           buildInputs = with pkgsAllowUnfree; [
             bashInteractive
+            coreutils
             gnumake
             podman-rootless.packages.${system}.podman
+            pleaseKeepMyInputs
           ];
 
           shellHook = ''
             export TMPDIR=/tmp
 
+            test -d .profiles || mkdir -v .profiles
+
+            test -L .profiles/dev \
+            || nix develop .# --profile .profiles/dev --command echo
+
+            test -L .profiles/dev-shell-default \
+            || nix build $(nix eval --impure --raw .#devShells."$system".default.drvPath) --out-link .profiles/dev-shell-"$system"-default
+
             echo "Entering the nix devShell"
           '';
         };

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`.direnv/`
`2`	`2`	`.idea/`
	`3`	`+.profiles/`