haskal
/
dragnpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: haskal:nixos-25.05
Branches Tags
haskal:main
haskal:nixos-25.05
haskal:nixos-24.11
haskal:mkflake
haskal:nixos-24.11-tmp
haskal:nixos-24.05
haskal:module/dbzfs
..
compare: haskal:main
Branches Tags
haskal:main
haskal:nixos-25.05
haskal:nixos-24.11
haskal:mkflake
haskal:nixos-24.11-tmp
haskal:nixos-24.05
haskal:module/dbzfs

15 Commits
nixos-25.0 ... main

Author SHA1 Message Date
xenia 2772028078 update nixpkgs 2025-08-03 16:21:47 -04:00
xenia 113bc45dd7 oops 2025-07-07 21:36:51 -04:00
xenia a66cf9784a update nixpkgs and lix 2025-07-07 21:31:25 -04:00
xenia 8a7924eec1 update to lix 2.92.2 2025-06-24 22:27:10 -04:00
xenia 6b4734f62a whoops 2025-06-22 18:21:51 -04:00
xenia 8cc37b204b pkgs: fix zbasefind 2025-06-18 23:35:09 -04:00
xenia 5b50a91cb5 pkgs: add moloch(-dragon) 2025-06-11 01:12:19 -04:00
xenia 0a6e9704e6 templates: beamer: use new style texlive syntax 2025-06-10 00:09:21 -04:00
xenia a00041da5f templates: update gitignore 2025-06-09 23:03:57 -04:00
xenia a81c912fef templates: update beamer 2025-06-09 22:16:59 -04:00
xenia 93e5969f57 templates: update beamer template 2025-06-09 22:16:25 -04:00
xenia 25abcac448 templates: update beamer template 2025-06-09 22:04:16 -04:00
xenia 50d9159ec9 templates: add beamer template 2025-06-09 21:19:54 -04:00
xenia 3e8347b65d flake: add `apps` to mkFlake transformed keys 2025-06-09 21:19:47 -04:00
xenia dfcb303eef flake: rework the nixpkgs init code 2025-06-06 00:24:26 -04:00
2 changed files with 11 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
flake.lock
View File

@ -30,16 +30,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1754028485, "lastModified": 1753939845,
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59e69648d345d6e8fef86158c555730fa12af9de", "rev": "94def634a20494ee057c76998843c015909d6311",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

14
flake.nix
View File

@ -2,7 +2,7 @@
description = "dragnpkgs together with nixpkgs and lix"; description = "dragnpkgs together with nixpkgs and lix";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz";
@ -33,18 +33,18 @@
# self reference in the registry to be downloadable by URL in case it makes it into a # self reference in the registry to be downloadable by URL in case it makes it into a
# flake.lock # flake.lock
meta.registry-entry = { meta.registry-entry = {
from = { id = "dragnpkgs"; type = "indirect"; }; from = { id = "dragnpkgs-unstable"; type = "indirect"; };
to = { to = {
type = "git"; type = "git";
url = "https://git.lain.faith/haskal/dragnpkgs.git"; url = "https://git.lain.faith/haskal/dragnpkgs.git";
ref = "nixos-25.05"; ref = "main";
} // self.lib.filterAttrs } // self.lib.filterAttrs
(n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash")
self; self;
}; };
# the nix path entry for self # the nix path entry for self
meta.path-entry = "dragnpkgs=flake:dragnpkgs"; meta.path-entry = "dragnpkgs-unstable=flake:dragnpkgs-unstable";
lib = (lib-base.extend (import ./lib/overlay.nix)).extend (final: prev: { lib = (lib-base.extend (import ./lib/overlay.nix)).extend (final: prev: {
# initializes regular upstream nixpkgs with the given arguments # initializes regular upstream nixpkgs with the given arguments
@ -159,17 +159,17 @@
}; };
}; };
config.nix.registry.dragnpkgs = config.nix.registry.dragnpkgs-unstable =
lib.mkIf config.dragnpkgs.setFlakeRegistry self.meta.registry-entry; lib.mkIf config.dragnpkgs.setFlakeRegistry self.meta.registry-entry;
config.nix.registry.nixpkgs = lib.mkIf config.dragnpkgs.setNixpkgsFlakeAlias { config.nix.registry.nixpkgs = lib.mkIf config.dragnpkgs.setNixpkgsFlakeAlias {
from = { id = "nixpkgs"; type = "indirect"; }; from = { id = "nixpkgs"; type = "indirect"; };
to = { id = "dragnpkgs"; type = "indirect"; }; to = { id = "dragnpkgs-unstable"; type = "indirect"; };
}; };
config.nix.registry.templates = lib.mkIf config.dragnpkgs.setTemplatesFlakeAlias { config.nix.registry.templates = lib.mkIf config.dragnpkgs.setTemplatesFlakeAlias {
from = { id = "templates"; type = "indirect"; }; from = { id = "templates"; type = "indirect"; };
to = { id = "dragnpkgs"; type = "indirect"; }; to = { id = "dragnpkgs-unstable"; type = "indirect"; };
}; };
config.nix.nixPath = lib.mkIf config.dragnpkgs.setNixPath [ config.nix.nixPath = lib.mkIf config.dragnpkgs.setNixPath [