From d046ba01ff0e46f84a0b89a5c39d6975f71ef4f1 Mon Sep 17 00:00:00 2001
From: Malte Poll <mp@edgeless.systems>
Date: Wed, 4 Oct 2023 10:50:42 +0200
Subject: [PATCH] nix: update nixpkgs

---
 WORKSPACE.bazel |  4 ++--
 flake.lock      | 25 ++++---------------------
 flake.nix       |  9 ++-------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index ee1d635c6..224713682 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -17,8 +17,8 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_flake_package", "n
 
 nixpkgs_git_repository(
     name = "nixpkgs",
-    revision = "27c6a38e0aa2e57ab914ad8b500582085549c236",
-    sha256 = "875c2e171ab9663ff6ad2b5c75d974776682b3b4075143fc98d73c39a3b8c132",
+    revision = "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
+    sha256 = "2c8c39259595441e2fe529b75b2e69eba486e0f3457e810bf9bb2b531822743e",
 )
 
 nixpkgs_flake_package(
diff --git a/flake.lock b/flake.lock
index 69dc537b7..ec251d40b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1695806987,
-        "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
+        "lastModified": 1696261572,
+        "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
+        "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
         "type": "github"
       },
       "original": {
@@ -34,27 +34,10 @@
         "type": "github"
       }
     },
-    "nixpkgsWorking": {
-      "locked": {
-        "lastModified": 1695660025,
-        "narHash": "sha256-9kCTqG3Coaq5qZMLRRYUVVAVzRrYP6+CPi3WMqGbdKY=",
-        "owner": "katexochen",
-        "repo": "nixpkgs",
-        "rev": "53e5fdfd2399716305b21ee1535590527f7f6e6a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "katexochen",
-        "ref": "working",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgsUnstable": "nixpkgsUnstable",
-        "nixpkgsWorking": "nixpkgsWorking"
+        "nixpkgsUnstable": "nixpkgsUnstable"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 9d616b504..d5f14d530 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,6 @@
   description = "Constellation";
 
   inputs = {
-    nixpkgsWorking = {
-      url = "github:katexochen/nixpkgs/working";
-    };
     nixpkgsUnstable = {
       url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     };
@@ -15,17 +12,15 @@
 
   outputs =
     { self
-    , nixpkgsWorking
     , nixpkgsUnstable
     , flake-utils
     }:
     flake-utils.lib.eachDefaultSystem (system:
     let
-      pkgsWorking = import nixpkgsWorking { inherit system; };
       pkgsUnstable = import nixpkgsUnstable { inherit system; };
 
-      mkosiDev = (pkgsWorking.mkosi.overrideAttrs (oldAttrs: rec {
-        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsWorking;  [
+      mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
+        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable;  [
           # package management
           dnf5
           rpm