From 2a1b0cc90c126f8716f25dae45f068fc563a24f2 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 25 Jan 2025 01:52:40 +0000 Subject: [PATCH] nixpkgs: 0-unstable-2025-01-23 -> 0-unstable-2025-01-24 --- pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 +++--- pkgs/by-name/nixpkgs-bootstrap/patches.nix | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 76adb409a..8a3b8fd73 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "a37ebead1785777bed04c56a029f099b85c957d2"; - sha256 = "sha256-QLvC0BQ5xhnHUpmKzJl1KWNVjyysqoCbuAg+bx4VndU="; - version = "0-unstable-2025-01-23"; + rev = "401ac2b03c8fa072b0a8a0c517ed196d9be6499d"; + sha256 = "sha256-2mNYOXUh7ZJxqiI4Bvt9XXUwTG6mWJRMi50yh23Vro4="; + version = "0-unstable-2025-01-24"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 772b34c09..52418e3ae 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -46,12 +46,6 @@ in # hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw="; # }) - (fetchpatch' { - name = "nautilus: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/373662"; - hash = "sha256-lm/FNd9yaTDGW1NXHjrZc1cP3wyp9LlWH9CfkyViymk="; - }) - (fetchpatch' { # patch should be safe to remove; keeping it here to track the upstreaming status name = "nixos/gitea: don't configure the database if `createDatabase == false`"; @@ -67,15 +61,6 @@ in # hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; # }) - # (fetchpatch' { - # # this causes a rebuild of systemd and everything above it: - # # PR against staging is live: - # name = "libcap: ship the optional 'captree' component"; - # prUrl = "https://github.com/NixOS/nixpkgs/pull/332399"; - # saneCommit = "30d6d5d6e86c490978b9615a9c685ffd92c81116"; - # hash = "sha256-hEcpS7r1K6yb5dcj2evbWajwIQaaSHKdLPQVg1LlCYE="; - # }) - # (fetchpatch' { # name = "unl0kr: 2.0.0 -> 3.2.0"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";