3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

9864 commits

Author SHA1 Message Date
zowoq 6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Vladimír Čunát f48c1fda6b
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments.  The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
Jan Tojnar 3239fd2b8f
Merge pull request #164155 from a-m-joseph/evince-fix-supportMultimedia-false
evince: pass -Dmultimedia=disabled if !supportMultimedia
2022-03-14 21:53:30 +01:00
Adam Joseph a6fc7b2891 evince: pass -Dmultimedia=disabled if !supportMultimedia
The evince derivation has an option supportMultimedia?true, which if
set to false will exclude gstreamer from the nativeBuildInputs.
Unfortunately this is not enough; the build will fail with:

  Run-time dependency gstreamer-base-1.0 found: NO (tried pkgconfig)

  meson.build:236:0: ERROR: Dependency "gstreamer-base-1.0" not found, tried pkgconfig

Let's pass "-Dmultimedia=disabled" to meson in this case so that the
build succeeds.

Checked with nixpkgs-hammer, which did not report any new warnings
introduced by this commit.
2022-03-14 12:45:04 -07:00
Bobby Rong 45289e1f25
Merge pull request #164085 from bobby285271/pantheon
Pantheon: prepare for vala 0.56
2022-03-14 22:56:08 +08:00
Alyssa Ross d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
github-actions[bot] 0ed928e4ab
Merge master into staging-next 2022-03-14 12:01:26 +00:00
Bobby Rong 21eeb396de
pantheon.elementary-photos: fix build with vala 0.56 2022-03-14 19:58:55 +08:00
Bobby Rong 2f1f631eaa
pantheon.elementary-mail: fix build with vala 0.56 2022-03-14 16:51:26 +08:00
davidak 26c983d95e
Merge pull request #164051 from r-ryantm/auto-update/evince
evince: 41.3 -> 41.4
2022-03-14 08:31:51 +01:00
R. Ryantm 11e41ae4b2 evince: 41.3 -> 41.4 2022-03-13 22:12:41 +00:00
github-actions[bot] 295cda2612
Merge master into staging-next 2022-03-12 18:00:58 +00:00
R. Ryantm a610331778 gnome.gnome-todo: unstable-2022-02-01 -> unstable-2022-03-11 2022-03-12 15:04:30 +01:00
github-actions[bot] ed2c56a3c5
Merge staging-next into staging 2022-03-11 12:01:55 +00:00
github-actions[bot] e01403d0eb
Merge master into staging-next 2022-03-11 12:01:14 +00:00
piegames 0ff66591e4
Merge pull request #162668: gnomeExtensions.arcmenu: 23 -> 24 2022-03-11 12:21:01 +01:00
Ryan Horiguchi a396af658c
gnomeExtensions: auto-update 2022-03-10 23:44:18 +01:00
github-actions[bot] 03c9842a65
Merge staging-next into staging 2022-03-10 18:02:01 +00:00
github-actions[bot] 76c5dacba7
Merge master into staging-next 2022-03-10 18:01:25 +00:00
Sandro 769881ffdc
Merge pull request #162937 from romildo/upd.xfce4-cpufreq-plugin 2022-03-10 15:01:28 +01:00
Sandro fce81c5761
Merge pull request #162939 from romildo/upd.mate-tweak 2022-03-10 15:01:18 +01:00
github-actions[bot] f6b4a4048a
Merge staging-next into staging 2022-03-09 12:01:59 +00:00
github-actions[bot] d47f26379a
Merge master into staging-next 2022-03-08 18:01:16 +00:00
Felix Buehler 783d2679e5 treewide: rename name to pname&version 2022-03-08 13:24:25 +01:00
Sandro da5b455850
Merge pull request #163078 from Stunkymonkey/gnome2-pname-version 2022-03-07 17:50:07 +01:00
github-actions[bot] 8e01330277
Merge master into staging-next 2022-03-07 12:01:33 +00:00
Sandro 94342fb23b
Merge pull request #163068 from Stunkymonkey/plasma5-pname 2022-03-07 10:59:52 +01:00
github-actions[bot] 196bab22be
Merge master into staging-next 2022-03-07 06:01:25 +00:00
Felix Buehler 35727684c8 gnome2: rename name to pname&version 2022-03-07 01:03:02 +01:00
Felix Buehler e728776b56 plasma5: rename name to pname 2022-03-06 22:28:59 +01:00
R. Ryantm f59dd81b3d gnome.gnome-tweaks: 40.0 -> 40.10 2022-03-05 22:59:38 +00:00
José Romildo 2b3b7f3f36 mate.mate-tweak: 22.04.1 → 22.04.4 2022-03-05 22:59:05 +00:00
José Romildo 2e44f478cc xfce.xfce4-cpufreq-plugin: 1.2.6 -> 1.2.7 2022-03-05 19:51:17 -03:00
github-actions[bot] 437813752b
Merge master into staging-next 2022-03-04 18:01:19 +00:00
Sandro f74045c683
Merge pull request #161443 from aanderse/krunner-ssh 2022-03-04 14:46:52 +01:00
R. Ryantm 5e6e647dc1 gnomeExtensions.arcmenu: 23 -> 24 2022-03-03 20:27:58 +00:00
github-actions[bot] cd1f27794e
Merge master into staging-next 2022-03-02 06:11:13 +00:00
Bobby Rong 80d84b063b
Merge pull request #162293 from bobby285271/pantheon
Pantheon updates 2022-02-28
2022-03-02 10:21:09 +08:00
github-actions[bot] fbe95e7196
Merge master into staging-next 2022-03-01 18:05:48 +00:00
Bobby Rong 4646e7f59c
pantheon.elementary-greeter: 6.0.1 -> 6.0.2 2022-03-01 10:23:06 +08:00
Bobby Rong 1bff9045b4
pantheon.appcenter: fix AppStream.PoolFlags being renamed 2022-03-01 10:10:48 +08:00
Jan Tojnar 3935dd094d libgnome-games-support: move out of gnome scope
We do not want libraries there.
2022-02-28 15:18:35 +01:00
AndersonTorres ed2b1b4b90 Merge branch 'master' into staging-next 2022-02-26 21:04:25 -03:00
Aaron Andersen a31c55c3a4 krunner-ssh: init at 1.0 2022-02-26 10:26:58 -05:00
R. Ryantm 9c61cdfb85 gnome.gpaste: 3.42.5 -> 3.42.6 2022-02-26 16:06:28 +01:00
R. Ryantm 61d2bc0cfe gnome-tour: 40.0 -> 40.1 2022-02-26 15:49:32 +01:00
R. Ryantm 733e15de50 gnome.gnome-mines: 40.0 -> 40.1 2022-02-25 10:57:22 -08:00
Sandro 035c360136
Merge pull request #148257 from zseri/opt-disable-avahi-geoclue 2022-02-25 13:00:05 +01:00
R. Ryantm bdc5169fa4 gnomeExtensions.dash-to-dock: 71+date=2022-01-24 -> 71+date=2022-02-23 2022-02-24 13:51:29 +01:00
R. Ryantm 52e9fca9ee gnomeExtensions.arcmenu: 21 -> 23 2022-02-24 05:53:24 +00:00