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

nixpkgs: 2024-04-26 -> 2024-04-27; nixpkgs-wayland -> 2024-04-27 

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/7d3f4eadec32d447a5f20d87fa309f00986cb288' (2024-04-26)
  → 'github:nixos/nixpkgs/19c30e016f04874d60ed0922bf58be4aa9a15e53' (2024-04-27)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/0b868df4ced96400774414f5baf30b696215b98f' (2024-04-26)
  → 'github:nixos/nixpkgs/77759bd39047f1b92f12b26b55029f0cc2c88093' (2024-04-27)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ca9d278400c170935a95dd75e7e2537c2afd1cb7' (2024-04-26)
  → 'github:nix-community/nixpkgs-wayland/ff41a88e80aaf3ae1561cc6a54636fc46f9214de' (2024-04-27)
```
This commit is contained in:
Colin 2024-04-27 16:04:14 +00:00
parent 1757ea4492
commit e5876a1e5b
2 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -167,11 +167,11 @@
},
"nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1714164575,
"narHash": "sha256-qD6v6JaJcEecszEekUsq09lOg4p+C0B4xOjXctKSNSQ=",
"lastModified": 1714206764,
"narHash": "sha256-vrFcPzhqap6XUfqA/FkNiUW12fjFis8PHlqx1AX3Q5c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7d3f4eadec32d447a5f20d87fa309f00986cb288",
"rev": "19c30e016f04874d60ed0922bf58be4aa9a15e53",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1714163391,
"narHash": "sha256-cNFOXSGBex7iuwVvTvLAOyaLJ2JrbpkazhN5sFsBd+E=",
"lastModified": 1714233728,
"narHash": "sha256-xq+NBStMeZH8Z7ndUnOF71b9PAu2j+rZcMrFXEq0wSU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0b868df4ced96400774414f5baf30b696215b98f",
"rev": "77759bd39047f1b92f12b26b55029f0cc2c88093",
"type": "github"
},
"original": {
@ -223,11 +223,11 @@
]
},
"locked": {
"lastModified": 1714148467,
"narHash": "sha256-490twO3T4EYoQcQ0FuJjnwIdt8eRryNzIq3CVDnRzFw=",
"lastModified": 1714230891,
"narHash": "sha256-VcSgHRMG/HfSyW0STt14UwEdTpOXDKX9oLMcGbmXoGw=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "ca9d278400c170935a95dd75e7e2537c2afd1cb7",
"rev": "ff41a88e80aaf3ae1561cc6a54636fc46f9214de",
"type": "github"
},
"original": {

26
overlays/cross.nix
View File

@ -965,7 +965,7 @@ in with final; {
# gnome_vfs = useEmulatedStdenv super.gnome_vfs;
# });
# 2024/02/27: upstreaming is blocked on python3Packages.eyeD3
# 2024/02/27: upstreaming is unblocked
gpodder = prev.gpodder.overridePythonAttrs (upstream: {
# fix gobject-introspection overrides import that otherwise fails on launch
nativeBuildInputs = upstream.nativeBuildInputs ++ [
@ -1591,30 +1591,6 @@ in with final; {
'';
});
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(py-final: py-prev: {
# 2024/02/27: upstreaming is unblocked (eyeD3 is a dep of gpodder)
# out for review: <https://github.com/NixOS/nixpkgs/pull/307214>
eyed3 = py-prev.eyed3.overrideAttrs (orig: {
# weird double-wrapping of the output executable, but somehow with the build python ends up on PYTHONPATH
postInstall = "";
});
# 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
# # - it could be patched with ~10 LoC in the HDF5LibWrapper class.
# #
# # expose numpy and hdf5 as available at build time
# nativeBuildInputs = orig.nativeBuildInputs ++ orig.propagatedBuildInputs ++ orig.buildInputs;
# buildInputs = [];
# # HDF5_DIR = "${hdf5}";
# });
# skia-pathops = ?
# it tries to call `cc` during the build, but can't find it.
})
];
# qt5 = let
# emulatedQt5 = prev.qt5.override {
# # emulate qt5base and all qtModules.