Restore version in Qt derivation names · tjh.dev/nixpkgs@e45c0ea

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtcharts"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtcharts"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtconnectivity.nix

··· 1 { qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }: 2 3 qtModule { 4 - name = "qtconnectivity"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 buildInputs = lib.optional stdenv.isLinux bluez; 7 outputs = [ "out" "dev" "bin" ];

··· 1 { qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }: 2 3 qtModule { 4 + pname = "qtconnectivity"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 buildInputs = lib.optional stdenv.isLinux bluez; 7 outputs = [ "out" "dev" "bin" ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtdeclarative.nix

··· 3 with lib; 4 5 qtModule { 6 - name = "qtdeclarative"; 7 qtInputs = [ qtbase qtsvg ]; 8 nativeBuildInputs = [ python3 ]; 9 outputs = [ "out" "dev" "bin" ];

··· 3 with lib; 4 5 qtModule { 6 + pname = "qtdeclarative"; 7 qtInputs = [ qtbase qtsvg ]; 8 nativeBuildInputs = [ python3 ]; 9 outputs = [ "out" "dev" "bin" ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtdoc.nix

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 - name = "qtdoc"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" ]; 7 }

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtdoc"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtgamepad.nix

··· 1 { qtModule, qtbase, qtdeclarative, pkg-config }: 2 3 qtModule { 4 - name = "qtgamepad"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 buildInputs = [ ]; 7 nativeBuildInputs = [ pkg-config ];

··· 1 { qtModule, qtbase, qtdeclarative, pkg-config }: 2 3 qtModule { 4 + pname = "qtgamepad"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 buildInputs = [ ]; 7 nativeBuildInputs = [ pkg-config ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 - name = "qtgraphicaleffects"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" "dev" ]; 7 }

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtgraphicaleffects"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" "dev" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtimageformats.nix

··· 1 { qtModule, qtbase, libtiff }: 2 3 qtModule { 4 - name = "qtimageformats"; 5 qtInputs = [ qtbase ]; 6 propagatedBuildInputs = [ libtiff ]; 7 }

··· 1 { qtModule, qtbase, libtiff }: 2 3 qtModule { 4 + pname = "qtimageformats"; 5 qtInputs = [ qtbase ]; 6 propagatedBuildInputs = [ libtiff ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtlocation.nix

··· 1 { lib, stdenv, qtModule, qtbase, qtmultimedia }: 2 3 qtModule { 4 - name = "qtlocation"; 5 qtInputs = [ qtbase qtmultimedia ]; 6 outputs = [ "bin" "out" "dev" ]; 7 qmakeFlags = lib.optional stdenv.isDarwin [

··· 1 { lib, stdenv, qtModule, qtbase, qtmultimedia }: 2 3 qtModule { 4 + pname = "qtlocation"; 5 qtInputs = [ qtbase qtmultimedia ]; 6 outputs = [ "bin" "out" "dev" ]; 7 qmakeFlags = lib.optional stdenv.isDarwin [

+1 -1

pkgs/development/libraries/qt-5/modules/qtmacextras.nix

··· 1 { lib, qtModule, qtbase }: 2 3 qtModule { 4 - name = "qtmacextras"; 5 qtInputs = [ qtbase ]; 6 meta = with lib; { 7 maintainers = with maintainers; [ periklis ];

··· 1 { lib, qtModule, qtbase }: 2 3 qtModule { 4 + pname = "qtmacextras"; 5 qtInputs = [ qtbase ]; 6 meta = with lib; { 7 maintainers = with maintainers; [ periklis ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtmultimedia.nix

··· 5 with lib; 6 7 qtModule { 8 - name = "qtmultimedia"; 9 qtInputs = [ qtbase qtdeclarative ]; 10 nativeBuildInputs = [ pkg-config ]; 11 buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]

··· 5 with lib; 6 7 qtModule { 8 + pname = "qtmultimedia"; 9 qtInputs = [ qtbase qtdeclarative ]; 10 nativeBuildInputs = [ pkg-config ]; 11 buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]

+1 -1

pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 - name = "qtnetworkauth"; 5 qtInputs = [ qtbase ]; 6 }

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 + pname = "qtnetworkauth"; 5 qtInputs = [ qtbase ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 - name = "qtquickcontrols"; 5 qtInputs = [ qtdeclarative ]; 6 }

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtquickcontrols"; 5 qtInputs = [ qtdeclarative ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 - name = "qtquickcontrols2"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtquickcontrols2"; 5 qtInputs = [ qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtscript.nix

··· 1 { qtModule, qtbase, qttools }: 2 3 qtModule { 4 - name = "qtscript"; 5 qtInputs = [ qtbase qttools ]; 6 }

··· 1 { qtModule, qtbase, qttools }: 2 3 qtModule { 4 + pname = "qtscript"; 5 qtInputs = [ qtbase qttools ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtscxml.nix

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtscxml"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtscxml"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtsensors.nix

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtsensors"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtsensors"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtserialbus.nix

··· 1 { qtModule, qtbase, qtserialport }: 2 3 qtModule { 4 - name = "qtserialbus"; 5 qtInputs = [ qtbase qtserialport ]; 6 }

··· 1 { qtModule, qtbase, qtserialport }: 2 3 qtModule { 4 + pname = "qtserialbus"; 5 qtInputs = [ qtbase qtserialport ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtserialport.nix

··· 3 let inherit (lib) getLib optional; in 4 5 qtModule { 6 - name = "qtserialport"; 7 qtInputs = [ qtbase ]; 8 NIX_CFLAGS_COMPILE = 9 optional stdenv.isLinux

··· 3 let inherit (lib) getLib optional; in 4 5 qtModule { 6 + pname = "qtserialport"; 7 qtInputs = [ qtbase ]; 8 NIX_CFLAGS_COMPILE = 9 optional stdenv.isLinux

+1 -1

pkgs/development/libraries/qt-5/modules/qtspeech.nix

··· 1 { qtModule }: 2 3 qtModule { 4 - name = "qtspeech"; 5 qtInputs = [ ]; 6 outputs = [ "out" "dev" ]; 7 }

··· 1 { qtModule }: 2 3 qtModule { 4 + pname = "qtspeech"; 5 qtInputs = [ ]; 6 outputs = [ "out" "dev" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtsvg.nix

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 - name = "qtsvg"; 5 qtInputs = [ qtbase ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 + pname = "qtsvg"; 5 qtInputs = [ qtbase ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qttools.nix

··· 3 with lib; 4 5 qtModule { 6 - name = "qttools"; 7 qtInputs = [ qtbase qtdeclarative ]; 8 outputs = [ "out" "dev" "bin" ]; 9

··· 3 with lib; 4 5 qtModule { 6 + pname = "qttools"; 7 qtInputs = [ qtbase qtdeclarative ]; 8 outputs = [ "out" "dev" "bin" ]; 9

+1 -1

pkgs/development/libraries/qt-5/modules/qttranslations.nix

··· 1 { qtModule, qttools }: 2 3 qtModule { 4 - name = "qttranslations"; 5 qtInputs = [ qttools ]; 6 }

··· 1 { qtModule, qttools }: 2 3 qtModule { 4 + pname = "qttranslations"; 5 qtInputs = [ qttools ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix

··· 1 { qtModule, qtbase, qtdeclarative, qtsvg, hunspell }: 2 3 qtModule { 4 - name = "qtvirtualkeyboard"; 5 qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; 6 }

··· 1 { qtModule, qtbase, qtdeclarative, qtsvg, hunspell }: 2 3 qtModule { 4 + pname = "qtvirtualkeyboard"; 5 qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtwayland.nix

··· 1 { qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: 2 3 qtModule { 4 - name = "qtwayland"; 5 qtInputs = [ qtbase qtquickcontrols ]; 6 buildInputs = [ wayland ]; 7 nativeBuildInputs = [ pkg-config ];

··· 1 { qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: 2 3 qtModule { 4 + pname = "qtwayland"; 5 qtInputs = [ qtbase qtquickcontrols ]; 6 buildInputs = [ wayland ]; 7 nativeBuildInputs = [ pkg-config ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebchannel.nix

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtwebchannel"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtwebchannel"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

··· 24 with lib; 25 26 qtModule { 27 - name = "qtwebengine"; 28 qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; 29 nativeBuildInputs = [ 30 bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs

··· 24 with lib; 25 26 qtModule { 27 + pname = "qtwebengine"; 28 qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; 29 nativeBuildInputs = [ 30 bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix

··· 1 { qtModule, qtbase, qtwebsockets }: 2 3 qtModule { 4 - name = "qtwebglplugin"; 5 qtInputs = [ qtbase qtwebsockets ]; 6 }

··· 1 { qtModule, qtbase, qtwebsockets }: 2 3 qtModule { 4 + pname = "qtwebglplugin"; 5 qtInputs = [ qtbase qtwebsockets ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebkit.nix

··· 22 usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; 23 in 24 qtModule { 25 - name = "qtwebkit"; 26 qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] 27 ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia 28 ++ optional usingAnnulenWebkitFork qtwebchannel;

··· 22 usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; 23 in 24 qtModule { 25 + pname = "qtwebkit"; 26 qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] 27 ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia 28 ++ optional usingAnnulenWebkitFork qtwebchannel;

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebsockets.nix

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtwebsockets"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtwebsockets"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 outputs = [ "out" "dev" "bin" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtwebview.nix

··· 3 with lib; 4 5 qtModule { 6 - name = "qtwebview"; 7 qtInputs = [ qtdeclarative qtwebengine ]; 8 buildInputs = optional (stdenv.isDarwin) [ 9 darwin.apple_sdk.frameworks.CoreFoundation

··· 3 with lib; 4 5 qtModule { 6 + pname = "qtwebview"; 7 qtInputs = [ qtdeclarative qtwebengine ]; 8 buildInputs = optional (stdenv.isDarwin) [ 9 darwin.apple_sdk.frameworks.CoreFoundation

+1 -1

pkgs/development/libraries/qt-5/modules/qtx11extras.nix

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 - name = "qtx11extras"; 5 qtInputs = [ qtbase ]; 6 }

··· 1 { qtModule, qtbase }: 2 3 qtModule { 4 + pname = "qtx11extras"; 5 qtInputs = [ qtbase ]; 6 }

+1 -1

pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 - name = "qtxmlpatterns"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; 7 }

··· 1 { qtModule, qtbase, qtdeclarative }: 2 3 qtModule { 4 + pname = "qtxmlpatterns"; 5 qtInputs = [ qtbase qtdeclarative ]; 6 devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; 7 }

+1 -1

pkgs/development/libraries/qt-5/qtModule.nix

··· 7 args: 8 9 let 10 - pname = args.name; 11 version = args.version or srcs.${pname}.version; 12 src = args.src or srcs.${pname}.src; 13 in

··· 7 args: 8 9 let 10 + inherit (args) pname; 11 version = args.version or srcs.${pname}.version; 12 src = args.src or srcs.${pname}.src; 13 in