3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #74969 from marsam/remove-empty-inherits

treewide: remove empty inherits
This commit is contained in:
worldofpeace 2019-12-04 23:17:08 +00:00 committed by GitHub
commit b07e790963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 45 additions and 49 deletions

View file

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
pname = "workrave"; pname = "workrave";
version = "1.10.31"; version = "1.10.31";
src = let src = fetchFromGitHub {
in fetchFromGitHub {
sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
rev = with stdenv.lib; rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitVersion version); "v" + concatStringsSep "_" (splitVersion version);

View file

@ -20,8 +20,7 @@ let
''; '';
in { in {
runInWindowsVM = drv: let runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let
in pkgs.lib.overrideDerivation drv (attrs: let
bootstrap = bootstrapper attrs.windowsImage; bootstrap = bootstrapper attrs.windowsImage;
in { in {
requiredSystemFeatures = [ "kvm" ]; requiredSystemFeatures = [ "kvm" ];

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time"; description = "Generates static DBus bindings for Golang and QML at build-time";

View file

@ -113,7 +113,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging searchHardCodedPaths $out # debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Go-lang bindings for dde-daemon"; description = "Go-lang bindings for dde-daemon";

View file

@ -37,7 +37,7 @@ mkDerivation rec {
-e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Calendar for Deepin Desktop Environment"; description = "Calendar for Deepin Desktop Environment";

View file

@ -99,7 +99,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Control panel of Deepin Desktop Environment"; description = "Control panel of Deepin Desktop Environment";

View file

@ -121,7 +121,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging searchHardCodedPaths $out # debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon for handling Deepin Desktop Environment session settings"; description = "Daemon for handling Deepin Desktop Environment session settings";

View file

@ -68,7 +68,7 @@ unwrapped = mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dock for Deepin Desktop Environment"; description = "Dock for Deepin Desktop Environment";

View file

@ -240,7 +240,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "File manager and desktop module for Deepin Desktop Environment"; description = "File manager and desktop module for Deepin Desktop Environment";

View file

@ -63,7 +63,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin Desktop Environment launcher module"; description = "Deepin Desktop Environment launcher module";

View file

@ -41,7 +41,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging searchHardCodedPaths $out # for debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin network utils"; description = "Deepin network utils";

View file

@ -38,7 +38,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "PolicyKit agent for Deepin Desktop Environment"; description = "PolicyKit agent for Deepin Desktop Environment";

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt DBus interface library for Deepin software"; description = "Qt DBus interface library for Deepin software";

View file

@ -113,7 +113,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging searchHardCodedPaths $out # debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module"; description = "Deepin desktop-environment - Session UI module";

View file

@ -51,7 +51,7 @@ mkDerivation rec {
searchHardCodedPaths $modsrc # for debugging searchHardCodedPaths $modsrc # for debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin file search tool"; description = "Deepin file search tool";

View file

@ -36,7 +36,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging searchHardCodedPaths $out # debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Easy to use calculator for Deepin Desktop Environment"; description = "Easy to use calculator for Deepin Desktop Environment";

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment"; description = "Base assets and definitions for Deepin Desktop Environment";

View file

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GSettings deepin desktop-wide schemas"; description = "GSettings deepin desktop-wide schemas";

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin Internationalization utilities"; description = "Deepin Internationalization utilities";

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin GTK Theme"; description = "Deepin GTK Theme";

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Icons for the Deepin Desktop Environment"; description = "Icons for the Deepin Desktop Environment";

View file

@ -41,7 +41,7 @@ mkDerivation rec {
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Image Viewer for Deepin Desktop Environment"; description = "Image Viewer for Deepin Desktop Environment";

View file

@ -34,7 +34,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin menu service"; description = "Deepin menu service";

View file

@ -58,7 +58,7 @@ mkDerivation rec {
--replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie"
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin movie player"; description = "Deepin movie player";

View file

@ -48,7 +48,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; description = "Easy-to-use screenshot tool for Deepin Desktop Environment";

View file

@ -25,7 +25,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Pop-up shortcut viewer for Deepin applications"; description = "Pop-up shortcut viewer for Deepin applications";

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin sound theme"; description = "Deepin sound theme";

View file

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
"-DVERSION=${version}" "-DVERSION=${version}"
]; ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Default terminal emulator for Deepin"; description = "Default terminal emulator for Deepin";

View file

@ -31,7 +31,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging searchHardCodedPaths $out # for debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A daemon that helps to launch applications faster"; description = "A daemon that helps to launch applications faster";

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
$out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Wallpapers for Deepin Desktop Environment"; description = "Wallpapers for Deepin Desktop Environment";

View file

@ -29,7 +29,7 @@ mkDerivation rec {
libdisomaster/libdisomaster.pro libdisomaster/libdisomaster.pro
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A libisoburn wrapper for Qt"; description = "A libisoburn wrapper for Qt";

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNOME keyring extension for dde-polkit-agent"; description = "GNOME keyring extension for dde-polkit-agent";

View file

@ -43,7 +43,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin tool kit core library"; description = "Deepin tool kit core library";

View file

@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin graphical user interface library"; description = "Deepin graphical user interface library";

View file

@ -37,7 +37,7 @@ mkDerivation rec {
"LIB_INSTALL_DIR=${outRef}/lib" "LIB_INSTALL_DIR=${outRef}/lib"
]; ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Deepin graphical user interface library"; description = "Deepin graphical user interface library";

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile sed -i -e 's:/share/gocode:/share/go:' Makefile
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment"; description = "GoLang DBus factory for the Deepin Desktop Environment";

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache" "GOCACHE=$(TMPDIR)/go-cache"
]; ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Convert dbus interfaces to go-lang or qml wrapper code"; description = "Convert dbus interfaces to go-lang or qml wrapper code";

View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache" "GOCACHE=$(TMPDIR)/go-cache"
]; ];
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Generate static golang bindings for GObject"; description = "Generate static golang bindings for GObject";

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
rm -r $out/share/go/src/pkg.deepin.io/lib/debian rm -r $out/share/go/src/pkg.deepin.io/lib/debian
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development"; description = "Go bindings for Deepin Desktop Environment development";

View file

@ -90,7 +90,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt5 binding of Chromium Embedded Framework"; description = "Qt5 binding of Chromium Embedded Framework";

View file

@ -43,7 +43,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE"; description = "Qt platform theme integration plugin for DDE";

View file

@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE"; description = "Qt platform theme integration plugins for DDE";

View file

@ -28,7 +28,7 @@ mkDerivation rec {
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "UDisks2 D-Bus interfaces binding for Qt5"; description = "UDisks2 D-Bus interfaces binding for Qt5";

View file

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
} }
)) { )) {
inherit ;name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i"; sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
}; };

View file

@ -3,9 +3,7 @@
, gtk2, which, withGtk ? false , gtk2, which, withGtk ? false
}: }:
let stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "pktgen"; pname = "pktgen";
version = "3.7.2"; version = "3.7.2";