diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f06c190882..43bd7c04aaa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1379,6 +1379,8 @@ in eschalot = callPackage ../tools/security/eschalot { }; + esphome = callPackage ../servers/home-assistant/esphome.nix { }; + esptool = callPackage ../tools/misc/esptool { }; esptool-ck = callPackage ../tools/misc/esptool-ck { }; @@ -6524,6 +6526,11 @@ in any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); + bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { }); + bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix { + interactive = true; + withDocs = true; + }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/4.4.nix { @@ -10817,33 +10824,6 @@ in libgadu = callPackage ../development/libraries/libgadu { }; - gap-libgap-compatible = let - version = "4r8p6"; - pkgVer = "2016_11_12-14_25"; - in - (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: { - name = "libgap-${oldAttrs.pname}-${version}"; - inherit version; - src = fetchurl { - url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; - sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b"; - }; - patches = [ - # don't install any packages by default (needed for interop with libgap, probably obsolete with 4r10 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/nodefaultpackages.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1xwj766m3axrxbkyx13hy3q8s2wkqxy3m6mgpwq3c3n4vk3v416v"; - }) - - # fix infinite loop in writeandcheck() when writing an error message fails. - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1"; - }) - ]; - }); - libgap = callPackage ../development/libraries/libgap { }; - libgda = callPackage ../development/libraries/libgda { }; libgdamm = callPackage ../development/libraries/libgdamm { }; @@ -12118,6 +12098,8 @@ in qtxmlpatterns = qt59.qtxmlpatterns; }; + pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; + re2 = callPackage ../development/libraries/re2 { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; @@ -12395,6 +12377,8 @@ in readline70 = callPackage ../development/libraries/readline/7.0.nix { }; + readline80 = callPackage ../development/libraries/readline/8.0.nix { }; + readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -13135,7 +13119,7 @@ in yojimbo = callPackage ../development/libraries/yojimbo { }; - yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { }; + yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; @@ -15393,6 +15377,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + agave = callPackage ../data/fonts/agave { }; + aileron = callPackage ../data/fonts/aileron { }; andagii = callPackage ../data/fonts/andagii { }; @@ -15401,6 +15387,9 @@ in android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; + ankacoder = callPackage ../data/fonts/ankacoder { }; + ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; + anonymousPro = callPackage ../data/fonts/anonymous-pro { }; ant-theme = callPackage ../data/themes/ant-theme { }; @@ -15437,6 +15426,8 @@ in charis-sil = callPackage ../data/fonts/charis-sil { }; + cherry = callPackage ../data/fonts/cherry { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -15583,6 +15574,8 @@ in hanazono = callPackage ../data/fonts/hanazono { }; + hermit = callPackage ../data/fonts/hermit { }; + hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; @@ -15659,6 +15652,8 @@ in # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); + luculent = callPackage ../data/fonts/luculent { }; + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -16046,7 +16041,7 @@ in androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; - android-studio-preview = androidStudioPackages.beta; + android-studio-preview = androidStudioPackages.preview; animbar = callPackage ../applications/graphics/animbar { }; @@ -19694,6 +19689,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tdrop = callPackage ../applications/misc/tdrop { }; + tree = callPackage ../tools/system/tree {}; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; @@ -22000,7 +21997,9 @@ in gap = callPackage ../applications/science/math/gap { }; - gap-minimal = lowPrio (gap.override { keepAllPackages = false; }); + gap-minimal = lowPrio (gap.override { packageSet = "minimal"; }); + + gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; @@ -23114,6 +23113,8 @@ in callPackage ../applications/networking/znc/modules.nix { } ); + zoneminder = callPackage ../servers/zoneminder { }; + zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; xcpc = callPackage ../misc/emulators/xcpc { }; |