Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
379c3899a5
124 changed files with 6367 additions and 3761 deletions
|
|
@ -1488,7 +1488,7 @@
|
|||
name = "Felipe Espinoza";
|
||||
};
|
||||
fgaz = {
|
||||
email = "francygazz@gmail.com";
|
||||
email = "fgaz@fgaz.me";
|
||||
github = "fgaz";
|
||||
name = "Francesco Gazzetta";
|
||||
};
|
||||
|
|
@ -1759,6 +1759,11 @@
|
|||
email = "commits@schurr.at";
|
||||
github = "hansjoergschurr";
|
||||
name = "Hans-Jörg Schurr";
|
||||
};
|
||||
HaoZeke = {
|
||||
email = "r95g10@gmail.com";
|
||||
github = "haozeke";
|
||||
name = "Rohit Goswami";
|
||||
};
|
||||
haslersn = {
|
||||
email = "haslersn@fius.informatik.uni-stuttgart.de";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
|
||||
wcWrapped = pkgs.writeShellScriptBin "way-cooler" ''
|
||||
${cfg.extraSessionCommands}
|
||||
exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler
|
||||
exec ${pkgs.dbus}/bin/dbus-run-session ${way-cooler}/bin/way-cooler
|
||||
'';
|
||||
wcJoined = pkgs.symlinkJoin {
|
||||
name = "way-cooler-wrapped";
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@ let
|
|||
ROOT_PATH = ${cfg.log.rootPath}
|
||||
LEVEL = ${cfg.log.level}
|
||||
|
||||
[service]
|
||||
DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration}
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
in
|
||||
|
|
@ -248,6 +251,18 @@ in
|
|||
description = "Upper level of template and static files path.";
|
||||
};
|
||||
|
||||
disableRegistration = mkEnableOption "the registration lock" // {
|
||||
description = ''
|
||||
By default any user can create an account on this <literal>gitea</literal> instance.
|
||||
This can be disabled by using this option.
|
||||
|
||||
<emphasis>Note:</emphasis> please keep in mind that this should be added after the initial
|
||||
deploy unless <link linkend="opt-services.gitea.useWizard">services.gitea.useWizard</link>
|
||||
is <literal>true</literal> as the first registered user will be the administrator if
|
||||
no install wizard is used.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
|
|
@ -263,7 +278,7 @@ in
|
|||
description = "gitea";
|
||||
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ gitea.bin ];
|
||||
path = [ gitea.bin pkgs.gitAndTools.git ];
|
||||
|
||||
preStart = let
|
||||
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
|
||||
|
|
|
|||
|
|
@ -340,6 +340,10 @@ mountFS() {
|
|||
echo "resizing $device..."
|
||||
e2fsck -fp "$device"
|
||||
resize2fs "$device"
|
||||
elif [ "$fsType" = f2fs ]; then
|
||||
echo "resizing $device..."
|
||||
fsck.f2fs -fp "$device"
|
||||
resize.f2fs "$device"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -127,8 +127,8 @@ let
|
|||
copy_bin_and_libs ${pkgs.kmod}/bin/kmod
|
||||
ln -sf kmod $out/bin/modprobe
|
||||
|
||||
# Copy resize2fs if needed.
|
||||
${optionalString (any (fs: fs.autoResize) fileSystems) ''
|
||||
# Copy resize2fs if any ext* filesystems are to be resized
|
||||
${optionalString (any (fs: fs.autoResize && (lib.hasPrefix "ext" fs.fsType)) fileSystems) ''
|
||||
# We need mke2fs in the initrd.
|
||||
copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ with lib;
|
|||
|
||||
let
|
||||
inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;
|
||||
fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems;
|
||||
in
|
||||
{
|
||||
config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) {
|
||||
|
|
@ -14,6 +15,11 @@ in
|
|||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd ''
|
||||
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs
|
||||
${optionalString (any (fs: fs.autoResize) fileSystems) ''
|
||||
# We need f2fs-tools' tools to resize filesystems
|
||||
copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
|
||||
''}
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ with pkgs.lib;
|
|||
machine =
|
||||
{ config, pkgs, ... }:
|
||||
{ services.gitea.enable = true;
|
||||
services.gitea.disableRegistration = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
@ -72,6 +73,7 @@ with pkgs.lib;
|
|||
$machine->waitForUnit('gitea.service');
|
||||
$machine->waitForOpenPort('3000');
|
||||
$machine->succeed("curl --fail http://localhost:3000/");
|
||||
$machine->succeed("curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. Please contact your site administrator.'");
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,22 @@
|
|||
{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
|
||||
autogen, sqlite, gmp, zlib, fetchFromGitHub, fetchpatch }:
|
||||
autogen, sqlite, gmp, zlib, fetchzip }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clightning-${version}";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "ElementsProject";
|
||||
repo = "lightning";
|
||||
rev = "v${version}";
|
||||
sha256 = "18yns0yyf7kc4p4n1crxdqh37j9faxkx216nh2ip7cxj4x8bf9gx";
|
||||
src = fetchzip {
|
||||
#
|
||||
# NOTE 0.6.3 release zip was bugged, this zip is a fix provided by the team
|
||||
# https://github.com/ElementsProject/lightning/issues/2254#issuecomment-453791475
|
||||
#
|
||||
# replace url with:
|
||||
# https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip
|
||||
# for future relases
|
||||
#
|
||||
url = "https://github.com/ElementsProject/lightning/files/2752675/clightning-v0.6.3.zip";
|
||||
sha256 = "0k5pwimwn69pcakiq4a7qnjyf4i8w1jlacwrjazm1sfivr6nfiv6";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -19,21 +24,12 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which ];
|
||||
buildInputs = [ sqlite gmp zlib python3 ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
|
||||
|
||||
configurePhase = ''
|
||||
./configure --prefix=$out --disable-developer --disable-valgrind
|
||||
'';
|
||||
|
||||
# NOTE: remove me in 0.6.3
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "clightning_0_6_2-compile-error.patch";
|
||||
url = https://patch-diff.githubusercontent.com/raw/ElementsProject/lightning/pull/2070.patch;
|
||||
sha256 = "1576fqik5zcpz5zsvp2ks939bgiz0jc22yf24iv61000dd5j6na9";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo "" > tools/refresh-submodules.sh
|
||||
patchShebangs tools/generate-wire.py
|
||||
|
|
|
|||
|
|
@ -12,11 +12,15 @@ let
|
|||
build = "182.5199772";
|
||||
sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw";
|
||||
};
|
||||
betaVersion = stableVersion;
|
||||
betaVersion = {
|
||||
version = "3.4.0.10"; # "Android Studio 3.4 Beta 1"
|
||||
build = "183.5217543";
|
||||
sha256Hash = "0yd9l4py82i3gl1nvfwlhfx12hzf1mih8ylgdl3r85hhlqs7w2dm";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.4.0.9"; # "Android Studio 3.4 Canary 10"
|
||||
build = "183.5202479";
|
||||
sha256Hash = "067mkf8n7bwv0f900d6d2hwxdhcgnp6dxqf6v81y1hf285ybymld";
|
||||
version = "3.5.0.0"; # "Android Studio 3.5 Canary 1"
|
||||
build = "183.5215047";
|
||||
sha256Hash = "1f7lllj85fia02hgy4ksbqh80sdcml16fv1g892jc6lwykjrdw5y";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
|
|
|
|||
|
|
@ -250,12 +250,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "0wv4hmh71ca9fl4pslf8nn6wppa98sc94272z4nb42jbs6dnb9ji"; /* updated by script */
|
||||
sha256 = "1pffxq69ihdc55lsy2q56vlanpgyks0g82n40b29j4m66flmxbkl"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -276,12 +276,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.2"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "0z3z9hc7h3n63mfy7c5zh5sz8c0bzgxk79xamw08sxphrsjahasz"; /* updated by script */
|
||||
sha256 = "0vnw6zc23dibpk1z7yg1lrgjznqc7508g1azybml878h6yykm5a4"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand Release";
|
||||
|
|
@ -289,12 +289,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "1zi4aib1h4jfn241gsg83jsqfj99fpbci4pkh8xarap6xrallyiq"; /* updated by script */
|
||||
sha256 = "1c9x3m7dknqr6yxqnn2ch3akwm6yskpmy32hcbjg7s87g1n6gy8m"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
|
|
@ -302,12 +302,12 @@ in
|
|||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
||||
sha256 = "0x0dplmv37gqdbrwxsx6xaix9dbaa6kqc09ganln5r4nl2bg64i8"; /* updated by script */
|
||||
sha256 = "1dj39hs63xba2jfk3sd2yiq7vk7758axrc5549krfd1aaawl4sl8"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
|
|
@ -328,12 +328,12 @@ in
|
|||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "02vs8nxxm139jl622nhxs59i9gw9rs5rjymkg8a0ajpybang24jk"; /* updated by script */
|
||||
sha256 = "0dnjkq1qbxc05cxafi5hw6pw9wya0w44ni32b34sclq26xr6blvj"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm Release";
|
||||
|
|
@ -341,12 +341,12 @@ in
|
|||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0g4ag9lid2km69s5g31hhhvz3zjx52wxca1q4qz1h0s9km0ca1sq"; /* updated by script */
|
||||
sha256 = "0z6qjc3qh58ds338rlfzi9446y3sghpnccaachkja2q59f97dfma"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm Release";
|
||||
|
|
@ -354,15 +354,15 @@ in
|
|||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2018.2.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "1g2b7wszviknzd4srgcvwmci0pxyjbcmjzb4fg5clh62wwdpa16n"; /* updated by script */
|
||||
sha256 = "0ghk819ik28y9b61vb2h463zbvvq1n2wl778czkakc4qjba2qnks"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider 2018.2";
|
||||
update-channel = "Rider 2018.3";
|
||||
};
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
|
|
@ -380,12 +380,12 @@ in
|
|||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
version = "2018.3.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1l3jy1ifx82gdnvpgz77ycxbwymcwwd830i4mfidkr9gkndlxpsp"; /* updated by script */
|
||||
sha256 = "0q8njbrll7qgijnxqic2mpca2jb2plpd677xdj5v72mm66mvxmss"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm Release";
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipe-7.2.7";
|
||||
name = "ipe-7.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
|
||||
sha256 = "08lzqhagvr8l69hxghyw9akf5dixbily7hj2gxhzzrp334k3yvfn";
|
||||
sha256 = "1i0h0q32xvbb0d3y2ff76jxnaw05hjf2z5gzww886z8arxwar1xn";
|
||||
};
|
||||
|
||||
# changes taken from Gentoo portage
|
||||
|
|
@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
patches = [ ./xlocale.patch ];
|
||||
|
||||
#TODO: make .desktop entry
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
--- ipe-7.2.7/src/ipelib/ipeplatform.cpp 2016-12-09 15:09:04.000000000 +0100
|
||||
+++ ipe-7.2.7/src/ipelib/ipeplatform.cpp 2017-11-23 17:13:11.152395834 +0100
|
||||
@@ -38,7 +38,6 @@
|
||||
#include <gdiplus.h>
|
||||
#else
|
||||
#include <sys/wait.h>
|
||||
-#include <xlocale.h>
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "urh-${version}";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jopohl";
|
||||
repo = "urh";
|
||||
rev = "v${version}";
|
||||
sha256 = "050c7vhxxwvmkahdhwdk371qhfnmass5bs9zxr8yj4mqfnihcmi8";
|
||||
sha256 = "06mz35jnmy6rchsnlk2s81fdwnc7zvx496q4ihjb9qybhyka79ay";
|
||||
};
|
||||
|
||||
buildInputs = [ hackrf rtl-sdr airspy limesuite ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,26 +1,28 @@
|
|||
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
|
||||
, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
|
||||
{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
|
||||
, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
|
||||
, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
|
||||
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
|
||||
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "discord";
|
||||
version = "0.0.5";
|
||||
version = "0.0.8";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g";
|
||||
sha256 = "1p786ma54baljs0bw8nl9sr37ypbpjblcndxsw4djgyxkd9ii16r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
libcxx systemd libpulseaudio
|
||||
stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
|
||||
gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
|
||||
stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype
|
||||
gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
];
|
||||
|
|
@ -29,10 +31,14 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/{bin,opt/discord,share/pixmaps}
|
||||
mv * $out/opt/discord
|
||||
|
||||
chmod +x $out/opt/discord/Discord
|
||||
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
$out/opt/discord/Discord
|
||||
|
||||
wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath}
|
||||
wrapProgram $out/opt/discord/Discord \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
ln -s $out/opt/discord/Discord $out/bin/
|
||||
ln -s $out/opt/discord/discord.png $out/share/pixmaps
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
|
||||
, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret
|
||||
, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Patch contained in next (>2.5.1) release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-qt-5.12-build";
|
||||
url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch";
|
||||
sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
|
|||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "12j3fw0j8qcr86c1vsz4bsb55j9inp0ll3wjjdvg1cj4hmwmn5ck";
|
||||
sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
rec {
|
||||
major = "6";
|
||||
minor = "1";
|
||||
patch = "3";
|
||||
patch = "4";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
|
@ -12,6 +12,6 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl";
|
||||
sha256 = "1zip7clhh3bp9smlxx1y5zpnwhaa6p0xlxg7k5d644q8gqbyk3v4";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,14 +48,14 @@ let
|
|||
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "1cry3gkvk71jf71jk4pff320axfid2wqjdnhkj2z718g4pp54dwf";
|
||||
sha256 = "1lgyns8zmwky1p78rvilnixqmicpfaal6x6286l4m7hv46pha181";
|
||||
};
|
||||
|
||||
# TODO: dictionaries
|
||||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "0q26zb2lq2cnkq0cn9ds3qwa981ljz0lyw13pa6f62nvrnwwqgwa";
|
||||
sha256 = "0ia490xksnhh4m5fas6irr7qbnkaap7zs3fg8jbq4qrfjh81bcpm";
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -68,7 +68,10 @@ in stdenv.mkDerivation rec {
|
|||
# of rasqal/rasqal.h
|
||||
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
|
||||
|
||||
patches = [ ./xdg-open-brief.patch ];
|
||||
patches = [
|
||||
./xdg-open-brief.patch
|
||||
./poppler.patch
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -v $sourceRoot/src
|
||||
|
|
|
|||
289
pkgs/applications/office/libreoffice/poppler.patch
Normal file
289
pkgs/applications/office/libreoffice/poppler.patch
Normal file
|
|
@ -0,0 +1,289 @@
|
|||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index 06e4faead..d4174e208 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer& o_rOutputBuf,
|
||||
o_rOutputBuf.resize(header_size);
|
||||
|
||||
// initialize stream
|
||||
- Guchar *p;
|
||||
+ unsigned char *p;
|
||||
GfxRGB rgb;
|
||||
std::unique_ptr<ImageStream> imgStr(
|
||||
new ImageStream(str,
|
||||
@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer& o_rOutputBuf,
|
||||
oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
|
||||
if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
|
||||
{
|
||||
- Guchar nIndex = 0;
|
||||
+ unsigned char nIndex = 0;
|
||||
colorMap->getRGB( &nIndex, &zeroColor );
|
||||
nIndex = 1;
|
||||
colorMap->getRGB( &nIndex, &oneColor );
|
||||
@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
|
||||
PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
|
||||
m_pDoc( pDoc ),
|
||||
m_aFontMap(),
|
||||
- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
|
||||
+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
|
||||
m_bSkipImages(false)
|
||||
{
|
||||
}
|
||||
@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
|
||||
LinkAction* pAction = link->getAction();
|
||||
if (pAction && pAction->getKind() == actionURI)
|
||||
{
|
||||
+#if POPPLER_CHECK_VERSION(0, 72, 0)
|
||||
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
|
||||
+#else
|
||||
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
|
||||
+#endif
|
||||
|
||||
std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
|
||||
|
||||
@@ -578,7 +582,11 @@ void PDFOutDev::restoreState(GfxState*)
|
||||
printf( "restoreState\n" );
|
||||
}
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 71, 0)
|
||||
+void PDFOutDev::setDefaultCTM(const double *pMat)
|
||||
+#else
|
||||
void PDFOutDev::setDefaultCTM(double *pMat)
|
||||
+#endif
|
||||
{
|
||||
assert(pMat);
|
||||
|
||||
@@ -752,8 +760,11 @@ void PDFOutDev::updateFont(GfxState *state)
|
||||
printf( " %lld", fontID );
|
||||
|
||||
aFont = it->second;
|
||||
-
|
||||
+#if POPPLER_CHECK_VERSION(0, 72, 0)
|
||||
+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
|
||||
+#else
|
||||
std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
|
||||
+#endif
|
||||
printf( " %d %d %d %d %f %d %s",
|
||||
aFont.isEmbedded,
|
||||
aFont.isBold,
|
||||
@@ -939,11 +950,11 @@ void PDFOutDev::endTextObject(GfxState*)
|
||||
}
|
||||
|
||||
void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
|
||||
- int width, int height, GBool invert,
|
||||
+ int width, int height, poppler_bool invert,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ poppler_bool /*interpolate*/,
|
||||
#endif
|
||||
- GBool /*inlineImg*/ )
|
||||
+ poppler_bool /*inlineImg*/ )
|
||||
{
|
||||
if (m_bSkipImages)
|
||||
return;
|
||||
@@ -972,9 +983,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
|
||||
void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height, GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ poppler_bool /*interpolate*/,
|
||||
#endif
|
||||
- int* maskColors, GBool /*inlineImg*/ )
|
||||
+ int* maskColors, poppler_bool /*inlineImg*/ )
|
||||
{
|
||||
if (m_bSkipImages)
|
||||
return;
|
||||
@@ -1023,13 +1034,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height,
|
||||
GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ poppler_bool /*interpolate*/,
|
||||
#endif
|
||||
Stream* maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
- GBool maskInvert
|
||||
+ poppler_bool maskInvert
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool /*maskInterpolate*/
|
||||
+ , poppler_bool /*maskInterpolate*/
|
||||
#endif
|
||||
)
|
||||
{
|
||||
@@ -1045,13 +1056,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height,
|
||||
GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ poppler_bool /*interpolate*/,
|
||||
#endif
|
||||
Stream* maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
GfxImageColorMap* maskColorMap
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool /*maskInterpolate*/
|
||||
+ , poppler_bool /*maskInterpolate*/
|
||||
#endif
|
||||
)
|
||||
{
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
index 7e65f085d..4b5c14d15 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -129,6 +129,12 @@ namespace pdfi
|
||||
GooString & getFamilyName() const
|
||||
{ return const_cast<GooString &>(familyName); }
|
||||
};
|
||||
+ // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool
|
||||
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
|
||||
+typedef GBool poppler_bool;
|
||||
+#else
|
||||
+typedef bool poppler_bool;
|
||||
+#endif
|
||||
|
||||
class PDFOutDev : public OutputDev
|
||||
{
|
||||
@@ -151,22 +157,26 @@ namespace pdfi
|
||||
|
||||
// Does this device use upside-down coordinates?
|
||||
// (Upside-down means (0,0) is the top left corner of the page.)
|
||||
- virtual GBool upsideDown() override { return gTrue; }
|
||||
+ virtual poppler_bool upsideDown() override { return true; }
|
||||
|
||||
// Does this device use drawChar() or drawString()?
|
||||
- virtual GBool useDrawChar() override { return gTrue; }
|
||||
+ virtual poppler_bool useDrawChar() override { return true; }
|
||||
|
||||
// Does this device use beginType3Char/endType3Char? Otherwise,
|
||||
// text in Type 3 fonts will be drawn with drawChar/drawString.
|
||||
- virtual GBool interpretType3Chars() override { return gFalse; }
|
||||
+ virtual poppler_bool interpretType3Chars() override { return false; }
|
||||
|
||||
// Does this device need non-text content?
|
||||
- virtual GBool needNonText() override { return gTrue; }
|
||||
+ virtual poppler_bool needNonText() override { return true; }
|
||||
|
||||
//----- initialization and control
|
||||
|
||||
// Set default transform matrix.
|
||||
+#if POPPLER_CHECK_VERSION(0, 71, 0)
|
||||
+ virtual void setDefaultCTM(const double *ctm) override;
|
||||
+#else
|
||||
virtual void setDefaultCTM(double *ctm) override;
|
||||
+#endif
|
||||
|
||||
// Start a page.
|
||||
virtual void startPage(int pageNum, GfxState *state
|
||||
@@ -233,40 +243,40 @@ namespace pdfi
|
||||
|
||||
//----- image drawing
|
||||
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GBool invert,
|
||||
+ int width, int height, poppler_bool invert,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ poppler_bool interpolate,
|
||||
#endif
|
||||
- GBool inlineImg) override;
|
||||
+ poppler_bool inlineImg) override;
|
||||
virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ poppler_bool interpolate,
|
||||
#endif
|
||||
- int *maskColors, GBool inlineImg) override;
|
||||
+ int *maskColors, poppler_bool inlineImg) override;
|
||||
virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height,
|
||||
GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ poppler_bool interpolate,
|
||||
#endif
|
||||
Stream *maskStr, int maskWidth, int maskHeight,
|
||||
- GBool maskInvert
|
||||
+ poppler_bool maskInvert
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool maskInterpolate
|
||||
+ , poppler_bool maskInterpolate
|
||||
#endif
|
||||
) override;
|
||||
virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height,
|
||||
GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ poppler_bool interpolate,
|
||||
#endif
|
||||
Stream *maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
GfxImageColorMap *maskColorMap
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool maskInterpolate
|
||||
+ , poppler_bool maskInterpolate
|
||||
#endif
|
||||
) override;
|
||||
|
||||
@@ -279,7 +289,7 @@ extern FILE* g_binary_out;
|
||||
|
||||
// note: if you ever change Output_t, please keep in mind that the current code
|
||||
// relies on it being of 8 bit size
|
||||
-typedef Guchar Output_t;
|
||||
+typedef unsigned char Output_t;
|
||||
typedef std::vector< Output_t > OutputBuffer;
|
||||
|
||||
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
||||
index 44f30c0ba..66c175165 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
||||
@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
||||
appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
|
||||
|
||||
// initialize stream
|
||||
- Guchar *p, *pm;
|
||||
+ unsigned char *p, *pm;
|
||||
GfxRGB rgb;
|
||||
GfxGray alpha;
|
||||
ImageStream* imgStr =
|
||||
@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
||||
appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
|
||||
|
||||
// initialize stream
|
||||
- Guchar *p;
|
||||
+ unsigned char *p;
|
||||
GfxRGB rgb;
|
||||
ImageStream* imgStr =
|
||||
new ImageStream(str,
|
||||
@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
||||
{
|
||||
for( int x = 0; x < maskWidth; ++x )
|
||||
{
|
||||
- Guchar aPixel = 0;
|
||||
+ unsigned char aPixel = 0;
|
||||
imgStrMask->getPixel( &aPixel );
|
||||
int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
|
||||
(x*width/maskWidth)*4 + 1 + 3 // mapped column
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
index 16db05afe..cd559cab0 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
|
||||
|
||||
// read config file
|
||||
globalParams = new GlobalParams();
|
||||
- globalParams->setErrQuiet(gTrue);
|
||||
+ globalParams->setErrQuiet(true);
|
||||
#if defined(_MSC_VER)
|
||||
globalParams->setupBaseFonts(nullptr);
|
||||
#endif
|
||||
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
|
||||
i,
|
||||
PDFI_OUTDEV_RESOLUTION,
|
||||
PDFI_OUTDEV_RESOLUTION,
|
||||
- 0, gTrue, gTrue, gTrue);
|
||||
+ 0, true, true, true);
|
||||
rDoc.processLinks(&aOutDev, i);
|
||||
}
|
||||
|
||||
|
|
@ -4,16 +4,16 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }:
|
|||
|
||||
let
|
||||
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
|
||||
revision = "22730";
|
||||
revision = "22806";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scribus-unstable-${version}";
|
||||
version = "2018-10-13";
|
||||
version = "2019-01-16";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://scribus.net/trunk/Scribus";
|
||||
rev = revision;
|
||||
sha256 = "1nlg4qva0fach8fi07r1pakjjlijishpwzlgpnxyaz7r31yjaw63";
|
||||
sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -96,6 +96,14 @@ stdenv.mkDerivation rec {
|
|||
rev = "db10d327ade93711da735a599a67580524e6f7b4";
|
||||
sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/26442
|
||||
(fetchSageDiff {
|
||||
name = "cypari2-2.0.3.patch";
|
||||
base = "8.6.rc1";
|
||||
rev = "cd62d45bcef93fb4f7ed62609a46135e6de07051";
|
||||
sha256 = "08l2b9w0rn1zrha6188j72f7737xs126gkgmydjd31baa6367np2";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-repo-${version}";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "09p0xv8x7mkmibri7rcl1k4dwh2gj3c7dipkrwrsir6hrwsispd1";
|
||||
sha256 = "0ll1yzwgpayps7c05j8kf1m4zvww7crmlyy7xa0w5g2krbjvjzvi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ with stdenv.lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "gitea-${version}";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
rev = "v${version}";
|
||||
sha256 = "02d37mh1qxsq9lc9ylk5sgdlc1cgwh6fri077crk43mnyb5lhj3j";
|
||||
sha256 = "09h8nbzsxm34rlfnvbsf4cs02igids806927xpxf7g563cdapcnl";
|
||||
# Required to generate the same checksum on MacOS due to unicode encoding differences
|
||||
# More information: https://github.com/NixOS/nixpkgs/pull/48128
|
||||
extraPostFetch = ''
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gitolite-${version}";
|
||||
version = "3.6.10";
|
||||
version = "3.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sitaramc";
|
||||
repo = "gitolite";
|
||||
rev = "v${version}";
|
||||
sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h";
|
||||
sha256 = "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh";
|
||||
};
|
||||
|
||||
buildInputs = [ git nettools perl ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
substituteInPlace ./install --replace " 2>/dev/null" ""
|
||||
substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \
|
||||
--replace /usr/bin/perl "${perl}/bin/perl"
|
||||
|
|
|
|||
|
|
@ -127,8 +127,8 @@ in {
|
|||
};
|
||||
|
||||
subversion_1_11 = common {
|
||||
version = "1.11.0";
|
||||
sha256 = "0miyz3xsxxp56iczxv6yqd8p06av3vxpb5nasyg2xb3ln1247i47";
|
||||
version = "1.11.1";
|
||||
sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy";
|
||||
extraBuildInputs = [ lz4 utf8proc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vlc-${version}";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
|
||||
sha256 = "1nvj00khy08sing0mdnw6virmiq579mrk5rvpx9710nlxggqgh7m";
|
||||
sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q";
|
||||
};
|
||||
|
||||
# VLC uses a *ton* of libraries for various pieces of functionality, many of
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
From 858dbaaeda33b05c1ac80aea0ba9a03924e09005 Mon Sep 17 00:00:00 2001
|
||||
From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
|
||||
Date: Wed, 9 May 2018 11:08:12 +0100
|
||||
Subject: [PATCH] libacpi: fixes for iasl >= 20180427
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
New versions of iasl have introduced improved C file generation, as
|
||||
reported in the changelog:
|
||||
|
||||
iASL: Enhanced the -tc option (which creates an AML hex file in C,
|
||||
suitable for import into a firmware project):
|
||||
1) Create a unique name for the table, to simplify use of multiple
|
||||
SSDTs.
|
||||
2) Add a protection #ifdef in the file, similar to a .h header file.
|
||||
|
||||
The net effect of that on generated files is:
|
||||
|
||||
-unsigned char AmlCode[] =
|
||||
+#ifndef __SSDT_S4_HEX__
|
||||
+#define __SSDT_S4_HEX__
|
||||
+
|
||||
+unsigned char ssdt_s4_aml_code[] =
|
||||
|
||||
The above example is from ssdt_s4.asl.
|
||||
|
||||
Fix the build with newer versions of iasl by stripping the '_aml_code'
|
||||
suffix from the variable name on generated files.
|
||||
|
||||
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
|
||||
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
||||
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
Release-acked-by: Juergen Gross <jgross@suse.com>
|
||||
---
|
||||
tools/libacpi/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
|
||||
index a47a658a25..c17f3924cc 100644
|
||||
--- a/tools/libacpi/Makefile
|
||||
+++ b/tools/libacpi/Makefile
|
||||
@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
|
||||
|
||||
$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
|
||||
iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
|
||||
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
|
||||
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
|
||||
rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
|
||||
|
||||
$(MK_DSDT): mk_dsdt.c
|
||||
@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
|
||||
|
||||
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
|
||||
iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
|
||||
- sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
|
||||
+ sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
|
||||
echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
|
||||
mv -f $@.$(TMP_SUFFIX) $@
|
||||
rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -120,7 +120,8 @@ stdenv.mkDerivation (rec {
|
|||
'';
|
||||
|
||||
patches = [ ./0000-fix-ipxe-src.patch
|
||||
./0000-fix-install-python.patch ]
|
||||
./0000-fix-install-python.patch
|
||||
./acpica-utils-20180427.patch]
|
||||
++ (config.patches or []);
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
2916
pkgs/applications/window-managers/way-cooler/crates-io.nix
Normal file
2916
pkgs/applications/window-managers/way-cooler/crates-io.nix
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -6,21 +6,30 @@ let
|
|||
# refer to
|
||||
# https://github.com/way-cooler/way-cooler.github.io/blob/master/way-cooler-release-i3-default.sh
|
||||
# for version numbers
|
||||
cratesIO = callPackage ./crates-io.nix {};
|
||||
|
||||
fakegit = writeShellScriptBin "git" ''
|
||||
echo ""
|
||||
'';
|
||||
way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override {
|
||||
# https://nest.pijul.com/pmeunier/carnix/discussions/22
|
||||
version = "0.8.1";
|
||||
deps = (callPackage ./way-cooler.nix {}).deps;
|
||||
way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps {
|
||||
features = cratesIO.features_.way_cooler."${version}" deps {
|
||||
"way_cooler"."${version}" = f;
|
||||
};
|
||||
};
|
||||
way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
|
||||
crateOverrides = defaultCrateOverrides // {
|
||||
|
||||
way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
|
||||
};}).overrideAttrs (oldAttrs: rec {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p $out/etc
|
||||
cp -r config $out/etc/way-cooler
|
||||
'';
|
||||
});
|
||||
|
||||
wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -29,8 +38,9 @@ let
|
|||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
|
||||
'';
|
||||
});
|
||||
wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
|
||||
});
|
||||
|
||||
wc-grab = (callPackage ./wc-grab.nix {}).wc_grab {};
|
||||
|
||||
wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
|
||||
crateOverrides = defaultCrateOverrides // {
|
||||
|
||||
|
|
@ -43,6 +53,7 @@ let
|
|||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
|
||||
'';
|
||||
});
|
||||
|
||||
# https://github.com/way-cooler/way-cooler/issues/446
|
||||
wc-bar-bare = stdenv.mkDerivation {
|
||||
name = "wc-bar-bare-2017-12-05";
|
||||
|
|
@ -75,7 +86,7 @@ let
|
|||
${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
|
||||
'';
|
||||
in symlinkJoin rec {
|
||||
version = "0.8.0";
|
||||
inherit version;
|
||||
name = "way-cooler-with-extensions-${version}";
|
||||
paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
|
||||
|
||||
|
|
@ -94,6 +105,7 @@ in symlinkJoin rec {
|
|||
homepage = http://way-cooler.org/;
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = [ maintainers.miltador ];
|
||||
broken = stdenv.hostPlatform.isAarch64; # fails to build wc-bg (on aarch64)
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -4,7 +4,6 @@ let inherit (lib.lists) fold;
|
|||
inherit (lib.attrsets) recursiveUpdate;
|
||||
in
|
||||
rec {
|
||||
|
||||
# aho-corasick-0.6.8
|
||||
|
||||
crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
|
||||
|
|
@ -1456,6 +1455,38 @@ rec {
|
|||
}) [];
|
||||
|
||||
|
||||
# end
|
||||
# serde-1.0.84
|
||||
|
||||
crates.serde."1.0.84" = deps: { features?(features_.serde."1.0.84" deps {}) }: buildRustCrate {
|
||||
crateName = "serde";
|
||||
version = "1.0.84";
|
||||
authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
|
||||
sha256 = "1x40cvvkbkz592jflwbfbxhim3wxdqp9dy0qxjw13ra7q57b29gy";
|
||||
build = "build.rs";
|
||||
dependencies = mapFeatures features ([
|
||||
]);
|
||||
features = mkFeatures (features."serde"."1.0.84" or {});
|
||||
};
|
||||
features_.serde."1.0.84" = deps: f: updateFeatures f (rec {
|
||||
serde = fold recursiveUpdate {} [
|
||||
{ "1.0.84".default = (f.serde."1.0.84".default or true); }
|
||||
{ "1.0.84".serde_derive =
|
||||
(f.serde."1.0.84".serde_derive or false) ||
|
||||
(f.serde."1.0.84".derive or false) ||
|
||||
(serde."1.0.84"."derive" or false); }
|
||||
{ "1.0.84".std =
|
||||
(f.serde."1.0.84".std or false) ||
|
||||
(f.serde."1.0.84".default or false) ||
|
||||
(serde."1.0.84"."default" or false); }
|
||||
{ "1.0.84".unstable =
|
||||
(f.serde."1.0.84".unstable or false) ||
|
||||
(f.serde."1.0.84".alloc or false) ||
|
||||
(serde."1.0.84"."alloc" or false); }
|
||||
];
|
||||
}) [];
|
||||
|
||||
|
||||
# end
|
||||
# serde_derive-1.0.80
|
||||
|
||||
|
|
@ -1744,6 +1775,26 @@ rec {
|
|||
];
|
||||
|
||||
|
||||
# end
|
||||
# toml-0.4.10
|
||||
|
||||
crates.toml."0.4.10" = deps: { features?(features_.toml."0.4.10" deps {}) }: buildRustCrate {
|
||||
crateName = "toml";
|
||||
version = "0.4.10";
|
||||
authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
|
||||
sha256 = "0fs4kxl86w3kmgwcgcv23nk79zagayz1spg281r83w0ywf88d6f1";
|
||||
dependencies = mapFeatures features ([
|
||||
(crates."serde"."${deps."toml"."0.4.10"."serde"}" deps)
|
||||
]);
|
||||
};
|
||||
features_.toml."0.4.10" = deps: f: updateFeatures f (rec {
|
||||
serde."${deps.toml."0.4.10".serde}".default = true;
|
||||
toml."0.4.10".default = (f.toml."0.4.10".default or true);
|
||||
}) [
|
||||
(features_.serde."${deps."toml"."0.4.10"."serde"}" deps)
|
||||
];
|
||||
|
||||
|
||||
# end
|
||||
# toml-0.4.8
|
||||
|
||||
|
|
@ -1764,6 +1815,26 @@ rec {
|
|||
];
|
||||
|
||||
|
||||
# end
|
||||
# toml2nix-0.1.1
|
||||
|
||||
crates.toml2nix."0.1.1" = deps: { features?(features_.toml2nix."0.1.1" deps {}) }: buildRustCrate {
|
||||
crateName = "toml2nix";
|
||||
version = "0.1.1";
|
||||
authors = [ "Pierre-Étienne Meunier <pierre-etienne.meunier@inria.fr>" ];
|
||||
sha256 = "167qyylp0s76h7r0n99as3jwry5mrn5q1wxh2sdwh51d5qnnw6b2";
|
||||
dependencies = mapFeatures features ([
|
||||
(crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps)
|
||||
]);
|
||||
};
|
||||
features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec {
|
||||
toml."${deps.toml2nix."0.1.1".toml}".default = true;
|
||||
toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true);
|
||||
}) [
|
||||
(features_.toml."${deps."toml2nix"."0.1.1"."toml"}" deps)
|
||||
];
|
||||
|
||||
|
||||
# end
|
||||
# ucd-util-0.1.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "source-sans-pro-2.040";
|
||||
name = "source-sans-pro-2.045";
|
||||
|
||||
url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/2.040R-ro%2F1.090R-it/source-sans-pro-2.040R-ro-1.090R-it.zip";
|
||||
url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip;
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype $out/share/fonts/variable
|
||||
mkdir -p $out/share/fonts/{opentype,truetype,variable}
|
||||
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
|
||||
'';
|
||||
|
||||
sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp";
|
||||
sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://sourceforge.net/adobe/sourcesans;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "papirus-icon-theme-${version}";
|
||||
version = "20181120";
|
||||
version = "20190106";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = "papirus-icon-theme";
|
||||
rev = version;
|
||||
sha256 = "1v0vb7l948gxyz37vzh01jqmb8d3w3hxw85vly08ra1ldixaczc5";
|
||||
sha256 = "0i5dmpqq65nipps800iijxd6krnvrdbnd6zrf7f145dg7r6hfk8p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shades-of-gray-theme-${version}";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WernerFP";
|
||||
repo = "Shades-of-gray-theme";
|
||||
rev = version;
|
||||
sha256 = "14p1s1pmzqnn9j9vwqfxfd4i045p356a6d9rwzzs0gx3c6ibqx3a";
|
||||
sha256 = "1i5mra1ib3c8xqnhwjh8yzjcdnhvqdmccw5x52sfh9xq797px39l";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk_engines ];
|
||||
|
|
|
|||
|
|
@ -2,23 +2,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dtc-${version}";
|
||||
version = "1.4.5";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
|
||||
sha256 = "0l787g1wmd4d6izsp91m5r2qms2h2jg2hhzllfi9qkbnplyz21wn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison pkgconfig swig which ];
|
||||
buildInputs = [ python2 ];
|
||||
|
||||
patches = [
|
||||
# Fix 32-bit build
|
||||
(fetchpatch {
|
||||
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=497432fd2131967f349e69dc5d259072151cc4b4";
|
||||
sha256 = "1hrvhvz0qkck53mhacrc4rxjrvp34d8dkw7xb5lr4gpg32grvkpq";
|
||||
})
|
||||
# Fix setup.py
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dezgeg/dtc/commit/d94a745148ba5c9198143ccc0f7d877fe498ab73.patch";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iasl-${version}";
|
||||
version = "20180313";
|
||||
version = "20181213";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
|
||||
sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
|
||||
sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ productVersion
|
||||
, patchVersion
|
||||
, downloadUrl
|
||||
, buildVersion
|
||||
, sha256
|
||||
, jceName
|
||||
, jceDownloadUrl
|
||||
, releaseToken
|
||||
, sha256JCE
|
||||
}:
|
||||
|
||||
{ swingSupport ? true
|
||||
, stdenv
|
||||
, requireFile
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, unzip
|
||||
, file
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
, installjdk ? true
|
||||
, pluginSupport ? true
|
||||
, installjce ? false
|
||||
, licenseAccepted ? false
|
||||
, glib
|
||||
, libxml2
|
||||
, libav_0_8
|
||||
|
|
@ -36,6 +37,13 @@
|
|||
|
||||
assert swingSupport -> xorg != null;
|
||||
|
||||
if !licenseAccepted then throw ''
|
||||
You must accept the Oracle Binary Code License Agreement for Java SE at
|
||||
https://www.oracle.com/technetwork/java/javase/terms/license/index.html
|
||||
by setting nixpkgs config option 'oraclejdk.accept_license = true;'
|
||||
''
|
||||
else assert licenseAccepted;
|
||||
|
||||
let
|
||||
|
||||
/**
|
||||
|
|
@ -50,10 +58,10 @@ let
|
|||
|
||||
jce =
|
||||
if installjce then
|
||||
requireFile {
|
||||
name = jceName;
|
||||
url = jceDownloadUrl;
|
||||
fetchurl {
|
||||
url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}";
|
||||
sha256 = sha256JCE;
|
||||
curlOpts = "-b oraclelicense=a";
|
||||
}
|
||||
else
|
||||
"";
|
||||
|
|
@ -67,19 +75,23 @@ let
|
|||
|
||||
in
|
||||
|
||||
assert sha256 ? ${stdenv.hostPlatform.system};
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
name =
|
||||
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
|
||||
|
||||
src = requireFile {
|
||||
name = {
|
||||
i686-linux = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz";
|
||||
x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";
|
||||
armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz";
|
||||
aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz";
|
||||
src = let
|
||||
platformName = {
|
||||
i686-linux = "linux-i586";
|
||||
x86_64-linux = "linux-x64";
|
||||
armv7l-linux = "linux-arm32-vfp-hflt";
|
||||
aarch64-linux = "linux-arm64-vfp-hflt";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
url = downloadUrl;
|
||||
sha256 = sha256.${stdenv.hostPlatform.system};
|
||||
in fetchurl {
|
||||
url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
|
||||
curlOpts = "-b oraclelicense=a";
|
||||
sha256 = sha256.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ file ]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "191";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
|
||||
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
|
||||
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
|
||||
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
|
||||
patchVersion = "201";
|
||||
buildVersion = "09";
|
||||
sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac";
|
||||
sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b";
|
||||
sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz";
|
||||
sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k";
|
||||
releaseToken = "42970487e3af4f5aa5bca3f542482c60";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "191";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
|
||||
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
|
||||
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
|
||||
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
|
||||
patchVersion = "201";
|
||||
buildVersion = "09";
|
||||
sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac";
|
||||
sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b";
|
||||
sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz";
|
||||
sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k";
|
||||
releaseToken = "42970487e3af4f5aa5bca3f542482c60";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An embeddable Javascript engine, with a focus on portability and compact footprint";
|
||||
homepage = "http://duktape.org/";
|
||||
downloadPage = "http://duktape.org/download.html";
|
||||
homepage = https://duktape.org/;
|
||||
downloadPage = https://duktape.org/download.html;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.fgaz ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, substituteAll, fetchurl
|
||||
, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
|
||||
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
|
||||
, makeWrapper, callPackage, self, gdbm, db, lzma
|
||||
, callPackage, self, gdbm, db, lzma
|
||||
, python-setup-hook
|
||||
# For the Python package set
|
||||
, packageOverrides ? (self: super: {})
|
||||
|
|
@ -37,7 +37,7 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
|
||||
] ++ optionals isPy3k [
|
||||
|
|
@ -128,15 +128,6 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
ln -s $out/${executable}/include $out/include/${libPrefix}
|
||||
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
|
||||
|
||||
# We must wrap the original, not the symlink.
|
||||
# PyPy uses argv[0] to find its standard library, and while it knows
|
||||
# how to follow symlinks, it doesn't know about wrappers. So, it
|
||||
# will think the wrapper is the original. As long as the wrapper has
|
||||
# the same path as the original, this is OK.
|
||||
wrapProgram "$out/${executable}-c/${executable}-c" \
|
||||
--set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \
|
||||
--set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib"
|
||||
|
||||
# verify cffi modules
|
||||
$out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"}
|
||||
|
||||
|
|
@ -149,7 +140,7 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pypy.org/;
|
||||
description = "Fast, compliant alternative implementation of the Python language (3.5.3)";
|
||||
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
|
||||
license = licenses.mit;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ andersk ];
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pypy.org/;
|
||||
description = "Fast, compliant alternative implementation of the Python language (3.5.3)";
|
||||
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatpak";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [ "out" "man" "doc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "01z7ybskxh6r58yh1m98z0z36fba4ljaxpqmh4y6kkaw8pyhhs6i";
|
||||
sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
|
||||
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
|
||||
libsoup lzma ostree polkit python3 systemd xorg.libXau
|
||||
gnome3.gsettings-desktop-schemas glib-networking
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = [ stdenv.lib.maintainers.dfordivam ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:
|
||||
|
||||
let version = "8.2.1";
|
||||
let version = "8.3.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qpdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
|
||||
sha256 = "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl";
|
||||
sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtstyleplugin-kvantum-${version}";
|
||||
version = "0.10.6";
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "0.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "a6daa1a6df3c5d4abc7ea39ef7028ddea2addbf6";
|
||||
sha256 = "1zns4x95h0ydiwx8yw0bmyg4lc2sy7annmdrg66sx753x3177zxp";
|
||||
rev = "V${version}";
|
||||
sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/Kvantum";
|
||||
sourceRoot = "source/Kvantum";
|
||||
|
||||
postPatch = ''
|
||||
# Fix plugin dir
|
||||
|
|
|
|||
|
|
@ -1,18 +1,24 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib }:
|
||||
{ stdenv, fetchurl, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_43, dbus, glib }:
|
||||
|
||||
let
|
||||
version = "0.1.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "xdg-dbus-proxy-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-dbus-proxy";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "055wli36lvdannp6qqwbvd78353n61wn9kp8y3dchh39wq7x7vwy";
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1w8yg5j51zsr9d97d4jjp9dvd7iq893p2xk54i6lf3lx01ribdqh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt docbook_xsl docbook_xml_dtd_43 ];
|
||||
buildInputs = [ glib ];
|
||||
checkInputs = [ dbus ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-man"
|
||||
];
|
||||
|
||||
# dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "DBus proxy for Flatpak and others";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
, "dhcp"
|
||||
, "dnschain"
|
||||
, "elasticdump"
|
||||
, "elm-live"
|
||||
, "elm-oracle"
|
||||
, "elm-test"
|
||||
, "emoj"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -13,13 +13,13 @@ let
|
|||
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
|
||||
};
|
||||
};
|
||||
"ajv-6.6.1" = {
|
||||
"ajv-6.7.0" = {
|
||||
name = "ajv";
|
||||
packageName = "ajv";
|
||||
version = "6.6.1";
|
||||
version = "6.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
|
||||
sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
|
||||
url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz";
|
||||
sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==";
|
||||
};
|
||||
};
|
||||
"ansi-regex-2.1.1" = {
|
||||
|
|
@ -535,22 +535,22 @@ let
|
|||
sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
|
||||
};
|
||||
};
|
||||
"fined-1.1.0" = {
|
||||
"fined-1.1.1" = {
|
||||
name = "fined";
|
||||
packageName = "fined";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz";
|
||||
sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
|
||||
url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz";
|
||||
sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==";
|
||||
};
|
||||
};
|
||||
"flagged-respawn-1.0.0" = {
|
||||
"flagged-respawn-1.0.1" = {
|
||||
name = "flagged-respawn";
|
||||
packageName = "flagged-respawn";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz";
|
||||
sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7";
|
||||
url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz";
|
||||
sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==";
|
||||
};
|
||||
};
|
||||
"for-in-1.0.2" = {
|
||||
|
|
@ -1206,7 +1206,7 @@ let
|
|||
packageName = "minimist";
|
||||
version = "0.0.8";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
|
||||
url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
|
||||
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
|
||||
};
|
||||
};
|
||||
|
|
@ -1215,7 +1215,7 @@ let
|
|||
packageName = "minimist";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
|
||||
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
|
||||
sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
|
||||
};
|
||||
};
|
||||
|
|
@ -1251,7 +1251,7 @@ let
|
|||
packageName = "mkdirp";
|
||||
version = "0.5.1";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
|
||||
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
|
||||
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
|
||||
};
|
||||
};
|
||||
|
|
@ -1309,13 +1309,13 @@ let
|
|||
sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==";
|
||||
};
|
||||
};
|
||||
"npm-packlist-1.1.12" = {
|
||||
"npm-packlist-1.2.0" = {
|
||||
name = "npm-packlist";
|
||||
packageName = "npm-packlist";
|
||||
version = "1.1.12";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz";
|
||||
sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==";
|
||||
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz";
|
||||
sha512 = "7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==";
|
||||
};
|
||||
};
|
||||
"npmlog-4.1.2" = {
|
||||
|
|
@ -1413,7 +1413,7 @@ let
|
|||
packageName = "os-homedir";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
|
||||
url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
|
||||
sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
|
||||
};
|
||||
};
|
||||
|
|
@ -1422,7 +1422,7 @@ let
|
|||
packageName = "os-tmpdir";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
|
||||
url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
|
||||
sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
|
||||
};
|
||||
};
|
||||
|
|
@ -1467,7 +1467,7 @@ let
|
|||
packageName = "path-is-absolute";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
|
||||
url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
|
||||
sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
|
||||
};
|
||||
};
|
||||
|
|
@ -1525,13 +1525,13 @@ let
|
|||
sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
|
||||
};
|
||||
};
|
||||
"psl-1.1.29" = {
|
||||
"psl-1.1.31" = {
|
||||
name = "psl";
|
||||
packageName = "psl";
|
||||
version = "1.1.29";
|
||||
version = "1.1.31";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz";
|
||||
sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==";
|
||||
url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz";
|
||||
sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==";
|
||||
};
|
||||
};
|
||||
"punycode-1.4.1" = {
|
||||
|
|
@ -1575,7 +1575,7 @@ let
|
|||
packageName = "readable-stream";
|
||||
version = "2.3.6";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
|
||||
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
|
||||
sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
|
||||
};
|
||||
};
|
||||
|
|
@ -1624,13 +1624,13 @@ let
|
|||
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
|
||||
};
|
||||
};
|
||||
"resolve-1.8.1" = {
|
||||
"resolve-1.9.0" = {
|
||||
name = "resolve";
|
||||
packageName = "resolve";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
|
||||
sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
|
||||
url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz";
|
||||
sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==";
|
||||
};
|
||||
};
|
||||
"resolve-dir-1.0.1" = {
|
||||
|
|
@ -1660,13 +1660,13 @@ let
|
|||
sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
|
||||
};
|
||||
};
|
||||
"rimraf-2.6.2" = {
|
||||
"rimraf-2.6.3" = {
|
||||
name = "rimraf";
|
||||
packageName = "rimraf";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
|
||||
sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==";
|
||||
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
|
||||
sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
|
||||
};
|
||||
};
|
||||
"safe-buffer-5.1.2" = {
|
||||
|
|
@ -1683,7 +1683,7 @@ let
|
|||
packageName = "safe-regex";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
|
||||
url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
|
||||
sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
|
||||
};
|
||||
};
|
||||
|
|
@ -1710,7 +1710,7 @@ let
|
|||
packageName = "semver";
|
||||
version = "5.3.0";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
|
||||
url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
|
||||
sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
|
||||
};
|
||||
};
|
||||
|
|
@ -1822,13 +1822,13 @@ let
|
|||
sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
|
||||
};
|
||||
};
|
||||
"sshpk-1.15.2" = {
|
||||
"sshpk-1.16.0" = {
|
||||
name = "sshpk";
|
||||
packageName = "sshpk";
|
||||
version = "1.15.2";
|
||||
version = "1.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz";
|
||||
sha512 = "Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==";
|
||||
url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz";
|
||||
sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==";
|
||||
};
|
||||
};
|
||||
"static-extend-0.1.2" = {
|
||||
|
|
@ -1854,7 +1854,7 @@ let
|
|||
packageName = "string_decoder";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
|
||||
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
|
||||
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
|
||||
};
|
||||
};
|
||||
|
|
@ -1863,7 +1863,7 @@ let
|
|||
packageName = "strip-ansi";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
|
||||
url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
|
||||
sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
|
||||
};
|
||||
};
|
||||
|
|
@ -1881,7 +1881,7 @@ let
|
|||
packageName = "tar";
|
||||
version = "2.2.1";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz";
|
||||
url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz";
|
||||
sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
|
||||
};
|
||||
};
|
||||
|
|
@ -2020,13 +2020,13 @@ let
|
|||
sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
|
||||
};
|
||||
};
|
||||
"v8flags-3.1.1" = {
|
||||
"v8flags-3.1.2" = {
|
||||
name = "v8flags";
|
||||
packageName = "v8flags";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz";
|
||||
sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==";
|
||||
url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz";
|
||||
sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==";
|
||||
};
|
||||
};
|
||||
"verror-1.10.0" = {
|
||||
|
|
@ -2082,7 +2082,7 @@ in
|
|||
packageName = "bower";
|
||||
version = "1.8.4";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
|
||||
url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
|
||||
sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
|
|
@ -2201,8 +2201,8 @@ in
|
|||
];
|
||||
})
|
||||
sources."findup-sync-2.0.0"
|
||||
sources."fined-1.1.0"
|
||||
sources."flagged-respawn-1.0.0"
|
||||
sources."fined-1.1.1"
|
||||
sources."flagged-respawn-1.0.1"
|
||||
sources."for-in-1.0.2"
|
||||
sources."for-own-1.0.0"
|
||||
sources."fragment-cache-0.2.1"
|
||||
|
|
@ -2284,7 +2284,7 @@ in
|
|||
sources."regex-not-1.0.2"
|
||||
sources."repeat-element-1.1.3"
|
||||
sources."repeat-string-1.6.1"
|
||||
sources."resolve-1.8.1"
|
||||
sources."resolve-1.9.0"
|
||||
sources."resolve-dir-1.0.1"
|
||||
sources."resolve-url-0.2.1"
|
||||
sources."ret-0.1.15"
|
||||
|
|
@ -2369,7 +2369,7 @@ in
|
|||
})
|
||||
sources."urix-0.1.0"
|
||||
sources."use-3.1.1"
|
||||
sources."v8flags-3.1.1"
|
||||
sources."v8flags-3.1.2"
|
||||
sources."which-1.3.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
|
|
@ -2391,7 +2391,7 @@ in
|
|||
};
|
||||
dependencies = [
|
||||
sources."abbrev-1.1.1"
|
||||
sources."ajv-6.6.1"
|
||||
sources."ajv-6.7.0"
|
||||
sources."ansi-regex-2.1.1"
|
||||
sources."aproba-1.2.0"
|
||||
sources."are-we-there-yet-1.1.5"
|
||||
|
|
@ -2459,18 +2459,18 @@ in
|
|||
sources."path-is-absolute-1.0.1"
|
||||
sources."performance-now-2.1.0"
|
||||
sources."process-nextick-args-2.0.0"
|
||||
sources."psl-1.1.29"
|
||||
sources."psl-1.1.31"
|
||||
sources."punycode-2.1.1"
|
||||
sources."qs-6.5.2"
|
||||
sources."readable-stream-2.3.6"
|
||||
sources."request-2.88.0"
|
||||
sources."rimraf-2.6.2"
|
||||
sources."rimraf-2.6.3"
|
||||
sources."safe-buffer-5.1.2"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."semver-5.3.0"
|
||||
sources."set-blocking-2.0.0"
|
||||
sources."signal-exit-3.0.2"
|
||||
sources."sshpk-1.15.2"
|
||||
sources."sshpk-1.16.0"
|
||||
sources."string-width-1.0.2"
|
||||
sources."string_decoder-1.1.1"
|
||||
sources."strip-ansi-3.0.1"
|
||||
|
|
@ -2502,10 +2502,10 @@ in
|
|||
node-gyp-build = nodeEnv.buildNodePackage {
|
||||
name = "node-gyp-build";
|
||||
packageName = "node-gyp-build";
|
||||
version = "3.5.1";
|
||||
version = "3.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
|
||||
sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
|
||||
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz";
|
||||
sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
@ -2561,7 +2561,7 @@ in
|
|||
sources."needle-2.2.4"
|
||||
sources."nopt-4.0.1"
|
||||
sources."npm-bundled-1.0.5"
|
||||
sources."npm-packlist-1.1.12"
|
||||
sources."npm-packlist-1.2.0"
|
||||
sources."npmlog-4.1.2"
|
||||
sources."number-is-nan-1.0.1"
|
||||
sources."object-assign-4.1.1"
|
||||
|
|
@ -2577,7 +2577,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."readable-stream-2.3.6"
|
||||
sources."rimraf-2.6.2"
|
||||
sources."rimraf-2.6.3"
|
||||
sources."safe-buffer-5.1.2"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."sax-1.2.4"
|
||||
|
|
@ -2606,10 +2606,10 @@ in
|
|||
pnpm = nodeEnv.buildNodePackage {
|
||||
name = "pnpm";
|
||||
packageName = "pnpm";
|
||||
version = "2.21.1";
|
||||
version = "2.25.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.21.1.tgz";
|
||||
sha512 = "0UEIdUM8VqRHolaBPREYhTEuu/Zfi4qp3Kp0u6ioCtn7Yi33sGFdApEczb/SenmaqtnWD7OUIO74v8Aw9wnYeg==";
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.1.tgz";
|
||||
sha512 = "VlDIaWSEQJuIQOFzhcg4YQ7enQMrJHb11eUclMj1VxIOxCZX51e/EDu+PZ0IO/4iQsgifiVoQcBbacBKi55jDA==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,13 +6,23 @@ in
|
|||
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
|
||||
version = "1.0.3";
|
||||
sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
|
||||
} else {
|
||||
version = "1.0.2";
|
||||
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
|
||||
}
|
||||
; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-${pname}-${version}";
|
||||
version = "1.0.3";
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
|
||||
inherit (param) sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocamlbuild topkg ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
disabled = !isPy3k; # according to setup.py
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ldmdwfp0g8293k4gyp962nv7ik4zw83p1khkq8jqkzmk7qf040y";
|
||||
sha256 = "0fzm2q922qi68ns5biy807dzmgz1i9gqdh73lcafs0gfk8zyc9v5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bokeh";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "07rczl2xkkqzpm45m0rlb2hki48b6w1k912gmwacf5aisnc0a0rw";
|
||||
sha256 = "1s0gi4n8bn0ain3k6jz6xzbbpn1jpb7rkadmsri8dkcpwyfhacvs";
|
||||
};
|
||||
|
||||
disabled = isPyPy;
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.9.62"; # N.B: if you change this, change botocore too
|
||||
version = "1.9.75"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0rf3ik4bqr0qab2648rcaahycr2sih257ngz8brizyfln0lk1sg9";
|
||||
sha256 = "0l4ifnp7mnf8n7dpf5jf5gwcxccb4qrijqyf3izbz2pdlrv1pw73";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.12.62"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.12.79"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zgq3cldrh1x65s3vy1mhp1h5nnsdxw7ig1v0di7p8yns3iazsv7";
|
||||
sha256 = "16ikl3lv9q4i8bwzvm11a5q3bds42p36i4ap01fm3r9w1kzxb1wd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "1.3.1";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
|
||||
sha256 = "0mghbmilmy34xp1d50xdx76sijqxmpkm2bcgx2v1mdji2ff7n0yc";
|
||||
};
|
||||
|
||||
# This differs slightly from the default python installPhase in that it pip-installs
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "detox";
|
||||
version = "0.15";
|
||||
version = "0.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "accde1a79b621df9dfd55b97460e80743a771a3d9a1acd900489a4355f0cc8c7";
|
||||
sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "discogs-client";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414";
|
||||
sha256 = "1n23xy33fdp3dq0hhfdg0lx4z7rhdi74ik8v1mc7rql1jbxl7bmf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests oauthlib ];
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
# get full repository need conftest.py to run tests
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qay94amxs0k6lmwhy07bq54m5zms0rjmnp7a66fldipjla6w8lg";
|
||||
sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-SocketIO";
|
||||
version = "3.1.0";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7188b35f7874903f554b3a1a3a4465213e765c4f17182fa5cb3d9f6915da4c1";
|
||||
sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flexmock";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fe95c8727f4db73dc8f2f7b4548bffe7992440a965fefd60da291abda5352c2b";
|
||||
sha256 = "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gast";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0c296xm1vz9x4w4inmdl0k8mnc0i9arw94si2i7pglpc461r0s3h";
|
||||
sha256 = "1w5dzdb3gpcfmd2s0b93d8gff40a1s41rv31458z14inb3s9v4zy";
|
||||
};
|
||||
checkInputs = [ astunparse ] ;
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
pname = "iptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3";
|
||||
sha256 = "1sp2v76qqsgqjk0vqfbm2s4sc4mi0gkkpzjnvwih3ymmidilz2hi";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "keyrings.alt";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m";
|
||||
sha256 = "0lgp2d3hrpvbb2rfz18vrv5lrck72k3l2f2cpkbks2kigrfbgiqb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "paste";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Paste";
|
||||
inherit version;
|
||||
sha256 = "1bb2068807ce3592d313ce9b1a25a7ac842a504e7e3b005027193d17a043d1a8";
|
||||
sha256 = "14lbi9asn5agsdf7r97prkjpz7amgmp529lbvfhf0nv881xczah6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
buildPythonPackage rec {
|
||||
|
||||
pname = "peewee";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
|
||||
# pypi release does not provide tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "coleifer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0kqhpalw1587zaz3fcj13mpzs5950l6fm3qlcfqsfp16h8w0s89f";
|
||||
sha256 = "0z6fdihmvqfg0ysa94g4w2w7146fsi2gnrgh90b4i1s3wj8iaxqy";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrsistent";
|
||||
version = "0.14.6";
|
||||
version = "0.14.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5a31f6b093da3401fefdeb53a0980e3145bb9d2bf852b579cc7b39c7f0016c87";
|
||||
sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
, setuptools }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
pname = "pyshp";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0l5a28878vplwclqvjj7v0xx6zlr03ia1dkq5hc3mxf05bahiwyz";
|
||||
sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-django";
|
||||
version = "3.4.4";
|
||||
version = "3.4.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "07zl2438gavrcykva6i2lpxmzgf90h4xlm3nqgd7wsqz2yh727zy";
|
||||
sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest setuptools_scm ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "QtAwesome";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8dfd8bcac56caa6d81639fc43db673b62aeca6129f4c8e9b1da17a32c0d309fd";
|
||||
sha256 = "0yb194c927g9nqknfb49nfqv32l74bb0m71wswijbbybb7syabbl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qtpy six pyside ];
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sortedcollections";
|
||||
version = "1.0.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12q1gf81l53mv634hk259aql69k9572nfv5gsn8gxlywdly2z63b";
|
||||
sha256 = "12nkw69lnyvh9wy6rsd0ng4bcia81vkhj1rj1kj1k3vzppn0sgmr";
|
||||
};
|
||||
|
||||
buildInputs = [ sortedcontainers ];
|
||||
propagatedBuildInputs = [ sortedcontainers ];
|
||||
|
||||
# wants to test all python versions with tox:
|
||||
# No tests in PyPi tarball
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "supervisor";
|
||||
version = "3.3.4";
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
|
||||
sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
|
||||
};
|
||||
|
||||
checkInputs = [ mock ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.22.0";
|
||||
version = "6.23.0";
|
||||
# tests not included in PyPi, so fetch from github instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "1kh2hcjm1qyisqqjyjnilkyj3vv6l5flpjyqkq27pwxvc461aapp";
|
||||
sha256 = "07fb8sklj8527aa8hi71w4iibgmcnndmnqjdcp82ff80ladn9i5y";
|
||||
};
|
||||
|
||||
buildInputs = [ nose mock ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uncompyle6";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lv0ks7w5bsl8bndm6ikl4yprkq2ps23y409ldlycrvlggjg44y5";
|
||||
sha256 = "1z4489grxc06pxmfy63b6x6h54p05fhbigvrrgr1kvdciy2nvz04";
|
||||
};
|
||||
|
||||
checkInputs = [ nose pytest hypothesis six ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unittest-xml-reporting";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
propagatedBuildInputs = [six];
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3ba27af788bddb4403ee72561bfd3df2deb27a926a5426aa9beeb354c59b9c44";
|
||||
sha256 = "1cn870jgf4h0wb4bnafw527g1dj6rd3rgyjz4f64khd0zx9qs84z";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vine";
|
||||
version = "1.1.4";
|
||||
version = "1.2.0";
|
||||
|
||||
disable = pythonOlder "2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72";
|
||||
sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f";
|
||||
};
|
||||
|
||||
buildInputs = [ case pytest ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "w3lib";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "55994787e93b411c2d659068b51b9998d9d0c05e0df188e6daf8f45836e1ea38";
|
||||
sha256 = "1mqwlc1cr15jxr3gr8pqqh5gf0gppm2kcvdi8vid6y8wmq9bjkg5";
|
||||
};
|
||||
|
||||
buildInputs = [ six pytest ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "19fznzypkxgl1i9fy4d72xp7rbk30g62rjqmcmnqf3ij46p8flj2";
|
||||
sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -4,30 +4,22 @@
|
|||
, fetchpatch
|
||||
, git
|
||||
, go
|
||||
, python
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-watcher-${version}";
|
||||
version = "0.5.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sis723hwax4dg0c28x20yj0hjli66q1ykcvjirgy57znz4iwlq9";
|
||||
sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bazelbuild/bazel-watcher/commit/4d5928eee3dd5843a1b55136d914b78fef7f25d0.patch";
|
||||
sha256 = "0gxzcdqgifrmvznfy0p5nd11b39n2pwxcvpmhc6hxf85mwlxz7dg";
|
||||
})
|
||||
|
||||
./update-gazelle-fix-ssl.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ go git ];
|
||||
nativeBuildInputs = [ go git python ];
|
||||
|
||||
bazelTarget = "//ibazel";
|
||||
|
||||
|
|
@ -52,9 +44,15 @@ buildBazelPackage rec {
|
|||
# a different sha256 for the fetch phase.
|
||||
rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
|
||||
sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
|
||||
|
||||
# Remove the gazelle tools, they contain go binaries that are built
|
||||
# non-deterministically. As long as the gazelle version matches the tools
|
||||
# should be equivalent.
|
||||
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
|
||||
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
|
||||
'';
|
||||
|
||||
sha256 = "1iyjvibvlwg980p7nizr6x5v31dyp4a344f0xn839x393583k59d";
|
||||
sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/WORKSPACE b/WORKSPACE
|
||||
index 4011d9b..d085ae8 100644
|
||||
--- a/WORKSPACE
|
||||
+++ b/WORKSPACE
|
||||
@@ -52,11 +52,9 @@ http_archive(
|
||||
|
||||
http_archive(
|
||||
name = "bazel_gazelle",
|
||||
- sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b",
|
||||
- urls = [
|
||||
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
|
||||
- "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
|
||||
- ],
|
||||
+ sha256 = "0600ea2daf98170211dc561fd348a8a9328c91eb6df66a381eaaf0bcd122e80b",
|
||||
+ strip_prefix = "bazel-gazelle-b34f46af2f31ee0470e7364352c2376bcc10d079",
|
||||
+ url = "https://github.com/bazelbuild/bazel-gazelle/archive/b34f46af2f31ee0470e7364352c2376bcc10d079.tar.gz",
|
||||
)
|
||||
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper
|
||||
{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
|
||||
, jdk, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, python, perl, gnused, gnugrep, findutils
|
||||
# Apple dependencies
|
||||
|
|
@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
# additional tests that check bazel’s functionality
|
||||
passthru.tests = {
|
||||
python_bin_path = callPackage ./python-bin-path-test.nix {};
|
||||
};
|
||||
|
||||
name = "bazel-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -47,8 +52,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
sourceRoot = ".";
|
||||
|
||||
patches =
|
||||
lib.optional enableNixHacks ./nix-hacks.patch;
|
||||
patches = [
|
||||
./python-stub-path-fix.patch
|
||||
] ++ lib.optional enableNixHacks ./nix-hacks.patch;
|
||||
|
||||
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
||||
|
||||
|
|
@ -118,6 +124,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
genericPatches = ''
|
||||
# Substitute python's stub shebang to plain python path. (see TODO add pr URL)
|
||||
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
|
||||
--replace "/usr/bin/env python" "${python}/bin/python" \
|
||||
--replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
|
||||
# substituteInPlace is rather slow, so prefilter the files with grep
|
||||
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
|
||||
# If you add more replacements here, you must change the grep above!
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
{ stdenv, lib, writeText, runCommandCC, bazel }:
|
||||
|
||||
let
|
||||
WORKSPACE = writeText "WORKSPACE" ''
|
||||
workspace(name = "our_workspace")
|
||||
'';
|
||||
|
||||
pythonLib = writeText "lib.py" ''
|
||||
def foo():
|
||||
return 43
|
||||
'';
|
||||
|
||||
pythonBin = writeText "bin.py" ''
|
||||
from lib import foo
|
||||
|
||||
assert foo() == 43
|
||||
'';
|
||||
|
||||
pythonBUILD = writeText "BUILD" ''
|
||||
py_library(
|
||||
name = "lib",
|
||||
srcs = [ "lib.py" ],
|
||||
)
|
||||
|
||||
py_test(
|
||||
name = "bin",
|
||||
srcs = [ "bin.py" ],
|
||||
deps = [ ":lib" ],
|
||||
)
|
||||
'';
|
||||
|
||||
runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script;
|
||||
|
||||
workspaceDir = runLocal "our_workspace" ''
|
||||
mkdir $out
|
||||
cp ${WORKSPACE} $out/WORKSPACE
|
||||
mkdir $out/python
|
||||
cp ${pythonLib} $out/python/lib.py
|
||||
cp ${pythonBin} $out/python/bin.py
|
||||
cp ${pythonBUILD} $out/python/BUILD.bazel
|
||||
'';
|
||||
|
||||
testBazel = runLocal "bazel-test-builtin-rules" ''
|
||||
export HOME=$(mktemp -d)
|
||||
cp -r ${workspaceDir}/* .
|
||||
${bazel}/bin/bazel --output_base=/tmp/bazel-tests/wd\
|
||||
test \
|
||||
--test_output=errors \
|
||||
--host_javabase='@local_jdk//:jdk' \
|
||||
//...
|
||||
|
||||
touch $out
|
||||
'';
|
||||
|
||||
in testBazel
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||
index dac21c9a83..69b11c283f 100644
|
||||
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
||||
@@ -67,7 +67,7 @@ def FindPythonBinary(module_space):
|
||||
return os.path.join(module_space, PYTHON_BINARY)
|
||||
else:
|
||||
# Case 4: Path has to be looked up in the search path.
|
||||
- return SearchPath(PYTHON_BINARY)
|
||||
+ return "NIX_STORE_PYTHON_PATH"
|
||||
|
||||
def CreatePythonPathEntries(python_imports, module_space):
|
||||
parts = python_imports.split(':');
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, python3, fetchpatch, git }:
|
||||
{ lib, python3, git }:
|
||||
|
||||
let newPython = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
|
@ -10,71 +10,64 @@ let newPython = python3.override {
|
|||
};
|
||||
});
|
||||
node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.2.0";
|
||||
version = "0.6.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
|
||||
sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
|
||||
};
|
||||
});
|
||||
astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.6.5";
|
||||
future = super.future.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.16.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
|
||||
sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
|
||||
};
|
||||
});
|
||||
pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.8.4";
|
||||
tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.28.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
|
||||
sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav";
|
||||
};
|
||||
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in newPython.pkgs.buildPythonApplication rec {
|
||||
version = "1.6.0";
|
||||
version = "1.11.2";
|
||||
pname = "conan";
|
||||
|
||||
src = newPython.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa";
|
||||
sha256 = "0b4r9n6541jjp2lsdzc1nc6mk1a953w0d4ynjss3ns7pp89y4nd4";
|
||||
};
|
||||
|
||||
# Bump PyYAML to 3.13
|
||||
patches = fetchpatch {
|
||||
url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch;
|
||||
sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
git
|
||||
] ++ (with newPython.pkgs; [
|
||||
codecov
|
||||
mock
|
||||
node-semver
|
||||
nose
|
||||
parameterized
|
||||
mock
|
||||
webtest
|
||||
codecov
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with newPython.pkgs; [
|
||||
requests fasteners pyyaml pyjwt colorama patch
|
||||
bottle pluginbase six distro pylint node-semver
|
||||
future pygments mccabe deprecation
|
||||
colorama deprecation distro fasteners bottle
|
||||
future node-semver patch pygments pluginbase
|
||||
pyjwt pylint pyyaml requests six tqdm
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
export HOME="$TMP/conan-home"
|
||||
mkdir -p "$HOME"
|
||||
nosetests conans.test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://conan.io;
|
||||
description = "Decentralized and portable C/C++ package manager";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ HaoZeke ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, postgresql, makeWrapper }:
|
||||
{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ephemeralpg-${version}";
|
||||
version = "2.5";
|
||||
|
|
@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
mkdir -p $out
|
||||
PREFIX=$out make install
|
||||
wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
|
||||
wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]}
|
||||
'';
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = ''Run tests on an isolated, temporary PostgreSQL database.'';
|
||||
license = stdenv.lib.licenses.isc;
|
||||
license = licenses.isc;
|
||||
homepage = http://ephemeralpg.org/;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ hrdinka ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{ fetchFromBitbucket, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pg_tmp-${version}";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "eradman";
|
||||
repo = "ephemeralpg";
|
||||
rev = "ephemeralpg-${version}";
|
||||
sha256 = "0j0va9pch2xhwwx4li3qx3lkgrd79c0hcy5w5y1cqax571hv89wa";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
PREFIX=$out make install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://ephemeralpg.org;
|
||||
description = "Run tests on an isolated, temporary PostgreSQL database";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ hrdinka ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, libffi, openssl, pythonPackages }:
|
||||
{ stdenv, libffi, openssl, python3Packages }:
|
||||
let
|
||||
inherit (pythonPackages) fetchPypi buildPythonApplication vcrpy mock hiro;
|
||||
inherit (python3Packages) fetchPypi buildPythonApplication vcrpy mock hiro;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "jira-cli";
|
||||
|
|
@ -16,9 +16,9 @@ in
|
|||
|
||||
# Tests rely on VCR cassettes being written during tests. R/O nix store prevents this.
|
||||
doCheck = false;
|
||||
checkInputs = with pythonPackages; [ vcrpy mock hiro ];
|
||||
checkInputs = with python3Packages; [ vcrpy mock hiro ];
|
||||
buildInputs = [ libffi openssl ];
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argparse ordereddict requests six suds-jurko termcolor keyring
|
||||
jira keyrings-alt
|
||||
];
|
||||
|
|
|
|||
|
|
@ -25,4 +25,5 @@ mkDerivation rec {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
description = "Functional sed for JSON";
|
||||
maintainers = with stdenv.lib.maintainers; [ fgaz ];
|
||||
homepage = https://github.com/chrisdone/jl;
|
||||
}
|
||||
|
|
|
|||
43
pkgs/development/tools/misc/ccls/default.nix
Normal file
43
pkgs/development/tools/misc/ccls/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper
|
||||
, cmake, llvmPackages, rapidjson }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ccls-${version}";
|
||||
version = "0.20181225.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaskRay";
|
||||
repo = "ccls";
|
||||
rev = version;
|
||||
sha256 = "1qgb2nk4nsgbx4qwymwlzi202daskk536a5l877fsp878jpp61cm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
|
||||
|
||||
cmakeFlags = [ "-DSYSTEM_CLANG=ON" ];
|
||||
|
||||
shell = stdenv.shell;
|
||||
postFixup = ''
|
||||
# We need to tell ccls where to find the standard library headers.
|
||||
|
||||
standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\""
|
||||
standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
|
||||
export standard_library_includes
|
||||
|
||||
wrapped=".ccls-wrapped"
|
||||
export wrapped
|
||||
|
||||
mv $out/bin/ccls $out/bin/$wrapped
|
||||
substituteAll ${./wrapper} $out/bin/ccls
|
||||
chmod --reference=$out/bin/$wrapped $out/bin/ccls
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A c/c++ language server powered by clang";
|
||||
homepage = https://github.com/MaskRay/ccls;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
12
pkgs/development/tools/misc/ccls/wrapper
Normal file
12
pkgs/development/tools/misc/ccls/wrapper
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#! @shell@ -e
|
||||
|
||||
initString="--init={\"clang\":{\"extraArgs\": [@standard_library_includes@"
|
||||
|
||||
if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then
|
||||
read -a cflags_array <<< ${NIX_CFLAGS_COMPILE}
|
||||
initString+=$(printf ', \"%s\"' "${cflags_array[@]}")
|
||||
fi
|
||||
|
||||
initString+="]}}"
|
||||
|
||||
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pkgconf-1.5.4";
|
||||
name = "pkgconf-1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz";
|
||||
sha256 = "0r26qmij9lxpz183na3dxj6lamcma94cjhasy19fya44w2j68n4w";
|
||||
sha256 = "1rgcw7lbmxv45y4ybnlh1wzhd1d15d2616499ajjnrvnnnms6db1";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,31 +1,22 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
|
||||
{ lib, fetchzip, buildDunePackage, cmdliner }:
|
||||
|
||||
let inherit (stdenv.lib) getVersion versionAtLeast; in
|
||||
|
||||
assert versionAtLeast (getVersion ocaml) "3.12.1";
|
||||
assert versionAtLeast (getVersion cmdliner) "1.0.0";
|
||||
assert versionAtLeast (getVersion ocp-build) "1.99.6-beta";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml${ocaml.version}-ocp-indent-${version}";
|
||||
version = "1.6.1";
|
||||
buildDunePackage rec {
|
||||
version = "1.7.0";
|
||||
pname = "ocp-indent";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
|
||||
sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
|
||||
sha256 = "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocp-build ];
|
||||
buildInputs = [ ocaml findlib cmdliner ];
|
||||
minimumOCamlVersion = "4.02";
|
||||
|
||||
inherit (dune) installPhase;
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = http://typerex.ocamlpro.com/ocp-indent.html;
|
||||
description = "A customizable tool to indent OCaml code";
|
||||
license = licenses.gpl3;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
maintainers = [ maintainers.jirkamarsik ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "vgo2nix-${version}";
|
||||
version = "unstable-2018-10-14";
|
||||
version = "unstable-2018-12-02";
|
||||
goPackagePath = "github.com/adisbladis/vgo2nix";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -17,8 +17,8 @@ buildGoPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "adisbladis";
|
||||
repo = "vgo2nix";
|
||||
rev = "a36137a2b9675f5e9b7e0a7840bc9fe9f2414d4e";
|
||||
sha256 = "1658hr1535v8w3s41q0bcgk8hmisjn8gcw7i3n2d2igszn1dp0q4";
|
||||
rev = "b298f4fb799fc532488fc887e1938668d7f3d219";
|
||||
sha256 = "0gr5vfz5wzpcyxsz948aniyfbryg53agvzbkhdnb5hiwhi7nay9p";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "yq";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
propagatedBuildInputs = [ pyyaml xmltodict jq ];
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c10wbhgx8d8s44a8g2vzn4cmvkf7z7yqxrnk88aapgi51i786q0";
|
||||
sha256 = "1fwvwy75n4rqzh6sxyp2jmjqc7939s0xmrhxw7zhdy6iacggvnpp";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue