Merge nixpkgs-jens repo into dotfiles repo

nixos/layers/base.nix

@@ -8,9 +8,6 @@
     ./zsh.nix
   ];
   
-  # You need to set up the channel `<nixpkgs-jens>` or point `nixpkgs-jens.location` to a checkout of `https://git.c3pb.de/jens/nixpkgs-jens` 
-  nixpkgs-jens.enable = true;
-
   # Is it worth to specify this where it is needed instead of configuring it globally? Not sure yet.
   nixpkgs.config.allowUnfree = true;
 

nixos/modules/default.nix

@@ -5,6 +5,5 @@
     ./sway.nix
     #./loginctl-linger.nix
     ./dotfiles.nix
-    ./nixpkgs-jens.nix
   ];
 }

nixos/modules/nixpkgs-jens.nix

-{ lib, config, ... }:
-
-with lib;
-
-{
-  options.nixpkgs-jens = {
-    enable = mkEnableOption "Load jens nixpkgs channel";
-    location = mkOption {
-      default = <nixpkgs-jens>;
-      type = types.path;
-    };
-  };
-  config = mkIf config.nixpkgs-jens.enable {
-    nixpkgs.overlays = [ (import config.nixpkgs-jens.location) ];
-  };
-}

nixos/pkgs/default.nix

@@ -7,6 +7,8 @@ let
     # Import packages defined here
     # e.g.:
     #mypkg = haskell.packages.ghc865.callPackage ./mypkg { };
+    qbar = haskellPackages.callPackage ./qbar { };
+    dotnet-sdk = self.callPackage ./dotnet-sdk { };
   };
 
 in newpkgs

nixos/pkgs/dotnet-sdk/default.nix

+{ stdenv
+, fetchurl
+, libunwind
+, openssl
+, icu
+, libuuid
+, zlib
+, curl
+}:
+
+let
+  rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
+in
+  stdenv.mkDerivation rec {
+    version = "3.0.100";
+    netCoreVersion = "3.0.0";
+    pname = "dotnet-sdk";
+
+    src = fetchurl {
+      url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz";
+      # use sha512 from the download page
+      sha512 = "766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7";
+    };
+
+    sourceRoot = ".";
+
+    buildPhase = ''
+      runHook preBuild
+      patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet
+      patchelf --set-rpath "${rpath}" ./dotnet
+      find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
+      echo -n "dotnet-sdk version: "
+      ./dotnet --version
+      runHook postBuild
+    '';
+
+    dontPatchELF = true;
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/bin
+      cp -r ./ $out
+      ln -s $out/dotnet $out/bin/dotnet
+      runHook postInstall
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://dotnet.github.io/;
+      description = ".NET Core SDK ${version} with .NET Core ${netCoreVersion}";
+      platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ kuznero ];
+      license = licenses.mit;
+    };
+  }

nixos/pkgs/qbar/default.nix

+{ mkDerivation, aeson, async, attoparsec, base, bytestring, colour
+, concurrent-extra, directory, fetchgit, filepath, hpack, mtl
+, network, optparse-applicative, pipes, pipes-aeson
+, pipes-concurrency, pipes-network, pipes-parse, stdenv, stm, text
+, time, typed-process, unix, unordered-containers
+}:
+mkDerivation {
+  pname = "qbar";
+  version = "0.1.0.0";
+  src = fetchgit {
+    url = "https://git.c3pb.de/jens/qbar";
+    sha256 = "1bf4ff522fp7rhhw3rnz6mc2iy9yf8dgbj3705wfdnbviaxcixaa";
+    rev = "ccc975c4bbac56e212d6dddc070ee345d0c14000";
+    fetchSubmodules = true;
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson async attoparsec base bytestring colour concurrent-extra
+    directory filepath mtl network optparse-applicative pipes
+    pipes-aeson pipes-concurrency pipes-network pipes-parse stm text
+    time typed-process unix unordered-containers
+  ];
+  libraryToolDepends = [ hpack ];
+  executableHaskellDepends = [
+    aeson async attoparsec base bytestring colour concurrent-extra
+    directory filepath mtl network optparse-applicative pipes
+    pipes-aeson pipes-concurrency pipes-network pipes-parse stm text
+    time typed-process unix unordered-containers
+  ];
+  testHaskellDepends = [
+    aeson async attoparsec base bytestring colour concurrent-extra
+    directory filepath mtl network optparse-applicative pipes
+    pipes-aeson pipes-concurrency pipes-network pipes-parse stm text
+    time typed-process unix unordered-containers
+  ];
+  prePatch = "hpack";
+  license = stdenv.lib.licenses.bsd3;
+}