Merge branch 'master' into staging
This commit is contained in:
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.9.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
|
||||
url = "https://lionet.info/soft/asn1c-${version}.tar.gz";
|
||||
sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
|
||||
};
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
binaryVersion = 8;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
|
||||
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
|
||||
sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd";
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
|
||||
})
|
||||
else if stdenv.system == "x86_64-linux" then (fetchurl {
|
||||
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
|
||||
url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
|
||||
sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
|
||||
})
|
||||
else throw "Architecture not supported";
|
||||
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.13.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.colm.net/files/colm/${name}.tar.gz";
|
||||
url = "https://www.colm.net/files/colm/${name}.tar.gz";
|
||||
sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26";
|
||||
};
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ in
|
||||
stdenv.mkDerivation {
|
||||
name = "gforth-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
|
||||
url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
|
||||
sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
|
||||
};
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
, # Whether to build dynamic libs for the standard library (on the target
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt
|
||||
enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt
|
||||
|
||||
, # Whetherto build terminfo.
|
||||
enableTerminfo ? !targetPlatform.isWindows
|
||||
@@ -49,7 +49,8 @@ let
|
||||
'' + stdenv.lib.optionalString enableIntegerSimple ''
|
||||
INTEGER_LIBRARY = integer-simple
|
||||
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
|
||||
Stage1Only = YES
|
||||
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
|
||||
CrossCompilePrefix = ${targetPrefix}
|
||||
HADDOCK_DOCS = NO
|
||||
BUILD_SPHINX_HTML = NO
|
||||
BUILD_SPHINX_PDF = NO
|
||||
@@ -74,7 +75,7 @@ let
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.4.3";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
@@ -208,4 +209,8 @@ stdenv.mkDerivation rec {
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
}
|
||||
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
noAuditTmpdir = true;
|
||||
})
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
, libffi, libiconv ? null, ncurses
|
||||
|
||||
, useLLVM ? !targetPlatform.isx86
|
||||
, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
@@ -50,7 +50,8 @@ let
|
||||
'' + stdenv.lib.optionalString enableIntegerSimple ''
|
||||
INTEGER_LIBRARY = integer-simple
|
||||
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
|
||||
Stage1Only = YES
|
||||
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
|
||||
CrossCompilePrefix = ${targetPrefix}
|
||||
HADDOCK_DOCS = NO
|
||||
BUILD_SPHINX_HTML = NO
|
||||
BUILD_SPHINX_PDF = NO
|
||||
@@ -166,10 +167,10 @@ stdenv.mkDerivation rec {
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
checkTarget = "test";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = ''
|
||||
for bin in "$out"/lib/${name}/bin/*; do
|
||||
isELF "$bin" || continue
|
||||
|
||||
@@ -80,12 +80,12 @@ in stdenv.mkDerivation {
|
||||
cd lib/boot
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/libexec
|
||||
mkdir -p $out/lib/${bootGhcjs.name}
|
||||
lndir ${libexec} $out/bin
|
||||
|
||||
wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
|
||||
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
|
||||
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
|
||||
wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
|
||||
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
|
||||
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d"
|
||||
|
||||
env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
|
||||
'';
|
||||
|
||||
@@ -2,15 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glslang-git-${version}";
|
||||
version = "2018-02-05";
|
||||
version = "2018-06-21";
|
||||
|
||||
# `vulkan-loader` requires a specific version of `glslang` as specified in
|
||||
# `<vulkan-loader-repo>/external_revisions/glslang_revision`.
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "2651ccaec8";
|
||||
sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq";
|
||||
rev = "ef1f899b5d64a9628023f1bb129198674cba2b97";
|
||||
sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
|
||||
|
||||
@@ -78,6 +78,10 @@ in stdenv.mkDerivation rec {
|
||||
"-DLLVM_BUILD_TESTS=ON"
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
] ++ stdenv.lib.optional enableSharedLibraries [
|
||||
"-DLLVM_LINK_LLVM_DYLIB=ON"
|
||||
] ++ stdenv.lib.optional (!isDarwin)
|
||||
@@ -86,9 +90,6 @@ in stdenv.mkDerivation rec {
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
# Not yet supported
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
|
||||
@@ -122,6 +122,10 @@ in stdenv.mkDerivation rec {
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
|
||||
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
] ++ stdenv.lib.optional enableSharedLibraries [
|
||||
"-DLLVM_LINK_LLVM_DYLIB=ON"
|
||||
] ++ stdenv.lib.optional (!isDarwin)
|
||||
@@ -133,9 +137,6 @@ in stdenv.mkDerivation rec {
|
||||
"-DCMAKE_CROSSCOMPILING=True"
|
||||
"-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen"
|
||||
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
# Not yet supported
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
|
||||
"-DCOMPILER_RT_BUILD_XRAY=OFF"
|
||||
|
||||
@@ -100,6 +100,10 @@ in stdenv.mkDerivation (rec {
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
"-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
|
||||
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
]
|
||||
++ stdenv.lib.optional enableSharedLibraries
|
||||
"-DLLVM_LINK_LLVM_DYLIB=ON"
|
||||
@@ -115,11 +119,6 @@ in stdenv.mkDerivation (rec {
|
||||
++ stdenv.lib.optionals (isDarwin) [
|
||||
"-DLLVM_ENABLE_LIBCXX=ON"
|
||||
"-DCAN_TARGET_i386=false"
|
||||
]
|
||||
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
version = "14.01.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
|
||||
url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
|
||||
sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq";
|
||||
};
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
|
||||
url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
|
||||
url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2.13.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
|
||||
sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
|
||||
url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
|
||||
sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
|
||||
@@ -6,7 +6,7 @@ stdenv.mkDerivation (rec {
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
|
||||
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
|
||||
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
|
||||
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
version = "4.00.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
|
||||
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
version = "104";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz";
|
||||
sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb";
|
||||
};
|
||||
|
||||
|
||||
39
pkgs/development/compilers/osl/default.nix
Normal file
39
pkgs/development/compilers/osl/default.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
|
||||
openimageio, llvm, boost165, flex, bison, partio, pugixml,
|
||||
utillinux, python
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override { enableStatic = true; };
|
||||
in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
name = "openshadinglanguage-${version}";
|
||||
version = "1.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "Release-1.9.9";
|
||||
sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash '';
|
||||
|
||||
buildInputs = [
|
||||
cmake zlib openexr openimageio llvm
|
||||
boost_static flex bison partio pugixml
|
||||
utillinux # needed just for hexdump
|
||||
python # CMake doesn't check this?
|
||||
];
|
||||
# TODO: How important is partio? CMake doesn't seem to find it
|
||||
meta = with stdenv.lib; {
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = http://opensource.imageworks.com/?p=osl;
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -5,7 +5,7 @@ let
|
||||
fname = "pakcs-1.14.0";
|
||||
|
||||
fsrc = fetchurl {
|
||||
url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
|
||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
|
||||
sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s";
|
||||
};
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
|
||||
homepage = http://www.ponylang.org;
|
||||
homepage = https://www.ponylang.org;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ doublec kamilchm patternspandemic ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pony-stable-${version}";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "pony-stable";
|
||||
rev = version;
|
||||
sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf";
|
||||
sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx";
|
||||
};
|
||||
|
||||
buildInputs = [ ponyc ];
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "scala-2.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
url = "https://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj";
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
Code sizes are typically reduced by a factor of two to three when
|
||||
compared to an equivalent Java application.
|
||||
'';
|
||||
homepage = http://www.scala-lang.org/;
|
||||
homepage = https://www.scala-lang.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
branch = "2.10";
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "scala-2.11.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
url = "https://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di";
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "scala-2.12.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
url = "https://www.scala-lang.org/files/archive/${name}.tgz";
|
||||
sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
Code sizes are typically reduced by a factor of two to three when
|
||||
compared to an equivalent Java application.
|
||||
'';
|
||||
homepage = http://www.scala-lang.org/;
|
||||
homepage = https://www.scala-lang.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
23
pkgs/development/compilers/seexpr/default.nix
Normal file
23
pkgs/development/compilers/seexpr/default.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
|
||||
bison, flex, mesa_glu, pythonPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "seexpr-${version}";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wdas";
|
||||
repo = "SeExpr";
|
||||
rev = "v2.11";
|
||||
sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake mesa_glu libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
|
||||
meta = with stdenv.lib; {
|
||||
description = "Embeddable expression evaluation engine from Disney Animation";
|
||||
homepage = https://www.disneyanimation.com/technology/seexpr.html;
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,32 +1,52 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }:
|
||||
{ stdenv, fetchFromGitHub, cmake, python }:
|
||||
# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
|
||||
# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
|
||||
# https://github.com/google/shaderc/blob/known-good/known_good.json
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# Future work: extract and fetch all revisions automatically based on a revision of shaderc's known-good branch.
|
||||
let
|
||||
glslang = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "32d3ec319909fcad0b2b308fe1635198773e8316";
|
||||
sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj";
|
||||
};
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c";
|
||||
sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x";
|
||||
};
|
||||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552";
|
||||
sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "shaderc-git-${version}";
|
||||
version = "2016-09-08";
|
||||
version = "2018-06-01";
|
||||
|
||||
# `vulkan-loader` requires a specific version of `glslang` as specified in
|
||||
# `<vulkan-loader-repo>/glslang_revision`.
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "shaderc";
|
||||
rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce";
|
||||
sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki";
|
||||
rev = "be8e0879750303a1de09385465d6b20ecb8b380d";
|
||||
sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
cp -r ${spirv-tools.src} third_party/spirv-tools
|
||||
chmod -R +w third_party/spirv-tools
|
||||
ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers
|
||||
cp -r --no-preserve=mode ${glslang} third_party/glslang
|
||||
cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools
|
||||
ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake glslang python ];
|
||||
buildInputs = [ cmake python ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ];
|
||||
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "A collection of tools, libraries and tests for shader compilation.";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
name = "yap-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
|
||||
url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
|
||||
sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "yasm-1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz";
|
||||
url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz";
|
||||
sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user