diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-12-01 15:54:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 15:54:46 +0000 |
| commit | bfed0522b63da2b7696f935bd45cf6f49b2080b2 (patch) | |
| tree | c70d91e306d4df8a50c2c9d1196436a57b2a0b34 /pkgs/top-level | |
| parent | 474378411f553e81f463210f22e7c409a147d75f (diff) | |
| parent | b60d5692bf44337bc2081caf634ac3b60a8512e5 (diff) | |
| download | nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar.gz nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar.bz2 nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar.lz nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar.xz nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.tar.zst nixpkgs-bfed0522b63da2b7696f935bd45cf6f49b2080b2.zip | |
Merge pull request #74656 from Elyhaka/master
libfprint: 1.0 -> 1.90
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61645c41986..cc92b56da57 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -115,6 +115,7 @@ mapAliases ({ ''; font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 foomatic_filters = foomatic-filters; # 2016-08 + fprintd-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override."; fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 @@ -193,6 +194,7 @@ mapAliases ({ liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 + libfprint-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override."; libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5353048d830..76fd9bb8c84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3303,9 +3303,6 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-thinkpad = fprintd.override { - thinkpad = true; - }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -12222,9 +12219,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; |