diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 6 |
5 files changed, 41 insertions, 22 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3a7e74a0ae38..1451c8be95ab4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1507,9 +1507,9 @@ mapAliases ({ inherit (plasma5Packages) akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk - breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook - kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary @@ -1522,8 +1522,8 @@ mapAliases ({ plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake - zanshin + sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde + yakuake zanshin ; inherit (plasma5Packages.thirdParty) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8f903a1aa80b..4a0fb8dd685d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -409,6 +409,8 @@ with pkgs; protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; + protolint = callPackage ../development/tools/protolint { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -4117,6 +4119,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + snazy = callPackage ../development/tools/snazy { }; + snippetpixie = callPackage ../tools/text/snippetpixie { }; snowcat = callPackage ../tools/security/snowcat { }; @@ -7170,6 +7174,8 @@ with pkgs; usePulseaudio = true; }; + jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -10949,6 +10955,10 @@ with pkgs; trytond = with python3Packages; toPythonApplication trytond; + tun2socks = callPackage ../tools/networking/tun2socks { + buildGoModule = buildGo118Module; + }; + tuntox = callPackage ../tools/networking/tuntox { }; omapd = callPackage ../tools/security/omapd { }; @@ -17829,6 +17839,8 @@ with pkgs; idasen = with python3Packages; toPythonApplication idasen; + ikill = callPackage ../tools/misc/ikill { }; + ilbc = callPackage ../development/libraries/ilbc { }; ilmbase = callPackage ../development/libraries/ilmbase { }; @@ -19262,6 +19274,8 @@ with pkgs; libviper = callPackage ../development/libraries/libviper { }; + libviperfx = callPackage ../development/libraries/libviperfx { }; + libvpx = callPackage ../development/libraries/libvpx { }; libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; @@ -19963,7 +19977,6 @@ with pkgs; polkit = callPackage ../development/libraries/polkit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; - poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; poppler_gi = lowPrio (poppler.override { introspectionSupport = true; @@ -25337,10 +25350,7 @@ with pkgs; calibre-web = callPackage ../servers/calibre-web { }; - calligra = libsForQt5.callPackage ../applications/office/calligra { - # Must use the same Qt version as Calligra itself: - poppler = libsForQt5.poppler_0_61; - }; + calligra = libsForQt5.callPackage ../applications/office/calligra { }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -25937,8 +25947,6 @@ with pkgs; icesl = callPackage ../applications/misc/icesl { }; - kalendar = libsForQt5.callPackage ../applications/office/kalendar { }; - keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -26954,6 +26962,8 @@ with pkgs; sonixd = callPackage ../applications/audio/sonixd { }; + sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; + spectmorph = callPackage ../applications/audio/spectmorph { }; smallwm = callPackage ../applications/window-managers/smallwm { }; @@ -29076,8 +29086,6 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; - quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; libmodplug = null; @@ -29499,8 +29507,6 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; @@ -30210,6 +30216,9 @@ with pkgs; uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { }; + viper4linux = callPackage ../applications/audio/viper4linux { }; + viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { }; + vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = libsForQt5.callPackage ../applications/video/vlc { @@ -35243,4 +35252,6 @@ with pkgs; honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; + + mictray = callPackage ../tools/audio/mictray { }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6bb539550a2d5..ee20285a90085 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23222,7 +23222,11 @@ let url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; - buildInputs = [ ListMoreUtils TestDifferences TestException ]; + nativeBuildInputs = [ shortenPerlShebang ]; + checkInputs = [ ListMoreUtils TestDifferences TestException ]; + postInstall = '' + shortenPerlShebang $out/bin/Markdown.pl + ''; }; TextMarkdownHoedown = buildPerlModule { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b32adce0dc501..2214db668cdf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3887,8 +3887,12 @@ in { httplib2 = callPackage ../development/python-modules/httplib2 { }; + http-message-signatures = callPackage ../development/python-modules/http-message-signatures { }; + http-parser = callPackage ../development/python-modules/http-parser { }; + http-sfv = callPackage ../development/python-modules/http-sfv { }; + httpretty = callPackage ../development/python-modules/httpretty { }; httpserver = callPackage ../development/python-modules/httpserver { }; @@ -5742,6 +5746,8 @@ in { nunavut = callPackage ../development/python-modules/nunavut { }; + nutils = callPackage ../development/python-modules/nutils { }; + nvchecker = callPackage ../development/python-modules/nvchecker { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -9816,6 +9822,8 @@ in { stringcase = callPackage ../development/python-modules/stringcase { }; + stringly = callPackage ../development/python-modules/stringly { }; + stripe = callPackage ../development/python-modules/stripe { }; striprtf = callPackage ../development/python-modules/striprtf { }; @@ -10277,6 +10285,8 @@ in { transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + treelog = callPackage ../development/python-modules/treelog { }; + treeo = callPackage ../development/python-modules/treeo { }; treex = callPackage ../development/python-modules/treex { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 72d2a77d2832e..0b1324b867272 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -168,12 +168,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea suffix = "qt5"; }; - poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { - lcms = pkgs.lcms2; - qt5Support = true; - suffix = "qt5"; - }; - pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; |