nixpkgs: 2023-07-24 -> 2023-07-25; uninsane-dot-org
``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/b12803b6d90e2e583429bb79b859ca53c348b39a' (2023-07-24) → 'github:nixos/nixpkgs/ef99fa5c5ed624460217c31ac4271cfb5cb2502c' (2023-07-25) • Updated input 'uninsane-dot-org': 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=1542323cfb46a8950c17a3afa5f7cd2e62dd9672' (2023-07-02) → 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=fcec1d09b6c469d9425a716b11b4f4995a285774' (2023-07-25) ```
This commit is contained in:
parent
ad6b0ea75e
commit
28ef8141f7
14
flake.lock
14
flake.lock
|
@ -85,11 +85,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1690179384,
|
"lastModified": 1690272529,
|
||||||
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
|
"narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
|
"rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -152,11 +152,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688265812,
|
"lastModified": 1690326573,
|
||||||
"narHash": "sha256-Wkx56Pw7V5+5Gn6B3olDGP+o1qIp8BPFL0MWC2wbKVg=",
|
"narHash": "sha256-UgsGOTx00sp4Oev6QNN2u+4AMVehgGO/8yODF++8bwM=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "1542323cfb46a8950c17a3afa5f7cd2e62dd9672",
|
"rev": "fcec1d09b6c469d9425a716b11b4f4995a285774",
|
||||||
"revCount": 202,
|
"revCount": 204,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.uninsane.org/colin/uninsane"
|
"url": "https://git.uninsane.org/colin/uninsane"
|
||||||
},
|
},
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
serif = [ "DejaVu Serif" ];
|
serif = [ "DejaVu Serif" ];
|
||||||
sansSerif = [ "DejaVu Sans" ];
|
sansSerif = [ "DejaVu Sans" ];
|
||||||
};
|
};
|
||||||
enableDefaultFonts = true;
|
#vvv enables dejavu_fonts, freefont_ttf, gyre-fonts, liberation_ttf, unifont, noto-fonts-emoji
|
||||||
fonts = with pkgs; [ font-awesome noto-fonts-emoji hack-font ];
|
enableDefaultPackages = true;
|
||||||
|
packages = with pkgs; [ font-awesome noto-fonts-emoji hack-font ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -232,6 +232,12 @@ in [
|
||||||
hash = "sha256-8NqqLBbjt1fLj4ZYhat7wPqQSv/aez9IwgSK2b4CfW8=";
|
hash = "sha256-8NqqLBbjt1fLj4ZYhat7wPqQSv/aez9IwgSK2b4CfW8=";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
(fetchpatch' {
|
||||||
|
title = "libgudev: fix cross failing to build checks";
|
||||||
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/245761";
|
||||||
|
hash = "sha256-jEQeGAcDGrv0TYouBTfn5ubWaosWg/ecmUW0ii1QIVs=";
|
||||||
|
})
|
||||||
|
|
||||||
# (fetchpatch' {
|
# (fetchpatch' {
|
||||||
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
|
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
|
||||||
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";
|
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";
|
||||||
|
|
|
@ -1337,6 +1337,8 @@ in {
|
||||||
blueprint-compiler = dontCheck emulated.blueprint-compiler; # emulate: because gi. dontCheck: because tests time out
|
blueprint-compiler = dontCheck emulated.blueprint-compiler; # emulate: because gi. dontCheck: because tests time out
|
||||||
gjs = dontCheck emulated.gjs; # emulate: because Tangram build hangs. dontCheck: because tests time out
|
gjs = dontCheck emulated.gjs; # emulate: because Tangram build hangs. dontCheck: because tests time out
|
||||||
};
|
};
|
||||||
|
# fixes "meson.build:204:12: ERROR: Can not run test applications in this cross environment."
|
||||||
|
tracker = useEmulatedStdenv prev.tracker;
|
||||||
tracker-miners = prev.tracker-miners.override {
|
tracker-miners = prev.tracker-miners.override {
|
||||||
# fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
|
# fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
|
||||||
inherit (emulated) stdenv;
|
inherit (emulated) stdenv;
|
||||||
|
@ -1368,6 +1370,12 @@ in {
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
upower = prev.upower.overrideAttrs (upstream: {
|
||||||
|
# cross-compiled builds seem to not create the installedTest files
|
||||||
|
outputs = lib.remove "installedTests" upstream.outputs;
|
||||||
|
postInstall = lib.replaceStrings [ "installedTests" ] [ "" ] upstream.postInstall;
|
||||||
|
postFixup = "";
|
||||||
|
});
|
||||||
|
|
||||||
visidata = prev.visidata.override {
|
visidata = prev.visidata.override {
|
||||||
# hdf5 / h5py don't cross-compile, but i don't use that file format anyway.
|
# hdf5 / h5py don't cross-compile, but i don't use that file format anyway.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user