Unverified Commit 76d36c09 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #314678 from jtojnar/gnome-updates

GNOME updates 2024-05-25
parents b10576f8 07ae3d80
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -40,15 +40,15 @@
, xvfb-run
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-builder";
  version = "46.1";
  version = "46.2";

  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
    hash = "sha256-lhaWbVIqLIUCizPAm605cudp6fkK91VNXnGDfb3HiHE=";
    url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
    hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM=";
  };

  patches = [
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
  '';

  passthru.updateScript = gnome.updateScript {
    packageName = pname;
    packageName = "gnome-builder";
  };

  meta = with lib; {
@@ -175,4 +175,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.linux;
    mainProgram = "gnome-builder";
  };
}
})
+4 −9
Original line number Diff line number Diff line
@@ -7,23 +7,23 @@
, ninja
, pkg-config
, uhttpmock_1_0
, libxml2
, glib
, gnome-online-accounts
, json-glib
, librest_1_0
, libsoup_3
, gnome
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "libmsgraph";
  version = "0.2.1";
  version = "0.2.2";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz";
    hash = "sha256-4OWeqorj4KSOwKbC/tBHCFanCSSOkhK2odA33leS7Ls=";
    hash = "sha256-EsyVT3ULsTes6FAP6TVdJubgDvbMqrKVDp02DpJ1gzU=";
  };

  nativeBuildInputs = [
@@ -36,21 +36,16 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    uhttpmock_1_0
    libxml2
  ];

  propagatedBuildInputs = [
    glib
    gnome-online-accounts
    json-glib
    librest_1_0
    libsoup_3
  ];

  mesonFlags = [
    # https://gitlab.gnome.org/GNOME/msgraph/-/merge_requests/9
    "-Dc_args=-Wno-error=format-security"
  ];

  postFixup = ''
    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
    moveToOutput "share/doc/msgraph-0" "$devdoc"
+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "file-roller";
  version = "44.2";
  version = "44.3";

  src = fetchurl {
    url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
    hash = "sha256-LFcXzn8F+6sTyEe2zjGxsCSIYfp6uPD/Hx4dRdHizfk=";
    hash = "sha256-BMinRiX+yEJn/exAMGr7QQS9My2FBh4NNtSrBTOt+ko=";
  };

  nativeBuildInputs = [
+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-maps";
  version = "46.10";
  version = "46.11";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
    hash = "sha256-XyXul6DC/t+E8M8DkrTvi+GT4/bOJfl1RntvzsBUIa8=";
    hash = "sha256-lAtBuXQLCBMyXjkWdYcWz4+g7k4MkZHyYM7AbZITWDU=";
  };

  doCheck = !stdenv.isDarwin;
+6 −6
Original line number Diff line number Diff line
@@ -40,15 +40,15 @@
, withLibsecret ? true
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "evince";
  version = "46.1";
  version = "46.3";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
    hash = "sha256-lLtSU2WwYKKML2AX0iy/KvURVQclSqQum/wAC7wYq2I=";
    url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz";
    hash = "sha256-vA0dQbnX/8di6Z0qv6+sv3RRgvCzHYbbXuyMZ/XzAGs=";
  };

  depsBuildBuild = [
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
      packageName = "evince";
    };
  };

@@ -141,4 +141,4 @@ stdenv.mkDerivation rec {
    mainProgram = "evince";
    maintainers = teams.gnome.members ++ teams.pantheon.members;
  };
}
})
Loading