1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Commit graph

232 commits

Author SHA1 Message Date
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
José Romildo Malaquias 11ac4397a5 deepin.deepin-wm: use vala-0.42 to avoid compilation errors 2019-09-13 09:08:58 -03:00
Jan Tojnar 9b6789de73
tree-wide: replace wrapProgram with wrapGApp
where appropriate
2019-09-10 17:54:57 +02:00
worldofpeace 59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace c0a57b7854
Merge pull request #65248 from worldofpeace/mkDerivation/deepin
deepin: use qt5.mkDerivation where needed, cleanup wrappers
2019-08-04 10:24:09 -04:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
worldofpeace d01d0c1a81 deepin.dtkwidget: use qmakeFlags 2019-07-21 23:49:36 -04:00
worldofpeace 98656c95d8 deepin.dtkwm: use qmakeFlags 2019-07-21 23:49:36 -04:00
worldofpeace 0f73418f43 deepin.qt5dxcb-plugin: use qmakeFlags 2019-07-21 23:49:36 -04:00
worldofpeace 735199a210 deepin: use qt5.mkDerivation where needed, cleanup wrappers
This switches a majority of the applications to using qt5.mkDerivation
which automatically adds wrapQtAppsHook.

In certain places, where GLib and gtk intersect with Qt, we
also needed to use wrapGAppsHook. In these cases there will
be multiple wrappers.
2019-07-21 23:49:36 -04:00
José Romildo Malaquias d94a4c8070
Merge pull request #63781 from romildo/upd.deepin.dde-session-ui
deepin.dde-session-ui: 4.9.11 -> 4.9.12
2019-07-05 00:00:03 -03:00
José Romildo Malaquias b0944be570 deepin.dde-session-ui: 4.9.11 -> 4.9.12
- Update to version 4.9.12
- Revise hard coded paths
- Wrap binaries in lib/deepin-daemon/
2019-07-04 21:48:23 -03:00
worldofpeace 8789ff3179
Merge pull request #63822 from worldofpeace/dde-control-center/init
deepin.dde-control-center: init at 4.10.11
2019-06-27 22:15:52 -04:00
worldofpeace 072a755870 deepin.dde-control-center: init at 4.10.11 2019-06-27 22:15:13 -04:00
worldofpeace cdeadfe2d7
Merge pull request #63796 from romildo/upd.deepin.dde-daemon
deepin.dde-daemon: 3.27.2.5 -> 3.27.2.6; fix some hard coded paths
2019-06-27 18:10:44 -04:00
worldofpeace 7c5a514d0f
Merge pull request #63797 from romildo/upd.deepin.deepin-calculator
deepin.deepin-calculator: init at 1.0.11
2019-06-26 14:48:55 -04:00
José Romildo Malaquias 1d964892c4 deepin.dde-launcher: init at 4.6.13
fixup! deepin.dde-launcher: init at 4.6.11

deepin.dde-launcher: 4.6.11 -> 4.6.12

deepin.dde-launcher: 4.6.12 -> 4.6.13
2019-06-26 00:40:08 -03:00
José Romildo Malaquias 356a347467 deepin.deepin-calculator: init at 1.0.11 2019-06-26 00:25:57 -03:00
José Romildo Malaquias aadbc98fe8 deepin.dde-daemon: fix some hard coded paths 2019-06-25 23:09:58 -03:00
José Romildo Malaquias 45108a48b3 deepin.dde-daemon: 3.27.2.5 -> 3.27.2.6 2019-06-25 23:07:43 -03:00
José Romildo Malaquias 27170f9619 deepin.dtkcore: explicitly set DTK_VERSION
The build system fails to detect the version to build, defaulting to
the minimum one. To circunvent that it has to be explicitly set.
2019-06-25 22:26:16 -03:00
José Romildo Malaquias 6bde2ebab5 deepin.qt5integration: 0.3.11 -> 0.3.12 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 1996a4e3a9 deepin.qt5dxcb-plugin: 1.1.27 -> 1.2.2 2019-06-22 10:00:23 -03:00
José Romildo Malaquias d1c6afbefb deepin.go-gir-generator: 2.0.1 -> 2.0.2 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 10fe4955f0 deepin.go-dbus-factory: 0.7.0 -> 0.9.0 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 56fc7a5e27 deepin.dtkwidget: 2.0.12.3 -> 2.0.14 2019-06-22 10:00:23 -03:00
José Romildo Malaquias ed177954c9 deepin.dtkcore: 2.0.12.1 -> 2.0.14 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 0678da02bf deepin.deepin-terminal: 3.2.2.1 -> 3.2.6 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 4c5f252189 deepin.deepin-screenshot: 4.1.10 -> 4.2.1 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 7ae57e0d95 deepin.deepin-movie-reborn: 3.2.22.1 -> 3.2.24 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 08b947c7cc deepin.deepin-menu: 3.4.6 -> 3.4.8 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 6945053159 deepin.deepin-image-viewer: 1.3.13 -> 1.3.17 2019-06-22 10:00:23 -03:00
José Romildo Malaquias dd141077f0 deepin.deepin-icon-theme: 15.12.69 -> 15.12.71 2019-06-22 10:00:23 -03:00
José Romildo Malaquias e740813625 deepin.deepin-gtk-theme: 17.10.10 -> 17.10.11 2019-06-22 10:00:23 -03:00
José Romildo Malaquias cb466b8b8b deepin.deepin-desktop-schemas: 3.13.0 -> 3.13.6 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 1a3d5b94d9 deepin.deepin-desktop-base: 2019.04.24 -> 2019.06.19 2019-06-22 10:00:23 -03:00
José Romildo Malaquias f535050720 deepin.deepin-anything: 0.0.7 -> 0.1.0 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 69c29b61ff deepin.dde-session-ui: 4.9.6 -> 4.9.11 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 938b213ed9 deepin.dde-qt-dbus-factory: 1.1.1 -> 1.1.5 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 83457f1269 deepin.dde-polkit-agent: 0.2.6 -> 0.2.10 2019-06-22 10:00:23 -03:00
José Romildo Malaquias 1e9aedc718 deepin.dde-file-manager: 4.8.6.2 -> 4.8.6.4 2019-06-22 09:55:49 -03:00
José Romildo Malaquias 41bbeba160 deepin.dde-dock: 4.9.9 -> 4.10.3 2019-06-22 09:55:49 -03:00
José Romildo Malaquias cb75ea64c9 deepin.dde-daemon: 3.27.1 -> 3.27.2.5 2019-06-22 09:55:49 -03:00
José Romildo Malaquias c66f53065c deepin.dde-api: 3.18.3 -> 3.18.4.1 2019-06-22 09:55:49 -03:00
José Romildo Malaquias 01725fdec8 deepin.dde-calendar: 1.2.6 -> 1.2.10 2019-06-22 09:55:49 -03:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
José Romildo Malaquias e645c763b4 deepin.dde-file-manager: init at 4.8.6.2 2019-06-11 01:56:57 -04:00