nur-packages

commit 219fc78c99df5fdd24e0ea75501d5aaa7423530d
parent 567d519e1c9fc402c2047bd16505567f52ffb47e
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Fri, 29 Jan 2021 02:34:52 +0300

Drop nixos-19.09, nixos-20.09 support

Diffstat:
M
.github/workflows/build.yml
 | 
1
-
M
pkgs/default.nix
 | 
16
+++-------------

2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,6 @@ jobs:
         nixPath:
           - nixpkgs=channel:nixos-unstable
           - nixpkgs=channel:nixpkgs-unstable
-          - nixpkgs=channel:nixos-20.09
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -170,13 +170,7 @@ lib.makeScope newScope (
     redict = libsForQt5.callPackage ./dict/redict {
       inherit sources;
     };
-    stardict-tools =
-      # Needed for nixos-19.09
-      if pkgs ? libmysql
-      then callPackage ./dict/stardict-tools {
-        libmysqlclient = libmysql;
-      }
-      else callPackage ./dict/stardict-tools { };
+    stardict-tools = callPackage ./dict/stardict-tools { };
     tatoebatools = callPackage ./dict/tatoebatools { };
     zdict = callPackage ./dict/zdict { };
 
@@ -226,12 +220,8 @@ lib.makeScope newScope (
         nlsSupport = false;
       };
     };
-    docker-mbtileserver = if pkgs ? mbtileserver
-      then callPackage ./images/mbtileserver { }
-      else null;
-    docker-quark = if pkgs.dockerTools ? fakeNss
-      then callPackage ./images/quark { }
-      else null;
+    docker-mbtileserver = callPackage ./images/mbtileserver { };
+    docker-quark = callPackage ./images/quark { };
     docker-wekan = callPackage ./images/wekan { };
 
     ### MISC