diff options
Diffstat (limited to 'pkgs')
229 files changed, 1768 insertions, 2827 deletions
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 34f5667bfca..a978b67c5dc 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig -, wafHook }: +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 51f895ea2d5..7cc431583ed 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.3"; pname = "game-music-emu"; src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2"; - sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; + sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; buildInputs = [ cmake ]; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ luc65r ]; }; } diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 2464abb6585..6e96bf45294 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: +{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index eb5672fe135..f2f3734ec2e 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; - preFixup = '' - gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - ''; - meta = with stdenv.lib; { homepage = "https://www.mopidy.com/"; description = '' diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix index 121e93d3f5c..474672dfd7d 100644 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-calendar"; + pname = "akonadi-calendar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index b09058b60be..2076723a372 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "akonadi-contacts"; + pname = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix index cc1acbc6dd0..26b373fb330 100644 --- a/pkgs/applications/kde/akonadi-import-wizard.nix +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-import-wizard"; + pname = "akonadi-import-wizard"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 0ed958b4e77..fbd028b1ec2 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-mime"; + pname = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix index 72c4d799239..6db7e00be9b 100644 --- a/pkgs/applications/kde/akonadi-notes.nix +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-notes"; + pname = "akonadi-notes"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix index 23ee6b1b9cc..495b63abd44 100644 --- a/pkgs/applications/kde/akonadi-search.nix +++ b/pkgs/applications/kde/akonadi-search.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-search"; + pname = "akonadi-search"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 6ffe1e2de8a..3c6ed88aa9b 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi"; + pname = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index a02400847bb..76e5ca480b4 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "akonadiconsole"; + pname = "akonadiconsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix index 98d53bc8083..5cacfe0c04f 100644 --- a/pkgs/applications/kde/akregator.nix +++ b/pkgs/applications/kde/akregator.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "akregator"; + pname = "akregator"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 76cc423f546..69a56254d65 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -20,7 +20,7 @@ let in mkDerivation { - name = "ark"; + pname = "ark"; meta = { description = "Graphical file compression/decompression utility"; license = with lib.licenses; diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index 3479b6600fc..887e7ea2986 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "baloo-widgets"; + pname = "baloo-widgets"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix index f42a6a01871..c2a5329ee2a 100644 --- a/pkgs/applications/kde/bomber.nix +++ b/pkgs/applications/kde/bomber.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bomber"; + pname = "bomber"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bomber"; description = "A single player arcade game"; diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix index 4bd3113a051..989a80aa29f 100644 --- a/pkgs/applications/kde/bovo.nix +++ b/pkgs/applications/kde/bovo.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bovo"; + pname = "bovo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bovo"; description = "Five in a row application"; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 1537bd25d55..b316ab4e568 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,16 +1,23 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: mkDerivation { - name = "calendarsupport"; + pname = "calendarsupport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch"; + sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 1f0f7b5ace3..f60ac76653d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -35,15 +35,13 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; - inherit (srcs.${sname}) src version; + inherit (args) pname; + inherit (srcs.${pname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in mkDerivation (args // { - pname = name; - inherit src version; + inherit pname version src; outputs = args.outputs or [ "out" ]; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index 5580952f40a..37613f86a7f 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "dolphin-plugins"; + pname = "dolphin-plugins"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 76d4e989e8c..3774c7e00b6 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "dolphin"; + pname = "dolphin"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix index 9dd55ec4b9c..0ce6459e3f6 100644 --- a/pkgs/applications/kde/dragon.nix +++ b/pkgs/applications/kde/dragon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "dragon"; + pname = "dragon"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; description = "A simple media player for KDE"; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 5a77cfec2f5..6252e53078f 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -19,7 +19,7 @@ }: mkDerivation rec { - name = "elisa"; + pname = "elisa"; buildInputs = [ libvlc ]; diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index 495491f6d3c..1a6cc9442b9 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "eventviews"; + pname = "eventviews"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index dc023c57a7e..e3bba77f972 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.2/src) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 225efba3768..2a8b82352b4 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ffmpegthumbs"; + pname = "ffmpegthumbs"; meta = { license = with lib.licenses; [ gpl2 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index a3be5be7f0a..1aeff531862 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "filelight"; + pname = "filelight"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix index c02fa0fef2e..b4aa2168e0d 100644 --- a/pkgs/applications/kde/granatier.nix +++ b/pkgs/applications/kde/granatier.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "granatier"; + pname = "granatier"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.granatier"; description = "Clone of the classic Bomberman game"; diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 92a0f1cde49..517cb072f74 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "grantleetheme"; + pname = "grantleetheme"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 3d03d1dea3e..0cd884d5401 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "gwenview"; + pname = "gwenview"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 30955d1c274..981c184d151 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "incidenceeditor"; + pname = "incidenceeditor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 35d55787ec7..cc9763961f8 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "k3b"; + pname = "k3b"; meta = with lib; { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ sander phreedom ]; diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index b4b0450e78b..452c5142157 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, @@ -8,11 +8,18 @@ }: mkDerivation { - name = "kaddressbook"; + pname = "kaddressbook"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch"; + sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index a1dec1179cc..70ee3f74185 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -16,7 +16,7 @@ }: mkDerivation { - name = "kalarm"; + pname = "kalarm"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index 356c1e4812d..5671174e9b1 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kalarmcal"; + pname = "kalarmcal"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix index cf579caa9cc..3f51f068815 100644 --- a/pkgs/applications/kde/kalzium.nix +++ b/pkgs/applications/kde/kalzium.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: mkDerivation { - name = "kalzium"; + pname = "kalzium"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium"; description = "Program that shows you the Periodic Table of Elements"; diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix index 5f4cc40138c..01fa984e593 100644 --- a/pkgs/applications/kde/kapman.nix +++ b/pkgs/applications/kde/kapman.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kapman"; + pname = "kapman"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kapman"; description = "Clone of the well known game Pac-Man"; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix index a5e211318a2..7251648be09 100644 --- a/pkgs/applications/kde/kapptemplate.nix +++ b/pkgs/applications/kde/kapptemplate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kapptemplate"; + pname = "kapptemplate"; nativeBuildInputs = [ extra-cmake-modules cmake ]; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index e0d0273efde..1cc16496d12 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kate"; + pname = "kate"; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix index 2690cfc0589..aa00d58c417 100644 --- a/pkgs/applications/kde/katomic.nix +++ b/pkgs/applications/kde/katomic.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "katomic"; + pname = "katomic"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.katomic"; description = "Fun educational game built around molecular geometry"; diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix index ce0d8e36b91..9f2f652f558 100644 --- a/pkgs/applications/kde/kblackbox.nix +++ b/pkgs/applications/kde/kblackbox.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblackbox"; + pname = "kblackbox"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; description = "Game of hide and seek played on a grid of boxes"; diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix index a11a6e25744..971901687f0 100644 --- a/pkgs/applications/kde/kblocks.nix +++ b/pkgs/applications/kde/kblocks.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblocks"; + pname = "kblocks"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; description = "Classic falling blocks game"; diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix index b67e3ce0217..d96c0f7f827 100644 --- a/pkgs/applications/kde/kbounce.nix +++ b/pkgs/applications/kde/kbounce.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }: mkDerivation { - name = "kbounce"; + pname = "kbounce"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; description = "Single player arcade game with the elements of puzzle"; diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix index fbcddd46ca8..cf60ada3c00 100644 --- a/pkgs/applications/kde/kbreakout.nix +++ b/pkgs/applications/kde/kbreakout.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "kbreakout"; + pname = "kbreakout"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 16fc6c51777..308ed35dc4e 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcachegrind"; + pname = "kcachegrind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 4e2a308b17f..b24046df5f5 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalc"; + pname = "kcalc"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.fridh ]; diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 2e389ec4ac7..1fce68e7f46 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalutils"; + pname = "kcalutils"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix index 4af712b1d5a..d35ee5ee670 100644 --- a/pkgs/applications/kde/kcharselect.nix +++ b/pkgs/applications/kde/kcharselect.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcharselect"; + pname = "kcharselect"; meta = { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 45b32fbe832..87ab2271561 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcolorchooser"; + pname = "kcolorchooser"; meta = { license = with lib.licenses; [ mit ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index a58e1b25a2e..f4dd7ec145d 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kdebugsettings"; + pname = "kdebugsettings"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 83e54d1fa80..8c7b2b635c0 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -26,15 +26,7 @@ }: mkDerivation { - name = "kdeconnect-kde"; - - patches = [ - # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 - (fetchpatch { - url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff"; - sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac"; - }) - ]; + pname = "kdeconnect-kde"; buildInputs = [ kcmutils diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index e5f5b88ec44..bdfe5102c01 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdegraphics-mobipocket"; + pname = "kdegraphics-mobipocket"; meta = { license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 2e7887582f9..10280be3c30 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kdegraphics-thumbnailers"; + pname = "kdegraphics-thumbnailers"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index d251eb74f27..94656b02671 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdenetwork-filesharing"; + pname = "kdenetwork-filesharing"; meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b2abee57939..47afcd0a67e 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -35,7 +35,7 @@ }: mkDerivation { - name = "kdenlive"; + pname = "kdenlive"; nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index e47aae89e60..0939b0ecd26 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-addons"; + pname = "kdepim-addons"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index 57c02ea4e84..19f476fd781 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdepim-apps-libs"; + pname = "kdepim-apps-libs"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index e0a5d43e654..335284aa6c4 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-runtime"; + pname = "kdepim-runtime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index eef94fd5eb2..5c196d6a3b1 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdf"; + pname = "kdf"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.peterhoeg ]; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix index df301af0cba..192bfda4c27 100644 --- a/pkgs/applications/kde/kdialog.nix +++ b/pkgs/applications/kde/kdialog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdialog"; + pname = "kdialog"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix index 6c124f9450e..040806fd08e 100644 --- a/pkgs/applications/kde/kdiamond.nix +++ b/pkgs/applications/kde/kdiamond.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }: mkDerivation { - name = "kdiamond"; + pname = "kdiamond"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; description = "A single player puzzle game"; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index efe247df737..9deb1a3c015 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "keditbookmarks"; + pname = "keditbookmarks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix index 10932b38032..fa0ef1c9220 100644 --- a/pkgs/applications/kde/kfind.nix +++ b/pkgs/applications/kde/kfind.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kfind"; + pname = "kfind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.iblech ]; diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix index a8747047f42..a88fd9283e0 100644 --- a/pkgs/applications/kde/kfloppy.nix +++ b/pkgs/applications/kde/kfloppy.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: mkDerivation { - name = "kfloppy"; + pname = "kfloppy"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; description = "Utility to format 3.5\" and 5.25\" floppy disks"; diff --git a/pkgs/applications/kde/kgeography.nix b/pkgs/applications/kde/kgeography.nix index c96c198cca9..7a5d5516b5e 100644 --- a/pkgs/applications/kde/kgeography.nix +++ b/pkgs/applications/kde/kgeography.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgeography"; + pname = "kgeography"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.globin ]; diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix index 6a50f1d08d1..b03246eacd5 100644 --- a/pkgs/applications/kde/kget.nix +++ b/pkgs/applications/kde/kget.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kget"; + pname = "kget"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 944cff47e0d..32ba95231cd 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kgpg"; + pname = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 69b629bbeb9..77f30d8e69b 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "khelpcenter"; + pname = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix index 92fcc238779..789206a1639 100644 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kidentitymanagement"; + pname = "kidentitymanagement"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 7b858907795..1ca57d91c19 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kig"; + pname = "kig"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ raskin ]; diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix index 6585f943f2a..238158b524b 100644 --- a/pkgs/applications/kde/kigo.nix +++ b/pkgs/applications/kde/kigo.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "kigo"; + pname = "kigo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kigo"; description = "An open-source implementation of the popular Go game"; diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix index ec9b6de82c9..ef81c3b5ec1 100644 --- a/pkgs/applications/kde/killbots.nix +++ b/pkgs/applications/kde/killbots.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "killbots"; + pname = "killbots"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.killbots"; description = "A game where you avoid robots"; diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index 9e42c571058..e93804bd885 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kimap"; + pname = "kimap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index a803ba72982..fdc531d5d12 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kio-extras"; + pname = "kio-extras"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix index 180d066a87c..d79980a3a6f 100644 --- a/pkgs/applications/kde/kipi-plugins.nix +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kipi-plugins"; + pname = "kipi-plugins"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 303ea6162ba..cc71307f1ac 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kitinerary"; + pname = "kitinerary"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix index 14a8aea5e67..888ac59ddfb 100644 --- a/pkgs/applications/kde/kldap.nix +++ b/pkgs/applications/kde/kldap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kldap"; + pname = "kldap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index c15c6eb78d6..f1f8ae9b375 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kleopatra"; + pname = "kleopatra"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix index aaddceb7bd6..ca63c4f456e 100644 --- a/pkgs/applications/kde/klettres.nix +++ b/pkgs/applications/kde/klettres.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }: mkDerivation { - name = "klettres"; + pname = "klettres"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.klettres"; description = "An application specially designed to help the user to learn an alphabet"; diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix index 7fadf409bd3..336ea9a2506 100644 --- a/pkgs/applications/kde/klines.nix +++ b/pkgs/applications/kde/klines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "klines"; + pname = "klines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.klines"; description = "A simple but highly addictive one player game"; diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix index fdac690cf22..ba1bb8d1851 100644 --- a/pkgs/applications/kde/kmag.nix +++ b/pkgs/applications/kde/kmag.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "kmag"; + pname = "kmag"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; description = "A small Linux utility to magnify a part of the screen"; diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix index 93588b241e1..285cf8adff5 100644 --- a/pkgs/applications/kde/kmahjongg.nix +++ b/pkgs/applications/kde/kmahjongg.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kmahjongg"; + pname = "kmahjongg"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; meta = { diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index f380315cce9..c0ab4ff947e 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmail-account-wizard"; + pname = "kmail-account-wizard"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index d225eba8223..fa3fe033035 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "kmail"; + pname = "kmail"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index d5832db570c..5efdc959afb 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmailtransport"; + pname = "kmailtransport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix index c1348edf3f6..6f3db970b94 100644 --- a/pkgs/applications/kde/kmbox.nix +++ b/pkgs/applications/kde/kmbox.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmbox"; + pname = "kmbox"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index ac877d85228..51e78b5f649 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmime"; + pname = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix index edf3114244b..66131df26c1 100644 --- a/pkgs/applications/kde/kmines.nix +++ b/pkgs/applications/kde/kmines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }: mkDerivation { - name = "kmines"; + pname = "kmines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kmines"; description = "A classic Minesweeper game"; diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 8010c57d927..207fba8e77b 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmix"; + pname = "kmix"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.rongcuid ]; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix index c0c00f21340..04ccb809c79 100644 --- a/pkgs/applications/kde/kmplot.nix +++ b/pkgs/applications/kde/kmplot.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kmplot"; + pname = "kmplot"; meta = { license = with lib.licenses; [ gpl2Plus fdl12 ]; maintainers = [ lib.maintainers.orivej ]; diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix index 669f9961a49..155faf4e539 100644 --- a/pkgs/applications/kde/knavalbattle.nix +++ b/pkgs/applications/kde/knavalbattle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }: mkDerivation { - name = "knavalbattle"; + pname = "knavalbattle"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; description = "Naval Battle is a ship sinking game"; diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix index f34bb84f0a0..3a863b40a1c 100644 --- a/pkgs/applications/kde/knetwalk.nix +++ b/pkgs/applications/kde/knetwalk.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "knetwalk"; + pname = "knetwalk"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; description = "A single player logic game"; diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix index 8b71493ff18..084a2349fc1 100644 --- a/pkgs/applications/kde/knights.nix +++ b/pkgs/applications/kde/knights.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }: mkDerivation { - name = "knights"; + pname = "knights"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knights"; description = "A chess game"; diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix index 2dc2f48c149..75b92eb07bb 100644 --- a/pkgs/applications/kde/knotes.nix +++ b/pkgs/applications/kde/knotes.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "knotes"; + pname = "knotes"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kcrash diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix index f9fa31b665b..2f1189855be 100644 --- a/pkgs/applications/kde/kolf.nix +++ b/pkgs/applications/kde/kolf.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kolf"; + pname = "kolf"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libkdegames kio ktextwidgets ]; meta = { diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix index 6cb9995459a..806b2f59233 100644 --- a/pkgs/applications/kde/kollision.nix +++ b/pkgs/applications/kde/kollision.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kollision"; + pname = "kollision"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kollision"; description = "A casual game"; diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index 4501324a871..66746cf466d 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kolourpaint"; + pname = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkexiv2 ]; meta = { diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index 3a264e40257..a449a1e4f51 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kompare"; + pname = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index 62ed3db063e..72fcf8ff220 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "konqueror"; + pname = "konqueror"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support kcmutils khtml kdesu diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix index cfef018de6c..7802b9c66c3 100644 --- a/pkgs/applications/kde/konquest.nix +++ b/pkgs/applications/kde/konquest.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konquest"; + pname = "konquest"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkdegames qtquickcontrols ]; meta = { diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index ed26dc08bb6..b49507e0b8e 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konsole"; + pname = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ ttuegel turion ]; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index eb28458392c..3dfa28e9dfe 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kontact"; + pname = "kontact"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index f2df628f301..b7e033deb0a 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kontactinterface"; + pname = "kontactinterface"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index 2f37a1bac0f..f28e0406b13 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "korganizer"; + pname = "korganizer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix index 9ee57353237..d1e47af6b72 100644 --- a/pkgs/applications/kde/kpat.nix +++ b/pkgs/applications/kde/kpat.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kpat"; + pname = "kpat"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 6f79a46202b..2948075f696 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kpimtextedit"; + pname = "kpimtextedit"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index f31b37de931..e7b81477122 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kpkpass"; + pname = "kpkpass"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix index 2b3dc5313d9..669a38e37ca 100644 --- a/pkgs/applications/kde/kqtquickcharts.nix +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kqtquickcharts"; + pname = "kqtquickcharts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 2b0a1a5c514..01cc39d9895 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "krdc"; + pname = "krdc"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix index 9f4be46738b..351555b5f33 100644 --- a/pkgs/applications/kde/kreversi.nix +++ b/pkgs/applications/kde/kreversi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }: mkDerivation { - name = "kreversi"; + pname = "kreversi"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kreversi"; description = "A simple one player strategy game played against the computer"; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d2b96bf6100..aa280d019b1 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "krfb"; + pname = "krfb"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = with lib.maintainers; [ jerith666 ]; diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix index 2018245cfcb..460675e8cb1 100644 --- a/pkgs/applications/kde/kruler.nix +++ b/pkgs/applications/kde/kruler.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kruler"; + pname = "kruler"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.vandenoever ]; diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix index 5be17bb8ee0..791e95af690 100644 --- a/pkgs/applications/kde/kshisen.nix +++ b/pkgs/applications/kde/kshisen.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }: mkDerivation { - name = "kshisen"; + pname = "kshisen"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kshisen"; description = "A solitaire-like game played using the standard set of Mahjong tiles"; diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix index 6a5f51a17bf..3bf80f4abf5 100644 --- a/pkgs/applications/kde/ksmtp/default.nix +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksmtp"; + pname = "ksmtp"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix index b18a3e7cf8f..49ef76151ea 100644 --- a/pkgs/applications/kde/kspaceduel.nix +++ b/pkgs/applications/kde/kspaceduel.nix @@ -10,10 +10,10 @@ }: mkDerivation { - name = "kspaceduel"; + pname = "kspaceduel"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix index 12d989befe1..b48ee473523 100644 --- a/pkgs/applications/kde/ksquares.nix +++ b/pkgs/applications/kde/ksquares.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }: mkDerivation { - name = "ksquares"; + pname = "ksquares"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; description = "A game of Dots and Boxes"; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix index 678c21d5870..bf59c6e94c3 100644 --- a/pkgs/applications/kde/ksudoku.nix +++ b/pkgs/applications/kde/ksudoku.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "ksudoku"; + pname = "ksudoku"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libGLU kdeclarative libkdegames ]; meta = { diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix index bec92d55966..08f7ffb7e05 100644 --- a/pkgs/applications/kde/ksystemlog.nix +++ b/pkgs/applications/kde/ksystemlog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksystemlog"; + pname = "ksystemlog"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; propagatedBuildInputs = [ karchive kconfig kio ]; diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix index 812a13aa118..639bd933103 100644 --- a/pkgs/applications/kde/kteatime.nix +++ b/pkgs/applications/kde/kteatime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }: mkDerivation { - name = "kteatime"; + pname = "kteatime"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime"; description = "A handy timer for steeping tea"; diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix index bdb8f2c687b..7eab059f1a7 100644 --- a/pkgs/applications/kde/ktimer.nix +++ b/pkgs/applications/kde/ktimer.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "ktimer"; + pname = "ktimer"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer"; description = "A little tool to execute programs after some time"; diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix index 61f8672e47d..c264e0b53ca 100644 --- a/pkgs/applications/kde/ktnef.nix +++ b/pkgs/applications/kde/ktnef.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ktnef"; + pname = "ktnef"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 7e300ea7157..9d31d4ec62b 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -9,7 +9,7 @@ mkDerivation { - name = "ktouch"; + pname = "ktouch"; meta = { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix index c495b16fef7..d178f651545 100644 --- a/pkgs/applications/kde/kturtle.nix +++ b/pkgs/applications/kde/kturtle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }: mkDerivation { - name = "kturtle"; + pname = "kturtle"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle"; description = "An educational programming environment for learning how to program"; diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index e39e7e5157d..b5799a24e36 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "kwalletmanager"; + pname = "kwalletmanager"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 1a831c7c8dd..125e79c2c3c 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -3,7 +3,7 @@ , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { - name = "kwave"; + pname = "kwave"; meta = with lib; { homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix index 69a1b9e99cb..51e3391b8e7 100644 --- a/pkgs/applications/kde/libgravatar.nix +++ b/pkgs/applications/kde/libgravatar.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "libgravatar"; + pname = "libgravatar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index 3fd48605654..3dde4960502 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -3,7 +3,7 @@ , libmusicbrainz5 }: mkDerivation { - name = "libkcddb"; + pname = "libkcddb"; meta = with lib; { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 70e3cb0e195..1419fb0e980 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libraw, qtbase }: mkDerivation { - name = "libkdcraw"; + pname = "libkdcraw"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix index 494b193b832..830837756b8 100644 --- a/pkgs/applications/kde/libkdegames.nix +++ b/pkgs/applications/kde/libkdegames.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "libkdegames"; + pname = "libkdegames"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix index 92716e40a34..cc0c15a9e06 100644 --- a/pkgs/applications/kde/libkdepim.nix +++ b/pkgs/applications/kde/libkdepim.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libkdepim"; + pname = "libkdepim"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 8c8d244d6f6..8d9b3a82032 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }: mkDerivation { - name = "libkexiv2"; + pname = "libkexiv2"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 0e1d71d2745..979ca7e2f45 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkgapi"; + pname = "libkgapi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index c70d8407fc7..e94f0e6c4a8 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: mkDerivation { - name = "libkipi"; + pname = "libkipi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix index 0958a0e605f..dd17345c5f1 100644 --- a/pkgs/applications/kde/libkleo.nix +++ b/pkgs/applications/kde/libkleo.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkleo"; + pname = "libkleo"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index 295b9784268..b14e50f32bc 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkmahjongg"; + pname = "libkmahjongg"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index cae2aec5668..93ac12d97d6 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { - name = "libkomparediff2"; + pname = "libkomparediff2"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; } diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix index f92f21de7fb..33a2ef48f90 100644 --- a/pkgs/applications/kde/libksane.nix +++ b/pkgs/applications/kde/libksane.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libksane"; + pname = "libksane"; meta = with lib; { license = licenses.gpl2; maintainers = with maintainers; [ pshendry ]; diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix index dd33f759c31..209647a4791 100644 --- a/pkgs/applications/kde/libksieve.nix +++ b/pkgs/applications/kde/libksieve.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksieve"; + pname = "libksieve"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index 44edea8f55e..c3a8659a735 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "mailcommon"; + pname = "mailcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index 5de58658777..b1e0461a959 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "mailimporter"; + pname = "mailimporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index f690e453361..525289bdc3b 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "marble"; + pname = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index 0704003353a..eadb27f05bc 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "mbox-importer"; + pname = "mbox-importer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index e31e61d35ca..d47a5504417 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "messagelib"; + pname = "messagelib"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index 2c0f0a5092d..ca7d6124ed5 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "minuet"; + pname = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 288b2ceb807..12537eba270 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "okular"; + pname = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index dd09e8f9cd8..25734e318ab 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "picmi"; + pname = "picmi"; meta = with lib; { description = "Nonogram game"; longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 82cdf19df94..746bb2aec2a 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pim-data-exporter"; + pname = "pim-data-exporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix index c83df2e0e49..1f3f1542cdb 100644 --- a/pkgs/applications/kde/pim-sieve-editor.nix +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "pim-sieve-editor"; + pname = "pim-sieve-editor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 2e74f528aeb..dff5e883cb5 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pimcommon"; + pname = "pimcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f0501ffadee..2ea662419b1 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "print-manager"; + pname = "print-manager"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index feae7ca81de..45362d556a7 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "rocs"; + pname = "rocs"; meta = with lib; { homepage = "https://edu.kde.org/rocs/"; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index b980ea21df2..c6861b218de 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "spectacle"; + pname = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 6966c07ec0a..5ff13eaf240 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-20.08.2.tar.xz"; - sha256 = "d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d"; - name = "akonadi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-20.08.3.tar.xz"; + sha256 = "1hwaan45cyw2nmfmdp5pbhvm00xdxy9la68ms3sa8a67zcsfljhl"; + name = "akonadi-20.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz"; - sha256 = "20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51"; - name = "akonadi-calendar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-20.08.3.tar.xz"; + sha256 = "18rwvn5i6i4ng335rxpwx3a2m4vyq96w9m3fa1gvmr8ls7vkaqrk"; + name = "akonadi-calendar-20.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-tools-20.08.2.tar.xz"; - sha256 = "2069cc3a12f0da3f10181c13d19b1048d8f2e0c0f4a4e14309a7e6f08aa74ab9"; - name = "akonadi-calendar-tools-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-tools-20.08.3.tar.xz"; + sha256 = "1pnm3xi26bnbjmnv9zwi9w5rkr1pdry50hzy3gxw7b0g11zz036w"; + name = "akonadi-calendar-tools-20.08.3.tar.xz"; }; }; akonadiconsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadiconsole-20.08.2.tar.xz"; - sha256 = "dc03a1986b6e7af0d26af927009d567da1e1835cc2bb5cc1b5732ffca3ecde9d"; - name = "akonadiconsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadiconsole-20.08.3.tar.xz"; + sha256 = "061r0p9pj22x0hiz6piz4vramll3w5xy92sx8nfhcp2gmnvj9890"; + name = "akonadiconsole-20.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz"; - sha256 = "e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30"; - name = "akonadi-contacts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-contacts-20.08.3.tar.xz"; + sha256 = "18n9x41fmh4q9q9lfv882iwk6j1hvgpl11y4qn873vwr9sdrcf4s"; + name = "akonadi-contacts-20.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-import-wizard-20.08.2.tar.xz"; - sha256 = "639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e"; - name = "akonadi-import-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-import-wizard-20.08.3.tar.xz"; + sha256 = "0gny0rxvyks5w4rdb73ly06lyvz7kcfvff1268bn6i96xr83kmim"; + name = "akonadi-import-wizard-20.08.3.tar.xz"; }; }; akonadi-mime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz"; - sha256 = "5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3"; - name = "akonadi-mime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-mime-20.08.3.tar.xz"; + sha256 = "12ps633y64mj72iryd9z2nmrf7lxbkqj7xnzj28549cvg6jizgl7"; + name = "akonadi-mime-20.08.3.tar.xz"; }; }; akonadi-notes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz"; - sha256 = "4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7"; - name = "akonadi-notes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-notes-20.08.3.tar.xz"; + sha256 = "1z90r37lqc7ydmily730idd4s8rcbr6i3a8x9m647snbala16z36"; + name = "akonadi-notes-20.08.3.tar.xz"; }; }; akonadi-search = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz"; - sha256 = "618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7"; - name = "akonadi-search-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-search-20.08.3.tar.xz"; + sha256 = "0izpkvjybp6r79rai0p5j74bm0f8ksgsl3z34ggb51j6vj9rla7h"; + name = "akonadi-search-20.08.3.tar.xz"; }; }; akregator = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz"; - sha256 = "4de4bd31dede5c09e0eb9e14d1da1d1979409eb1e28df5f95963086d4a49edc9"; - name = "akregator-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akregator-20.08.3.tar.xz"; + sha256 = "1gqh820s5by3r9lz7r16r0krh916idsks6sgy26hcrwfmva45wn5"; + name = "akregator-20.08.3.tar.xz"; }; }; analitza = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/analitza-20.08.2.tar.xz"; - sha256 = "2fad01bf48199e3671559ec9a619f0d590af331922899c793f96fc90860ec487"; - name = "analitza-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/analitza-20.08.3.tar.xz"; + sha256 = "16s6kjyclj73lq8z8mvrbsl75h1nrnv7syp6wpip6gvfs5ynai90"; + name = "analitza-20.08.3.tar.xz"; }; }; ark = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz"; - sha256 = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc"; - name = "ark-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ark-20.08.3.tar.xz"; + sha256 = "03kwjp2nj570k9ph8bgj042sjj4x0h9jwv8nwx0pfpcxkgxv5pzy"; + name = "ark-20.08.3.tar.xz"; }; }; artikulate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/artikulate-20.08.2.tar.xz"; - sha256 = "66545d85e25aa67816deea4b2b89b485181458a5bc117dad9588671d8b48b41c"; - name = "artikulate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/artikulate-20.08.3.tar.xz"; + sha256 = "0bx97qi6zi7jmlzm3g7qamnzg0966g4w9xpskbxbr4cgjr312x19"; + name = "artikulate-20.08.3.tar.xz"; }; }; audiocd-kio = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/audiocd-kio-20.08.2.tar.xz"; - sha256 = "5f38c549fe8c3a4659ac8291c223327b765834e7668bc15a96047e20cdb11f01"; - name = "audiocd-kio-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/audiocd-kio-20.08.3.tar.xz"; + sha256 = "01n4nyda7l7by1nyx2sgxdl8qkdfndk0w6hj0qc6a7fllcfj5cpb"; + name = "audiocd-kio-20.08.3.tar.xz"; }; }; baloo-widgets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz"; - sha256 = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07"; - name = "baloo-widgets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/baloo-widgets-20.08.3.tar.xz"; + sha256 = "0ciidrsvwc3ppxhw7w5116q4lfbsvij9jsvyzm292pmjln2vikrg"; + name = "baloo-widgets-20.08.3.tar.xz"; }; }; blinken = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/blinken-20.08.2.tar.xz"; - sha256 = "c6e74033ab8ece83618c5cda0ab3cf327514b8e2e6b0e9daf484ce88f671a65e"; - name = "blinken-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/blinken-20.08.3.tar.xz"; + sha256 = "1gfw0w66nm3sx81bnr0p0yz1bhjj63lvd3cr86x3b2pny5rcw1da"; + name = "blinken-20.08.3.tar.xz"; }; }; bomber = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bomber-20.08.2.tar.xz"; - sha256 = "27c226b31bcdbbda0c9e304e428ca7451614c397a038e830f8052c381dae7215"; - name = "bomber-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bomber-20.08.3.tar.xz"; + sha256 = "1nw1a9cf0nqgk00hvzcqch3bl97lx6bih0wsax5q0z1kzwlz0kgr"; + name = "bomber-20.08.3.tar.xz"; }; }; bovo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bovo-20.08.2.tar.xz"; - sha256 = "936cab24a13900765f0c5a5afb6f155cb5a05bdb067f86b77e33af5f0e4c37d2"; - name = "bovo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bovo-20.08.3.tar.xz"; + sha256 = "06pbivyvfgjx6zkadvwfwnrg9vjy4rf52k2a74qjcnl2ms16sr1g"; + name = "bovo-20.08.3.tar.xz"; }; }; calendarsupport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/calendarsupport-20.08.2.tar.xz"; - sha256 = "83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10"; - name = "calendarsupport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/calendarsupport-20.08.3.tar.xz"; + sha256 = "09w06n745764fs440nh0piy5sahfn50kh3zrljhgzadcij6165vd"; + name = "calendarsupport-20.08.3.tar.xz"; }; }; cantor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz"; - sha256 = "aca92b6e40a9e05282eae2b55f7cc6bf88612ffa9b3dde1a239648be8e5bdc59"; - name = "cantor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cantor-20.08.3.tar.xz"; + sha256 = "1njqycx0v3zq5mdcvfdfgxs8vgl01v80s27qgapsxxrgr9hgxbhl"; + name = "cantor-20.08.3.tar.xz"; }; }; cervisia = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cervisia-20.08.2.tar.xz"; - sha256 = "b3444ecd1078b92fad9b00297496dd3d92366a9c0bb56cfa138f28cc15db1389"; - name = "cervisia-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cervisia-20.08.3.tar.xz"; + sha256 = "1bsc72kxcmzx25408ngzqzj4a0168vqfr3a2gvmm6d8klbgpm3gv"; + name = "cervisia-20.08.3.tar.xz"; }; }; dolphin = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz"; - sha256 = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc"; - name = "dolphin-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-20.08.3.tar.xz"; + sha256 = "107n763qix95b1hgy86hddpj9x2clzhaiw8q8yjn9lzj1rz5facx"; + name = "dolphin-20.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-plugins-20.08.2.tar.xz"; - sha256 = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf"; - name = "dolphin-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-plugins-20.08.3.tar.xz"; + sha256 = "0fmay0sycfj9s7zyxbldgcal5lj2psi0n9zrgq812s5qr4rb5c8c"; + name = "dolphin-plugins-20.08.3.tar.xz"; }; }; dragon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dragon-20.08.2.tar.xz"; - sha256 = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c"; - name = "dragon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dragon-20.08.3.tar.xz"; + sha256 = "14qsb7h8w58i9jsh1gpcj8pwjgy7y3mqfy51hca82yrd82z5b9rn"; + name = "dragon-20.08.3.tar.xz"; }; }; elisa = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz"; - sha256 = "6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268"; - name = "elisa-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/elisa-20.08.3.tar.xz"; + sha256 = "0893nbj0jsapnfd09cp961k2m7lq6sjvzynpa4hfp9ch1jbc912c"; + name = "elisa-20.08.3.tar.xz"; }; }; eventviews = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz"; - sha256 = "ecac9ac6e6a6ed835b28048d8bfc09bac9a1e7a57c5dd0eba6f4360301b32af9"; - name = "eventviews-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/eventviews-20.08.3.tar.xz"; + sha256 = "158j5g3i0wbbxpg9jmr50dvbpms4c4vgcnpmn3b3vfbszzwsy6rg"; + name = "eventviews-20.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ffmpegthumbs-20.08.2.tar.xz"; - sha256 = "af5b3de86487d3ddccda34c5165a34427ef97fe1090108781eb38babc101740f"; - name = "ffmpegthumbs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ffmpegthumbs-20.08.3.tar.xz"; + sha256 = "186hpq949r3xx2a64nqjy4pcn67d6kdvsy80zr238lgb9qqcqygi"; + name = "ffmpegthumbs-20.08.3.tar.xz"; }; }; filelight = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz"; - sha256 = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e"; - name = "filelight-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/filelight-20.08.3.tar.xz"; + sha256 = "1jljsnjdhnqphh1kanj6hi2rswq3i9119iah1j33jy5pladcyf5q"; + name = "filelight-20.08.3.tar.xz"; }; }; granatier = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/granatier-20.08.2.tar.xz"; - sha256 = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57"; - name = "granatier-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/granatier-20.08.3.tar.xz"; + sha256 = "195bc2rcz11v76c0cwa9mb7rfixjn7sb0a52wrzz0sf9624m0rcs"; + name = "granatier-20.08.3.tar.xz"; }; }; grantlee-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantlee-editor-20.08.2.tar.xz"; - sha256 = "353b2c58d169e8b3c91367a7ce8939ede39c289036e3617da019ae1045a81c7b"; - name = "grantlee-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantlee-editor-20.08.3.tar.xz"; + sha256 = "1k2rdicd68jdk3pazyn3q0vj99n0vnkpzkrnacpymkjy85cjgrv9"; + name = "grantlee-editor-20.08.3.tar.xz"; }; }; grantleetheme = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz"; - sha256 = "8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62"; - name = "grantleetheme-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantleetheme-20.08.3.tar.xz"; + sha256 = "07b7v5v2vyz3vyj1jjzryzaak8bbqg8a2caxwb6s7cwhy19y6my5"; + name = "grantleetheme-20.08.3.tar.xz"; }; }; gwenview = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz"; - sha256 = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d"; - name = "gwenview-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/gwenview-20.08.3.tar.xz"; + sha256 = "09mwp3z97hgd7c15w0hz8k61qn5icb81rj27nxzy877ph1xnrixc"; + name = "gwenview-20.08.3.tar.xz"; }; }; incidenceeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/incidenceeditor-20.08.2.tar.xz"; - sha256 = "e9c24390b5951ef9f504a4dc432fea52ed7487288c424f073446e6c07e70c69a"; - name = "incidenceeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/incidenceeditor-20.08.3.tar.xz"; + sha256 = "15kkl8z1nig9qyxfrq54c3sqh1xs1lzlbm5rphj34y0yb8dbn8kx"; + name = "incidenceeditor-20.08.3.tar.xz"; }; }; juk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz"; - sha256 = "b19f59ad8c80c4c335469fbddde6db92112e286b1699964eab39a3d826c7ec60"; - name = "juk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/juk-20.08.3.tar.xz"; + sha256 = "1jvj0r4grm55cnck4apnh4fh44mv1ycm0pprrkh57iwj1dlf7kif"; + name = "juk-20.08.3.tar.xz"; }; }; k3b = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/k3b-20.08.2.tar.xz"; - sha256 = "6370be558e93fed4605b7870b1d7ea324713c5a52370eab9c05d85fc3b76acd5"; - name = "k3b-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz"; + sha256 = "0qg2p6gdg0clgv6qab5vr0i451m9hqqmpwq335w8m9nwb6wg30cx"; + name = "k3b-20.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz"; - sha256 = "6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe"; - name = "kaccounts-integration-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-integration-20.08.3.tar.xz"; + sha256 = "006cglw5ai274a1r5jbk109mdrvw8v6fp3cdyi1kbrq7lp3123a2"; + name = "kaccounts-integration-20.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-providers-20.08.2.tar.xz"; - sha256 = "c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90"; - name = "kaccounts-providers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-providers-20.08.3.tar.xz"; + sha256 = "1vpv366bzj0sk7dqyxrq06a8ixgaaqi125mf2gmybvhj5yvrn3fp"; + name = "kaccounts-providers-20.08.3.tar.xz"; }; }; kaddressbook = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaddressbook-20.08.2.tar.xz"; - sha256 = "8d2e5849dd8878806e8566ce43c139633c37f027f677603600c8acc0d0d41198"; - name = "kaddressbook-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaddressbook-20.08.3.tar.xz"; + sha256 = "00mia1jh2c5rcnsyx3wizjdg65pvpazfb8ayppjzv4rrc2nhr9nn"; + name = "kaddressbook-20.08.3.tar.xz"; }; }; kajongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz"; - sha256 = "1eb534ac6d1d3ca14b73bd6e5b626b988acafc30b168f54d48a493adc715ecde"; - name = "kajongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kajongg-20.08.3.tar.xz"; + sha256 = "0wr045xqm1q03vy0jbgrldpdc9k3lgnhd39yhi574la367ayffpa"; + name = "kajongg-20.08.3.tar.xz"; }; }; kalarm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarm-20.08.2.tar.xz"; - sha256 = "e783c041ac4b162cf5254e37e53854835eda6c61ef3ae2358466000a8650a4da"; - name = "kalarm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarm-20.08.3.tar.xz"; + sha256 = "0194rapyvnpmhkba0rgclrai1ywx9anr8dski0j6z1yg0kgav8df"; + name = "kalarm-20.08.3.tar.xz"; }; }; kalarmcal = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz"; - sha256 = "0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6"; - name = "kalarmcal-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarmcal-20.08.3.tar.xz"; + sha256 = "1i9hi3y4j2pmdmlj13kl13vfplxrh8w23fxz0mmawi1wn533fp66"; + name = "kalarmcal-20.08.3.tar.xz"; }; }; kalgebra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalgebra-20.08.2.tar.xz"; - sha256 = "c934dc8d92917e31c17efa5b64dbec4795439a5f26762e2f214b49028bfe264d"; - name = "kalgebra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalgebra-20.08.3.tar.xz"; + sha256 = "0k7miil5ilrw68j6xl9g6cf3zfw7g52h0gfwd5j248nx2nxr150c"; + name = "kalgebra-20.08.3.tar.xz"; }; }; kalzium = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalzium-20.08.2.tar.xz"; - sha256 = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016"; - name = "kalzium-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalzium-20.08.3.tar.xz"; + sha256 = "1r80bnpdrybsdwcblpj7cg32dv90l79gs0i42gpm6inilfr3vp5n"; + name = "kalzium-20.08.3.tar.xz"; }; }; kamera = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamera-20.08.2.tar.xz"; - sha256 = "ba28cab34267ce203b4b70f4a2c2b6a75849aec83dd2d73f6903894c5c125fdf"; - name = "kamera-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamera-20.08.3.tar.xz"; + sha256 = "06fwxdgbyywdrf1r0w17w3chfr0s8jhqswz9chmdfds9f2bb45cr"; + name = "kamera-20.08.3.tar.xz"; }; }; kamoso = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamoso-20.08.2.tar.xz"; - sha256 = "e7d0af2781ff077261886a1683aff1d518a17f9b6d83f84fa95a7633a00f1516"; - name = "kamoso-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamoso-20.08.3.tar.xz"; + sha256 = "0zhl3va65ajz3hdggg0jvvgvj14s461pjw9adw9bnfcbs4jzkl2y"; + name = "kamoso-20.08.3.tar.xz"; }; }; kanagram = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kanagram-20.08.2.tar.xz"; - sha256 = "3f3f961aa847f26ac875104e82b8e7e73bbc049f20460117f849df91ba9b42e2"; - name = "kanagram-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kanagram-20.08.3.tar.xz"; + sha256 = "1cyx8yq03xaw34ic69ghz9gafk8l30qinp0kkp9a1wh4pry8rnxf"; + name = "kanagram-20.08.3.tar.xz"; }; }; kapman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapman-20.08.2.tar.xz"; - sha256 = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd"; - name = "kapman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapman-20.08.3.tar.xz"; + sha256 = "0nh1f0v026rib5ahj1mhvs99yabrgdq71bis465vfpm4favnirzy"; + name = "kapman-20.08.3.tar.xz"; }; }; kapptemplate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz"; - sha256 = "3bda6d9f6127e19357f071ca6f9f05890c35a6aaf86e54bce39381f0045b6b0c"; - name = "kapptemplate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapptemplate-20.08.3.tar.xz"; + sha256 = "1r98ym9sazjzknxfw58hjiyxhmi49fyhrdn02v0b8fm711vprxab"; + name = "kapptemplate-20.08.3.tar.xz"; }; }; kate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kate-20.08.2.tar.xz"; - sha256 = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0"; - name = "kate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kate-20.08.3.tar.xz"; + sha256 = "1m7ximinknc0l9zqv4p25ybn6zysz59l4vvdb9xkhjp53aqskdz9"; + name = "kate-20.08.3.tar.xz"; }; }; katomic = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/katomic-20.08.2.tar.xz"; - sha256 = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85"; - name = "katomic-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/katomic-20.08.3.tar.xz"; + sha256 = "1v31x6371r9ccvc676vq5dlpkp4829xf0r37dnvdxlfm22mgsdnk"; + name = "katomic-20.08.3.tar.xz"; }; }; kbackup = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbackup-20.08.2.tar.xz"; - sha256 = "bb97dd10a64c42ae80c9c87442d3a06d3c18f4f5997bd3b6d1460dec655b3e0a"; - name = "kbackup-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbackup-20.08.3.tar.xz"; + sha256 = "1sayzvj46ckhn5zgp7qi6zmrmd7bjh5mg05mcl5pfwv4dcvxkrng"; + name = "kbackup-20.08.3.tar.xz"; }; }; kblackbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblackbox-20.08.2.tar.xz"; - sha256 = "714a8749a49d1a7938b74372138ae3e5bafef50de61207e63a6d2c60b6bfded2"; - name = "kblackbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblackbox-20.08.3.tar.xz"; + sha256 = "0vka2pswbza1z8f97nhxcjrczx4w1x0qyjpzs9ycn9a14smqpsrh"; + name = "kblackbox-20.08.3.tar.xz"; }; }; kblocks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblocks-20.08.2.tar.xz"; - sha256 = "c82f8b6e722308a236d0057028d644ebf8105c9c902d799bc2fb3e1c1ff7c188"; - name = "kblocks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblocks-20.08.3.tar.xz"; + sha256 = "1jc063xn6dphydf49kv0izzy0nv06dr412xxjvkp7vccwv9qd5gf"; + name = "kblocks-20.08.3.tar.xz"; }; }; kbounce = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbounce-20.08.2.tar.xz"; - sha256 = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2"; - name = "kbounce-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbounce-20.08.3.tar.xz"; + sha256 = "0863vlirljvf101mdv6jxprj9axs4cikrnld3wvxrcqw3w2dy6wy"; + name = "kbounce-20.08.3.tar.xz"; }; }; kbreakout = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbreakout-20.08.2.tar.xz"; - sha256 = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef"; - name = "kbreakout-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbreakout-20.08.3.tar.xz"; + sha256 = "14nd1dnbdyxv59y8iildhydhxgal38hvj7bk6544glwl8yalak8z"; + name = "kbreakout-20.08.3.tar.xz"; }; }; kbruch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbruch-20.08.2.tar.xz"; - sha256 = "54c5997a8d6405439448dd929bf16017c9e5db052b30c9bf144c656c6d8b9e0b"; - name = "kbruch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbruch-20.08.3.tar.xz"; + sha256 = "03s1hl4h8rsx0gn7wqfssi1ga4igx48jb47gpw6f9rfjm8f199vb"; + name = "kbruch-20.08.3.tar.xz"; }; }; kcachegrind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcachegrind-20.08.2.tar.xz"; - sha256 = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c"; - name = "kcachegrind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcachegrind-20.08.3.tar.xz"; + sha256 = "17j06z9cpj5qhfbp1xgw4qmhi4jckf2i99c9brys4ifb3p0rkbrs"; + name = "kcachegrind-20.08.3.tar.xz"; }; }; kcalc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz"; - sha256 = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf"; - name = "kcalc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalc-20.08.3.tar.xz"; + sha256 = "1mk30fkv51w3fqlpkzgm1yj5sp98h26kkphplqkjva5v6s1jzmjy"; + name = "kcalc-20.08.3.tar.xz"; }; }; kcalutils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz"; - sha256 = "fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae"; - name = "kcalutils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalutils-20.08.3.tar.xz"; + sha256 = "1i2yh4gvdwlylj7f7p32g1z7lzh3p19rrbd96l1gqhy700f2whpw"; + name = "kcalutils-20.08.3.tar.xz"; }; }; kcharselect = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcharselect-20.08.2.tar.xz"; - sha256 = "9438e723469b6bf0d87b23965c6d925800ff35b2cc2214a7eeb5fb41009489e0"; - name = "kcharselect-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcharselect-20.08.3.tar.xz"; + sha256 = "1p6rijjfa2jk4vr0ivjn6p5qf2ys5kvhw0cwfyjs45ff7zg0s2ga"; + name = "kcharselect-20.08.3.tar.xz"; }; }; kcolorchooser = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcolorchooser-20.08.2.tar.xz"; - sha256 = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72"; - name = "kcolorchooser-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcolorchooser-20.08.3.tar.xz"; + sha256 = "1874qa04whiivyydxfcn0f1xch515ga1af4ym42zqz64j3kq7i47"; + name = "kcolorchooser-20.08.3.tar.xz"; }; }; kcron = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcron-20.08.2.tar.xz"; - sha256 = "ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83"; - name = "kcron-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcron-20.08.3.tar.xz"; + sha256 = "1piwssyg9fvah25gql6w0n8xf634f6gy475cz52gb1bl7rp72q6j"; + name = "kcron-20.08.3.tar.xz"; }; }; kdebugsettings = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz"; - sha256 = "78502b1a52f9f81ff848e5b210b37a3a74da7c0032de2513f23c1d25cf801283"; - name = "kdebugsettings-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdebugsettings-20.08.3.tar.xz"; + sha256 = "11xnvr9qib3hnp48whsw659c724s2114p5dr3fswvhm3hkw1aky7"; + name = "kdebugsettings-20.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz"; - sha256 = "6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67"; - name = "kdeconnect-kde-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeconnect-kde-20.08.3.tar.xz"; + sha256 = "0x10ga81qlsahavmv356xzjxyds41y2b4v338rqcyqkxvfmxj01k"; + name = "kdeconnect-kde-20.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-scripts-20.08.2.tar.xz"; - sha256 = "ff1a819991903b09bef3637b579d215e087310e39b98a1a6928e15f193aec056"; - name = "kde-dev-scripts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-scripts-20.08.3.tar.xz"; + sha256 = "0x8ba4mlxx17vk674738xln2dy696b148fa3s87za4yb4jj9gc5n"; + name = "kde-dev-scripts-20.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-utils-20.08.2.tar.xz"; - sha256 = "21a4a11e102cbbd9fed955720966d7be2f7a615f57c9bf1dfc94ce973d25ffc3"; - name = "kde-dev-utils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-utils-20.08.3.tar.xz"; + sha256 = "0k7zb1km89nnqfi2p1mhp6dvwkhmgbcgw89301acag34yy954dvn"; + name = "kde-dev-utils-20.08.3.tar.xz"; }; }; kdeedu-data = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz"; - sha256 = "9030c39b92a7500254e8303ce246d2535cd66a203bb96b2670defd5288294ad1"; - name = "kdeedu-data-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeedu-data-20.08.3.tar.xz"; + sha256 = "1k164h4n8r4yjlll5900fz764lr0qiy3q1fpcpkr8f1n7qs7f797"; + name = "kdeedu-data-20.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-mobipocket-20.08.2.tar.xz"; - sha256 = "8972079756633abe8cbfaa39cdff9d56f89958861e6e418738311bcdc52771a5"; - name = "kdegraphics-mobipocket-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-mobipocket-20.08.3.tar.xz"; + sha256 = "0ifxbwn7pmxr7y4ri617a303b27nqwqa418isgfrfk11jc4yyxhq"; + name = "kdegraphics-mobipocket-20.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz"; - sha256 = "977cf6c40ba00a8a391a951aab80c55d9615927a1ef4a7bb5eea2f6a83373532"; - name = "kdegraphics-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-thumbnailers-20.08.3.tar.xz"; + sha256 = "0mbzkw7pxcfmkpb8ivhahnxkkrkjhmbjqy2l9gqx35gp5855gmxf"; + name = "kdegraphics-thumbnailers-20.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenetwork-filesharing-20.08.2.tar.xz"; - sha256 = "f909ee8433baf906b6c23af4747d83ae3e151e213585abe01282213012228b3a"; - name = "kdenetwork-filesharing-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenetwork-filesharing-20.08.3.tar.xz"; + sha256 = "0id19wmiivdrx10r1hwbwi7bx6g1v9g5lpbhlmfrapvy82ijfmbg"; + name = "kdenetwork-filesharing-20.08.3.tar.xz"; }; }; kdenlive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz"; - sha256 = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418"; - name = "kdenlive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenlive-20.08.3.tar.xz"; + sha256 = "187d5khqq9ckmqp8amd7ghlvig1z97w2jzm9s4zsfhjzyqv3d3wz"; + name = "kdenlive-20.08.3.tar.xz"; }; }; kdepim-addons = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz"; - sha256 = "f7ab0d9ee2b9351959199f8903c447c6cb82fd58d642b7039cd2b8e324038b01"; - name = "kdepim-addons-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-addons-20.08.3.tar.xz"; + sha256 = "17m8pwiig46pc6x4ylvymb3b6c7xcm2df3vjma665kcir1dr0q7p"; + name = "kdepim-addons-20.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-apps-libs-20.08.2.tar.xz"; - sha256 = "8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434"; - name = "kdepim-apps-libs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz"; + sha256 = "08iw1p9mv4jic7pk6skxc5anp7k46lhcdqxpq1i6wlhbrk6bpsvg"; + name = "kdepim-apps-libs-20.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz"; - sha256 = "3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132"; - name = "kdepim-runtime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-runtime-20.08.3.tar.xz"; + sha256 = "0zz2zwq3gr177vgkwz6b70q4n2ra4ym58f167pgvi9kxv3884fib"; + name = "kdepim-runtime-20.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-kioslaves-20.08.2.tar.xz"; - sha256 = "5e79532675d717d906f6b43eea1cac20fe1513bcf497696251c00fe74e2f0f58"; - name = "kdesdk-kioslaves-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-kioslaves-20.08.3.tar.xz"; + sha256 = "1kwzms0qha058cm92d4f8pr89r3bqaqx5zfw6gz05s6lg892j5in"; + name = "kdesdk-kioslaves-20.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-thumbnailers-20.08.2.tar.xz"; - sha256 = "0b6809e2469d7057b6d674d5950fd4f6243a1d3d185452212522880c714c1c63"; - name = "kdesdk-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-thumbnailers-20.08.3.tar.xz"; + sha256 = "10fc0agpvzpqdxqynd70vzya0g1nbdw0ylbnl9w35n9jhww42jff"; + name = "kdesdk-thumbnailers-20.08.3.tar.xz"; }; }; kdf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdf-20.08.2.tar.xz"; - sha256 = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e"; - name = "kdf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdf-20.08.3.tar.xz"; + sha256 = "02k5nhsf1zzkx9cl3r2500pj2zfmvjhlfsb3smgpka6in7iivxyp"; + name = "kdf-20.08.3.tar.xz"; }; }; kdialog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdialog-20.08.2.tar.xz"; - sha256 = "1bb808c2d01680e2396f282b798d9e22d2c1722f992c672eaf7451bf83a5d459"; - name = "kdialog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdialog-20.08.3.tar.xz"; + sha256 = "0knl6176bjazjiacg1qqaldlqcjlb3bi829sliq1sdh4lzzwrbzk"; + name = "kdialog-20.08.3.tar.xz"; }; }; kdiamond = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdiamond-20.08.2.tar.xz"; - sha256 = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21"; - name = "kdiamond-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdiamond-20.08.3.tar.xz"; + sha256 = "0ls1kg3wank1al46knq12jilmp8gaa4rn7zbgflcrhgy5gw8l5px"; + name = "kdiamond-20.08.3.tar.xz"; }; }; keditbookmarks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz"; - sha256 = "87d72e78c907e7829a642364f3a49dd0f0dea0c76e7a5c524a67f957dca94b9b"; - name = "keditbookmarks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/keditbookmarks-20.08.3.tar.xz"; + sha256 = "0m8ap5hvjgldj9hdk6shpkv8xylhhjla2xn1zs86pvj4la3zh4f8"; + name = "keditbookmarks-20.08.3.tar.xz"; }; }; kfind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfind-20.08.2.tar.xz"; - sha256 = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74"; - name = "kfind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfind-20.08.3.tar.xz"; + sha256 = "10i5mw6q2parq5w7pi955kgfvdlw8hwis2p7r9vkvabjdk69nkdr"; + name = "kfind-20.08.3.tar.xz"; }; }; kfloppy = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfloppy-20.08.2.tar.xz"; - sha256 = "7f624d03dc3dc5099ac1479148800043195fa6c0e3bb6d7efcb452a76e99e191"; - name = "kfloppy-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfloppy-20.08.3.tar.xz"; + sha256 = "1cp0pwgldscc7va508gk43im3fv0lsxd5sbhpw8kxlzjlpbwlp8v"; + name = "kfloppy-20.08.3.tar.xz"; }; }; kfourinline = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfourinline-20.08.2.tar.xz"; - sha256 = "aed2ecdb40b2e3d5452b183a1817216373d32a0aab4eff02f6c823a6f8d801eb"; - name = "kfourinline-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfourinline-20.08.3.tar.xz"; + sha256 = "0h1n44dncr2siw447n7b0gkx3380vajvqjsgjvapkg7m7bmz7nsv"; + name = "kfourinline-20.08.3.tar.xz"; }; }; kgeography = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgeography-20.08.2.tar.xz"; - sha256 = "82c4798f3184c77d0be63aeb5e86c84240c9cb0aa0e66ff57f92c0b5c3748f19"; - name = "kgeography-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgeography-20.08.3.tar.xz"; + sha256 = "1mk5cip55chc8pmh8wfl7an5x076ywisr0i7isqcjaij2cv54283"; + name = "kgeography-20.08.3.tar.xz"; }; }; kget = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz"; - sha256 = "42993095d6325e921b6ed36f4b0a2153ffd5d68cfa3e6d3ced2db09e2a6aabb8"; - name = "kget-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kget-20.08.3.tar.xz"; + sha256 = "144ydk8bbfirph464mkkvwpnynj465i2ynhm8n9d330kcrhnaxd0"; + name = "kget-20.08.3.tar.xz"; }; }; kgoldrunner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgoldrunner-20.08.2.tar.xz"; - sha256 = "4bbcfcf5cf810e0b1f78e1a88d222631c07401187fb327deaa5ab6658483d351"; - name = "kgoldrunner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgoldrunner-20.08.3.tar.xz"; + sha256 = "101cdl04wb6xbq95b51ax36570y9ahkcy5gccqsyvc307ij9yg7r"; + name = "kgoldrunner-20.08.3.tar.xz"; }; }; kgpg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgpg-20.08.2.tar.xz"; - sha256 = "fc4ec5c38c3bdb02a399f0eb1e75da356a523ada369d5410c2f4e7f5f14a508f"; - name = "kgpg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgpg-20.08.3.tar.xz"; + sha256 = "1ip21yal37yxg5i5sfy6lgfb3sz9lld0dwa7a1w4lbddf9w3akd6"; + name = "kgpg-20.08.3.tar.xz"; }; }; khangman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khangman-20.08.2.tar.xz"; - sha256 = "7ff30ecbab7c9e8f44b7e8c3887ec78a918c919ce902005aeb7fb969ac995b28"; - name = "khangman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khangman-20.08.3.tar.xz"; + sha256 = "1zwdd2gpjkld3vkawp0lj83il257ryxf8wpmbgzn1wz8sxxi01jj"; + name = "khangman-20.08.3.tar.xz"; }; }; khelpcenter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khelpcenter-20.08.2.tar.xz"; - sha256 = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d"; - name = "khelpcenter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khelpcenter-20.08.3.tar.xz"; + sha256 = "1xan4awwgs08k7ksfy80rfcxqd6bi8i1fjdgy55hh7wshv76zf5r"; + name = "khelpcenter-20.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz"; - sha256 = "17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec"; - name = "kidentitymanagement-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kidentitymanagement-20.08.3.tar.xz"; + sha256 = "0vkydvf4yw3qlqrg9m1zdm6j0c1crxdvc7l24yls9fjbj957vbls"; + name = "kidentitymanagement-20.08.3.tar.xz"; }; }; kig = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz"; - sha256 = "401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5"; - name = "kig-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kig-20.08.3.tar.xz"; + sha256 = "1dvizdfkvl7p7hr4xm4zh51lpr8qr3s5j5zz162s7arr7sws4w8h"; + name = "kig-20.08.3.tar.xz"; }; }; kigo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kigo-20.08.2.tar.xz"; - sha256 = "b9e6edd2e35e57edb3d89bb76f1d7e4a9e7f8fb64644b58012543a367834aa60"; - name = "kigo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kigo-20.08.3.tar.xz"; + sha256 = "0sx3klivzn8h96mpnbkiv2nbi2l6w0j6fclj7q3ql3cm81jh6n15"; + name = "kigo-20.08.3.tar.xz"; }; }; killbots = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/killbots-20.08.2.tar.xz"; - sha256 = "332ebd24be6ea62c8621aeaa5b200d6ebf03ae0198a06693b36b2c80cac89d95"; - name = "killbots-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/killbots-20.08.3.tar.xz"; + sha256 = "1j41my0brpqpvd8xibv39z4x4kmw1sqz7wy7ibhh0zir3jh64n83"; + name = "killbots-20.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimagemapeditor-20.08.2.tar.xz"; - sha256 = "fd8272978a7c3a1d95b20a5ec57ccf00d740a8d6eb483f0a204d03669215309c"; - name = "kimagemapeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimagemapeditor-20.08.3.tar.xz"; + sha256 = "1m9mrksdl08ijmpmx3lhdysnm70mrnqz9rlbcn1h95p2sq0bk8cg"; + name = "kimagemapeditor-20.08.3.tar.xz"; }; }; kimap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz"; - sha256 = "bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092"; - name = "kimap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimap-20.08.3.tar.xz"; + sha256 = "16paglkqgnyzwjydhn02qw7zg0d4casir4bsfch15wdmqv389mrg"; + name = "kimap-20.08.3.tar.xz"; }; }; kio-extras = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz"; - sha256 = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e"; - name = "kio-extras-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-extras-20.08.3.tar.xz"; + sha256 = "0i7k9asc97r9z4lfk5hyf7mcbx0za7j6v4dhqn43j5v4x2i0201c"; + name = "kio-extras-20.08.3.tar.xz"; }; }; kio-gdrive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz"; - sha256 = "71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca"; - name = "kio-gdrive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-gdrive-20.08.3.tar.xz"; + sha256 = "0pp0nvsnfdm8vskw194qjfac4agnlsjm44w1704b5sqx6i27dafy"; + name = "kio-gdrive-20.08.3.tar.xz"; }; }; kipi-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz"; - sha256 = "89de8f75dd01e2130c1e651bd04717ce4d35768202ae3e825c93c75c8312e583"; - name = "kipi-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kipi-plugins-20.08.3.tar.xz"; + sha256 = "1pplhv8yjfl1ifx9ykf4w2lgma8jvshihmd5c5mz9liqk3lawq15"; + name = "kipi-plugins-20.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kirigami-gallery-20.08.2.tar.xz"; - sha256 = "0b4a5cec32bdfaef42b790f1d249d227c9daf56e0f3c1e302d33ccaa485c28e5"; - name = "kirigami-gallery-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kirigami-gallery-20.08.3.tar.xz"; + sha256 = "0l100ng8ai55s0vl8nkpq4vysy2nc6sk1dbisc2mp7br74ykyfp9"; + name = "kirigami-gallery-20.08.3.tar.xz"; }; }; kiriki = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiriki-20.08.2.tar.xz"; - sha256 = "42081e39c045bd830c6a79938a83690ea5641aa9e5437645234441da2d29b053"; - name = "kiriki-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiriki-20.08.3.tar.xz"; + sha256 = "1gddjii84cbz1dg8k0pnd3dyzar4lvj03j9v84vabggjjjbpir0f"; + name = "kiriki-20.08.3.tar.xz"; }; }; kiten = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiten-20.08.2.tar.xz"; - sha256 = "a7285d5880611da2202d0e3f8f2bf860f275932d3da54ff7aecc793225f7ad7d"; - name = "kiten-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiten-20.08.3.tar.xz"; + sha256 = "0n9mq86gcl6s2f45l8lbp4gsdj356l78xjkdvm14f6qlh81vsqlc"; + name = "kiten-20.08.3.tar.xz"; }; }; kitinerary = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz"; - sha256 = "69d8b5f64774860e5098c1dbfb06d274da4379c04383c4f0f0e412481c48fa27"; - name = "kitinerary-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kitinerary-20.08.3.tar.xz"; + sha256 = "169pmy5fyjkbya8r2kdkd9s83sim0jplc3lx8bv2xh6r10mvzgm6"; + name = "kitinerary-20.08.3.tar.xz"; }; }; kjumpingcube = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kjumpingcube-20.08.2.tar.xz"; - sha256 = "0edba227e24b8aeda4e75bc6c25ad25b50ac624b5319a64ce20d6c3f7691a48a"; - name = "kjumpingcube-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kjumpingcube-20.08.3.tar.xz"; + sha256 = "19246jwwd686x8i0jrvz2c8mpkf6qhm7rnskzin59dqzr76xrpgz"; + name = "kjumpingcube-20.08.3.tar.xz"; }; }; kldap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz"; - sha256 = "dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489"; - name = "kldap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kldap-20.08.3.tar.xz"; + sha256 = "1ihaazsnb9r30m2qhzcp2ns9f5fs7l3agsc9f9wxi4cyw73bq0n3"; + name = "kldap-20.08.3.tar.xz"; }; }; kleopatra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz"; - sha256 = "70ffa2d1549b6b4674a9cd92052174002d81fb236cfbf872187c6e3616191ba2"; - name = "kleopatra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kleopatra-20.08.3.tar.xz"; + sha256 = "1r879g7hw3c5cww58z0kvqj47pgzbiq1vpgxz847smrylqajcpyi"; + name = "kleopatra-20.08.3.tar.xz"; }; }; klettres = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klettres-20.08.2.tar.xz"; - sha256 = "9cef7dea479d27644e4812157d4cf3993dc3ee84b847377a17cec305a03a3156"; - name = "klettres-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klettres-20.08.3.tar.xz"; + sha256 = "0irc0f7vjznlsczan30zzprbnvgnbg19vabr97cw9rkkfa28azx9"; + name = "klettres-20.08.3.tar.xz"; }; }; klickety = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klickety-20.08.2.tar.xz"; - sha256 = "90665c5aeda52f55af8dcf3936e557ba431d9e48c6be361eaeb82117b6213a33"; - name = "klickety-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klickety-20.08.3.tar.xz"; + sha256 = "1qsm9grmy0bnalpdghg48xi68zzk6ysmg6n0d74ldmmnirv3r0zf"; + name = "klickety-20.08.3.tar.xz"; }; }; klines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klines-20.08.2.tar.xz"; - sha256 = "8e8b897cdc3c31fada1dd2635da211def507f47c8062c6458f559283ae470edb"; - name = "klines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klines-20.08.3.tar.xz"; + sha256 = "1l95ph1sjp3r1q065k3rj18lm36krl7bh41zgqh021p692ywc48c"; + name = "klines-20.08.3.tar.xz"; }; }; kmag = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmag-20.08.2.tar.xz"; - sha256 = "8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05"; - name = "kmag-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmag-20.08.3.tar.xz"; + sha256 = "0y44gz3qn91vl840xz25l5kc5jj82k5qqxkgsvvyld2s99rif84k"; + name = "kmag-20.08.3.tar.xz"; }; }; kmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmahjongg-20.08.2.tar.xz"; - sha256 = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d"; - name = "kmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmahjongg-20.08.3.tar.xz"; + sha256 = "0wgp9m7xzf5ysmrrnyng4p4jypvzfnqkyw62gknl0qhk531cgq3h"; + name = "kmahjongg-20.08.3.tar.xz"; }; }; kmail = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz"; - sha256 = "ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2"; - name = "kmail-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-20.08.3.tar.xz"; + sha256 = "0g59s7wl0n4bp8kw559rdlamlqxl47qvwfms9kr9ign35rvs0ghg"; + name = "kmail-20.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz"; - sha256 = "7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8"; - name = "kmail-account-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-account-wizard-20.08.3.tar.xz"; + sha256 = "0vama5a02dfgxrl4iz88lbi8dvq3d9b055xil770d90pwp0sljcz"; + name = "kmail-account-wizard-20.08.3.tar.xz"; }; }; kmailtransport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz"; - sha256 = "8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c"; - name = "kmailtransport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmailtransport-20.08.3.tar.xz"; + sha256 = "07552qj3ngwvyss7f8cy87c0gmzc47agn54wk85qq0v1fwr73n6z"; + name = "kmailtransport-20.08.3.tar.xz"; }; }; kmbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz"; - sha256 = "4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73"; - name = "kmbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmbox-20.08.3.tar.xz"; + sha256 = "0ipmwcicn3qklybqy9v41lh7byn7j62ja8b0xf06z9nliwkk4b0b"; + name = "kmbox-20.08.3.tar.xz"; }; }; kmime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz"; - sha256 = "9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435"; - name = "kmime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmime-20.08.3.tar.xz"; + sha256 = "1ndbx712vm4v0fi7p8j28d8z35h3bmsixc97z5r9dg03v1kzd36v"; + name = "kmime-20.08.3.tar.xz"; }; }; kmines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmines-20.08.2.tar.xz"; - sha256 = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753"; - name = "kmines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmines-20.08.3.tar.xz"; + sha256 = "1mn5hip3vnzmkk1hy14glsplp7f5pm56yv0d5mz25icfgw0xa6lp"; + name = "kmines-20.08.3.tar.xz"; }; }; kmix = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmix-20.08.2.tar.xz"; - sha256 = "73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85"; - name = "kmix-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmix-20.08.3.tar.xz"; + sha256 = "00gm93faqmqx0hhkxi3k2pn6sq82k2f622vqgk7mwznkpg66mf4k"; + name = "kmix-20.08.3.tar.xz"; }; }; kmousetool = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmousetool-20.08.2.tar.xz"; - sha256 = "c1f70c172dc2ad7d937db5e6355522082f924ba45e7aac1bbb1c04e230f1d406"; - name = "kmousetool-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmousetool-20.08.3.tar.xz"; + sha256 = "09qznykysr42rzz5cmqvhvz91cr8dbzwjd73hwaib2lfs3c2cgbl"; + name = "kmousetool-20.08.3.tar.xz"; }; }; kmouth = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmouth-20.08.2.tar.xz"; - sha256 = "d206afecdbe5f063dfbf805956f475e95c7b0fd548fd5f1b4fd7376ea6747e96"; - name = "kmouth-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmouth-20.08.3.tar.xz"; + sha256 = "0ajhnl1sjllfb42nyafpirmlgcs6waqp8qxvgsz5dk5zkb8daqmr"; + name = "kmouth-20.08.3.tar.xz"; }; }; kmplot = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmplot-20.08.2.tar.xz"; - sha256 = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b"; - name = "kmplot-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmplot-20.08.3.tar.xz"; + sha256 = "0cv7q1wmbb3fkf4s6ns4q1il5zr4q02b3xghpp661ma82d8jhjcy"; + name = "kmplot-20.08.3.tar.xz"; }; }; knavalbattle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knavalbattle-20.08.2.tar.xz"; - sha256 = "2cd91ee61193810eee62e47f38f590e81b03287083f31564e0ebfd893d339ac9"; - name = "knavalbattle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knavalbattle-20.08.3.tar.xz"; + sha256 = "1028i8zl5ynm3vvqajsms2hq8gmmjmjc5dc6r3jyh6r964vxq3nq"; + name = "knavalbattle-20.08.3.tar.xz"; }; }; knetwalk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz"; - sha256 = "4a97f4b1af463e5e50698e8ac089cf6933fb66f25dd9b0fae3f1b1a51cbca3c0"; - name = "knetwalk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knetwalk-20.08.3.tar.xz"; + sha256 = "13pspvi2p68irpbr3f2ck78qmvfl3vahm5qjw2fwhidhpindf9nl"; + name = "knetwalk-20.08.3.tar.xz"; }; }; knights = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knights-20.08.2.tar.xz"; - sha256 = "b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4"; - name = "knights-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knights-20.08.3.tar.xz"; + sha256 = "0zqb87mr2x085hi3r9cvdrx2kvxmclh4ffi1ajcb8v1f79wiwzin"; + name = "knights-20.08.3.tar.xz"; }; }; knotes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knotes-20.08.2.tar.xz"; - sha256 = "1e61f2c8b5fe9075f07be16543e3a7310bf533b6c2446f162f7196b41e3e6ecb"; - name = "knotes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knotes-20.08.3.tar.xz"; + sha256 = "0ysw8js2s6njilg4v4vqrl1bzcmqvk42l68pzvyflr112zviqz28"; + name = "knotes-20.08.3.tar.xz"; }; }; kolf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolf-20.08.2.tar.xz"; - sha256 = "834c1c6cdc62e650c7b0d36db26387cc4ebe2bb4b2e8fa06c0bf461e3a1e8c64"; - name = "kolf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolf-20.08.3.tar.xz"; + sha256 = "1ywyny8iq2sxglsvpgw6p3w3w567k6cw6waywfcfy0lcnfarg1n0"; + name = "kolf-20.08.3.tar.xz"; }; }; kollision = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kollision-20.08.2.tar.xz"; - sha256 = "9b6829f49d9baa89596ef8649996724db72c3c8eb793b9b6afc80dc0d07c0421"; - name = "kollision-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kollision-20.08.3.tar.xz"; + sha256 = "1l8a32bni40jz5jna0ip9ggbx7zp1hhiw2mip7v8f6qc4arbknl8"; + name = "kollision-20.08.3.tar.xz"; }; }; kolourpaint = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolourpaint-20.08.2.tar.xz"; - sha256 = "fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0"; - name = "kolourpaint-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolourpaint-20.08.3.tar.xz"; + sha256 = "0d64gnnb553rxscr8710h5bx8ijxd87jrbix07k41y79i5x60irh"; + name = "kolourpaint-20.08.3.tar.xz"; }; }; kompare = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kompare-20.08.2.tar.xz"; - sha256 = "4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550"; - name = "kompare-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kompare-20.08.3.tar.xz"; + sha256 = "0r9m2vcw9hbdkfdy24pfpqs2b5r0jyxh1ma2h66hfv4ycd470ilc"; + name = "kompare-20.08.3.tar.xz"; }; }; konqueror = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz"; - sha256 = "f0622aa67ad0028e28bd6129688aab8946fb49492f0b335f6624ab7d4ef239d7"; - name = "konqueror-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konqueror-20.08.3.tar.xz"; + sha256 = "1ssjj83jcbcq8i7wx5zd12z7crh2zg6awbpy38maq3c7747nqz7k"; + name = "konqueror-20.08.3.tar.xz"; }; }; konquest = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konquest-20.08.2.tar.xz"; - sha256 = "cf97a6961b15b39f5bcdf541e52c137f1d67d0fa5ee259922b4e762edc4491eb"; - name = "konquest-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konquest-20.08.3.tar.xz"; + sha256 = "1wq0j02dzdah6yhx8r2cg191617hid9fs780yr317fprkwkgb8cb"; + name = "konquest-20.08.3.tar.xz"; }; }; konsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konsole-20.08.2.tar.xz"; - sha256 = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951"; - name = "konsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konsole-20.08.3.tar.xz"; + sha256 = "0jjidy756x8n456qbm977a73l8229kk8i489jh52296k8pkh6yjx"; + name = "konsole-20.08.3.tar.xz"; }; }; kontact = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontact-20.08.2.tar.xz"; - sha256 = "232d9880df74ce0c7697f08b53ef9512ac9c11c3b04142ba7ba4b95091cb5396"; - name = "kontact-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontact-20.08.3.tar.xz"; + sha256 = "0qasgxvq7xps0zxk4hf2sizmy90mxyq70m2pq49pq17ij2pa9ynl"; + name = "kontact-20.08.3.tar.xz"; }; }; kontactinterface = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontactinterface-20.08.2.tar.xz"; - sha256 = "72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07"; - name = "kontactinterface-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontactinterface-20.08.3.tar.xz"; + sha256 = "1ah2814js08sm49ykarqdw7z03w4fbym5cc4vwmzimcvh2bc78j3"; + name = "kontactinterface-20.08.3.tar.xz"; }; }; kopete = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz"; - sha256 = "05f5d6236d4c96b9ce7ba5f24f4e06d7263a78cac27368a7e6b3e5075d42fbb1"; - name = "kopete-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kopete-20.08.3.tar.xz"; + sha256 = "1lsab66k0xq1g0w0cxcpadmf9kkc09x8wwbv4i8y3aj2mn7849gh"; + name = "kopete-20.08.3.tar.xz"; }; }; korganizer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz"; - sha256 = "4f719ec12c52fc313997a187439dc6888fd030a4a1b2357db000abc0a19527b2"; - name = "korganizer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/korganizer-20.08.3.tar.xz"; + sha256 = "112h6vn2y9d3q3z62cwg3zrak3xgx9affibc9cvr6fzhp4z0x9ps"; + name = "korganizer-20.08.3.tar.xz"; }; }; kpat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpat-20.08.2.tar.xz"; - sha256 = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446"; - name = "kpat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpat-20.08.3.tar.xz"; + sha256 = "1id4b9jkphi8pp29gc2vb3n9f0g8kl9yy5v8cnyv3jq673aj0fs9"; + name = "kpat-20.08.3.tar.xz"; }; }; kpimtextedit = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz"; - sha256 = "2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6"; - name = "kpimtextedit-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpimtextedit-20.08.3.tar.xz"; + sha256 = "1m4r5zbhbjvj3za78xfp3dibyf7mp9gan5ir5zd0k2p7adp3i652"; + name = "kpimtextedit-20.08.3.tar.xz"; }; }; kpkpass = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz"; - sha256 = "ed699c75128ef299f06d699c80c69ac9529fa044db6f18a39d54a5e70d85108c"; - name = "kpkpass-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpkpass-20.08.3.tar.xz"; + sha256 = "0zw3xx5mi38za0xbvld97f5bqvwwgyz47kybyrdm7jrhvmmiiiis"; + name = "kpkpass-20.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kqtquickcharts-20.08.2.tar.xz"; - sha256 = "2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4"; - name = "kqtquickcharts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kqtquickcharts-20.08.3.tar.xz"; + sha256 = "0l7v8vrc7by0w0yshnh21jaqhspmhkvm5cd0hpay6jc9v2azkcf3"; + name = "kqtquickcharts-20.08.3.tar.xz"; }; }; krdc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krdc-20.08.2.tar.xz"; - sha256 = "52ddd68bdb1b356be341cf3bc5405cb965f4e4f3da8bf4b28bfb62c7db21ac5f"; - name = "krdc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krdc-20.08.3.tar.xz"; + sha256 = "1g9lxdldljh5a2s4g7g9b98lij168l99ah0vr6nvdl53n35pfr8n"; + name = "krdc-20.08.3.tar.xz"; }; }; kreversi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kreversi-20.08.2.tar.xz"; - sha256 = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2"; - name = "kreversi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kreversi-20.08.3.tar.xz"; + sha256 = "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi"; + name = "kreversi-20.08.3.tar.xz"; }; }; krfb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krfb-20.08.2.tar.xz"; - sha256 = "5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4"; - name = "krfb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krfb-20.08.3.tar.xz"; + sha256 = "13nypbcdhh53wq72w59z5q46a09g1w4yyi1pmsjwa8r7jnk8cafk"; + name = "krfb-20.08.3.tar.xz"; }; }; kross-interpreters = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz"; - sha256 = "82da0302d2d292e86fa924c8bd1d4effb21f763c42c57affaddeff4777c43951"; - name = "kross-interpreters-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kross-interpreters-20.08.3.tar.xz"; + sha256 = "0mr5vpbbcv66s6dyrrypy1ai6ba744z8cn4r0iwys35p6am075qj"; + name = "kross-interpreters-20.08.3.tar.xz"; }; }; kruler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kruler-20.08.2.tar.xz"; - sha256 = "ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778"; - name = "kruler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kruler-20.08.3.tar.xz"; + sha256 = "1vhl8acccdqfdj7lci8r2mig9qf1js4f8v7b4fqljpnc3gdg8749"; + name = "kruler-20.08.3.tar.xz"; }; }; kshisen = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kshisen-20.08.2.tar.xz"; - sha256 = "d11030b101a409324661adf664d4298f34cc320abff80dba72d112cc3ae2d25d"; - name = "kshisen-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kshisen-20.08.3.tar.xz"; + sha256 = "1vy8qh8s60a4ikyw3sh4cbr3p3fk35d4dwdqc263gn4skyrsb1l9"; + name = "kshisen-20.08.3.tar.xz"; }; }; ksirk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksirk-20.08.2.tar.xz"; - sha256 = "b7766f0976b3cc112d4c599d91c07d321829c9b1e8ef34d3d21ec4964026854a"; - name = "ksirk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksirk-20.08.3.tar.xz"; + sha256 = "1kxc1b05r8x6pvaiwpvjpgrr88qkm5qs4d3s1ym8rki60c724qpl"; + name = "ksirk-20.08.3.tar.xz"; }; }; ksmtp = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz"; - sha256 = "5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee"; - name = "ksmtp-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksmtp-20.08.3.tar.xz"; + sha256 = "1p9clzvmsym2fijwvs3s0zqx57bk82mlks52j5ni3il6lvklaayc"; + name = "ksmtp-20.08.3.tar.xz"; }; }; ksnakeduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksnakeduel-20.08.2.tar.xz"; - sha256 = "b6f0f51f8fad795cd134f9426b1f1ba8ccceb72e304e8ba55e60af471ad282cc"; - name = "ksnakeduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksnakeduel-20.08.3.tar.xz"; + sha256 = "03ydbwknn20gadjpwcw0z8zw777hgj8j10w4gvp2dwpb07rdg1pn"; + name = "ksnakeduel-20.08.3.tar.xz"; }; }; kspaceduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kspaceduel-20.08.2.tar.xz"; - sha256 = "62b9526c031662c049aa90b06ed3e5e2ce8ae774f271e1f29430f23c1f6cd787"; - name = "kspaceduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kspaceduel-20.08.3.tar.xz"; + sha256 = "1ii3lnxd11d3ihl8j1abh9qn9q0qq8ra9hbrwjs5df2kk36bnirj"; + name = "kspaceduel-20.08.3.tar.xz"; }; }; ksquares = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksquares-20.08.2.tar.xz"; - sha256 = "e1f9fdfa9a4a8348a65e66d48b7389784a1db6c8799cea453d6da3a2a57aca59"; - name = "ksquares-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksquares-20.08.3.tar.xz"; + sha256 = "1ch7lbylzb9ngdzvpzqq5f30gkm2l4rzk6iqa8xm53rawr7jjqcy"; + name = "ksquares-20.08.3.tar.xz"; }; }; ksudoku = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksudoku-20.08.2.tar.xz"; - sha256 = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33"; - name = "ksudoku-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksudoku-20.08.3.tar.xz"; + sha256 = "0hnqbd3krxi3zwj8p4n9ydhwfwhw8wljhjdfv0llv0nhj1wb89p9"; + name = "ksudoku-20.08.3.tar.xz"; }; }; ksystemlog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksystemlog-20.08.2.tar.xz"; - sha256 = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53"; - name = "ksystemlog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksystemlog-20.08.3.tar.xz"; + sha256 = "11fc2mn4hkcibpxp7s2gihpp05yix7ws84a0bm6vjiqlidmrk192"; + name = "ksystemlog-20.08.3.tar.xz"; }; }; kteatime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kteatime-20.08.2.tar.xz"; - sha256 = "d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac"; - name = "kteatime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kteatime-20.08.3.tar.xz"; + sha256 = "1vj738s2a7nnrvxi847mdmn1vg79kh9k8gqaflcwnvyxanf6n4f7"; + name = "kteatime-20.08.3.tar.xz"; }; }; ktimer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktimer-20.08.2.tar.xz"; - sha256 = "69293b7296643c6543d0646d14f9c75479f29f129924258957a407b77539a4c2"; - name = "ktimer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktimer-20.08.3.tar.xz"; + sha256 = "1rc1z93s24b7p2ixr4xbpg0sj8ls90gzfijwj9f8b0lrwd905ysv"; + name = "ktimer-20.08.3.tar.xz"; }; }; ktnef = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz"; - sha256 = "ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d"; - name = "ktnef-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktnef-20.08.3.tar.xz"; + sha256 = "1lj93sqyi522k91jiyf7d26vx5sgn5njhyaf8plsfz5rj82dw1m4"; + name = "ktnef-20.08.3.tar.xz"; }; }; ktouch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktouch-20.08.2.tar.xz"; - sha256 = "1b073a92343c9a2c772cfaac4e9fa7b6e85750586e3a57da413e33cdba34b5f4"; - name = "ktouch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktouch-20.08.3.tar.xz"; + sha256 = "1ssxd7f75866rn5k192bnm016d8674q13ibcgmaxqsmr7wqkyd39"; + name = "ktouch-20.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-accounts-kcm-20.08.2.tar.xz"; - sha256 = "df709ee612ff4c71a43197762b8a9d296b5a43f6e0afe4d9c8d0bd88eef81465"; - name = "ktp-accounts-kcm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-accounts-kcm-20.08.3.tar.xz"; + sha256 = "0039svbzx7fphyk6cw4hb8k4h7l6q31pbwvp6pvls450rycz8i8y"; + name = "ktp-accounts-kcm-20.08.3.tar.xz"; }; }; ktp-approver = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-approver-20.08.2.tar.xz"; - sha256 = "054db02db679d0a4600632700cdd57cae539159a0a8f01f479ea337d33d8a6bd"; - name = "ktp-approver-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-approver-20.08.3.tar.xz"; + sha256 = "1kqsdw7vkcd0ka98y2r7qz7dp5hsrr2m8k1xlh3gpj7fdxpla2bh"; + name = "ktp-approver-20.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-auth-handler-20.08.2.tar.xz"; - sha256 = "a61557efa800d42fd8ed14efdb09d43310212976d737a4fd5272f502bacbc371"; - name = "ktp-auth-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-auth-handler-20.08.3.tar.xz"; + sha256 = "0wbhg458ysipwma8sygimasq71sbrzmx3vwqi51ai8y5hwrx04j4"; + name = "ktp-auth-handler-20.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-call-ui-20.08.2.tar.xz"; - sha256 = "ecd38d8b9f24cf620b8c9c1935328af3142199c6aa87e69c734e43096e492ac5"; - name = "ktp-call-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-call-ui-20.08.3.tar.xz"; + sha256 = "1fh8bz9kc6f8v28x12xp3vw19swgcq07zyjzhd6qcnwf1bv6gl7i"; + name = "ktp-call-ui-20.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz"; - sha256 = "807fcd6f9c415a0799057435f997e143e9584a94577f9afaa7fcc6a4197e7cb0"; - name = "ktp-common-internals-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-common-internals-20.08.3.tar.xz"; + sha256 = "193yx4g1fwlwysy5scb7m24wqmvwmfyyb9sv7arw7zn5czlg480z"; + name = "ktp-common-internals-20.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-list-20.08.2.tar.xz"; - sha256 = "214d73532dc855a8a4b68730adf5cbd046aae89f2ee2ad5d9a4c25b4eff6acb0"; - name = "ktp-contact-list-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-list-20.08.3.tar.xz"; + sha256 = "0093z17r1xqlb1zlgxfayrnrkyl8zmnnasfd8i97dx712wmbbxxa"; + name = "ktp-contact-list-20.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-runner-20.08.2.tar.xz"; - sha256 = "8e40e4ab7ce2c1c382b109a15f88f5e1c7d147c76ed36ca05ef6d9f3f58d3d45"; - name = "ktp-contact-runner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-runner-20.08.3.tar.xz"; + sha256 = "063jylnq3gm0s0jh1xs6b591a161sb6gdi840l40mqlhhg7i8x55"; + name = "ktp-contact-runner-20.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-desktop-applets-20.08.2.tar.xz"; - sha256 = "b0884360be80f89dee3852b023055220e3cdab2f422cc3812eda31169fba6298"; - name = "ktp-desktop-applets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-desktop-applets-20.08.3.tar.xz"; + sha256 = "1i69qzfa455phjnd5ycflyggcbq7ycn2cc7a3ni5195isjzq6r6s"; + name = "ktp-desktop-applets-20.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-filetransfer-handler-20.08.2.tar.xz"; - sha256 = "c2ec5fd2a5746dd8ce1371c503c51feee206d8dfe7ca8cdaa71b8e925636a97c"; - name = "ktp-filetransfer-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-filetransfer-handler-20.08.3.tar.xz"; + sha256 = "0a26ziacl3fkd0a0h1579jnwjzjlsz0zymj9k4da4sb60zad5y72"; + name = "ktp-filetransfer-handler-20.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-kded-module-20.08.2.tar.xz"; - sha256 = "307285b2d4e04c244691a6f2a285aec8ada26e0b01eb1fdbf2bc1da57b05828a"; - name = "ktp-kded-module-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-kded-module-20.08.3.tar.xz"; + sha256 = "105vh6b7a0v02arksbwxn30slpcg11cpvb7dqmvf041iyr13sqsv"; + name = "ktp-kded-module-20.08.3.tar.xz"; }; }; ktp-send-file = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-send-file-20.08.2.tar.xz"; - sha256 = "6c3fb09112d439ce2f0db3acdbc766e8a914d4dc7cbb6ab709922f8e95f2f0e1"; - name = "ktp-send-file-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-send-file-20.08.3.tar.xz"; + sha256 = "08pp3029jplc6rcbav40cgy787gn3jjl312gbgvnwzglxaqvcg4b"; + name = "ktp-send-file-20.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-text-ui-20.08.2.tar.xz"; - sha256 = "0f10612e08bc1ee04fb0a538337d760d7b79b5dac37bb58275998d16dbb5415c"; - name = "ktp-text-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-text-ui-20.08.3.tar.xz"; + sha256 = "1anxl9wa5ndyi9r9w0kpivx8nv1xpx28xjvkdplkc75cc1wl88sw"; + name = "ktp-text-ui-20.08.3.tar.xz"; }; }; ktuberling = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktuberling-20.08.2.tar.xz"; - sha256 = "f9e4a0de3b92d015f8e7b862badf4bbf11b3ce2727aa607384a009247e7b7fad"; - name = "ktuberling-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktuberling-20.08.3.tar.xz"; + sha256 = "0q6ynmn6w5q65a77fq8n9vxqswrimln22b1zfgxmb2i3qwnhkrmz"; + name = "ktuberling-20.08.3.tar.xz"; }; }; kturtle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kturtle-20.08.2.tar.xz"; - sha256 = "ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7"; - name = "kturtle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kturtle-20.08.3.tar.xz"; + sha256 = "0riv76vwvz94zixqhhwkxw8sz2r2xqai39yh9hr31d28q9rza384"; + name = "kturtle-20.08.3.tar.xz"; }; }; kubrick = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kubrick-20.08.2.tar.xz"; - sha256 = "02fed26a7246feffd668fbda939893295557c0571da64fdf195db93474653224"; - name = "kubrick-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kubrick-20.08.3.tar.xz"; + sha256 = "03k73gr33dr3va69vc70fsfcdwkqz70bg87yk2l2j33x8wsgl4wx"; + name = "kubrick-20.08.3.tar.xz"; }; }; kwalletmanager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwalletmanager-20.08.2.tar.xz"; - sha256 = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8"; - name = "kwalletmanager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwalletmanager-20.08.3.tar.xz"; + sha256 = "1l07vxl2x3jl8553rbvr3p0k3rc95nmrw4vhxxynl3102xshrg5i"; + name = "kwalletmanager-20.08.3.tar.xz"; }; }; kwave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwave-20.08.2.tar.xz"; - sha256 = "6e15a67022ef96f07b9825139cc7aaacbc6f60729570c31ce6cb25184602b434"; - name = "kwave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwave-20.08.3.tar.xz"; + sha256 = "0zk8ik03qcc6y0vhpih8sk2jpkxwxalmqmaan2767k9h92grdpc8"; + name = "kwave-20.08.3.tar.xz"; }; }; kwordquiz = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwordquiz-20.08.2.tar.xz"; - sha256 = "57aa012f3aad128579f067668db1344306e2e23d6a89b47d413d6eee0da0e238"; - name = "kwordquiz-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwordquiz-20.08.3.tar.xz"; + sha256 = "1kiqk3xyd0l7kqdxqjqs8mw4drcdbdri9xxi5gcav57ndcinknqb"; + name = "kwordquiz-20.08.3.tar.xz"; }; }; libgravatar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz"; - sha256 = "4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7"; - name = "libgravatar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libgravatar-20.08.3.tar.xz"; + sha256 = "09dvx2rb1j7q4r0gkbhz0vjk8ya3njqprpjqdhwcq7xwc2j9h0hr"; + name = "libgravatar-20.08.3.tar.xz"; }; }; libkcddb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz"; - sha256 = "545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a"; - name = "libkcddb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcddb-20.08.3.tar.xz"; + sha256 = "0r36hs79hmq0znsds0d04lj7ffs6l2d866kyn1z1fdwr9b3crirg"; + name = "libkcddb-20.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz"; - sha256 = "37534f67af69775d6f786917920d2810a5d20f28df57e1a17aee9a7b30bbe302"; - name = "libkcompactdisc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcompactdisc-20.08.3.tar.xz"; + sha256 = "1nglk3kbx5czqla3cnpnf1fk71pf2cl9h6rgb40ak1xw4z31d456"; + name = "libkcompactdisc-20.08.3.tar.xz"; }; }; libkdcraw = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdcraw-20.08.2.tar.xz"; - sha256 = "6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2"; - name = "libkdcraw-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdcraw-20.08.3.tar.xz"; + sha256 = "1806i99qsrmixdg5b0hyi8h55fk00q6wxsnrblbwcmsb268jddp7"; + name = "libkdcraw-20.08.3.tar.xz"; }; }; libkdegames = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdegames-20.08.2.tar.xz"; - sha256 = "d9f0ab87dc4671a55ad8d2b7d3a54cbc444201c11ebae436e0107fe7067fb983"; - name = "libkdegames-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdegames-20.08.3.tar.xz"; + sha256 = "1ccbcwwqb53bgqlr1rq9plpw21mipxp8rsi1f7l0p1jzpw054p08"; + name = "libkdegames-20.08.3.tar.xz"; }; }; libkdepim = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz"; - sha256 = "3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101"; - name = "libkdepim-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdepim-20.08.3.tar.xz"; + sha256 = "1v77g02v5sdqprh8psx5xpjgf8v91il60ca59yivm5jvc3hdf3f6"; + name = "libkdepim-20.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz"; - sha256 = "ef8e0b359e3cf1b3303da3795add1ced405d230f51895abe10d5a7989be03923"; - name = "libkeduvocdocument-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkeduvocdocument-20.08.3.tar.xz"; + sha256 = "0ghkx6x5sn5fl934ybhl32knwv9zky0n1vkjw2w93lpms45xmw76"; + name = "libkeduvocdocument-20.08.3.tar.xz"; }; }; libkexiv2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkexiv2-20.08.2.tar.xz"; - sha256 = "793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d"; - name = "libkexiv2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkexiv2-20.08.3.tar.xz"; + sha256 = "1lh3947w6xgzl2r1wm6m4kd478q6bv89f0c3c38ldv30imfw7rfl"; + name = "libkexiv2-20.08.3.tar.xz"; }; }; libkgapi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgapi-20.08.2.tar.xz"; - sha256 = "f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df"; - name = "libkgapi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgapi-20.08.3.tar.xz"; + sha256 = "1kmgf9v9rvb67l7aw5xsx7v44l4pz8rl6p09lk26irq7gd4k68la"; + name = "libkgapi-20.08.3.tar.xz"; }; }; libkgeomap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgeomap-20.08.2.tar.xz"; - sha256 = "7149095aa0df4e3a184bb2a6fb8322e27e3a34eb3bc40cf370a09b21fb2a6ea0"; - name = "libkgeomap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgeomap-20.08.3.tar.xz"; + sha256 = "14ipksxnvgk2s1sw7a70153iy9aik9mf4i7k8y3pzdr3l3155ayk"; + name = "libkgeomap-20.08.3.tar.xz"; }; }; libkipi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkipi-20.08.2.tar.xz"; - sha256 = "87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1"; - name = "libkipi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkipi-20.08.3.tar.xz"; + sha256 = "1b5qby7xm926qnzrf1zpb89fwx1a2syhqnznmdjxifj499p1jqjb"; + name = "libkipi-20.08.3.tar.xz"; }; }; libkleo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkleo-20.08.2.tar.xz"; - sha256 = "34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4"; - name = "libkleo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkleo-20.08.3.tar.xz"; + sha256 = "1d6dal4qnrikg6ma2ird4b2sdivqqkkhamvd3s1srcxppc3aiq79"; + name = "libkleo-20.08.3.tar.xz"; }; }; libkmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkmahjongg-20.08.2.tar.xz"; - sha256 = "032ac6d9e96cd9156f5153c01f881d0e442fda9de90398df320846095ba2c40a"; - name = "libkmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkmahjongg-20.08.3.tar.xz"; + sha256 = "0xabp1vzbzs52m3bb9nzm1d9md1n4j4pr13izn6nv28ja7477nnm"; + name = "libkmahjongg-20.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz"; - sha256 = "91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98"; - name = "libkomparediff2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkomparediff2-20.08.3.tar.xz"; + sha256 = "0nk0jkf0jwaz1yqzzp44c6xyjgw42gclkcvw8w61w1f8sdl40wb8"; + name = "libkomparediff2-20.08.3.tar.xz"; }; }; libksane = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksane-20.08.2.tar.xz"; - sha256 = "21bb577d78e020281dfc6c993ab7fe286d648e72c851e45463a32969fbb35aa6"; - name = "libksane-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksane-20.08.3.tar.xz"; + sha256 = "0d2cnmvk16g1vnx9jd7jvp3bpw07ss54khmhqip8iskkvcfll9j0"; + name = "libksane-20.08.3.tar.xz"; }; }; libksieve = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz"; - sha256 = "589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e"; - name = "libksieve-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksieve-20.08.3.tar.xz"; + sha256 = "0bhpdqynazssql2iivvpb9l8npa441345gcn59fc0va6barl9sam"; + name = "libksieve-20.08.3.tar.xz"; }; }; lokalize = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz"; - sha256 = "c11616bc02763fb1f3b1abf0b2ba70d0c6c550435c94ff25c5096f9a90375e23"; - name = "lokalize-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lokalize-20.08.3.tar.xz"; + sha256 = "0iab8sd1qh7h0zna7lc3v43z6rcmxba9v4nynhl5miiac4r6ddr8"; + name = "lokalize-20.08.3.tar.xz"; }; }; lskat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lskat-20.08.2.tar.xz"; - sha256 = "78f152f7af46345f65c3800f9c591fb204e917595c1f803c9c15148ef39c42b8"; - name = "lskat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lskat-20.08.3.tar.xz"; + sha256 = "1rcmh592w5gd5b69czfxycypidj74y2d91cw92rccariadz9vnjz"; + name = "lskat-20.08.3.tar.xz"; }; }; mailcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz"; - sha256 = "a4170ab9ff7680fb26c61474f42d5424716f4e91c1a5e9275cc1222491c9564d"; - name = "mailcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailcommon-20.08.3.tar.xz"; + sha256 = "0bhs60cz4qcrqkmw2sm6cd2laq8lzj9vcwi8kjqkajsidh342wdv"; + name = "mailcommon-20.08.3.tar.xz"; }; }; mailimporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailimporter-20.08.2.tar.xz"; - sha256 = "a255b60378c1cf77e517919d072cb44bd8c25e8ed8f07429763bb7915b3cc711"; - name = "mailimporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailimporter-20.08.3.tar.xz"; + sha256 = "0w6yfgqx0adlkwx32vmb23kl6n50737jiabmad3pnhqw8rv41h80"; + name = "mailimporter-20.08.3.tar.xz"; }; }; marble = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz"; - sha256 = "f44ac10de33dc31ce1cb99635131fe2c7bf3f60f09204b2061f81042a725475c"; - name = "marble-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/marble-20.08.3.tar.xz"; + sha256 = "1xpxgy724z97k063fdk0l3mrl8i6nvnhj35b4987jqji76i92ffb"; + name = "marble-20.08.3.tar.xz"; }; }; mbox-importer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mbox-importer-20.08.2.tar.xz"; - sha256 = "3b3bee33683c534974255616f3b2f3baebf85363b2c24bbee9cc195ddf35ca9a"; - name = "mbox-importer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mbox-importer-20.08.3.tar.xz"; + sha256 = "1qh0f93df228cqlcqdwc7g6im3g0gkfmzir3ccsmb5iv0ygvjl6f"; + name = "mbox-importer-20.08.3.tar.xz"; }; }; messagelib = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz"; - sha256 = "5cf3a3f2b6473e60a7c2af10aa4eb1cfba25a4786132ee87b657b0dafb9f5028"; - name = "messagelib-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/messagelib-20.08.3.tar.xz"; + sha256 = "16amni6qrq96h8jr313gc7k9frwr20d4pk9y2i61a1xm2w3xsqd4"; + name = "messagelib-20.08.3.tar.xz"; }; }; minuet = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/minuet-20.08.2.tar.xz"; - sha256 = "24383168e2a0b7b319ecb37e2b1f3b039ad790a7e0f49385657f049565f1ef84"; - name = "minuet-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/minuet-20.08.3.tar.xz"; + sha256 = "1l45g7labnyz0pkwcfhjl5a3ypr7cy3bsshr06ab85364yjwazvi"; + name = "minuet-20.08.3.tar.xz"; }; }; okular = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz"; - sha256 = "6f1885ed8050a55bb2cbf05089b452f555852e003ec7fe89fe472c0dbc92e65b"; - name = "okular-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/okular-20.08.3.tar.xz"; + sha256 = "1q59ikcwsfgjc0202daingxv15iarnzba6szdncznzcafd6hhk9z"; + name = "okular-20.08.3.tar.xz"; }; }; palapeli = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/palapeli-20.08.2.tar.xz"; - sha256 = "a31b0db2f3e77eac8f527d26f8ed0400fe5bcdb3a3970b925f14886bd1bcd63e"; - name = "palapeli-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/palapeli-20.08.3.tar.xz"; + sha256 = "107z3izfznrq7g5aqb5a7r8a4ibaia90g334d7wwvd7prm7hdgfp"; + name = "palapeli-20.08.3.tar.xz"; }; }; parley = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/parley-20.08.2.tar.xz"; - sha256 = "cf2f00925730d8baec66d422f058e4b3e979678e79c57898ceffd8650720bda6"; - name = "parley-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/parley-20.08.3.tar.xz"; + sha256 = "0wli09zkk5z50y1gzp5wc9k056xjaadlq97j09lf6lqyg6kb56ya"; + name = "parley-20.08.3.tar.xz"; }; }; picmi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz"; - sha256 = "35f2bf3d8375618f97aee01c8f2421521b2cd5c11d7b14fc9a376026d74c82a5"; - name = "picmi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/picmi-20.08.3.tar.xz"; + sha256 = "1lkpazsi9dyb2y9q5bk56d80x7x035rf4hdap25i8qfj3ilykv3w"; + name = "picmi-20.08.3.tar.xz"; }; }; pimcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pimcommon-20.08.2.tar.xz"; - sha256 = "cba9e66153d36debe3f046363af7ff40a4ba263f33bfe20c7ec10b5bf9183deb"; - name = "pimcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pimcommon-20.08.3.tar.xz"; + sha256 = "0mpl7li2y5xjzk4hdb85d1x7cz15cicd91c1krlw74q7pbrjinlq"; + name = "pimcommon-20.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-data-exporter-20.08.2.tar.xz"; - sha256 = "54b09a3f763004c805cc0dce8ab2e665116b7ef29419f22ad413aa250dcb4ac0"; - name = "pim-data-exporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-data-exporter-20.08.3.tar.xz"; + sha256 = "0f08c16d3730fbdsbrwlr9w5c4l9xcmd1bdbv5m38h5r2ddlkvzr"; + name = "pim-data-exporter-20.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-sieve-editor-20.08.2.tar.xz"; - sha256 = "e8c590a0fddc5292172115b11fb75c5f847347079100617dbf321875642d7098"; - name = "pim-sieve-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-sieve-editor-20.08.3.tar.xz"; + sha256 = "1falzw2a2v912fdzlyljsw9rcy1whrn9ys9ccrskkpvjn8y444x4"; + name = "pim-sieve-editor-20.08.3.tar.xz"; }; }; poxml = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/poxml-20.08.2.tar.xz"; - sha256 = "67d260349489e92ebce20253f9a3ccde5bb75eb13eb4d1a08a86c18c82e4a2a9"; - name = "poxml-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/poxml-20.08.3.tar.xz"; + sha256 = "0gzg3vbsjrfhs1jg59g7b3gf3b4qajiffkb94njkz8v1f0fadlxp"; + name = "poxml-20.08.3.tar.xz"; }; }; print-manager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/print-manager-20.08.2.tar.xz"; - sha256 = "de21f8c428198b906f4ae438d6ced8d707b12c15578409c2aa2f7b2f73feb990"; - name = "print-manager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/print-manager-20.08.3.tar.xz"; + sha256 = "18nl9gpmzz4g9fqzyvbh858nxz23b2vyi505qacqvcrz13r0l78z"; + name = "print-manager-20.08.3.tar.xz"; }; }; rocs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz"; - sha256 = "2d8efd62b89dd36033bb3d818c82fee67e6efa2d2bb98dda0d4eab13baaee485"; - name = "rocs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/rocs-20.08.3.tar.xz"; + sha256 = "0bd9x7kh2s4z79ff9byd3ly7k040c574zwrrgi8sq21yd531hxhj"; + name = "rocs-20.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/signon-kwallet-extension-20.08.2.tar.xz"; - sha256 = "a271f4d09511171dcf1ebcdaf0b7205f9ee6a75b20ef0801f36d136f7b4a70dd"; - name = "signon-kwallet-extension-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/signon-kwallet-extension-20.08.3.tar.xz"; + sha256 = "1s0syq9aw2q34k1wxrpjqqi12xay1h0vc4s2d8l184hzzg8qq71i"; + name = "signon-kwallet-extension-20.08.3.tar.xz"; }; }; spectacle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz"; - sha256 = "9a467ea3b05981d588d39573cca375636b825ad8cab8a36ce48dbbc12425ab0d"; - name = "spectacle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/spectacle-20.08.3.tar.xz"; + sha256 = "16dwbsk9hik7gmz9s4x78hibz4x9d1fpx8x2i2giry5hwzknfcw4"; + name = "spectacle-20.08.3.tar.xz"; }; }; step = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/step-20.08.2.tar.xz"; - sha256 = "a52e4b6f281ba1a7afd4ab3ac7307080464147c4052ee222399135fe61ac7958"; - name = "step-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/step-20.08.3.tar.xz"; + sha256 = "05ljsmgpra1az64yddy8idi46cv3afaf2v4n7d5j81a8vvlz7fj1"; + name = "step-20.08.3.tar.xz"; }; }; svgpart = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/svgpart-20.08.2.tar.xz"; - sha256 = "3a46b5bd9acf5372f73b602d155517f0dff47f3337bd8a46a580aae7480dd771"; - name = "svgpart-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/svgpart-20.08.3.tar.xz"; + sha256 = "0wwq576dblqmfknr0qs8kskw7nar6hah95fqicdn97xdy4nvzhc6"; + name = "svgpart-20.08.3.tar.xz"; }; }; sweeper = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/sweeper-20.08.2.tar.xz"; - sha256 = "0c255ef15c1e32eb561b26f5b73a6c154730be583efbc5ee713aaed17de14091"; - name = "sweeper-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/sweeper-20.08.3.tar.xz"; + sha256 = "0i4zvbljdzkj47vh8kizam7vsc9k7mvf8dqd2j6ixr4p0cqvw5a8"; + name = "sweeper-20.08.3.tar.xz"; }; }; umbrello = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/umbrello-20.08.2.tar.xz"; - sha256 = "0357b44646c750253e3e7ee323b9e49e854c4c8cdf340eb5a11b2d42edfc4cd7"; - name = "umbrello-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/umbrello-20.08.3.tar.xz"; + sha256 = "1hh5gyggb4f3pjip8dfvx00hi83gj65c92jgzkzahj7p35mkplgl"; + name = "umbrello-20.08.3.tar.xz"; }; }; yakuake = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/yakuake-20.08.2.tar.xz"; - sha256 = "8a0aa3a97a9fdc781887a6cb6480cba5079cf8aacd3345b63f5eb6be4d91665a"; - name = "yakuake-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/yakuake-20.08.3.tar.xz"; + sha256 = "05zd2xm5vgrgz0bxbkh1mpiknlqzpzk5jb74lnd5x7wn5b80ngv0"; + name = "yakuake-20.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/zeroconf-ioslave-20.08.2.tar.xz"; - sha256 = "0ad34f8361ee3ecd669e396265135b534239994d3bec5e9e6a43b7b7bf5c04e4"; - name = "zeroconf-ioslave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/zeroconf-ioslave-20.08.3.tar.xz"; + sha256 = "1afga0liiy9n98kb0gmxzbb6ckhdgbrdc4ig1x9pwp98wr1fzmcg"; + name = "zeroconf-ioslave-20.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index f4f2c53522f..10bf27038ae 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "yakuake"; + pname = "yakuake"; buildInputs = [ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8c0d4117a3..6d8983179dc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -300,8 +300,6 @@ in (mkDrv rec { cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - mkdir -p $dev cp -r include $dev '' + lib.optionalString kdeIntegration '' diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 302ad2c21aa..2bc825d8149 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -264,7 +264,9 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-flashback = callPackage ./misc/gnome-flashback { }; - gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-panel = callPackage ./misc/gnome-panel { + autoreconfHook = pkgs.autoreconfHook269; + }; gnome-tweaks = callPackage ./misc/gnome-tweaks { }; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index dbc4eef057b..2087db493cf 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ -A '*.tar.xz' ) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 7e0d691412b..12d3f5d8987 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -73,7 +73,7 @@ let "--enable-libssp" "--disable-nls" # To keep ABI compatibility with upstream mingw-w64 - "--enable-fully-dynamic-string" + "--enable-fully-dynamic-string" ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ # See Note [Windows Exception Handling] "--enable-sjlj-exceptions" @@ -187,13 +187,16 @@ let "--disable-symvers" "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" - ] + ] ++ lib.optionals langJit [ "--enable-host-shared" - ] + ] ++ lib.optionals (langD) [ "--with-target-system-zlib=yes" ] + # Make -fcommon default on gcc10 + # TODO: fix all packages (probably 100+) and remove that + ++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}" ; in configureFlags diff --git a/pkgs/development/interpreters/python/cpython/3.7/find_library.patch b/pkgs/development/interpreters/python/cpython/3.7/find_library.patch new file mode 100644 index 00000000000..97fb66662d0 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/find_library.patch @@ -0,0 +1,105 @@ +From 9b5a023a5dc3127da15253f7acad71019395ebe1 Mon Sep 17 00:00:00 2001 +From: Pablo Galindo <Pablogsal@gmail.com> +Date: Thu, 8 Oct 2020 19:50:37 +0100 +Subject: [PATCH] [3.7] bpo-41976: Fix the fallback to gcc of + ctypes.util.find_library when using gcc>9 (GH-22598). (GH-22601) + +(cherry picked from commit 27ac19cca2c639caaf6fedf3632fe6beb265f24f) + +Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> +--- + Lib/ctypes/test/test_find.py | 12 ++++++- + Lib/ctypes/util.py | 32 +++++++++++++++---- + .../2020-10-08-18-22-28.bpo-41976.Svm0wb.rst | 3 ++ + 3 files changed, 39 insertions(+), 8 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst + +diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py +index b99fdcba7b28f..92ac1840ad7d4 100644 +--- a/Lib/ctypes/test/test_find.py ++++ b/Lib/ctypes/test/test_find.py +@@ -1,4 +1,5 @@ + import unittest ++import unittest.mock + import os.path + import sys + import test.support +@@ -72,7 +73,7 @@ def test_shell_injection(self): + + @unittest.skipUnless(sys.platform.startswith('linux'), + 'Test only valid for Linux') +-class LibPathFindTest(unittest.TestCase): ++class FindLibraryLinux(unittest.TestCase): + def test_find_on_libpath(self): + import subprocess + import tempfile +@@ -111,6 +112,15 @@ def test_find_on_libpath(self): + # LD_LIBRARY_PATH) + self.assertEqual(find_library(libname), 'lib%s.so' % libname) + ++ def test_find_library_with_gcc(self): ++ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None): ++ self.assertNotEqual(find_library('c'), None) ++ ++ def test_find_library_with_ld(self): ++ with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \ ++ unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None): ++ self.assertNotEqual(find_library('c'), None) ++ + + if __name__ == "__main__": + unittest.main() +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 97973bce001d9..0c2510e1619c8 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -93,6 +93,12 @@ def find_library(name): + # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump + import re, tempfile + ++ def _is_elf(filename): ++ "Return True if the given file is an ELF file" ++ elf_header = b'\x7fELF' ++ with open(filename, 'br') as thefile: ++ return thefile.read(4) == elf_header ++ + def _findLib_gcc(name): + # Run GCC's linker with the -t (aka --trace) option and examine the + # library name it prints out. The GCC command will fail because we +@@ -299,17 +312,22 @@ def _findLib_ld(name): + stderr=subprocess.PIPE, + universal_newlines=True) + out, _ = p.communicate() +- res = re.search(expr, os.fsdecode(out)) +- if res: +- result = res.group(0) +- except Exception as e: ++ res = re.findall(expr, os.fsdecode(out)) ++ for file in res: ++ # Check if the given file is an elf file: gcc can report ++ # some files that are linker scripts and not actual ++ # shared objects. See bpo-41976 for more details ++ if not _is_elf(file): ++ continue ++ return os.fsdecode(file) ++ except Exception: + pass # result will be None + return result + + def find_library(name): + # See issue #9998 + return _findSoname_ldconfig(name) or \ +- _get_soname(_findLib_gcc(name) or _findLib_ld(name)) ++ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) + + ################################################################ + # test code +diff --git a/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst +new file mode 100644 +index 0000000000000..c8b3fc771845e +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2020-10-08-18-22-28.bpo-41976.Svm0wb.rst +@@ -0,0 +1,3 @@ ++Fixed a bug that was causing :func:`ctypes.util.find_library` to return ++``None`` when triying to locate a library in an environment when gcc>=9 is ++available and ``ldconfig`` is not. Patch by Pablo Galindo diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index cd06c2b6367..c67ede82003 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -165,6 +165,9 @@ in with passthru; stdenv.mkDerivation { ] ++ [ # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch + ] ++ optionals (isPy37 || isPy38) [ + # Backport a fix for ctypes.util.find_library. + ./3.7/find_library.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index b154f80c1dd..46ed3626d2a 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -5,6 +5,7 @@ , swig , eigen , pkgconfig +, python2 , wafHook , makeWrapper , qt4 @@ -38,9 +39,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wafHook pkgconfig + python2 # For wafHook swig + wafHook ] # The gaiafusion binary inside $out/bin needs a shebangs patch, and # wrapping with the appropriate $PYTHONPATH diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f95818b399c..ad92bf13c4c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + separateDebugInfo = stdenv.isLinux; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3382af17c35..57f05d410fb 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.3"; + version = "2.66.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cdmyyycw2mf5s0f5sfd59q91223s4smcqi8n2fwrccwm5ji7wvr"; + sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index dd76745e1fe..74f8329788a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" ${lib.optionalString (stdenv.cc.libc != null) - ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' + ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"'' } diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index c2a639dff24..0d33d28196c 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do # We can't use --suffix here due to quoting so we craft the export command by hand - wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH=$GST_PLUGIN_SYSTEM_PATH''${GST_PLUGIN_SYSTEM_PATH:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")' + wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH_1_0=$GST_PLUGIN_SYSTEM_PATH_1_0''${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")' done ''; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 654ad3116a4..59685ca07cc 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -43,6 +43,7 @@ , cups ? null , AppKit , Cocoa +, broadwaySupport ? true }: assert cupsSupport -> cups != null; @@ -87,6 +88,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" "-Dtracker3=${boolToString trackerSupport}" + "-Dbroadway_backend=${boolToString broadwaySupport}" ]; # These are the defines that'd you'd get with --enable-debug=minimum (default). diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ea38934b000..5c6ea732b69 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 01ec659a95b..8fe2484faca 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "lcms-1.19"; +stdenv.mkDerivation rec { + pname = "lcms"; + version = "1.19"; src = fetchurl { - url = "http://www.littlecms.com/lcms-1.19.tar.gz"; + url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index e622cc6be68..75db780b7bb 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - (binutils-unwrapped.patchesDir + "/build-components-separately.patch") + ../../tools/misc/binutils/build-components-separately.patch (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 0d3faf69e3b..168773662f6 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }: +{ stdenv, fetchFromGitHub, makeWrapper +, autoreconfHook, autoconf-archive +, installShellFiles, libiconv }: stdenv.mkDerivation rec { + pname = "libdatrie"; - version = "0.2.12"; + version = "2019-12-20"; - src = fetchurl { - url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz"; - sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"; + src = fetchFromGitHub { + owner = "tlwg"; + repo = "libdatrie"; + rev = "d1db08ac1c76f54ba23d63665437473788c999f3"; + sha256 = "03dc363259iyiidrgadzc7i03mmfdj8h78j82vk6z53w6fxq5zxc"; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + installShellFiles + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + preAutoreconf = let + reports = "https://github.com/tlwg/libdatrie/issues"; + in + '' + sed -i -e "/AC_INIT/,+3d" configure.ac + sed -i "5iAC_INIT(${pname},${version},[${reports}])" configure.ac + ''; + postInstall = '' installManPage man/trietool.1 ''; - meta = with stdenv.lib;{ + meta = with stdenv.lib; { homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 2290d2fa07d..cd529cb06ee 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { # aarch64 configurePlatforms = [ "host" "build" ]; + postConfigure = '' + sed -i configure \ + -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' + ''; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 1c5c39ac898..b724789188c 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,22 +1,22 @@ -{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext , pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { pname = "liblangtag"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromBitbucket { owner = "tagoh"; repo = pname; rev = version; - sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g"; + sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96"; }; core_zip = fetchurl { # please update if an update is available - url = "http://www.unicode.org/Public/cldr/33.1/core.zip"; - sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp"; + url = "http://www.unicode.org/Public/cldr/37/core.zip"; + sha256 = "0myswkvvaxvrz9zwq4zh65sygfd9n72cd5rk4pwacqba4nxgb4xs"; }; language_subtag_registry = fetchurl { diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 5f583d53abf..854c2732c12 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Fix for #40213, probably permanent, because upstream doesn't seem to be # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; meta = with stdenv.lib; { homepage = "https://sourceforge.net/projects/omxil/"; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index f596ddfafc4..8db034683dc 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; patches = binutils-unwrapped.patches ++ [ - (binutils-unwrapped.patchesDir + "/build-components-separately.patch") + ../../tools/misc/binutils/build-components-separately.patch ]; # We just want to build libopcodes diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 9f4d6275ad6..e8d3682b8b3 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; - doCheck = true; + doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails meta = with stdenv.lib; { description = "Open, royalty-free, highly versatile audio codec"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 578763478f5..0e18164e6f2 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.2.4"; + version = "20.3.1"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"; + sha256 = "03vqm9kqrcpijg6bxldj0bg360z8d7c767n3b16jdc1apd4inxdg"; }; prePatch = "patchShebangs ."; @@ -58,34 +58,14 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Fix `-Werror=int-conversion` pthread warnings on musl. - # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available - (fetchpatch { - name = "nine_debug-Make-tid-more-type-correct"; - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; - sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; - }) - ] - # do not prefix user provided dri-drivers-path - ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch"; - sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9"; + # Fix `-Werror=int-conversion` pthread warnings on musl. + # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available + (fetchpatch { + name = "nine_debug-Make-tid-more-type-correct"; + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; + sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - ++ lib.optionals (lib.versionOlder version "19.1.0") [ - # do not prefix user provided d3d-drivers-path - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/dcc48664197c7e44684ccfb970a4ae083974d145.patch"; - sha256 = "1nhs0xpx3hiy8zfb5gx1zd7j7xha6h0hr7yingm93130a5902lkb"; - }) - - # don't build libGLES*.so with GLVND - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/b01524fff05eef66e8cd24f1c5aacefed4209f03.patch"; - sha256 = "1pszr6acx2xw469zq89n156p3bf3xf84qpbjw5fr1sj642lbyh7c"; - }) - ]; + ]; postPatch = '' substituteInPlace meson.build --replace \ diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 9601ae1eea3..3a036fcf6fb 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { }) ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index de0db887d4b..d0a9a2e5b49 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, python2 , python3 , pkg-config , readline @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wafHook + python2 # For wafHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 074868251d0..e7b9a26f19f 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "20.08.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "19gchq6fpa00ic5rn1zmjzxx85cif4hbdrsjcfd2aqxz9gqgwrdf"; + sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index 016b4985ed1..8f41bc582bc 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh index 2d266b52977..e4e02bd82ed 100644 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index 70e6dbe82a3..81ceb3ef77e 100644 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -1 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index a583239b52e..3799ccbb59c 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; }; + patches = [ + ./gcc10.patch + ]; + nativeBuildInputs = [ cmake ]; # Building the tests currently fails on AArch64 due to internal compiler diff --git a/pkgs/development/libraries/range-v3/gcc10.patch b/pkgs/development/libraries/range-v3/gcc10.patch new file mode 100644 index 00000000000..caebf0a6316 --- /dev/null +++ b/pkgs/development/libraries/range-v3/gcc10.patch @@ -0,0 +1,133 @@ +From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001 +From: Eric Niebler <eniebler@boost.org> +Date: Mon, 17 Aug 2020 17:48:09 -0700 +Subject: [PATCH] work around premature instantiation problem on gcc; fixes + #1545 + +--- + include/range/v3/view/chunk.hpp | 6 +++--- + include/range/v3/view/split.hpp | 26 +++++++++++++------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp +index 0c03cf1eb..b8df13303 100644 +--- a/include/range/v3/view/chunk.hpp ++++ b/include/range/v3/view/chunk.hpp +@@ -313,8 +313,8 @@ namespace ranges + + public: + inner_view() = default; +- constexpr explicit inner_view(chunk_view_ & view) noexcept +- : rng_{&view} ++ constexpr explicit inner_view(chunk_view_ * view) noexcept ++ : rng_{view} + {} + CPP_auto_member + constexpr auto CPP_fun(size)()( +@@ -338,7 +338,7 @@ namespace ranges + constexpr inner_view read() const + { + RANGES_EXPECT(!done()); +- return inner_view{*rng_}; ++ return inner_view{rng_}; + } + constexpr bool done() const + { +diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp +index facf1b37f..496220e4a 100644 +--- a/include/range/v3/view/split.hpp ++++ b/include/range/v3/view/split.hpp +@@ -389,19 +389,19 @@ namespace ranges + split_outer_iterator() = default; + + CPP_member +- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)( ++ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)( + /// \pre + requires (!forward_range<Base>)) +- : parent_(&parent) ++ : parent_(parent) + {} + + CPP_member +- constexpr CPP_ctor(split_outer_iterator)(Parent & parent, ++ constexpr CPP_ctor(split_outer_iterator)(Parent * parent, + iterator_t<Base> current)( + /// \pre + requires forward_range<Base>) + : Current{std::move(current)} +- , parent_(&parent) ++ , parent_(parent) + {} + + template(bool Other)( +@@ -519,7 +519,7 @@ namespace ranges + ranges::equal_to> && + (forward_range<V> || detail::tiny_range<Pattern>) + #endif +- struct RANGES_EMPTY_BASES split_view ++ struct RANGES_EMPTY_BASES split_view + : view_interface<split_view<V, Pattern>, is_finite<V>::value ? finite : unknown> + , private detail::split_view_base<iterator_t<V>> + { +@@ -537,17 +537,17 @@ namespace ranges + #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17 + outer_iterator<simple_view<V>()> begin_(std::true_type) + { +- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)}; ++ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)}; + } + outer_iterator<false> begin_(std::false_type) + { + this->curr_ = ranges::begin(base_); +- return outer_iterator<false>{*this}; ++ return outer_iterator<false>{this}; + } + + outer_iterator<simple_view<V>()> end_(std::true_type) const + { +- return outer_iterator<true>{*this, ranges::end(base_)}; ++ return outer_iterator<true>{this, ranges::end(base_)}; + } + default_sentinel_t end_(std::false_type) const + { +@@ -580,11 +580,11 @@ namespace ranges + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range<V>) +- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)}; ++ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)}; + else + { + this->curr_ = ranges::begin(base_); +- return outer_iterator<false>{*this}; ++ return outer_iterator<false>{this}; + } + #else + return begin_(meta::bool_<forward_range<V>>{}); +@@ -596,7 +596,7 @@ namespace ranges + /// \pre + requires forward_range<V> && forward_range<const V>) + { +- return {*this, ranges::begin(base_)}; ++ return {this, ranges::begin(base_)}; + } + CPP_member + constexpr auto end() // +@@ -604,14 +604,14 @@ namespace ranges + /// \pre + requires forward_range<V> && common_range<V>) + { +- return outer_iterator<simple_view<V>()>{*this, ranges::end(base_)}; ++ return outer_iterator<simple_view<V>()>{this, ranges::end(base_)}; + } + constexpr auto end() const + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range<V> && forward_range<const V> && + common_range<const V>) +- return outer_iterator<true>{*this, ranges::end(base_)}; ++ return outer_iterator<true>{this, ranges::end(base_)}; + else + return default_sentinel; + #else diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 68cf993a5a8..55032864c3f 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { pytestrunner ]; + postPatch = '' + sed -i "s/'coverage>=\([^,]\+\),.*',$/'coverage>=\1',/" setup.py + ''; + # FIXME: tests requires .git directory to be present doCheck = false; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 45178377026..33d6003cae7 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , pytest , markupsafe -, setuptools +, setuptools }: buildPythonPackage rec { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 385cb990c46..d38f42e4b33 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, fetchpatch +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"; + sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73"; }; patches = [ @@ -38,12 +38,6 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - # Fix namelink failures, can be removed in 3.19.2+ - (fetchpatch { - url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch"; - sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc"; - }) - ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index cd506b970f6..890c457da05 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,6 +4,7 @@ , writeTextDir , substituteAll , fetchpatch +, installShellFiles }: python3.pkgs.buildPythonApplication rec { @@ -77,6 +78,13 @@ python3.pkgs.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson + ''; + meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8c..2131caede3c 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, pkgs, python, makeSetupHook, waf }: +{ lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { - deps = [ python ]; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 4645c63e71d..10b48d51191 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.33.0"; + version = "1.33.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0="; + sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo="; }; patches = [ diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix new file mode 100644 index 00000000000..500d80d4bb8 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "autoconf-2.69"; + + src = fetchurl { + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + }; + + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; + + # Work around a known issue in Cygwin. See + # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for + # details. + # There are many test failures on `i386-pc-solaris2.11'. + #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = false; + + # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + enableParallelBuilding = true; + + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + doInstallCheck = false; # fails + + meta = { + homepage = "https://www.gnu.org/software/autoconf/"; + description = "Part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 93add837290..57a92cee737 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "autoconf-2.69"; + name = "autoconf-2.70"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.xz"; - sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; }; nativeBuildInputs = [ m4 perl ]; @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); - doCheck = false; + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" ''; - doInstallCheck = false; # fails - meta = { homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/always-search-rpath.patch index 2e9956e6b6e..2e9956e6b6e 100644 --- a/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch +++ b/pkgs/development/tools/misc/binutils/always-search-rpath.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch index 38fa4934a28..38fa4934a28 100644 --- a/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 978ec3f2f99..fb3293aee44 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -19,13 +19,7 @@ let reuseLibs = enableShared && withAllTargets; - # Remove gold-symbol-visibility patch when updating, the proper fix - # is now upstream. - # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "${minorVersion}${patchVersion}"; - minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31"; - patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1"; - + version = "2.34"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -37,49 +31,33 @@ let rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; }; - - # binutils sources not part of the bootstrap. - non-boot-src = (fetchurl { + # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM + normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = { - "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; - "2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; - }.${version}; + sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; }); - - # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM - normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src; - - # Platforms where we directly use the final source. - # Generally for cross-compiled platforms, where the boot source won't compile. - skipBootSrc = stdenv.targetPlatform.isOr1k; - - # Select the specific source according to the platform in use. - src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src - else if skipBootSrc then non-boot-src - else normal-src; - - patchesDir = ./patches + "/${minorVersion}"; in stdenv.mkDerivation { pname = targetPrefix + basename; - inherit src version; + inherit version; + + src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src; patches = [ # Make binutils output deterministic by default. - "${patchesDir}/deterministic.patch" + ./deterministic.patch # Bfd looks in BINDIR/../lib for some plugins that don't # exist. This is pointless (since users can't install plugins # there) and causes a cycle between the lib and bin outputs, so # get rid of it. - "${patchesDir}/no-plugins.patch" + ./no-plugins.patch # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - "${patchesDir}/disambiguate-arm-targets.patch" + ./disambiguate-arm-targets.patch # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate @@ -87,41 +65,28 @@ stdenv.mkDerivation { # shared objects when cross-compiling. Consequently, we are forced to # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. - "${patchesDir}/always-search-rpath.patch" - ] - # For version 2.31 exclusively - ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [ - # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 - ./patches/2.31/gold-symbol-visibility.patch - - # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 - # un-break features so linking against musl doesn't produce crash-only binaries - ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch - ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] - ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch - ++ # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and - # indeed GHC will refuse to compile with a binutils suffering from it. See - # this comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch - ; + ./always-search-rpath.patch + + ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ # This patch was suggested by Nick Clifton to fix + # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + # It can be removed when that 7-year-old bug is closed. + # This binutils bug causes GHC to emit broken binaries on armv7, and + # indeed GHC will refuse to compile with a binutils suffering from it. See + # this comment for more information: + # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 + lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison - ] ++ lib.optionals (lib.versionAtLeast version "2.34") [ perl texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook - ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; + ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ flex ]; buildInputs = [ zlib gettext ]; inherit noSysDirs; @@ -182,7 +147,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit targetPrefix patchesDir; + inherit targetPrefix; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch b/pkgs/development/tools/misc/binutils/deterministic.patch index 736e0aca6ce..736e0aca6ce 100644 --- a/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch +++ b/pkgs/development/tools/misc/binutils/deterministic.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch index abbfa73da05..abbfa73da05 100644 --- a/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch +++ b/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch index 68cf51b7dd3..68cf51b7dd3 100644 --- a/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch +++ b/pkgs/development/tools/misc/binutils/no-plugins.patch diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch deleted file mode 100644 index 5a047b0f070..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ /dev/null @@ -1,517 +0,0 @@ -From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Fri, 20 Jul 2018 09:18:47 -0700 -Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed - -When -z separate-code, which is enabled by default for Linux/x86, is -used to create executable, ld won't place any data in the code-only -PT_LOAD segment. If there are no data sections placed before the -code-only PT_LOAD segment, the program headers won't be mapped into -any PT_LOAD segment. When the executable tries to access it (based -on the program header address passed in AT_PHDR), it will lead to -segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if -there may be no data sections before the text section so that the -first PT_LOAD segment won't be code-only and will contain the program -header. - -Testcases are adjusted to either pass "-z noseparate-code" to ld or -discard the .note.gnu.property section. A Linux/x86 run-time test is -added. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the - separate code program header is needed, make sure that the first - read-only PT_LOAD segment has no code by adding a - GNU_PROPERTY_X86_ISA_1_USED note. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/linux-x86.S: New file. - * testsuite/ld-elf/linux-x86.exp: Likewise. - * testsuite/ld-elf/pr23428.c: Likewise. - * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld - for Linux/x86 targets. - * testsuite/ld-i386/abs-iamcu.d: Likewise. - * testsuite/ld-i386/abs.d: Likewise. - * testsuite/ld-i386/pr12718.d: Likewise. - * testsuite/ld-i386/pr12921.d: Likewise. - * testsuite/ld-x86-64/abs-k1om.d: Likewise. - * testsuite/ld-x86-64/abs-l1om.d: Likewise. - * testsuite/ld-x86-64/abs.d: Likewise. - * testsuite/ld-x86-64/pr12718.d: Likewise. - * testsuite/ld-x86-64/pr12921.d: Likewise. - * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property - section. - * testsuite/ld-scripts/print-memory-usage.t: Likewise. - * testsuite/ld-scripts/size-2.t: Likewise. - * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld - to create executable if language is "asm". - -(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) ---- - bfd/elfxx-x86.c | 60 ++++++++++++++----- - ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ - ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ - ld/testsuite/ld-elf/sec64k.exp | 2 + - ld/testsuite/ld-i386/abs-iamcu.d | 2 +- - ld/testsuite/ld-i386/abs.d | 2 +- - ld/testsuite/ld-i386/pr12718.d | 2 +- - ld/testsuite/ld-i386/pr12921.d | 2 +- - ld/testsuite/ld-linkonce/zeroeh.ld | 1 + - ld/testsuite/ld-scripts/print-memory-usage.t | 2 + - ld/testsuite/ld-scripts/size-2.t | 1 + - ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- - ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- - ld/testsuite/ld-x86-64/abs.d | 2 +- - ld/testsuite/ld-x86-64/pr12718.d | 2 +- - ld/testsuite/ld-x86-64/pr12921.d | 2 +- - ld/testsuite/lib/ld-lib.exp | 5 +- - 20 files changed, 248 insertions(+), 25 deletions(-) - create mode 100644 ld/testsuite/ld-elf/linux-x86.S - create mode 100644 ld/testsuite/ld-elf/linux-x86.exp - create mode 100644 ld/testsuite/ld-elf/pr23428.c - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index a2497aab86..2e4ff88f1f 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties - const struct elf_backend_data *bed; - unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; - unsigned int got_align; -+ bfd_boolean has_text = FALSE; - - features = 0; - if (info->ibt) -@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties - if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour - && bfd_count_sections (pbfd) != 0) - { -+ if (!has_text) -+ { -+ /* Check if there is no non-empty text section. */ -+ sec = bfd_get_section_by_name (pbfd, ".text"); -+ if (sec != NULL && sec->size != 0) -+ has_text = TRUE; -+ } -+ - ebfd = pbfd; - - if (elf_properties (pbfd) != NULL) - break; - } - -- if (ebfd != NULL && features) -+ bed = get_elf_backend_data (info->output_bfd); -+ -+ htab = elf_x86_hash_table (info, bed->target_id); -+ if (htab == NULL) -+ return pbfd; -+ -+ if (ebfd != NULL) - { -- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_FEATURE_1_AND, -- 4); -- prop->u.number |= features; -- prop->pr_kind = property_number; -+ prop = NULL; -+ if (features) -+ { -+ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -+ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_FEATURE_1_AND, -+ 4); -+ prop->u.number |= features; -+ prop->pr_kind = property_number; -+ } -+ else if (has_text -+ && elf_properties (ebfd) == NULL -+ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL -+ && !htab->elf.dynamic_sections_created -+ && !info->traditional_format -+ && (info->output_bfd->flags & D_PAGED) != 0 -+ && info->separate_code) -+ { -+ /* If the separate code program header is needed, make sure -+ that the first read-only PT_LOAD segment has no code by -+ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_USED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - - /* Create the GNU property note section if needed. */ -- if (pbfd == NULL) -+ if (prop != NULL && pbfd == NULL) - { - sec = bfd_make_section_with_flags (ebfd, - NOTE_GNU_PROPERTY_SECTION_NAME, -@@ -2581,12 +2617,6 @@ error_alignment: - - pbfd = _bfd_elf_link_setup_gnu_properties (info); - -- bed = get_elf_backend_data (info->output_bfd); -- -- htab = elf_x86_hash_table (info, bed->target_id); -- if (htab == NULL) -- return pbfd; -- - htab->r_info = init_table->r_info; - htab->r_sym = init_table->r_sym; - -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -new file mode 100644 -index 0000000000..bdf40c6e01 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -0,0 +1,63 @@ -+ .text -+ .globl _start -+ .type _start,@function -+ .p2align 4 -+_start: -+ xorl %ebp, %ebp -+#ifdef __LP64__ -+ popq %rdi -+ movq %rsp, %rsi -+ andq $~15, %rsp -+#elif defined __x86_64__ -+ mov (%rsp),%edi -+ addl $4,%esp -+ movl %esp, %esi -+ andl $~15, %esp -+#else -+ popl %esi -+ movl %esp, %ecx -+ andl $~15, %esp -+ -+ subl $8,%esp -+ pushl %ecx -+ pushl %esi -+#endif -+ -+ call main -+ -+ hlt -+ -+ .type syscall, @function -+ .globl syscall -+ .p2align 4 -+syscall: -+#ifdef __x86_64__ -+ movq %rdi, %rax /* Syscall number -> rax. */ -+ movq %rsi, %rdi /* shift arg1 - arg5. */ -+ movq %rdx, %rsi -+ movq %rcx, %rdx -+ movq %r8, %r10 -+ movq %r9, %r8 -+ movq 8(%rsp),%r9 /* arg6 is on the stack. */ -+ syscall /* Do the system call. */ -+#else -+ push %ebp -+ push %edi -+ push %esi -+ push %ebx -+ mov 0x2c(%esp),%ebp -+ mov 0x28(%esp),%edi -+ mov 0x24(%esp),%esi -+ mov 0x20(%esp),%edx -+ mov 0x1c(%esp),%ecx -+ mov 0x18(%esp),%ebx -+ mov 0x14(%esp),%eax -+ int $0x80 -+ pop %ebx -+ pop %esi -+ pop %edi -+ pop %ebp -+#endif -+ ret /* Return to caller. */ -+ .size syscall, .-syscall -+ .section .note.GNU-stack,"",@progbits -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -new file mode 100644 -index 0000000000..36217c6fb4 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -0,0 +1,46 @@ -+# Expect script for simple native Linux/x86 tests. -+# Copyright (C) 2018 Free Software Foundation, Inc. -+# -+# This file is part of the GNU Binutils. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -+# MA 02110-1301, USA. -+# -+ -+# Test very simple native Linux/x86 programs with linux-x86.S. -+if { ![isnative] || [which $CC] == 0 \ -+ || (![istarget "i?86-*-linux*"] \ -+ && ![istarget "x86_64-*-linux*"] \ -+ && ![istarget "amd64-*-linux*"]) } { -+ return -+} -+ -+# Add $PLT_CFLAGS if PLT is expected. -+global PLT_CFLAGS -+# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -+global NOPIE_CFLAGS NOPIE_LDFLAGS -+ -+run_ld_link_exec_tests [list \ -+ [list \ -+ "Run PR ld/23428 test" \ -+ "--no-dynamic-linker -z separate-code" \ -+ "" \ -+ { linux-x86.S pr23428.c } \ -+ "pr23428" \ -+ "pass.out" \ -+ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ -+ "asm" \ -+ ] \ -+] -diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c -new file mode 100644 -index 0000000000..3631ed7926 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr23428.c -@@ -0,0 +1,43 @@ -+#include <unistd.h> -+#include <link.h> -+#include <syscall.h> -+ -+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) -+ -+int -+main (int argc, char **argv) -+{ -+ char **ev = &argv[argc + 1]; -+ char **evp = ev; -+ ElfW(auxv_t) *av; -+ const ElfW(Phdr) *phdr = NULL; -+ size_t phnum = 0; -+ size_t loadnum = 0; -+ int fd = STDOUT_FILENO; -+ size_t i; -+ -+ while (*evp++ != NULL) -+ ; -+ -+ av = (ElfW(auxv_t) *) evp; -+ -+ for (; av->a_type != AT_NULL; ++av) -+ switch (av->a_type) -+ { -+ case AT_PHDR: -+ phdr = (const void *) av->a_un.a_val; -+ break; -+ case AT_PHNUM: -+ phnum = av->a_un.a_val; -+ break; -+ } -+ -+ for (i = 0; i < phnum; i++, phdr++) -+ if (phdr->p_type == PT_LOAD) -+ loadnum++; -+ -+ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); -+ -+ syscall (SYS_exit, !loadnum); -+ return 0; -+} -diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp -index b58139e9dd..3909c0eaa1 100644 ---- a/ld/testsuite/ld-elf/sec64k.exp -+++ b/ld/testsuite/ld-elf/sec64k.exp -@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] - foreach sfile $sfiles { puts $ofd "#source: $sfile" } - if { [istarget spu*-*-*] } { - puts $ofd "#ld: --local-store 0:0" -+ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { -+ puts $ofd "#ld: -z noseparate-code" - } else { - puts $ofd "#ld:" - } -diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d -index ac9beff2e5..aba7d6b03f 100644 ---- a/ld/testsuite/ld-i386/abs-iamcu.d -+++ b/ld/testsuite/ld-i386/abs-iamcu.d -@@ -2,7 +2,7 @@ - #source: abs.s - #source: zero.s - #as: --32 -march=iamcu --#ld: -m elf_iamcu -+#ld: -m elf_iamcu -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d -index e660aca524..191ee4456a 100644 ---- a/ld/testsuite/ld-i386/abs.d -+++ b/ld/testsuite/ld-i386/abs.d -@@ -2,7 +2,7 @@ - #as: --32 - #source: abs.s - #source: zero.s --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d -index ec51540a42..7eba52d95e 100644 ---- a/ld/testsuite/ld-i386/pr12718.d -+++ b/ld/testsuite/ld-i386/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d -index e49079b3c8..ea2da3eb51 100644 ---- a/ld/testsuite/ld-i386/pr12921.d -+++ b/ld/testsuite/ld-i386/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld -index b22eaa12c9..f89855a08f 100644 ---- a/ld/testsuite/ld-linkonce/zeroeh.ld -+++ b/ld/testsuite/ld-linkonce/zeroeh.ld -@@ -2,4 +2,5 @@ SECTIONS { - .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } - .gcc_except_table 0x2000 : { *(.gcc_except_table) } - .eh_frame 0x4000 : { *(.eh_frame) } -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t -index 5ff057a5e3..6eda1d2dc4 100644 ---- a/ld/testsuite/ld-scripts/print-memory-usage.t -+++ b/ld/testsuite/ld-scripts/print-memory-usage.t -@@ -11,4 +11,6 @@ SECTIONS - *(.data) - *(.rw) - } -+ -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t -index 723863995e..c3c4eddab4 100644 ---- a/ld/testsuite/ld-scripts/size-2.t -+++ b/ld/testsuite/ld-scripts/size-2.t -@@ -18,4 +18,5 @@ SECTIONS - LONG (SIZEOF (.tdata)) - LONG (SIZEOF (.tbss)) - } :image -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d -index 2c26639fc0..6b0fde0eed 100644 ---- a/ld/testsuite/ld-x86-64/abs-k1om.d -+++ b/ld/testsuite/ld-x86-64/abs-k1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=k1om --#ld: -m elf_k1om -+#ld: -m elf_k1om -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d -index 1fb96d44b7..f87869f9d0 100644 ---- a/ld/testsuite/ld-x86-64/abs-l1om.d -+++ b/ld/testsuite/ld-x86-64/abs-l1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=l1om --#ld: -m elf_l1om -+#ld: -m elf_l1om -z noseparate-code - #objdump: -rs -j .text - #target: x86_64-*-linux* - -diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d -index b24b018639..d99ab4685d 100644 ---- a/ld/testsuite/ld-x86-64/abs.d -+++ b/ld/testsuite/ld-x86-64/abs.d -@@ -1,7 +1,7 @@ - #name: Absolute non-overflowing relocs - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s --#ld: -+#ld: -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d -index 07d17325d0..2c503ffbaa 100644 ---- a/ld/testsuite/ld-x86-64/pr12718.d -+++ b/ld/testsuite/ld-x86-64/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d -index 6fe6abee09..1162d55818 100644 ---- a/ld/testsuite/ld-x86-64/pr12921.d -+++ b/ld/testsuite/ld-x86-64/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index cfbefe9028..1095091882 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { - continue - } - -- if { [ string match "c++" $lang ] } { -+ if { [ string match "asm" $lang ] } { -+ set link_proc ld_link -+ set link_cmd $ld -+ } elseif { [ string match "c++" $lang ] } { - set link_proc ld_link - set link_cmd $CXX - } else { --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch deleted file mode 100644 index ca50d9a57cd..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Sat, 11 Aug 2018 06:41:33 -0700 -Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property - -Existing properties may be removed during property merging. We avoid -adding X86_ISA_1_NEEDED property only if existing properties won't be -removed. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't - add X86_ISA_1_NEEDED property only if existing properties won't - be removed. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/dummy.s: New file. - * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. - * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. - -(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) ---- - bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ - ld/testsuite/ld-elf/dummy.s | 1 + - ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 2 +- - 6 files changed, 66 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-elf/dummy.s - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ccfd25815..2d8f7b640b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties - prop->pr_kind = property_number; - } - else if (has_text -- && elf_properties (ebfd) == NULL - && elf_tdata (info->output_bfd)->o->build_id.sec == NULL - && !htab->elf.dynamic_sections_created - && !info->traditional_format -@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by - adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_NEEDED, -- 4); -- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -- prop->pr_kind = property_number; -+ elf_property_list *list; -+ bfd_boolean need_property = TRUE; -+ -+ for (list = elf_properties (ebfd); list; list = list->next) -+ switch (list->property.pr_type) -+ { -+ case GNU_PROPERTY_STACK_SIZE: -+ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: -+ case GNU_PROPERTY_X86_ISA_1_NEEDED: -+ /* These properties won't be removed during merging. */ -+ need_property = FALSE; -+ break; -+ } -+ -+ if (need_property) -+ { -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - } - - /* Create the GNU property note section if needed. */ -diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s -new file mode 100644 -index 0000000000..403f98000d ---- /dev/null -+++ b/ld/testsuite/ld-elf/dummy.s -@@ -0,0 +1 @@ -+# Dummy -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -index bdf40c6e01..d94abc1106 100644 ---- a/ld/testsuite/ld-elf/linux-x86.S -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -61,3 +61,31 @@ syscall: - ret /* Return to caller. */ - .size syscall, .-syscall - .section .note.GNU-stack,"",@progbits -+ -+ .section ".note.gnu.property", "a" -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+ .long 1f - 0f /* name length */ -+ .long 5f - 2f /* data length */ -+ .long 5 /* note type */ -+0: .asciz "GNU" /* vendor name */ -+1: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+2: .long 0xc0000002 /* pr_type. */ -+ .long 4f - 3f /* pr_datasz. */ -+3: -+ .long 0x2 -+4: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+5: -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -index 36217c6fb4..f6f5a80853 100644 ---- a/ld/testsuite/ld-elf/linux-x86.exp -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ - "Run PR ld/23428 test" \ - "--no-dynamic-linker -z separate-code" \ - "" \ -- { linux-x86.S pr23428.c } \ -+ { linux-x86.S pr23428.c dummy.s } \ - "pr23428" \ - "pass.out" \ - "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch deleted file mode 100644 index 866d6db8ce2..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ /dev/null @@ -1,583 +0,0 @@ -From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 8 Aug 2018 06:09:15 -0700 -Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. -If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the -corresponding x86 instruction set isn’t used. When merging properties -from 2 input files and one input file doesn't have the -GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have -it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED -property if an input file doesn't have it. - -This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the -GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA -requirement. - -bfd/ - - PR ld/23486 - * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove - GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. - (_bfd_x86_elf_link_setup_gnu_properties): Adding the - GNU_PROPERTY_X86_ISA_1_NEEDED, instead of - GNU_PROPERTY_X86_ISA_1_USED, property. - -ld/ - - PR ld/23486 - * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. - * testsuite/ld-x86-64/x86-64.exp: Likewise. - * testsuite/ld-i386/pr23486a.d: New file. - * testsuite/ld-i386/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486a.d: Likewise. - * testsuite/ld-x86-64/pr23486a.s: Likewise. - * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486b.s: Likewise. - * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". - * testsuite/ld-i386/property-4.r: Likewise. - * testsuite/ld-i386/property-5.r: Likewise. - * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. - * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. - * testsuite/ld-x86-64/property-3.r: Likewise. - * testsuite/ld-x86-64/property-4.r: Likewise. - * testsuite/ld-x86-64/property-5.r: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. - -(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) ---- - bfd/elfxx-x86.c | 25 ++++++++++++--- - ld/testsuite/ld-i386/i386.exp | 2 ++ - ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ - ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ - ld/testsuite/ld-i386/property-3.r | 1 - - ld/testsuite/ld-i386/property-4.r | 1 - - ld/testsuite/ld-i386/property-5.r | 1 - - ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/property-3.r | 1 - - ld/testsuite/ld-x86-64/property-4.r | 1 - - ld/testsuite/ld-x86-64/property-5.r | 1 - - .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- - .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- - .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- - .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ - 31 files changed, 211 insertions(+), 47 deletions(-) - create mode 100644 ld/testsuite/ld-i386/pr23486a.d - create mode 100644 ld/testsuite/ld-i386/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s - create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s - ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - switch (pr_type) - { - case GNU_PROPERTY_X86_ISA_1_USED: -+ if (aprop == NULL || bprop == NULL) -+ { -+ /* Only one of APROP and BPROP can be NULL. */ -+ if (aprop != NULL) -+ { -+ /* Remove this property since the other input file doesn't -+ have it. */ -+ aprop->pr_kind = property_remove; -+ updated = TRUE; -+ } -+ break; -+ } -+ goto or_property; -+ - case GNU_PROPERTY_X86_ISA_1_NEEDED: - if (aprop != NULL && bprop != NULL) - { -+or_property: - number = aprop->u.number; - aprop->u.number = number | bprop->u.number; -- /* Remove the property if ISA bits are empty. */ -+ /* Remove the property if all bits are empty. */ - if (aprop->u.number == 0) - { - aprop->pr_kind = property_remove; -@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - { - if (aprop->u.number == 0) - { -- /* Remove APROP if ISA bits are empty. */ -+ /* Remove APROP if all bits are empty. */ - aprop->pr_kind = property_remove; - updated = TRUE; - } - } - else - { -- /* Return TRUE if APROP is NULL and ISA bits of BPROP -+ /* Return TRUE if APROP is NULL and all bits of BPROP - aren't empty to indicate that BPROP should be added - to ABFD. */ - updated = bprop->u.number != 0; -@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties - { - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by -- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ - prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_USED, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, - 4); - prop->u.number = GNU_PROPERTY_X86_ISA_1_486; - prop->pr_kind = property_number; -diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp -index 6d794fe653..78dad02579 100644 ---- a/ld/testsuite/ld-i386/i386.exp -+++ b/ld/testsuite/ld-i386/i386.exp -@@ -462,6 +462,8 @@ run_dump_test "pr23189" - run_dump_test "pr23194" - run_dump_test "pr23372a" - run_dump_test "pr23372b" -+run_dump_test "pr23486a" -+run_dump_test "pr23486b" - - if { !([istarget "i?86-*-linux*"] - || [istarget "i?86-*-gnu*"] -diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d -new file mode 100644 -index 0000000000..41a6dcf7d5 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486a.s -+#source: ../ld-x86-64/pr23486b.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d -new file mode 100644 -index 0000000000..08019b7274 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486b.s -+#source: ../ld-x86-64/pr23486a.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-i386/property-3.r -+++ b/ld/testsuite/ld-i386/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-i386/property-4.r -+++ b/ld/testsuite/ld-i386/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-i386/property-5.r -+++ b/ld/testsuite/ld-i386/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d -index 4bb35b00fb..0aedea1614 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d -index 418d58a8f7..bd69ac6478 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d -index e261038f60..76d2a39f2c 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d -index 25f3d2361e..e770ecffa5 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d -new file mode 100644 -index 0000000000..6d9fa68cdb ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s -new file mode 100644 -index 0000000000..a07d0c7ced ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_USED */ -+ .long 0xc0000000 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0xa -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d -new file mode 100644 -index 0000000000..0445e69d82 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486b.s -+#source: pr23486a.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s -new file mode 100644 -index 0000000000..c5167eeb65 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ -+ .long 0xc0000001 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0x3 -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-x86-64/property-3.r -+++ b/ld/testsuite/ld-x86-64/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-x86-64/property-4.r -+++ b/ld/testsuite/ld-x86-64/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-x86-64/property-5.r -+++ b/ld/testsuite/ld-x86-64/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -index 011426f5a4..4cec728dc7 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -index 1b4229a037..a8df49a351 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -index 290ed6abf1..c112626711 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -index 1142e03272..f10dffdc2c 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -index 819542d181..0147a3c7b6 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -index 4c5d0e0a18..1f8c2dc929 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -index ba181e0bc5..7ca2539ca5 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -index 5216f385dd..f66a40e449 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index 6edb9e86f4..ae21e554ad 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp -@@ -403,6 +403,10 @@ run_dump_test "pr23372a" - run_dump_test "pr23372a-x32" - run_dump_test "pr23372b" - run_dump_test "pr23372b-x32" -+run_dump_test "pr23486a" -+run_dump_test "pr23486a-x32" -+run_dump_test "pr23486b" -+run_dump_test "pr23486b-x32" - - if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { - return --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch b/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch deleted file mode 100644 index d3cd0d2131c..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch +++ /dev/null @@ -1,178 +0,0 @@ -From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 -From: John Ericson <John.Ericson@Obsidian.Systems> -Date: Thu, 12 Oct 2017 11:16:57 -0400 -Subject: [PATCH] Build components separately - ---- - bfd/configure.ac | 18 +++--------------- - opcodes/Makefile.am | 17 +++++++++++++---- - opcodes/configure.ac | 45 ++++++--------------------------------------- - 3 files changed, 22 insertions(+), 58 deletions(-) - -diff --git a/bfd/configure.ac b/bfd/configure.ac -index 9a183c1628..8728837384 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --# When building a shared libbfd, link against the pic version of libiberty --# so that apps that use libbfd won't need libiberty just to satisfy any --# libbfd references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libbfd. - SHARED_LIBADD= --SHARED_LDFLAGS= -+SHARED_LDFLAGS=-liberty - if test "$enable_shared" = "yes"; then --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi -- - # More hacks to build DLLs on Windows. - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" -+ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" - ;; - - # Hack to build or1k-src on OSX - or1k*-*-darwin*) -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" -+ SHARED_LIBADD="-liberty -lintl" - ;; - esac - -diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 925e7ff651..47b395c195 100644 ---- a/opcodes/Makefile.am -+++ b/opcodes/Makefile.am -@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) - endif - - # This is where bfd.h lives. --BFD_H = ../bfd/bfd.h -+BFD_H = $(BFDDIR)/bfd.h - - BUILD_LIBS = @BUILD_LIBS@ - BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ - # development.sh is used to determine -Werror default. - CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh - --AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ - - disassemble.lo: disassemble.c - if am__fastdepCC -@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c - # old version of libbfd, or to pick up libbfd for the wrong architecture - # if host != build. So for building with shared libraries we use a - # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. --libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ -+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion - libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ --libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ -+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ - # Allow dependency tracking to work on all the source files. - EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) - -+libtool-soversion: -+ @echo "creating $@" -+ bfd_soversion="$(VERSION)" ;\ -+ . $(BFDDIR)/development.sh ;\ -+ if test "$$development" = true ; then \ -+ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ fi ;\ -+ echo "$${bfd_soversion}" > $@ -+ - # libtool will build .libs/libopcodes.a. We create libopcodes.a in - # the build directory so that we don't have to convert all the - # programs that use libopcodes.a simultaneously. This is a hack which -diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b9f5eb8a4f..ef2c2152b7 100644 ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -89,6 +89,7 @@ AC_PROG_INSTALL - - AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) - ACX_HEADER_STRING -+GCC_HEADER_STDINT(bfd_stdint.h) - - AC_CHECK_DECLS([basename, stpcpy]) - -@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --#Libs for generator progs --if test "x$cross_compiling" = "xno"; then -- BUILD_LIBS=../libiberty/libiberty.a -- BUILD_LIB_DEPS=$BUILD_LIBS --else -- # if cross-compiling, assume that the system provides -liberty -- # and that the version is compatible with new headers. -- BUILD_LIBS=-liberty -- BUILD_LIB_DEPS= --fi --BUILD_LIBS="$BUILD_LIBS $LIBINTL" --BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" -+BUILD_LIBS="-liberty $LIBINTL" -+BUILD_LIB_DEPS="$LIBINTL_DEP" - - AC_SUBST(BUILD_LIBS) - AC_SUBST(BUILD_LIB_DEPS) - - # Horrible hacks to build DLLs on Windows and a shared library elsewhere. - SHARED_LDFLAGS= --SHARED_LIBADD= -+SHARED_LIBADD=-liberty - SHARED_DEPENDENCIES= - if test "$enable_shared" = "yes"; then --# When building a shared libopcodes, link against the pic version of libiberty --# so that apps that use libopcodes won't need libiberty just to satisfy any --# libopcodes references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libopcodes. - # Note that linking against libbfd as we do here, which is itself linked - # against libiberty, may not satisfy all the libopcodes libiberty references - # since libbfd may not pull in the entirety of libiberty. --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi -- - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin" -+ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin" - ;; -- *-*-darwin*) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}" -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -- ;; - *) -- case "$host_vendor" in -- hp) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}" -- ;; -- *) -- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}" -- ;; -- esac -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -+ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" - ;; - esac - --- -2.14.2 - diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch deleted file mode 100644 index 0fb05a482d1..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 8564af037f5c4c6d2744a89497691359205b2bbc -Author: Shea Levy <shea@shealevy.com> -Date: Mon Mar 19 10:52:40 2018 -0400 - - Revert "Allow multiply-defined absolute symbols when they have the same value." - - This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. - -diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 -index b2a47710b5..d7ca1b48c0 100644 ---- a/gold/ChangeLog-2017 -+++ b/gold/ChangeLog-2017 -@@ -114,11 +114,6 @@ - (localedir): Define as @localedir@. - (gnulocaledir, gettextsrcdir): Use @datarootdir@. - --2017-11-28 Cary Coutant <ccoutant@gmail.com> -- -- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute -- symbols when they have the same value. -- - 2017-11-28 Cary Coutant <ccoutant@gmail.com> - - * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. -diff --git a/gold/resolve.cc b/gold/resolve.cc -index 4a5784cf8b..803576bfed 100644 ---- a/gold/resolve.cc -+++ b/gold/resolve.cc -@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol<size>* to, - Object* object, const char* version, - bool is_default_version) - { -- bool to_is_ordinary; -- const unsigned int to_shndx = to->shndx(&to_is_ordinary); -- - // It's possible for a symbol to be defined in an object file - // using .symver to give it a version, and for there to also be - // a linker script giving that symbol the same version. We - // don't want to give a multiple-definition error for this - // harmless redefinition. -+ bool to_is_ordinary; - if (to->source() == Symbol::FROM_OBJECT - && to->object() == object -- && to->is_defined() - && is_ordinary -+ && to->is_defined() -+ && to->shndx(&to_is_ordinary) == st_shndx - && to_is_ordinary -- && to_shndx == st_shndx -- && to->value() == sym.get_st_value()) -- return; -- -- // Likewise for an absolute symbol defined twice with the same value. -- if (!is_ordinary -- && st_shndx == elfcpp::SHN_ABS -- && !to_is_ordinary -- && to_shndx == elfcpp::SHN_ABS - && to->value() == sym.get_st_value()) - return; - -@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol<size>* to, - && (sym.get_st_bind() == elfcpp::STB_WEAK - || to->binding() == elfcpp::STB_WEAK) - && orig_st_shndx != elfcpp::SHN_UNDEF -+ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF - && to_is_ordinary -- && to_shndx != elfcpp::SHN_UNDEF - && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. - && to->symsize() != 0 - && (sym.get_st_type() != to->type() -@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol<size>* to, - { - Symbol_location fromloc - = { object, orig_st_shndx, static_cast<off_t>(sym.get_st_value()) }; -- Symbol_location toloc = { to->object(), to_shndx, -+ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), - static_cast<off_t>(to->value()) }; - this->candidate_odr_violations_[to->name()].insert(fromloc); - this->candidate_odr_violations_[to->name()].insert(toloc); diff --git a/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch b/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch deleted file mode 100644 index 9624b7976b7..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c ---- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 -+++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 -@@ -333,6 +333,7 @@ - if (plugin_program_name == NULL) - return found; - -+#if 0 - plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); - p = make_relative_prefix (plugin_program_name, - BINDIR, -@@ -364,6 +365,7 @@ - free (p); - if (d) - closedir (d); -+#endif - - return found; - } diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch deleted file mode 100644 index 2e9956e6b6e..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index b6940d376d..0feb1adfd0 100755 ---- a/ld/genscripts.sh -+++ b/ld/genscripts.sh -@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then - USE_LIBPATH=yes - fi - -+# TODO: why is this needed? -+USE_LIBPATH=yes -+ - # Set the library search path, for libraries named by -lfoo. - # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. - # Otherwise, the default is set here. diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch b/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch deleted file mode 100644 index 736e0aca6ce..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c ---- orig/ld/ldlang.c -+++ new/ld/ldlang.c -@@ -3095,6 +3095,8 @@ - ldfile_output_machine)) - einfo (_("%P%F:%s: can not set architecture: %E\n"), name); - -+ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; -+ - link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); - if (link_info.hash == NULL) - einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch deleted file mode 100644 index abbfa73da05..00000000000 --- a/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c -index 9f956d3..f5b61f1 100644 ---- a/bfd/elf32-arm.c -+++ b/bfd/elf32-arm.c -@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) - #undef ELF_MAXPAGESIZE - #define ELF_MAXPAGESIZE 0x1000 - -+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */ -+#define elf_match_priority 2 - #include "elf32-target.h" -+#undef elf_match_priority - - - /* Merge backend specific data from an object file to the output -@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, - #undef ELF_MAXPAGESIZE - #define ELF_MAXPAGESIZE 0x8000 - -+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */ -+#define elf_match_priority 2 - #include "elf32-target.h" -+#undef elf_match_priority diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ee0074f7d83..ce57194bc49 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.18"; + version = "0.7.0"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb"; + sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli"; + sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62"; + cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b75b67e0528..5d33ae99149 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -52,7 +52,7 @@ let "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" + "pak128.german_1.2_for_ST_121.0/PAK128.german_1.2_for_ST_121-0.zip"; - sha256 = "1jxjckz4b02yv1mv1zc3pmajpq740dfnlvhr0x762lbrybymvagi"; + sha256 = "1cv1rzl1a3i5dvk476zq094wawk9hhdh2f0y4xrdny5gn17mb2xi"; }; /* This release contains accented filenames that prevent unzipping. diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0be36daac9f..cb46bc2bfe2 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -91,14 +91,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # elements specified above. dontPatchELF = true; - # Disable stripping to avoid breaking placeholder DLLs/EXEs. - # Symptoms of broken placeholders are: when the wineprefix is created - # drive_c/windows/system32 will only contain a few files instead of - # hundreds, there will be an error about winemenubuilder and MountMgr - # on startup of Wine, and the Drives tab in winecfg will show an error. - # TODO: binutils 2.34 contains a fix for this bug, re-enable stripping once available. - dontStrip = true; - ## FIXME # Add capability to ignore known failing tests # and enable doCheck diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index b3de7ceedaa..55fa6b36de2 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,19 +5,16 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; + sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.9 once 5.10 is out: - substituteInPlace include/version.h \ - --replace "5.8.0" "${version}" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3bdb8c4f297..9edc0ced412 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -113,6 +113,13 @@ let sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' + + # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. + # This way kernels can be bit-by-bit reproducible depending on settings + # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). + # See also https://kernelnewbies.org/BuildId + sed -i Makefile -e 's|--build-id|--build-id=none|' + sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|" ''; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index fb969d7574a..e6fbc9aa097 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-${version}.tar.xz"; - sha256 = "1nyh9kdi3knhxcbv5v4snya0g3gff0m671lnvqcbygw3rm77mx7g"; + url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; + sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; }; patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 28681aed564..559fb6219b4 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { url = mkURL "26f0e7b2" "0018-prevent-pow-optimization.patch"; sha256 = "1c8g0jz5yj9a0rsmryx9vdjsw4hw8mjfcg05c9pmyjg85w3dfp3m"; }) + ./gcc10.patch ]; postPatch = '' diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/os-specific/linux/syslinux/gcc10.patch new file mode 100644 index 00000000000..f4893a91231 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/gcc10.patch @@ -0,0 +1,33 @@ +diff --git a/dos/string.h b/dos/string.h +index f648de2..a502132 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,13 @@ + #ifndef _STRING_H + #define _STRING_H + ++#include <stddef.h> ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) + + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) +@@ -21,6 +22,13 @@ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) + return rv; + } + ++static inline size_t strlen(const char *s) ++{ ++ size_t len = 0; ++ while (*s++) len++; ++ return len; ++} ++ + extern char *strchr(const char *s, int c); + + #endif /* _STRING_H */ diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a2464aeb586..8bdf9efd445 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook, util-linux, nukeReferences, coreutils +, autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -89,7 +89,7 @@ let "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" ''; - nativeBuildInputs = [ autoreconfHook nukeReferences ] + nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) ++ optional buildUser pkgconfig; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 1ef624f2a41..d5766b8d19e 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; + NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion"; enableParallelBuilding = true; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index dc87acddd88..b56e430d995 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks - jinja2 + jinja2 werkzeug ]; checkInputs = [ diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index a155c1717eb..610e89c2fc3 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { } ; + patches = [ + ./gcc10.patch + ]; + # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits diff --git a/pkgs/tools/archivers/p7zip/gcc10.patch b/pkgs/tools/archivers/p7zip/gcc10.patch new file mode 100644 index 00000000000..9361249af93 --- /dev/null +++ b/pkgs/tools/archivers/p7zip/gcc10.patch @@ -0,0 +1,40 @@ +From 1b7d2c73f01b2d2b6a3d2d16840e96e92afdcd61 Mon Sep 17 00:00:00 2001 +From: jinfeihan57 <jinfeihan57@gmail.com> +Date: Tue, 9 Jun 2020 16:48:25 +0800 +Subject: [PATCH] gix gcc10 compiler error + +--- + CPP/Windows/ErrorMsg.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +index 99684ae..90a7e20 100644 +--- a/CPP/Windows/ErrorMsg.cpp ++++ b/CPP/Windows/ErrorMsg.cpp +@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode) + const char * txt = 0; + AString msg; + +- switch(errorCode) { ++ switch(HRESULT(errorCode)) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; + case E_NOTIMPL : txt = "E_NOTIMPL"; break ; + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +@@ -22,7 +22,7 @@ UString MyFormatMessage(DWORD errorCode) + case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; + case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; + case E_INVALIDARG : txt = "E_INVALIDARG"; break ; +- case ERROR_DIRECTORY : txt = "Error Directory"; break ; ++ case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); + } +@@ -43,7 +43,7 @@ bool MyFormatMessage(DWORD messageID, CSysString &message) + const char * txt = 0; + AString msg; + +- switch(messageID) { ++ switch(HRESULT(messageID)) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; + case E_NOTIMPL : txt = "E_NOTIMPL"; break ; + case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch new file mode 100644 index 00000000000..90b60235aad --- /dev/null +++ b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch @@ -0,0 +1,25 @@ +From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 +From: srs5694 <srs5694@users.sourceforge.net> +Date: Fri, 15 May 2020 12:34:14 -0400 +Subject: [PATCH] Fix GCC 10 compile problem + +--- + Make.common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.common b/Make.common +index 3f0b919..95a3a97 100644 +--- a/Make.common ++++ b/Make.common +@@ -60,7 +60,7 @@ endif + # + + # ...for both GNU-EFI and TianoCore.... +-OPTIMFLAGS = -Os -fno-strict-aliasing ++OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns + CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall + + # ...for GNU-EFI.... +-- +2.29.2 + diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 5c7c68d9d9e..76786c26d81 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-toolchain.patch + ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index cdc19887333..c9c71a99deb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 5222f731efb..4a6eca89624 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" "-Wno-error=format-overflow" + "-Wno-error=stringop-overflow=8" ]; installFlags = [ "DESTDIR=\${out}" ]; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { '' substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" sed -i "includes/dhcpd.h" \ - -"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" + -e "s|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' ''; diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d51e5515bd6..9c2b4915bf1 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pkgconfig , wafHook +, python3 , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook + python3 asciidoc docbook_xml_dtd_45 docbook_xsl diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bfc67ccac63..e30b712c5fa 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, callPackage +{ lib, fetchurl, fetchpatch, fetchFromGitHub, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -23,13 +23,13 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? false - , name, suffix ? "", src + , name, suffix ? "", src, patches ? [] }: let sh = busybox-sandbox-shell; nix = stdenv.mkDerivation rec { - inherit name src; + inherit name src patches; version = lib.getVersion name; is24 = lib.versionAtLeast version "2.4pre"; @@ -208,6 +208,13 @@ in rec { sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; }; + patches = [ + (fetchpatch { # Fix build on gcc10 + url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; + sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; + }) + ]; + inherit storeDir stateDir confDir boehmgc; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27c565bce0c..03a146eabd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -120,6 +120,10 @@ in { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook269 = makeSetupHook + { deps = [ autoconf269 automake gettext libtool ]; } + ../build-support/setup-hooks/autoreconf.sh; + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -245,7 +249,9 @@ in archiver = callPackage ../applications/misc/archiver { }; # It segfaults if it uses qt5.15 - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + autoreconfHook = autoreconfHook269; + }; gretl = callPackage ../applications/science/math/gretl { }; @@ -1019,7 +1025,9 @@ in apg = callPackage ../tools/security/apg { }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; + apt-dater = callPackage ../tools/package-management/apt-dater { + autoreconfHook = autoreconfHook269; + }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -3509,7 +3517,9 @@ in duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { }; + duff = callPackage ../tools/filesystems/duff { + autoreconfHook = autoreconfHook269; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; @@ -3573,7 +3583,9 @@ in eflite = callPackage ../applications/audio/eflite {}; - eid-mw = callPackage ../tools/security/eid-mw { }; + eid-mw = callPackage ../tools/security/eid-mw { + autoreconfHook = autoreconfHook269; + }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -4285,7 +4297,9 @@ in gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { }; + gnash = callPackage ../misc/gnash { + autoreconfHook = autoreconfHook269; + }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; @@ -4521,7 +4535,9 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { }; + gsmlib = callPackage ../development/libraries/gsmlib { + autoreconfHook = autoreconfHook269; + }; gssdp = callPackage ../development/libraries/gssdp { }; @@ -5194,9 +5210,13 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap {}; + libcoap = callPackage ../applications/networking/libcoap { + autoconf = autoconf269; + }; - libcryptui = callPackage ../development/libraries/libcryptui { }; + libcryptui = callPackage ../development/libraries/libcryptui { + autoreconfHook = autoreconfHook269; + }; libsmartcols = callPackage ../development/libraries/libsmartcols { }; @@ -5620,7 +5640,9 @@ in lv = callPackage ../tools/text/lv { }; - lxc = callPackage ../os-specific/linux/lxc { }; + lxc = callPackage ../os-specific/linux/lxc { + autoreconfHook = autoreconfHook269; + }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; @@ -6393,7 +6415,9 @@ in opn2bankeditor = callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; - orangefs = callPackage ../tools/filesystems/orangefs { }; + orangefs = callPackage ../tools/filesystems/orangefs { + autoreconfHook = autoreconfHook269; + }; os-prober = callPackage ../tools/misc/os-prober {}; @@ -6467,7 +6491,9 @@ in parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; - parcellite = callPackage ../tools/misc/parcellite { }; + parcellite = callPackage ../tools/misc/parcellite { + autoreconfHook = autoreconfHook269; + }; patchutils = callPackage ../tools/text/patchutils { }; @@ -7644,8 +7670,9 @@ in sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { + autoreconfHook = autoreconfHook269; libxml2 = libxml2Python; - }; + }; systembus-notify = callPackage ../applications/misc/systembus-notify { }; @@ -7930,7 +7957,9 @@ in ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { + autoreconfHook = autoreconfHook269; + }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { }; @@ -8091,7 +8120,9 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; - verilog = callPackage ../applications/science/electronics/verilog {}; + verilog = callPackage ../applications/science/electronics/verilog { + autoconf = autoconf269; + }; versus = callPackage ../applications/networking/versus { }; @@ -8200,6 +8231,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoconf = autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8322,7 +8354,9 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { + autoconf = autoconf269; + }; uhub = callPackage ../servers/uhub { }; @@ -8516,6 +8550,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; + autoconf = autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; @@ -8643,7 +8678,9 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { + autoreconfHook = autoreconfHook269; + }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -9111,10 +9148,9 @@ in gccFun = callPackage (if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then ../development/compilers/gcc/6 - else ../development/compilers/gcc/9); + else ../development/compilers/gcc/10); gcc = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") - then gcc6 else gcc9; - + then gcc6 else gcc10; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -10273,7 +10309,9 @@ in solc = callPackage ../development/compilers/solc { }; - souffle = callPackage ../development/compilers/souffle { }; + souffle = callPackage ../development/compilers/souffle { + autoreconfHook = autoreconfHook269; + }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; @@ -10832,6 +10870,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; + autoreconfHook = autoreconfHook269; bison = buildPackages.bison_3_5; }) ruby_2_5 @@ -11051,12 +11090,14 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf = autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; + autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; + autoconf270 = callPackage ../development/tools/misc/autoconf { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -11548,6 +11589,7 @@ in fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoreconfHook = autoreconfHook269; }; fujprog = callPackage ../development/tools/misc/fujprog { @@ -11907,7 +11949,9 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/tools/misc/openocd { + autoreconfHook = autoreconfHook269; + }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -12505,9 +12549,13 @@ in belle-sip = callPackage ../development/libraries/belle-sip { }; - libbfd = callPackage ../development/libraries/libbfd { }; + libbfd = callPackage ../development/libraries/libbfd { + autoreconfHook = autoreconfHook269; + }; - libopcodes = callPackage ../development/libraries/libopcodes { }; + libopcodes = callPackage ../development/libraries/libopcodes { + autoreconfHook = autoreconfHook269; + }; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; @@ -12768,7 +12816,9 @@ in inherit suidHelper serviceDirectories apparmor; }; - dee = callPackage ../development/libraries/dee { }; + dee = callPackage ../development/libraries/dee { + autoreconfHook = autoreconfHook269; + }; dhex = callPackage ../applications/editors/dhex { }; @@ -12876,6 +12926,7 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + autoreconfHook = autoreconfHook269; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -13070,6 +13121,7 @@ in gdal = callPackage ../development/libraries/gdal { pythonPackages = python3Packages; + autoreconfHook = autoreconfHook269; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -13470,6 +13522,7 @@ in heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + autoreconfHook = autoreconfHook269; }; libheimdal = heimdal; @@ -13494,6 +13547,7 @@ in hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; + autoreconfHook = autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; @@ -13506,7 +13560,9 @@ in hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; - hivex = callPackage ../development/libraries/hivex { }; + hivex = callPackage ../development/libraries/hivex { + autoreconfHook = autoreconfHook269; + }; hound = callPackage ../development/tools/misc/hound { }; @@ -13821,7 +13877,9 @@ in libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; - libarchive = callPackage ../development/libraries/libarchive { }; + libarchive = callPackage ../development/libraries/libarchive { + autoreconfHook = autoreconfHook269; + }; libasr = callPackage ../development/libraries/libasr { }; @@ -14055,7 +14113,9 @@ in libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { + autoreconfHook = autoreconfHook269; + }; libeb = callPackage ../development/libraries/libeb { }; @@ -14236,7 +14296,9 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + autoreconfHook = autoreconfHook269; + }; libgssglue = callPackage ../development/libraries/libgssglue { }; @@ -14482,6 +14544,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { + autoconf = autoconf269; guile = guile_2_0; }; @@ -15037,7 +15100,7 @@ in libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_latest; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -15953,7 +16016,9 @@ in sbc = callPackage ../development/libraries/sbc { }; - schroedinger = callPackage ../development/libraries/schroedinger { }; + schroedinger = callPackage ../development/libraries/schroedinger { + autoreconfHook = autoreconfHook269; + }; SDL = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; @@ -16283,9 +16348,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - wafHook = wafHook.override { python = python3; }; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {}; @@ -16368,7 +16431,9 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { + autoreconfHook = autoreconfHook269; + }; tremor = callPackage ../development/libraries/tremor { }; @@ -17039,7 +17104,9 @@ in cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis { }; + charybdis = callPackage ../servers/irc/charybdis { + autoreconfHook = autoreconfHook269; + }; clamsmtp = callPackage ../servers/mail/clamsmtp { }; @@ -17859,7 +17926,9 @@ in tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - torque = callPackage ../servers/computing/torque { }; + torque = callPackage ../servers/computing/torque { + autoreconfHook = autoreconfHook269; + }; tt-rss = callPackage ../servers/tt-rss { }; tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; @@ -21093,7 +21162,9 @@ in elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elinks = callPackage ../applications/networking/browsers/elinks { + autoreconfHook = autoreconfHook269; + }; elvis = callPackage ../applications/editors/elvis { }; @@ -21337,7 +21408,9 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; - fsv = callPackage ../applications/misc/fsv { }; + fsv = callPackage ../applications/misc/fsv { + autoreconfHook = autoreconfHook269; + }; ft2-clone = callPackage ../applications/audio/ft2-clone { }; @@ -21683,6 +21756,7 @@ in getxbook = callPackage ../applications/misc/getxbook { }; gimp = callPackage ../applications/graphics/gimp { + autoreconfHook = autoreconfHook269; gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; @@ -22581,6 +22655,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 icu = icu64; variant = "still"; jdk = jdk8; @@ -22798,7 +22873,9 @@ in metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + mhwaveedit = callPackage ../applications/audio/mhwaveedit { + autoreconfHook = autoreconfHook269; + }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; @@ -23021,7 +23098,9 @@ in else null; }; - mup = callPackage ../applications/audio/mup { }; + mup = callPackage ../applications/audio/mup { + autoreconfHook = autoreconfHook269; + }; # TODO: we should probably merge these 2 musescore = @@ -23219,6 +23298,7 @@ in msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; + autoreconfHook = autoreconfHook269; }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -23919,7 +23999,9 @@ in rkdeveloptool = callPackage ../misc/rkdeveloptool { }; - rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { + autoreconfHook = autoreconfHook269; + }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -24193,7 +24275,9 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { }; + spek = callPackage ../applications/audio/spek { + autoreconfHook = autoreconfHook269; + }; spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; @@ -24225,7 +24309,9 @@ in sslyze = with python3Packages; toPythonApplication sslyze; - ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssr = callPackage ../applications/audio/soundscape-renderer { + autoreconfHook = autoreconfHook269; + }; ssrc = callPackage ../applications/audio/ssrc { }; @@ -24615,7 +24701,9 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; - vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcprompt = callPackage ../applications/version-management/vcprompt { + autoconf = autoconf269; + }; vcs = callPackage ../applications/video/vcs { }; @@ -25078,7 +25166,9 @@ in gtk = gtk2; }; - x11basic = callPackage ../development/compilers/x11basic { }; + x11basic = callPackage ../development/compilers/x11basic { + autoconf = autoconf269; + }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -25383,7 +25473,9 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { + autoconf = autoconf269; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -25507,7 +25599,10 @@ in nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { + withGui = false; + autoreconfHook = autoreconfHook269; + }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -25786,7 +25881,10 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { qt5 = qt514; }; + freeciv = callPackage ../games/freeciv { + autoreconfHook = autoreconfHook269; + qt5 = qt514; + }; freeciv_gtk = freeciv.override { gtkClient = true; @@ -26767,7 +26865,9 @@ in neuron-version = neuron.version; }; - kallisto = callPackage ../applications/science/biology/kallisto { }; + kallisto = callPackage ../applications/science/biology/kallisto { + autoconf = autoconf269; + }; kssd = callPackage ../applications/science/biology/kssd { }; @@ -27484,6 +27584,7 @@ in boinc = callPackage ../applications/science/misc/boinc { }; celestia = callPackage ../applications/science/astronomy/celestia { + autoreconfHook = autoreconfHook269; lua = lua5_1; inherit (pkgs.gnome2) gtkglext; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 14399d7ac95..542c721e215 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2 }: +{ callPackage, wxGTK30, openssl_1_0_2, autoconf269 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -20,6 +20,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = autoconf269; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -33,6 +34,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = autoconf269; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -44,6 +46,7 @@ rec { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; + autoconf = autoconf269; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -55,6 +58,7 @@ rec { # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; + autoconf = autoconf269; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -67,6 +71,7 @@ rec { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = autoconf269; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -79,6 +84,7 @@ rec { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = autoconf269; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -89,6 +95,7 @@ rec { # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { + autoconf = autoconf269; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02fee95980c..75ea7341cfc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7489,6 +7489,7 @@ let }; nativeBuildInputs = [ buildPackages.pkgconfig ]; propagatedBuildInputs = [ pkgs.pkgconfig ]; + doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; description = "Simplistic interface to pkg-config"; |