From 8423b6155fa943204e7b9ff9cb92cc5e6d9f7381 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 29 Jan 2025 13:17:56 -0500 Subject: nix package/config updates, ruby on nix current - current is at ruby 3.3.6 - next is at ruby 3.4.1 --- flake.nix | 65 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 31 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 5720103d..b5588879 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,17 @@ { description = "sisu parser & document generator"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; - inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; # "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; outputs = { self, nixpkgs, - flake-utils, } @ inputs: let pname = "sisu"; version = "7.3.1"; shell = ./shell.nix; # ./default.nix; - devEnv = ./shell.nix; # ./.envrc; # ./shell.nix; # ./default.nix; - supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + devEnv = ./.envrc; # ./.envrc; # ./shell.nix; # ./default.nix; + supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types + nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types checkPhase = '' runHook preCheck runHook postCheck @@ -74,10 +72,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite jq git @@ -89,10 +87,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite graphicsmagick zip @@ -112,6 +110,7 @@ sigil calibre #(suite includes: ebook-viewer) foliate + validatePkgConfig jq #git ]; @@ -122,15 +121,16 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite graphicsmagick zip unzip xz + validatePkgConfig jq #git ]; @@ -141,10 +141,10 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite graphicsmagick zip @@ -153,10 +153,11 @@ source-sans-pro source-serif-pro source-code-pro - texlive.combined.scheme-full + texliveFull # texliveTeTeX noto-fonts noto-fonts-cjk-sans takao + validatePkgConfig jq #git ]; @@ -167,15 +168,16 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite graphicsmagick zip unzip xz + validatePkgConfig jq #git ]; @@ -186,13 +188,14 @@ inherit shell; inherit devEnv; packages = [ - ruby_3_3 - rubyPackages_3_3.rake - rubyPackages_3_3.sqlite3 - rubyPackages_3_3.thor + ruby + rubyPackages.rake + rubyPackages.sqlite3 + rubyPackages.thor sqlite graphicsmagick perl538Packages.Po4a + validatePkgConfig jq #git ]; -- cgit v1.2.3