nix flake update 2023/04/23
This commit is contained in:
parent
8df87256a1
commit
20f4251c6e
18
flake.lock
18
flake.lock
|
@ -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,11 +82,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681998133,
|
"lastModified": 1682272886,
|
||||||
"narHash": "sha256-Ki9ZArDrj7m9+59drB+p/w0hmEb0AP1I7Qaq83jJCBw=",
|
"narHash": "sha256-fBeoSYSvFeZte9jVxUlyKbWQdzLjfMrXK3Dhwg/usoI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6ae5dc6f745d745c5ff583f9eb425717ec322f75",
|
"rev": "7d385961ebe582fed4e850a326d8d200be79f6b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -113,11 +113,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681821695,
|
"lastModified": 1682218555,
|
||||||
"narHash": "sha256-uwyBGo/9IALi97AfMuzkJroQQhV6hkybaZVdw6pRNG4=",
|
"narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "5698b06b0731a2c15ff8c2351644427f8ad33993",
|
"rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -412,6 +412,7 @@ 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
|
||||||
|
@ -890,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;
|
||||||
|
@ -917,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;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1176,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;
|
||||||
});
|
});
|
||||||
|
|
|
@ -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=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
});
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user