Compare commits

...

2 commits

Author SHA1 Message Date
9279727757
flake: use paperless from nixos-unstable
remove nixpkgs-master input
2025-04-18 17:52:45 +02:00
4a4d7f16ea
flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/b4e98224ad1336751a2ac7493967a4c9f6d9cb3f' (2025-04-08)
  → 'github:nix-community/home-manager/c61bfe3ae692f42ce688b5865fac9e0de58e1387' (2025-04-15)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/3e5bb71d1ab409b4110a66b8aa340d664892579a' (2025-04-15)
  → 'github:nixos/nixpkgs/7a091923db262378891ca51a25cb21f0705eb0cb' (2025-04-18)
• Updated input 'nixpkgs-unstable':
    'github:nixos/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650' (2025-04-12)
  → 'github:nixos/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef' (2025-04-17)
2025-04-18 17:09:28 +02:00
7 changed files with 19 additions and 57 deletions

29
flake.lock generated
View file

@ -57,11 +57,11 @@
]
},
"locked": {
"lastModified": 1744117652,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github"
},
"original": {
@ -125,22 +125,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1744734272,
"narHash": "sha256-P32AWRtc13VZMfSubFKShFHacXRy6od/ILrwmEgkq9c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3e5bb71d1ab409b4110a66b8aa340d664892579a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-nc-spreed-signaling-pr": {
"locked": {
"lastModified": 1742859343,
@ -159,11 +143,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@ -179,7 +163,6 @@
"home-manager": "home-manager",
"invoiceplane-template": "invoiceplane-template",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-nc-spreed-signaling-pr": "nixpkgs-nc-spreed-signaling-pr",
"nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver"

View file

@ -3,7 +3,6 @@
# Track channels with commits tested and built by hydra
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-nc-spreed-signaling-pr.url = "github:hensoko/nixpkgs/nextcloud-spreed-signaling";

View file

@ -28,7 +28,6 @@
registry = {
nixpkgs.flake = config.momo-cloud.flake-dependency-inject.nixpkgs;
unstable.flake = config.momo-cloud.flake-dependency-inject.nixpkgs-unstable;
master.flake = config.momo-cloud.flake-dependency-inject.nixpkgs-master;
system.flake = flake.self;
};

View file

@ -30,7 +30,6 @@
default = {
nixpkgs = inputs.nixpkgs;
nixpkgs-unstable = inputs.nixpkgs-unstable;
nixpkgs-master = inputs.nixpkgs-master;
home-manager = inputs.home-manager;
};
};

View file

@ -5,15 +5,16 @@
}:
let
backupDir = "/var/backups/paperless";
nixpkgs-master = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/8852da7e72ef9f41684d83925c2f428b06587a29.tar.gz";
sha256 = "sha256:0q2ww87kqn9bard90x8w5r30gbcyjk07zngfwr2ap3pbs4rzpjxi";
lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
nixpkgs-unstable = builtins.fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${lock.nodes.nixpkgs-unstable.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs-unstable.locked.narHash;
};
in
{
# Pull in early https://github.com/paperless-ngx/paperless-ngx/pull/9039
imports = [
(nixpkgs-master + "/nixos/modules/services/misc/paperless.nix")
(nixpkgs-unstable + "/nixos/modules/services/misc/paperless.nix")
];
disabledModules = [

View file

@ -18,8 +18,6 @@
let
nixpkgs-unstable = import inputs.nixpkgs-unstable { system = prev.system; };
nixpkgs-master = import inputs.nixpkgs-master { system = prev.system; };
nixpkgs-nc-spreed-signaling = import inputs.nixpkgs-nc-spreed-signaling-pr {
system = prev.system;
};
@ -34,7 +32,7 @@
})
];
});
paperless-ngx = nixpkgs-master.paperless-ngx;
paperless-ngx = nixpkgs-unstable.paperless-ngx;
nextcloud-spreed-signaling = nixpkgs-nc-spreed-signaling.nextcloud-spreed-signaling;
}

31
staging/flake.lock generated
View file

@ -200,11 +200,11 @@
]
},
"locked": {
"lastModified": 1744117652,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github"
},
"original": {
@ -245,14 +245,13 @@
"home-manager": "home-manager_2",
"invoiceplane-template": "invoiceplane-template",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-nc-spreed-signaling-pr": "nixpkgs-nc-spreed-signaling-pr",
"nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver"
},
"locked": {
"lastModified": 0,
"narHash": "sha256-n2uWdKIWHpCJkfXnEN5VGU3YQEUAB+vGmligtqx6mN8=",
"narHash": "sha256-ekJw5hcKs86qGdBt4glOZmCCpLCHRB+REbJGJ5Atgr8=",
"path": "../",
"type": "path"
},
@ -307,22 +306,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1744734272,
"narHash": "sha256-P32AWRtc13VZMfSubFKShFHacXRy6od/ILrwmEgkq9c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3e5bb71d1ab409b4110a66b8aa340d664892579a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-nc-spreed-signaling-pr": {
"locked": {
"lastModified": 1742859343,
@ -341,11 +324,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {