diff --git a/flake.lock b/flake.lock index 06d16963..9b7db906 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1679516998, - "narHash": "sha256-w4baQlS84X8Lf0E5RN0nGkx03luDuV1X0+jWMAXm6fs=", + "lastModified": 1680563603, + "narHash": "sha256-gxSci3NTlzgkAOhaC93Q4lReX/Pjd7++imD85JOAlps=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "7a6e97e3af73c4cca87e12c83abcb4913dac7dbc", + "rev": "4aa0afd84005b79be4d5361b56a60df9e9bd4ea3", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1680415272, - "narHash": "sha256-S2J9n+sSeAAdXWHrz/s9pyS5fhbQilfNqYrs6RCUyN8=", + "lastModified": 1680976873, + "narHash": "sha256-zWSTl2cYSwV9mWttlR3clwJ5SBhJj+0p+zl43MNS1xA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66f60deb8aa348ca81d60d0639ae420c667ff92a", + "rev": "df6db8c5b0b94b85e578d05b37e5bf3b24555638", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1680086409, - "narHash": "sha256-Q2QcVgKvTj/LLuZX9dP8ImySWD5sTn8DDI5+EggRn2c=", + "lastModified": 1680517067, + "narHash": "sha256-8Ew0IDRuzEGFUjIGqk7EjuB/NL80HDIvlR1YY4Iw95M=", "ref": "refs/heads/master", - "rev": "068f176a64f0e26dc8c1f0eccf28cbd05be4909b", - "revCount": 182, + "rev": "2970c6080187975a1fc996f541167e697d4ebebc", + "revCount": 187, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/flake.nix b/flake.nix index d1052d5e..1bd92115 100644 --- a/flake.nix +++ b/flake.nix @@ -243,7 +243,7 @@ deployScript = action: pkgs.writeShellScript "deploy-moby" '' nixos-rebuild --flake '.#moby' build $@ sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey $(readlink ./result) - nixos-rebuild --flake '.#moby' ${action} --target-host colin@moby --use-remote-sudo $@ + nixos-rebuild --flake '.#moby' ${action} --target-host colin@moby-hn --use-remote-sudo $@ ''; in { update-feeds = { diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index a5f9452e..619cf6ed 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -795,6 +795,8 @@ in "-Dextensions_tool=false" "-Dman=false" "-Dgtk_doc=false" + # fixes "src/st/meson.build:198:2: ERROR: Dependency "libmutter-test-12" not found, tried pkgconfig" + "-Dtests=false" ]; outputs = [ "out" "dev" ]; postPatch = upstream.postPatch or "" + '' @@ -1573,7 +1575,11 @@ in xdg-desktop-portal-gtk = mvToBuildInputs [ next.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" - xdg-desktop-portal-gnome = mvToNativeInputs [ next.gettext next.glib ] prev.xdg-desktop-portal-gnome; + xdg-desktop-portal-gnome = ( + addNativeInputs [ next.wayland-scanner ] ( + mvToNativeInputs [ next.gettext next.glib ] prev.xdg-desktop-portal-gnome + ) + ); # webkitgtk = prev.webkitgtk.override { stdenv = next.ccacheStdenv; }; # webp-pixbuf-loader = prev.webp-pixbuf-loader.override { # # fixes "Builder called die: Cannot wrap '/nix/store/kpp8qhzdjqgvw73llka5gpnsj0l4jlg8-gdk-pixbuf-aarch64-unknown-linux-gnu-2.42.10/bin/gdk-pixbuf-thumbnailer' because it is not an executable file" diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 63c2b2ec..25e6fd01 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -1,10 +1,4 @@ { fetchpatch, fetchurl }: [ - # librewolf: build with `MOZ_REQUIRE_SIGNING=false` - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/199134.diff"; - # url = "https://git.uninsane.org/colin/nixpkgs/commit/99b82e07fee4d194520d6e8d51bc45c80a4d3c7e.diff"; - sha256 = "sha256-Ne4hyHQDwBHUlWo8Z3QyRdmEv1rYGOjFGxSfOAcLUvQ="; - }) # splatmoji: init at 1.2.0 (fetchpatch { @@ -48,6 +42,12 @@ hash = "sha256-AK/l0vteCEg/ae4E0dS1oWnlLI4xyeyLFJcqMgCQ4RI="; }) + # 2023-04-11: sequoia: 0.27.0 -> 0.28.0 & fix staging-next build + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/225823.diff"; + hash = "sha256-6ExUJZxP1t5SbTaHimaqzScTjFdqnZhZqTIUxY452QQ="; + }) + # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized