From ecaca9ebab5bd0db9e5b11005132dc758a019357 Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Mon, 12 Dec 2022 13:10:32 -0500 Subject: [PATCH] update nixpkgs to latest (23.05) --- flake.lock | 8 ++++---- flake.nix | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b295f91..d75a7dc 100644 --- a/flake.lock +++ b/flake.lock @@ -17,10 +17,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663494472, - "narHash": "sha256-fSowlaoXXWcAM8m9wA6u+eTJJtvruYHMA+Lb/tFi/qM=", - "path": "/nix/store/iw3xi0bfszikb0dmyywp7pm590jvbqvs-source", - "rev": "f677051b8dc0b5e2a9348941c99eea8c4b0ff28f", + "lastModified": 1670064435, + "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "path": "/nix/store/1psqy3qnsxj0kzmfcf67hwiz7aa8kb9b-source", + "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "type": "path" }, "original": { diff --git a/flake.nix b/flake.nix index 5ac3d0b..f8817ec 100644 --- a/flake.nix +++ b/flake.nix @@ -8,14 +8,19 @@ let pkgs = nixpkgs.legacyPackages.${system}; - rubyWithGems = pkgs.ruby_3_1.withPackages (ps: with ps; [ slop solargraph rspec rake ]); - in - { + devPackages = [ + pkgs.rubyPackages_3_1.solargraph + pkgs.rubyPackages_3_1.rspec + pkgs.rubyPackages_3_1.rake + ]; + + rubyWithGems = pkgs.ruby_3_1.withPackages (ps: with ps; [ slop ]); + in { packages = flake-utils.lib.flattenTree { default = pkgs.stdenv.mkDerivation { name = "terramena"; src = self; - buildInputs = with pkgs; [ rubyWithGems ]; + buildInputs = [ rubyWithGems ]; installPhase = '' mkdir -p $out/lib $out/bin $out/share @@ -26,10 +31,7 @@ }; }; - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - rubyWithGems - ]; - }; + devShells.default = + pkgs.mkShell { buildInputs = [ rubyWithGems ] ++ devPackages; }; }); }