diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-02 02:18:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 02:18:22 +0100 |
| commit | b2b921bdcaa82044df338e508fbb6348b8e7a344 (patch) | |
| tree | d48b538425397096ce03d4b2bc04a7b919f04de5 /pkgs/top-level | |
| parent | 5c753f53d8bc74fe03c975db9e43570faf5ebc95 (diff) | |
| parent | 317249e5aec33c4995ee53ee11513ddd571e3b53 (diff) | |
| download | nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.gz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.bz2 nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.lz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.xz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.zst nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.zip | |
Merge pull request #53149 from jtojnar/qrencode-cleanup
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 992f578c211c..a2ca284f18dd 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 { }; @@ -17404,7 +17402,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 { }; |