Commit 0ee7ff443fc1

Vincent Demeester <vincent@sbr.pm>
2017-01-13 22:55:36
Update some packages (configuration & office)
… and pin some packages from unstable. I need to setup a way to easily update and test these but that's a start 👼. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 5914250
Changed files (3)
configuration/custom-packages.nix
@@ -3,18 +3,25 @@
 {
 	nixpkgs.config = {
 		packageOverrides = self: with self; let
-			fetchNixPkgs = { rev, sha256 }:
+			fetchNixPkgs = { rev, sha256, owner, repo }:
 				fetchFromGitHub {
-					inherit sha256 rev;
-					owner = "vdemeester";
-					repo = "sbrpkgs";
+					inherit sha256 rev owner repo;
 				};
 			pinnedPkgs = import (fetchNixPkgs {
-				rev = "19cb2f23b1bec2538ed3ae14cfae6218bb4dddaa";
-				sha256 = "13j5cdlqgabr6mchymx77anqxnldxpkdxgq9kk7p911k5fg0vpq1";
+				owner = "NixOS";
+				repo = "nixpkgs";
+				rev = "89dfe67f81addb0ffacbfa14079579c24c2a4530";
+				sha256 = "1l8gz2k0w9grrkj30zsyk3k6jzcx52icysrli87xsz8yk5qpaj5i";
+			}) {};
+			sbrPkgs = import (fetchNixPkgs {
+				owner = "vdemeester";
+				repo = "sbrpkgs";
+				rev = "162d2fd7c2ec7b8afff22299e3d025f1397dc738";
+				sha256 = "10mawxggpdqmb9nzag1xk3afynrbmkwcy0xp42mndfjilrwgi3d1";
 			}) {};
 		in {
-			inherit (pinnedPkgs) dobi vndr docker;
+			inherit (pinnedPkgs) keybase ipfs mpv;
+			inherit (sbrPkgs) dobi vndr docker ape tuck clasp;
 		};
 	};
 }
profiles/desktop.nix
@@ -34,6 +34,12 @@
 		xlibs.xmodmap
 		xorg.xbacklight
 		xss-lock
+		ape
+		tuck
+		clasp
+		keybase
+		ipfs
+		mpv
 	];
 	hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
 	services = {
profiles/office.nix
@@ -4,5 +4,9 @@
 	environment.systemPackages = with pkgs; [
 		calibre
 		libreoffice
+		gimp
+		haskellPackages.hledger
+		haskellPackages.hledger-ui
+		haskellPackages.hledger-web
 	];
 }