From 829bc7e6f10f26ac63ac1e9e3d998260c15b553d Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 24 Apr 2016 11:27:29 +0200
Subject: [PATCH] pkgs: use release channel for system + rkt update

Only override specific packages from the git repo.
---
 configuration/steveej-laptop/pkg.nix | 22 ++++++++--------------
 derivations/dev/go.nix               |  8 --------
 derivations/dev/rkt.nix              |  6 +++---
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index 8778c6b..5360ba6 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -1,22 +1,16 @@
 { config, pkgs, ... }:
 
-{
+let
+  gitpkgs = import <gitpkgs> {};
+
+in {
   nixpkgs.config = {
     allowBroken = false;
 
     packageOverrides = pkgs: rec {
       goPackages = pkgs.go16Packages;
-
       bluez = pkgs.bluez5;
-
-      #vimPlugins = pkgs.recurseIntoAttrs (pkgs.callPackage /home/steveej/src/github/NixOS/nixpkgs-systemsource/pkgs/misc/vim-plugins { });
-
       linuxPackages = pkgs.linuxPackages_latest;
-
-      #pythonFull = pkgs.python27.buildEnv.override {
-      #  extraLibs = with pkgs.pythonPackages; [];
-      #};
-
     };
 
     allowUnfree = true;
@@ -46,7 +40,7 @@
   imports =
     [
       ../common/pkg/default.nix
-      ../common/pkg/neovim.nix
+      (import ../common/pkg/neovim.nix { inherit config; pkgs = gitpkgs; })
     ];
 
 
@@ -78,7 +72,6 @@
     teamviewer
     gnome3.dconf # needed by virtmanager
     virtmanager
-    linuxPackages.virtualbox
     x11_ssh_askpass
 
     spotify
@@ -89,8 +82,7 @@
     gimp
     inkscape
     pdftk
-
-    rkt
+    imagemagick
 
     iptables
     nftables
@@ -98,6 +90,8 @@
 
     pandoc
     pythonFull
+  ] ++ [
+    gitpkgs.rkt
   ];
 
 }
diff --git a/derivations/dev/go.nix b/derivations/dev/go.nix
index 3b49987..e992c73 100644
--- a/derivations/dev/go.nix
+++ b/derivations/dev/go.nix
@@ -31,12 +31,4 @@ in pkgs.stdenv.mkDerivation {
   inherit name;
   buildInputs = extraBuildInputs ++ (goBuildInputs){ inherit goPackages; };
   shellHook = (goShellHook) { inherit name; inherit goPackages; };
-#  go14Env = mkGoEnv {
-#    inherit name;
-#    goPackages=pkgs.go14Packages;
-#  };
-#  go15 = mkGoEnv {
-#    inherit name;
-#    goPackages=pkgs.go15Packages;
-#  };
 }
diff --git a/derivations/dev/rkt.nix b/derivations/dev/rkt.nix
index 3e63233..c06a80e 100644
--- a/derivations/dev/rkt.nix
+++ b/derivations/dev/rkt.nix
@@ -4,9 +4,9 @@ mkGoEnv ? import ./go.nix,
 }:
 let 
   rktBasebuildInputs = with pkgs; [
-    autoconf
-    automake
-    autogen
+    stdenv.glibc.out
+    stdenv.glibc.static
+    autoreconfHook
     gnupg1
     squashfsTools
     cpio