chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-12-24 10:41:48 +01:00
parent 6134c6e1e6
commit 8c34956096
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

19
configurations/hledger.nix
View file

@ -1,24 +1,5 @@
{ pkgs, ... }: { 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-manager.users.charlotte = { pkgs, ... }: {
home.packages = [ pkgs.hledger ]; home.packages = [ pkgs.hledger ];
}; };

12
flake.lock generated
View file

@ -38,16 +38,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1607522989, "lastModified": 1608755064,
"narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=", "narHash": "sha256-nx/o32ipf2YH8WTff7uYwWOwTI+Vtrr49mgxEPdK5bw=",
"owner": "nixos", "owner": "charvp",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4", "rev": "57a787c9fa91f149c86a1ce83d57e07cfa589e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "charvp",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -7,7 +7,7 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:charvp/nixpkgs/master";
}; };
outputs = { self, nixpkgs, home-manager, flake-utils }: outputs = { self, nixpkgs, home-manager, flake-utils }:

2
update.sh
View file

@ -6,7 +6,7 @@ if [ -z "${NO_LOCAL:-}" ]
then then
pushd ../nixpkgs pushd ../nixpkgs
git fetch --all --prune git fetch --all --prune
git rebase upstream/nixos-unstable || exit 1 git rebase upstream/nixos-unstable-small || exit 1
git push || exit 1 git push || exit 1
popd popd
fi fi