nixpkgs: 2024-01-14 -> 2024-01-19; sops-nix -> 2024-01-15
```
• Updated input 'nixpkgs-next-unpatched':
'github:nixos/nixpkgs/724e39ebb9b8eda97f17d423f66fbc5a991f4f8d' (2024-01-14)
→ 'github:nixos/nixpkgs/331c78971299375240001d946861951b6cc98176' (2024-01-19)
• Updated input 'nixpkgs-unpatched':
'github:nixos/nixpkgs/6c08fe3ccf437d8b26bec010fd925ddd6bb0d0d5' (2024-01-14)
→ 'github:nixos/nixpkgs/bbec4099302591a41304d360e3bab805e5ccc0be' (2024-01-19)
• Updated input 'sops-nix':
'github:Mic92/sops-nix/70dd0d521f7849338e487a219c1a07c429a66d77' (2024-01-14)
→ 'github:Mic92/sops-nix/87755331580fdf23df7e39b46d63ac88236bf42c' (2024-01-15)
```
This commit is contained in:
parent
0907240fda
commit
2e9084c9ef
18
flake.lock
18
flake.lock
|
|
@ -19,11 +19,11 @@
|
|||
},
|
||||
"nixpkgs-next-unpatched": {
|
||||
"locked": {
|
||||
"lastModified": 1705233677,
|
||||
"narHash": "sha256-eq3VE8QGJsunqqF/BlLslWE1gASp4Hlgp0c78coxat0=",
|
||||
"lastModified": 1705687260,
|
||||
"narHash": "sha256-Tu9oRNHEWnH4HOeJKG1IkxoLfjRSPJTVl1wcNHHNVZY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "724e39ebb9b8eda97f17d423f66fbc5a991f4f8d",
|
||||
"rev": "331c78971299375240001d946861951b6cc98176",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -51,11 +51,11 @@
|
|||
},
|
||||
"nixpkgs-unpatched": {
|
||||
"locked": {
|
||||
"lastModified": 1705254014,
|
||||
"narHash": "sha256-4RrVNEqxeji4vqDgzSl7JoCD6a0ag5LF9zXFndtqrpE=",
|
||||
"lastModified": 1705699755,
|
||||
"narHash": "sha256-68sApxqUhh2WMOezkp3wEJzErBfJXdpYT/gi+WBwsAk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c08fe3ccf437d8b26bec010fd925ddd6bb0d0d5",
|
||||
"rev": "bbec4099302591a41304d360e3bab805e5ccc0be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -82,11 +82,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705201153,
|
||||
"narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=",
|
||||
"lastModified": 1705356877,
|
||||
"narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "70dd0d521f7849338e487a219c1a07c429a66d77",
|
||||
"rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ let
|
|||
// (if title != null then { name = title; } else {})
|
||||
) else null;
|
||||
in [
|
||||
(fetchpatch' {
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/280551";
|
||||
title = "python3Packages.pure-protobuf: 3.0.0 -> 2.3.0"; # 2024/01/12: fix build
|
||||
hash = "sha256-T1Ojc4A9rcJsmQ8Il76qdVFNOqnWHJj9kKnnWt0E74A=";
|
||||
})
|
||||
(fetchpatch' {
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/280925";
|
||||
title = "j4-dmenu-desktop: pin to gcc12"; # 2024/01/14: fix build
|
||||
|
|
@ -40,6 +35,7 @@ in [
|
|||
prUrl = "https://github.com/NixOS/nixpkgs/pull/277003";
|
||||
title = " pcsclite: disable building pcsc-wirecheck{,-gen} when cross compiling"; # 2023/12/27: fix build
|
||||
hash = "sha256-9QqeZV1FgbxRpDDqHXWcIpOqyAt0YZRBcCTdoC6ugaY=";
|
||||
merged.staging = "202401191200";
|
||||
})
|
||||
(fetchpatch' {
|
||||
title = "argyllcms: support cross compilation";
|
||||
|
|
@ -230,27 +226,6 @@ in [
|
|||
# hash = "sha256-K3mG1kcyB7sQZ7ZRCdlinNsV6mCcl3eIUI2ldSmcbJE=";
|
||||
# })
|
||||
|
||||
# (fetchpatch' {
|
||||
# title = "hare-json: init at unstable-2023-02-25";
|
||||
# saneCommit = "6c88c2b087755e8f60c9f61c6361dec2f7a38155";
|
||||
# hash = "sha256-9TTlhwLDZESaFC02k4+YER+NvoNVPz9wFYV79+Dmuxs=";
|
||||
# })
|
||||
# (fetchpatch' {
|
||||
# title = "hare-ev: init at unstable-2022-12-29";
|
||||
# saneCommit = "1761049e9b8620091f29bf864ecbbf204b0c56b4";
|
||||
# hash = "sha256-H2ekBJx/iRX8E4uVmdEyaAZVhqeM25QbwvQ9Ki7fMQ0=";
|
||||
# })
|
||||
# (fetchpatch' {
|
||||
# title = "bonsai: init at 1.0.0";
|
||||
# saneCommit = "507252828934c73c7cffe255dae237c041676c27";
|
||||
# hash = "sha256-HwycOd3v4IifdQqQmMP6w14g0E/T9RAjAw41AsUZQoc=";
|
||||
# })
|
||||
(fetchpatch' {
|
||||
title = "bonsai: init at 1.0.2";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/233892";
|
||||
hash = "sha256-i50rY3S4IeRHpZrG2wF/MJaLyS7TbfUv6pszrDOixzg=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
title = "gthumb: make the webservices feature be optional";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromSourcehut
|
||||
, gitUpdater
|
||||
, hare
|
||||
, hareThirdParty
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (hareThirdParty) hare-json hare-ev;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bonsai";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~stacyharper";
|
||||
repo = "bonsai";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace 'hare build' 'hare build $(HARE_TARGET_FLAGS)'
|
||||
'';
|
||||
|
||||
env.HARE_TARGET_FLAGS =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
"-a aarch64"
|
||||
else if stdenv.hostPlatform.isRiscV64 then
|
||||
"-a riscv64"
|
||||
else if stdenv.hostPlatform.isx86_64 then
|
||||
"-a x86_64"
|
||||
else
|
||||
"";
|
||||
# TODO: hare setup-hook is supposed to do this for us.
|
||||
# It does it correctly for native compilation, but not cross compilation: wrong offset?
|
||||
env.HAREPATH = "${hare-json}/src/hare/third-party:${hare-ev}/src/hare/third-party";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hare
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hare-ev
|
||||
hare-json
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export HARECACHE=$(mktemp -d)
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Finite State Machine structured as a tree";
|
||||
homepage = "https://git.sr.ht/~stacyharper/bonsai";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,6 @@ let
|
|||
|
||||
### ADDITIONAL PACKAGES
|
||||
alsa-ucm-conf-sane = callPackage ./additional/alsa-ucm-conf-sane { };
|
||||
bonsai = callPackage ./additional/bonsai { };
|
||||
bootpart-uefi-x86_64 = callPackage ./additional/bootpart-uefi-x86_64 { };
|
||||
cargoDocsetHook = callPackage ./additional/cargo-docset/hook.nix { };
|
||||
chatty-latest = callPackage ./additional/chatty-latest { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user