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

nix flake update: nixpkgs f027fe965cc2 -> fc47fa33a3ac; sops-nix

Browse Source
This commit is contained in:
Colin
2023-03-28 19:03:53 +00:00
parent e90a8b7b6e
commit b1e9d8db80
6 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock generated
View File

@@ -82,16 +82,16 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1679983302,
"narHash": "sha256-vJe9Fct7k3NSnh0KVQAdS+hZQTKbei7xVJXBRQ4e7zY=",
"lastModified": 1680026472,
"narHash": "sha256-f9824KWmxVBI4WLI7o6tDFfj+dW+qj6uQKo0ZRsbaZQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f027fe965cc27f258e9f7ffd3d0cec011e51a41c",
"rev": "fc47fa33a3ac1044098b1d516f88c38c2d22ef72",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "staging",
"ref": "staging-next",
"repo": "nixpkgs",
"type": "github"
}
@@ -113,11 +113,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1679799335,
"narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=",
"lastModified": 1679993313,
"narHash": "sha256-pfZ/BxJDTifnQBMXg60OhwpJvg96LHvEXGtpHeGcWLM=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145",
"rev": "5b26523e28989a7f56953b695184070c06335814",
"type": "github"
},
"original": {

2
flake.nix
View File

@@ -23,7 +23,7 @@
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging";
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
# nixpkgs = {
# url = "./nixpatches";

1
hosts/by-name/moby/default.nix
View File

@@ -38,6 +38,7 @@
# sane.programs.consoleUtils.enableFor.user.colin = false;
# sane.programs.guiApps.enableFor.user.colin = false;
sane.programs.sequoia.enableFor.user.colin = false;
sane.programs.tuiApps.enableFor.user.colin = false; # visidata, others, don't compile well
boot.loader.efi.canTouchEfiVariables = false;
# /boot space is at a premium. default was 20.

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

@@ -241,6 +241,7 @@ let
});
addNativeInputs = nativeBuildInputs: addInputs { inherit nativeBuildInputs; };
addBuildInputs = buildInputs: addInputs { inherit buildInputs; };
addDepsBuildBuild = depsBuildBuild: addInputs { inherit depsBuildBuild; };
mvToNativeInputs = nativeBuildInputs: mvInputs { inherit nativeBuildInputs; };
mvToBuildInputs = buildInputs: mvInputs { inherit buildInputs; };
rmInputs = { buildInputs ? [], nativeBuildInputs ? [] }: pkg: pkg.overrideAttrs (upstream: {
@@ -563,6 +564,9 @@ in
# fixes error where python3.10-skia-pathops dependency isn't available for the build platform
inherit (emulated) stdenv;
};
# fixes "FileNotFoundError: [Errno 2] No such file or directory: 'gtk4-update-icon-cache'"
# - only required because of my wrapGAppsHook4 change
celluloid = addNativeInputs [ next.gtk4 ] prev.celluloid;
cdrtools = prev.cdrtools.override {
# "configure: error: installation or configuration problem: C compiler cc not found."
inherit (emulated) stdenv;
@@ -760,6 +764,8 @@ in
# };
# fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
file-roller = mvToNativeInputs [ next.glib ] super.file-roller;
# fixes: "meson.build:75:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable"
gnome-clocks = addNativeInputs [ next.gtk4 ] super.gnome-clocks;
# fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable"
gnome-color-manager = mvToNativeInputs [ next.glib ] super.gnome-color-manager;
# fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
@@ -846,6 +852,8 @@ in
});
# fixes: meson.build:111:6: ERROR: Program 'glib-compile-schemas' not found or not executable
gnome-user-share = addNativeInputs [ next.glib ] super.gnome-user-share;
# fixes: "FileNotFoundError: [Errno 2] No such file or directory: 'gtk4-update-icon-cache'"
gnome-weather = addNativeInputs [ next.gtk4 ] super.gnome-weather;
mutter = super.mutter.overrideAttrs (orig: {
nativeBuildInputs = orig.nativeBuildInputs ++ [
next.glib # fixes "clutter/clutter/meson.build:281:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
@@ -863,10 +871,12 @@ in
# # new failure mode: "/nix/store/grqh2wygy9f9wp5bgvqn4im76v82zmcx-binutils-2.39/bin/ld: /nix/store/f7yr5z123d162p5457jh3wzkqm7x8yah-glib-2.74.3/lib/libglib-2.0.so: error adding symbols: file in wrong format"
# inherit (emulated) stdenv;
# };
nautilus = super.nautilus.overrideAttrs (orig: {
nautilus = addInputs {
# fixes: "meson.build:123:0: ERROR: Dependency "libxml-2.0" not found, tried pkgconfig"
buildInputs = orig.buildInputs ++ [ next.libxml2 ];
});
buildInputs = [ next.libxml2 ];
# fixes: "meson.build:226:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable"
nativeBuildInputs = [ next.gtk4 ];
} super.nautilus;
});
gocryptfs = prev.gocryptfs.override {
@@ -1232,6 +1242,14 @@ in
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(py-next: py-prev: {
aiohttp = py-prev.aiohttp.overridePythonAttrs (orig: {
# fixes "ModuleNotFoundError: No module named 'setuptools'"
propagatedBuildInputs = orig.propagatedBuildInputs ++ [
py-next.setuptools
];
});
defcon = py-prev.defcon.overridePythonAttrs (orig: {
nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs;
});
@@ -1242,6 +1260,12 @@ in
"tests/test_main.py"
];
});
gssapi = py-prev.gssapi.overridePythonAttrs (_orig: {
# "krb5-aarch64-unknown-linux-gnu-1.20.1/lib/libgssapi_krb5.so: cannot open shared object file"
# setup.py only needs this to detect if kerberos was configured with gssapi support (not sure why it doesn't call krb5-config for that?)
# it doesn't actually link or use anything from the build krb5 except a "canary" symobl.
GSSAPI_MAIN_LIB = "${next.buildPackages.krb5}/lib/libgssapi_krb5.so";
});
# h5py = py-prev.h5py.overridePythonAttrs (orig: {
# # XXX: can't upstream until its dependency, hdf5, is fixed. that looks TRICKY.
# # - the `setup_configure.py` in h5py tries to dlopen (and call into) the hdf5 lib to query the version and detect features like MPI
@@ -1282,6 +1306,19 @@ in
"tests/unit/test_compat.py"
];
});
scipy = py-prev.scipy.override {
inherit (emulated) stdenv;
};
# scipy = py-prev.scipy.overridePythonAttrs (orig: {
# # "/nix/store/yhz6yy9bp52x9fvcda4lr6kgsngxnv2l-python3.10-numpy-1.24.2/lib/python3.10/site-packages/numpy/core/include/../lib/libnpymath.a: error adding symbols: file in wrong format"
# # mesonFlags = orig.mesonFlags or [] ++ [ "-Duse-pythran=false" ];
# # don't know how to plumb meson falgs through python apps
# # postPatch = orig.postPatch or "" + ''
# # sed -i "s/option('use-pythran', type: 'boolean', value: true,/option('use-pythran', type: 'boolean', value: false,/" meson_options.txt
# # '';
# SCIPY_USE_PYTHRAN = false;
# nativeBuildInputs = lib.remove py-next.pythran orig.nativeBuildInputs;
# });
# skia-pathops = ?
# it tries to call `cc` during the build, but can't find it.
})
@@ -1330,6 +1367,13 @@ in
# fixes "error: could not find git for clone of catch2-populate"
buildInputs = orig.buildInputs or [] ++ [ next.catch2_3 ];
});
rav1e = prev.rav1e.override {
# fix "aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'"
inherit (emulated)
rustPlatform
stdenv
;
};
rmlint = prev.rmlint.override {
# fixes "Checking whether the C compiler works... no"
# rmlint is scons; it reads the CC environment variable, though, so *may* be cross compilable
@@ -1422,7 +1466,12 @@ in
});
# fixes: "src/meson.build:12:2: ERROR: Program 'gdbus-codegen' not found or not executable"
sysprof = mvToNativeInputs [ next.glib ] prev.sysprof;
sysprof = mvToNativeInputs [ next.glib ] (
addNativeInputs [ next.wrapGAppsHook ] (
# addDepsBuildBuild [ next.pkg-config ] prev.sysprof
rmInputs { nativeBuildInputs = [ next.wrapGAppsHook4 ]; } prev.sysprof
)
);
# fixes "configure: error: *** gdbus-codegen is required to build tpm2-abrmd; No package 'gio-unix-2.0' found"
tpm2-abrmd = addNativeInputs [ next.glib ] prev.tpm2-abrmd;
tracker-miners = prev.tracker-miners.override {
@@ -1465,6 +1514,9 @@ in
});
# fixes "perl: command not found"
vpnc = mvToNativeInputs [ next.perl ] prev.vpnc;
wrapGAppsHook4 = prev.wrapGAppsHook4.override {
gtk3 = next.emptyDirectory;
};
xapian = prev.xapian.overrideAttrs (upstream: {
# the output has #!/bin/sh scripts.
# - shebangs get re-written on native build, but not cross build

6
overlays/disable-flakey-tests.nix
View File

@@ -60,6 +60,12 @@
# - not ok 267 - tcp_bind_error_addrinuse_listen
doCheck = false;
});
libwacom = prev.libwacom.overrideAttrs (_upstream: {
# 2023/03/30
# "libwacom:all / pytest TIMEOUT"
doCheck = false;
mesonFlags = [ "-Dtests=disabled" ];
});
llvmPackages_12 =
let

4
pkgs/browserpass/default.nix
View File

@@ -32,8 +32,8 @@ in
owner = "colin";
repo = "browserpass-native";
# don't forcibly append '.gpg'
rev = "85bdb08379c03297c1236f66e8764160c922d397";
hash = "sha256-SEfihU+GreWhYfLVr7tTnMCo6Iq20a78F8iVbycOQUQ=";
rev = "d3ef88e12cb127914fb0ead762b7baee6913592f";
hash = "sha256-FRnFmCJI/1f92DOI1VXSPivSBzIR372gmgLUfLLiuPc=";
};
installPhase = ''
make install