From 8c349560968ea82ae997af092bda8bea6e5c97eb Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 24 Dec 2020 10:41:48 +0100
Subject: [PATCH] Update dependencies

---
 configurations/hledger.nix | 19 -------------------
 flake.lock                 | 12 ++++++------
 flake.nix                  |  2 +-
 update.sh                  |  2 +-
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/configurations/hledger.nix b/configurations/hledger.nix
index 2b47ce25..46f35a42 100644
--- a/configurations/hledger.nix
+++ b/configurations/hledger.nix
@@ -1,24 +1,5 @@
 { pkgs, ... }:
-let
-  hledger-repo = pkgs.fetchFromGitHub {
-    owner = "simonmichael";
-    repo = "hledger";
-    rev = "76dd4d83bc114974fe498578971d9100be521d7a";
-    sha256 = "109b52adhfsxh2zskjxy63xsw1mhn844ddq09b6llqz21h71wsmx";
-  };
-in
 {
-  nixpkgs.overlays = [
-    (self: super: {
-      haskellPackages = super.haskellPackages.override {
-        overrides = hself: hsuper: rec {
-          hledger = hsuper.callCabal2nixWithOptions "hledger" hledger-repo "--subpath hledger" { };
-          hledger-lib = hsuper.callCabal2nixWithOptions "hledger-lib" hledger-repo "--subpath hledger-lib" { };
-        };
-      };
-    })
-  ];
-
   home-manager.users.charlotte = { pkgs, ... }: {
     home.packages = [ pkgs.hledger ];
   };
diff --git a/flake.lock b/flake.lock
index 89bebca8..9df9dc02 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,16 +38,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1607522989,
-        "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
-        "owner": "nixos",
+        "lastModified": 1608755064,
+        "narHash": "sha256-nx/o32ipf2YH8WTff7uYwWOwTI+Vtrr49mgxEPdK5bw=",
+        "owner": "charvp",
         "repo": "nixpkgs",
-        "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4",
+        "rev": "57a787c9fa91f149c86a1ce83d57e07cfa589e07",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "owner": "charvp",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 7d8173a2..3a4015bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:charvp/nixpkgs/master";
   };
 
   outputs = { self, nixpkgs, home-manager, flake-utils }:
diff --git a/update.sh b/update.sh
index 12540720..56fb427d 100755
--- a/update.sh
+++ b/update.sh
@@ -6,7 +6,7 @@ if [ -z "${NO_LOCAL:-}" ]
 then
     pushd ../nixpkgs
     git fetch --all --prune
-    git rebase upstream/nixos-unstable || exit 1
+    git rebase upstream/nixos-unstable-small || exit 1
     git push || exit 1
     popd
 fi