From 28df5a17b898e40cf9edae30a979fe4a775b7ebb Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Mon, 21 Apr 2025 13:54:53 +0200 Subject: [PATCH] =?UTF-8?q?isabelle=20=E2=86=92=20isabelle-upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/{isabelle.nix => isabelle-upstream.nix} | 2 +- flake.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename apps/{isabelle.nix => isabelle-upstream.nix} (93%) diff --git a/apps/isabelle.nix b/apps/isabelle-upstream.nix similarity index 93% rename from apps/isabelle.nix rename to apps/isabelle-upstream.nix index 186b49f..aee6029 100644 --- a/apps/isabelle.nix +++ b/apps/isabelle-upstream.nix @@ -8,7 +8,7 @@ let }; in buildFHSEnv { - pname = "isabelle"; + pname = "isabelle-upstream"; inherit version; targetPkgs = pkgs: (with pkgs; [ zlib fontconfig ]) ++ diff --git a/flake.nix b/flake.nix index 833e876..a55befc 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,12 @@ genAttrs names (pkg: callPackage ./${dir}/${pkg}.nix {}); linuxPackages = packagesInDir "apps" [ - "multi-ghc" "basilisk" "isabelle" + "multi-ghc" "basilisk" "isabelle-upstream" "firefox-esr-alias" "inkscape-xwayland" ]; - crossPlatformPackages = packagesInDir "scripts" [ "niss-misc" ]; + crossPlatformPackages = + packagesInDir "scripts" [ "niss-misc" ]; fonts = packagesInDir "fonts" [ "constructium" "fairfax-hd" "kreative-square" "muller"