From d5d755a4b2e310b72c67bc5d09d363c14b3b5417 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 3 Feb 2023 09:18:18 +0000 Subject: [PATCH] flake update: nixpkgs 2023-01-25 -> 2023-02-01; sops-nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs': 'path:/nix/store/760ff23zl95q4jza8mkg47vs9ff20hq3-source/nixpatches?lastModified=1&narHash=sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=' (1970-01-01) → 'path:/nix/store/pr622dac2xv2fzxvkfdfzl3sba1m7xkm-source/nixpatches?lastModified=1&narHash=sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=' (1970-01-01) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/9b97ad7b4330aacda9b2343396eb3df8a853b4fc' (2023-01-25) → 'github:nixos/nixpkgs/4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db' (2023-02-01) • Updated input 'sops-nix': 'github:Mic92/sops-nix/b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c' (2023-01-24) → 'github:Mic92/sops-nix/a81ce6c961480b3b93498507074000c589bd9d60' (2023-02-01) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/918b760070bb8f48cb511300fcd7e02e13058a2e' (2023-01-22) → 'github:NixOS/nixpkgs/a3a1400571e3b9ccc270c2e8d36194cf05aab6ce' (2023-02-01) ``` --- flake.lock | 24 ++++++++++++------------ hosts/common/home/firefox.nix | 4 ++-- hosts/common/programs.nix | 4 ++-- nixpatches/list.nix | 7 ------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 75b2a71a..cfe7cf3d 100644 --- a/flake.lock +++ b/flake.lock @@ -39,22 +39,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=", - "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches", + "narHash": "sha256-rkVbviFmYYmbbVfvFRtOM95IjETbNu3I517Hrxp8EF4=", + "path": "/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches", + "path": "/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1674352297, - "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", + "lastModified": 1675265860, + "narHash": "sha256-PZNqc4ZnTRT34NsHJYbXn+Yhghh56l8HEXn39SMpGNc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e", + "rev": "a3a1400571e3b9ccc270c2e8d36194cf05aab6ce", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1674546403, - "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", + "lastModified": 1675288837, + "narHash": "sha256-76s8TLENa4PzWDeuIpEF78gqeUrXi6rEJJaKEAaJsXw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", + "rev": "a81ce6c961480b3b93498507074000c589bd9d60", "type": "github" }, "original": { diff --git a/hosts/common/home/firefox.nix b/hosts/common/home/firefox.nix index 49149cce..d5f05e52 100644 --- a/hosts/common/home/firefox.nix +++ b/hosts/common/home/firefox.nix @@ -125,11 +125,11 @@ in # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'` # browserpass-ce.package = addon "browserpass-ce" "browserpass@maximbaz.com" "sha256-sXgUBbRvMnRpeIW1MTkmTcoqtW/8RDXAkxAq1evFkpc="; browserpass-extension.package = localAddon pkgs.browserpass-extension; - bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-JOj5P7c2JTTReHCRZXm4BscaGr3i+9Y4Ey/y621x8PI="; + bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+325k="; ether-metamask.package = addon "ether-metamask" "webextension@metamask.io" "sha256-G+MwJDOcsaxYSUXjahHJmkWnjLeQ0Wven8DU/lGeMzA="; i2p-in-private-browsing.package = addon "i2p-in-private-browsing" "i2ppb@eyedeekay.github.io" "sha256-dJcJ3jxeAeAkRvhODeIVrCflvX+S4E0wT/PyYzQBQWs="; sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w="; - sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-d2K3ufvurWnYVzqLbyR//MgejybkY9exitAf9RdLNRo="; + sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-hRsvLaAsVm3dALsTrJqHTNgRFAQcU7XSaGhr5G6+mFs="; ublacklist.package = addon "ublacklist" "@ublacklist" "sha256-RqY5iHzbL2qizth7aguyOKWPyINXmrwOlf/OsfqAS48="; ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-a/ivUmY1P6teq9x0dt4CbgHt+3kBsEMMXlOfZ5Hx7cg="; diff --git a/hosts/common/programs.nix b/hosts/common/programs.nix index 49bfdbb2..c5622da1 100644 --- a/hosts/common/programs.nix +++ b/hosts/common/programs.nix @@ -181,8 +181,8 @@ let tdesktop # broken on phosh tokodon vlc - # pleroma client (Electron). input is broken on phosh. - whalebird + # pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure) + # whalebird xdg-utils # for xdg-open xterm # broken on phosh ; diff --git a/nixpatches/list.nix b/nixpatches/list.nix index c45b300b..a2d1b3ab 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -13,13 +13,6 @@ hash = "sha256-IvsIcd2wPdz4b/7FMrDrcVlIZjFecCQ9uiL0Umprbx0="; }) - # fix libreoffice build by: Revert "mdds: 2.0.3 -> 2.1.0" - # merged 2023/01/25 - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/212583.diff"; - hash = "sha256-nkXgwQUtxYkJT2OzG6Jc72snizW5wHvR1nmh2KDnaPc="; - }) - # fix handbrake build by: handbrake: 1.5.1 -> 1.6.1 # PR opened 2023/01/23 (fetchpatch {