From 6b6fffd73e08f5e361bb5bf7451481796fb73008 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Tue, 20 Dec 2022 11:26:48 +0100
Subject: [PATCH] Update nixpkgs

---
 default.nix      | 77 ++++++++++++------------------------------------
 nix/sources.json |  6 ++--
 2 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/default.nix b/default.nix
index 6266c08..d1e41d7 100644
--- a/default.nix
+++ b/default.nix
@@ -45,49 +45,6 @@ let
 
   haskellPackages = pkgs.haskellPackages.override {
     overrides = self: super: rec {
-      aeson =
-        super.aeson_2_0_3_0;
-
-      attoparsec =
-        super.attoparsec_0_14_4;
-
-      semialign =
-        super.semialign_1_2_0_1;
-
-      time-compat =
-        super.time-compat_1_9_6_1;
-
-      # Need to disable the test suite as otherwise we have a
-      # circular dependency with quickcheck-instances.
-      text-short =
-        pkgs.haskell.lib.dontCheck super.text-short_0_1_5;
-
-      quickcheck-instances =
-        super.quickcheck-instances_0_3_27;
-
-      hashable =
-        super.hashable_1_4_0_2;
-
-      OneTuple =
-        super.OneTuple_0_3_1;
-
-      path =
-        super.path_0_9_2;
-
-      genvalidity =
-        super.genvalidity_1_0_0_1;
-
-      validity =
-        super.validity_0_12_0_0;
-
-      http2 =
-        super.http2_3_0_3;
-
-      genvalidity-property =
-        super.genvalidity-property_1_0_0_0;
-
-      genvalidity-hspec =
-        super.genvalidity-hspec_1_0_0_0;
 
       niv =
         pkgs.haskell.lib.justStaticExecutables (
@@ -259,29 +216,33 @@ rec
         doCheck = true;
       };
 
-  readme = pkgs.runCommand "README.md" { nativeBuildInputs = [ niv ]; }
+  readme = pkgs.runCommand "README.md" { nativeBuildInputs = [ niv pkgs.moreutils ]; }
     ''
       cp ${./README.tpl.md} $out
-      sed -i "/replace_niv_help/r"<(niv --help) $out
-      sed -i "/replace_niv_help/d" $out
+      chmod +w $out
 
-      sed -i "/replace_niv_add_help/r"<(niv add --help) $out
-      sed -i "/replace_niv_add_help/d" $out
+      sed "/replace_niv_help/r"<(niv --help) $out | sponge $out
+      sed "/replace_niv_help/d" $out | sponge $out
 
-      sed -i "/replace_niv_update_help/r"<(niv update --help) $out
-      sed -i "/replace_niv_update_help/d" $out
+      sed "/replace_niv_add_help/r"<(niv add --help) $out | sponge $out $out
+      sed "/replace_niv_add_help/d" $out | sponge $out
 
-      sed -i "/replace_niv_modify_help/r"<(niv modify --help) $out
-      sed -i "/replace_niv_modify_help/d" $out
+      sed "/replace_niv_update_help/r"<(niv update --help) $out| sponge $out $out
+      sed "/replace_niv_update_help/d" $out | sponge $out
 
-      sed -i "/replace_niv_drop_help/r"<(niv drop --help) $out
-      sed -i "/replace_niv_drop_help/d" $out
+      sed "/replace_niv_modify_help/r"<(niv modify --help) $out | sponge $out
+      sed "/replace_niv_modify_help/d" $out | sponge $out
 
-      sed -i "/replace_niv_init_help/r"<(niv init --help) $out
-      sed -i "/replace_niv_init_help/d" $out
+      sed "/replace_niv_drop_help/r"<(niv drop --help) $out | sponge $out
+      sed "/replace_niv_drop_help/d" $out | sponge $out
 
-      sed -i "/replace_niv_show_help/r"<(niv show --help) $out
-      sed -i "/replace_niv_show_help/d" $out
+      sed "/replace_niv_init_help/r"<(niv init --help) $out | sponge $out
+      sed "/replace_niv_init_help/d" $out | sponge $out
+
+      sed "/replace_niv_show_help/r"<(niv show --help) $out | sponge $out
+      sed "/replace_niv_show_help/d" $out | sponge $out
+
+      echo done
     '';
 
   readme-test = pkgs.runCommand "README-test" {}
diff --git a/nix/sources.json b/nix/sources.json
index 7a7ce31..48d6478 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ddd637d4e817e42e00c5d0ea70c38270d8f4f953",
-        "sha256": "16jmbmkhqkkjxx3pd73wk56yhzwfbsjnm28ljby5mwik5rxx6yc6",
+        "rev": "6844c91781fdad8ad523b77ec9d1f35ff407a8e6",
+        "sha256": "199d0g2i3aph2c7sjkngr722l9yqzk40b7wr6dklnx4pxssgwbrp",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/ddd637d4e817e42e00c5d0ea70c38270d8f4f953.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6844c91781fdad8ad523b77ec9d1f35ff407a8e6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-fmt": {