diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 161 |
1 files changed, 111 insertions, 50 deletions
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 { <<packages_extra>> ]; 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 <nixpkgs> {} }: +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 <nixpkgs> {} }: +with pkgs; [ + <<ruby_version_3_2>> + <<packages_project_relevant>> + <<packages_build>> +] +#+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 <nixpkgs> {} }: 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 <nixpkgs> {} }: with pkgs; [ @@ -405,31 +454,31 @@ with pkgs; [ #+NAME: ruby_legacy #+BEGIN_SRC nix -<<ruby_version_3_0>> +<<ruby_version_3_1>> #+END_SRC *** ruby current #+NAME: ruby_current #+BEGIN_SRC nix -<<ruby_version_3_1>> +<<ruby_version_3_2>> #+END_SRC *** ruby next #+NAME: ruby_next #+BEGIN_SRC nix -<<ruby_version_3_1>> +<<ruby_version_3_2>> #+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 |