mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 17:23:08 +00:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
2e7c7dad92
@ -2921,6 +2921,11 @@
|
||||
github = "marcweber";
|
||||
name = "Marc Weber";
|
||||
};
|
||||
marenz = {
|
||||
email = "marenz@arkom.men";
|
||||
github = "marenz2569";
|
||||
name = "Markus Schmidl";
|
||||
};
|
||||
markus1189 = {
|
||||
email = "markus1189@gmail.com";
|
||||
github = "markus1189";
|
||||
|
||||
@ -14,13 +14,16 @@ ltermbox,
|
||||
lua-cmsgpack,
|
||||
lua_cliargs,
|
||||
lua-iconv,
|
||||
lua-messagepack,
|
||||
lua-term,
|
||||
lua-toml,
|
||||
luabitop,
|
||||
luaevent,
|
||||
luacheck
|
||||
luaffi,,http://luarocks.org/dev,
|
||||
luuid,
|
||||
penlight,
|
||||
rapidjson,
|
||||
say,
|
||||
std__debug,std._debug,
|
||||
std_normalize,std.normalize,
|
||||
|
||||
|
@ -33,7 +33,12 @@ in
|
||||
paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d")
|
||||
([ pkgs.apparmor-profiles ] ++ cfg.packages);
|
||||
in {
|
||||
wantedBy = [ "local-fs.target" ];
|
||||
after = [ "local-fs.target" ];
|
||||
before = [ "sysinit.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig = {
|
||||
DefaultDependencies = "no";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = "yes";
|
||||
@ -43,6 +48,9 @@ in
|
||||
ExecStop = map (p:
|
||||
''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"''
|
||||
) cfg.profiles;
|
||||
ExecReload = map (p:
|
||||
''${pkgs.apparmor-parser}/bin/apparmor_parser --reload ${paths} "${p}"''
|
||||
) cfg.profiles;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -273,11 +273,10 @@ in {
|
||||
wantedBy = [ "kube-control-plane-online.target" ];
|
||||
after = [ "kube-scheduler.service" "kube-controller-manager.service" ];
|
||||
before = [ "kube-control-plane-online.target" ];
|
||||
environment.KUBECONFIG = cfg.lib.mkKubeConfig "default" cfg.kubeconfig;
|
||||
path = [ pkgs.kubectl ];
|
||||
path = [ pkgs.curl ];
|
||||
preStart = ''
|
||||
until kubectl get --raw=/healthz 2>/dev/null; do
|
||||
echo kubectl get --raw=/healthz: exit status $?
|
||||
until curl -Ssf ${cfg.apiserverAddress}/healthz do
|
||||
echo curl -Ssf ${cfg.apiserverAddress}/healthz: exit status $?
|
||||
sleep 3
|
||||
done
|
||||
'';
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "timemachine-${version}";
|
||||
version = "0.3.1";
|
||||
pname = "timemachine";
|
||||
version = "0.3.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "swh";
|
||||
repo = "timemachine";
|
||||
rev = "1966d8524d4e4c47c525473bab3b010a168adc98";
|
||||
sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jsvd29wiqigxyqxl2xjklla11fwyjy68vqivcnlr9f2af4ylym8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebkit, hunspell }:
|
||||
{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebengine, hunspell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghostwriter";
|
||||
version = "1.7.4";
|
||||
version = "1.8.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wereturtle";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m";
|
||||
sha256 = "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkgconfig qttools ];
|
||||
|
||||
buildInputs = [ qtwebkit hunspell ];
|
||||
buildInputs = [ qtwebengine hunspell ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A cross-platform, aesthetic, distraction-free Markdown editor";
|
||||
|
||||
@ -6,20 +6,20 @@ buildGoPackage rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.7.13";
|
||||
rev = "67cd823b2a07c7bb2bcb919c0963e8f23e22d57e";
|
||||
version = "0.8.1";
|
||||
rev = "9ce987dd0eeb66df993f8d232b57ff3e4d380dda";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "windmilleng";
|
||||
repo = "tilt";
|
||||
rev = "${rev}";
|
||||
sha256 = "0cfmdd6wsczcmy6fkd418rvancx4qy1c3pzq9jbfsy4innhh51j7";
|
||||
sha256 = "0ybzj2csmjc7zlkprcyy5cnh9dxgngcx3wd6n43kawi5db0lvjn4";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/windmilleng/tilt";
|
||||
subPackages = [ "cmd/tilt" ];
|
||||
|
||||
buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-18");
|
||||
buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-29");
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake
|
||||
, qttools, qtmultimedia
|
||||
{ stdenv, lib, fetchFromGitHub, cmake
|
||||
, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
|
||||
, libqmatrixclient_0_4, libqmatrixclient_0_5 }:
|
||||
|
||||
let
|
||||
@ -13,7 +13,7 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtmultimedia qtquickcontrols qttools library ];
|
||||
buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -37,6 +37,6 @@ let
|
||||
};
|
||||
|
||||
in rec {
|
||||
quaternion = generic "0.0.9.3" "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3" "v" libqmatrixclient_0_4;
|
||||
quaternion-git = generic "0.0.9.4-rc3" "1fc3ya9fr3zw1cx7565s2rswzry98avslrryvdi0qa9yn0m3sw7p" "" libqmatrixclient_0_5;
|
||||
quaternion = generic "0.0.9.4" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5;
|
||||
quaternion-git = quaternion;
|
||||
}
|
||||
|
||||
@ -1,50 +1,70 @@
|
||||
{ stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib,
|
||||
buildPlatform, buildPackages, ghcWithPackages, fetchpatch }:
|
||||
let
|
||||
options-patch =
|
||||
fetchpatch {
|
||||
url = https://github.com/cedille/cedille/commit/ee62b0fabde6c4f7299a3778868519255cc4a64f.patch;
|
||||
name = "options.patch";
|
||||
sha256 = "19xzn9sqpfnfqikqy1x9lb9mb6722kbgvrapl6cf8ckcw8cfj8cz";
|
||||
};
|
||||
in
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, texinfo
|
||||
, alex
|
||||
, happy
|
||||
, Agda
|
||||
, buildPlatform
|
||||
, buildPackages
|
||||
, ghcWithPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0";
|
||||
name = "cedille-${version}";
|
||||
version = "1.1.1";
|
||||
pname = "cedille";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cedille";
|
||||
repo = "cedille";
|
||||
rev = "v${version}";
|
||||
sha256 = "08c2vgg8i6l3ws7hd5gsj89mki36lxm7x7s8hi1qa5gllq04a832";
|
||||
sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ];
|
||||
|
||||
patches = [options-patch];
|
||||
nativeBuildInputs = [ texinfo alex happy ];
|
||||
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];
|
||||
|
||||
LANG = "en_US.UTF-8";
|
||||
LOCALE_ARCHIVE =
|
||||
lib.optionalString (buildPlatform.libc == "glibc")
|
||||
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
|
||||
|
||||
patches = [
|
||||
# texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch";
|
||||
sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs create-libraries.sh
|
||||
cp -r ${agdaIowaStdlib.src} ial
|
||||
chmod -R 755 ial
|
||||
patchShebangs docs/src/compile-docs.sh
|
||||
'';
|
||||
|
||||
outputs = ["out" "lib"];
|
||||
# We regenerate the info file in order to fix the direntry
|
||||
preBuild = ''
|
||||
rm -f docs/info/cedille-info-main.info
|
||||
'';
|
||||
|
||||
buildFlags = [ "all" "cedille-docs" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv cedille $out/bin/cedille
|
||||
mv lib $lib
|
||||
install -Dm755 -t $out/bin/ cedille
|
||||
install -Dm755 -t $out/bin/ core/cedille-core
|
||||
install -Dm644 -t $out/share/info docs/info/cedille-info-main.info
|
||||
|
||||
mkdir -p $out/lib/
|
||||
cp -r lib/ $out/lib/cedille/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory.";
|
||||
meta = with stdenv.lib; {
|
||||
description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory";
|
||||
homepage = https://cedille.github.io/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.mpickering ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam mpickering ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,13 +12,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "33.0.0";
|
||||
version = "33.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0bphwjjpcj86phcx795wdy5b0ivwh5mvbvi5288pql88x6x0jjk9";
|
||||
sha256 = "130hh6m7cv2x9jv51qclnfg3dldxhfzhzhf6sqibfhynaj65m09i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -84,12 +84,12 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.6.4.20190406";
|
||||
version = "8.6.5";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/~ghc/8.6.5-rc1/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1zschidlaj80fl9flnlfhvlvy75cks3hz31cfxyyz935m3xyayxv";
|
||||
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
|
||||
inherit enableShared;
|
||||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-8.6.4.20190406";
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
230
pkgs/development/compilers/ghc/8.8.1.nix
Normal file
230
pkgs/development/compilers/ghc/8.8.1.nix
Normal file
@ -0,0 +1,230 @@
|
||||
{ stdenv, pkgsBuildTarget, targetPackages
|
||||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
||||
, # GHC can be built with system libffi or a bundled one.
|
||||
libffi ? null
|
||||
|
||||
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
|
||||
, # 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.
|
||||
buildLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
|
||||
|
||||
, # If enabled, use -fPIC when compiling static libs.
|
||||
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
|
||||
|
||||
, # Whether to build dynamic libs for the standard library (on the target
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
|
||||
|
||||
, # Whetherto build terminfo.
|
||||
enableTerminfo ? !stdenv.targetPlatform.isWindows
|
||||
|
||||
, # What flavour to build. An empty string indicates no
|
||||
# specific flavour and falls back to ghc default values.
|
||||
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
|
||||
|
||||
, # Whether to disable the large address space allocator
|
||||
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
|
||||
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
|
||||
}:
|
||||
|
||||
assert !enableIntegerSimple -> gmp != null;
|
||||
|
||||
let
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
inherit (bootPkgs) ghc;
|
||||
|
||||
# TODO(@Ericson2314) Make unconditional
|
||||
targetPrefix = stdenv.lib.optionalString
|
||||
(targetPlatform != hostPlatform)
|
||||
"${targetPlatform.config}-";
|
||||
|
||||
buildMK = ''
|
||||
BuildFlavour = ${ghcFlavour}
|
||||
ifneq \"\$(BuildFlavour)\" \"\"
|
||||
include mk/flavours/\$(BuildFlavour).mk
|
||||
endif
|
||||
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
|
||||
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
|
||||
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
|
||||
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
|
||||
CrossCompilePrefix = ${targetPrefix}
|
||||
HADDOCK_DOCS = NO
|
||||
BUILD_SPHINX_HTML = NO
|
||||
BUILD_SPHINX_PDF = NO
|
||||
'' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
|
||||
GhcLibHcOpts += -fPIC
|
||||
GhcRtsHcOpts += -fPIC
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
EXTRA_CC_OPTS += -std=gnu99
|
||||
'';
|
||||
|
||||
# Splicer will pull out correct variations
|
||||
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
|
||||
++ [libffi]
|
||||
++ stdenv.lib.optional (!enableIntegerSimple) gmp
|
||||
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.8.0.20190424";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/~ghc/8.8.1-alpha1/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1lwzy4q9hhaayamr1ij3lk8l7zdwfqza5b2racylp7xn2y9wanl9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
preConfigure = ''
|
||||
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
|
||||
export "''${env#TARGET_}=''${!env}"
|
||||
done
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
|
||||
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
|
||||
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
|
||||
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
|
||||
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
|
||||
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||
echo "patching llvm-targets for musl targets..."
|
||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||
echo "(go go gadget sed)"
|
||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||
|
||||
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||
for x in configure aclocal.m4; do
|
||||
substituteInPlace $x \
|
||||
--replace '*-android*|*-gnueabi*)' \
|
||||
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||
done
|
||||
'';
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||
configurePlatforms = [ "build" "host" ]
|
||||
++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||
# `--with` flags for libraries needed for RTS linker
|
||||
configureFlags = [
|
||||
"--datadir=$doc/share/doc/ghc"
|
||||
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
|
||||
] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
|
||||
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
|
||||
"--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
|
||||
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
|
||||
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
|
||||
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
|
||||
"--enable-bootstrap-with-devel-snapshot"
|
||||
] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
|
||||
"CFLAGS=-fuse-ld=gold"
|
||||
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
|
||||
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
|
||||
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
|
||||
"--disable-large-address-space"
|
||||
];
|
||||
|
||||
# Make sure we never relax`$PATH` and hooks support for compatability.
|
||||
strictDeps = true;
|
||||
|
||||
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
|
||||
dontAddExtraLibs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl autoconf automake m4 python3 sphinx
|
||||
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
|
||||
];
|
||||
|
||||
# For building runtime libs
|
||||
depsBuildTarget = toolsForTarget;
|
||||
|
||||
buildInputs = [ perl ] ++ (libDeps hostPlatform);
|
||||
|
||||
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
|
||||
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
|
||||
|
||||
depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
|
||||
depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
|
||||
|
||||
# required, because otherwise all symbols from HSffi.o are stripped, and
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
|
||||
|
||||
checkTarget = "test";
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
|
||||
postInstall = ''
|
||||
# Install the bash completion file.
|
||||
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
|
||||
|
||||
# Patch scripts to include "readelf" and "cat" in $PATH.
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit bootPkgs targetPrefix;
|
||||
|
||||
inherit llvmPackages;
|
||||
inherit enableShared;
|
||||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://haskell.org/ghc;
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
noAuditTmpdir = true;
|
||||
})
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
|
||||
, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
|
||||
, gdk_pixbuf, atk }:
|
||||
, gdk_pixbuf, atk, zlib }:
|
||||
|
||||
# TODO: Investigate building from source instead of patching binaries.
|
||||
# TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
|
||||
|
||||
let drv = stdenv.mkDerivation rec {
|
||||
pname = "jetbrainsjdk";
|
||||
version = "202b1483.37";
|
||||
version = "164";
|
||||
name = pname + "-" + version;
|
||||
|
||||
src = if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz";
|
||||
sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
|
||||
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
|
||||
sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
|
||||
}
|
||||
else
|
||||
throw "unsupported system: ${stdenv.hostPlatform.system}";
|
||||
@ -29,16 +29,7 @@ let drv = stdenv.mkDerivation rec {
|
||||
jrePath=$out/jre
|
||||
'';
|
||||
|
||||
postFixup = let
|
||||
arch = "amd64";
|
||||
rSubPaths = [
|
||||
"lib/${arch}/jli"
|
||||
"lib/${arch}/server"
|
||||
"lib/${arch}/xawt"
|
||||
"lib/${arch}"
|
||||
];
|
||||
in ''
|
||||
rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
|
||||
postFixup = ''
|
||||
find $out -type f -perm -0100 \
|
||||
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$rpath" {} \;
|
||||
@ -47,10 +38,11 @@ let drv = stdenv.mkDerivation rec {
|
||||
|
||||
rpath = lib.makeLibraryPath ([
|
||||
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
|
||||
alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk
|
||||
alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib
|
||||
(placeholder "out")
|
||||
] ++ (with xorg; [
|
||||
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
|
||||
]));
|
||||
])) + ":${placeholder "out"}/lib/jli";
|
||||
|
||||
passthru.home = drv;
|
||||
|
||||
|
||||
@ -1282,4 +1282,10 @@ self: super: {
|
||||
# Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
|
||||
yesod-markdown = doJailbreak super.yesod-markdown;
|
||||
|
||||
# These packages needs network 3.x, which is not in LTS-13.x.
|
||||
network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; };
|
||||
lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
|
||||
lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
|
||||
lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; });
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -4,8 +4,8 @@ with haskellLib;
|
||||
|
||||
self: super: {
|
||||
|
||||
# This compiler version needs llvm 5.x.
|
||||
llvmPackages = pkgs.llvmPackages_5;
|
||||
# This compiler version needs llvm 6.x.
|
||||
llvmPackages = pkgs.llvmPackages_6;
|
||||
|
||||
# Disable GHC 8.6.x core libraries.
|
||||
array = null;
|
||||
|
||||
58
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
Normal file
58
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
with haskellLib;
|
||||
|
||||
self: super: {
|
||||
|
||||
# This compiler version needs llvm 7.x.
|
||||
llvmPackages = pkgs.llvmPackages_7;
|
||||
|
||||
# Disable GHC 8.8.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
binary = null;
|
||||
bytestring = null;
|
||||
Cabal = null;
|
||||
containers = null;
|
||||
deepseq = null;
|
||||
directory = null;
|
||||
filepath = null;
|
||||
ghc-boot = null;
|
||||
ghc-boot-th = null;
|
||||
ghc-compact = null;
|
||||
ghc-heap = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
libiserv = null;
|
||||
mtl = null;
|
||||
parsec = null;
|
||||
pretty = null;
|
||||
process = null;
|
||||
rts = null;
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
terminfo = null;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Ignore overly restrictive upper version bounds.
|
||||
doctest = doJailbreak super.doctest;
|
||||
|
||||
# These packages don't work and need patching and/or an update.
|
||||
primitive = overrideSrc (doJailbreak super.primitive) {
|
||||
version = "20180530-git";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell";
|
||||
repo = "primitive";
|
||||
rev = "97964182881aa0419546e0bb188b2d17e4468324";
|
||||
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
|
||||
|
||||
compiler: ghc-8.6.4
|
||||
compiler: ghc-8.6.5
|
||||
|
||||
core-packages:
|
||||
- array-0.5.3.0
|
||||
@ -12,13 +12,13 @@ core-packages:
|
||||
- deepseq-1.4.4.0
|
||||
- directory-1.3.3.0
|
||||
- filepath-1.4.2.1
|
||||
- ghc-8.6.4
|
||||
- ghc-boot-8.6.4
|
||||
- ghc-boot-th-8.6.4
|
||||
- ghc-8.6.5
|
||||
- ghc-boot-8.6.5
|
||||
- ghc-boot-th-8.6.5
|
||||
- ghc-compact-0.1.0.0
|
||||
- ghc-heap-8.6.4
|
||||
- ghc-heap-8.6.5
|
||||
- ghc-prim-0.5.3
|
||||
- ghci-8.6.4
|
||||
- ghci-8.6.5
|
||||
- haskeline-0.7.4.3
|
||||
- hpc-0.6.0.3
|
||||
- integer-gmp-1.0.2.0
|
||||
@ -46,7 +46,7 @@ default-package-overrides:
|
||||
# Newer versions don't work in LTS-12.x
|
||||
- alsa-mixer < 0.3
|
||||
- cassava-megaparsec < 2
|
||||
# LTS Haskell 13.18
|
||||
# LTS Haskell 13.19
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
@ -179,7 +179,7 @@ default-package-overrides:
|
||||
- amazonka-waf ==1.6.1
|
||||
- amazonka-workspaces ==1.6.1
|
||||
- amazonka-xray ==1.6.1
|
||||
- amqp ==0.18.1
|
||||
- amqp ==0.18.2
|
||||
- annotated-wl-pprint ==0.7.0
|
||||
- ansi-terminal ==0.8.2
|
||||
- ansi-wl-pprint ==0.6.8.2
|
||||
@ -269,7 +269,7 @@ default-package-overrides:
|
||||
- bencode ==0.6.0.0
|
||||
- between ==0.11.0.0
|
||||
- bibtex ==0.1.0.6
|
||||
- bifunctors ==5.5.3
|
||||
- bifunctors ==5.5.4
|
||||
- bimap ==0.3.3
|
||||
- bimap-server ==0.1.0.1
|
||||
- binary-bits ==0.5
|
||||
@ -316,7 +316,7 @@ default-package-overrides:
|
||||
- boolean-normal-forms ==0.0.1
|
||||
- boolsimplifier ==0.1.8
|
||||
- bordacount ==0.1.0.0
|
||||
- boring ==0.1
|
||||
- boring ==0.1.1
|
||||
- both ==0.1.1.0
|
||||
- bound ==2.0.1
|
||||
- BoundedChan ==1.0.3.0
|
||||
@ -563,7 +563,7 @@ default-package-overrides:
|
||||
- DAV ==1.3.3
|
||||
- dbcleaner ==0.1.3
|
||||
- DBFunctor ==0.1.1.1
|
||||
- dbus ==1.2.5
|
||||
- dbus ==1.2.6
|
||||
- debian-build ==0.10.1.2
|
||||
- debug ==0.1.1
|
||||
- debug-trace-var ==0.2.0
|
||||
@ -579,7 +579,7 @@ default-package-overrides:
|
||||
- dependent-sum-template ==0.0.0.6
|
||||
- deque ==0.2.7
|
||||
- deriveJsonNoPrefix ==0.1.0.1
|
||||
- deriving-compat ==0.5.4
|
||||
- deriving-compat ==0.5.5
|
||||
- derulo ==1.0.5
|
||||
- detour-via-sci ==1.0.0
|
||||
- dhall ==1.19.1
|
||||
@ -651,7 +651,7 @@ default-package-overrides:
|
||||
- ekg-statsd ==0.2.4.0
|
||||
- elerea ==2.9.0
|
||||
- elf ==0.29
|
||||
- eliminators ==0.5
|
||||
- eliminators ==0.5.1
|
||||
- elm2nix ==0.1.1
|
||||
- elm-core-sources ==1.0.0
|
||||
- elm-export ==0.6.0.1
|
||||
@ -698,7 +698,7 @@ default-package-overrides:
|
||||
- explicit-exception ==0.1.9.2
|
||||
- exp-pairs ==0.2.0.0
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.6.14
|
||||
- extra ==1.6.15
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.3.3
|
||||
- fail ==4.9.0.0
|
||||
@ -725,7 +725,7 @@ default-package-overrides:
|
||||
- fileplow ==0.1.0.0
|
||||
- filter-logger ==0.6.0.0
|
||||
- filtrable ==0.1.1.0
|
||||
- fin ==0.0.1
|
||||
- fin ==0.0.2
|
||||
- FindBin ==0.0.5
|
||||
- fingertree ==0.1.4.2
|
||||
- finite-typelits ==0.1.4.2
|
||||
@ -788,7 +788,7 @@ default-package-overrides:
|
||||
- general-games ==1.1.1
|
||||
- generic-arbitrary ==0.1.0
|
||||
- generic-data ==0.3.0.0
|
||||
- generic-deriving ==1.12.3
|
||||
- generic-deriving ==1.12.4
|
||||
- generic-lens ==1.1.0.0
|
||||
- GenericPretty ==1.2.2
|
||||
- generic-random ==1.2.0.0
|
||||
@ -896,7 +896,7 @@ default-package-overrides:
|
||||
- HandsomeSoup ==0.4.2
|
||||
- hapistrano ==0.3.9.2
|
||||
- happy ==1.19.9
|
||||
- hasbolt ==0.1.3.2
|
||||
- hasbolt ==0.1.3.3
|
||||
- hashable ==1.2.7.0
|
||||
- hashable-time ==0.2.0.2
|
||||
- hashids ==1.0.2.4
|
||||
@ -918,9 +918,9 @@ default-package-overrides:
|
||||
- haskell-src-meta ==0.8.2
|
||||
- haskey-btree ==0.3.0.0
|
||||
- haskoin-core ==0.8.4
|
||||
- hasql ==1.3.0.3
|
||||
- hasql ==1.3.0.5
|
||||
- hasql-optparse-applicative ==0.3.0.3
|
||||
- hasql-pool ==0.5.0.1
|
||||
- hasql-pool ==0.5.0.2
|
||||
- hasql-transaction ==0.7.1
|
||||
- hasty-hamiltonian ==1.3.2
|
||||
- haxl ==2.0.1.1
|
||||
@ -963,7 +963,7 @@ default-package-overrides:
|
||||
- hmatrix-gsl ==0.19.0.1
|
||||
- hmatrix-gsl-stats ==0.4.1.7
|
||||
- hmatrix-morpheus ==0.1.1.2
|
||||
- hmatrix-vector-sized ==0.1.1.2
|
||||
- hmatrix-vector-sized ==0.1.1.3
|
||||
- hmpfr ==0.4.4
|
||||
- hoauth2 ==1.8.4
|
||||
- Hoed ==0.5.1
|
||||
@ -1130,7 +1130,7 @@ default-package-overrides:
|
||||
- IntervalMap ==0.6.1.1
|
||||
- intervals ==0.8.1
|
||||
- intset-imperative ==0.1.0.0
|
||||
- invariant ==0.5.1
|
||||
- invariant ==0.5.2
|
||||
- invertible ==0.2.0.5
|
||||
- io-choice ==0.0.7
|
||||
- io-machine ==0.2.0.0
|
||||
@ -1212,7 +1212,7 @@ default-package-overrides:
|
||||
- leancheck ==0.8.0
|
||||
- leancheck-instances ==0.0.3
|
||||
- leapseconds-announced ==2017.1.0.1
|
||||
- lens ==4.17
|
||||
- lens ==4.17.1
|
||||
- lens-action ==0.2.3
|
||||
- lens-aeson ==1.0.2
|
||||
- lens-datetime ==0.3
|
||||
@ -1264,7 +1264,7 @@ default-package-overrides:
|
||||
- long-double ==0.1
|
||||
- loop ==0.3.0
|
||||
- lrucaching ==0.3.3
|
||||
- lsp-test ==0.5.1.1
|
||||
- lsp-test ==0.5.1.2
|
||||
- lucid ==2.9.11
|
||||
- lucid-extras ==0.1.0.1
|
||||
- lxd-client-config ==0.1.0.1
|
||||
@ -1414,7 +1414,7 @@ default-package-overrides:
|
||||
- netwire ==5.0.3
|
||||
- netwire-input ==0.0.7
|
||||
- netwire-input-glfw ==0.0.10
|
||||
- network ==2.8.0.0
|
||||
- network ==2.8.0.1
|
||||
- network-anonymous-i2p ==0.10.0
|
||||
- network-anonymous-tor ==0.11.0
|
||||
- network-attoparsec ==0.12.2
|
||||
@ -1485,7 +1485,7 @@ default-package-overrides:
|
||||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.14.3.0
|
||||
- optparse-generic ==1.3.0
|
||||
- optparse-simple ==0.1.1.1
|
||||
- optparse-simple ==0.1.1.2
|
||||
- optparse-text ==0.1.1.0
|
||||
- overhang ==1.0.0
|
||||
- packcheck ==0.4.1
|
||||
@ -1574,13 +1574,13 @@ default-package-overrides:
|
||||
- polynomials-bernstein ==1.1.2
|
||||
- polyparse ==1.12.1
|
||||
- pooled-io ==0.0.2.2
|
||||
- port-utils ==0.2.0.0
|
||||
- port-utils ==0.2.1.0
|
||||
- posix-paths ==0.2.1.6
|
||||
- possibly ==1.0.0.0
|
||||
- postgresql-binary ==0.12.1.2
|
||||
- postgresql-libpq ==0.9.4.2
|
||||
- postgresql-schema ==0.1.14
|
||||
- postgresql-simple ==0.6.1
|
||||
- postgresql-simple ==0.6.2
|
||||
- postgresql-simple-migration ==0.1.14.0
|
||||
- postgresql-simple-queue ==1.0.1
|
||||
- postgresql-simple-url ==0.2.1.0
|
||||
@ -1650,6 +1650,7 @@ default-package-overrides:
|
||||
- QuickCheck ==2.12.6.1
|
||||
- quickcheck-arbitrary-adt ==0.3.1.0
|
||||
- quickcheck-assertions ==0.3.0
|
||||
- quickcheck-classes ==0.6.0.0
|
||||
- quickcheck-instances ==0.3.19
|
||||
- quickcheck-io ==0.2.0
|
||||
- quickcheck-simple ==0.1.0.4
|
||||
@ -1687,7 +1688,7 @@ default-package-overrides:
|
||||
- rebase ==1.3.1
|
||||
- record-dot-preprocessor ==0.1.5
|
||||
- records-sop ==0.1.0.2
|
||||
- recursion-schemes ==5.1.2
|
||||
- recursion-schemes ==5.1.3
|
||||
- reducers ==3.12.3
|
||||
- refact ==0.3.0.2
|
||||
- references ==0.3.3.1
|
||||
@ -1825,7 +1826,7 @@ default-package-overrides:
|
||||
- servant-tracing ==0.1.0.2
|
||||
- servant-websockets ==1.1.0
|
||||
- servant-yaml ==0.1.0.1
|
||||
- serverless-haskell ==0.8.6
|
||||
- serverless-haskell ==0.8.7
|
||||
- serversession ==1.0.1
|
||||
- serversession-frontend-wai ==1.0
|
||||
- servius ==1.2.3.0
|
||||
@ -1921,7 +1922,7 @@ default-package-overrides:
|
||||
- storable-record ==0.0.4
|
||||
- storable-tuple ==0.0.3.3
|
||||
- storablevector ==0.2.13
|
||||
- store ==0.5.0.1
|
||||
- store ==0.5.1.0
|
||||
- store-core ==0.4.4
|
||||
- Strafunski-StrategyLib ==5.0.1.0
|
||||
- stratosphere ==0.29.1
|
||||
@ -2052,13 +2053,13 @@ default-package-overrides:
|
||||
- threads ==0.5.1.6
|
||||
- threepenny-gui ==0.8.3.0
|
||||
- th-reify-compat ==0.0.1.5
|
||||
- th-reify-many ==0.1.8
|
||||
- th-reify-many ==0.1.9
|
||||
- throttle-io-stream ==0.2.0.1
|
||||
- throwable-exceptions ==0.1.0.9
|
||||
- th-strict-compat ==0.1.0.1
|
||||
- th-utilities ==0.2.1.0
|
||||
- thyme ==0.3.5.5
|
||||
- tidal ==1.0.11
|
||||
- tidal ==1.0.13
|
||||
- tile ==0.3.0.0
|
||||
- time-compat ==0.1.0.3
|
||||
- timeit ==2.0
|
||||
@ -2066,7 +2067,7 @@ default-package-overrides:
|
||||
- time-lens ==0.4.0.2
|
||||
- time-locale-compat ==0.1.1.5
|
||||
- time-locale-vietnamese ==1.0.0.0
|
||||
- time-parsers ==0.1.2.0
|
||||
- time-parsers ==0.1.2.1
|
||||
- time-qq ==0.0.1.0
|
||||
- timerep ==2.0.0.2
|
||||
- timer-wheel ==0.1.0
|
||||
@ -2080,7 +2081,7 @@ default-package-overrides:
|
||||
- tls-session-manager ==0.0.0.2
|
||||
- tmapchan ==0.0.3
|
||||
- tmapmvar ==0.0.4
|
||||
- tmp-postgres ==0.1.1.1
|
||||
- tmp-postgres ==0.1.2.2
|
||||
- token-bucket ==0.1.0.1
|
||||
- tomland ==0.5.0
|
||||
- tostring ==0.2.1.1
|
||||
@ -2180,7 +2181,7 @@ default-package-overrides:
|
||||
- validity-vector ==0.2.0.2
|
||||
- valor ==0.1.0.0
|
||||
- vault ==0.3.1.2
|
||||
- vec ==0.1
|
||||
- vec ==0.1.1
|
||||
- vector ==0.12.0.2
|
||||
- vector-algorithms ==0.8.0.1
|
||||
- vector-binary-instances ==0.2.5.1
|
||||
@ -2223,9 +2224,9 @@ default-package-overrides:
|
||||
- wai-slack-middleware ==0.2.0
|
||||
- wai-transformers ==0.1.0
|
||||
- wai-websockets ==3.0.1.2
|
||||
- warp ==3.2.26
|
||||
- warp-tls ==3.2.4.3
|
||||
- warp-tls-uid ==0.2.0.5
|
||||
- warp ==3.2.27
|
||||
- warp-tls ==3.2.5
|
||||
- warp-tls-uid ==0.2.0.6
|
||||
- wave ==0.1.5
|
||||
- wcwidth ==0.0.2
|
||||
- web3 ==0.8.3.1
|
||||
@ -2309,7 +2310,7 @@ default-package-overrides:
|
||||
- yesod ==1.6.0
|
||||
- yesod-alerts ==0.1.2.0
|
||||
- yesod-auth ==1.6.6
|
||||
- yesod-auth-hashdb ==1.7.1
|
||||
- yesod-auth-hashdb ==1.7.1.1
|
||||
- yesod-auth-oauth2 ==0.6.1.1
|
||||
- yesod-bin ==1.6.0.3
|
||||
- yesod-core ==1.6.14
|
||||
@ -2322,8 +2323,8 @@ default-package-overrides:
|
||||
- yesod-gitrev ==0.2.1
|
||||
- yesod-markdown ==0.12.6.1
|
||||
- yesod-newsfeed ==1.6.1.0
|
||||
- yesod-paginator ==1.1.0.1
|
||||
- yesod-persistent ==1.6.0.1
|
||||
- yesod-paginator ==1.1.0.2
|
||||
- yesod-persistent ==1.6.0.2
|
||||
- yesod-recaptcha2 ==0.3.0
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.0.1
|
||||
@ -2341,7 +2342,7 @@ default-package-overrides:
|
||||
- zeromq4-patterns ==0.3.1.0
|
||||
- zim-parser ==0.2.1.0
|
||||
- zip ==1.2.0
|
||||
- zip-archive ==0.4
|
||||
- zip-archive ==0.4.1
|
||||
- zippers ==0.2.5
|
||||
- zip-stream ==0.2.0.1
|
||||
- zlib ==0.6.2
|
||||
@ -2391,13 +2392,15 @@ extra-packages:
|
||||
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
|
||||
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
|
||||
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
|
||||
- network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30)
|
||||
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
|
||||
- patience ^>= 0.1 # required by chell-0.4.x
|
||||
- persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- primitive == 0.5.1.* # required to build alex with GHC 6.12.3
|
||||
- proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- QuickCheck < 2 # required by test-framework-quickcheck and its users
|
||||
- resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
|
||||
@ -2413,7 +2416,6 @@ extra-packages:
|
||||
- yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- patience ^>= 0.1 # required by chell-0.4.x
|
||||
|
||||
package-maintainers:
|
||||
peti:
|
||||
@ -2599,7 +2601,7 @@ dont-distribute-packages:
|
||||
- XML
|
||||
|
||||
broken-packages:
|
||||
# these packages don't compile
|
||||
# These packages don't compile or depend on packages that don't compile.
|
||||
- 3dmodels
|
||||
- 4Blocks
|
||||
- a50
|
||||
@ -3173,6 +3175,7 @@ broken-packages:
|
||||
- blockhash
|
||||
- Blogdown
|
||||
- blogination
|
||||
- BlogLiterately-diagrams
|
||||
- bloodhound
|
||||
- bloodhound-amazonka-auth
|
||||
- bloomfilter-redis
|
||||
@ -3228,6 +3231,9 @@ broken-packages:
|
||||
- brok
|
||||
- broker-haskell
|
||||
- bronyradiogermany-streaming
|
||||
- brotli
|
||||
- brotli-conduit
|
||||
- brotli-streams
|
||||
- browscap
|
||||
- bson-generic
|
||||
- bson-generics
|
||||
@ -3278,6 +3284,7 @@ broken-packages:
|
||||
- c2hsc
|
||||
- cabal-audit
|
||||
- cabal-bundle-clib
|
||||
- cabal-cache
|
||||
- cabal-cargs
|
||||
- cabal-constraints
|
||||
- cabal-db
|
||||
@ -4020,9 +4027,11 @@ broken-packages:
|
||||
- dia-base
|
||||
- dia-functions
|
||||
- diagrams-boolean
|
||||
- diagrams-builder
|
||||
- diagrams-canvas
|
||||
- diagrams-graphviz
|
||||
- diagrams-gtk
|
||||
- diagrams-haddock
|
||||
- diagrams-hsqml
|
||||
- diagrams-html5
|
||||
- diagrams-pandoc
|
||||
@ -4600,6 +4609,7 @@ broken-packages:
|
||||
- frag
|
||||
- Frames-beam
|
||||
- Frames-dsv
|
||||
- Frames-map-reduce
|
||||
- franchise
|
||||
- Frank
|
||||
- freddy
|
||||
@ -4731,6 +4741,7 @@ broken-packages:
|
||||
- generic-tree
|
||||
- generic-xml
|
||||
- generic-xmlpickler
|
||||
- generics-eot
|
||||
- genericserialize
|
||||
- genesis
|
||||
- genesis-test
|
||||
@ -5232,6 +5243,7 @@ broken-packages:
|
||||
- haskell-src-exts-prisms
|
||||
- haskell-src-exts-qq
|
||||
- haskell-src-exts-sc
|
||||
- haskell-src-exts-simple
|
||||
- haskell-src-meta-mwotton
|
||||
- haskell-stack-trace-plugin
|
||||
- haskell-token-utils
|
||||
@ -5567,6 +5579,7 @@ broken-packages:
|
||||
- HLearn-datastructures
|
||||
- HLearn-distributions
|
||||
- hledger-chart
|
||||
- hledger-flow
|
||||
- hledger-irr
|
||||
- hledger-vty
|
||||
- hlibBladeRF
|
||||
@ -5717,6 +5730,7 @@ broken-packages:
|
||||
- HROOT-math
|
||||
- HROOT-tree
|
||||
- hs-blake2
|
||||
- hs-brotli
|
||||
- hs-carbon-examples
|
||||
- hs-cdb
|
||||
- hs-conllu
|
||||
@ -6056,6 +6070,7 @@ broken-packages:
|
||||
- ihaskell-diagrams
|
||||
- ihaskell-display
|
||||
- ihaskell-gnuplot
|
||||
- ihaskell-graphviz
|
||||
- ihaskell-hatex
|
||||
- ihaskell-hvega
|
||||
- ihaskell-inline-r
|
||||
@ -6361,6 +6376,7 @@ broken-packages:
|
||||
- kmp-dfa
|
||||
- knead
|
||||
- knead-arithmetic
|
||||
- knit-haskell
|
||||
- knots
|
||||
- koellner-phonetic
|
||||
- korfu
|
||||
@ -6527,6 +6543,7 @@ broken-packages:
|
||||
- libconfig
|
||||
- libcspm
|
||||
- libexpect
|
||||
- libffi-dynamic
|
||||
- libGenI
|
||||
- libhbb
|
||||
- libinfluxdb
|
||||
@ -6767,6 +6784,7 @@ broken-packages:
|
||||
- manifolds
|
||||
- manifolds-core
|
||||
- map-exts
|
||||
- map-reduce-folds
|
||||
- map-syntax
|
||||
- Mapping
|
||||
- mappy
|
||||
@ -7174,7 +7192,6 @@ broken-packages:
|
||||
- netwire-vinylglfw-examples
|
||||
- network-address
|
||||
- network-anonymous-i2p
|
||||
- network-bsd
|
||||
- network-builder
|
||||
- network-bytestring
|
||||
- network-connection
|
||||
@ -7584,6 +7601,7 @@ broken-packages:
|
||||
- pipes-async
|
||||
- pipes-attoparsec-streaming
|
||||
- pipes-bgzf
|
||||
- pipes-brotli
|
||||
- pipes-cacophony
|
||||
- pipes-cereal
|
||||
- pipes-cereal-plus
|
||||
@ -7661,6 +7679,7 @@ broken-packages:
|
||||
- polh-lexicon
|
||||
- polimorf
|
||||
- Pollutocracy
|
||||
- poly
|
||||
- poly-control
|
||||
- polydata
|
||||
- polydata-core
|
||||
@ -7797,6 +7816,7 @@ broken-packages:
|
||||
- proteome
|
||||
- proto-lens-combinators
|
||||
- proto-lens-descriptors
|
||||
- proto3-suite
|
||||
- protobuf-native
|
||||
- protocol-buffers-descriptor-fork
|
||||
- protocol-buffers-fork
|
||||
@ -7833,6 +7853,7 @@ broken-packages:
|
||||
- purescript-iso
|
||||
- purescript-tsd-gen
|
||||
- push-notify
|
||||
- push-notify-apn
|
||||
- push-notify-ccs
|
||||
- push-notify-general
|
||||
- pusher-haskell
|
||||
@ -8295,6 +8316,7 @@ broken-packages:
|
||||
- scenegraph
|
||||
- schedevr
|
||||
- schedule-planner
|
||||
- scheduler
|
||||
- schedyield
|
||||
- schematic
|
||||
- scholdoc
|
||||
@ -8865,10 +8887,12 @@ broken-packages:
|
||||
- streamdeck
|
||||
- streamed
|
||||
- streaming-benchmarks
|
||||
- streaming-brotli
|
||||
- streaming-cassava
|
||||
- streaming-concurrency
|
||||
- streaming-conduit
|
||||
- streaming-fft
|
||||
- streaming-lzma
|
||||
- streaming-osm
|
||||
- streaming-pcap
|
||||
- streaming-png
|
||||
@ -9029,6 +9053,7 @@ broken-packages:
|
||||
- tasty-jenkins-xml
|
||||
- tasty-laws
|
||||
- tasty-lens
|
||||
- tasty-quickcheck-laws
|
||||
- tasty-stats
|
||||
- tasty-tap
|
||||
- tasty-travis
|
||||
@ -9209,6 +9234,7 @@ broken-packages:
|
||||
- tkhs
|
||||
- tkyprof
|
||||
- tls-extra
|
||||
- tmp-postgres
|
||||
- tn
|
||||
- to-haskell
|
||||
- to-string-class
|
||||
@ -9417,6 +9443,7 @@ broken-packages:
|
||||
- unity-testresult-parser
|
||||
- unitym-yesod
|
||||
- universe
|
||||
- universe-dependent-sum
|
||||
- universe-instances-extended
|
||||
- universe-th
|
||||
- universum
|
||||
@ -9528,6 +9555,7 @@ broken-packages:
|
||||
- vector-bytestring
|
||||
- vector-clock
|
||||
- vector-conduit
|
||||
- vector-endian
|
||||
- vector-extras
|
||||
- vector-functorlazy
|
||||
- vector-heterogenous
|
||||
|
||||
1803
pkgs/development/haskell-modules/hackage-packages.nix
generated
1803
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dav1d";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "130yjr82w0az4xsdcmcjdwkhd0sin5pm6q6s9dyn5yhrwfx1vf0p";
|
||||
sha256 = "08vysa3naqjfvld9w1k6l6hby4xfn4l2gvnfnan498g5nss4050h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja nasm ];
|
||||
|
||||
@ -320,6 +320,26 @@ lua-iconv = buildLuarocksPackage {
|
||||
};
|
||||
};
|
||||
};
|
||||
lua-messagepack = buildLuarocksPackage {
|
||||
pname = "lua-messagepack";
|
||||
version = "0.5.1-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock;
|
||||
sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g";
|
||||
};
|
||||
disabled = ( luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
buildType = "builtin";
|
||||
|
||||
meta = {
|
||||
homepage = "http://fperrad.frama.io/lua-MessagePack/";
|
||||
description="a pure Lua implementation of the MessagePack serialization format";
|
||||
license = {
|
||||
fullName = "MIT/X11";
|
||||
};
|
||||
};
|
||||
};
|
||||
lua-term = buildLuarocksPackage {
|
||||
pname = "lua-term";
|
||||
version = "0.7-1";
|
||||
@ -346,6 +366,26 @@ lua-term = buildLuarocksPackage {
|
||||
};
|
||||
};
|
||||
};
|
||||
lua-toml = buildLuarocksPackage {
|
||||
pname = "lua-toml";
|
||||
version = "2.0-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://luarocks.org/lua-toml-2.0-1.src.rock;
|
||||
sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m";
|
||||
};
|
||||
disabled = ( luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
buildType = "builtin";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jonstoler/lua-toml";
|
||||
description="toml decoder/encoder for Lua";
|
||||
license = {
|
||||
fullName = "MIT";
|
||||
};
|
||||
};
|
||||
};
|
||||
luabitop = buildLuarocksPackage {
|
||||
pname = "luabitop";
|
||||
version = "1.0.2-3";
|
||||
@ -482,6 +522,26 @@ penlight = buildLuarocksPackage {
|
||||
};
|
||||
};
|
||||
};
|
||||
rapidjson = buildLuarocksPackage {
|
||||
pname = "rapidjson";
|
||||
version = "0.5.1-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://luarocks.org/rapidjson-0.5.1-1.src.rock;
|
||||
sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay";
|
||||
};
|
||||
disabled = ( luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
buildType = "cmake";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/xpol/lua-rapidjson";
|
||||
description="Json module based on the very fast RapidJSON.";
|
||||
license = {
|
||||
fullName = "MIT";
|
||||
};
|
||||
};
|
||||
};
|
||||
say = buildLuarocksPackage {
|
||||
pname = "say";
|
||||
version = "1.3-1";
|
||||
|
||||
@ -68,4 +68,11 @@ with super;
|
||||
platforms = pkgs.lib.platforms.linux;
|
||||
};
|
||||
});
|
||||
|
||||
rapidjson = super.rapidjson.overrideAttrs(oa: {
|
||||
preBuild = ''
|
||||
sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
|
||||
sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
||||
21
pkgs/development/python-modules/caldav/default.nix
Normal file
21
pkgs/development/python-modules/caldav/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, tzlocal, requests, vobject, lxml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "caldav";
|
||||
version = "0.6.0";
|
||||
|
||||
propagatedBuildInputs = [ tzlocal requests vobject lxml ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ll9knpc50yxx858hrvfnapdi2a6g1pz9cnjhwffry2x7r4ckarz";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "This project is a CalDAV (RFC4791) client library for Python.";
|
||||
homepage = "https://pythonhosted.org/caldav/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marenz ];
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cli_helpers";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7c2038bba0c41f41acae0f6e660ff3b00d69f55d9d968f024952cace78111e12";
|
||||
sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi, django }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-picklefield";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
meta = {
|
||||
description = "A pickled object field for Django";
|
||||
homepage = https://github.com/gintas/django-picklefield;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,32 +2,32 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
ast (2.4.0)
|
||||
eventmachine (1.2.7)
|
||||
backport (1.0.0)
|
||||
htmlentities (4.3.4)
|
||||
jaro_winkler (1.5.1)
|
||||
jaro_winkler (1.5.2)
|
||||
kramdown (1.17.0)
|
||||
mini_portile2 (2.3.0)
|
||||
nokogiri (1.8.5)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
parallel (1.12.1)
|
||||
parser (2.5.3.0)
|
||||
mini_portile2 (2.4.0)
|
||||
nokogiri (1.10.3)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
parallel (1.17.0)
|
||||
parser (2.6.3.0)
|
||||
ast (~> 2.4.0)
|
||||
powerpack (0.1.2)
|
||||
rainbow (3.0.0)
|
||||
reverse_markdown (1.1.0)
|
||||
nokogiri
|
||||
rubocop (0.60.0)
|
||||
rubocop (0.68.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.5, != 2.5.1.1)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.4.0)
|
||||
unicode-display_width (>= 1.4.0, < 1.6)
|
||||
ruby-progressbar (1.10.0)
|
||||
solargraph (0.29.1)
|
||||
eventmachine (~> 1.2, >= 1.2.5)
|
||||
solargraph (0.32.1)
|
||||
backport (~> 1.0)
|
||||
bundler (>= 1.17.2)
|
||||
htmlentities (~> 4.3, >= 4.3.4)
|
||||
jaro_winkler (~> 1.5)
|
||||
kramdown (~> 1.16)
|
||||
parser (~> 2.3)
|
||||
reverse_markdown (~> 1.0, >= 1.0.5)
|
||||
@ -37,8 +37,8 @@ GEM
|
||||
yard (~> 0.9)
|
||||
thor (0.20.3)
|
||||
tilt (2.0.9)
|
||||
unicode-display_width (1.4.0)
|
||||
yard (0.9.16)
|
||||
unicode-display_width (1.5.0)
|
||||
yard (0.9.19)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -47,4 +47,4 @@ DEPENDENCIES
|
||||
solargraph!
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.1
|
||||
1.17.2
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{
|
||||
ast = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
|
||||
@ -7,15 +9,19 @@
|
||||
};
|
||||
version = "2.4.0";
|
||||
};
|
||||
eventmachine = {
|
||||
backport = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
|
||||
sha256 = "00kwxnj4jwjkf5ji473qsz0nq4kjsx6p6hzlm8iwbbylv22hf2xy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "1.0.0";
|
||||
};
|
||||
htmlentities = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
|
||||
@ -24,14 +30,18 @@
|
||||
version = "4.3.4";
|
||||
};
|
||||
jaro_winkler = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
|
||||
sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
};
|
||||
kramdown = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
|
||||
@ -40,48 +50,50 @@
|
||||
version = "1.17.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
|
||||
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.5";
|
||||
version = "1.10.3";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
|
||||
sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.1";
|
||||
version = "1.17.0";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
|
||||
sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.3.0";
|
||||
};
|
||||
powerpack = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
version = "2.6.3.0";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
|
||||
@ -91,6 +103,8 @@
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg";
|
||||
@ -99,15 +113,19 @@
|
||||
version = "1.1.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ivk049z3mp12nc6v1wn35bsq1g7nz1i2r4xwzqf0v25hm2v7n1i";
|
||||
sha256 = "171bczfafdmyz1lj6mgz2wdzz8i42w10zw2wj5j13y2f6hp687ca";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.60.0";
|
||||
version = "0.68.0";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
|
||||
@ -116,15 +134,19 @@
|
||||
version = "1.10.0";
|
||||
};
|
||||
solargraph = {
|
||||
dependencies = ["eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
|
||||
dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12sy1rdz2fk3aba43701qp1250xm8w26rlizypd6h5rnmmqm5q54";
|
||||
sha256 = "1bsv0x9hhxwki7v8x99wzxcl1spgwrsxqd6alpb2y0wf9lsakabl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.29.1";
|
||||
version = "0.32.1";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
|
||||
@ -133,6 +155,8 @@
|
||||
version = "0.20.3";
|
||||
};
|
||||
tilt = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
|
||||
@ -141,19 +165,23 @@
|
||||
version = "2.0.9";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
|
||||
sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
yard = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67";
|
||||
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.16";
|
||||
version = "0.9.19";
|
||||
};
|
||||
}
|
||||
@ -3,12 +3,12 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "autoflake";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807";
|
||||
sha256 = "0wzrvrn6279fijg8jkqbs6313f7b5ll5d22pk5s0fc1fp2wyanbb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyflakes ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazelisk";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philwo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72";
|
||||
sha256 = "1hi4jmkqy1fjn91q72qlfvm63plz5jqb4hw4c1qv9ddqjgwrmxr3";
|
||||
};
|
||||
|
||||
modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
|
||||
|
||||
@ -8,8 +8,8 @@ in
|
||||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "1.3.0";
|
||||
sha256 = "1g0k2hl3wb1rnjxvp7a1j6m200z92878ifb17h2ll69rlpmwcfqr";
|
||||
version = "2.0.7";
|
||||
sha256 = "049m57s8hcaa3q812331vgpaibkidf3x221hyxpglfk3sarxvqwv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.1-rc6";
|
||||
modDirVersion = "5.1.0-rc6";
|
||||
version = "5.1-rc7";
|
||||
modDirVersion = "5.1.0-rc7";
|
||||
extraMeta.branch = "5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
sha256 = "0s751wb4xdcnljid03a3gi9pkql7fcvixh32aiclbmfz6gyvbykv";
|
||||
sha256 = "05085j84kn3mf5s2hy8i9jgvnglpr9v918kmc9lmpn5vq7frh9s1";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "1.15.12";
|
||||
sha256 = "1giavdph0jqhywdkj4650s5qhz6qfd6nrv74k9q005yy2ym90nrx";
|
||||
version = "1.16.0";
|
||||
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
|
||||
})
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "1.14.2";
|
||||
sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80";
|
||||
version = "1.16.0";
|
||||
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
|
||||
})
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
|
||||
|
||||
buildGoPackage rec {
|
||||
version = "6.1.4";
|
||||
version = "6.1.6";
|
||||
name = "grafana-${version}";
|
||||
goPackagePath = "github.com/grafana/grafana";
|
||||
|
||||
@ -11,12 +11,12 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "0a0k66vbsi2704pb5vr8mjr7n3v5dapnfhqxkrw6biicj8ahka30";
|
||||
sha256 = "12fj3j1w37nm8p2h4af38wbxkvm0pzf1zsjx8wpj0zrxanbigpjg";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "1wamnvv2jiyi6cyw9p65j2hm3si345asfwl7kjg7drx0vn08ks6g";
|
||||
sha256 = "1dg2gjmym06x8wj2xmygsww622k86cq07kbxvp8j8h17br4imj4k";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-04-26";
|
||||
version = "2019-04-29";
|
||||
name = "oh-my-zsh-${version}";
|
||||
rev = "f5b2d9c7ce8ced5a4ec67a4ecfa877e6951124ef";
|
||||
rev = "d16adb6a9f9b0ea46121f48751a012f0511b465b";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "17d837kyw16g91cnmdpdvhl2sgi3cb7fzligwwzjyp0y7kbiy3n4";
|
||||
sha256 = "0sps2jcsh8x91xzm1zixmi4fij0agzg8m4scyf8sgb6mn41y92rx";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abcMIDI-${version}";
|
||||
version = "2019.03.30";
|
||||
version = "2019.04.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
|
||||
sha256 = "05a2n3l6l4ds9vi05hldw7fc6hx9avdh8jbiakazzmyvcsysr12x";
|
||||
sha256 = "18w6sny8hc9yswqxqw5rvv5j07a50q8aaih73d74asm3nwf71rl1";
|
||||
};
|
||||
|
||||
# There is also a file called "makefile" which seems to be preferred by the standard build phase
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atftp-${version}";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/atftp/${name}.tar.gz";
|
||||
sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
|
||||
sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s";
|
||||
};
|
||||
|
||||
buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
|
||||
|
||||
@ -34,10 +34,7 @@ stdenv.mkDerivation rec {
|
||||
++ optionals enableTNC [ trousers sqlite libxml2 ]
|
||||
++ optionals stdenv.isLinux [ systemd.dev pam iptables ]
|
||||
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ])
|
||||
++ optionals enableNetworkManager [ networkmanager ]
|
||||
# ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787
|
||||
# Remove when the above PR lands in master
|
||||
++ [ libpcap ];
|
||||
++ optionals enableNetworkManager [ networkmanager ];
|
||||
|
||||
patches = [
|
||||
./ext_auth-path.patch
|
||||
@ -56,10 +53,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray+=("--with-systemdsystemunitdir=$out/etc/systemd/system")
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-swanctl"
|
||||
"--enable-cmd"
|
||||
@ -74,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-curl" ]
|
||||
++ optionals stdenv.isLinux [
|
||||
"--enable-farp" "--enable-dhcp"
|
||||
"--enable-systemd"
|
||||
"--enable-systemd" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"--enable-xauth-pam"
|
||||
"--enable-forecast"
|
||||
"--enable-connmark"
|
||||
|
||||
4
pkgs/tools/text/peco/deps.nix
generated
4
pkgs/tools/text/peco/deps.nix
generated
@ -41,8 +41,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8";
|
||||
sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
|
||||
rev = "e2050e41c8847748ec5288741c0b19a8cb26d084";
|
||||
sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -7317,7 +7317,7 @@ in
|
||||
|
||||
haskell = callPackage ./haskell-packages.nix { };
|
||||
|
||||
haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc864.override {
|
||||
haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc865.override {
|
||||
overrides = haskell.packageOverrides;
|
||||
});
|
||||
|
||||
@ -7672,6 +7672,8 @@ in
|
||||
|
||||
llvmPackages_latest = llvmPackages_8;
|
||||
|
||||
lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being.";
|
||||
|
||||
manticore = callPackage ../development/compilers/manticore { };
|
||||
|
||||
mercury = callPackage ../development/compilers/mercury { };
|
||||
|
||||
@ -71,6 +71,12 @@ in {
|
||||
buildLlvmPackages = buildPackages.llvmPackages_6;
|
||||
llvmPackages = pkgs.llvmPackages_6;
|
||||
};
|
||||
ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix {
|
||||
bootPkgs = packages.ghc863Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_7;
|
||||
llvmPackages = pkgs.llvmPackages_7;
|
||||
};
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
|
||||
bootPkgs = packages.ghc863Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
@ -140,6 +146,11 @@ in {
|
||||
ghc = bh.compiler.ghc865;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
|
||||
};
|
||||
ghc881 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc881;
|
||||
ghc = bh.compiler.ghc881;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
|
||||
};
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||
ghc = bh.compiler.ghcHEAD;
|
||||
|
||||
@ -1156,6 +1156,8 @@ in {
|
||||
|
||||
bitstruct = callPackage ../development/python-modules/bitstruct { };
|
||||
|
||||
caldav = callPackage ../development/python-modules/caldav { };
|
||||
|
||||
caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { };
|
||||
|
||||
biopython = callPackage ../development/python-modules/biopython { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user