summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-05-07 14:48:34 +0200
committertv <tv@shackspace.de>2015-05-19 23:17:20 +0200
commitd63b684d72e09596c711e4a5d0dfb597c74ebd16 (patch)
tree1385a80acde46191ba2809e67a7194b618dd119f
parent46db44b89fc97a7326640f9e4b76b12af314a0b0 (diff)
mors: lass/nixpkgs.nix -> common/nixpkgs.nix
-rw-r--r--modules/lass/nixpkgs.nix16
-rw-r--r--modules/mors/default.nix2
2 files changed, 1 insertions, 17 deletions
diff --git a/modules/lass/nixpkgs.nix b/modules/lass/nixpkgs.nix
deleted file mode 100644
index 09b88672b..000000000
--- a/modules/lass/nixpkgs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
- options = {
- nixpkgs.url = mkOption {
- type = types.string;
- description = "url of the remote repo";
- };
- nixpkgs.rev= mkOption {
- type = types.string;
- description = "revision of the remote repo";
- };
- };
-}
diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index 2cdbe5274..4cbf6088f 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -20,7 +20,7 @@
../lass/steam.nix
../lass/wine.nix
../lass/texlive.nix
- ../lass/nixpkgs.nix
+ ../common/nixpkgs.nix
];
nixpkgs = {
url = "https://github.com/Lassulus/nixpkgs";