Created
March 27, 2015 11:24
-
-
Save qknight/f8d7d4cd717caec14bfd to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/README.md b/README.md | |
index fa5a419..d9011b8 100644 | |
--- a/README.md | |
+++ b/README.md | |
@@ -18,3 +18,5 @@ Communication: | |
* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) | |
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) | |
+hi | |
+hu | |
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix | |
index 7432154..ae16414 100644 | |
--- a/pkgs/applications/graphics/sane/backends.nix | |
+++ b/pkgs/applications/graphics/sane/backends.nix | |
@@ -2,7 +2,7 @@ | |
, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null | |
}: | |
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); | |
+#assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); | |
let | |
firmware = gt68xxFirmware { inherit fetchurl; }; | |
diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix | |
index 84fdf63..7cc6345 100644 | |
--- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix | |
+++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix | |
@@ -9,7 +9,7 @@ | |
, installjce ? false | |
}: | |
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; | |
+#assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; | |
assert swingSupport -> xlibs != null; | |
let | |
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix | |
index eb83bcc..5b84fd4 100644 | |
--- a/pkgs/top-level/all-packages.nix | |
+++ b/pkgs/top-level/all-packages.nix | |
@@ -7,7 +7,7 @@ | |
{ # The system (e.g., `i686-linux') for which to build the packages. | |
system ? builtins.currentSystem | |
- | |
+ | |
, # The standard environment to use. Only used for bootstrapping. If | |
# null, the default standard environment is used. | |
bootStdenv ? null | |
@@ -36,6 +36,7 @@ let config_ = config; platform_ = platform; in # rename the function arguments | |
let | |
+ | |
lib = import ../../lib; | |
# The contents of the configuration file found at $NIXPKGS_CONFIG or | |
@@ -3770,7 +3771,7 @@ let | |
system == "x86_64-linux"; | |
jdkdistro = installjdk: pluginSupport: | |
- assert supportsJDK; | |
+ #assert supportsJDK; | |
(if pluginSupport then appendToName "with-plugin" else x: x) | |
(callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment