1
0
Fork 0

Update deps
All checks were successful
Build / build-amd64-linux (push) Successful in 59s
Build / build-arm64-linux (push) Successful in 3m22s

This commit is contained in:
Daniel Kempkens 2024-02-17 16:20:34 +01:00
parent ee66fc7653
commit 3182177933
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
4 changed files with 13 additions and 30 deletions

View file

@ -79,11 +79,11 @@
]
},
"locked": {
"lastModified": 1708029101,
"narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=",
"lastModified": 1708143835,
"narHash": "sha256-SRGi47kleiyNVQlR9mxp9Ux2t2SLy7Nm3L6b3UKjH2c=",
"owner": "nix-community",
"repo": "disko",
"rev": "810eccbad22cc50323b27161033399eb87658932",
"rev": "4d81082b2c37a6e1e181cc9f589b5b657774bd63",
"type": "github"
},
"original": {
@ -355,11 +355,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1708103068,
"narHash": "sha256-A3Itq2swJOJ9+RzcmHEA8Tpd8opWAVin3GchouNR8uk=",
"lastModified": 1708143560,
"narHash": "sha256-j76z5aj/OEm/aoF7fakKMwoPZAwtCqoQlhl/ERgmk6c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "607312f76ac46232b6f690748ff0383a2249af05",
"rev": "6c2492ff8eea1842aa164aa84f0774a1e946ab11",
"type": "github"
},
"original": {
@ -371,11 +371,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708093448,
"narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=",
"lastModified": 1708151420,
"narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f",
"rev": "6e2f00c83911461438301db0dba5281197fe4b3a",
"type": "github"
},
"original": {
@ -403,22 +403,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1708139649,
"narHash": "sha256-u/GarSFofJfSjZkq1BYDkuBPDO5IkC7AK4DfSFWsUvE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "560dcb4198deca03f23731365526053f5a76f45d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1702780907,
@ -489,7 +473,6 @@
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix"
}

View file

@ -2,7 +2,7 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
# nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Tools

View file

@ -3,13 +3,13 @@
let
default-system = "x86_64-linux";
overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
# overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
# overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; };
overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = {
overlays = [
overlay-master
# overlay-master
# overlay-unstable
overlay-nifoc
];

View file

@ -3,7 +3,7 @@
let
web-domain = "mastodon.kempkens.io";
pkg-base = pkgs.pkgs-master.mastodon;
pkg-base = pkgs.mastodon;
pkg-mastodon = pkg-base.overrideAttrs (_: {
mastodonModules = pkgs.mastodon.mastodonModules.overrideAttrs (oldMods: