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

nixpkgs: 2024-01-22 -> 2024-01-27 

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/dceddd03df4f840ea28c65887c199495793fb322' (2024-01-22)
  → 'github:nixos/nixpkgs/ef4dd61b7d53af44b060473308c50fa3b34d5681' (2024-01-27)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/8cccce637e19577815de54c5ecc3132dff965aee' (2024-01-22)
  → 'github:nixos/nixpkgs/c002c6aa977ad22c60398daaa9be52f2203d0006' (2024-01-27)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/ae171b54e76ced88d506245249609f8c87305752' (2024-01-21)
  → 'github:Mic92/sops-nix/4606d9b1595e42ffd9b75b9e69667708c70b1d68' (2024-01-24)
```

this breaks sway login for lappy. not obvious why.
This commit is contained in:
Colin 2024-01-27 15:58:02 +00:00
parent c1a1f51ca2
commit a7eb8dd6fa
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -19,11 +19,11 @@
},
"nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1705881734,
"narHash": "sha256-+Hy10FEtJEbcVRgAo12LPep2CsVCT3ZQEepUEaL4ogs=",
"lastModified": 1706356872,
"narHash": "sha256-iGD45HcriZazKx7yB32mq/hgysxCLgTy1besrLTj9Xc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dceddd03df4f840ea28c65887c199495793fb322",
"rev": "ef4dd61b7d53af44b060473308c50fa3b34d5681",
"type": "github"
},
"original": {
@ -51,11 +51,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1705891108,
"narHash": "sha256-PQ0Df5BzByg+0gPE1goa9WYVXSoEP6gtjblrbYC8WOI=",
"lastModified": 1706371002,
"narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8cccce637e19577815de54c5ecc3132dff965aee",
"rev": "c002c6aa977ad22c60398daaa9be52f2203d0006",
"type": "github"
},
"original": {
@ -82,11 +82,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1705805983,
"narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=",
"lastModified": 1706130372,
"narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "ae171b54e76ced88d506245249609f8c87305752",
"rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
"type": "github"
},
"original": {

5
nixpatches/list.nix
View File

@ -26,11 +26,6 @@ let
// (if title != null then { name = title; } else {})
) else null;
in [
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/283049";
title = " bonsai: refactor derivation and move to pkgs/by-name";
hash = "sha256-PD1VKd+cQUxllV88QmqheY6JO5l+6YoBW+kT8iyu2Ns=";
})
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/280925";
title = "j4-dmenu-desktop: pin to gcc12"; # 2024/01/14: fix build

5
overlays/cross.nix
View File

@ -1563,6 +1563,11 @@ in with final; {
# # '';
# });
modemmanager = prev.modemmanager.overrideAttrs (upstream: {
# fixes "meson.build:53:26: ERROR: python3 not found"
nativeBuildInputs = upstream.nativeBuildInputs ++ upstream.nativeInstallCheckInputs;
});
# fixes: "ar: command not found"
# `ar` is provided by bintools
# 2023/07/27: upstreaming is unblocked by deps; but turns out to not be this simple