From 4573e88c2f9b5f8c57c6b2e0f4c0526bb729526e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 12 Oct 2023 22:29:59 -0400 Subject: nix flake shell ruby-3.2 update --- flake.lock | 30 ++++++-- flake.nix | 75 +++++++++--------- nix/pkglst/packages_ruby_2_6.nix | 17 ----- nix/pkglst/packages_ruby_3_0.nix | 18 ----- nix/pkglst/packages_ruby_3_1.nix | 18 ----- org/config_nix.org | 161 +++++++++++++++++++++++++++------------ shell.nix | 18 +++-- 7 files changed, 185 insertions(+), 152 deletions(-) delete mode 100644 nix/pkglst/packages_ruby_2_6.nix delete mode 100644 nix/pkglst/packages_ruby_3_0.nix delete mode 100644 nix/pkglst/packages_ruby_3_1.nix diff --git a/flake.lock b/flake.lock index fbcbeac4..b44c2260 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "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", diff --git a/flake.nix b/flake.nix index 83c5b027..c3d120a6 100644 --- a/flake.nix +++ b/flake.nix @@ -50,24 +50,16 @@ inherit shell; inherit devEnv; buildInputs = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor - #ruby_2_7 - #rubyPackages_2_7.rake - #rubyPackages_2_7.sqlite3 - #rubyPackages_2_7.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick unzip xz zip openssl - nixFlakes - validatePkgConfig - jq - git ]; buildPhase = '' ''; @@ -121,10 +113,17 @@ ''; in with pkgs; { devShell = mkShell { - name = "sisu dev shell default"; + name = "sisu dev base shell"; inherit shell; inherit devEnv; - packages = [ sqlite ]; + packages = [ + sqlite + nixFlakes + validatePkgConfig + nix-output-monitor + jq + git + ]; inherit shellHook; }; devShell-epub = mkShell { @@ -132,10 +131,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -158,6 +157,7 @@ #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -168,10 +168,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -180,6 +180,7 @@ #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -190,10 +191,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -206,6 +207,7 @@ #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -216,10 +218,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -228,6 +230,7 @@ #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -238,21 +241,23 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick - perl534Packages.Po4a + perl538Packages.Po4a #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; inherit shellHook; }; + default = import ./shell.nix { inherit pkgs; }; }); }; } diff --git a/nix/pkglst/packages_ruby_2_6.nix b/nix/pkglst/packages_ruby_2_6.nix deleted file mode 100644 index f8f27323..00000000 --- a/nix/pkglst/packages_ruby_2_6.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs ? import {} }: -with pkgs; [ - ruby_2_6 - rubyPackages_2_6.rake - rubyPackages_2_6.sqlite3 - rubyPackages_2_6.thor - sqlite - unzip - xz - zip - openssl - #texlive-combined-full - nixFlakes - validatePkgConfig - jq - git -] diff --git a/nix/pkglst/packages_ruby_3_0.nix b/nix/pkglst/packages_ruby_3_0.nix deleted file mode 100644 index 371ff256..00000000 --- a/nix/pkglst/packages_ruby_3_0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs ? import {} }: -with pkgs; [ - ruby_3_0 - rubyPackages_3_0.rake - rubyPackages_3_0.sqlite3 - rubyPackages_3_0.thor - sqlite - graphicsmagick - unzip - xz - zip - openssl - #texlive-combined-full - nixFlakes - validatePkgConfig - jq - git -] diff --git a/nix/pkglst/packages_ruby_3_1.nix b/nix/pkglst/packages_ruby_3_1.nix deleted file mode 100644 index 067d024b..00000000 --- a/nix/pkglst/packages_ruby_3_1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs ? import {} }: -with pkgs; [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor - sqlite - graphicsmagick - unzip - xz - zip - openssl - #texlive-combined-full - nixFlakes - validatePkgConfig - jq - git -] diff --git a/org/config_nix.org b/org/config_nix.org index f4187a50..25a2c8aa 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -132,24 +132,16 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; buildInputs = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor - #ruby_2_7 - #rubyPackages_2_7.rake - #rubyPackages_2_7.sqlite3 - #rubyPackages_2_7.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick unzip xz zip openssl - nixFlakes - validatePkgConfig - jq - git ]; buildPhase = '' ''; @@ -203,10 +195,17 @@ export RUBYLIB+=`pwd`/lib ''; in with pkgs; { devShell = mkShell { - name = "sisu dev shell default"; + name = "sisu dev base shell"; inherit shell; inherit devEnv; - packages = [ sqlite ]; + packages = [ + sqlite + nixFlakes + validatePkgConfig + nix-output-monitor + jq + git + ]; inherit shellHook; }; devShell-epub = mkShell { @@ -214,10 +213,10 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -240,6 +239,7 @@ export RUBYLIB+=`pwd`/lib #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -250,10 +250,10 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -262,6 +262,7 @@ export RUBYLIB+=`pwd`/lib #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -272,10 +273,10 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -288,6 +289,7 @@ export RUBYLIB+=`pwd`/lib #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -298,10 +300,10 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick zip @@ -310,6 +312,7 @@ export RUBYLIB+=`pwd`/lib #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; @@ -320,21 +323,23 @@ export RUBYLIB+=`pwd`/lib inherit shell; inherit devEnv; packages = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick - perl534Packages.Po4a + perl538Packages.Po4a #devenv nixFlakes validatePkgConfig + nix-output-monitor jq git ]; inherit shellHook; }; + default = import ./shell.nix { inherit pkgs; }; }); }; } @@ -356,14 +361,46 @@ mkShell { <> ]; shellHook = '' - if [[ -e ".envrc" ]]; then - source .envrc - fi - eval "$(starship init bash)" + #if [[ -e ".envrc" ]]; then + # source .envrc + #fi + #eval "$(starship init bash)" ''; } #+END_SRC + +{ pkgs ? import {} }: +with pkgs; +mkShell { + buildInputs = [ + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor + sqlite + graphicsmagick + unzip + xz + zip + openssl + #texlive-combined-full + nixFlakes + validatePkgConfig + nix-output-monitor + nix-tree + jq + git + #starship + ]; + shellHook = '' + #if [[ -e ".envrc" ]]; then + # source .envrc + #fi + #eval "$(starship init bash)" + ''; +} + ** packages.nix *** default @@ -377,9 +414,21 @@ with pkgs; [ ] #+END_SRC +*** ruby 3.2 + +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_2.nix +#+BEGIN_SRC nix +{ pkgs ? import {} }: +with pkgs; [ + <> + <> + <> +] +#+END_SRC + *** ruby 3.1 -#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_1.nix +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_1.nix #+BEGIN_SRC nix { pkgs ? import {} }: with pkgs; [ @@ -391,7 +440,7 @@ with pkgs; [ *** ruby 3.0 -#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_0.nix +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_0.nix #+BEGIN_SRC nix { pkgs ? import {} }: with pkgs; [ @@ -405,31 +454,31 @@ with pkgs; [ #+NAME: ruby_legacy #+BEGIN_SRC nix -<> +<> #+END_SRC *** ruby current #+NAME: ruby_current #+BEGIN_SRC nix -<> +<> #+END_SRC *** ruby next #+NAME: ruby_next #+BEGIN_SRC nix -<> +<> #+END_SRC -*** ruby 3.0 - ruby_version_3_0 +*** ruby 3.2 - ruby_version_3_2 -#+NAME: ruby_version_3_0 +#+NAME: ruby_version_3_2 #+BEGIN_SRC nix -ruby_3_0 -rubyPackages_3_0.rake -rubyPackages_3_0.sqlite3 -rubyPackages_3_0.thor +ruby_3_2 +rubyPackages_3_2.rake +rubyPackages_3_2.sqlite3 +rubyPackages_3_2.thor #+END_SRC *** ruby 3.1 - ruby_version_3_1 @@ -442,6 +491,16 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor #+END_SRC +*** ruby 3.0 - ruby_version_3_0 + +#+NAME: ruby_version_3_0 +#+BEGIN_SRC nix +ruby_3_0 +rubyPackages_3_0.rake +rubyPackages_3_0.sqlite3 +rubyPackages_3_0.thor +#+END_SRC + *** nix related packages #+NAME: nix_packages @@ -470,6 +529,8 @@ openssl #+BEGIN_SRC nix nixFlakes validatePkgConfig +nix-output-monitor +nix-tree jq git #+END_SRC diff --git a/shell.nix b/shell.nix index 27fadf87..aa2fb632 100755 --- a/shell.nix +++ b/shell.nix @@ -3,10 +3,10 @@ with pkgs; mkShell { buildInputs = [ - ruby_3_1 - rubyPackages_3_1.rake - rubyPackages_3_1.sqlite3 - rubyPackages_3_1.thor + ruby_3_2 + rubyPackages_3_2.rake + rubyPackages_3_2.sqlite3 + rubyPackages_3_2.thor sqlite graphicsmagick unzip @@ -16,14 +16,16 @@ mkShell { #texlive-combined-full nixFlakes validatePkgConfig + nix-output-monitor + nix-tree jq git #starship ]; shellHook = '' - if [[ -e ".envrc" ]]; then - source .envrc - fi - eval "$(starship init bash)" + #if [[ -e ".envrc" ]]; then + # source .envrc + #fi + #eval "$(starship init bash)" ''; } -- cgit v1.2.3