git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87974 from jtojnar/gnome-more-updates
commite16ca535e9d613e7c50637ad2b56381d40c62e8f authorJan Tojnar <jtojnar@gmail.com> dateSun 17 May 2020, 08:35 (7 years ago) parent873e1146f15e31
4 files changed+105−44
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+12−11 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+43−11 pkgs/desktops/gnome-3/core/simple-scan/default.nix+48−12 pkgs/development/libraries/pipewire/default.nix+2−10
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+12−11
@@ -27,22 +27,13 @@
2727
2828stdenv.mkDerivation rec {
2929 pname = "gnome-clocks";
30− version = "3.36.0";
30+ version = "3.36.2";
3131
3232 src = fetchurl {
3333 url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
34− sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc";
34+ sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY=";
3535 };
3636
37− passthru = {
38− updateScript = gnome3.updateScript {
39− packageName = "gnome-clocks";
40− attrPath = "gnome3.gnome-clocks";
41− };
42− };
43−
44− doCheck = true;
45−
4637 nativeBuildInputs = [
4738 vala
4839 meson
@@ -55,6 +46,7 @@ stdenv.mkDerivation rec {
5546 libxml2
5647 gobject-introspection # for finding vapi files
5748 ];
49+
5850 buildInputs = [
5951 gtk3
6052 glib
@@ -76,6 +68,15 @@ stdenv.mkDerivation rec {
7668 )
7769 '';
7870
71+ doCheck = true;
72+
73+ passthru = {
74+ updateScript = gnome3.updateScript {
75+ packageName = "gnome-clocks";
76+ attrPath = "gnome3.gnome-clocks";
77+ };
78+ };
79+
7980 meta = with stdenv.lib; {
8081 homepage = "https://wiki.gnome.org/Apps/Clocks";
8182 description = "Clock application designed for GNOME 3";
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+43−11
@@ -1,25 +1,57 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook
2−, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gnome3
7+, glib
8+, gtk3
9+, wrapGAppsHook
10+, gettext
11+, itstool
12+, libxml2
13+, libxslt
14+, docbook_xsl
15+, docbook_xml_dtd_43
16+, systemd
17+, python3
18+, gsettings-desktop-schemas
19+}:
320
421stdenv.mkDerivation rec {
522 pname = "gnome-logs";
6− version = "3.34.0";
23+ version = "3.36.0";
724
825 src = fetchurl {
926 url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m";
27+ sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA=";
1128 };
1229
13− mesonFlags = [
14− "-Dman=true"
15− ];
16−
1730 nativeBuildInputs = [
1831 python3
19− meson ninja pkgconfig wrapGAppsHook gettext itstool
20− libxml2 libxslt docbook_xsl docbook_xml_dtd_43
32+ meson
33+ ninja
34+ pkgconfig
35+ wrapGAppsHook
36+ gettext
37+ itstool
38+ libxml2
39+ libxslt
40+ docbook_xsl
41+ docbook_xml_dtd_43
42+ ];
43+
44+ buildInputs = [
45+ glib
46+ gtk3
47+ systemd
48+ gsettings-desktop-schemas
49+ gnome3.adwaita-icon-theme
50+ ];
51+
52+ mesonFlags = [
53+ "-Dman=true"
2154 ];
22− buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
2355
2456 postPatch = ''
2557 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/core/simple-scan/default.nix+48−12
@@ -1,24 +1,60 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
2−, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
3−, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gettext
7+, itstool
8+, python3
9+, wrapGAppsHook
10+, cairo
11+, gdk-pixbuf
12+, colord
13+, glib
14+, gtk3
15+, gusb
16+, packagekit
17+, libwebp
18+, libxml2
19+, sane-backends
20+, vala
21+, gnome3
22+, gobject-introspection
23+}:
424
525stdenv.mkDerivation rec {
626 pname = "simple-scan";
7− version = "3.36.2";
27+ version = "3.36.2.1";
828
929 src = fetchurl {
1030 url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf";
31+ sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs=";
1232 };
1333
14− buildInputs = [
15− cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb
16− gtk3 libwebp packagekit sane-backends vala
17− ];
1834 nativeBuildInputs = [
19− meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
20− # For setup hook
21− gobject-introspection
35+ meson
36+ ninja
37+ gettext
38+ itstool
39+ pkgconfig
40+ python3
41+ wrapGAppsHook
42+ libxml2
43+ gobject-introspection # For setup hook
44+ ];
45+
46+ buildInputs = [
47+ cairo
48+ gdk-pixbuf
49+ colord
50+ glib
51+ gnome3.adwaita-icon-theme
52+ gusb
53+ gtk3
54+ libwebp
55+ packagekit
56+ sane-backends
57+ vala
2258 ];
2359
2460 postPatch = ''
pkgs/development/libraries/pipewire/default.nix+2−10
@@ -1,6 +1,5 @@
11{ stdenv
22, fetchFromGitLab
3−, fetchpatch
43, meson
54, ninja
65, pkgconfig
@@ -33,7 +32,7 @@ let
3332in
3433stdenv.mkDerivation rec {
3534 pname = "pipewire";
36− version = "0.3.2";
35+ version = "0.3.5";
3736
3837 outputs = [ "out" "lib" "dev" "doc" ];
3938
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
4241 owner = "pipewire";
4342 repo = "pipewire";
4443 rev = version;
45− sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs=";
44+ sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ=";
4645 };
4746
4847 nativeBuildInputs = [
@@ -73,13 +72,6 @@ stdenv.mkDerivation rec {
7372 vulkan-loader
7473 xorg.libX11
7574 ];
76− patches = [
77− # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227
78− (fetchpatch {
79− url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch";
80− sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x";
81− })
82− ];
8375
8476 mesonFlags = [
8577 "-Ddocs=true"