Merge branch 'master' into staging
Haskell updates. Hydra: ?compare=1416248
This commit is contained in:
Vladimír Čunát
commit
9ab5848335
|
|
@ -80,6 +80,7 @@
|
|||
benley = "Benjamin Staffin <benley@gmail.com>";
|
||||
bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
|
||||
benwbooth = "Ben Booth <benwbooth@gmail.com>";
|
||||
berce = "Bert Moens <bert.moens@gmail.com>";
|
||||
berdario = "Dario Bertini <berdario@gmail.com>";
|
||||
bergey = "Daniel Bergey <bergey@teallabs.org>";
|
||||
bhipple = "Benjamin Hipple <bhipple@protonmail.com>";
|
||||
|
|
|
|||
|
|
@ -32,6 +32,12 @@ in
|
|||
description = "Content of the configuration file";
|
||||
};
|
||||
|
||||
mathjax = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable support for math rendering using MathJax";
|
||||
};
|
||||
|
||||
branch = mkOption {
|
||||
type = types.str;
|
||||
default = "master";
|
||||
|
|
@ -84,6 +90,7 @@ in
|
|||
--host ${cfg.address} \
|
||||
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
|
||||
--ref ${cfg.branch} \
|
||||
${optionalString cfg.mathjax "--mathjax"} \
|
||||
${cfg.stateDir}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
{stdenv, fetchpatch, fetchFromGitHub, python3Packages}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
name = "ddgr-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "ddgr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
(python3Packages.python.withPackages (ps: with ps; [
|
||||
requests
|
||||
]))
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc";
|
||||
name = "Fix-zsh-completion.patch";
|
||||
url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/bash-completion/completions/"
|
||||
cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"
|
||||
mkdir -p "$out/share/fish/vendor_completions.d/"
|
||||
cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/"
|
||||
mkdir -p "$out/share/zsh/site-functions/"
|
||||
cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/jarun/ddgr;
|
||||
description = "Search DuckDuckGo from the terminal";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ markus1189 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
name = "kitty-${version}";
|
||||
format = "other";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonApplication rec {
|
|||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w202rsgswagb3kiqbwg4xixcglip2hhz6wj1qx9x2whi4zl1l68";
|
||||
sha256 = "0zs5b1sxi2f1lgpjs1qvd15gz6m1wfpyqskyyr0vmm4ch3rgp5zz";
|
||||
};
|
||||
|
||||
buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ];
|
||||
|
|
|
|||
|
|
@ -29,9 +29,11 @@
|
|||
# Set to `privacySupport` or `false`.
|
||||
|
||||
, webrtcSupport ? !privacySupport
|
||||
, googleAPISupport ? !privacySupport
|
||||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, crashreporterSupport ? false
|
||||
|
||||
, safeBrowsingSupport ? false
|
||||
, drmSupport ? false
|
||||
|
||||
## other
|
||||
|
|
@ -141,7 +143,7 @@ stdenv.mkDerivation (rec {
|
|||
]
|
||||
|
||||
# and wants these
|
||||
++ lib.optionals isTorBrowserLike [
|
||||
++ lib.optionals isTorBrowserLike ([
|
||||
"--with-tor-browser-version=${version}"
|
||||
"--enable-signmar"
|
||||
"--enable-verify-mar"
|
||||
|
|
@ -151,7 +153,9 @@ stdenv.mkDerivation (rec {
|
|||
# possibilities on other platforms.
|
||||
# Lets save some space instead.
|
||||
"--with-system-nspr"
|
||||
]
|
||||
] ++ flag geolocationSupport "mozril-geoloc"
|
||||
++ flag safeBrowsingSupport "safe-browsing"
|
||||
)
|
||||
|
||||
++ flag alsaSupport "alsa"
|
||||
++ flag pulseaudioSupport "pulseaudio"
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ in rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "SLNOS";
|
||||
repo = "tor-browser";
|
||||
# branch "tor-browser-45.8.0esr-6.5-2"
|
||||
# branch "tor-browser-45.8.0esr-6.5-2-slnos"
|
||||
rev = "e4140ea01b9906934f0347e95f860cec207ea824";
|
||||
sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
|
||||
};
|
||||
|
|
@ -128,8 +128,9 @@ in rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "SLNOS";
|
||||
repo = "tor-browser";
|
||||
rev = "tor-browser-52.3.0esr-7.0-1-slnos";
|
||||
sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
|
||||
# branch "tor-browser-52.5.0esr-7.0-1-slnos";
|
||||
rev = "830ff8d622ef20345d83f386174f790b0fc2440d";
|
||||
sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ buildFHSUserEnv {
|
|||
do_install=1
|
||||
else
|
||||
installed_version=$(cat "$HOME/.dropbox-dist/VERSION")
|
||||
latest_version=$(printf "${version}\n$installed_version\n" | sort -V | head -n 1)
|
||||
latest_version=$(printf "${version}\n$installed_version\n" | sort -rV | head -n 1)
|
||||
if [ "x$installed_version" != "x$latest_version" ]; then
|
||||
do_install=1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
let
|
||||
pname = "konversation";
|
||||
version = "1.7.2";
|
||||
version = "1.7.4";
|
||||
in mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz";
|
||||
sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freerdp-git-${version}";
|
||||
version = "20170724";
|
||||
name = "freerdp-${version}";
|
||||
version = "2.0.0-rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = "2.0.0-rc0";
|
||||
sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1";
|
||||
rev = version;
|
||||
sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn";
|
||||
};
|
||||
|
||||
# outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
|||
cmake pkgconfig
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.40";
|
||||
version = "0.14.41";
|
||||
name = "syncthing-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
|
||||
sha256 = "1hcy4rxdyvwrpm480j5a4injkkdaqkixmbdy9blkq5i2fwv377yn";
|
||||
};
|
||||
|
||||
buildInputs = [ go removeReferencesTo ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
|
||||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
|
||||
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
|
||||
, withHelp ? true
|
||||
|
|
@ -166,10 +166,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
for a in sbase scalc sdraw smath swriter simpress soffice; do
|
||||
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
|
||||
wrapProgram "$out/bin/$a" \
|
||||
--prefix XDG_DATA_DIRS : \
|
||||
"$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
;
|
||||
done
|
||||
|
||||
ln -s $out/bin/soffice $out/bin/libreoffice
|
||||
|
|
@ -252,16 +248,17 @@ in stdenv.mkDerivation rec {
|
|||
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
|
||||
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
|
||||
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
|
||||
gst_all_1.gst-plugins-base glib
|
||||
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
|
||||
python3 sablotron sane-backends unzip vigra which zip zlib
|
||||
mdds bluez5 glibc libcmis libwps libabw libzmf libtool
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme
|
||||
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme
|
||||
gdb
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
|
||||
, libatomic_ops, graphite2, harfbuzz, libodfgen
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, defaultIconTheme, glib, ncurses
|
||||
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
|
||||
, withHelp ? true
|
||||
|
|
@ -162,10 +162,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
for a in sbase scalc sdraw smath swriter simpress soffice; do
|
||||
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
|
||||
wrapProgram "$out/bin/$a" \
|
||||
--prefix XDG_DATA_DIRS : \
|
||||
"$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
;
|
||||
done
|
||||
|
||||
ln -s $out/bin/soffice $out/bin/libreoffice
|
||||
|
|
@ -247,15 +243,16 @@ in stdenv.mkDerivation rec {
|
|||
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
|
||||
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
|
||||
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
|
||||
gst_all_1.gst-plugins-base glib
|
||||
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
|
||||
python3 sablotron sane-backends unzip vigra which zip zlib
|
||||
mdds bluez5 glibc libcmis libwps libabw libzmf
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz
|
||||
librevenge libe-book libmwaw glm glew ncurses
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
|
|
|
|||
|
|
@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
|
|||
name = "qemu-CVE-2017-15118.patch";
|
||||
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=51ae4f8455c9e32c54770c4ebc25bf86a8128183";
|
||||
sha256 = "0f9i096dz3h1i8g92y99vak23rjs1shf7prlcxqizsz0fah7wx7h"; })
|
||||
(fetchpatch {
|
||||
name = "qemu-CVE-2017-17381.patch";
|
||||
url = "https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git/patch/?id=758ead31c7e17bf17a9ef2e0ca1c3e86ab296b43";
|
||||
sha256 = "17yw4bqsbywdrbmrikr94yjnfsg853bf4i3k4y3k169387da2yc5"; })
|
||||
];
|
||||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ with stdenv.lib;
|
|||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "virt-manager-${version}";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
|
||||
sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23";
|
||||
sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook intltool file ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
|
||||
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
|
||||
, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc
|
||||
, telepathy_glib, intltool, dbus_libs, icu, glib_networking
|
||||
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
|
||||
, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -9,12 +9,26 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-media-server"
|
||||
"--enable-kerberos"
|
||||
"--enable-lastfm"
|
||||
"--enable-todoist"
|
||||
"--enable-gtk-doc"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
|
||||
libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala
|
||||
docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig vala gnome_common intltool wrapGAppsHook
|
||||
libxslt docbook_xsl_ns docbook_xsl gtk_doc
|
||||
];
|
||||
buildInputs = [
|
||||
glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup
|
||||
gcr kerberos
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{fetchurl, stdenv}:
|
||||
{ fetchurl, stdenv, gnome3 }:
|
||||
stdenv.mkDerivation {
|
||||
name = "unicode-data-10.0.0";
|
||||
srcs = [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gambit-${version}";
|
||||
version = "4.8.8-300db59";
|
||||
version = "4.8.8-415-g29ed48bb";
|
||||
bootstrap = import ./bootstrap.nix ( pkgs );
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/feeley/gambit.git";
|
||||
rev = "300db59e1d3b66bcd597f617849df0274d2a4472";
|
||||
sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp";
|
||||
rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec";
|
||||
sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl git autoconf bootstrap ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "gerbil-${version}";
|
||||
|
||||
version = "0.12-DEV-777-gd855915";
|
||||
version = "0.12-DEV-836-gcde6802";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vyzo/gerbil.git";
|
||||
rev = "9db6187dc996eec4087f83b86339e7b17bb69bad";
|
||||
sha256 = "1hqmsy77d62dvil3az4vdr0rmwvxhinjl1dbcxzamz2c2kcjv1jg";
|
||||
rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5";
|
||||
sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
|
|||
export GERBIL_HOME=$out
|
||||
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
|
||||
if [[ \$# = 0 ]] ; then
|
||||
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
|
||||
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
|
||||
else
|
||||
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
|
||||
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
|
||||
fi
|
||||
EOF
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, sha256_i686
|
||||
, sha256_x86_64
|
||||
, sha256_armv7l
|
||||
, sha256_aarch64
|
||||
, jceName
|
||||
, jceDownloadUrl
|
||||
, sha256JCE
|
||||
|
|
@ -38,11 +39,12 @@
|
|||
|
||||
assert stdenv.system == "i686-linux"
|
||||
|| stdenv.system == "x86_64-linux"
|
||||
|| stdenv.system == "armv7l-linux";
|
||||
|| stdenv.system == "armv7l-linux"
|
||||
|| stdenv.system == "aarch64-linux";
|
||||
assert swingSupport -> xorg != null;
|
||||
|
||||
let
|
||||
abortArch = abort "jdk requires i686-linux, x86_64-linux, or armv7l-linux";
|
||||
abortArch = abort "jdk requires i686-linux, x86_64-linux, aarch64-linux or armv7l-linux";
|
||||
|
||||
/**
|
||||
* The JRE libraries are in directories that depend on the CPU.
|
||||
|
|
@ -54,6 +56,8 @@ let
|
|||
"amd64"
|
||||
else if stdenv.system == "armv7l-linux" then
|
||||
"arm"
|
||||
else if stdenv.system == "aarch64-linux" then
|
||||
"aarch64"
|
||||
else
|
||||
abortArch;
|
||||
|
||||
|
|
@ -99,6 +103,12 @@ let result = stdenv.mkDerivation rec {
|
|||
url = downloadUrl;
|
||||
sha256 = sha256_armv7l;
|
||||
}
|
||||
else if stdenv.system == "aarch64-linux" then
|
||||
requireFile {
|
||||
name = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz";
|
||||
url = downloadUrl;
|
||||
sha256 = sha256_aarch64;
|
||||
}
|
||||
else
|
||||
abortArch;
|
||||
|
||||
|
|
@ -116,7 +126,7 @@ let result = stdenv.mkDerivation rec {
|
|||
# Set PaX markings
|
||||
exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||
for file in $exes; do
|
||||
paxmark m "$file"
|
||||
paxmark m "$file" || true
|
||||
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
|
||||
${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
|
||||
done
|
||||
|
|
@ -212,7 +222,7 @@ let result = stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms
|
||||
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
|
||||
};
|
||||
|
||||
}; in result
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import ./jdk-linux-base.nix {
|
|||
sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0";
|
||||
sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7";
|
||||
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
|
||||
sha256_aarch64 = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import ./jdk-linux-base.nix {
|
|||
sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w";
|
||||
sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1";
|
||||
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
|
||||
sha256_aarch64 = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ self: super: {
|
|||
|
||||
# cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
|
||||
# Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; });
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
|
||||
hackage-security = dontCheck super.hackage-security;
|
||||
|
||||
# Link statically to avoid runtime dependency on GHC.
|
||||
|
|
@ -730,14 +730,9 @@ self: super: {
|
|||
'';
|
||||
});
|
||||
|
||||
# test suite cannot find its own "idris" binary
|
||||
# The standard libraries are compiled separately
|
||||
idris = doJailbreak (dontCheck super.idris);
|
||||
|
||||
idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: {
|
||||
# The standard libraries are compiled separately
|
||||
configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ];
|
||||
});
|
||||
|
||||
# https://github.com/bos/math-functions/issues/25
|
||||
math-functions = dontCheck super.math-functions;
|
||||
|
||||
|
|
|
|||
|
|
@ -111,4 +111,7 @@ self: super: {
|
|||
network_2_6_3_1 = dontCheck super.network_2_6_3_1;
|
||||
network = self.network_2_6_3_1;
|
||||
|
||||
# Haddock fails with an internal error.
|
||||
utf8-string = dontHaddock super.utf8-string;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,6 @@ self: super: {
|
|||
apply-refact = super.apply-refact_0_3_0_1;
|
||||
|
||||
# This builds needs the latest Cabal version.
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_0; });
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ core-packages:
|
|||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 9.14
|
||||
# LTS Haskell 9.16
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
|
|
@ -317,7 +317,7 @@ default-package-overrides:
|
|||
- byteset ==0.1.1.0
|
||||
- bytestring-builder ==0.10.8.1.0
|
||||
- bytestring-conversion ==0.3.1
|
||||
- bytestring-handle ==0.1.0.5
|
||||
- bytestring-handle ==0.1.0.6
|
||||
- bytestring-lexing ==0.5.0.2
|
||||
- bytestring-progress ==1.0.7
|
||||
- bytestring-strict-builder ==0.4.5
|
||||
|
|
@ -333,7 +333,7 @@ default-package-overrides:
|
|||
- cabal-rpm ==0.11.2
|
||||
- cache ==0.1.0.0
|
||||
- cacophony ==0.10.0
|
||||
- cairo ==0.13.4.1
|
||||
- cairo ==0.13.4.2
|
||||
- calendar-recycling ==0.0
|
||||
- call-stack ==0.1.0
|
||||
- carray ==0.1.6.8
|
||||
|
|
@ -426,7 +426,7 @@ default-package-overrides:
|
|||
- conduit-connection ==0.1.0.3
|
||||
- conduit-extra ==1.1.17
|
||||
- conduit-iconv ==0.1.1.2
|
||||
- conduit-parse ==0.1.2.1
|
||||
- conduit-parse ==0.1.2.2
|
||||
- ConfigFile ==1.1.4
|
||||
- configuration-tools ==0.2.15
|
||||
- configurator ==0.3.0.0
|
||||
|
|
@ -700,9 +700,9 @@ default-package-overrides:
|
|||
- fileplow ==0.1.0.0
|
||||
- filter-logger ==0.6.0.0
|
||||
- find-clumpiness ==0.2.3.1
|
||||
- fingertree ==0.1.2.1
|
||||
- fingertree ==0.1.3.0
|
||||
- fingertree-psqueue ==0.3
|
||||
- finite-typelits ==0.1.2.0
|
||||
- finite-typelits ==0.1.3.0
|
||||
- fixed ==0.2.1.1
|
||||
- fixed-length ==0.2
|
||||
- fixed-vector ==0.9.0.0
|
||||
|
|
@ -786,7 +786,7 @@ default-package-overrides:
|
|||
- gi-gtk ==3.0.17
|
||||
- gi-javascriptcore ==3.0.14
|
||||
- ginger ==0.5.3.0
|
||||
- gio ==0.13.3.1
|
||||
- gio ==0.13.4.0
|
||||
- gi-pango ==1.0.15
|
||||
- giphy-api ==0.5.2.0
|
||||
- gi-soup ==2.4.14
|
||||
|
|
@ -803,7 +803,7 @@ default-package-overrides:
|
|||
- gitson ==0.5.2
|
||||
- gi-webkit ==3.0.14
|
||||
- gl ==0.8.0
|
||||
- glabrous ==0.3.3
|
||||
- glabrous ==0.3.4
|
||||
- glaze ==0.3.0.1
|
||||
- glazier ==0.11.0.1
|
||||
- glazier-pipes ==0.1.5.1
|
||||
|
|
@ -937,10 +937,10 @@ default-package-overrides:
|
|||
- group-by-date ==0.1.0.2
|
||||
- grouped-list ==0.2.1.3
|
||||
- groupoids ==4.0
|
||||
- groups ==0.4.0.0
|
||||
- groups ==0.4.1.0
|
||||
- gtk ==0.14.7
|
||||
- gtk2hs-buildtools ==0.13.3.0
|
||||
- gtk3 ==0.14.7
|
||||
- gtk2hs-buildtools ==0.13.3.1
|
||||
- gtk3 ==0.14.8
|
||||
- H ==0.9.0.1
|
||||
- h2c ==1.0.0
|
||||
- hackage-db ==1.22
|
||||
|
|
@ -959,7 +959,7 @@ default-package-overrides:
|
|||
- hamlet ==1.2.0
|
||||
- HandsomeSoup ==0.4.2
|
||||
- handwriting ==0.1.0.3
|
||||
- hapistrano ==0.3.3.0
|
||||
- hapistrano ==0.3.4.0
|
||||
- happstack-hsp ==7.3.7.3
|
||||
- happstack-jmacro ==7.0.12
|
||||
- happstack-server ==7.4.6.4
|
||||
|
|
@ -1056,7 +1056,7 @@ default-package-overrides:
|
|||
- hjsonschema ==1.6.3
|
||||
- hlibgit2 ==0.18.0.16
|
||||
- hlibsass ==0.1.6.1
|
||||
- hlint ==2.0.10
|
||||
- hlint ==2.0.11
|
||||
- hmatrix ==0.18.0.0
|
||||
- hmatrix-gsl ==0.18.0.1
|
||||
- hmatrix-gsl-stats ==0.4.1.7
|
||||
|
|
@ -1087,16 +1087,16 @@ default-package-overrides:
|
|||
- hsass ==0.4.2
|
||||
- hsb2hs ==0.3.1
|
||||
- hs-bibutils ==5.5
|
||||
- hscolour ==1.24.1
|
||||
- hscolour ==1.24.2
|
||||
- hscurses ==1.4.2.0
|
||||
- hsdev ==0.2.5.1
|
||||
- hsdns ==1.7
|
||||
- hsebaysdk ==0.4.0.0
|
||||
- hse-cpp ==0.2
|
||||
- hsemail ==2
|
||||
- hset ==2.2.0
|
||||
- HSet ==0.0.1
|
||||
- hsexif ==0.6.1.4
|
||||
- hset ==2.2.0
|
||||
- hsexif ==0.6.1.5
|
||||
- hs-GeoIP ==0.3
|
||||
- hsignal ==0.2.7.5
|
||||
- hsinstall ==1.6
|
||||
|
|
@ -1126,7 +1126,7 @@ default-package-overrides:
|
|||
- hspec-wai ==0.8.0
|
||||
- hspec-wai-json ==0.8.0
|
||||
- hspec-webdriver ==1.2.0
|
||||
- hsshellscript ==3.4.1
|
||||
- hsshellscript ==3.4.2
|
||||
- hstatistics ==0.3
|
||||
- hstatsd ==0.1
|
||||
- HStringTemplate ==0.8.6
|
||||
|
|
@ -1189,7 +1189,6 @@ default-package-overrides:
|
|||
- ical ==0.0.1
|
||||
- iconv ==0.4.1.3
|
||||
- identicon ==0.2.2
|
||||
- idris ==1.0
|
||||
- ieee754 ==0.8.0
|
||||
- if ==0.1.0.0
|
||||
- IfElse ==0.85
|
||||
|
|
@ -1275,7 +1274,7 @@ default-package-overrides:
|
|||
- jwt ==0.7.2
|
||||
- kan-extensions ==5.0.2
|
||||
- kansas-comet ==0.4
|
||||
- katip ==0.5.1.0
|
||||
- katip ==0.5.2.0
|
||||
- kawhi ==0.3.0
|
||||
- kdt ==0.2.4
|
||||
- keter ==1.4.3.2
|
||||
|
|
@ -1300,7 +1299,6 @@ default-package-overrides:
|
|||
- language-javascript ==0.6.0.10
|
||||
- language-lua2 ==0.1.0.5
|
||||
- language-puppet ==1.3.8.1
|
||||
- language-python ==0.5.4
|
||||
- language-thrift ==0.10.0.0
|
||||
- largeword ==1.2.5
|
||||
- latex ==0.1.0.3
|
||||
|
|
@ -1401,8 +1399,8 @@ default-package-overrides:
|
|||
- median-stream ==0.7.0.0
|
||||
- med-module ==0.1.1
|
||||
- megaparsec ==5.3.1
|
||||
- mega-sdist ==0.3.0.2
|
||||
- memory ==0.14.8
|
||||
- mega-sdist ==0.3.0.4
|
||||
- memory ==0.14.9
|
||||
- MemoTrie ==0.6.8
|
||||
- mersenne-random-pure64 ==0.2.2.0
|
||||
- messagepack ==0.5.4
|
||||
|
|
@ -1465,7 +1463,7 @@ default-package-overrides:
|
|||
- monads-tf ==0.1.0.3
|
||||
- monad-time ==0.2
|
||||
- monad-unlift ==0.2.0
|
||||
- monad-unlift-ref ==0.2.0
|
||||
- monad-unlift-ref ==0.2.1
|
||||
- mongoDB ==2.3.0
|
||||
- monoidal-containers ==0.3.0.2
|
||||
- monoid-extras ==0.4.2
|
||||
|
|
@ -1541,7 +1539,7 @@ default-package-overrides:
|
|||
- non-empty-sequence ==0.2.0.2
|
||||
- non-negative ==0.1.1.2
|
||||
- NoTrace ==0.3.0.2
|
||||
- nsis ==0.3.1
|
||||
- nsis ==0.3.2
|
||||
- numbers ==3000.2.0.1
|
||||
- numeric-extras ==0.1
|
||||
- numeric-prelude ==0.4.2
|
||||
|
|
@ -1574,14 +1572,14 @@ default-package-overrides:
|
|||
- open-browser ==0.2.1.0
|
||||
- openexr-write ==0.1.0.1
|
||||
- OpenGL ==3.0.2.0
|
||||
- OpenGLRaw ==3.2.5.0
|
||||
- OpenGLRaw ==3.2.6.0
|
||||
- openpgp-asciiarmor ==0.1
|
||||
- opensource ==0.1.0.0
|
||||
- openssl-streams ==1.2.1.3
|
||||
- open-witness ==0.4.0.1
|
||||
- operational ==0.2.3.5
|
||||
- operational-class ==0.3.0.0
|
||||
- opml-conduit ==0.6.0.3
|
||||
- opml-conduit ==0.6.0.4
|
||||
- optional-args ==1.0.1
|
||||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.13.2.0
|
||||
|
|
@ -1653,7 +1651,7 @@ default-package-overrides:
|
|||
- pinboard ==0.9.12.6
|
||||
- pinch ==0.3.2.0
|
||||
- pinchot ==0.24.0.0
|
||||
- pipes ==4.3.6
|
||||
- pipes ==4.3.7
|
||||
- pipes-attoparsec ==0.5.1.5
|
||||
- pipes-bytestring ==2.1.6
|
||||
- pipes-cacophony ==0.5.0
|
||||
|
|
@ -1665,8 +1663,8 @@ default-package-overrides:
|
|||
- pipes-misc ==0.3.0.0
|
||||
- pipes-mongodb ==0.1.0.0
|
||||
- pipes-parse ==3.0.8
|
||||
- pipes-random ==1.0.0.3
|
||||
- pipes-safe ==2.2.5
|
||||
- pipes-random ==1.0.0.4
|
||||
- pipes-safe ==2.2.6
|
||||
- pipes-text ==0.0.2.5
|
||||
- pipes-wai ==3.2.0
|
||||
- pixelated-avatar-generator ==0.1.3
|
||||
|
|
@ -1688,7 +1686,7 @@ default-package-overrides:
|
|||
- polynomials-bernstein ==1.1.2
|
||||
- polyparse ==1.12
|
||||
- pooled-io ==0.0.2.1
|
||||
- posix-paths ==0.2.1.1
|
||||
- posix-paths ==0.2.1.3
|
||||
- posix-realtime ==0.0.0.4
|
||||
- postgresql-binary ==0.12.1
|
||||
- postgresql-libpq ==0.9.3.1
|
||||
|
|
@ -1807,7 +1805,7 @@ default-package-overrides:
|
|||
- redis-resp ==0.4.0
|
||||
- reducers ==3.12.2
|
||||
- refact ==0.3.0.2
|
||||
- references ==0.3.3.0
|
||||
- references ==0.3.3.1
|
||||
- ref-fd ==0.4.0.1
|
||||
- refined ==0.1.2.1
|
||||
- reflection ==2.1.2
|
||||
|
|
@ -1831,13 +1829,13 @@ default-package-overrides:
|
|||
- regex-tdfa-text ==1.0.0.3
|
||||
- regex-with-pcre ==1.0.1.3
|
||||
- reinterpret-cast ==0.1.0
|
||||
- relational-query ==0.9.5.0
|
||||
- relational-query-HDBC ==0.6.4.1
|
||||
- relational-query ==0.9.5.1
|
||||
- relational-query-HDBC ==0.6.4.2
|
||||
- relational-record ==0.1.8.0
|
||||
- relational-schemas ==0.1.4.1
|
||||
- relational-schemas ==0.1.4.2
|
||||
- renderable ==0.2.0.1
|
||||
- RepLib ==0.5.4
|
||||
- repline ==0.1.6.0
|
||||
- repline ==0.1.7.0
|
||||
- req ==0.2.0
|
||||
- req-conduit ==0.1.0
|
||||
- rerebase ==1.0.3
|
||||
|
|
@ -1943,7 +1941,7 @@ default-package-overrides:
|
|||
- SHA ==1.6.4.2
|
||||
- shake ==0.15.11
|
||||
- shake-language-c ==0.10.1
|
||||
- shakespeare ==2.0.14
|
||||
- shakespeare ==2.0.14.1
|
||||
- shell-conduit ==4.6.1
|
||||
- shelly ==1.6.8.3
|
||||
- shikensu ==0.3.7
|
||||
|
|
@ -2082,7 +2080,7 @@ default-package-overrides:
|
|||
- syb ==0.7
|
||||
- symbol ==0.2.4
|
||||
- symengine ==0.1.2.0
|
||||
- synthesizer-core ==0.8.1.1
|
||||
- synthesizer-core ==0.8.1.2
|
||||
- synthesizer-dimensional ==0.8.0.2
|
||||
- synthesizer-midi ==0.6.0.4
|
||||
- sysinfo ==0.1.1
|
||||
|
|
@ -2096,7 +2094,7 @@ default-package-overrides:
|
|||
- tagged-binary ==0.2.0.1
|
||||
- tagged-identity ==0.1.2
|
||||
- tagshare ==0.0
|
||||
- tagsoup ==0.14.1
|
||||
- tagsoup ==0.14.2
|
||||
- tagstream-conduit ==0.5.5.3
|
||||
- tar ==0.5.0.3
|
||||
- tar-conduit ==0.1.1
|
||||
|
|
@ -2198,7 +2196,7 @@ default-package-overrides:
|
|||
- timelens ==0.2.0.2
|
||||
- time-lens ==0.4.0.1
|
||||
- time-locale-compat ==0.1.1.3
|
||||
- timemap ==0.0.4
|
||||
- timemap ==0.0.6
|
||||
- time-parsers ==0.1.2.0
|
||||
- timerep ==2.0.0.2
|
||||
- timespan ==0.3.0.0
|
||||
|
|
@ -2207,7 +2205,7 @@ default-package-overrides:
|
|||
- tinylog ==0.14.0
|
||||
- tinytemplate ==0.1.2.0
|
||||
- titlecase ==1.0.1
|
||||
- tldr ==0.2.2
|
||||
- tldr ==0.2.3
|
||||
- tls ==1.3.11
|
||||
- tls-debug ==0.4.4
|
||||
- tls-session-manager ==0.0.0.1
|
||||
|
|
@ -2326,7 +2324,7 @@ default-package-overrides:
|
|||
- vector-space ==0.10.4
|
||||
- vector-split ==1.0.0.2
|
||||
- vector-th-unbox ==0.2.1.6
|
||||
- vectortiles ==1.2.0.5
|
||||
- vectortiles ==1.2.0.6
|
||||
- verbosity ==0.2.3.0
|
||||
- versions ==3.1.1
|
||||
- vhd ==0.2.2
|
||||
|
|
@ -2342,7 +2340,7 @@ default-package-overrides:
|
|||
- wai-conduit ==3.0.0.3
|
||||
- wai-cors ==0.2.5
|
||||
- wai-eventsource ==3.0.0
|
||||
- wai-extra ==3.0.20.0
|
||||
- wai-extra ==3.0.20.2
|
||||
- wai-handler-launch ==3.0.2.3
|
||||
- wai-logger ==2.3.0
|
||||
- wai-middleware-auth ==0.1.2.1
|
||||
|
|
@ -2355,7 +2353,7 @@ default-package-overrides:
|
|||
- wai-middleware-metrics ==0.2.4
|
||||
- wai-middleware-rollbar ==0.4.0
|
||||
- wai-middleware-static ==0.8.1
|
||||
- wai-middleware-throttle ==0.2.1.0
|
||||
- wai-middleware-throttle ==0.2.2.0
|
||||
- wai-middleware-verbs ==0.3.2
|
||||
- wai-predicates ==0.9.0
|
||||
- wai-route ==0.3.1.1
|
||||
|
|
@ -2387,9 +2385,9 @@ default-package-overrides:
|
|||
- websockets ==0.10.0.0
|
||||
- websockets-rpc ==0.4.0
|
||||
- websockets-simple ==0.0.2
|
||||
- websockets-snap ==0.10.2.3
|
||||
- websockets-snap ==0.10.2.4
|
||||
- weeder ==0.1.7
|
||||
- weigh ==0.0.5
|
||||
- weigh ==0.0.7
|
||||
- wikicfp-scraper ==0.1.0.9
|
||||
- wild-bind ==0.1.0.3
|
||||
- wild-bind-indicator ==0.1.0.1
|
||||
|
|
@ -2440,7 +2438,7 @@ default-package-overrides:
|
|||
- xml ==1.3.14
|
||||
- xml-basic ==0.1.2
|
||||
- xml-conduit ==1.5.1
|
||||
- xml-conduit-parse ==0.3.1.1
|
||||
- xml-conduit-parse ==0.3.1.2
|
||||
- xml-conduit-writer ==0.1.1.2
|
||||
- xmlgen ==0.6.2.1
|
||||
- xml-hamlet ==0.4.1.1
|
||||
|
|
@ -2457,18 +2455,18 @@ default-package-overrides:
|
|||
- xss-sanitize ==0.3.5.7
|
||||
- xturtle ==0.2.0.0
|
||||
- yackage ==0.8.1
|
||||
- yahoo-finance-api ==0.2.0.2
|
||||
- yahoo-finance-api ==0.2.0.3
|
||||
- yaml ==0.8.25
|
||||
- Yampa ==0.10.6.2
|
||||
- YampaSynth ==0.2
|
||||
- yesod ==1.4.5
|
||||
- yesod-auth ==1.4.19
|
||||
- yesod-auth ==1.4.20
|
||||
- yesod-auth-account ==1.4.3
|
||||
- yesod-auth-basic ==0.1.0.2
|
||||
- yesod-auth-fb ==1.8.1
|
||||
- yesod-auth-hashdb ==1.6.2
|
||||
- yesod-bin ==1.5.2.6
|
||||
- yesod-core ==1.4.37
|
||||
- yesod-core ==1.4.37.2
|
||||
- yesod-default ==1.2.0
|
||||
- yesod-eventsource ==1.4.1
|
||||
- yesod-fb ==0.4.0
|
||||
|
|
@ -2480,7 +2478,7 @@ default-package-overrides:
|
|||
- yesod-job-queue ==0.3.0.4
|
||||
- yesod-markdown ==0.11.4
|
||||
- yesod-newsfeed ==1.6
|
||||
- yesod-persistent ==1.4.2
|
||||
- yesod-persistent ==1.4.3
|
||||
- yesod-recaptcha2 ==0.1.0.1
|
||||
- yesod-sitemap ==1.4.0.1
|
||||
- yesod-static ==1.5.3.1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,11 +1,11 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glpk-4.63";
|
||||
name = "glpk-4.64";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/glpk/${name}.tar.gz";
|
||||
sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci";
|
||||
sha256 = "096cqgjc7vkq6wd8znhcxjbs1s2rym3qf753fqxrrq531vs6g4jk";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchurl, bash, pkgconfig, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unicorn-emulator-${version}";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz";
|
||||
sha256 = "0z01apwmvhvdldm372ww9pjfn45awkw3m90c0h4v0nj0ihmlysis";
|
||||
};
|
||||
|
||||
configurePhase = '' patchShebangs make.sh '';
|
||||
buildPhase = '' ./make.sh '';
|
||||
installPhase = '' env PREFIX=$out ./make.sh install '';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Lightweight multi-platform CPU emulator library";
|
||||
homepage = "http://www.unicorn-engine.org";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip;
|
||||
sha256 = "1sik243xqx7kbdddcq3va8h8q2wijf9ffhgp752hx725x3pjh9ss";
|
||||
sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, cffi
|
||||
, six
|
||||
, hypothesis
|
||||
, pytest
|
||||
, wheel
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "argon2_cffi";
|
||||
version = "16.3.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ap3il3j1pjyprrhpfyhc21izpmhzhfb5s69vlzc65zvd1nj99cr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cffi six ];
|
||||
checkInputs = [ hypothesis pytest wheel ];
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Secure Password Hashes for Python";
|
||||
homepage = https://argon2-cffi.readthedocs.io/;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,20 +2,18 @@
|
|||
|
||||
with pythonPackages;buildPythonPackage rec {
|
||||
pname = "devpi-common";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d89634a57981ed43cb5dcd25e00c9454ea111189c5ddc08d945b3d5187ada5fd";
|
||||
sha256 = "0rh119iw5hk41gsvbjr0wixvl1i4f0b1vcnw9ym35rmcp517z0wb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests py ];
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
# Don't know why this test is failing!
|
||||
substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env"
|
||||
py.test
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, nose
|
||||
, bcrypt
|
||||
, argon2_cffi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,10 +17,10 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
propagatedBuildInputs = [ bcrypt ];
|
||||
propagatedBuildInputs = [ bcrypt argon2_cffi ];
|
||||
|
||||
meta = {
|
||||
description = "A password hashing library for Python";
|
||||
homepage = https://code.google.com/p/passlib/;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ buildPythonPackage rec {
|
|||
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python wrapper for OpenCL";
|
||||
homepage = https://github.com/pyopencl/pyopencl;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainer = stdenv.lib.maintainers.fridh;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.fridh ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, lib
|
||||
, pexpect
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-timeout";
|
||||
version = "1.2.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
|
||||
};
|
||||
buildInputs = [ pytest ];
|
||||
checkInputs = [ pytest pexpect ];
|
||||
checkPhase = ''pytest -ra'';
|
||||
|
||||
meta = with lib;{
|
||||
description = "py.test plugin to abort hanging tests";
|
||||
homepage = http://bitbucket.org/pytest-dev/pytest-timeout/;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,24 +13,16 @@ let
|
|||
inherit (stdenv.lib) optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
name = "radare2-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7";
|
||||
sha256 = "1mny0iw2dgszvvx0yb0z5vlygz4f3jblzi9byybczm8wdqs1vhb1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2017-15385.patch";
|
||||
url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch;
|
||||
sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
|
||||
capstone = fetchurl {
|
||||
|
|
@ -51,13 +43,6 @@ stdenv.mkDerivation rec {
|
|||
++ optional pythonBindings [python]
|
||||
++ optional luaBindings [lua];
|
||||
|
||||
postInstall = ''
|
||||
# replace symlinks pointing into the build directory with the files they point to
|
||||
rm $out/bin/{r2-docker,r2-indent}
|
||||
cp sys/r2-docker.sh $out/bin/r2-docker
|
||||
cp sys/indent.sh $out/bin/r2-indent
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "unix-like reverse engineering framework and commandline tools";
|
||||
homepage = http://radare.org/;
|
||||
|
|
|
|||
|
|
@ -1,28 +1,47 @@
|
|||
{ stdenv, pythonPackages, glibcLocales} :
|
||||
{ stdenv
|
||||
, lib
|
||||
, pythonPackages
|
||||
, glibcLocales
|
||||
, devpi-server
|
||||
, git
|
||||
, mercurial
|
||||
} :
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "devpi-client";
|
||||
version = "3.1.0rc1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kfyva886k9zxmilqb2yviwqzyvs3n36if3s56y4clbvw9hr2lc3";
|
||||
sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr";
|
||||
};
|
||||
# requires devpi-server which is currently not packaged
|
||||
doCheck = true;
|
||||
checkInputs = with pythonPackages; [ pytest webtest mock ];
|
||||
checkPhase = "py.test";
|
||||
|
||||
checkInputs = with pythonPackages; [
|
||||
pytest webtest mock
|
||||
devpi-server tox
|
||||
sphinx wheel git mercurial detox
|
||||
setuptools
|
||||
];
|
||||
checkPhase = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
|
||||
# setuptools do not get propagated into the tox call (cannot import setuptools)
|
||||
rm testing/test_test.py
|
||||
|
||||
# test tries to connect to upstream pypi
|
||||
py.test -k 'not test_pypi_index_attributes' testing
|
||||
'';
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
buildInputs = with pythonPackages; [ glibcLocales pkginfo tox check-manifest ];
|
||||
propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy ];
|
||||
buildInputs = with pythonPackages; [ glibcLocales pkginfo check-manifest ];
|
||||
propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy setuptools ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://doc.devpi.net;
|
||||
description = "Github-style pypi index server and packaging meta tool";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ lewo makefu ];
|
||||
|
||||
description = "Client for devpi, a pypi index server and packaging meta tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lewo makefu ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, pythonPackages, glibcLocales, nginx }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "devpi-server";
|
||||
version = "4.3.1";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0x6ks2sbpknznxaqlh0gf5hcvhkmgixixq2zs91wgfqxk4vi4s6n";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages;
|
||||
[ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ];
|
||||
checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout pytest-catchlog mock pyyaml ];
|
||||
checkPhase = ''
|
||||
cd test_devpi_server/
|
||||
PATH=$PATH:$out/bin pytest --slow -rfsxX
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;{
|
||||
homepage = http://doc.devpi.net;
|
||||
description = "Github-style pypi index server and packaging meta tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ makefu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut, freetype
|
||||
, SDL, SDL_mixer, SDL_image, libXi, inputproto
|
||||
, sfml, libXi, inputproto
|
||||
, libXmu, libXext, xextproto, libXt, libSM, libICE
|
||||
, libpng, pkgconfig, gettext, intltool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.0";
|
||||
version = "0.7.4";
|
||||
name = "extremetuxracer-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
|
||||
sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4";
|
||||
sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
mesa libX11 xproto tcl freeglut freetype
|
||||
SDL SDL_mixer SDL_image libXi inputproto
|
||||
sfml libXi inputproto
|
||||
libXmu libXext xextproto libXt libSM libICE
|
||||
libpng pkgconfig gettext intltool
|
||||
];
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [ "--with-tcl=${tcl}/lib" ];
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A DOS emulator";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
licenses = licenses.gpl2;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -820,6 +820,17 @@ rec {
|
|||
|
||||
};
|
||||
|
||||
vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-codefmt-2017-03-04";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/google/vim-codefmt";
|
||||
rev = "8bae55b45c3f030845ab636d6860cef4071915d1";
|
||||
sha256 = "0wg0fplpwsgkbycjx1ryl29afbfzfsdv0j7xisjik26m9q8shn1k";
|
||||
};
|
||||
dependencies = ["maktaba"];
|
||||
|
||||
};
|
||||
|
||||
vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-jsonnet-2017-04-06";
|
||||
src = fetchgit {
|
||||
|
|
@ -831,6 +842,17 @@ rec {
|
|||
|
||||
};
|
||||
|
||||
vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-maktaba-2017-05-07";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/google/vim-maktaba";
|
||||
rev = "2ae8b4478ea9bc2c6c8106acb55ddfb935754fb9";
|
||||
sha256 = "1w8paqn0qyk4j5wfx48rc2za7kzhgdaggikklmjr1vsv2y0b8fzc";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-jsdoc-2017-02-11";
|
||||
src = fetchgit {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,9 @@
|
|||
"github:flazz/vim-colorschemes"
|
||||
"github:floobits/floobits-neovim"
|
||||
"github:frigoeu/psc-ide-vim"
|
||||
"github:google/vim-codefmt"
|
||||
"github:google/vim-jsonnet"
|
||||
"github:google/vim-maktaba"
|
||||
"github:heavenshell/vim-jsdoc"
|
||||
"github:hecal3/vim-leader-guide"
|
||||
"github:idris-hackers/idris-vim"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.14.3";
|
||||
version = "4.14.4";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
|
||||
|
|
@ -13,6 +13,6 @@ import ./generic.nix (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0rh3r1ik9xwa3pl5rrqjjbknyc7xnam10jih7v5q5v33pd716a5n";
|
||||
sha256 = "17m7ws3yp6f7ivi8n4gw0i10wf77bb37r7s6jbijg6nsj3vvz49a";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.4.103";
|
||||
version = "4.4.104";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "017r4aq6bwhrir3n4nckd5407gpnryv0bbgpp7rv6lnzbxwd008x";
|
||||
sha256 = "0bhc4ay8ikvhqxj191mbm5kshh2zj46n5snwfa1d6bqzdkgg5s5h";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.66";
|
||||
version = "4.9.67";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0fwnmba25ww5q4asfz3mqdmbrhfdfgid388701h4xy20pwpjndsy";
|
||||
sha256 = "0zazyxn3q8bpinqvxjqkxg721vgzyk9agfbgr6hdyxvqq7fagfkz";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
|
|||
homepage = http://www.linux-phc.org/;
|
||||
downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ let
|
|||
Copy-On-Write filesystem with data integrity detection and repair,
|
||||
snapshotting, cloning, block devices, deduplication, and more.
|
||||
'';
|
||||
home = http://zfsonlinux.org/;
|
||||
homepage = http://zfsonlinux.org/;
|
||||
license = licenses.cddl;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }:
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neard-0.15-post-git-20510929";
|
||||
name = "neard-0.16";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git";
|
||||
sha256 = "07dny1l8n46v0yn30zqa8bkyj8ay01xphc124nhf2sqwbff7nf2m";
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz";
|
||||
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ let
|
|||
description = str;
|
||||
longDescription = str;
|
||||
branch = str;
|
||||
homepage = str;
|
||||
homepage = either (listOf str) str;
|
||||
downloadPage = str;
|
||||
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
|
||||
maintainers = listOf str;
|
||||
|
|
@ -158,11 +158,12 @@ let
|
|||
downloadURLRegexp = str;
|
||||
isFcitxEngine = bool;
|
||||
isIbusEngine = bool;
|
||||
isGutenprint = bool;
|
||||
};
|
||||
|
||||
checkMetaAttr = k: v:
|
||||
if metaTypes?${k} then
|
||||
if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
|
||||
if metaTypes.${k}.check v then null else "key '${k}' has a value ${toString v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
|
||||
else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
|
||||
checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,24 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abcMIDI-${version}";
|
||||
version = "2017.06.10";
|
||||
version = "2017.11.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leesavide";
|
||||
repo = "abcmidi";
|
||||
rev = name;
|
||||
sha256 = "0y92m3mj63vvy79ksq4z5hgkz6w50drg9a4bmbk6jylny0l0bdpy";
|
||||
# You can find new releases on http://ifdo.ca/~seymour/runabc/top.html
|
||||
src = fetchurl {
|
||||
url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
|
||||
sha256 = "095nnyaqnsr3v7hsswpad9g0hxdnr4s6z8yk1bmr3g1j0cfv1xs9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
# There is also a file called "makefile" which seems to be preferred by the standard build phase
|
||||
makefile = "Makefile";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://abc.sourceforge.net/abcMIDI/;
|
||||
license = licenses.gpl2Plus;
|
||||
description = "abc <-> MIDI conversion utilities";
|
||||
description = "Utilities for converting between abc and MIDI";
|
||||
maintainers = [ maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://gitlab.com/interception/linux/plugins/caps2esc";
|
||||
description = "Transforming the most useless key ever into the most useful one";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = stdenv.lib.maintainers.vyp;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vyp ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ in stdenv.mkDerivation rec {
|
|||
license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
|
||||
description = "A wrapper for using Windows plugins in Linux browsers";
|
||||
maintainers = with stdenv.lib.maintainers; [ skeidel ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
|
||||
{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.8.1";
|
||||
|
|
@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ];
|
||||
cmakeFlags="-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}";
|
||||
|
||||
buildInputs = [ python expat glib pcre openssl curl check attr gpgme ];
|
||||
|
||||
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
|
||||
propagatedBuildInputs = [ curl gpgme expat ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7.11";
|
||||
name = "libacr38u-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2";
|
||||
sha256 = "0lxbq17y51cablx6bcd89klwnyigvkz0rsf9nps1a97ggnllyzkx";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ pcsclite libusb ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(usbdropdir="$out/pcsc/drivers");
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "ACR38U smartcard reader driver for pcsclite";
|
||||
longDescription = ''
|
||||
A PC/SC IFD handler implementation for the ACS ACR38U
|
||||
smartcard readers. This driver is for the non-CCID version only.
|
||||
|
||||
This package is needed to communicate with the ACR38U smartcard readers through
|
||||
the PC/SC Lite resource manager (pcscd).
|
||||
|
||||
It can be enabled in /etc/nixos/configuration.nix by adding:
|
||||
services.pcscd.enable = true;
|
||||
services.pcscd.plugins = [ libacr38u ];
|
||||
|
||||
The package is based on the debian package libacr38u.
|
||||
'';
|
||||
homepage = http://www.acs.com.hk;
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ berce ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Thermal Daemon";
|
||||
homepage = https://01.org/linux-thermal-daemon;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -855,6 +855,7 @@ with pkgs;
|
|||
traefik = callPackage ../servers/traefik { };
|
||||
|
||||
capstone = callPackage ../development/libraries/capstone { };
|
||||
unicorn-emu = callPackage ../development/libraries/unicorn-emu { };
|
||||
|
||||
cataract = callPackage ../applications/misc/cataract { };
|
||||
cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
|
||||
|
|
@ -5530,6 +5531,8 @@ with pkgs;
|
|||
|
||||
devpi-client = callPackage ../development/tools/devpi-client {};
|
||||
|
||||
devpi-server = callPackage ../development/tools/devpi-server {};
|
||||
|
||||
dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
|
@ -5948,7 +5951,6 @@ with pkgs;
|
|||
overrides = self: super: {
|
||||
binary = lib.dontCheck self.binary_0_8_5_1;
|
||||
cheapskate = self.cheapskate_0_1_1;
|
||||
idris = self.idris_1_1_1;
|
||||
parsers = lib.dontCheck super.parsers;
|
||||
semigroupoids = lib.dontCheck super.semigroupoids;
|
||||
trifecta = lib.dontCheck super.trifecta;
|
||||
|
|
@ -6056,7 +6058,8 @@ with pkgs;
|
|||
supportsJDK =
|
||||
system == "i686-linux" ||
|
||||
system == "x86_64-linux" ||
|
||||
system == "armv7l-linux";
|
||||
system == "armv7l-linux" ||
|
||||
system == "aarch64-linux";
|
||||
|
||||
jdkdistro = oraclejdk8distro;
|
||||
|
||||
|
|
@ -8912,6 +8915,8 @@ with pkgs;
|
|||
|
||||
libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
|
||||
|
||||
libacr38u = callPackage ../tools/security/libacr38u { };
|
||||
|
||||
libagar = callPackage ../development/libraries/libagar { };
|
||||
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
|
||||
|
||||
|
|
@ -14243,6 +14248,8 @@ with pkgs;
|
|||
|
||||
dd-agent = callPackage ../tools/networking/dd-agent { };
|
||||
|
||||
ddgr = callPackage ../applications/misc/ddgr { };
|
||||
|
||||
deadbeef = callPackage ../applications/audio/deadbeef {
|
||||
pulseSupport = config.pulseaudio or true;
|
||||
};
|
||||
|
|
@ -15548,7 +15555,7 @@ with pkgs;
|
|||
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice {
|
||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
||||
inherit (gnome2) GConf ORBit2 gnome_vfs;
|
||||
inherit (gnome3) gsettings_desktop_schemas defaultIconTheme;
|
||||
inherit (gnome3) defaultIconTheme;
|
||||
zip = zip.override { enableNLS = false; };
|
||||
bluez5 = bluez5_28;
|
||||
fontsConf = makeFontsConf {
|
||||
|
|
@ -15568,7 +15575,7 @@ with pkgs;
|
|||
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
|
||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
||||
inherit (gnome2) GConf ORBit2 gnome_vfs;
|
||||
inherit (gnome3) gsettings_desktop_schemas defaultIconTheme;
|
||||
inherit (gnome3) defaultIconTheme;
|
||||
zip = zip.override { enableNLS = false; };
|
||||
#glm = glm_0954;
|
||||
bluez5 = bluez5_28;
|
||||
|
|
|
|||
|
|
@ -162,6 +162,8 @@ in {
|
|||
|
||||
ansicolor = callPackage ../development/python-modules/ansicolor { };
|
||||
|
||||
argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };
|
||||
|
||||
asana = callPackage ../development/python-modules/asana { };
|
||||
|
||||
asn1crypto = callPackage ../development/python-modules/asn1crypto { };
|
||||
|
|
@ -3766,6 +3768,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
|
||||
|
||||
pytest-warnings = callPackage ../development/python-modules/pytest-warnings { };
|
||||
|
||||
pytestpep8 = buildPythonPackage rec {
|
||||
|
|
@ -10400,6 +10404,10 @@ in {
|
|||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
};
|
||||
|
||||
librepo = toPythonModule (pkgs.librepo.override {
|
||||
inherit python;
|
||||
});
|
||||
|
||||
libnacl = callPackage ../development/python-modules/libnacl {
|
||||
inherit (pkgs) libsodium;
|
||||
};
|
||||
|
|
@ -24458,6 +24466,7 @@ EOF
|
|||
parse-type = callPackage ../development/python-modules/parse-type { };
|
||||
|
||||
ephem = callPackage ../development/python-modules/ephem { };
|
||||
|
||||
});
|
||||
|
||||
in fix' (extends overrides packages)
|
||||
|
|
|
|||
Loading…
Reference in New Issue