diff --git a/flake.lock b/flake.lock index 180f06dab..d429c05a3 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1681613598, - "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", + "lastModified": 1682173319, + "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", + "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1681998133, - "narHash": "sha256-Ki9ZArDrj7m9+59drB+p/w0hmEb0AP1I7Qaq83jJCBw=", + "lastModified": 1682272886, + "narHash": "sha256-fBeoSYSvFeZte9jVxUlyKbWQdzLjfMrXK3Dhwg/usoI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ae5dc6f745d745c5ff583f9eb425717ec322f75", + "rev": "7d385961ebe582fed4e850a326d8d200be79f6b8", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681821695, - "narHash": "sha256-uwyBGo/9IALi97AfMuzkJroQQhV6hkybaZVdw6pRNG4=", + "lastModified": 1682218555, + "narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5698b06b0731a2c15ff8c2351644427f8ad33993", + "rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac", "type": "github" }, "original": { diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 29c7eb309..11314f914 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -412,6 +412,7 @@ in # nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f # hdf5 # configure: error: cannot run test program while cross compiling # http2 + ibus jellyfin-web # in node-dependencies-jellyfin-web: "node: command not found" (nodePackages don't cross compile) # libgccjit # "../../gcc-9.5.0/gcc/jit/jit-result.c:52:3: error: 'dlclose' was not declared in this scope" (needed by emacs!) # libsForQt5 # qtbase # make: g++: No such file or directory @@ -890,17 +891,20 @@ in i2p = mvToNativeInputs [ next.ant next.gettext ] prev.i2p; # ibus = (prev.ibus.override { - # # fixes: "configure.ac:152: error: possibly undefined macro: AM_PATH_GLIB_2_0" - # inherit (emulated) stdenv; - ibus = prev.ibus.overrideAttrs (upstream: { - nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [ - next.glib # fixes: ImportError: /nix/store/fi1rsalr11xg00dqwgzbf91jpl3zwygi-gobject-introspection-aarch64-unknown-linux-gnu-1.74.0/lib/gobject-introspection/giscanner/_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory - next.buildPackages.gobject-introspection # fixes "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory" - ]; - buildInputs = lib.remove next.gobject-introspection upstream.buildInputs ++ [ - next.vala # fixes: "Package `ibus-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories" - ]; - }); + # inherit (emulated) + # stdenv # fixes: "configure: error: cannot run test program while cross compiling" + # gobject-introspection # "cannot open shared object ..." + # ; + # }); + # .overrideAttrs (upstream: { + # nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [ + # next.glib # fixes: ImportError: /nix/store/fi1rsalr11xg00dqwgzbf91jpl3zwygi-gobject-introspection-aarch64-unknown-linux-gnu-1.74.0/lib/gobject-introspection/giscanner/_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory + # next.buildPackages.gobject-introspection # fixes "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory" + # ]; + # buildInputs = lib.remove next.gobject-introspection upstream.buildInputs ++ [ + # next.vala # fixes: "Package `ibus-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories" + # ]; + # }); # fixes "./autogen.sh: line 26: gtkdocize: not found" iio-sensor-proxy = mvToNativeInputs [ next.glib next.gtk-doc ] prev.iio-sensor-proxy; @@ -917,19 +921,19 @@ in openjdk8-bootstrap = useEmulatedStdenv prev.javaPackages.compiler.openjdk8-bootstrap; # fixes "configure: error: Could not find required tool for WHICH" openjdk8 = useEmulatedStdenv prev.javaPackages.compiler.openjdk8; - openjdk19 = ( - # fixes "configure: error: Could not find required tool for ZIPEXE" - # new failure: "checking for cc... [not found]" - (mvToNativeInputs - [ next.zip ] - (useEmulatedStdenv prev.javaPackages.compiler.openjdk19) - ).overrideAttrs (_upstream: { - # avoid building `support/demos`, which segfaults - buildFlags = [ "product-images" ]; - doCheck = false; # pre-emptive - }) - ); - # openjdk19 = emulated.javaPackages.compiler.openjdk19; + # openjdk19 = ( + # # fixes "configure: error: Could not find required tool for ZIPEXE" + # # new failure: "checking for cc... [not found]" + # (mvToNativeInputs + # [ next.zip ] + # (useEmulatedStdenv prev.javaPackages.compiler.openjdk19) + # ).overrideAttrs (_upstream: { + # # avoid building `support/demos`, which segfaults + # buildFlags = [ "product-images" ]; + # doCheck = false; # pre-emptive + # }) + # ); + openjdk19 = emulated.javaPackages.compiler.openjdk19; }; }; @@ -1176,6 +1180,10 @@ in ]; }); + cryptography = py-prev.cryptography.override { + inherit (emulated) rustPlatform; # "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’" + }; + defcon = py-prev.defcon.overridePythonAttrs (orig: { nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs; }); diff --git a/overlays/pins.nix b/overlays/pins.nix index ca562e9c1..dded29a2c 100644 --- a/overlays/pins.nix +++ b/overlays/pins.nix @@ -18,4 +18,15 @@ # chromium can take 4 hours to build from source, with no signs of progress. # disable it if you're in a rush. # chromium = next.emptyDirectory; + + # TODO(2023/04/24): remove this. it's upstreamed for next staging-next `nix flake update` + sway-unwrapped = prev.sway-unwrapped.overrideAttrs (upstream: { + patches = upstream.patches or [] ++ [ + (next.fetchpatch { + name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"; + url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; + hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; + }) + ]; + }); })