diff options
| -rw-r--r-- | pkgs/lib/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/lib/platforms.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/misc/eProver/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 01f01d5cb165..aec2fb0bcc06 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -14,10 +14,11 @@ let debug = import ./debug.nix; misc = import ./misc.nix; maintainers = import ./maintainers.nix; + platforms = import ./platforms.nix; in { inherit trivial lists strings stringsWithDeps attrsets sources options - properties modules types meta debug maintainers; + properties modules types meta debug maintainers platforms; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix new file mode 100644 index 000000000000..acb35105d15b --- /dev/null +++ b/pkgs/lib/platforms.nix @@ -0,0 +1,10 @@ +let + lists = import ./lists.nix; +in +rec { + linux = ["i686-linux" "x86_64-linux"]; + darwin = ["i686-darwin"]; + cygwin = ["i686-cygwin"]; + all = linux ++ darwin ++ cygwin; + allBut = platform: lists.filter (x: platform != x) all; +} diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix index 495f98ffb04b..30353e122c12 100644 --- a/pkgs/tools/misc/eProver/default.nix +++ b/pkgs/tools/misc/eProver/default.nix @@ -28,5 +28,7 @@ stdenv.mkDerivation { meta = { description = "E automated theorem prover"; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2bc07b483ccb..dcf83c007299 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -51,11 +51,7 @@ let else []; /* Common platform groups on which to test packages. */ - linux = ["i686-linux" "x86_64-linux"]; - darwin = ["i686-darwin"]; - cygwin = ["i686-cygwin"]; - all = linux ++ darwin ++ cygwin; - allBut = platform: pkgs.lib.filter (x: platform != x) all; + inherit (pkgs.lib.platforms) linux darwin cygwin allBut all; /* Platform groups for specific kinds of applications. */ x11Supported = linux; |