From 70d2d97525d7dc15a6dd249633bede9e646f1911 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 9 Mar 2023 21:45:02 +0000 Subject: [PATCH 1/6] flake update: nixpkgs 2023-03-04 -> 2023-03-08; nix-serve; sops-nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nix-serve': 'github:edolstra/nix-serve/7089565e260267c9c234a81292c841958737cef6' (2023-02-09) → 'github:edolstra/nix-serve/3b6d30016d910a43e0e16f94170440a3e0b8fa8d' (2023-03-07) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/3c5319ad3aa51551182ac82ea17ab1c6b0f0df89' (2023-03-04) → 'github:nixos/nixpkgs/c90c4025bb6e0c4eaf438128a3b2640314b1c58d' (2023-03-08) • Updated input 'sops-nix': 'github:Mic92/sops-nix/7cff56b43952edc5a2c212076d5fc922f764240f' (2023-03-05) → 'github:Mic92/sops-nix/00e9e9cd46600d68dd98a392025d4894c3711b58' (2023-03-08) ``` --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b9e123e8..bd461d9f 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1675958846, - "narHash": "sha256-/nf09eM2vey9GrAXoqagccJrBo/fGyVKP7oNSxPqwdo=", + "lastModified": 1678202930, + "narHash": "sha256-SF82/tTnagdazlETJLzXD9kjZ6lyk38agdLbmMx1UZE=", "owner": "edolstra", "repo": "nix-serve", - "rev": "7089565e260267c9c234a81292c841958737cef6", + "rev": "3b6d30016d910a43e0e16f94170440a3e0b8fa8d", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1678293141, + "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1677987270, - "narHash": "sha256-NRqhY8jbrmP1C6oiVqv1T0T1r560eo4ZpmEdHoQmKj4=", + "lastModified": 1678264398, + "narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7cff56b43952edc5a2c212076d5fc922f764240f", + "rev": "00e9e9cd46600d68dd98a392025d4894c3711b58", "type": "github" }, "original": { From 77587389c4b9fe443fa7232a1b658abbd354d571 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 10 Mar 2023 00:13:59 +0000 Subject: [PATCH 2/6] re-enable chromium --- overlays/pins.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/overlays/pins.nix b/overlays/pins.nix index 4ea9cf11..ca562e9c 100644 --- a/overlays/pins.nix +++ b/overlays/pins.nix @@ -15,6 +15,7 @@ # so just forward the unstable packages. inherit (next.stable or prev) ; - # TODO(2023/03/09): chromium 110.0.5481.177 build hangs. next flake update should resolve? - chromium = next.emptyDirectory; + # 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; }) From e13af1c1c858f9a81ead852f721e4b366f6f8fa6 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 10 Mar 2023 05:19:21 +0000 Subject: [PATCH 3/6] update phosh: 0.23 -> 0.25.1 --- hosts/common/cross/default.nix | 6 +++--- nixpatches/list.nix | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 1002f9b6..b529b391 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -1140,9 +1140,9 @@ in mesonFlags = upstream.mesonFlags ++ [ "-Dphoc_tests=disabled" # "tests/meson.build:20:0: ERROR: Program 'phoc' not found or not executable" ]; - postPatch = upstream.postPatch or "" + '' - sed -i 's:gio_querymodules = :gio_querymodules = "${next.buildPackages.glib.dev}/bin/gio-querymodules" if True else :' build-aux/post_install.py - ''; + # postPatch = upstream.postPatch or "" + '' + # sed -i 's:gio_querymodules = :gio_querymodules = "${next.buildPackages.glib.dev}/bin/gio-querymodules" if True else :' build-aux/post_install.py + # ''; }); # phosh-mobile-settings = prev.phosh-mobile-settings.override { # # fixes "meson.build:26:0: ERROR: Dependency "phosh-plugins" not found, tried pkgconfig" diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 1cf3a223..8f8772d2 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -37,6 +37,12 @@ # let ccache cross-compile ./2023-03-04-ccache-cross-fix.patch + # 2023-03-09: phosh: 0.23 -> 0.25.1 + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/219355.diff"; + hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ="; + }) + # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized From 190571e565c37363723d1e901bc89892379497da Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 10 Mar 2023 09:01:27 +0000 Subject: [PATCH 4/6] flake: update uninsane.org so that it can build on modern nixpkgs --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bd461d9f..e1c6de11 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1675131883, - "narHash": "sha256-yBgJDG72YqIr1bltasqHD1E/kHc9uRFgDjxDmy6kI8M=", + "lastModified": 1678438369, + "narHash": "sha256-GfhWNvAfNZpvP5RZo1yetgJ5+eAp+zlkjS2+YJqN8fs=", "ref": "refs/heads/master", - "rev": "b099c24091cc192abf3997b94342d4b31cc5757b", - "revCount": 170, + "rev": "9b549e42da18218e46d1bf217b5eb81c0c4caf11", + "revCount": 173, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, From 0486c7f78709c506fade72a4cb9a034902065b0c Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 10 Mar 2023 09:02:26 +0000 Subject: [PATCH 5/6] programs: only ship gnome-terminal on phosh this saves us one whole `webkitgtk` (5.0) build on non-phosh GUIs. --- hosts/common/programs.nix | 2 +- hosts/modules/gui/phosh.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/common/programs.nix b/hosts/common/programs.nix index f17cddee..c5e55655 100644 --- a/hosts/common/programs.nix +++ b/hosts/common/programs.nix @@ -162,7 +162,7 @@ let "gnome.nautilus" # gnome-podcasts "gnome.gnome-system-monitor" - "gnome.gnome-terminal" # works on phosh + # "gnome.gnome-terminal" # works on phosh "gnome.gnome-weather" gpodder-configured gthumb diff --git a/hosts/modules/gui/phosh.nix b/hosts/modules/gui/phosh.nix index bd1b58c3..422e9463 100644 --- a/hosts/modules/gui/phosh.nix +++ b/hosts/modules/gui/phosh.nix @@ -28,6 +28,7 @@ in "guiApps" # TODO: see about removing gnome-bluetooth if the in-built gnome-settings bluetooth manager can work "gnome.gnome-bluetooth" + "gnome.gnome-terminal" "phosh-mobile-settings" # "plasma5Packages.konsole" # more reliable terminal ]; @@ -37,11 +38,13 @@ in sane.programs = { inherit (pkgs // { "gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth; + "gnome.gnome-terminal" = pkgs.gnome.gnome-terminal; "plasma5Packages.konsole" = pkgs.plasma5Packages.konsole; }) phosh-mobile-settings "plasma5Packages.konsole" # "gnome.gnome-bluetooth" + "gnome.gnome-terminal" ; }; } From cd375a9a0584c003e79a0e8f17e606bbb8541e0e Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 10 Mar 2023 09:07:52 +0000 Subject: [PATCH 6/6] nit: remove dead commented-out code --- hosts/common/cross/default.nix | 80 ++-------------------------------- 1 file changed, 3 insertions(+), 77 deletions(-) diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index b529b391..0e61e672 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -64,29 +64,9 @@ # - `nix build '.#host-pkgs.moby.qt6Packages.qtwayland'` FAILS # - it uses qmake in nativeBuildInputs (but `.#host-pkgs.moby.buildPackages.qt6.qmake` builds, same with native qtbase...) # - failed version build log truly doesn't have the `QT_HOST_PATH` flag. -# - `host-pkgs.desko.stdenv` fails build: +# +# - `host-pkgs.cross-desko.stdenv` fails build: # - #cross-compiling:nixos.org says pkgsCross.gnu64 IS KNOWN TO NOT COMPILE. let this go for now: -# - make a `` (don't specifiy local/targetSystem) and `-cross` target. -# - `desko-cross` will be broken but `desko` can work -# - see -# - disallowedRequisites = [ bootstrapTools.out ]; -# """ -# error: output '/nix/store/w2vgzyvs2jzf7yr6qqqrjbvrqxxmhwy0-stdenv-linux' is not allowed to refer to the following paths: -# /nix/store/2qbgchkjj1hqi1c8raznwml94pkm3k7q-libunistring-1.0 -# /nix/store/4j425ybkjxcdj89352l5gpdl3nmxq4zn-libidn2-2.3.2 -# /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224 -# /nix/store/qbgfsaviwqi2p6jr7an1g2754sv3xqhn-gcc-11.3.0-lib -# """ -# - rg doesn't reveal any such references in the output though... -# - nor references to bootstrapTools -# - HOWEVER, IT DOES CONTAIN A REFERENCE TO THE PREVIOUS STAGE'S BASH: -# - /nix/store/w2vgzyvs2jzf7yr6qqqrjbvrqxxmhwy0-stdenv-linux/setup -# - export SHELL=/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/bash -# - not clear if that matters? but maybe it reaches bootstrapTools transitively? -# - yeah: that bash specifies the above `glibc` as its loader -# - so we probably can't `inherit` the emulated bash like that. -# - try building `.#host-pkgs.desko.stdenv.shellPackage` or `.#host-pkgs.desko.stdenv.bootstrapTools` -# - `file result/bin/bash` does show that it uses the interpreter for the glibc, above { config, lib, options, pkgs, ... }: @@ -232,21 +212,6 @@ in prev.stdenv.hostPlatform == prev.stdenv.targetPlatform && prev.stdenv.hostPlatform == config.nixpkgs.hostPlatform ) { - # stdenv = prev.stdenv.override { - # cc = next.buildPackages.ccacheWrapper.overrideAttrs (orig: { - # passthru = orig.passthru // { - # # cc = orig.passthru.unwrappedCC; - # cc = prev.stdenv.cc.cc; - # }; - # # passthru = next.buildPackages.stdenv.cc.passthru // orig.passthru; - # }); - # # cc = prev.stdenv.__bootPackages.ccacheWrapper; - # }; - # stdenv = prev.stdenv.__bootPackages.ccacheStdenv; - # stdenv = prev.stdenv.override { - # cc = prev.buildPackages.ccacheWrapper; - # }; - # XXX: stdenv.cc is the cc-wrapper, from . # always the same. # stdenv.cc.cc is either the real gcc (for buildPackages.stdenv), or the ccache (for normal stdenv). @@ -265,44 +230,6 @@ in # stdenv = prev.ccacheStdenv.override { inherit (prev) stdenv; }; }) - # (next: prev: - # let - # emulated = prev.emulated; - # in { - # # packages which don't "cross compile" from x86_64 -> x86_64 - # inherit (emulated) - # # aws-crt-cpp # "/build/source/include/aws/crt/Optional.h:6:10: fatal error: utility: No such file or directory" - # # # bash # "configure: error: C compiler cannot create executables" - # # boehmgc # "gc_badalc.cc:29:10: fatal error: new: No such file or directory " - # # c-ares # dns-proto.h:11:10: fatal error: memory: No such file or directory - # # db48 # "./db_cxx.h:59:10: fatal error: iostream.h: No such file or directory" - # # # kexec-tools # "configure: error: C compiler cannot create executables" - # # gmp6 # "configure: error: could not find a working compiler" - # # gtest # "/build/source/googletest/src/gtest_main.cc:30:10: fatal error: cstdio: No such file or directory" - # # icu72 # "../common/unicode/localpointer.h:45:10: fatal error: memory: No such file or directory" - # # # libidn2 # "configure: error: C compiler cannot create executables" - # # ncurses # "configure: error: C compiler cannot create executables" - # ; - - # bash = prev.bash.overrideAttrs (orig: { - # # configure doesn't know how to build because it doesn't know where to find crt1.o. - # # some parts of nixpkgs specify the path to it explicitly: - # # - - # # - - # # alternatively, the wrapper gcc (first item on PATH if we look at a failed bash's env-vars) - # # adds these flags automatically. so we can probably just tell `configure` to *not* use any special gcc other than the wrapper. - # # TESTING IN PROGRESS: - # # - N.B.: BUILDCC is a vlc-ism! - # # BUILDCC = "${prev.stdenv.cc}/bin/${prev.stdenv.cc.targetPrefix}cc"; # has illegal requisites - # CC = "${prev.stdenv.cc}/bin/${prev.stdenv.cc.targetPrefix}cc"; # XXX: tested in nixpkgs: FAILS WITH SAME SIGNATURE. env-vars doesn't show our CC though :-( - # # ^ env vars set here are making their way through, but something else (build script?) is overwriting it - # SANE_CC = "${prev.stdenv.cc}/bin/${prev.stdenv.cc.targetPrefix}cc"; - # # CC = "gcc" # bash configure.ac - # # CC_FOR_BUILD = "gcc" # bash configure.ac - # # BUILDCC = "gcc"; # VLC - # }); - # } - # ) (nativeSelf: nativeSuper: { pkgsi686Linux = nativeSuper.pkgsi686Linux.extend (i686Self: i686Super: { # fixes eval-time error: "Unsupported cross architecture" @@ -390,7 +317,6 @@ in # '@perlbin@' \ # '/usr/bin/perl' # ''; - # TODO: test this, alongside native mod_dnssd postFixup = upstream.postFixup or "" + '' sed -i 's:/replace/with/path/to/perl/interpreter:${next.buildPackages.perl}/bin/perl:' $dev/bin/apxs ''; @@ -1291,7 +1217,7 @@ in spandsp = prev.spandsp.overrideAttrs (upstream: { configureFlags = upstream.configureFlags or [] ++ [ - # experimental solution to runtime error: "undefined symbol: rpl_realloc" + # fixes runtime error: "undefined symbol: rpl_realloc" # source is "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes"