Commit graph

11845 commits

Author SHA1 Message Date
github-actions[bot] 6746017444
Merge master into staging-next 2023-03-17 00:02:33 +00:00
Weijia Wang c623f6bfd3
Merge pull request #221447 from wineee/deepin-voice-note
deepin.deepin-voice-note: 5.10.22 -> 5.11.1
2023-03-16 23:26:19 +02:00
github-actions[bot] 80a0ae17b5
Merge master into staging-next 2023-03-16 12:01:29 +00:00
Vladimír Čunát 0f9354bfee
Merge #218309: ffmpeg: ffmpeg_4 → ffmpeg_5
...into staging
2023-03-16 11:11:31 +01:00
rewine 691cbaff10
deepin.deepin-voice-note: 5.10.22 -> 5.11.1 2023-03-16 16:53:27 +08:00
rewine 1a12eb4a33
deepin.deepin-image-viewer: 5.9.4 -> 5.9.11 2023-03-16 11:26:45 +08:00
Martin Weinelt 1c52b361a8
Merge remote-tracking branch 'origin/master' into staging-next 2023-03-15 14:36:40 +01:00
Bobby Rong 35619488db
Merge pull request #221256 from bobby285271/upd/pantheon.elementary-mail
pantheon.elementary-mail: 7.0.0 -> 7.0.1
2023-03-15 18:58:41 +08:00
Bobby Rong 609312c32c
pantheon.elementary-mail: 7.0.0 -> 7.0.1 2023-03-15 10:23:02 +08:00
Martin Weinelt 231c1145f2
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/rflink/default.nix
2023-03-14 22:33:40 +01:00
K900 77e09950a6 plasma: 5.27.2 -> 5.27.3 2023-03-14 20:27:10 +03:00
Martin Weinelt 6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
piegames ac5c65473f
Merge pull request #220740: "gnomeExtensions: auto-update" 2023-03-14 07:20:25 +01:00
Nick Cao eb555ff2fe
Merge pull request #218965 from wineee/deepin-terminal-update
deepin.deepin-terminal: 5.4.34 -> 5.9.40
2023-03-14 10:03:35 +08:00
Artturi b978bf0f0f
Merge pull request #220570 from Artturin/fixlints1 2023-03-14 02:15:55 +02:00
Atemu f8264a5b1e tree-wide: mark broken packages as such
Found while changing ffmpeg from 4 to 5; these all depend on ffmpeg either
directly or transitively.
2023-03-13 16:43:06 -06:00
Vladimír Čunát 2d51a0e8ad
Merge branch 'master' into staging-next 2023-03-13 08:25:10 +01:00
Bobby Rong 4992a756b8
Merge pull request #220839 from wineee/deepin-reader-upd
deepin.deepin-reader: 5.10.28 -> 5.10.29
2023-03-13 10:56:23 +08:00
Bobby Rong a3d1e2a87a
Merge pull request #220916 from bobby285271/fix/pantheon.elementary-mail
pantheon.elementary-mail: Backport a crash fix
2023-03-13 09:43:37 +08:00
Bobby Rong 24450ca95b
pantheon.elementary-mail: Backport a crash fix 2023-03-13 07:55:20 +08:00
rewine e249df14b4
deepin.deepin-reader: 5.10.28 -> 5.10.29 2023-03-12 22:30:00 +08:00
github-actions[bot] 9d8f144878
Merge master into staging-next 2023-03-12 12:01:31 +00:00
Nick Cao 5f404dfda2
Merge pull request #220806 from wineee/deepin-draw
deepin.deepin-draw: 5.11.4 -> 5.11.7
2023-03-12 19:43:28 +08:00
rewine 39552719a6
deepin.deepin-compressor: 5.12.9 -> 5.12.14 2023-03-12 19:04:02 +08:00
rewine b021459220
deepin.deepin-draw: 5.11.4 -> 5.11.7 2023-03-12 18:54:03 +08:00
Ryan Horiguchi 9fcd39a8cc
gnomeExtensions: auto-update 2023-03-11 22:07:50 +01:00
Artturin cab4a24c34 treewide: fix lints
Arg to lib.optional is a list

