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

Merge branch 'staging/nixpkgs-2023-04-19-staging-next' into master-next

Browse Source
This commit is contained in:
Colin 2023-04-25 09:53:53 +00:00
commit a4bcb44677
5 changed files with 126 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.lock
View File

@ -66,11 +66,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1681613598, "lastModified": 1682173319,
"narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,16 +82,16 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1681648924, "lastModified": 1682272886,
"narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", "narHash": "sha256-fBeoSYSvFeZte9jVxUlyKbWQdzLjfMrXK3Dhwg/usoI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f294325aed382b66c7a188482101b0f336d1d7db", "rev": "7d385961ebe582fed4e850a326d8d200be79f6b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "staging-next",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -113,11 +113,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1681721408, "lastModified": 1682218555,
"narHash": "sha256-NWCbZKOQEXz1hA2YDFxdd+fVrrw9edbG1DvbbLf7KUY=", "narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "de6514f8fe1b3c2b57307569a0898bc4be9ae1c5", "rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac",
"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"
}, },

4
flake.nix
View File

@ -43,8 +43,8 @@
# - use `staging` if no staging-next branch has been cut. # - use `staging` if no staging-next branch has been cut.
# #
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable> # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next"; nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging";
mobile-nixos = { mobile-nixos = {

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

@ -267,66 +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
# TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640 # # see <nixpkgs:pkgs/top-level/perl-packages.nix>
ModuleBuild = buildPerlPackage { # # TODO: try this PR: https://github.com/NixOS/nixpkgs/pull/225640
pname = "Module-Build"; # ModuleBuild = buildPerlPackage {
version = "0.4231"; # pname = "Module-Build";
src = fetchurl { # version = "0.4231";
url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; # src = pkgs.fetchurl {
hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; # 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) '' # # support cross-compilation by removing unnecessary File::Temp version check
# sed -i '/File::Temp/d' Build.PL # # postPatch = lib.optionalString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) ''
# ''; # # sed -i '/File::Temp/d' Build.PL
nativeBuildInputs = [ perl ]; # # '';
meta = { # nativeBuildInputs = [ perl ];
description = "Build and install Perl modules"; # meta = {
license = with lib.licenses; [ artistic1 gpl1Plus ]; # description = "Build and install Perl modules";
mainProgram = "config_data"; # license = with lib.licenses; [ artistic1 gpl1Plus ];
}; # mainProgram = "config_data";
}; # };
FileBaseDir = buildPerlModule { # };
version = "0.08"; # FileBaseDir = buildPerlModule {
pname = "File-BaseDir"; # version = "0.08";
src = fetchurl { # pname = "File-BaseDir";
url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; # src = pkgs.fetchurl {
hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; # url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz";
}; # hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM=";
configurePhase = '' # };
runHook preConfigure # configurePhase = ''
perl Build.PL PREFIX="$out" prefix="$out" # runHook preConfigure
''; # perl Build.PL PREFIX="$out" prefix="$out"
nativeBuildInputs = [ perl ]; # '';
propagatedBuildInputs = [ IPCSystemSimple ]; # nativeBuildInputs = [ perl ];
buildInputs = [ FileWhich ]; # propagatedBuildInputs = [ IPCSystemSimple ];
meta = { # buildInputs = [ FileWhich ];
description = "Use the Freedesktop.org base directory specification"; # meta = {
license = with lib.licenses; [ artistic1 gpl1Plus ]; # 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 { # # fixes: "FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded."
pname = "Test-utf8"; # Testutf8 = buildPerlPackage {
version = "1.02"; # pname = "Test-utf8";
src = fetchurl { # version = "1.02";
url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz"; # src = pkgs.fetchurl {
hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c="; # url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz";
}; # hash = "sha256-34LwnFlAgwslpJ8cgWL6JNNx5gKIDt742aTUv9Zri9c=";
nativeBuildInputs = [ perl ]; # };
meta = { # nativeBuildInputs = [ perl ];
description = "Handy utf8 tests"; # meta = {
homepage = "https://github.com/2shortplanks/Test-utf8/tree"; # description = "Handy utf8 tests";
license = with lib.licenses; [ artistic1 gpl1Plus ]; # homepage = "https://github.com/2shortplanks/Test-utf8/tree";
}; # license = with lib.licenses; [ artistic1 gpl1Plus ];
}; # };
# inherit (pkgs.emulated.perl.pkgs) # };
# Testutf8 # # inherit (pkgs.emulated.perl.pkgs)
# ; # # 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 ++ [
@ -411,10 +412,11 @@ in
# nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f # nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f
# hdf5 # configure: error: cannot run test program while cross compiling # hdf5 # configure: error: cannot run test program while cross compiling
# http2 # http2
ibus
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
@ -889,17 +891,20 @@ in
i2p = mvToNativeInputs [ next.ant next.gettext ] prev.i2p; i2p = mvToNativeInputs [ next.ant next.gettext ] prev.i2p;
# ibus = (prev.ibus.override { # ibus = (prev.ibus.override {
# # fixes: "configure.ac:152: error: possibly undefined macro: AM_PATH_GLIB_2_0" # inherit (emulated)
# inherit (emulated) stdenv; # stdenv # fixes: "configure: error: cannot run test program while cross compiling"
ibus = prev.ibus.overrideAttrs (upstream: { # gobject-introspection # "cannot open shared object ..."
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" # .overrideAttrs (upstream: {
]; # nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [
buildInputs = lib.remove next.gobject-introspection upstream.buildInputs ++ [ # 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.vala # fixes: "Package `ibus-1.0' not found in specified Vala API directories or GObject-Introspection GIR directories" # 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" # fixes "./autogen.sh: line 26: gtkdocize: not found"
iio-sensor-proxy = mvToNativeInputs [ next.glib next.gtk-doc ] prev.iio-sensor-proxy; iio-sensor-proxy = mvToNativeInputs [ next.glib next.gtk-doc ] prev.iio-sensor-proxy;
@ -916,19 +921,19 @@ in
openjdk8-bootstrap = useEmulatedStdenv prev.javaPackages.compiler.openjdk8-bootstrap; openjdk8-bootstrap = useEmulatedStdenv prev.javaPackages.compiler.openjdk8-bootstrap;
# fixes "configure: error: Could not find required tool for WHICH" # fixes "configure: error: Could not find required tool for WHICH"
openjdk8 = useEmulatedStdenv prev.javaPackages.compiler.openjdk8; openjdk8 = useEmulatedStdenv prev.javaPackages.compiler.openjdk8;
openjdk19 = ( # openjdk19 = (
# fixes "configure: error: Could not find required tool for ZIPEXE" # # fixes "configure: error: Could not find required tool for ZIPEXE"
# new failure: "checking for cc... [not found]" # # new failure: "checking for cc... [not found]"
(mvToNativeInputs # (mvToNativeInputs
[ next.zip ] # [ next.zip ]
(useEmulatedStdenv prev.javaPackages.compiler.openjdk19) # (useEmulatedStdenv prev.javaPackages.compiler.openjdk19)
).overrideAttrs (_upstream: { # ).overrideAttrs (_upstream: {
# avoid building `support/demos`, which segfaults # # avoid building `support/demos`, which segfaults
buildFlags = [ "product-images" ]; # buildFlags = [ "product-images" ];
doCheck = false; # pre-emptive # doCheck = false; # pre-emptive
}) # })
); # );
# openjdk19 = emulated.javaPackages.compiler.openjdk19; openjdk19 = emulated.javaPackages.compiler.openjdk19;
}; };
}; };
@ -1175,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: { defcon = py-prev.defcon.overridePythonAttrs (orig: {
nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs; nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs;
}); });

10
nixpatches/list.nix
View File

@ -38,11 +38,11 @@
hash = "sha256-RbQzAtFTr7Nrk2YBcHpKQMYoPlFMVSXNl96B/lkKluQ="; hash = "sha256-RbQzAtFTr7Nrk2YBcHpKQMYoPlFMVSXNl96B/lkKluQ=";
}) })
# 2023-04-18: obsidian: update electron_21 -> 24 (merged; waiting to reach downstream branches) # 2023-04-20: perl: fix modules for compatibility with miniperl
(fetchpatch { # (fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/226591.diff"; # url = "https://github.com/NixOS/nixpkgs/pull/225640.diff";
hash = "sha256-5Nv529giGtsU9z1WPIxOOLNlAwCw2MCYEaHAap/E0NI="; # 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).

11
overlays/pins.nix
View File

@ -18,4 +18,15 @@
# chromium can take 4 hours to build from source, with no signs of progress. # chromium can take 4 hours to build from source, with no signs of progress.
# disable it if you're in a rush. # disable it if you're in a rush.
# chromium = next.emptyDirectory; # 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=";
})
];
});
}) })