diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-14 00:05:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-14 00:05:23 +0000 |
commit | 6e10550c38ae245a2d4f3ed8a62ea62336c94948 (patch) | |
tree | 9c99172fd2f2bddc2bcf03392d5247ceaf2e0dc3 /pkgs/top-level/all-packages.nix | |
parent | 3e19234f34b4ac3090771e9b72e24870e820486a (diff) | |
parent | 5fa835b33c0a2ff32f12e8f0311d788a53512cec (diff) | |
download | nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar.gz nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar.bz2 nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar.lz nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar.xz nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.tar.zst nixpkgs-6e10550c38ae245a2d4f3ed8a62ea62336c94948.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254651a4f5b..3888d415ca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1566,6 +1566,8 @@ in gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; @@ -5546,7 +5548,17 @@ in grub2 = grub2_full; - grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20200223"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; + sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; + }; + }); + }; grub2_efi = grub2.override { efiSupport = true; @@ -8224,8 +8236,6 @@ in quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; - q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; @@ -9134,6 +9144,10 @@ in squeekboard = callPackage ../applications/accessibility/squeekboard { }; + sx = callPackage ../tools/X11/sx { + inherit (xorg) xauth xorgserver; + }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; @@ -13728,6 +13742,8 @@ in augustus = callPackage ../games/augustus { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; kafkacat = callPackage ../development/tools/kafkacat { }; @@ -25669,6 +25685,8 @@ in rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { }; + rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; + ympd = callPackage ../applications/audio/ympd { }; # a somewhat more maintained fork of ympd @@ -27214,6 +27232,8 @@ in tempo = callPackage ../servers/tracing/tempo {}; + temporal = callPackage ../applications/networking/cluster/temporal { }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = python3Packages.callPackage ../applications/misc/termdown { }; |