build time tool in buildInputs
2023-03-11 00:55:17 +02:00
Martin Weinelt 4729f61158 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-08 15:04:13 +01:00
Sandro a8991ec81a
Merge pull request #218953 from wineee/dtkgui
deepin.dtkgui: don't propagate librsvg and freeimage
2023-03-08 11:07:40 +01:00
Martin Weinelt 3c902cd3e4 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-08 03:36:07 +01:00
Bobby Rong 5fb8b948bf
Merge pull request #219677 from bobby285271/upd/pantheon.elementary-files
pantheon.elementary-files: 6.2.2 -> 6.3.0 + nixosTests.pantheon: ensure the password box is focused when login
2023-03-08 08:32:29 +08:00
Martin Weinelt e3f019bb71 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-07 15:05:00 +01:00
piegames 79a354065b
Merge pull request #219415: gnomeExtensions: auto-update 2023-03-07 12:59:30 +01:00
K900 62d6cdcf99 kwin: drop gcc12stdenv on aarch64 hack 2023-03-06 17:04:16 +03:00
Bobby Rong 15ada3ac04
pantheon.elementary-files: 6.2.2 -> 6.3.0 2023-03-06 17:55:20 +08:00
Martin Weinelt 8a085cd8e3 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-05 15:36:16 +01:00
Bobby Rong 2408257ae3
pantheon.xdg-desktop-portal-pantheon: 1.2.0 -> 7.0.0 2023-03-05 17:49:15 +08:00
Bobby Rong d13d8e2230
pantheon.wingpanel-indicator-network: 2.3.4 -> 7.0.1 2023-03-05 17:49:15 +08:00
Ryan Horiguchi b7b7c43d5a
gnomeExtensions: auto-update 2023-03-03 22:27:28 +01:00
github-actions[bot] 736c488efe
Merge staging-next into staging 2023-03-01 18:01:48 +00:00
Fabián Heredia Montiel 0c6d8cb679 xorg.xorgserver: 1.20.14 → 21.1.7
Diff:
https://github.com/freedesktop/xorg-xserver/compare/xorg-server-1.20.14...xorg-server-21.1.7

This reverts the revert on https://github.com/NixOS/nixpkgs/pull/174140
2023-03-01 08:47:09 -06:00
github-actions[bot] 5f2d948a2c
Merge staging-next into staging 2023-03-01 12:02:17 +00:00
rewine e3c84efc8e deepin.deepin-terminal: 5.4.34 -> 5.9.40 2023-03-01 17:41:13 +08:00
rewine 03bd63043f deepin.dtkgui: don't propagate librsvg and freeimage 2023-03-01 15:54:05 +08:00
rewine ee7e41392f deepin.deepin-camera: move NIX_CFLAGS_COMPILE to the env attrset 2023-03-01 15:44:27 +08:00
Nick Cao 73d324c9e0
Merge pull request #218722 from wineee/deepin-move
deepin.deepin-movie-reborn: init at 5.10.17
2023-03-01 15:28:34 +08:00
Nick Cao b6cfc3ad0a
Merge pull request #218724 from wineee/dde-device-formatter
deepin.dde-device-formatter: init at unstable-2022-09-05
2023-03-01 15:25:07 +08:00
github-actions[bot] e3dc1573ff
Merge staging-next into staging 2023-03-01 06:01:52 +00:00
Bobby Rong a12fc54f19
Merge pull request #196511 from NixOS/pantheon
Pantheon: default to mutter 42
2023-03-01 09:51:43 +08:00
Martin Weinelt 3686005e6e Merge remote-tracking branch 'origin/staging-next' into staging 2023-02-28 21:17:51 +00:00