From d3547bda033c6987a68c7f707097d84941f17837 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 18 Nov 2024 21:35:20 +0100 Subject: [PATCH] Update embedded nixpkgs revision, make sure wrapped ruby is used --- content/assets/stylesheets/bulma | 2 +- packages.nix | 4 ++-- shell.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/assets/stylesheets/bulma b/content/assets/stylesheets/bulma index 6374a809..3fd2f650 160000 --- a/content/assets/stylesheets/bulma +++ b/content/assets/stylesheets/bulma @@ -1 +1 @@ -Subproject commit 6374a8094d2af8d94368d51946719cd614d6f84f +Subproject commit 3fd2f6502678c09dc39d2fe37980b88c2c5bc534 diff --git a/packages.nix b/packages.nix index 5a487eea..2ab3a644 100644 --- a/packages.nix +++ b/packages.nix @@ -1,5 +1,5 @@ let - rev = "759537f06e6999e141588ff1c9be7f3a5c060106"; + rev = "5e4fbfb6b3de1aa2872b76d49fafc942626e2add"; nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; pkgs = import nixpkgs {}; ruby = pkgs.ruby_3_3; @@ -10,6 +10,6 @@ let }; in with pkgs; [ - gems libxml2 nodejs cacert git glibcLocales + gems (lowPrio gems.wrappedRuby) libxml2 nodejs cacert git glibcLocales pandoc (texlive.combine { inherit (texlive) scheme-basic xetex unicode-math enumitem booktabs ulem etoolbox; }) ] ++ (if stdenv.isDarwin then [terminal-notifier] else [chromium]) diff --git a/shell.nix b/shell.nix index b9939d3d..40253742 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ let build-deps = import ./packages.nix; - rev = "759537f06e6999e141588ff1c9be7f3a5c060106"; + rev = "5e4fbfb6b3de1aa2872b76d49fafc942626e2add"; nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; pkgs = import nixpkgs {}; in