From 38a3ba96dd73d2e9ccb3904f60793fe60184c8b7 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Thu, 15 Apr 2021 16:01:22 +0300 Subject: [PATCH] grit, hydrus and updates --- flake.lock | 24 ++++++++++++------------ overlays/grit.nix | 12 ++++++++++++ overlays/hydrus.nix | 11 ++++++----- profiles/core.nix | 1 + 4 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 overlays/grit.nix diff --git a/flake.lock b/flake.lock index 1693fc1..23f1cdf 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1617786842, - "narHash": "sha256-nuhewc9ANLkY2dBc9ikBQmy5EdCPElHbxd/pU96HdG0=", + "lastModified": 1618358082, + "narHash": "sha256-4vyEiTcCk7hRigwcRqDAF86YQbUzALUNxyH8SLG4oeo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6f63659a7021051a46035373ed50fbea7e4e924", + "rev": "dec334fa196a4aeedb1b60d8f7d61aa00d327499", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1618041827, - "narHash": "sha256-17Fzc8rmT6HOarCp+8k9RhmgMorNtzTk/rzew+FqHrA=", + "lastModified": 1618469593, + "narHash": "sha256-fNdt+Q3irnT3pId7PKSSVeR8/9inBrAEg4gpItoRowU=", "owner": "nix-community", "repo": "home-manager", - "rev": "f567ea8228e0ce718871d7346e444dd15ad702e5", + "rev": "ebbbd4f2b50703409543941e7445138dc1e7392e", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1617899217, - "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=", + "lastModified": 1618343055, + "narHash": "sha256-yux3woyNtMt6ynYRq7+DYe19CC+SoI/LJW+zSJd0UOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2", + "rev": "e019872af81e4013fd518fcacfba74b1de21a50e", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1617904961, - "narHash": "sha256-M45PTFsPZ6mWQ3UxrTUxlO4D+bXaKQuAsjfcpKBcAa4=", + "lastModified": 1618477375, + "narHash": "sha256-saSEQORHk9u+QEzqFEuuCQCCCf8wqQaOEauFL0LbYtk=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "fadd4b3505bca3175f2a00c3e5810ed074b55bb8", + "rev": "e9fd7014324e91eff4817b5be09ec788af8dba83", "type": "github" }, "original": { diff --git a/overlays/grit.nix b/overlays/grit.nix new file mode 100644 index 0000000..8af14fd --- /dev/null +++ b/overlays/grit.nix @@ -0,0 +1,12 @@ +final: prev: { + grit = prev.grit.overrideAttrs (old: rec { + version = "0.3.0"; + + src = prev.fetchFromGitHub { + owner = "climech"; + repo = old.pname; + rev = "v${version}"; + sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms="; + }; + }); +} diff --git a/overlays/hydrus.nix b/overlays/hydrus.nix index 92af8ac..a30b648 100644 --- a/overlays/hydrus.nix +++ b/overlays/hydrus.nix @@ -1,11 +1,12 @@ final: prev: { hydrus = prev.hydrus.overrideAttrs (old: rec { - pname = "hydrus"; - version = "434"; + version = "435"; - src = builtins.fetchGit { - url = "https://github.com/hydrusnetwork/hydrus.git"; - rev = "71bedccaeabf411307edeac3b03a0903d2c23ec8"; + src = prev.fetchFromGitHub { + owner = "hydrusnetwork"; + repo = old.pname; + rev = "v${version}"; + sha256 = "sha256-+YOFqRgyNtdVBBCb6MWb+PqUoGvt8M0/ygiHrvxdWWg="; }; postPatch = '' diff --git a/profiles/core.nix b/profiles/core.nix index e0f28b7..bfd8666 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -36,6 +36,7 @@ in tealdeer amber unzip + grit ]; shellAliases =