summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-19 23:49:14 +0200
committerlassulus <lass@aidsballs.de>2016-10-19 23:49:14 +0200
commit3db3f9df43b827d8bd73413df3357760f33c7ab1 (patch)
tree7bdeef109f8e41e44297cfdefbf370ab067953a0 /makefu/5pkgs/default.nix
parentc7be88d76a359379d8d75126a746fd3772aa5036 (diff)
parentb6fc3af1430e318f781a417e0d7366e1013c0c44 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r--makefu/5pkgs/default.nix7
1 files changed, 0 insertions, 7 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 6d020406d..0d375a510 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -2,16 +2,9 @@
let
inherit (pkgs) callPackage;
- nixpkgs-1509 = import (pkgs.fetchFromGitHub {
- owner = "NixOS"; repo = "nixpkgs-channels";
- rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
- sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
- }) {};
-
in
{
nixpkgs.config.packageOverrides = rec {
- cups = nixpkgs-1509.cups;
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};