diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/fflas-ffpack/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/g2o/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/givaro/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/java/swt/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/linbox/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/oracle-instantclient/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/qtModule.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/v8/5_x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/v8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/v8/plv8_6_x.nix | 4 |
14 files changed, 65 insertions, 65 deletions
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 858bc209391..649a90200e0 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 909c504870f..21975766e74 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; - "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; - "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + westmere = [ "-DDISABLE_SSE4_A=ON" ]; + sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; + ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; + haswell = [ "-DDISABLE_SSE4_A=ON" ]; + broadwell = [ "-DDISABLE_SSE4_A=ON" ]; + skylake = [ "-DDISABLE_SSE4_A=ON" ]; + skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); postInstall = '' diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 79fb7a8d738..4c1e538dcd6 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 591de48d319..a93d7774291 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -5,13 +5,13 @@ let platformMap = { - "x86_64-linux" = + x86_64-linux = { platform = "gtk-linux-x86_64"; sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; - "i686-linux" = + i686-linux = { platform = "gtk-linux-x86"; sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; - "x86_64-darwin" = + x86_64-darwin = { platform = "cocoa-macosx-x86_64"; sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e8a7aa7322f..ef1171b1760 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -64,7 +64,7 @@ let let inherit (args) name; - inherit (srcs."${name}") src version; + inherit (srcs.${name}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index f5cb197dfe5..8635b8c412f 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ++ stdenv.lib.optionals withSage [ "--enable-sage" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index bd4802b8775..84cfb47b554 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -44,10 +44,10 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { - "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; - "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; - "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; - "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 2e90d867b5a..6c5d4b94d53 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -17,22 +17,22 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; arch = { - "x86_64-linux" = "linux.x64"; - "x86_64-darwin" = "macos.x64"; - }."${stdenv.hostPlatform.system}" or throwSystem; + x86_64-linux = "linux.x64"; + x86_64-darwin = "macos.x64"; + }.${stdenv.hostPlatform.system} or throwSystem; srcs = { - "x86_64-linux" = [ + x86_64-linux = [ (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194") (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb") (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ] ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); - "x86_64-darwin" = [ + x86_64-darwin = [ (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9") (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b") (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ] ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); - }."${stdenv.hostPlatform.system}" or throwSystem; + }.${stdenv.hostPlatform.system} or throwSystem; extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8250e42a1b6..e2c71a77062 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -255,14 +255,14 @@ stdenv.mkDerivation { if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optionals (compareVersion "5.9.0" >= 0) { - "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 84a9d30918b..5003205ef37 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,14 +8,14 @@ args: let inherit (args) name; - version = args.version or srcs."${name}".version; - src = args.src or srcs."${name}".src; + version = args.version or srcs.${name}.version; + src = args.src or srcs.${name}.src; in mkDerivation (args // { name = "${name}-${version}"; inherit src; - patches = args.patches or patches."${name}" or []; + patches = args.patches or patches.${name} or []; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 892dfa2a609..76f0c5eea7f 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,14 +1,14 @@ { version = "1.14.0"; -"cpu-linux-x86_64" = { +cpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; }; -"gpu-linux-x86_64" = { +gpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; }; -"cpu-darwin-x86_64" = { +cpu-darwin-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; }; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index cb53765e394..050abe9e81b 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -17,7 +17,7 @@ let sharedFlag = if static then "static_library" else "shared_library"; deps = { - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; @@ -32,7 +32,7 @@ let rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2d9c5d4b92a..e367d8242de 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -14,7 +14,7 @@ let rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index bda3f07f0a4..f1155c41c12 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -24,12 +24,12 @@ let rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; |