diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-24 22:52:34 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-24 22:52:34 +0000 |
commit | dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5 (patch) | |
tree | 250ccfe471384195aab6abebdde5b029ce6a3f78 /pkgs/top-level | |
parent | c8293a6f8a9e2e9a6a509ec097566e52139b2c19 (diff) | |
parent | a7fe887c538a25674a2960489895a992fe841d21 (diff) | |
download | nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar.gz nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar.bz2 nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar.lz nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar.xz nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.tar.zst nixpkgs-dd2233fe6a2f93a8e3d5d986c757f6a4f4e0afc5.zip |
Merge pull request #129950 from hexagonal-sun/hamlib-bump
hamlib: 3.3 -> 4.2
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be51f79dca..ced988d8606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5509,7 +5509,9 @@ in gpp = callPackage ../development/tools/gpp { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { + hamlib = hamlib_4; + }; gptfdisk = callPackage ../tools/system/gptfdisk { }; @@ -15762,7 +15764,9 @@ in gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; - hamlib = callPackage ../development/libraries/hamlib { }; + hamlib = hamlib_3; + hamlib_3 = callPackage ../development/libraries/hamlib { }; + hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; @@ -23517,7 +23521,9 @@ in python3Packages = python37Packages; }; - cqrlog = callPackage ../applications/radio/cqrlog { }; + cqrlog = callPackage ../applications/radio/cqrlog { + hamlib = hamlib_4; + }; crun = callPackage ../applications/virtualization/crun {}; @@ -23596,7 +23602,9 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/radio/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { + hamlib = hamlib_4; + }; dirt = callPackage ../applications/audio/dirt {}; @@ -23928,7 +23936,9 @@ in flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { }; + fldigi = callPackage ../applications/radio/fldigi { + hamlib = hamlib_4; + }; flink = callPackage ../applications/networking/cluster/flink { }; |