felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore(flake): update photoprism2nix

Browse source
This commit is contained in:
Felix Schröter 2021-12-01 12:27:38 +01:00
parent e073ed6cab
commit c50e6a8f07
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
flake.lock
View file

@ -33,10 +33,7 @@
},
"gomod2nix": {
"inputs": {
"nixpkgs": [
"photoprism-flake",
"nixpkgs"
],
"nixpkgs": "nixpkgs_2",
"utils": "utils"
},
"locked": {
@ -133,18 +130,18 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1637723398,
"narHash": "sha256-DGSZANWNb6/Serix9FdTQLnjHcFTPTmI/gtBVmLn1U8=",
"ref": "release-21.11",
"rev": "a7e4a67cc1a95780dc3bcd082339411d74489c0d",
"revCount": 333570,
"type": "git",
"url": "file:///nix/nixpkgs"
"lastModified": 1638286143,
"narHash": "sha256-A+rgjbIpz3uPRKHPXwdmouVcVn5pZqLnaZHymjkraG4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "release-21.11",
"type": "indirect"
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
@ -243,14 +240,16 @@
"type": "github"
}
},
"photoprism-flake": {
"photoprism2nix": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"flake-utils"
],
"gomod2nix": "gomod2nix",
"nixpkgs": "nixpkgs_2",
"nixpkgs": [
"nixpkgs"
],
"photoprism": "photoprism",
"ranz2nix": "ranz2nix"
},
@ -258,13 +257,13 @@
"lastModified": 1637816713,
"narHash": "sha256-/GcZROyveHIoJoEu4GYtsrgOqN0KYeOiLMO7ysrwiww=",
"owner": "GTrunSec",
"repo": "photoprism-flake",
"repo": "photoprism2nix",
"rev": "91157226909dbf8c31b61b6e42e2d10d959ff452",
"type": "github"
},
"original": {
"owner": "GTrunSec",
"repo": "photoprism-flake",
"repo": "photoprism2nix",
"type": "github"
}
},
@ -319,7 +318,7 @@
"nvim-ts-autotag": "nvim-ts-autotag",
"nvim-ts-context-commentstring": "nvim-ts-context-commentstring",
"obelisk": "obelisk",
"photoprism-flake": "photoprism-flake",
"photoprism2nix": "photoprism2nix",
"pre-commit-hooks": "pre-commit-hooks"
}
},

11
flake.nix
View file

@ -23,8 +23,9 @@
flake = false;
};
inputs.photoprism-flake = {
url = "github:GTrunSec/photoprism-flake";
inputs.photoprism2nix = {
url = "github:GTrunSec/photoprism2nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
@ -50,7 +51,7 @@
};
outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur
, neovim, obelisk, photoprism-flake, pre-commit-hooks, nvim-ts-autotag
, neovim, obelisk, photoprism2nix, pre-commit-hooks, nvim-ts-autotag
, nvim-ts-context-commentstring, nvim-lspfuzzy }@inputs:
let
overlays = {
@ -85,7 +86,7 @@
};
# custom overlay so it's using the flake's nixpkgs
photoprism = self: super: {
photoprism = photoprism-flake.defaultPackage.${self.system};
photoprism = photoprism2nix.defaultPackage.${self.system};
};
};
nixosModules = { flakeDefaults = import ./modules/flakeDefaults.nix; };
@ -164,7 +165,7 @@
modules = [
nixpkgs.nixosModules.notDetected
nixos-hardware.nixosModules.raspberry-pi-4
# photoprism-flake.nixosModules.photoprism
# photoprism2nix.nixosModules.photoprism
(lib.createSystem "felix-rpi4" {
hardwareConfig = ./hardware/rpi4.nix;
config = ./rpi4.nix;