diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-10-21 21:09:56 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-10-26 10:40:16 -0400 |
commit | 50e5139893f8a79e3555a8f66cbb7c21dc80500d (patch) | |
tree | be22018575b99689949922b629647271f46aebfc /nixos | |
parent | 2c858f06aa99830f50b5caa60e006a3198e3815c (diff) | |
download | nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar.gz nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar.bz2 nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar.lz nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar.xz nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.tar.zst nixlib-50e5139893f8a79e3555a8f66cbb7c21dc80500d.zip |
redmine: drop 3.4.x package
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/redmine.nix | 15 | ||||
-rw-r--r-- | nixos/tests/redmine.nix | 13 |
2 files changed, 7 insertions, 21 deletions
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 24b9e27ac2da..bf9a6914a483 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -62,20 +62,11 @@ in services.redmine = { enable = mkEnableOption "Redmine"; - # default to the 4.x series not forcing major version upgrade of those on the 3.x series package = mkOption { type = types.package; - default = if versionAtLeast config.system.stateVersion "19.03" - then pkgs.redmine_4 - else pkgs.redmine - ; - defaultText = "pkgs.redmine"; - description = '' - Which Redmine package to use. This defaults to version 3.x if - <literal>system.stateVersion < 19.03</literal> and version 4.x - otherwise. - ''; - example = "pkgs.redmine_4.override { ruby = pkgs.ruby_2_4; }"; + default = pkgs.redmine; + description = "Which Redmine package to use."; + example = "pkgs.redmine.override { ruby = pkgs.ruby_2_4; }"; }; user = mkOption { diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 2d4df288b055..f0f4cbf6a21c 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -64,18 +64,13 @@ let }; in { - v3-mysql = mysqlTest pkgs.redmine // { - name = "v3-mysql"; + mysql = mysqlTest pkgs.redmine // { + name = "mysql"; meta.maintainers = [ maintainers.aanderse ]; }; - v4-mysql = mysqlTest pkgs.redmine_4 // { - name = "v4-mysql"; - meta.maintainers = [ maintainers.aanderse ]; - }; - - v4-pgsql = pgsqlTest pkgs.redmine_4 // { - name = "v4-pgsql"; + pgsql = pgsqlTest pkgs.redmine // { + name = "pgsql"; meta.maintainers = [ maintainers.aanderse ]; }; } |