From 02882dd781de67290ec8931496020850ed027253 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 15 Nov 2023 07:14:22 +0000 Subject: [PATCH] nixpkgs: 2023-10-29 -> 2023-11-12; sops-nix -> 2023-11-14; uninsane-dot-org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735' (2023-10-29) → 'github:nixos/nixpkgs/e44462d6021bfe23dfb24b775cc7c390844f773d' (2023-11-12) • Updated input 'sops-nix': 'github:Mic92/sops-nix/632c3161a6cc24142c8e3f5529f5d81042571165' (2023-10-29) → 'github:Mic92/sops-nix/0e3a94167dcd10a47b89141f35b2ff9e04b34c46' (2023-11-14) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/d87c5d8c41c9b3b39592563242f3a448b5cc4bc9' (2023-10-29) → 'github:NixOS/nixpkgs/9502d0245983bb233da8083b55d60d96fd3c29ff' (2023-11-12) • Updated input 'uninsane-dot-org': 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=2419750ca98fc04af42c91e50c49a29c68d465d2' (2023-10-30) → 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=8a4273489d945f21d7e0ca6aac952460c7d4c391' (2023-11-09) • Updated input 'uninsane-dot-org/flake-utils': 'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25) → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) ``` --- flake.lock | 32 ++++++++++++++++---------------- nixpatches/list.nix | 26 -------------------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 87727983..a4389a88 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698544399, - "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1699781429, + "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698548647, - "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", + "lastModified": 1699951338, + "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", + "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1698634059, - "narHash": "sha256-+Oyv6vDyCtBzab/5cTG0nUrHD9gj7KgGfD4D1Rn4fCk=", + "lastModified": 1699515935, + "narHash": "sha256-cJIuVrYorhIzG5pRFZb+ZtaKhTFD92ThC42SaxvSe/E=", "ref": "refs/heads/master", - "rev": "2419750ca98fc04af42c91e50c49a29c68d465d2", - "revCount": 210, + "rev": "8a4273489d945f21d7e0ca6aac952460c7d4c391", + "revCount": 216, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/nixpatches/list.nix b/nixpatches/list.nix index e6fb7946..9b332dc4 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -23,20 +23,6 @@ let // (if title != null then { name = title; } else {}) ); in [ - (fetchpatch' { - title = "gsound: enable introspection/vala when cross compiled"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/263107"; - saneCommit = "beb33584013f49d198152ad8ae8797bb6fa0266f"; - # hash = "sha256-tKeumQ1R/UWTL2J9RaGs8p9QHxGxP2a1DevHnX/ElRU="; - hash = "sha256-W9IS3JNPk5LkJeuZ+EL8NIv8+v7wEZo8Gt+ofq3RrrY="; - }) - (fetchpatch' { - title = "gspell: enable vala for cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/263135"; - saneCommit = "293bfdc031a1eaa5cc571000977df14b6d8237c8"; - # hash = "sha256-n6xatVeqMweuy/bm68cxWUkgUoS+H1xNRjT0JDFXeEs="; - hash = "sha256-PXatkvLjEgQJ4rRIjEOadKscM0WYWTozIFt2vzWOMKY="; - }) (fetchpatch' { title = "gcr: remove build gnupg from runtime closure"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263158"; @@ -44,23 +30,11 @@ in [ # hash = "sha256-9PNKzNlJ62WAq6H+tqlt0spFZ1DPP1hHmpx0YPuieFE="; hash = "sha256-6hUdsExHSMHy6FMY1+OLtVmKpRwysGIVkcDpYv7RRBk="; }) - (fetchpatch' { - title = "gvfs: support cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/263175"; - saneCommit = "0c6dd31f3394ac339d5351400350223af3fc1284"; - hash = "sha256-Ywxx2BkvVp3+Za3PPhVwa7sovjkVJrhFx3vj63IB6JQ="; - }) (fetchpatch' { title = "hspell: remove build perl from runtime closure"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263182"; hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM="; }) - (fetchpatch' { - title = "trust-dns: 0.23.0 -> 0.24.0"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; - saneCommit = "cb13904421c1870df1059bfe5988a24107983a5f"; - hash = "sha256-tXU1XXEQbZ3IMPncZB42XQPvx3IZMr5ez5bCfGRGVsk="; - }) # (fetchpatch' { # title = "trust-dns: 0.23.0 -> 0.24.0"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/262466";