From 37ff99f005f7b21bf9a52016b007148619b84d19 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 27 Feb 2025 10:47:32 +0100 Subject: [PATCH] Use older poppler in silverfin shell --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + shells/silverfin.nix | 8 +++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 754343b8..c6b5c68e 100644 --- a/flake.lock +++ b/flake.lock @@ -333,6 +333,22 @@ "type": "github" } }, + "nixpkgs-23-05": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-24_11": { "locked": { "lastModified": 1734083684, @@ -400,6 +416,7 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", + "nixpkgs-23-05": "nixpkgs-23-05", "nur": "nur", "systems": "systems", "tetris": "tetris", diff --git a/flake.nix b/flake.nix index 84a97871..9550720f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-23-05.url = "github:nixos/nixpkgs/nixos-23.05"; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/shells/silverfin.nix b/shells/silverfin.nix index 9cc086cd..566ca61d 100644 --- a/shells/silverfin.nix +++ b/shells/silverfin.nix @@ -50,7 +50,13 @@ pkgs.devshell.mkShell { minikube mupdf-headless nodejs_18 - poppler_utils + (inputs.nixpkgs-23-05.legacyPackages.aarch64-darwin.poppler_utils.overrideAttrs (old: rec { + version = "22.12.0"; + src = pkgs.fetchurl { + url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; + hash = "sha256-2aqcrN+9D46Y/Cs7sAjmRVl+1IBoV1fD57x0tCeNFcA="; + }; + })) (pkgs.lowPrio postgresql_14) stern yarn