librest_1_0: 0.9.1 → 0.10.2

https://gitlab.gnome.org/GNOME/librest/-/compare/0.9.1...0.10.2

pkgs/development/libraries/librest/1.0.nix

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchurl,
   meson,
   ninja,
@@ -16,8 +15,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "rest";
-  version = "0.9.1";
+  pname = "librest";
+  version = "0.10.2";
 
   outputs = [
     "out"
@@ -26,22 +25,10 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM=";
+    url = "mirror://gnome/sources/librest/${lib.versions.majorMinor version}/librest-${version}.tar.xz";
+    sha256 = "e2y5Ers6Is+n3PAFkl3LYogwJNsMCQmUhufWhRGFybg=";
   };
 
-  patches = [
-    # Pick up MR 30 (https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30) to fix GOA crashes with libsoup 3
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/librest/-/commit/fbad64abe28a96f591a30e3a5d3189c10172a414.patch";
-      hash = "sha256-r8+h84Y/AdM1IOMRcBVwDvfqapqOY8ZtRXdOIQvFR9w=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/librest/-/commit/8049048a0f7d52b3f4101c7123797fed099d4cc8.patch";
-      hash = "sha256-AMhHKzzOoTIlkRwN4KfUwdhxlqvtRgiVjKRfnG7KZwc=";
-    })
-  ];
-
   strictDeps = true;
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [
@@ -67,18 +54,6 @@ stdenv.mkDerivation rec {
     "-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
   ];
 
-  postPatch = ''
-    # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19
-    substituteInPlace meson.build \
-      --replace "con." "conf."
-
-    # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
-    # it should be a build-time dep for build
-    # TODO: send upstream
-    substituteInPlace docs/meson.build \
-      --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver"
-  '';
-
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     moveToOutput "share/doc" "$devdoc"
@@ -88,7 +63,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "librest";
       attrPath = "librest_1_0";
       versionPolicy = "odd-unstable";
     };