From 09394d8e465664059693caec81f0594c951f00a6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 12 Feb 2023 13:33:41 -0500 Subject: nix packages, added graphicsmagick - some fiddling with packages, determine what is needed where --- flake.nix | 7 ++++++- nix/pkglst/packages_ruby_3_0.nix | 1 + nix/pkglst/packages_ruby_3_1.nix | 1 + org/config_nix.org | 10 ++++++++-- shell.nix | 3 ++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4aeafbf1..83c5b027 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ #rubyPackages_2_7.sqlite3 #rubyPackages_2_7.thor sqlite + graphicsmagick unzip xz zip @@ -67,7 +68,6 @@ validatePkgConfig jq git - sqlite ]; buildPhase = '' ''; @@ -137,6 +137,7 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -172,6 +173,7 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -193,6 +195,7 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -218,6 +221,7 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -239,6 +243,7 @@ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick perl534Packages.Po4a #devenv nixFlakes diff --git a/nix/pkglst/packages_ruby_3_0.nix b/nix/pkglst/packages_ruby_3_0.nix index 66c9e0ba..371ff256 100644 --- a/nix/pkglst/packages_ruby_3_0.nix +++ b/nix/pkglst/packages_ruby_3_0.nix @@ -5,6 +5,7 @@ with pkgs; [ rubyPackages_3_0.sqlite3 rubyPackages_3_0.thor sqlite + graphicsmagick unzip xz zip diff --git a/nix/pkglst/packages_ruby_3_1.nix b/nix/pkglst/packages_ruby_3_1.nix index ca9ced14..067d024b 100644 --- a/nix/pkglst/packages_ruby_3_1.nix +++ b/nix/pkglst/packages_ruby_3_1.nix @@ -5,6 +5,7 @@ with pkgs; [ rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick unzip xz zip diff --git a/org/config_nix.org b/org/config_nix.org index 8dbfd4e0..f4187a50 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -141,6 +141,7 @@ export RUBYLIB+=`pwd`/lib #rubyPackages_2_7.sqlite3 #rubyPackages_2_7.thor sqlite + graphicsmagick unzip xz zip @@ -149,7 +150,6 @@ export RUBYLIB+=`pwd`/lib validatePkgConfig jq git - sqlite ]; buildPhase = '' ''; @@ -219,6 +219,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -254,6 +255,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -275,6 +277,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -300,6 +303,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick zip unzip xz @@ -321,6 +325,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick perl534Packages.Po4a #devenv nixFlakes @@ -451,6 +456,7 @@ bundix #+NAME: packages_project_relevant #+BEGIN_SRC nix sqlite +graphicsmagick unzip xz zip @@ -470,7 +476,7 @@ git #+NAME: packages_extra #+BEGIN_SRC nix -starship +#starship #+END_SRC ** variables diff --git a/shell.nix b/shell.nix index 9f689127..27fadf87 100755 --- a/shell.nix +++ b/shell.nix @@ -8,6 +8,7 @@ mkShell { rubyPackages_3_1.sqlite3 rubyPackages_3_1.thor sqlite + graphicsmagick unzip xz zip @@ -17,7 +18,7 @@ mkShell { validatePkgConfig jq git - starship + #starship ]; shellHook = '' if [[ -e ".envrc" ]]; then -- cgit v1.2.3