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

nixpkgs: 2023-12-14 -> 2023-12-15

Browse Source 
```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/248d12a902bfc36134176f31beba87b1fe30a3c1' (2023-12-14)
  → 'github:nixos/nixpkgs/9ad53b7aaf2b9e9e0d7e36ff4f8a779bf9b0195f' (2023-12-15)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/fd7914c96f7c006047e0154dd239aa2396478094' (2023-12-14)
  → 'github:nixos/nixpkgs/8a205497ba6f6938b7b516c184b7cf326ab15548' (2023-12-15)
```
This commit is contained in:
Colin
2023-12-15 17:40:44 +00:00
parent 728604e036
commit 1522eccfb3
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@@ -37,11 +37,11 @@
}, },
"nixpkgs-next-unpatched": { "nixpkgs-next-unpatched": {
"locked": { "locked": {
"lastModified": 1702576862, "lastModified": 1702641673,
"narHash": "sha256-liPhhJX9mCn92QpInvAoVKn6Wmrs2Ph34Zda4XZGOAI=", "narHash": "sha256-yRFH2tMS2HO4OkuBzvt0e2ZycG0epdzeXaVh0VFtw1k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "248d12a902bfc36134176f31beba87b1fe30a3c1", "rev": "9ad53b7aaf2b9e9e0d7e36ff4f8a779bf9b0195f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -69,11 +69,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1702578284, "lastModified": 1702656322,
"narHash": "sha256-gGNEJDUtKWvGUA9RsQwfbL3z9e4wMOHhslvbUG3qClE=", "narHash": "sha256-KNa7Y87K9OQ+NanjhBXvSI6rC0+LWmOls+4nZYhW8Kw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd7914c96f7c006047e0154dd239aa2396478094", "rev": "8a205497ba6f6938b7b516c184b7cf326ab15548",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
nixpatches/list.nix
View File

@@ -296,12 +296,12 @@ in [
# saneCommit = "507252828934c73c7cffe255dae237c041676c27"; # saneCommit = "507252828934c73c7cffe255dae237c041676c27";
# hash = "sha256-HwycOd3v4IifdQqQmMP6w14g0E/T9RAjAw41AsUZQoc="; # hash = "sha256-HwycOd3v4IifdQqQmMP6w14g0E/T9RAjAw41AsUZQoc=";
# }) # })
(fetchpatch' { # (fetchpatch' {
# includes hare-json and hare-ev as pre-reqs # # includes hare-json and hare-ev as pre-reqs
title = "bonsai: init at 1.0.0"; # title = "bonsai: init at 1.0.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/233892"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/233892";
hash = "sha256-EIv0hx0pXQUDz4V3PRj1SpdgNuL068Yh3zBYS9Ioh+w="; # hash = "sha256-EIv0hx0pXQUDz4V3PRj1SpdgNuL068Yh3zBYS9Ioh+w=";
}) # })
# pin to a pre-0.17.3 release # pin to a pre-0.17.3 release
# removing this and using stock 0.17.3 (also 0.17.4) causes: # removing this and using stock 0.17.3 (also 0.17.4) causes:

5
pkgs/additional/bonsai/default.nix
View File

@@ -3,10 +3,13 @@
, fetchFromSourcehut , fetchFromSourcehut
, gitUpdater , gitUpdater
, hare , hare
, hareThirdParty
, hare-ev , hare-ev
, hare-json
}: }:
let
inherit (hareThirdParty) hare-json;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bonsai"; pname = "bonsai";
version = "1.0.2"; version = "1.0.2";