diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-01 17:19:07 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-01 17:19:07 +0100 |
| commit | c5c2ac4f45959727b043b3478f28829fac36fffb (patch) | |
| tree | 6ae91c6eaf225617ecb248df10c388e0a6197cba /pkgs/top-level | |
| parent | 559916f6480b0cd745e52970dd1167ce7abbc6b1 (diff) | |
| download | nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.gz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.bz2 nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.lz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.xz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.zst nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.zip | |
qrencode: merge with libqrencode
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 51916f3146eb..90136f86acaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -171,6 +171,7 @@ mapAliases ({ libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient + libqrencode = qrencode; # added 2019-01-01 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c29d384a77fa..fda0fcc95892 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3992,8 +3992,6 @@ in libqmi = callPackage ../development/libraries/libqmi { }; - libqrencode = callPackage ../development/libraries/libqrencode { }; - libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; @@ -17429,7 +17427,7 @@ in java = if stdenv.isLinux then jre else jdk; }; - qrencode = callPackage ../tools/graphics/qrencode { }; + qrencode = callPackage ../development/libraries/qrencode { }; geeqie = callPackage ../applications/graphics/geeqie { }; |