From 8df87256a13b39f6858b926f0556315cda1c3454 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 21 Apr 2023 19:41:42 +0000 Subject: [PATCH] partial nixpkgs update (ibus fails) --- flake.lock | 14 ++-- hosts/common/cross/default.nix | 124 ++++++++++++++++----------------- nixpatches/list.nix | 6 ++ 3 files changed, 75 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index f98e1586..180f06da 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1681905675, - "narHash": "sha256-H2jcZFkMSAig0L4LgKSaEYR8KRpNNekrId4SQkdllGI=", + "lastModified": 1681998133, + "narHash": "sha256-Ki9ZArDrj7m9+59drB+p/w0hmEb0AP1I7Qaq83jJCBw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1cb3e73104adb41f8902093e07b8eba2114ab3f", + "rev": "6ae5dc6f745d745c5ff583f9eb425717ec322f75", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1680517067, - "narHash": "sha256-8Ew0IDRuzEGFUjIGqk7EjuB/NL80HDIvlR1YY4Iw95M=", + "lastModified": 1681952179, + "narHash": "sha256-GfI682y7LJXj6p0kcYIyzVKFNKtkEbxvMGu5VjSPeN4=", "ref": "refs/heads/master", - "rev": "2970c6080187975a1fc996f541167e697d4ebebc", - "revCount": 187, + "rev": "3b9ce28b7a65d516eedddac67a224493399e5b1e", + "revCount": 190, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index d141ef00..29c7eb30 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -267,67 +267,67 @@ in # the configuration of which specific package set `pkgs.cross` refers to happens elsewhere; # here we just define them all. - nixpkgs.config.perlPackageOverrides = pkgs': (with pkgs'; with pkgs'.perlPackages; { - # these are the upstream nixpkgs perl modules, but with `nativeBuildInputs = [ perl ]` - # to fix cross compilation errors - # see - # TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640 - ModuleBuild = buildPerlPackage { - pname = "Module-Build"; - version = "0.4231"; - src = pkgs.fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; - hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; - }; - # support cross-compilation by removing unnecessary File::Temp version check - # postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # sed -i '/File::Temp/d' Build.PL - # ''; - nativeBuildInputs = [ perl ]; - meta = { - description = "Build and install Perl modules"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "config_data"; - }; - }; - FileBaseDir = buildPerlModule { - version = "0.08"; - pname = "File-BaseDir"; - src = pkgs.fetchurl { - url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; - hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; - }; - configurePhase = '' - runHook preConfigure - perl Build.PL PREFIX="$out" prefix="$out" - ''; - nativeBuildInputs = [ perl ]; - propagatedBuildInputs = [ IPCSystemSimple ]; - buildInputs = [ FileWhich ]; - meta = { - description = "Use the Freedesktop.org base directory specification"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - # fixes: "FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded." - Testutf8 = buildPerlPackage { - pname = "Test-utf8"; - version = "1.02"; - src = pkgs.fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz"; - hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c="; - }; - nativeBuildInputs = [ perl ]; - meta = { - description = "Handy utf8 tests"; - homepage = "https://github.com/2shortplanks/Test-utf8/tree"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - # inherit (pkgs.emulated.perl.pkgs) - # Testutf8 - # ; - }); + # nixpkgs.config.perlPackageOverrides = pkgs': (with pkgs'; with pkgs'.perlPackages; { + # # these are the upstream nixpkgs perl modules, but with `nativeBuildInputs = [ perl ]` + # # to fix cross compilation errors + # # see + # # TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640 + # ModuleBuild = buildPerlPackage { + # pname = "Module-Build"; + # version = "0.4231"; + # src = pkgs.fetchurl { + # url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; + # hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; + # }; + # # support cross-compilation by removing unnecessary File::Temp version check + # # postPatch = lib.optionalString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) '' + # # sed -i '/File::Temp/d' Build.PL + # # ''; + # nativeBuildInputs = [ perl ]; + # meta = { + # description = "Build and install Perl modules"; + # license = with lib.licenses; [ artistic1 gpl1Plus ]; + # mainProgram = "config_data"; + # }; + # }; + # FileBaseDir = buildPerlModule { + # version = "0.08"; + # pname = "File-BaseDir"; + # src = pkgs.fetchurl { + # url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; + # hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; + # }; + # configurePhase = '' + # runHook preConfigure + # perl Build.PL PREFIX="$out" prefix="$out" + # ''; + # nativeBuildInputs = [ perl ]; + # propagatedBuildInputs = [ IPCSystemSimple ]; + # buildInputs = [ FileWhich ]; + # meta = { + # description = "Use the Freedesktop.org base directory specification"; + # license = with lib.licenses; [ artistic1 gpl1Plus ]; + # }; + # }; + # # fixes: "FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded." + # Testutf8 = buildPerlPackage { + # pname = "Test-utf8"; + # version = "1.02"; + # src = pkgs.fetchurl { + # url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz"; + # hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c="; + # }; + # nativeBuildInputs = [ perl ]; + # meta = { + # description = "Handy utf8 tests"; + # homepage = "https://github.com/2shortplanks/Test-utf8/tree"; + # license = with lib.licenses; [ artistic1 gpl1Plus ]; + # }; + # }; + # # inherit (pkgs.emulated.perl.pkgs) + # # Testutf8 + # # ; + # }); # XXX: replaceStdenv only affects non-cross stages # nixpkgs.config.replaceStdenv = { pkgs }: pkgs.ccacheStdenv; nixpkgs.overlays = crossOnlyUniversalOverlays ++ [ @@ -415,7 +415,7 @@ in 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 - # perlInterpreters # perl5.36.0-Module-Build perl5.36.0-Test-utf8 (see tracking issues ^) + perlInterpreters # perl5.36.0-Module-Build perl5.36.0-Test-utf8 (see tracking issues ^) # qgnomeplatform # qtbase qt5 # qt5.qtx11extras fails, but we can't selectively emulate it diff --git a/nixpatches/list.nix b/nixpatches/list.nix index d363d0ff..17692f24 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -38,6 +38,12 @@ hash = "sha256-RbQzAtFTr7Nrk2YBcHpKQMYoPlFMVSXNl96B/lkKluQ="; }) + # 2023-04-20: perl: fix modules for compatibility with miniperl + # (fetchpatch { + # url = "https://github.com/NixOS/nixpkgs/pull/225640.diff"; + # hash = "sha256-MNG8C0OgdPnFQ8SF2loiEhXJuP2z4n9pkXr8Zh4X7QU="; + # }) + # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized