nix: rework flake input

This commit is contained in:
Primrose 2024-08-02 02:46:55 +02:00
parent 16cbf92ec3
commit f5755d11a3
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
11 changed files with 128 additions and 132 deletions

View file

@ -4,15 +4,14 @@
flake.lib.mkNerdFont = ./mkNerdFont.nix;
perSystem =
{ pkgs, lib, ... }:
{ pkgs-stable, lib, ... }:
let
inherit (pkgs) alt-ergo-pin;
mkNerdFont = pkgs.callPackage self.lib.mkNerdFont { };
mkNerdFont = pkgs-stable.callPackage self.lib.mkNerdFont { };
in
{
# Export my package set
packages = rec {
hiosevka = pkgs.callPackage ./hiosevka { };
hiosevka = pkgs-stable.callPackage ./hiosevka { };
hiosevka-nerd-font-mono = mkNerdFont {
font = hiosevka;
extraArgs = [
@ -27,18 +26,18 @@
"--variable-width-glyphs"
];
};
altiosevka = pkgs.callPackage ./altiosevka { };
altiosevka = pkgs-stable.callPackage ./altiosevka { };
logisim-evolution = pkgs.callPackage ./logisim-evolution.nix { };
necrolib = pkgs.callPackage ./necrolib.nix { };
why3 = pkgs.callPackage ./why3.nix { inherit (alt-ergo-pin) alt-ergo; };
logisim-evolution = pkgs-stable.callPackage ./logisim-evolution.nix { };
necrolib = pkgs-stable.callPackage ./necrolib.nix { };
why3 = pkgs-stable.callPackage ./why3.nix { };
dl-librescore = pkgs.callPackage ./dl-librescore.nix { };
fish-lsp = pkgs.callPackage ./fish-lsp { };
maeel = pkgs.callPackage ./maeel.nix { };
tokei = pkgs.callPackage ./tokei { }; # alpha tokei with typst, skel, hledger
dl-librescore = pkgs-stable.callPackage ./dl-librescore.nix { };
fish-lsp = pkgs-stable.callPackage ./fish-lsp { };
maeel = pkgs-stable.callPackage ./maeel.nix { };
tokei = pkgs-stable.callPackage ./tokei { }; # alpha tokei with typst, skel, hledger
posy-cursor = pkgs.callPackage ./posy-cursor.nix { };
posy-cursor = pkgs-stable.callPackage ./posy-cursor.nix { };
};
};
}

View file

@ -2,9 +2,11 @@
symlinkJoin,
makeWrapper,
why3,
alt-ergo,
cvc4,
z3_4_12,
fetchFromGitHub,
system,
}:
let
provers = [
@ -12,6 +14,22 @@ let
cvc4
z3_4_12
];
inherit
(import
(fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "1b95daa381fa4a0963217a5d386433c20008208a";
hash = "sha256-vwEtkxIEQjymeTk89Ty1MGfRVSWL1/3j1wt5xB5ua88=";
})
{
inherit system;
config.allowUnfree = true;
}
)
alt-ergo
;
in
symlinkJoin {
name = "why3";