From ccef9d14141e55b149c930f7b08a810a6c9979ed Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 8 Dec 2023 20:08:17 +0000
Subject: [PATCH] nixpkgs: update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/f63903a90faf6cce169eb2bcc93fb45c457b1d31' (2023-12-08)
  → 'github:nixos/nixpkgs/c89d45747b4ba510caa6b2704b574484b6f93e96' (2023-12-08)
```
---
 flake.lock         |  6 +++---
 overlays/cross.nix | 28 +++-------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9b99a776..8b6af417 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,11 +53,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1702003655,
-        "narHash": "sha256-J0ZXNTDG4ZDB8PU0njha8xf7CZ0qSrYB0hHhzgEkOpI=",
+        "lastModified": 1702064746,
+        "narHash": "sha256-nptROGL9iPP2XPacbgueTMaIWpv+RtZEg24ZbSMNYBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f63903a90faf6cce169eb2bcc93fb45c457b1d31",
+        "rev": "c89d45747b4ba510caa6b2704b574484b6f93e96",
         "type": "github"
       },
       "original": {
diff --git a/overlays/cross.nix b/overlays/cross.nix
index b869a997..eacc47d4 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -714,7 +714,7 @@ in with final; {
     '';
   }));
 
-  # 2023/07/31: upstreaming is blocked on ostree dep
+  # 2023/12/08: upstreaming is unblocked
   # needs binfmt: "./configure: line 17437: /nix/store/j2afjl8psjlk5cz23n45w5x8wkks2rkl-bubblewrap-aarch64-unknown-linux-gnu-0.8.0/bin/bwrap: cannot execute binary file: Exec format error"
   flatpak = prev.flatpak.overrideAttrs (upstream: {
     # fixes "No package 'libxml-2.0' found"
@@ -1649,28 +1649,6 @@ in with final; {
   #   # fixes "checking for /proc/net/route... configure: error: cannot check for file existence when cross compiling"
   #   inherit (emulated) stdenv;
   # };
-  # ostree = prev.ostree.override {
-  #   # fixes "configure: error: Need GPGME_PTHREAD version 1.1.8 or later"
-  #   inherit (emulated) stdenv;
-  # };
-
-  # 2023/09/02: upstreaming is implemented on servo `wip-ostree` branch
-  # 2023/11/21: upstreaming is in PR: <https://github.com/NixOS/nixpkgs/pull/269169>
-  ostree = prev.ostree.overrideAttrs (upstream: {
-    # fixes: "configure: error: Need GPGME_PTHREAD version 1.1.8 or later"
-    # new failure mode: "./src/libotutil/ot-gpg-utils.h:22:10: fatal error: gpgme.h: No such file or directory"
-    # buildInputs = lib.remove gpgme upstream.buildInputs;
-    # nativeBuildInputs = upstream.nativeBuildInputs ++ [ gpgme ];
-    # buildInputs = lib.remove gjs upstream.buildInputs;
-    # configureFlags = lib.remove "--enable-installed-tests" upstream.configureFlags;
-    # postPatch = (upstream.postPatch or "") + ''
-    #   substituteInPlace Makefile-libostree.am \
-    #     --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc"
-    # '';
-    makeFlags = upstream.makeFlags ++ [
-      "INTROSPECTION_SCANNER_ENV="
-    ];
-  });
 
   # fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
   # 2023/07/27: upstreaming is blocked on p11-kit, argyllcms, libavif cross compilation
@@ -2226,7 +2204,7 @@ in with final; {
   #   buildInputs = upstream.buildInputs ++ [ bash ];
   # });
 
-  # 2023/11/21: upstreaming is blocked on ostree
+  # 2023/11/21: upstreaming is blocked on flatpak
   xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
     nativeBuildInputs = upstream.nativeBuildInputs ++ [
       # fixes "meson.build:117:8: ERROR: Program 'bwrap' not found or not executable"
@@ -2239,7 +2217,7 @@ in with final; {
     ];
   });
   # fixes "No package 'xdg-desktop-portal' found"
-  # 2023/11/21: upstreaming is blocked on ostree, webp-pixbuf-loader, qtsvg (via pipewire/ffado)
+  # 2023/12/08: upstreaming is blocked on argyllcms, flatpak, qtsvg (via pipewire/ffado)
   xdg-desktop-portal-gtk = mvToBuildInputs [ xdg-desktop-portal ] prev.xdg-desktop-portal-gtk;
   # fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable"
   # fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable"