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

nixpkgs: 2023-11-19 -> 2023-11-21 

switch to `master` branch for the GNOME changes

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/e4ad989506ec7d71f7302cc3067abd82730a4beb' (2023-11-19)
  → 'github:nixos/nixpkgs/72edcc748a92377d0568c9536ece114dbabb948c' (2023-11-21)
```
This commit is contained in:
Colin 2023-11-21 23:44:28 +00:00
parent beb13b8f84
commit 9343447c03
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -53,16 +53,16 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1700390070,
"narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
"lastModified": 1700609845,
"narHash": "sha256-g/p2xRCdGEaBhjNsQ8RMywxRHIT+o37YFckZxhpvUzI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
"rev": "72edcc748a92377d0568c9536ece114dbabb948c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}

11
flake.nix
View File

@ -36,13 +36,14 @@
# - staging-next merged into master.
#
# which branch to source from?
# - for everyday development, prefer `nixos-unstable` branch, as it provides good caching.
# - if need to test bleeding updates (e.g. if submitting code into staging):
# - use `staging-next` if it's been cut (i.e. if there's an active staging-next -> master PR)
# - use `staging` if no staging-next branch has been cut.
# - nixos-unstable: for everyday development; it provides good caching
# - master: temporarily if i'm otherwise cherry-picking lots of already-applied patches
# - staging-next: if testing stuff that's been PR'd into staging, i.e. base library updates.
# - staging: maybe if no staging-next -> master PR has been cut yet?
#
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=master";
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging";

9
hosts/common/programs/firefox.nix
View File

@ -13,7 +13,14 @@ let
mobile-prefs = lib.optionals false pkgs.librewolf-pmos-mobile.extraPrefsFiles;
# allow easy switching between firefox and librewolf with `defaultSettings`, below
librewolfSettings = {
browser = pkgs.librewolf-unwrapped;
browser = pkgs.librewolf-unwrapped.overrideAttrs (upstream: {
# TEMP(2023/11/21): fix eval bug in wrapFirefox
# see: <https://github.com/NixOS/nixpkgs/pull/244591>
passthru = upstream.passthru // {
requireSigning = false;
allowAddonSideload = true;
};
});
extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ mobile-prefs;
libName = "librewolf";
dotDir = ".librewolf";

17
nixpatches/list.nix
View File

@ -23,23 +23,6 @@ let
// (if title != null then { name = title; } else {})
);
in [
(fetchpatch' {
# needed for Gnome 44 -> 45 patch to apply
title = "telegram-desktop: build on Darwin";
prUrl = "https://github.com/NixOS/nixpkgs/pull/268592";
hash = "sha256-NqlXr739BbSouQ9ubo7s2rilWa3i/G0UlzH4JqXH3aw=";
})
(fetchpatch' {
title = "Gnome 44 -> 45";
prUrl = "https://github.com/NixOS/nixpkgs/pull/269032";
hash = "sha256-sxI5DXCzs6U8XDRTP0T4dOhEXCVxB5vUKyjNd46vmE8=";
})
(fetchpatch' {
# build fix: merged 2023/11/17
title = "python2/mk-python-derivation: disable catchConflictsHook";
prUrl = "https://github.com/NixOS/nixpkgs/pull/268027";
hash = "sha256-jw12uh6Tfyu2lp37YFMg8XLOoe5D1pez66whYwr6l3I=";
})
(fetchpatch' {
title = "gcr: remove build gnupg from runtime closure";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263158";