From 3f9c0d1b6016140be8904791432108635b3629d0 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 9 Aug 2023 07:54:03 +0000 Subject: [PATCH] nixpkgs: 2023-08-07 -> 2023-08-08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/5a8e9243812ba528000995b294292d3b5e120947' (2023-08-07) → 'github:nixos/nixpkgs/41c7605718399dcfa53dd7083793b6ae3bc969ff' (2023-08-08) ``` --- flake.lock | 6 +++--- nixpatches/list.nix | 30 ------------------------------ 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index f7e8871e..f01d3be1 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1691368598, - "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", + "lastModified": 1691472822, + "narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a8e9243812ba528000995b294292d3b5e120947", + "rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 94fccb7c..0d0cf91d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -260,17 +260,6 @@ in [ hash = "sha256-rD0es4uUbaLMrI9ZB2HzPmRLyu/ixNBLAFyDJtFHNko="; }) - (fetchpatch' { - title = "p11-kit: build with meson"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/244633"; - hash = "sha256-+z6hosSyt6ynLpUKS0TsHRoLOS8ck/SK9Y7W2zVUnCQ="; - }) - (fetchpatch' { - title = "p11-kit: use mesonEmulatorHook for cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/245124"; - hash = "sha256-8NqqLBbjt1fLj4ZYhat7wPqQSv/aez9IwgSK2b4CfW8="; - }) - # (fetchpatch' { # title = "perlPackages.FileBaseDir: 0.08 -> 0.09"; # saneCommit = "acc990b04bbe8c99587eadccc65f100c326ec204"; @@ -316,25 +305,6 @@ in [ saneCommit = "24b062309ea8baa2d8303c0610c9ec7b8c399e8b"; hash = "sha256-Jj+1z2DeCEY+DqI1J4vYjYJwDDMRcA93CqpZSXzG0wE="; }) - (fetchpatch' { - # alternate fix for upower; Arturrin - title = "upower: Fix cross"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/247031"; - hash = "sha256-Skn1dO+SDXbrWYWn8QpSBzYaTis/KUXLEY+pJxO9pWM="; - }) - # (fetchpatch' { - # # PR also includes the nativeBuildInputs fix - # title = "upower: fix cross compilation"; - # prUrl = "https://github.com/NixOS/nixpkgs/pull/246945"; - # saneCommit = "3ab262456acc016c8dc834df1d1f7e61a00e01e3"; - # # hash = "sha256-kTFZVu9oDiYH4W4SoQQj0pNuo9hTJk6jUy+hy34HUtA="; - # hash = "sha256-PpC9YRMqg/wPfFgAPNV80mwbZWCKxNi4agxNf0yQutI="; - # }) - # (fetchpatch' { - # title = "upower: don't pass unnecessary nativeBuildInputs"; - # saneCommit = "e2cbfb1bc81afadc5d31c18d43e774fa9a985f98"; - # hash = "sha256-7Q9Fjp7xrw3e887inc5cc01OvuOhThnVYduSLNtv2d0="; - # }) (fetchpatch' { title = "iio-sensor-proxy: support cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/246947";