diff --git a/.envrc b/.envrc index 1d953f4bd..3550a30f2 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use nix +use flake diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..0faec9f6a --- /dev/null +++ b/flake.lock @@ -0,0 +1,109 @@ +{ + "nodes": { + "devshell": { + "inputs": { + "nixpkgs": [ + "typelevel-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", + "owner": "numtide", + "repo": "devshell", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1781359544, + "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": [ + "typelevel-nix", + "flake-utils" + ], + "nixpkgs": [ + "typelevel-nix", + "nixpkgs" + ], + "typelevel-nix": "typelevel-nix" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "typelevel-nix": { + "inputs": { + "devshell": "devshell", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1782176829, + "narHash": "sha256-iVBZAkKuXt9Hr6k6BOjS8hAVy2VrSCD+l/nB/lMiQ1c=", + "owner": "typelevel", + "repo": "typelevel-nix", + "rev": "f93480571ec0aac0c991266d267d2276007582e3", + "type": "github" + }, + "original": { + "owner": "typelevel", + "repo": "typelevel-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..b1d2e5d16 --- /dev/null +++ b/flake.nix @@ -0,0 +1,32 @@ +{ + description = "Provision a dev environment"; + + inputs = { + typelevel-nix.url = "github:typelevel/typelevel-nix"; + nixpkgs.follows = "typelevel-nix/nixpkgs"; + flake-utils.follows = "typelevel-nix/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, typelevel-nix }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ typelevel-nix.overlays.default ]; + }; + + mkShell = jdk: pkgs.devshell.mkShell { + imports = [ typelevel-nix.typelevelShell ]; + name = "blaze"; + typelevelShell = { + jdk.package = jdk; + nodejs.enable = false; + native.enable = false; + }; + }; + in + rec { + devShell = mkShell pkgs.jdk8; + } + ); +} diff --git a/nix/nixpkgs-version.json b/nix/nixpkgs-version.json deleted file mode 100644 index 200fa61a3..000000000 --- a/nix/nixpkgs-version.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "nixos", - "repo": "nixpkgs", - "rev": "61290574123116a36225811f3ea6a7cfdf0fd17b", - "sha256": "1vwcjnx3nf9cw7xvi92lrd46k7sycvq9m1dfgq2myw02z5zklv06", - "fetchSubmodules": true -} \ No newline at end of file diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 0e64fe15c..000000000 --- a/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - java = "openjdk8_headless"; - pkgs = import ./nix/pkgs.nix { inherit java; }; -in -pkgs.mkShell { - buildInputs = [ - pkgs.git - pkgs.${java} - pkgs.sbt - ]; -}