dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #101528 from NixOS/gnome-3.38

Browse Source
This commit is contained in:
Jan Tojnar 2020-10-25 08:06:00 +01:00 committed by GitHub
commit 076a779d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "3.38.0";
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1olTi6+O+xrPfqYHJosaqhQY1VF9ktT2lGo9v4FOrlU=";
sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn";
};
nativeBuildInputs = [

11
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@ -47,13 +47,13 @@ in
stdenv.mkDerivation rec {
pname = "gdm";
version = "3.38.0";
version = "3.38.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1fimhklb204rflz8k345756jikgbw8113hms3zlcwk6975f43m26";
sha256 = "0wkzy5mrxq963fm4pmn6bhml73zmc8bq61frm77a175046c590q8";
};
mesonFlags = [
@ -122,13 +122,6 @@ stdenv.mkDerivation rec {
# Set up the environment properly when launching sessions
# https://github.com/NixOS/nixpkgs/issues/48255
./reset-environment.patch
# Fix runtime patch location.
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/114
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/9d841d681f3d1c58e3df51a98421257f774cd185.patch";
sha256 = "0lf5kpz9ghylqlbybc0mpfsvr4i29z1ag8wf6j1918hjrfcipnxj";
})
];
postPatch = ''

4
pkgs/desktops/gnome-3/core/gnome-software/default.nix
View File

@ -2,7 +2,7 @@
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils
, sysprof }:
, libsysprof-capture }:
let
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gtk3 glib packagekit appstream-glib libsoup
gsettings-desktop-schemas gnome-desktop
gspell json-glib libsecret ostree
polkit flatpak libxmlb gnome-online-accounts sysprof
polkit flatpak libxmlb gnome-online-accounts libsysprof-capture
] ++ stdenv.lib.optionals withFwupd [
fwupd
];

4
pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
View File

@ -35,7 +35,7 @@
, xorgserver
, python3
, wrapGAppsHook
, sysprof
, libsysprof-capture
, desktop-file-utils
, libcap_ng
, egl-wayland
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
libxkbfile
pango
pipewire_0_2 # TODO: backport pipewire 0.3 support
sysprof
libsysprof-capture
upower
xkeyboard_config
xwayland

4
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -32,7 +32,7 @@
, xorgserver
, python3
, wrapGAppsHook
, sysprof
, libsysprof-capture
, desktop-file-utils
, libcap_ng
, egl-wayland
@ -110,7 +110,7 @@ let self = stdenv.mkDerivation rec {
libxkbfile
pango
pipewire
sysprof
libsysprof-capture
xkeyboard_config
xwayland
wayland-protocols

4
pkgs/desktops/gnome-3/core/sushi/default.nix
View File

@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "sushi";
version = "3.34.0";
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8";
sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
View File

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "gnome-applets";
version = "3.37.2";
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0l1mc9ymjg0bgk92a08zd85hx1vaqrzdj0dwzmna20rp51vf0l4a";
sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
View File

@ -29,7 +29,7 @@
}:
let
pname = "gnome-flashback";
version = "3.37.2";
version = "3.38.0";
# From data/sessions/Makefile.am
requiredComponentsCommon = [
@ -60,7 +60,7 @@ let
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0lz6icgng8ri4sdi3lkdsyvxzfvlkayn85b5346g76vc1w5y03db";
sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m";
};
# make .desktop Execs absolute

4
pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gnome-panel";
version = "3.37.1";
version = "3.38.0";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-HVmP1okz52AY8vsRanhxy8ADPB8Qm/v+CKHstWBn0VI=";
hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU=";
};
# make .desktop Exec absolute

4
pkgs/development/libraries/gcr/default.nix
View File

@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gcr";
version = "3.36.0";
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda";
sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56";
};
postPatch = ''

4
pkgs/development/libraries/gjs/default.nix
View File

@ -29,11 +29,11 @@ let
];
in stdenv.mkDerivation rec {
pname = "gjs";
version = "1.66.0";
version = "1.66.1";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k";
sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/librsvg/default.nix
View File

@ -4,14 +4,14 @@
let
pname = "librsvg";
version = "2.50.0";
version = "2.50.1";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "s/rbokDwm5yYmKsgy3MRRnJD5gfPj5KLfF+EJHTuPfQ=";
sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, sysprof
{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
, libpsl, python3, brotli }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libpsl
brotli
] ++ lib.optionals stdenv.isLinux [
sysprof
libsysprof-capture
];
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
propagatedBuildInputs = [ glib libxml2 ];

4
pkgs/development/libraries/mm-common/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "mm-common";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8";
sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2";
};
nativeBuildInputs = [

4
pkgs/development/libraries/tracker-miners/default.nix
View File

@ -48,11 +48,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "3.0.0";
version = "3.0.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hj0ixrladm7sxcmi0hr6d7wdlg9zcq0cyk22prg9pn54dy1lj5v";
sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
};
nativeBuildInputs = [

4
pkgs/development/libraries/tracker/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.0.0";
version = "3.0.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh";
sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
};
patches = [

30
pkgs/development/tools/profiling/sysprof/capture.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv
, meson
, ninja
, sysprof
}:
stdenv.mkDerivation rec {
pname = "libsysprof-capture";
inherit (sysprof) src version;
nativeBuildInputs = [
meson
ninja
];
mesonFlags = [
"-Dwith_sysprofd=none"
"-Dlibsysprof=false"
"-Dhelp=false"
"-Denable_tools=false"
"-Denable_tests=false"
"-Denable_examples=false"
];
meta = sysprof.meta // {
description = "Static library for Sysprof capture data generation";
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/development/tools/profiling/sysprof/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "sysprof";
version = "3.38.0";
version = "3.38.1";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1kj1yb7sfd874jm0666cnf5lc0c83gxhsdqhjic6ykppqa6p5kcb";
sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
};
nativeBuildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -18621,6 +18621,8 @@ in
sysprof = callPackage ../development/tools/profiling/sysprof { };
libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { };
sysklogd = callPackage ../os-specific/linux/sysklogd { };
syslinux = callPackage ../os-specific/linux/syslinux { };