diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd5f59f..ab08364 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,5 +12,6 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - name: Setup erlang - run: cd sequential/installing && nix-shell - - run: make test PROFILE=ci + run: cd sequential/installing && nix develop + - name: Re-use nix flake to check erlang tests + run: cd sequential/installing && nix develop --command bash -c "cd ../../ && make test PROFILE=ci" diff --git a/sequential/installing/flake.lock b/sequential/installing/flake.lock new file mode 100644 index 0000000..69e7deb --- /dev/null +++ b/sequential/installing/flake.lock @@ -0,0 +1,62 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/sequential/installing/flake.nix b/sequential/installing/flake.nix index 80e5e0c..7f4be4f 100644 --- a/sequential/installing/flake.nix +++ b/sequential/installing/flake.nix @@ -2,8 +2,8 @@ description = "A flake to download Erlang 27 and Rebar3 from Nixpkgs 24.05"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/24.05"; # Pinning to Nixpkgs version 24.05 - flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs/24.05"; + flake-utils.url = "github:numtide/flake-utils/main"; }; outputs = { self, nixpkgs, flake-utils, ... }: @@ -13,8 +13,8 @@ in { packages.default = pkgs.mkShell { buildInputs = [ - pkgs.erlang_27 # Erlang 27 - pkgs.rebar3 # Rebar3 + pkgs.erlang_27 + pkgs.rebar3 ]; }; }); diff --git a/sequential/installing/shell.nix b/sequential/installing/shell.nix deleted file mode 100644 index 46af1ef..0000000 --- a/sequential/installing/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - pkgs = import { config = {}; overlays = []; }; -in -pkgs.mkShell { - packages = [ - (pkgs.erlang.override { version = "27.0.1"; }) - pkgs.beamPackages.rebar3 - ]; -}