colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

partial nixpkgs update (ibus fails)

Browse Source
This commit is contained in:
Colin 2023-04-21 19:41:42 +00:00
parent 198c40df66
commit 8df87256a1
3 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -82,11 +82,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1681905675, "lastModified": 1681998133,
"narHash": "sha256-H2jcZFkMSAig0L4LgKSaEYR8KRpNNekrId4SQkdllGI=", "narHash": "sha256-Ki9ZArDrj7m9+59drB+p/w0hmEb0AP1I7Qaq83jJCBw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a1cb3e73104adb41f8902093e07b8eba2114ab3f", "rev": "6ae5dc6f745d745c5ff583f9eb425717ec322f75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680517067, "lastModified": 1681952179,
"narHash": "sha256-8Ew0IDRuzEGFUjIGqk7EjuB/NL80HDIvlR1YY4Iw95M=", "narHash": "sha256-GfI682y7LJXj6p0kcYIyzVKFNKtkEbxvMGu5VjSPeN4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "2970c6080187975a1fc996f541167e697d4ebebc", "rev": "3b9ce28b7a65d516eedddac67a224493399e5b1e",
"revCount": 187, "revCount": 190,
"type": "git", "type": "git",
"url": "https://git.uninsane.org/colin/uninsane" "url": "https://git.uninsane.org/colin/uninsane"
}, },

124
hosts/common/cross/default.nix
View File

@ -267,67 +267,67 @@ in
# the configuration of which specific package set `pkgs.cross` refers to happens elsewhere; # the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
# here we just define them all. # here we just define them all.
nixpkgs.config.perlPackageOverrides = pkgs': (with pkgs'; with pkgs'.perlPackages; { # nixpkgs.config.perlPackageOverrides = pkgs': (with pkgs'; with pkgs'.perlPackages; {
# these are the upstream nixpkgs perl modules, but with `nativeBuildInputs = [ perl ]` # # these are the upstream nixpkgs perl modules, but with `nativeBuildInputs = [ perl ]`
# to fix cross compilation errors # # to fix cross compilation errors
# see <nixpkgs:pkgs/top-level/perl-packages.nix> # # see <nixpkgs:pkgs/top-level/perl-packages.nix>
# TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640 # # TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640
ModuleBuild = buildPerlPackage { # ModuleBuild = buildPerlPackage {
pname = "Module-Build"; # pname = "Module-Build";
version = "0.4231"; # version = "0.4231";
src = pkgs.fetchurl { # src = pkgs.fetchurl {
url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; # url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz";
hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; # hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc=";
}; # };
# support cross-compilation by removing unnecessary File::Temp version check # # support cross-compilation by removing unnecessary File::Temp version check
# postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # # postPatch = lib.optionalString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) ''
# sed -i '/File::Temp/d' Build.PL # # sed -i '/File::Temp/d' Build.PL
# ''; # # '';
nativeBuildInputs = [ perl ]; # nativeBuildInputs = [ perl ];
meta = { # meta = {
description = "Build and install Perl modules"; # description = "Build and install Perl modules";
license = with lib.licenses; [ artistic1 gpl1Plus ]; # license = with lib.licenses; [ artistic1 gpl1Plus ];
mainProgram = "config_data"; # mainProgram = "config_data";
}; # };
}; # };
FileBaseDir = buildPerlModule { # FileBaseDir = buildPerlModule {
version = "0.08"; # version = "0.08";
pname = "File-BaseDir"; # pname = "File-BaseDir";
src = pkgs.fetchurl { # src = pkgs.fetchurl {
url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; # url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz";
hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; # hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM=";
}; # };
configurePhase = '' # configurePhase = ''
runHook preConfigure # runHook preConfigure
perl Build.PL PREFIX="$out" prefix="$out" # perl Build.PL PREFIX="$out" prefix="$out"
''; # '';
nativeBuildInputs = [ perl ]; # nativeBuildInputs = [ perl ];
propagatedBuildInputs = [ IPCSystemSimple ]; # propagatedBuildInputs = [ IPCSystemSimple ];
buildInputs = [ FileWhich ]; # buildInputs = [ FileWhich ];
meta = { # meta = {
description = "Use the Freedesktop.org base directory specification"; # description = "Use the Freedesktop.org base directory specification";
license = with lib.licenses; [ artistic1 gpl1Plus ]; # 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." # # fixes: "FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded."
Testutf8 = buildPerlPackage { # Testutf8 = buildPerlPackage {
pname = "Test-utf8"; # pname = "Test-utf8";
version = "1.02"; # version = "1.02";
src = pkgs.fetchurl { # src = pkgs.fetchurl {
url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz"; # url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz";
hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c="; # hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c=";
}; # };
nativeBuildInputs = [ perl ]; # nativeBuildInputs = [ perl ];
meta = { # meta = {
description = "Handy utf8 tests"; # description = "Handy utf8 tests";
homepage = "https://github.com/2shortplanks/Test-utf8/tree"; # homepage = "https://github.com/2shortplanks/Test-utf8/tree";
license = with lib.licenses; [ artistic1 gpl1Plus ]; # license = with lib.licenses; [ artistic1 gpl1Plus ];
}; # };
}; # };
# inherit (pkgs.emulated.perl.pkgs) # # inherit (pkgs.emulated.perl.pkgs)
# Testutf8 # # Testutf8
# ; # # ;
}); # });
# XXX: replaceStdenv only affects non-cross stages # XXX: replaceStdenv only affects non-cross stages
# nixpkgs.config.replaceStdenv = { pkgs }: pkgs.ccacheStdenv; # nixpkgs.config.replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
nixpkgs.overlays = crossOnlyUniversalOverlays ++ [ nixpkgs.overlays = crossOnlyUniversalOverlays ++ [
@ -415,7 +415,7 @@ in
jellyfin-web # in node-dependencies-jellyfin-web: "node: command not found" (nodePackages don't cross compile) 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!) # 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 # 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 # qgnomeplatform
# qtbase # qtbase
qt5 # qt5.qtx11extras fails, but we can't selectively emulate it qt5 # qt5.qtx11extras fails, but we can't selectively emulate it

6
nixpatches/list.nix
View File

@ -38,6 +38,12 @@
hash = "sha256-RbQzAtFTr7Nrk2YBcHpKQMYoPlFMVSXNl96B/lkKluQ="; 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 # # kaiteki: init at 2022-09-03
# vendorHash changes too frequently (might not be reproducible). # vendorHash changes too frequently (might not be reproducible).
# using local package defn until stabilized # using local package defn until stabilized