From 7dbf35e3c448598c379da10d70ea286613e923e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 12:58:27 -0300 Subject: [PATCH 1/2] deepin.go-dbus-generator: remove It has been archived upstream and no other package currently depends on it. --- pkgs/desktops/deepin/default.nix | 1 - .../deepin/go-dbus-generator/default.nix | 38 ------------------- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/desktops/deepin/go-dbus-generator/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 8d33ac154af..001d49f447a 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -50,7 +50,6 @@ let dtkwidget = callPackage ./dtkwidget { }; dtkwm = callPackage ./dtkwm { }; go-dbus-factory = callPackage ./go-dbus-factory { }; - go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; qcef = callPackage ./qcef { }; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix deleted file mode 100644 index d0b2d8c07e6..00000000000 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, fetchFromGitHub -, go -, go-lib -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-generator"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb"; - }; - - nativeBuildInputs = [ - go - go-lib - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Convert dbus interfaces to go-lang or qml wrapper code"; - homepage = "https://github.com/linuxdeepin/go-dbus-generator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} From 5863654fbcc9f323715d5770002668c5360557cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 13:50:28 -0300 Subject: [PATCH 2/2] deepin.dbus-factory: remove It is not really needed by the other packages. --- pkgs/desktops/deepin/dbus-factory/default.nix | 43 ------------------- pkgs/desktops/deepin/dde-api/default.nix | 2 - pkgs/desktops/deepin/dde-daemon/default.nix | 2 - pkgs/desktops/deepin/default.nix | 1 - pkgs/desktops/deepin/startdde/default.nix | 2 - 5 files changed, 50 deletions(-) delete mode 100644 pkgs/desktops/deepin/dbus-factory/default.nix diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix deleted file mode 100644 index 06d921cce6d..00000000000 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -, jq -, libxml2 -, go-dbus-generator -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dbus-factory"; - version = "3.1.17"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256"; - }; - - nativeBuildInputs = [ - jq - libxml2 - go-dbus-generator - ]; - - makeFlags = [ - "GOPATH=${placeholder "out"}/share/go" - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Generates static DBus bindings for Golang and QML at build-time"; - homepage = "https://github.com/linuxdeepin/dbus-factory"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 325f62f3781..011be982df5 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -6,7 +6,6 @@ , bc , blur-effect , coreutils -, dbus-factory , deepin , deepin-gettext-tools , fontconfig @@ -43,7 +42,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build - dbus-factory # build deepin.setupHook # TODO: using $PATH to find run time executable does not work with cross compiling diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index b89b2c25446..c4edcef15af 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , pkgconfig -, dbus-factory , go-dbus-factory , go-gir-generator , go-lib @@ -59,7 +58,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig - dbus-factory deepin-gettext-tools gettext networkmanager diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 001d49f447a..5d71f2dc6b2 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -12,7 +12,6 @@ let ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; }; - dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-control-center = callPackage ./dde-control-center { }; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 7d03b00928e..75b36e85de3 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -4,7 +4,6 @@ , pkgconfig , alsaLib , coreutils -, dbus-factory , dde-api , dde-daemon , dde-dock @@ -53,7 +52,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig - dbus-factory jq wrapGAppsHook deepin.setupHook