Compare commits

...

2 Commits

Author SHA1 Message Date
Andreas Wiese cd8c70be1a modules/snipe-it: disable upstream module
NixOS 22.05 will have a module for Snipe-IT, but it's incompatible to
our implementation and the snipe-it package is currently still at 5.x.
So we'll keep our module around and disable the upstream module when
our's is used.  This will give users of our module a chance to migrate
to upstream and upstream a change to update the package to 6.x.
2022-05-24 07:27:23 +02:00
Andreas Wiese 1b9deccc76 inputs/nixpkgs: 21.11 -> 22.05
Flake lock file changes:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/604c44137d97b5111be1ca5c0d97f6e24fbc5c2c' (2022-01-23)
  → 'github:NixOS/nixpkgs/fb0003cd0b4d850995ff439621b01a8a6433cf2d' (2022-05-24)
2022-05-24 07:27:23 +02:00
3 changed files with 10 additions and 5 deletions

View File

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1642961095, "lastModified": 1653368995,
"narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", "narHash": "sha256-v1ztHn+OcA3dAgk6u3pq0d5ol4K/iXwsiFYpNDIN0VE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", "rev": "fb0003cd0b4d850995ff439621b01a8a6433cf2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.11-small", "ref": "release-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -1,7 +1,7 @@
{ {
description = "meterriblecrew.net package flake"; description = "meterriblecrew.net package flake";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11-small"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
outputs = inputs@{ self, nixpkgs }: let outputs = inputs@{ self, nixpkgs }: let

View File

@ -52,6 +52,11 @@ let
in { in {
# 22.05 has a module for this, but it's incompatible and snipe-it version is
# outdated, so keep this around until users had a chance to migrate to the
# upstream version.
disabledModules = [ "services/web-apps/snipe-it.nix" ];
options.services.snipe-it = { options.services.snipe-it = {
enable = mkEnableOption "Snipe-IT free open source IT asset management"; enable = mkEnableOption "Snipe-IT free open source IT asset management";