mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
commit
747ebe3f66
@ -62,16 +62,7 @@ depending on the JDK at runtime.</para>
|
||||
|
||||
<para>It is possible to use a different Java compiler than
|
||||
<command>javac</command> from the OpenJDK. For instance, to use the
|
||||
Eclipse Java Compiler:
|
||||
|
||||
<programlisting>
|
||||
buildInputs = [ jre ant ecj ];
|
||||
</programlisting>
|
||||
|
||||
(Note that here you don’t need the full JDK as an input, but just the
|
||||
JRE.) The ECJ has a stdenv setup hook that sets some environment
|
||||
variables to cause Ant to use ECJ, but this doesn’t work with all Ant
|
||||
files. Similarly, you can use the GNU Java Compiler:
|
||||
GNU Java Compiler:
|
||||
|
||||
<programlisting>
|
||||
buildInputs = [ gcj ant ];
|
||||
|
||||
@ -596,6 +596,11 @@
|
||||
github = "bjornfor";
|
||||
name = "Bjørn Forsman";
|
||||
};
|
||||
bkchr = {
|
||||
email = "nixos@kchr.de";
|
||||
github = "bkchr";
|
||||
name = "Bastian Köcher";
|
||||
};
|
||||
bluescreen303 = {
|
||||
email = "mathijs@bluescreen303.nl";
|
||||
github = "bluescreen303";
|
||||
@ -1996,6 +2001,11 @@
|
||||
github = "leenaars";
|
||||
name = "Michiel Leenaars";
|
||||
};
|
||||
leo60228 = {
|
||||
email = "iakornfeld@gmail.com";
|
||||
github = "leo60228";
|
||||
name = "leo60228";
|
||||
};
|
||||
leonardoce = {
|
||||
email = "leonardo.cecchi@gmail.com";
|
||||
github = "leonardoce";
|
||||
@ -2964,6 +2974,11 @@
|
||||
github = "redbaron";
|
||||
name = "Maxim Ivanov";
|
||||
};
|
||||
redfish64 = {
|
||||
email = "engler@gmail.com";
|
||||
github = "redfish64";
|
||||
name = "Tim Engler";
|
||||
};
|
||||
redvers = {
|
||||
email = "red@infect.me";
|
||||
github = "redvers";
|
||||
@ -3406,6 +3421,11 @@
|
||||
github = "suvash";
|
||||
name = "Suvash Thapaliya";
|
||||
};
|
||||
sveitser = {
|
||||
email = "sveitser@gmail.com";
|
||||
github = "sveitser";
|
||||
name = "Mathis Antony";
|
||||
};
|
||||
svsdep = {
|
||||
email = "svsdep@gmail.com";
|
||||
github = "svsdep";
|
||||
|
||||
@ -100,7 +100,10 @@ sub uploadFile {
|
||||
sub redirect {
|
||||
my ($name, $dest) = @_;
|
||||
#print STDERR "linking $name to $dest...\n";
|
||||
$bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest })
|
||||
$bucket->add_key($name, "", {
|
||||
'x-amz-website-redirect-location' => "/" . $dest,
|
||||
'x-amz-acl' => "public-read"
|
||||
})
|
||||
or die "failed to create redirect from $name to $dest\n";
|
||||
$cache{$name} = 1;
|
||||
}
|
||||
@ -112,7 +115,10 @@ sub uploadFile {
|
||||
|
||||
# Upload the file as sha512/<hash-in-base-16>.
|
||||
print STDERR "uploading $fn to $mainKey...\n";
|
||||
$bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name })
|
||||
$bucket->add_key_filename($mainKey, $fn, {
|
||||
'x-amz-meta-original-name' => $name,
|
||||
'x-amz-acl' => "public-read"
|
||||
})
|
||||
or die "failed to upload $fn to $mainKey\n";
|
||||
$cache{$mainKey} = 1;
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#
|
||||
# $ nix-build ./option-usage.nix --argstr testOption service.xserver.enable -A txt -o service.xserver.enable._txt
|
||||
#
|
||||
# otther target exists such as, `dotContent`, `dot`, and `pdf`. If you are
|
||||
# Other targets exists such as `dotContent`, `dot`, and `pdf`. If you are
|
||||
# looking for the option usage of multiple options, you can provide a list
|
||||
# as argument.
|
||||
#
|
||||
@ -35,7 +35,7 @@
|
||||
# value is replaced by a `throw` statement which is caught by the `tryEval`
|
||||
# evaluation of each option value.
|
||||
#
|
||||
# We then compare the result of the evluation of the original module, with
|
||||
# We then compare the result of the evaluation of the original module, with
|
||||
# the result of the second evaluation, and consider that the new failures are
|
||||
# caused by our mutation of the `config` argument.
|
||||
#
|
||||
@ -62,7 +62,7 @@ let
|
||||
"_module.args"
|
||||
|
||||
# For some reasons which we yet have to investigate, some options cannot
|
||||
# be replaced by a throw without cuasing a non-catchable failure.
|
||||
# be replaced by a throw without causing a non-catchable failure.
|
||||
"networking.bonds"
|
||||
"networking.bridges"
|
||||
"networking.interfaces"
|
||||
|
||||
@ -35,6 +35,7 @@ let
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
apply = x: assert (builtins.stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"); x;
|
||||
description = ''
|
||||
The name of the user account. If undefined, the name of the
|
||||
attribute set will be used.
|
||||
@ -91,6 +92,7 @@ let
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
apply = x: assert (builtins.stringLength x < 17 || abort "Group name '${x}' is longer than 16 characters which is not allowed!"); x;
|
||||
default = "nogroup";
|
||||
description = "The user's primary group.";
|
||||
};
|
||||
|
||||
@ -21,9 +21,6 @@ in
|
||||
"it cannot be cross compiled";
|
||||
};
|
||||
|
||||
# Needed by RPi firmware
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.loader.grub.enable = false;
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
|
||||
@ -21,9 +21,6 @@ in
|
||||
"it cannot be cross compiled";
|
||||
};
|
||||
|
||||
# Needed by RPi firmware
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.loader.grub.enable = false;
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
|
||||
@ -21,9 +21,6 @@ in
|
||||
"it cannot be cross compiled";
|
||||
};
|
||||
|
||||
# Needed by RPi firmware
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.loader.grub.enable = false;
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
|
||||
@ -20,6 +20,20 @@ let
|
||||
in
|
||||
{
|
||||
options.sdImage = {
|
||||
imageName = mkOption {
|
||||
default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.system}.img";
|
||||
description = ''
|
||||
Name of the generated image file.
|
||||
'';
|
||||
};
|
||||
|
||||
imageBaseName = mkOption {
|
||||
default = "nixos-sd-image";
|
||||
description = ''
|
||||
Prefix of the name of the generated image file.
|
||||
'';
|
||||
};
|
||||
|
||||
storePaths = mkOption {
|
||||
type = with types; listOf package;
|
||||
example = literalExample "[ pkgs.stdenv ]";
|
||||
@ -61,19 +75,25 @@ in
|
||||
sdImage.storePaths = [ config.system.build.toplevel ];
|
||||
|
||||
system.build.sdImage = pkgs.stdenv.mkDerivation {
|
||||
name = "sd-image-${pkgs.stdenv.system}.img";
|
||||
name = config.sdImage.imageName;
|
||||
|
||||
buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/nix-support $out/sd-image
|
||||
export img=$out/sd-image/${config.sdImage.imageName}
|
||||
|
||||
echo "${pkgs.stdenv.system}" > $out/nix-support/system
|
||||
echo "file sd-image $img" >> $out/nix-support/hydra-build-products
|
||||
|
||||
# Create the image file sized to fit /boot and /, plus 20M of slack
|
||||
rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }')
|
||||
bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512))
|
||||
imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 20 * 1024 * 1024))
|
||||
truncate -s $imageSize $out
|
||||
truncate -s $imageSize $img
|
||||
|
||||
# type=b is 'W95 FAT32', type=83 is 'Linux'.
|
||||
sfdisk $out <<EOF
|
||||
sfdisk $img <<EOF
|
||||
label: dos
|
||||
label-id: 0x2178694e
|
||||
|
||||
@ -82,11 +102,11 @@ in
|
||||
EOF
|
||||
|
||||
# Copy the rootfs into the SD image
|
||||
eval $(partx $out -o START,SECTORS --nr 2 --pairs)
|
||||
dd conv=notrunc if=${rootfsImage} of=$out seek=$START count=$SECTORS
|
||||
eval $(partx $img -o START,SECTORS --nr 2 --pairs)
|
||||
dd conv=notrunc if=${rootfsImage} of=$img seek=$START count=$SECTORS
|
||||
|
||||
# Create a FAT32 /boot partition of suitable size into bootpart.img
|
||||
eval $(partx $out -o START,SECTORS --nr 1 --pairs)
|
||||
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
|
||||
truncate -s $((SECTORS * 512)) bootpart.img
|
||||
faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n NIXOS_BOOT bootpart.img
|
||||
|
||||
@ -96,7 +116,7 @@ in
|
||||
|
||||
# Copy the populated /boot into the SD image
|
||||
(cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
|
||||
dd conv=notrunc if=bootpart.img of=$out seek=$START count=$SECTORS
|
||||
dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -35,6 +35,9 @@ let
|
||||
SECRET_KEY = #secretkey#
|
||||
INSTALL_LOCK = true
|
||||
|
||||
[log]
|
||||
ROOT_PATH = ${cfg.stateDir}/log
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
in
|
||||
|
||||
@ -6,6 +6,8 @@ let
|
||||
|
||||
cfg = config.services.parsoid;
|
||||
|
||||
parsoid = pkgs.nodePackages."parsoid-git://github.com/abbradar/parsoid#stable";
|
||||
|
||||
confTree = {
|
||||
worker_heartbeat_timeout = 300000;
|
||||
logging = { level = "info"; };
|
||||
@ -93,7 +95,7 @@ in
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
User = "nobody";
|
||||
ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
|
||||
ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -112,7 +112,7 @@ in
|
||||
mkdir -m 0755 -p ${stateDir}/dev/
|
||||
cp ${confFile} ${stateDir}/unbound.conf
|
||||
${optionalString cfg.enableRootTrustAnchor ''
|
||||
${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile}
|
||||
${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
|
||||
chown unbound ${stateDir} ${rootTrustAnchorFile}
|
||||
''}
|
||||
touch ${stateDir}/dev/random
|
||||
|
||||
@ -55,6 +55,17 @@ let
|
||||
}).config.system.build.isoImage);
|
||||
|
||||
|
||||
makeSdImage =
|
||||
{ module, maintainers ? ["dezgeg"], system }:
|
||||
|
||||
with import nixpkgs { inherit system; };
|
||||
|
||||
hydraJob ((import lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules = [ module versionModule ];
|
||||
}).config.system.build.sdImage);
|
||||
|
||||
|
||||
makeSystemTarball =
|
||||
{ module, maintainers ? ["viric"], system }:
|
||||
|
||||
@ -155,6 +166,10 @@ in rec {
|
||||
inherit system;
|
||||
});
|
||||
|
||||
sd_image = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
|
||||
module = ./modules/installer/cd-dvd/sd-image-aarch64.nix;
|
||||
inherit system;
|
||||
});
|
||||
|
||||
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
|
||||
ova = forMatchingSystems [ "x86_64-linux" ] (system:
|
||||
|
||||
@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
containers.foo.config = {};
|
||||
};
|
||||
};
|
||||
in [ pkgs.stdenv emptyContainer.config.containers.foo.path ];
|
||||
in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
|
||||
@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
config = {
|
||||
networking.bonds.bond0 = {
|
||||
interfaces = [ "eth1" ];
|
||||
mode = "active-backup";
|
||||
driverOptions.mode = "active-backup";
|
||||
};
|
||||
networking.interfaces.bond0.ipv4.addresses = [
|
||||
{ address = "10.10.0.3"; prefixLength = 24; }
|
||||
@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
config = {
|
||||
networking.bonds.bond0 = {
|
||||
interfaces = [ "eth1" ];
|
||||
mode = "active-backup";
|
||||
driverOptions.mode = "active-backup";
|
||||
};
|
||||
networking.bridges.br0.interfaces = [ "bond0" ];
|
||||
networking.interfaces.br0.ipv4.addresses = [
|
||||
|
||||
@ -2,32 +2,34 @@
|
||||
, makeWrapper, makeDesktopItem
|
||||
, qtbase, qmake, qtmultimedia, qttools
|
||||
, qtgraphicaleffects, qtdeclarative
|
||||
, qtlocation, qtquickcontrols, qtwebchannel
|
||||
, qtlocation, qtquickcontrols2, qtwebchannel
|
||||
, qtwebengine, qtx11extras, qtxmlpatterns
|
||||
, monero, unbound, readline, boost, libunwind
|
||||
, pcsclite, zeromq, cppzmq, pkgconfig
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monero-gui-${version}";
|
||||
version = "0.11.1.0";
|
||||
version = "2018-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq";
|
||||
rev = "fbe5ba831795008361f4de4347e7ecb6d868b4eb";
|
||||
sha256 = "06cncwk4mxfw1rqwlwisasvangl73xyqwj4g6r9j85j5x4xy0k5s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ qmake pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia qtgraphicaleffects
|
||||
qtdeclarative qtlocation qtquickcontrols
|
||||
qtdeclarative qtlocation qtquickcontrols2
|
||||
qtwebchannel qtwebengine qtx11extras
|
||||
qtxmlpatterns monero unbound readline
|
||||
boost libunwind makeWrapper
|
||||
boost libunwind pcsclite zeromq cppzmq
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 1a9a979..2316929 100644
|
||||
index c03b160..a8ea263 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -74,10 +74,6 @@ int main(int argc, char *argv[])
|
||||
@@ -80,14 +80,16 @@ int main(int argc, char *argv[])
|
||||
// qDebug() << "High DPI auto scaling - enabled";
|
||||
//#endif
|
||||
|
||||
@ -13,9 +13,6 @@ index 1a9a979..2316929 100644
|
||||
MainApp app(argc, argv);
|
||||
|
||||
qDebug() << "app startd";
|
||||
@@ -86,6 +82,13 @@ int main(int argc, char *argv[])
|
||||
app.setOrganizationDomain("getmonero.org");
|
||||
app.setOrganizationName("monero-project");
|
||||
|
||||
+ // Log settings
|
||||
+ QString logfile =
|
||||
@ -23,20 +20,19 @@ index 1a9a979..2316929 100644
|
||||
+ + "/monero-wallet-gui.log";
|
||||
+ Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
|
||||
+
|
||||
+
|
||||
filter *eventFilter = new filter;
|
||||
app.installEventFilter(eventFilter);
|
||||
|
||||
app.setApplicationName("monero-core");
|
||||
app.setOrganizationDomain("getmonero.org");
|
||||
app.setOrganizationName("monero-project");
|
||||
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
|
||||
index 8525bf3..6967b24 100644
|
||||
index 74649ce..fe1efc6 100644
|
||||
--- a/src/libwalletqt/Wallet.cpp
|
||||
+++ b/src/libwalletqt/Wallet.cpp
|
||||
@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const
|
||||
|
||||
QString Wallet::getWalletLogPath() const
|
||||
{
|
||||
- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log";
|
||||
+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log";
|
||||
@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const
|
||||
#ifdef Q_OS_MACOS
|
||||
return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename;
|
||||
#else
|
||||
- return QCoreApplication::applicationDirPath() + "/" + filename;
|
||||
+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename;
|
||||
#endif
|
||||
}
|
||||
|
||||
Wallet::Wallet(Monero::Wallet *w, QObject *parent)
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite
|
||||
, readline, IOKit
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline
|
||||
, IOKit ? null
|
||||
}:
|
||||
|
||||
assert stdenv.isDarwin -> IOKit != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monero-${version}";
|
||||
version = "0.12.0.0";
|
||||
@ -16,8 +21,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig git ];
|
||||
|
||||
buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin IOKit;
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
] ++ optional stdenv.isDarwin IOKit;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
@ -27,19 +34,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
installPhase = ''
|
||||
make install
|
||||
install -Dt "$out/bin/" \
|
||||
bin/monero-blockchain-export \
|
||||
bin/monero-blockchain-import \
|
||||
bin/monero-wallet-rpc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
description = "Private, secure, untraceable currency";
|
||||
homepage = https://getmonero.org/;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
maintainers = with maintainers; [ ehmry rnhmjoj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,10 +11,10 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fmit-${version}";
|
||||
version = "1.1.13";
|
||||
version = "1.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq";
|
||||
sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x";
|
||||
rev = "v${version}";
|
||||
repo = "fmit";
|
||||
owner = "gillesdegottex";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "praat-${version}";
|
||||
version = "6.0.37";
|
||||
version = "6.0.38";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
|
||||
sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq";
|
||||
sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
104
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
104
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
@ -175,10 +175,10 @@
|
||||
}) {};
|
||||
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "auctex";
|
||||
version = "12.1.0";
|
||||
version = "12.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar";
|
||||
sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas";
|
||||
url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar";
|
||||
sha256 = "10l96569dy9pfp8bm64pndhk1skg65kqhsyllwfa0zvb7mjkm70l";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -713,10 +713,10 @@
|
||||
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
version = "0.4.3";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar";
|
||||
sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.5.tar";
|
||||
sha256 = "1apsb08ml50nacqa6i86zwa2xxdfqry380bksp16zv63cj86b67g";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
@ -768,10 +768,10 @@
|
||||
el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
|
||||
elpaBuild {
|
||||
pname = "el-search";
|
||||
version = "1.6";
|
||||
version = "1.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.6.tar";
|
||||
sha256 = "18pv2l6rl8f9x0yjn4iyf6g94c0ly5mizqg0vxr3m420bkbyk95h";
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.6.3.tar";
|
||||
sha256 = "1yd8qlq95fb5qfmg3m16i9d5nsmkkgr12q0981r5ng06pc0j4al6";
|
||||
};
|
||||
packageRequires = [ cl-print emacs stream ];
|
||||
meta = {
|
||||
@ -861,10 +861,10 @@
|
||||
}) {};
|
||||
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
|
||||
pname = "exwm";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.17.tar";
|
||||
sha256 = "03vgrrrc1d3xr9ydl1ydvmqnvpnzg858dzdky2nd65h9ssyp2f5f";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.18.tar";
|
||||
sha256 = "1shz5bf4v4gg3arjaaldics5qkg3aiiaf3ngys8lb6qyxhcpvh6q";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -931,10 +931,10 @@
|
||||
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gited";
|
||||
version = "0.3.4";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gited-0.3.4.tar";
|
||||
sha256 = "0s03p0z5dqhigl01hzin2qy53nm7b4ilvfm83d0ca683i9rb7hx1";
|
||||
url = "https://elpa.gnu.org/packages/gited-0.4.1.tar";
|
||||
sha256 = "0080jcr10xvvf2rl7ar01c6zmzd0pafrs6w2l8v4cwwapyhv0dcd";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1106,10 +1106,10 @@
|
||||
}) {};
|
||||
iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "iterators";
|
||||
version = "0.1";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/iterators-0.1.el";
|
||||
sha256 = "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4";
|
||||
url = "https://elpa.gnu.org/packages/iterators-0.1.1.el";
|
||||
sha256 = "1r2cz2n6cr6wal5pqiqi5pn28pams639czgrvd60xcqmlr3li3g5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1160,10 +1160,10 @@
|
||||
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "js2-mode";
|
||||
version = "20170721";
|
||||
version = "20180301";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar";
|
||||
sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni";
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar";
|
||||
sha256 = "0kcs70iygbpaxs094q6agsjs56sz03jy4fwk178f9hr93x95pynx";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1423,14 +1423,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "mmm-mode";
|
||||
version = "0.5.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.6.tar";
|
||||
sha256 = "1vwsi8sk1i16dvz940c6q7i75023hrw07sc4cpmcz06rj8r68gr0";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "multishell";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar";
|
||||
sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/multishell.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1438,10 +1453,10 @@
|
||||
}) {};
|
||||
muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "muse";
|
||||
version = "3.20.1";
|
||||
version = "3.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/muse-3.20.1.tar";
|
||||
sha256 = "0h8lxm08r519psz93m1i43prkcpsm2dgkcvdlpvg7sm0ky7i5cay";
|
||||
url = "https://elpa.gnu.org/packages/muse-3.20.2.tar";
|
||||
sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1544,10 +1559,10 @@
|
||||
}) {};
|
||||
num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "num3-mode";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.2.el";
|
||||
sha256 = "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8";
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.3.el";
|
||||
sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1595,6 +1610,19 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "9.1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.1.9.tar";
|
||||
sha256 = "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "osc";
|
||||
version = "0.1";
|
||||
@ -1717,10 +1745,10 @@
|
||||
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
version = "0.26";
|
||||
version = "0.26.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/python-0.26.el";
|
||||
sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317";
|
||||
url = "https://elpa.gnu.org/packages/python-0.26.1.el";
|
||||
sha256 = "1dpw2w2nk6ggr8pz293qysjkiya3i7k25i447fbycjil59anzpb3";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1756,10 +1784,10 @@
|
||||
}) {};
|
||||
rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "rainbow-mode";
|
||||
version = "0.13";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el";
|
||||
sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl";
|
||||
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.el";
|
||||
sha256 = "1mg9dbgvg79sphpic56d11mrjwx668xffx5z5jszc9fdl5b8ygml";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1809,10 +1837,10 @@
|
||||
realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
|
||||
elpaBuild {
|
||||
pname = "realgud";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar";
|
||||
sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c";
|
||||
url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar";
|
||||
sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
|
||||
2534
pkgs/applications/editors/emacs-modes/melpa-generated.nix
generated
2534
pkgs/applications/editors/emacs-modes/melpa-generated.nix
generated
File diff suppressed because it is too large
Load Diff
@ -82,10 +82,6 @@ self:
|
||||
inherit (self.melpaPackages) ess ctable popup;
|
||||
};
|
||||
|
||||
ess-R-object-popup = super.ess-R-object-popup.override {
|
||||
inherit (self.melpaPackages) ess popup;
|
||||
};
|
||||
|
||||
# upstream issue: missing dependency highlight
|
||||
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
|
||||
|
||||
@ -117,7 +113,7 @@ self:
|
||||
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
|
||||
|
||||
# upstream issue: missing file header
|
||||
initsplit = markBroken super.initsplit;
|
||||
initsplit = super.initsplit;
|
||||
|
||||
# Expects bash to be at /bin/bash
|
||||
ivy-rtags = markBroken super.ivy-rtags;
|
||||
@ -128,9 +124,6 @@ self:
|
||||
# upstream issue: missing file header
|
||||
link = markBroken super.link;
|
||||
|
||||
# upstream issue: mismatched filename
|
||||
link-hint = markBroken super.link-hint;
|
||||
|
||||
# upstream issue: missing file header
|
||||
maxframe = markBroken super.maxframe;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -81,10 +81,6 @@ self:
|
||||
inherit (self.melpaPackages) ess ctable popup;
|
||||
};
|
||||
|
||||
ess-R-object-popup = super.ess-R-object-popup.override {
|
||||
inherit (self.melpaPackages) ess popup;
|
||||
};
|
||||
|
||||
# upstream issue: doesn't build
|
||||
eterm-256color = markBroken super.eterm-256color;
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20180226";
|
||||
version = "20180402";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20180226.tar";
|
||||
sha256 = "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy";
|
||||
url = "https://orgmode.org/elpa/org-20180402.tar";
|
||||
sha256 = "0gb8hh26jzjqy262ll8jl3ym0cpw6s17id2gizv5qvw18knxs751";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -14,10 +14,10 @@
|
||||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20180226";
|
||||
version = "20180402";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180226.tar";
|
||||
sha256 = "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180402.tar";
|
||||
sha256 = "09q5nr0ka7z719mi626wj5d51bcvdb08gk4zf94dzpks0gsqiikr";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tiled-${version}";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjorn";
|
||||
repo = "tiled";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rf50w7nkdm70999q1mj7sy5hyjj41qjf4izi849q9a7xnhddv44";
|
||||
sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake ];
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
libharu, opencv, vigra, postgresql }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "saga-6.2.0";
|
||||
name = "saga-6.3.0";
|
||||
|
||||
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz";
|
||||
sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280";
|
||||
url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz";
|
||||
sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openimageio-${version}";
|
||||
version = "1.8.8";
|
||||
version = "1.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "1jn4ph7giwxr65xxbm59i03wywnmxkqnpvqp0kcajl4k48vq3wkr";
|
||||
sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "processing-${version}";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz";
|
||||
sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk";
|
||||
};
|
||||
|
||||
# Stop it trying to download its own version of java
|
||||
patches = [ ./use-nixpkgs-jre.patch ];
|
||||
|
||||
buildInputs = [ ant jdk makeWrapper libXxf86vm which ];
|
||||
|
||||
buildPhase = "cd build && ant build";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/${name}
|
||||
mkdir -p $out/bin
|
||||
cp -r linux/work/* $out/${name}/
|
||||
makeWrapper $out/${name}/processing $out/bin/processing \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
|
||||
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
|
||||
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
|
||||
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
|
||||
ln -s ${jdk} $out/${name}/java
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A language and IDE for electronic arts";
|
||||
homepage = https://processing.org;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,88 +0,0 @@
|
||||
From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
|
||||
Date: Tue, 26 Aug 2014 00:07:58 +0200
|
||||
Subject: [PATCH] patch
|
||||
|
||||
---
|
||||
build/build.xml | 42 +++++++++++++++++++++---------------------
|
||||
1 file changed, 21 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/build/build.xml b/build/build.xml
|
||||
index 4d0f0b2..c3f5c09 100755
|
||||
--- a/build/build.xml
|
||||
+++ b/build/build.xml
|
||||
@@ -640,10 +640,11 @@
|
||||
value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" />
|
||||
-->
|
||||
|
||||
+ <!--
|
||||
<get src="http://processing.googlecode.com/files/${jre.file}"
|
||||
dest="linux/jre.tgz"
|
||||
usetimestamp="true" />
|
||||
-
|
||||
+ -->
|
||||
<!--
|
||||
Cannot use ant version of tar because it doesn't preserve properties.
|
||||
<untar compression="gzip"
|
||||
@@ -655,39 +656,38 @@
|
||||
<!--
|
||||
http://www.gnu.org/software/tar/manual/html_section/transform.html
|
||||
-->
|
||||
- <exec executable="tar" dir="linux">
|
||||
+ <!-- <exec executable="tar" dir="linux"> -->
|
||||
<!-- Change directory -->
|
||||
<!--
|
||||
<arg value="-C" />
|
||||
<arg value="linux/work" />
|
||||
<arg value="-xzpf" />
|
||||
-->
|
||||
- <arg value="xfz" />
|
||||
- <arg value="jre.tgz"/>
|
||||
- </exec>
|
||||
+ <!-- <arg value="xfz" /> -->
|
||||
+ <!-- <arg value="jre.tgz"/> -->
|
||||
+ <!-- </exec> -->
|
||||
|
||||
<!--
|
||||
We only want to move when the folder didn't exist before
|
||||
<move file="linux/jre1.7.0_40" tofile="linux/work/java" />
|
||||
-->
|
||||
- <exec executable="rsync" dir="linux">
|
||||
- <arg value="-a" />
|
||||
- <arg value="--delete" />
|
||||
- <arg value="jre1.7.0_40/" />
|
||||
- <arg value="work/java" />
|
||||
- </exec>
|
||||
- <delete dir="linux/jre1.7.0_40" />
|
||||
+ <!-- <exec executable="rsync" dir="linux"> -->
|
||||
+ <!-- <arg value="-a" /> -->
|
||||
+ <!-- <arg value="jre1.7.0_40/" /> -->
|
||||
+ <!-- <arg value="work/java" /> -->
|
||||
+ <!-- </exec> -->
|
||||
+ <!-- <delete dir="linux/jre1.7.0_40" /> -->
|
||||
|
||||
<!-- Remove unused JRE bloat. -->
|
||||
- <delete>
|
||||
- <fileset refid="javafx-basics" />
|
||||
- <fileset refid="javafx-linux-${sun.arch.data.model}" />
|
||||
- <fileset refid="jre-optional-linux" />
|
||||
- </delete>
|
||||
-
|
||||
- <copy todir="linux/work/java/lib/fonts">
|
||||
- <fileset dir="shared/lib/fonts" includes="*" />
|
||||
- </copy>
|
||||
+ <!-- <delete> -->
|
||||
+ <!-- <fileset refid="javafx-basics" /> -->
|
||||
+ <!-- <fileset refid="javafx-linux-${sun.arch.data.model}" /> -->
|
||||
+ <!-- <fileset refid="jre-optional-linux" /> -->
|
||||
+ <!-- </delete> -->
|
||||
+
|
||||
+ <!-- <copy todir="linux/work/java/lib/fonts"> -->
|
||||
+ <!-- <fileset dir="shared/lib/fonts" includes="*" /> -->
|
||||
+ <!-- </copy> -->
|
||||
|
||||
</target>
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,15 +1,18 @@
|
||||
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
|
||||
, ilmbase, libXi, libX11, libXext, libXrender
|
||||
, libjpeg, libpng, libsamplerate, libsndfile
|
||||
, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python
|
||||
, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages
|
||||
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, cudaSupport ? false, cudatoolkit
|
||||
, colladaSupport ? true, opencollada
|
||||
, enableNumpy ? false, makeWrapper
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let python = pythonPackages.python; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.79b";
|
||||
|
||||
@ -24,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||
freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal
|
||||
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
|
||||
(opensubdiv.override { inherit cudaSupport; })
|
||||
makeWrapper
|
||||
]
|
||||
++ optional jackaudioSupport libjack2
|
||||
++ optional cudaSupport cudatoolkit
|
||||
@ -70,6 +74,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = optionalString enableNumpy
|
||||
''
|
||||
wrapProgram $out/bin/blender \
|
||||
--prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = https://www.blender.org;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, python3, fetchFromGitHub }:
|
||||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
name = "buku-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "buku";
|
||||
rev = "v${version}";
|
||||
sha256 = "1639sf200n9rxgkvvhlhnrjsb7vn42p1fl1rx562axh3vpr6j4c4";
|
||||
sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.19.0";
|
||||
version = "3.20.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "0sann0aw6ngvmqp7049zg6hyqjrb5myq5ivr4r9x732c1cnjhhw9";
|
||||
sha256 = "1rnmh24d9hqnncg6p6zwkb3y3m4k9n7pzma69haxnm7iaps84gmy";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chirp-daily-${version}";
|
||||
version = "20170714";
|
||||
version = "20180325";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
|
||||
sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy";
|
||||
sha256 = "0z2m74hhkxvxchxv819wy947v3wl13kxrdq4kjjazzrlyaky921y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
76
pkgs/applications/misc/curabydagoma/default.nix
Normal file
76
pkgs/applications/misc/curabydagoma/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv, lib, fetchurl, python, pythonPackages, unzip }:
|
||||
|
||||
# This package uses a precompiled "binary" distribution of CuraByDagoma,
|
||||
# distributed by the editor.
|
||||
#
|
||||
# To update the package, follow the links on https://dist.dagoma.fr/:
|
||||
# * Cura By Dagoma
|
||||
# * Linux
|
||||
# * 64 bits
|
||||
# * Genric archive
|
||||
#
|
||||
# I made the arbitrary choice to compile this package only for x86_64.
|
||||
# I guess people owning a 3D printer generally don't use i686.
|
||||
# If, however, someone needs it, we certainly can find a solution.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "curabydagoma-${version}";
|
||||
# Version is the date, UNIX format
|
||||
version = "1520506579";
|
||||
# Hash of the user's choice: os, arch, package type...
|
||||
hash = "58228cce5bbdcf764b7116850956f1e5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.dagoma.fr/get/zip/CuraByDagoma/${version}/${hash}";
|
||||
sha256 = "16wfipdyjkf6dq8awjzs4zgkmqk6230277mf3iz8swday9hns8pq";
|
||||
};
|
||||
unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz";
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
|
||||
|
||||
# Compile all pyc files because the included pyc files may be older than the
|
||||
# py files. However, Python doesn't realize that because the packages
|
||||
# have all dates set to epoch.
|
||||
buildPhase = ''
|
||||
python -m compileall -f curabydago
|
||||
'';
|
||||
|
||||
# * Simply copy the stuff there
|
||||
# * Create an executable with the correct path etc
|
||||
# * Create a .desktop file to have a launcher in the desktop environments
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r * $out/
|
||||
|
||||
mkdir $out/bin
|
||||
cat > $out/bin/curabydago <<EOF
|
||||
#!/bin/sh
|
||||
export PYTHONPATH=$PYTHONPATH
|
||||
${python.out}/bin/python $out/curabydago/cura.py
|
||||
EOF
|
||||
chmod a+x $out/bin/curabydago
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cat > $out/share/applications/curabydago.desktop <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Cura-by-dagoma
|
||||
Comment=CuraByDagoma is a fork of Legacy Cura made by Dagoma for its own printers.
|
||||
Icon=$out/curabydago/resources/images/cura.ico
|
||||
Exec=$out/bin/curabydago
|
||||
Path=$out/
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Categories=GNOME;GTK;Utility;
|
||||
EOF
|
||||
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slicer for 3D printers built by Dagoma";
|
||||
homepage = https://dagoma.fr/cura-by-dagoma.html;
|
||||
license = licenses.agpl3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ tiramiseb ];
|
||||
};
|
||||
}
|
||||
23
pkgs/applications/misc/gpx/default.nix
Normal file
23
pkgs/applications/misc/gpx/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpx-${version}";
|
||||
version = "2.5.2";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markwal";
|
||||
repo = "GPX";
|
||||
rev = version;
|
||||
sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Gcode to x3g conversion postprocessor";
|
||||
homepage = https://github.com/markwal/GPX/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.leo60228 ];
|
||||
};
|
||||
}
|
||||
@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gqrx-${version}";
|
||||
version = "2.11.1";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "csete";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
sha256 = "06l90m3lx05290lvgghrgqrcg6732p69dvv3bsyw7cyxy3fvdhm6";
|
||||
sha256 = "0sndhzz2gnhsz41cp0zrsw3z10rqm1j3mvkzs1g1lsndrk12bcgy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
name = "rofi-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
|
||||
sha256 = "0h068wqf0n6gmil2g3lh263pm7spkp4k5rxbnfp52n8izqgyf7al";
|
||||
sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679";
|
||||
};
|
||||
|
||||
# config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
|
||||
|
||||
30
pkgs/applications/misc/slstatus/default.nix
Normal file
30
pkgs/applications/misc/slstatus/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slstatus-${version}";
|
||||
version = "unstable-2018-03-28";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://git.suckless.org/slstatus;
|
||||
rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd";
|
||||
sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76";
|
||||
};
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
homepage = https://tools.suckless.org/slstatus/;
|
||||
description = "status monitor for window managers that use WM_NAME like dwm";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ geistesk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "urh-${version}";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jopohl";
|
||||
repo = "urh";
|
||||
rev = "v${version}";
|
||||
sha256 = "0s8nbrkqcb4q3m8w17sqijbds5irk4xpzhjpwkkakzs0rm5g10sk";
|
||||
sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8";
|
||||
};
|
||||
|
||||
buildInputs = [ hackrf rtl-sdr ];
|
||||
|
||||
@ -6,11 +6,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "veracrypt-${version}";
|
||||
version = "1.21";
|
||||
version = "1.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
|
||||
sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4";
|
||||
sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y";
|
||||
};
|
||||
|
||||
unpackPhase =
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls
|
||||
, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwb-2016-03-21";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://bitbucket.org/portix/dwb";
|
||||
rev = "7fb82bc1db36a5d1d2436088c9b58054d2c51f96";
|
||||
sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup
|
||||
webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];
|
||||
|
||||
# There are Xlib and gtk warnings therefore I have set Wno-error
|
||||
makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"'';
|
||||
|
||||
preFixup=''
|
||||
wrapProgram "$out/bin/dwb" \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
|
||||
wrapProgram "$out/bin/dwbem" \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://portix.bitbucket.org/dwb/;
|
||||
description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -136,9 +136,9 @@ in rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "SLNOS";
|
||||
repo = "tor-browser";
|
||||
# branch "tor-browser-52.7.0esr-7.5-1-slnos";
|
||||
rev = "211b2be3fea45a450915b0addcd7783aa939e24a";
|
||||
sha256 = "18gv4r8cjf89mamjh93a856a5yfp7dm3jrk8g05w89vxb3lrl74v";
|
||||
# branch "tor-browser-52.7.3esr-7.5-1-slnos";
|
||||
rev = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182";
|
||||
sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches;
|
||||
|
||||
@ -29,13 +29,13 @@ let
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
name = "qutebrowser-${version}${versionPostfix}";
|
||||
namePrefix = "";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
versionPostfix = "";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0za0iiljs86y2n4znwk8cgn948xcv8iv80a9qfm87zl18y3ashly";
|
||||
sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
||||
@ -1,12 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }:
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
|
||||
, iptables, coreutils, kerberos, clang
|
||||
, components ? [
|
||||
"cmd/oc"
|
||||
"cmd/openshift"
|
||||
]
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.6.0";
|
||||
version = "3.9.0";
|
||||
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
|
||||
versionMajor = ver 0;
|
||||
versionMinor = ver 1;
|
||||
versionPatch = ver 2;
|
||||
in buildGoPackage rec {
|
||||
gitCommit = "191fece";
|
||||
# version is in vendor/k8s.io/kubernetes/pkg/version/base.go
|
||||
k8sversion = "v1.9.1";
|
||||
k8sgitcommit = "a0ce1bc657";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "openshift-origin-${version}";
|
||||
inherit version;
|
||||
|
||||
@ -14,40 +26,41 @@ in buildGoPackage rec {
|
||||
owner = "openshift";
|
||||
repo = "origin";
|
||||
rev = "v${version}";
|
||||
sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
|
||||
};
|
||||
sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78";
|
||||
};
|
||||
|
||||
buildInputs = [ which ];
|
||||
# go > 1.10
|
||||
# [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check.
|
||||
buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ];
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
goPackagePath = null;
|
||||
patchPhase = ''
|
||||
patchShebangs ./hack
|
||||
substituteInPlace pkg/bootstrap/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
|
||||
|
||||
substituteInPlace pkg/bootstrap/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
|
||||
|
||||
substituteInPlace pkg/bootstrap/docker/host/host.go \
|
||||
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
|
||||
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
cd go/src/origin-v${version}-src
|
||||
# Openshift build require this variables to be set
|
||||
# unless there is a .git folder which is not the case with fetchFromGitHub
|
||||
export OS_GIT_VERSION=v${version}
|
||||
export OS_GIT_MAJOR=${versionMajor}
|
||||
export OS_GIT_MINOR=${versionMinor}
|
||||
make build
|
||||
echo "OS_GIT_VERSION=v${version}" >> os-version-defs
|
||||
echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs
|
||||
echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs
|
||||
echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs
|
||||
echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs
|
||||
echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs
|
||||
echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs
|
||||
export OS_VERSION_FILE="os-version-defs"
|
||||
export CC=clang
|
||||
make all WHAT='${concatStringsSep " " components}'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$bin/bin"
|
||||
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
|
||||
mkdir -p "$out/bin"
|
||||
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -104,8 +104,8 @@ in rec {
|
||||
terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
|
||||
|
||||
terraform_0_11 = pluggable (generic {
|
||||
version = "0.11.4";
|
||||
sha256 = "1r3x7qv0bfsnmj7l3hmsww26rb9hkg361515gpvjjzafz5b7bz0c";
|
||||
version = "0.11.5";
|
||||
sha256 = "130ibb1pd60r2cycwpzs8qfwrz6knyc1a1849csxpipg5rs5q3jy";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
||||
@ -4,15 +4,15 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-alicloud";
|
||||
version = "1.8.1";
|
||||
sha256 = "127070zsy536pdvjpcj0028iwwrcm4s5gbhvhzxb70fhjvi9sj6v";
|
||||
version = "1.9.0";
|
||||
sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv";
|
||||
};
|
||||
archive =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-archive";
|
||||
version = "1.0.2";
|
||||
sha256 = "0n8939qai01lrk4kq3w344a73z6bfqbfq9yl28yh93fvmpkv6jz2";
|
||||
version = "1.0.3";
|
||||
sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4";
|
||||
};
|
||||
arukas =
|
||||
{
|
||||
@ -32,8 +32,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-aws";
|
||||
version = "1.11.0";
|
||||
sha256 = "14r54772qi6c73l50f6gp4j08rd03c2h4v1fwcydfc6kyf23f8k6";
|
||||
version = "1.13.0";
|
||||
sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny";
|
||||
};
|
||||
azure-classic =
|
||||
{
|
||||
@ -46,8 +46,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azurerm";
|
||||
version = "1.3.0";
|
||||
sha256 = "0szw7fmdwy8r99w40z2h7fp5znj8s0ddbcwrgm1g3vdcp757vcg5";
|
||||
version = "1.3.1";
|
||||
sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4";
|
||||
};
|
||||
bitbucket =
|
||||
{
|
||||
@ -193,8 +193,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-google";
|
||||
version = "1.7.0";
|
||||
sha256 = "1q38z3gihsbxlra1vzgsg1ss8q24f5vkj6k8pvvqjb2rzqpkk5cm";
|
||||
version = "1.8.0";
|
||||
sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh";
|
||||
};
|
||||
grafana =
|
||||
{
|
||||
@ -242,8 +242,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-kubernetes";
|
||||
version = "1.0.1";
|
||||
sha256 = "0s8h8nxsl07bhvynmgps07giqr2xmxizk1rcx4xivfc3q5mkvnhb";
|
||||
version = "1.1.0";
|
||||
sha256 = "1lhdmglc6nd24ss7z41qqbpsiy71ajvixhq4pfiq0b19hwj6awgn";
|
||||
};
|
||||
librato =
|
||||
{
|
||||
@ -270,8 +270,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-logicmonitor";
|
||||
version = "1.0.0";
|
||||
sha256 = "106y74w9nhqs65h26ipyjg636zcrnpn5s8r49sg4kh4ynvnrkv8v";
|
||||
version = "1.1.0";
|
||||
sha256 = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r";
|
||||
};
|
||||
mailgun =
|
||||
{
|
||||
@ -284,8 +284,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-mysql";
|
||||
version = "1.0.1";
|
||||
sha256 = "07lm1la9llp52gfs5wf6kq5rjys9lmd3hl7x5821vz54rakzic6n";
|
||||
version = "1.1.0";
|
||||
sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw";
|
||||
};
|
||||
newrelic =
|
||||
{
|
||||
@ -298,8 +298,8 @@
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-nomad";
|
||||
version = "1.1.0";
|
||||
sha256 = "0n3bd9fiablhb2zxmlqnidahdqlpj3i7701vi62zds04kcgdkxw8";
|
||||
version = "1.2.0";
|
||||
sha256 = "1z3knyjn5ymbk4vaja4ka9zn57cgl7vr7hqv6ybqw0q9i2ykaici";
|
||||
};
|
||||
ns1 =
|
||||
{
|
||||
@ -350,6 +350,13 @@
|
||||
version = "0.1.0";
|
||||
sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
|
||||
};
|
||||
oraclepaas =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oraclepaas";
|
||||
version = "1.0.0";
|
||||
sha256 = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2";
|
||||
};
|
||||
ovh =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terragrunt-${version}";
|
||||
version = "0.14.2";
|
||||
version = "0.14.6";
|
||||
|
||||
goPackagePath = "github.com/gruntwork-io/terragrunt";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bnscp0sjnzhnqbm7m5ip6g2608yfvsnr60f03y2qqld8m9wmj32";
|
||||
sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "628f99e2cda77dd323992ede8b05961b41f4352f";
|
||||
sha256 = "0dbr4czbjpnkira9bhackq01s9b13yvw5dscnxi3mr9adb89y9pm";
|
||||
rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a";
|
||||
sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -50,8 +50,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/go-version";
|
||||
rev = "4fe82ae3040f80a03d04d2cccb5606a626b8e1ee";
|
||||
sha256 = "0gq4207s1yf2nq4c2ir3bsai29svzz4830g1vbvzdrpis58r1x4m";
|
||||
rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7";
|
||||
sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -59,8 +59,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
|
||||
sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
|
||||
rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda";
|
||||
sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -104,8 +104,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "b89eecf5ca5db6d3ba60b237ffe3df7bafb7662f";
|
||||
sha256 = "0g946ii8qjaynvidj648z8izl91i6yhy0ir6g3qsrn136im3r8wk";
|
||||
rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69";
|
||||
sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "newsboat-${version}";
|
||||
version = "2.10.2";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
|
||||
sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px";
|
||||
sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, fetchurl, pythonPackages, libvncserver, zlib
|
||||
{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
|
||||
, gnutls, libvpx, makeDesktopItem }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "blink-${version}";
|
||||
version = "2.0.0";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
|
||||
sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05";
|
||||
src = fetchdarcs {
|
||||
url = http://devel.ag-projects.com/repositories/blink-qt;
|
||||
rev = "release-${version}";
|
||||
sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi";
|
||||
};
|
||||
|
||||
patches = [ ./pythonpath.patch ];
|
||||
@ -15,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ];
|
||||
propagatedBuildInputs = with pythonPackages; [ pyqt5 cjson sipsimple twisted google_api_python_client ];
|
||||
|
||||
buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
|
||||
|
||||
|
||||
@ -17,11 +17,11 @@ with lib;
|
||||
buildPythonApplication rec {
|
||||
name = "gajim-${version}";
|
||||
majorVersion = "1.0";
|
||||
version = "${majorVersion}.0";
|
||||
version = "${majorVersion}.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
|
||||
sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
|
||||
sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "3.0.5";
|
||||
version = "3.1.0";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
@ -46,7 +46,7 @@ let
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = "13im5m119cp5v0gvr1vpxjqskr8rvl6pii91b5x522wm7plfhj8s";
|
||||
sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3";
|
||||
}
|
||||
else
|
||||
throw "Slack is not supported on ${stdenv.system}";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.1.6";
|
||||
version = "6.1.7";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r02frlspjq8k0zz1z4wh2sx3jm6b1qby5mxg394sb3rjdxb8jhk";
|
||||
sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
@ -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 = [ ];
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,8 +12,8 @@ let
|
||||
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
|
||||
else throw "Spideroak client for: ${stdenv.system} not supported!";
|
||||
|
||||
sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f"
|
||||
else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d"
|
||||
sha256 = if stdenv.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533"
|
||||
else if stdenv.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16"
|
||||
else throw "Spideroak client for: ${stdenv.system} not supported!";
|
||||
|
||||
ldpath = stdenv.lib.makeLibraryPath [
|
||||
@ -21,7 +21,7 @@ let
|
||||
libX11 libXext libXrender zlib
|
||||
];
|
||||
|
||||
version = "7.0.1";
|
||||
version = "7.1.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "spideroak-${version}";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchhg, pkgs, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
version = "2.0rc1";
|
||||
version = "2.0.0";
|
||||
name = "beancount-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/b/beancount/${name}.tar.gz";
|
||||
sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf";
|
||||
sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [ nose ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkDerivation, lib, fetchurl,
|
||||
cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
|
||||
cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee,
|
||||
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
|
||||
kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive,
|
||||
kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info
|
||||
@ -19,11 +19,19 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtwebkit qtscript grantlee kxmlgui kwallet kparts
|
||||
qtwebengine qtscript grantlee kxmlgui kwallet kparts
|
||||
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
|
||||
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
|
||||
];
|
||||
|
||||
# SKG_DESIGNER must be used to generate the needed library for QtDesigner.
|
||||
# This is needed ONLY for developers. So NOT NEEDED for end user.
|
||||
# Source: https://forum.kde.org/viewtopic.php?f=210&t=143375#p393675
|
||||
cmakeFlags = [
|
||||
"-DSKG_DESIGNER=OFF"
|
||||
"-DSKG_WEBENGINE=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A personal finances manager, powered by KDE";
|
||||
license = with licenses; [ gpl3 ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-${version}";
|
||||
version = "3.3.87";
|
||||
version = "3.3.89";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "0yjvxvqdl276wv0y55bqxwna6lwc99hy6dkfiy6bij3nd1qm5rf6";
|
||||
sha256 = "1j7byy0kmapa66dp17gjvs4pa4gckjccljydixswdknpxs5ma45g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
33
pkgs/applications/science/logic/workcraft/default.nix
Normal file
33
pkgs/applications/science/logic/workcraft/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, pkgs, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "workcraft-${version}";
|
||||
version = "3.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
|
||||
sha256 = "0d1mi8jffwr7irp215j9rfpa3nmwxrx6mv13bh7vn0qf6i0aw0xi";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share
|
||||
cp -r * $out/share
|
||||
mkdir $out/bin
|
||||
makeWrapper $out/share/workcraft $out/bin/workcraft \
|
||||
--set JAVA_HOME "${jre}" \
|
||||
--set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=gasp';
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://workcraft.org/;
|
||||
description = "Framework for interpreted graph modeling, verification and synthesis";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ timor ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
@ -9,11 +9,11 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${attr}-${version}";
|
||||
attr = if enableGUI then "giac-with-xcas" else "giac";
|
||||
version = "1.4.9";
|
||||
version = "1.4.9-59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2";
|
||||
sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai";
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
|
||||
sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qalculate-gtk-${version}";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
|
||||
sha256 = "0sf4ywz8hsszaf0yr0ncdlp7mwjk6b276bwl0j9vf1j925c89pbn";
|
||||
sha256 = "0j5wp6bmnwkyxlvqci6ddg478a0ms93gicvycw0c6bkvs2gd77az";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "spyder";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f";
|
||||
sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
|
||||
};
|
||||
|
||||
# Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libopenshot-audio-${version}";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenShot";
|
||||
repo = "libopenshot-audio";
|
||||
rev = "v${version}";
|
||||
sha256 = "07615vacbvi08pzm4lxfckfwib2xcfdjaggpda58hy8nr0677fzq";
|
||||
sha256 = "0rn87jxyfq1yip1lb2255l5ilkakkqg9rn0lr0h6dn2xrmlbmg8l";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dynamips";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GNS3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n";
|
||||
sha256 = "1jrwvrpl61rqbjjphv8v7ryhdwfjrpps76dbvkpl43hpn5hqqis2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "singularity-${version}";
|
||||
version = "2.4.2";
|
||||
version = "2.4.5";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "singularityware";
|
||||
repo = "singularity";
|
||||
rev = version;
|
||||
sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4";
|
||||
sha256 = "0wz2in07197n5c2csww864nn2qmr925lqcjsd1kmlwwnrhq6lzl3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bspwm-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baskerville";
|
||||
repo = "bspwm";
|
||||
rev = version;
|
||||
sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis";
|
||||
sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stdman-${version}";
|
||||
version = "2017.04.02";
|
||||
version = "2018.03.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeaye";
|
||||
repo = "stdman";
|
||||
rev = "${version}";
|
||||
sha256 = "1wfxd9ca8b9l976rnlhjd0sp364skfm99wxi633swwwjvhy26sgm";
|
||||
sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r";
|
||||
};
|
||||
|
||||
outputDevdoc = "out";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }:
|
||||
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "econnman-${version}";
|
||||
@ -11,13 +11,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
|
||||
|
||||
buildInputs = [ efl python2Packages.python dbus curl ];
|
||||
buildInputs = [ efl python2Packages.python dbus ];
|
||||
|
||||
pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -70,6 +70,12 @@ stdenv.mkDerivation rec {
|
||||
'Cflags: -I''${includedir}/eina-1/eina'"$modules"
|
||||
'';
|
||||
|
||||
# EFL applications depend on libcurl, although it is linked at
|
||||
# runtime by hand in code (it is dlopened).
|
||||
postFixup = ''
|
||||
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/lib/libecore_con.so
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enlightenment-${version}";
|
||||
version = "0.22.2";
|
||||
version = "0.22.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
|
||||
sha256 = "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d";
|
||||
sha256 = "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }:
|
||||
{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ephoto-${version}";
|
||||
@ -11,11 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
|
||||
|
||||
buildInputs = [ efl pcre curl ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
|
||||
'';
|
||||
buildInputs = [ efl pcre ];
|
||||
|
||||
meta = {
|
||||
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rage-${version}";
|
||||
@ -24,12 +24,7 @@ stdenv.mkDerivation rec {
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-libav
|
||||
pcre
|
||||
curl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
|
||||
'';
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Video + Audio player along the lines of mplayer";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }:
|
||||
{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminology-${version}";
|
||||
@ -17,15 +17,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
efl
|
||||
pcre
|
||||
curl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The best terminal emulator written with the EFL";
|
||||
homepage = http://enlightenment.org/;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }:
|
||||
|
||||
let
|
||||
defaultVersion = "44";
|
||||
defaultVersion = "45";
|
||||
|
||||
# Map from git revs to SHA256 hashes
|
||||
sha256s = {
|
||||
"version_44" = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
|
||||
"version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
|
||||
"1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
|
||||
};
|
||||
in
|
||||
|
||||
@ -74,23 +74,26 @@ let
|
||||
elm-format = self.callPackage ./packages/elm-format.nix { };
|
||||
elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix {
|
||||
aeson-pretty = self.aeson-pretty_0_7_2;
|
||||
either = hlib.overrideCabal self.either (drv :{
|
||||
jailbreak = true;
|
||||
version = "4.4.1.1";
|
||||
sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
|
||||
self.exceptions self.free self.mmorph self.monad-control
|
||||
self.MonadRandom self.profunctors self.transformers
|
||||
self.transformers-base
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
in elmPkgs // {
|
||||
inherit elmPkgs;
|
||||
elmVersion = elmRelease.version;
|
||||
# needed for elm-package
|
||||
http-client = hlib.overrideCabal super.http-client (drv: {
|
||||
version = "0.4.31.2";
|
||||
sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n";
|
||||
});
|
||||
http-client-tls = hlib.overrideCabal super.http-client-tls (drv: {
|
||||
version = "0.2.4.1";
|
||||
sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d";
|
||||
});
|
||||
# https://github.com/elm-lang/elm-compiler/issues/1566
|
||||
indents = hlib.overrideCabal super.indents (drv: {
|
||||
version = "0.3.3";
|
||||
#test dep tasty has a version mismatch
|
||||
doCheck = false;
|
||||
sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
|
||||
});
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary
|
||||
, bytestring, containers, directory, edit-distance, elm-compiler
|
||||
, fetchgit, filepath, HTTP, http-client, http-client-tls
|
||||
, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls
|
||||
, http-types, mtl, network, optparse-applicative, parallel-io
|
||||
, pretty, stdenv, text, time, unordered-containers, vector
|
||||
, zip-archive
|
||||
@ -13,6 +13,10 @@ mkDerivation {
|
||||
sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7";
|
||||
rev = "8bd150314bacab5b6fc451927aa01deec2276fbf";
|
||||
};
|
||||
patches = fetchurl {
|
||||
url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch;
|
||||
sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
||||
@ -47,6 +47,4 @@ bootPkgs.callPackage ./base.nix {
|
||||
stage2 = import ./head_stage2.nix;
|
||||
|
||||
patches = [ ./ghcjs-head.patch ];
|
||||
|
||||
broken = true; # https://hydra.nixos.org/build/71923242
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@ let
|
||||
rm -rf $out/lib/openjdk/demo
|
||||
${lib.optionalString minimal ''
|
||||
for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
|
||||
rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so
|
||||
rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so
|
||||
done
|
||||
''}
|
||||
|
||||
|
||||
@ -1,244 +0,0 @@
|
||||
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype
|
||||
, which, bootjdk, nettools, xorg, file, cups
|
||||
, fontconfig, cpio, cacert, perl, setJavaClassPath
|
||||
, minimal ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
/**
|
||||
* The JRE libraries are in directories that depend on the CPU.
|
||||
*/
|
||||
architecture =
|
||||
if stdenv.system == "i686-linux" then
|
||||
"i386"
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
"amd64"
|
||||
else
|
||||
throw "openjdk requires i686-linux or x86_64 linux";
|
||||
|
||||
update = "111";
|
||||
|
||||
build = "01";
|
||||
|
||||
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
|
||||
paxflags = if stdenv.isi686 then "msp" else "m";
|
||||
|
||||
baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u";
|
||||
repover = "jdk7u${update}-b${build}";
|
||||
jdk7 = fetchurl {
|
||||
url = "${baseurl}/archive/${repover}.tar.gz";
|
||||
sha256 = "0wgb7hr2gipx1jg28fnsjh7xa744sh1mgr6z3xivmnsfy3dm91gi";
|
||||
};
|
||||
langtools = fetchurl {
|
||||
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
|
||||
sha256 = "0x1xs923h6sma02cbp1whg735x8vcndh5k01b7rkf714g6rxwa0y";
|
||||
};
|
||||
hotspot = fetchurl {
|
||||
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
|
||||
sha256 = "187apnsvnd4cfa7ss5g59dbh7x5ah8f1lwa2wvjfv055h2cmphpn";
|
||||
};
|
||||
corba = fetchurl {
|
||||
url = "${baseurl}/corba/archive/${repover}.tar.gz";
|
||||
sha256 = "0vmxf5sgjcmkm7i1scanaa2x75a1byj8b36vcajlr6j7qmdx6r8c";
|
||||
};
|
||||
jdk = fetchurl {
|
||||
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
|
||||
sha256 = "1f8f2dgrjhx8aw1gzawrf8qggf5j0dygsla08bbsxhx5mc5a6cka";
|
||||
};
|
||||
jaxws = fetchurl {
|
||||
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
|
||||
sha256 = "03982ajxm0hzany1jg009ym84vryx7a8qfi6wcgjxyxvk8vnz37c";
|
||||
};
|
||||
jaxp = fetchurl {
|
||||
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
|
||||
sha256 = "0578h04y1ha60yjplsa8lqdjds9s2lxzgs9ybm9rs1rqzxmm0xmy";
|
||||
};
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
name = "openjdk-7u${update}b${build}";
|
||||
|
||||
srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ];
|
||||
sourceRoot = ".";
|
||||
|
||||
outputs = [ "out" "jre" ];
|
||||
|
||||
buildInputs =
|
||||
[ unzip procps ant which zip cpio nettools alsaLib
|
||||
xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
|
||||
xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
|
||||
fontconfig perl file bootjdk
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=format-overflow" # newly detected by gcc7
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama";
|
||||
|
||||
postUnpack = ''
|
||||
ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do
|
||||
mv $p-* $(ls | grep '^jdk7u')/$p
|
||||
done
|
||||
cd jdk7u-*
|
||||
|
||||
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
|
||||
-e "s@/bin/ls@${coreutils}/bin/ls@" \
|
||||
hotspot/make/linux/makefiles/sa.make
|
||||
|
||||
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
|
||||
{jdk,corba}/make/common/shared/Defs-utils.gmk
|
||||
|
||||
tar xf ${cups.src}
|
||||
cupsDir=$(echo $(pwd)/cups-*)
|
||||
makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir)
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./cppflags-include-fix.patch
|
||||
./fix-java-home.patch
|
||||
./paxctl.patch
|
||||
./read-truststore-from-env.patch
|
||||
./currency-date-range.patch
|
||||
];
|
||||
|
||||
NIX_NO_SELF_RPATH = true;
|
||||
|
||||
makeFlags = [
|
||||
"SORT=${coreutils}/bin/sort"
|
||||
"ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
|
||||
"FREETYPE_HEADERS_PATH=${freetype.dev}/include"
|
||||
"FREETYPE_LIB_PATH=${freetype.out}/lib"
|
||||
"MILESTONE=${update}"
|
||||
"BUILD_NUMBER=b${build}"
|
||||
"USRBIN_PATH="
|
||||
"COMPILER_PATH="
|
||||
"DEVTOOLS_PATH="
|
||||
"UNIXCOMMAND_PATH="
|
||||
"BOOTDIR=${bootjdk.home}"
|
||||
"STATIC_CXX=false"
|
||||
"UNLIMITED_CRYPTO=1"
|
||||
"FULL_DEBUG_SYMBOLS=0"
|
||||
] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1";
|
||||
|
||||
configurePhase = "true";
|
||||
|
||||
preBuild = ''
|
||||
# We also need to PaX-mark in the middle of the build
|
||||
substituteInPlace hotspot/make/linux/makefiles/launcher.make \
|
||||
--replace XXX_PAXFLAGS_XXX ${paxflags}
|
||||
substituteInPlace jdk/make/common/Program.gmk \
|
||||
--replace XXX_PAXFLAGS_XXX ${paxflags}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
|
||||
|
||||
cp -av build/*/j2sdk-image/* $out/lib/openjdk
|
||||
|
||||
# Move some stuff to top-level.
|
||||
mv $out/lib/openjdk/include $out/include
|
||||
mv $out/lib/openjdk/man $out/share/man
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/linux/*_md.h $out/include/
|
||||
|
||||
# Remove some broken manpages.
|
||||
rm -rf $out/share/man/ja*
|
||||
|
||||
# Remove crap from the installation.
|
||||
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
|
||||
|
||||
# Move the JRE to a separate output.
|
||||
mv $out/lib/openjdk/jre $jre/lib/openjdk/
|
||||
mkdir $out/lib/openjdk/jre
|
||||
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
|
||||
|
||||
rm -rf $out/lib/openjdk/jre/bin
|
||||
ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
|
||||
|
||||
# Set PaX markings
|
||||
exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||
echo "to mark: *$exes*"
|
||||
for file in $exes; do
|
||||
echo "marking *$file*"
|
||||
paxmark ${paxflags} "$file"
|
||||
done
|
||||
|
||||
# Remove duplicate binaries.
|
||||
for i in $(cd $out/lib/openjdk/bin && echo *); do
|
||||
if [ "$i" = java ]; then continue; fi
|
||||
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
|
||||
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
|
||||
fi
|
||||
done
|
||||
|
||||
# Generate certificates.
|
||||
pushd $jre/lib/openjdk/jre/lib/security
|
||||
rm cacerts
|
||||
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
popd
|
||||
|
||||
ln -s $out/lib/openjdk/bin $out/bin
|
||||
ln -s $jre/lib/openjdk/jre/bin $jre/bin
|
||||
''; # */
|
||||
|
||||
# FIXME: this is unnecessary once the multiple-outputs branch is merged.
|
||||
preFixup = ''
|
||||
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
|
||||
patchELF $jre
|
||||
propagatedBuildInputs+=" $jre"
|
||||
|
||||
# Propagate the setJavaClassPath setup hook from the JRE so that
|
||||
# any package that depends on the JRE has $CLASSPATH set up
|
||||
# properly.
|
||||
mkdir -p $jre/nix-support
|
||||
printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Build the set of output library directories to rpath against
|
||||
LIBDIRS=""
|
||||
for output in $outputs; do
|
||||
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS"
|
||||
done
|
||||
|
||||
# Add the local library paths to remove dependencies on the bootstrap
|
||||
for output in $outputs; do
|
||||
OUTPUTDIR="$(eval echo \$$output)"
|
||||
BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)"
|
||||
echo "$BINLIBS" | while read i; do
|
||||
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
|
||||
patchelf --shrink-rpath "$i" || true
|
||||
done
|
||||
done
|
||||
|
||||
# Test to make sure that we don't depend on the bootstrap
|
||||
for output in $outputs; do
|
||||
if grep -q -r '${bootjdk}' $(eval echo \$$output); then
|
||||
echo "Extraneous references to ${bootjdk} detected"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://openjdk.java.net/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
description = "The open-source Java Development Kit";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit architecture;
|
||||
home = "${openjdk}/lib/openjdk";
|
||||
};
|
||||
};
|
||||
in openjdk
|
||||
@ -93,7 +93,7 @@ let
|
||||
./004_add-fontconfig.patch
|
||||
./005_enable-infinality.patch
|
||||
] ++ lib.optionals (!minimal && enableGnome2) [
|
||||
./swing-use-gtk.patch
|
||||
./swing-use-gtk-jdk8.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,262 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
|
||||
, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
|
||||
, libjpeg, giflib
|
||||
, setJavaClassPath
|
||||
, minimal ? false
|
||||
#, enableInfinality ? true # font rendering patch
|
||||
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
/**
|
||||
* The JRE libraries are in directories that depend on the CPU.
|
||||
*/
|
||||
architecture =
|
||||
if stdenv.system == "i686-linux" then
|
||||
"i386"
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
"amd64"
|
||||
else
|
||||
throw "openjdk requires i686-linux or x86_64 linux";
|
||||
|
||||
update = "9.0.4";
|
||||
build = "12";
|
||||
baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u";
|
||||
repover = "jdk-${update}+${build}";
|
||||
paxflags = if stdenv.isi686 then "msp" else "m";
|
||||
jdk9 = fetchurl {
|
||||
url = "${baseurl}/archive/${repover}.tar.gz";
|
||||
sha256 = "06hnrzkwxgrfq26il1mjyl6wgb7x3qym69pjbddhl9m29n2si3jh";
|
||||
};
|
||||
langtools = fetchurl {
|
||||
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
|
||||
sha256 = "16xqnqn773p6ywcdjx801vbng2skjal7svydn0s7wf3ldqzx64mi";
|
||||
};
|
||||
hotspot = fetchurl {
|
||||
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
|
||||
sha256 = "0g5ddffl2qykrjf17ac9as60rd4sfyv7s2fpgjn86k4a69gkx93v";
|
||||
};
|
||||
corba = fetchurl {
|
||||
url = "${baseurl}/corba/archive/${repover}.tar.gz";
|
||||
sha256 = "14585dzs2mfzgzrnbvc062pigngs35hajwpr22m6fzbm7580vnqk";
|
||||
};
|
||||
jdk = fetchurl {
|
||||
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
|
||||
sha256 = "16595jdg3y9zy70q8i615a7d6w0zzbydfxylvaq42wrsc7jw733h";
|
||||
};
|
||||
jaxws = fetchurl {
|
||||
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
|
||||
sha256 = "1m1aspc1hq74w0bkasrfvp8ygs6psbc1l61vfw9244j2vgfahjgn";
|
||||
};
|
||||
jaxp = fetchurl {
|
||||
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
|
||||
sha256 = "06ns2giw366vjivb6d46gqwfvfzkaddrgd1x6y8w37ywygp50lxm";
|
||||
};
|
||||
nashorn = fetchurl {
|
||||
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
|
||||
sha256 = "0z6mlzvz1hh1yzli69qjlrcwqdjnivbjbqqrqi4hhpls6z0a2ch7";
|
||||
};
|
||||
openjdk9 = stdenv.mkDerivation {
|
||||
name = "openjdk-${update}-b${build}";
|
||||
|
||||
srcs = [ jdk9 langtools hotspot corba jdk jaxws jaxp nashorn ];
|
||||
sourceRoot = ".";
|
||||
|
||||
outputs = [ "out" "jre" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
|
||||
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
|
||||
libXi libXinerama libXcursor lndir fontconfig
|
||||
] ++ lib.optionals (!minimal && enableGnome2) [
|
||||
gtk2 gnome_vfs GConf glib
|
||||
];
|
||||
|
||||
#move the seven other source dirs under the main jdk8u directory,
|
||||
#with version suffixes removed, as the remainder of the build will expect
|
||||
prePatch = ''
|
||||
mainDir=$(find . -maxdepth 1 -name jdk9\*);
|
||||
find . -maxdepth 1 -name \*jdk\* -not -name jdk9\* | awk -F- '{print $1}' | while read p; do
|
||||
mv $p-* $mainDir/$p
|
||||
done
|
||||
cd $mainDir
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk9.patch
|
||||
./read-truststore-from-env-jdk9.patch
|
||||
./currency-date-range-jdk8.patch
|
||||
#] ++ lib.optionals (!minimal && enableInfinality) [
|
||||
# ./004_add-fontconfig.patch
|
||||
# ./005_enable-infinality.patch
|
||||
] ++ lib.optionals (!minimal && enableGnome2) [
|
||||
./swing-use-gtk-jdk9.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
chmod +x configure
|
||||
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
|
||||
|
||||
configureFlagsArray=(
|
||||
"--with-boot-jdk=${bootjdk.home}"
|
||||
"--with-update-version=${update}"
|
||||
"--with-build-number=${build}"
|
||||
"--with-milestone=fcs"
|
||||
"--enable-unlimited-crypto"
|
||||
"--disable-debug-symbols"
|
||||
"--disable-freetype-bundling"
|
||||
"--with-zlib=system"
|
||||
"--with-giflib=system"
|
||||
"--with-stdc++lib=dynamic"
|
||||
|
||||
# glibc 2.24 deprecated readdir_r so we need this
|
||||
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
|
||||
"--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
|
||||
''
|
||||
+ lib.optionalString minimal "\"--enable-headless-only\""
|
||||
+ ");"
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1306558
|
||||
# https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
|
||||
+ stdenv.lib.optionalString stdenv.cc.isGNU ''
|
||||
NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS= lib.optionals (!minimal) [
|
||||
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
|
||||
] ++ lib.optionals (!minimal && enableGnome2) [
|
||||
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
|
||||
];
|
||||
|
||||
buildFlags = [ "all" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
|
||||
|
||||
cp -av build/*/images/jdk/* $out/lib/openjdk
|
||||
|
||||
# Remove some broken manpages.
|
||||
rm -rf $out/lib/openjdk/man/ja*
|
||||
|
||||
# Mirror some stuff in top-level.
|
||||
mkdir $out/include $out/share/man
|
||||
ln -s $out/lib/openjdk/include/* $out/include/
|
||||
ln -s $out/lib/openjdk/man/* $out/share/man/
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/linux/*_md.h $out/include/
|
||||
|
||||
# Copy the JRE to a separate output and setup fallback fonts
|
||||
cp -av build/*/images/jre $jre/lib/openjdk/
|
||||
mkdir $out/lib/openjdk/jre
|
||||
${lib.optionalString (!minimal) ''
|
||||
mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
|
||||
lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
|
||||
''}
|
||||
|
||||
# Remove crap from the installation.
|
||||
rm -rf $out/lib/openjdk/demo
|
||||
${lib.optionalString minimal ''
|
||||
for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
|
||||
rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so
|
||||
done
|
||||
''}
|
||||
|
||||
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
|
||||
|
||||
# Make sure cmm/*.pf are not symlinks:
|
||||
# https://youtrack.jetbrains.com/issue/IDEA-147272
|
||||
# in 9, it seems no *.pf files end up in $out ... ?
|
||||
# rm -rf $out/lib/openjdk/jre/lib/cmm
|
||||
# ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
|
||||
|
||||
# Set PaX markings
|
||||
exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||
echo "to mark: *$exes*"
|
||||
for file in $exes; do
|
||||
echo "marking *$file*"
|
||||
paxmark ${paxflags} "$file"
|
||||
done
|
||||
|
||||
# Remove duplicate binaries.
|
||||
for i in $(cd $out/lib/openjdk/bin && echo *); do
|
||||
if [ "$i" = java ]; then continue; fi
|
||||
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
|
||||
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
|
||||
fi
|
||||
done
|
||||
|
||||
# Generate certificates.
|
||||
(
|
||||
cd $jre/lib/openjdk/jre/lib/security
|
||||
rm cacerts
|
||||
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
)
|
||||
|
||||
ln -s $out/lib/openjdk/bin $out/bin
|
||||
ln -s $jre/lib/openjdk/jre/bin $jre/bin
|
||||
ln -s $jre/lib/openjdk/jre $out/jre
|
||||
'';
|
||||
|
||||
# FIXME: this is unnecessary once the multiple-outputs branch is merged.
|
||||
preFixup = ''
|
||||
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
|
||||
patchELF $jre
|
||||
propagatedBuildInputs+=" $jre"
|
||||
|
||||
# Propagate the setJavaClassPath setup hook from the JRE so that
|
||||
# any package that depends on the JRE has $CLASSPATH set up
|
||||
# properly.
|
||||
mkdir -p $jre/nix-support
|
||||
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
|
||||
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Build the set of output library directories to rpath against
|
||||
LIBDIRS=""
|
||||
for output in $outputs; do
|
||||
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
|
||||
done
|
||||
|
||||
# Add the local library paths to remove dependencies on the bootstrap
|
||||
for output in $outputs; do
|
||||
OUTPUTDIR=$(eval echo \$$output)
|
||||
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
|
||||
echo "$BINLIBS" | while read i; do
|
||||
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
|
||||
patchelf --shrink-rpath "$i" || true
|
||||
done
|
||||
done
|
||||
|
||||
# Test to make sure that we don't depend on the bootstrap
|
||||
for output in $outputs; do
|
||||
if grep -q -r '${bootjdk}' $(eval echo \$$output); then
|
||||
echo "Extraneous references to ${bootjdk} detected"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://openjdk.java.net/;
|
||||
license = licenses.gpl2;
|
||||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit architecture;
|
||||
home = "${openjdk9}/lib/openjdk";
|
||||
};
|
||||
};
|
||||
in openjdk9
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv
|
||||
, runCommand, fetchurl, file
|
||||
, runCommand, fetchurl, file, zlib
|
||||
|
||||
, version
|
||||
}:
|
||||
@ -7,30 +7,19 @@
|
||||
assert stdenv.hostPlatform.libc == "glibc";
|
||||
|
||||
let
|
||||
# !!! These should be on nixos.org
|
||||
fetchboot = version: arch: sha256: fetchurl {
|
||||
name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz";
|
||||
url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
src = if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
(if version == "8" then
|
||||
fetchurl {
|
||||
url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";
|
||||
sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks";
|
||||
}
|
||||
else if version == "7" then
|
||||
fetchurl {
|
||||
url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1";
|
||||
sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra";
|
||||
}
|
||||
(if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
|
||||
else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
|
||||
else throw "No bootstrap for version")
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
(if version == "8" then
|
||||
fetchurl {
|
||||
url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";
|
||||
sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9";
|
||||
}
|
||||
else if version == "7" then
|
||||
fetchurl {
|
||||
url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1";
|
||||
sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx";
|
||||
}
|
||||
(if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
|
||||
else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
|
||||
else throw "No bootstrap for version")
|
||||
else throw "No bootstrap for system";
|
||||
|
||||
@ -45,7 +34,7 @@ let
|
||||
find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
|
||||
isELF "$elf" || continue
|
||||
patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
|
||||
patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true
|
||||
patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true
|
||||
done
|
||||
|
||||
# Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
|
||||
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400
|
||||
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500
|
||||
@@ -234,12 +234,6 @@
|
||||
endif # !HEADLESS
|
||||
endif # PLATFORM
|
||||
|
||||
-ifeq ($(PLATFORM), linux)
|
||||
- # Checking for the X11/extensions headers at the additional location
|
||||
- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
|
||||
- $(wildcard /usr/include/X11/extensions))
|
||||
-endif
|
||||
-
|
||||
ifeq ($(PLATFORM), macosx))
|
||||
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
|
||||
-I$(OPENWIN_HOME)/include
|
||||
@ -1,14 +0,0 @@
|
||||
diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
--- openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-07-17 05:42:14.000000000 -0430
|
||||
+++ openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430
|
||||
@@ -281,8 +281,8 @@
|
||||
checkCurrencyCode(newCurrency);
|
||||
String timeString = currencyInfo.substring(4, length - 4);
|
||||
long time = format.parse(timeString).getTime();
|
||||
- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
|
||||
- throw new RuntimeException("time is more than 10 years from present: " + time);
|
||||
+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
|
||||
+ throw new RuntimeException("time is more than 20 years from present: " + time);
|
||||
}
|
||||
specialCaseCutOverTimes[specialCaseCount] = time;
|
||||
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
|
||||
@ -1,14 +0,0 @@
|
||||
--- a/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400
|
||||
+++ b/hotspot/src/os/linux/vm/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400
|
||||
@@ -2318,10 +2318,7 @@
|
||||
assert(ret, "cannot locate libjvm");
|
||||
char *rp = NULL;
|
||||
if (ret && dli_fname[0] != '\0') {
|
||||
- rp = realpath(dli_fname, buf);
|
||||
- }
|
||||
- if (rp == NULL) {
|
||||
- return;
|
||||
+ snprintf(buf, buflen, "%s", dli_fname);
|
||||
}
|
||||
|
||||
if (Arguments::sun_java_launcher_is_altjvm()) {
|
||||
@ -1,17 +0,0 @@
|
||||
diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200
|
||||
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100
|
||||
@@ -2358,12 +2358,10 @@
|
||||
CAST_FROM_FN_PTR(address, os::jvm_path),
|
||||
dli_fname, sizeof(dli_fname), NULL);
|
||||
assert(ret, "cannot locate libjvm");
|
||||
char *rp = NULL;
|
||||
if (ret && dli_fname[0] != '\0') {
|
||||
- rp = realpath(dli_fname, buf);
|
||||
+ snprintf(buf, buflen, "%s", dli_fname);
|
||||
}
|
||||
- if (rp == NULL)
|
||||
- return;
|
||||
|
||||
if (Arguments::created_by_gamma_launcher()) {
|
||||
// Support for the gamma launcher. Typical value for buf is
|
||||
@ -1,28 +0,0 @@
|
||||
diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make
|
||||
index 34bbcd6..41b9332 100644
|
||||
--- a/hotspot/make/linux/makefiles/launcher.make
|
||||
+++ b/hotspot/make/linux/makefiles/launcher.make
|
||||
@@ -83,6 +83,8 @@ $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
|
||||
$(QUIETLY) echo Linking launcher...
|
||||
$(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
|
||||
$(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)
|
||||
+ paxctl -c $(LAUNCHER)
|
||||
+ paxctl -zex -XXX_PAXFLAGS_XXX $(LAUNCHER)
|
||||
$(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
|
||||
|
||||
$(LAUNCHER): $(LAUNCHER_SCRIPT)
|
||||
diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk
|
||||
index 091800d..1de8cb4 100644
|
||||
--- a/jdk/make/common/Program.gmk
|
||||
+++ b/jdk/make/common/Program.gmk
|
||||
@@ -60,6 +60,10 @@ ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
|
||||
program_default_rule: all
|
||||
|
||||
program: $(ACTUAL_PROGRAM)
|
||||
+ if [[ "$(PROGRAM)" = "java" ]]; then \
|
||||
+ paxctl -c $(ACTUAL_PROGRAM); \
|
||||
+ paxctl -zex -XXX_PAXFLAGS_XXX $(ACTUAL_PROGRAM); \
|
||||
+ fi
|
||||
|
||||
# Work-around for missing processor specific mapfiles
|
||||
ifndef CROSS_COMPILE_ARCH
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
|
||||
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java.new 2017-07-05 20:45:57.491295030 -0400
|
||||
@@ -71,6 +71,7 @@
|
||||
*
|
||||
* The preference of the default trusted KeyStore is:
|
||||
* javax.net.ssl.trustStore
|
||||
+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
|
||||
* jssecacerts
|
||||
* cacerts
|
||||
*/
|
||||
@@ -144,6 +145,9 @@
|
||||
String temporaryName = "";
|
||||
File temporaryFile = null;
|
||||
long temporaryTime = 0L;
|
||||
+ if (storePropName == null){
|
||||
+ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
|
||||
+ }
|
||||
if (!"NONE".equals(storePropName)) {
|
||||
String[] fileNames =
|
||||
new String[] {storePropName, defaultStore};
|
||||
@ -1,21 +0,0 @@
|
||||
diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
|
||||
--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200
|
||||
+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100
|
||||
@@ -158,6 +158,7 @@
|
||||
/*
|
||||
* Try:
|
||||
* javax.net.ssl.trustStore (if this variable exists, stop)
|
||||
+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
|
||||
* jssecacerts
|
||||
* cacerts
|
||||
*
|
||||
@@ -165,6 +166,9 @@
|
||||
*/
|
||||
|
||||
storeFileName = props.get("trustStore");
|
||||
+ if (storeFileName == null) {
|
||||
+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
|
||||
+ }
|
||||
if (!"NONE".equals(storeFileName)) {
|
||||
if (storeFileName != null) {
|
||||
storeFile = new File(storeFileName);
|
||||
@ -1,26 +0,0 @@
|
||||
diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java
|
||||
--- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300
|
||||
+++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300
|
||||
@@ -607,11 +607,9 @@
|
||||
if (osType == OSInfo.OSType.WINDOWS) {
|
||||
return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
|
||||
} else {
|
||||
- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
|
||||
Toolkit toolkit = Toolkit.getDefaultToolkit();
|
||||
- if ("gnome".equals(desktop) &&
|
||||
- toolkit instanceof SunToolkit &&
|
||||
- ((SunToolkit) toolkit).isNativeGTKAvailable()) {
|
||||
+ if (toolkit instanceof SunToolkit &&
|
||||
+ ((SunToolkit) toolkit).isNativeGTKAvailable()) {
|
||||
// May be set on Linux and Solaris boxs.
|
||||
return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
|
||||
}
|
||||
@@ -1341,7 +1339,7 @@
|
||||
lafName = (String) lafData.remove("defaultlaf");
|
||||
}
|
||||
if (lafName == null) {
|
||||
- lafName = getCrossPlatformLookAndFeelClassName();
|
||||
+ lafName = getSystemLookAndFeelClassName();
|
||||
}
|
||||
lafName = swingProps.getProperty(defaultLAFKey, lafName);
|
||||
|
||||
@ -1,158 +0,0 @@
|
||||
{ swingSupport ? true
|
||||
, stdenv
|
||||
, requireFile
|
||||
, makeWrapper
|
||||
, unzip
|
||||
, file
|
||||
, xorg ? null
|
||||
, packageType ? "JDK" # JDK, JRE, or ServerJRE
|
||||
, pluginSupport ? true
|
||||
, glib
|
||||
, libxml2
|
||||
, ffmpeg_2
|
||||
, libxslt
|
||||
, libGL
|
||||
, freetype
|
||||
, fontconfig
|
||||
, gtk2
|
||||
, pango
|
||||
, cairo
|
||||
, alsaLib
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, zlib
|
||||
, elfutils
|
||||
, setJavaClassPath
|
||||
}:
|
||||
|
||||
assert stdenv.system == "x86_64-linux";
|
||||
assert swingSupport -> xorg != null;
|
||||
|
||||
let
|
||||
version = "9.0.4";
|
||||
|
||||
downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
|
||||
|
||||
rSubPaths = [
|
||||
"lib/jli"
|
||||
"lib/server"
|
||||
"lib"
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
name = if packageType == "JDK" then "oraclejdk-${version}"
|
||||
else if packageType == "JRE" then "oraclejre-${version}"
|
||||
else if packageType == "ServerJRE" then "oracleserverjre-${version}"
|
||||
else abort "unknown package Type ${packageType}";
|
||||
|
||||
src =
|
||||
if packageType == "JDK" then
|
||||
requireFile {
|
||||
name = "jdk-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/jdk9-downloads-3848520.html";
|
||||
sha256 = "18nsjn64wkfmyb09wf2k7lvhazf83cs3dyichr038vl1gs3ymi4h";
|
||||
}
|
||||
else if packageType == "JRE" then
|
||||
requireFile {
|
||||
name = "jre-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/jre9-downloads-3848532.html";
|
||||
sha256 = "01fp079mr04nniyf06w8vd47qxr6rly1lbh8dqkddb8fp9h6a79k";
|
||||
}
|
||||
else if packageType == "ServerJRE" then
|
||||
requireFile {
|
||||
name = "serverjre-${version}_linux-x64_bin.tar.gz";
|
||||
url = "${downloadUrlBase}/server-jre9-downloads-3848530.html";
|
||||
sha256 = "1jlpa4mn306hx0p9jcw3i6cpdvnng29dwjsymgcan56810q6p6yj";
|
||||
}
|
||||
else abort "unknown package Type ${packageType}";
|
||||
|
||||
nativeBuildInputs = [ file ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
# See: https://github.com/NixOS/patchelf/issues/10
|
||||
dontStrip = 1;
|
||||
|
||||
installPhase = ''
|
||||
cd ..
|
||||
|
||||
# Set PaX markings
|
||||
exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||
for file in $exes; do
|
||||
paxmark m "$file"
|
||||
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
|
||||
${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
|
||||
done
|
||||
|
||||
mv $sourceRoot $out
|
||||
|
||||
shopt -s extglob
|
||||
for file in $out/*
|
||||
do
|
||||
if test -f $file ; then
|
||||
rm $file
|
||||
fi
|
||||
done
|
||||
|
||||
if test -z "$pluginSupport"; then
|
||||
rm -f $out/bin/javaws
|
||||
fi
|
||||
|
||||
mkdir $out/lib/plugins
|
||||
ln -s $out/lib/libnpjp2.so $out/lib/plugins
|
||||
|
||||
# for backward compatibility
|
||||
ln -s $out $out/jre
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
|
||||
|
||||
# set all the dynamic linkers
|
||||
find $out -type f -perm -0100 \
|
||||
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$rpath" {} \;
|
||||
|
||||
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
|
||||
|
||||
# Oracle Java Mission Control needs to know where libgtk-x11 and related is
|
||||
if test -x $out/bin/jmc; then
|
||||
wrapProgram "$out/bin/jmc" \
|
||||
--suffix-each LD_LIBRARY_PATH ':' "$rpath"
|
||||
fi
|
||||
'';
|
||||
|
||||
/**
|
||||
* libXt is only needed on amd64
|
||||
*/
|
||||
libraries =
|
||||
[stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
|
||||
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
|
||||
|
||||
rpath = stdenv.lib.strings.makeLibraryPath libraries;
|
||||
|
||||
passthru.mozillaPlugin = "/lib/plugins";
|
||||
|
||||
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
|
||||
|
||||
passthru.home = result;
|
||||
|
||||
# for backward compatibility
|
||||
passthru.architecture = "";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
|
||||
};
|
||||
|
||||
}; in result
|
||||
@ -4,13 +4,13 @@ with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "psc-package";
|
||||
version = "0.2.5";
|
||||
version = "0.3.2-pre";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "purescript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15g0l8g8l6m5x4f73w68r9iav091x12b3wjxh0rx3ggnj093g6j1";
|
||||
sha256 = "0vriyvq0mad3px4lhbqg6xrym2z6wnhr81101mx8cg1lgql1wgwk";
|
||||
};
|
||||
|
||||
isLibrary = false;
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbcl-${version}";
|
||||
version = "1.4.4";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
|
||||
sha256 = "1k6v5b8qv7vyxvh8asx6phf2hbapx5pp5p5j47hgnq123fwnh4fa";
|
||||
sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
v_major = "4.0.3";
|
||||
v_major = "4.1";
|
||||
version = "${v_major}-RELEASE";
|
||||
version_friendly = "${v_major}";
|
||||
|
||||
@ -55,15 +55,15 @@ let
|
||||
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
|
||||
clang = fetch {
|
||||
repo = "swift-clang";
|
||||
sha256 = "0zm624iwiprk3c3nzqf4p1fd9zqic4yi3jv51cw3249ax4x6vy10";
|
||||
sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h";
|
||||
};
|
||||
llvm = fetch {
|
||||
repo = "swift-llvm";
|
||||
sha256 = "11vw6461c0cdvwm1wna1a5709fjj14hzp6br6jg94p4f6jp3yv4d";
|
||||
sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh";
|
||||
};
|
||||
compilerrt = fetch {
|
||||
repo = "swift-compiler-rt";
|
||||
sha256 = "1hj4qaj4c9n2wzg2cvarbyl0n708zd1dlw4zkzq07fjxxqs36nfa";
|
||||
sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl";
|
||||
};
|
||||
cmark = fetch {
|
||||
repo = "swift-cmark";
|
||||
@ -71,32 +71,32 @@ let
|
||||
};
|
||||
lldb = fetch {
|
||||
repo = "swift-lldb";
|
||||
sha256 = "0yk5qg85008vcn63vn2jpn5ls9pdhda222p2w1cfkrj27k5k8vqr";
|
||||
sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m";
|
||||
};
|
||||
llbuild = fetch {
|
||||
repo = "swift-llbuild";
|
||||
sha256 = "0jffw6z1s6ck1i05brw59x6vsg7zrxbz5n2wz72fj29rh3nppc7a";
|
||||
sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1";
|
||||
};
|
||||
pm = fetch {
|
||||
repo = "swift-package-manager";
|
||||
sha256 = "0xj070b8fii7ijfsnyq4fxgv6569vdrg0yippi85h2p1l7s9aagh";
|
||||
sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3";
|
||||
};
|
||||
xctest = fetch {
|
||||
repo = "swift-corelibs-xctest";
|
||||
sha256 = "0l355wq8zfwrpv044xf4smjwbm0bmib360748n8cwls3vkr9l2yv";
|
||||
sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5";
|
||||
};
|
||||
foundation = fetch {
|
||||
repo = "swift-corelibs-foundation";
|
||||
sha256 = "0s7yc5gsbd96a4bs8c6q24dyfjm4xhcr2nzhl2ics8dmi60j15s4";
|
||||
sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw";
|
||||
};
|
||||
libdispatch = fetch {
|
||||
repo = "swift-corelibs-libdispatch";
|
||||
sha256 = "0x8zzq3shhvmhq4sbhaaa0ddiv3nw347pz6ayym6jyzq7j9n15ia";
|
||||
sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
swift = fetch {
|
||||
repo = "swift";
|
||||
sha256 = "0a1gq0k5701i418f0qi7kywv16q7vh4a4wp0f6fpyv4sjkq27msx";
|
||||
sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky";
|
||||
};
|
||||
};
|
||||
|
||||
@ -132,19 +132,6 @@ let
|
||||
install_destdir=$SWIFT_INSTALL_DIR \
|
||||
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
|
||||
|
||||
# from llvm/4/llvm.nix
|
||||
sigaltstackPatch = fetchpatch {
|
||||
name = "sigaltstack.patch"; # for glibc-2.26
|
||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
||||
};
|
||||
|
||||
# https://bugs.swift.org/browse/SR-6409
|
||||
sigunusedPatch = fetchpatch {
|
||||
name = "sigunused.patch";
|
||||
url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff";
|
||||
sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swift-${version_friendly}";
|
||||
@ -179,7 +166,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configurePhase = ''
|
||||
cd ..
|
||||
|
||||
|
||||
export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz
|
||||
|
||||
mkdir build install
|
||||
@ -236,20 +223,18 @@ stdenv.mkDerivation rec {
|
||||
'' + ''
|
||||
patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
|
||||
patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
|
||||
patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch}
|
||||
patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
|
||||
# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
|
||||
patch -p1 -i ${./patches/remove_xlocale.patch}
|
||||
# https://bugs.swift.org/browse/SR-4633
|
||||
patch -p1 -d swift -i ${./patches/icu59.patch}
|
||||
|
||||
sed -i swift/utils/build-presets.ini \
|
||||
-e 's/^test-installable-package$/# \0/' \
|
||||
-e 's/^test$/# \0/' \
|
||||
-e 's/^validation-test$/# \0/' \
|
||||
-e 's/^long-test$/# \0/'
|
||||
|
||||
# https://bugs.swift.org/browse/SR-5779
|
||||
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
|
||||
|
||||
# https://bugs.swift.org/browse/SR-4838
|
||||
sed -i -e '30i#include <functional>' lldb/include/lldb/Utility/TaskPool.h
|
||||
|
||||
substituteInPlace clang/lib/Driver/ToolChains.cpp \
|
||||
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
|
||||
--replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
|
||||
' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
|
||||
patch -p1 -d clang -i ${./purity.patch}
|
||||
@ -258,19 +243,15 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
|
||||
|
||||
# This test fails on one of my machines, not sure why.
|
||||
# Disabling for now.
|
||||
# Disabling for now.
|
||||
rm llbuild/tests/Examples/buildsystem-capi.llbuild
|
||||
|
||||
PREFIX=''${out/#\/}
|
||||
substituteInPlace swift-corelibs-xctest/build_script.py \
|
||||
--replace usr "$PREFIX"
|
||||
substituteInPlace swiftpm/Utilities/bootstrap \
|
||||
--replace "usr" "$PREFIX"
|
||||
'' + stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
patch -p1 -d compiler-rt -i ${sigaltstackPatch}
|
||||
patch -p1 -d compiler-rt -i ${./patches/sigaltstack.patch}
|
||||
patch -p1 -d llbuild -i ${sigunusedPatch}
|
||||
patch -p1 -i ${./patches/sigunused.patch}
|
||||
--replace \"usr\" \"$PREFIX\" \
|
||||
--replace usr/lib "$PREFIX/lib"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
@ -305,7 +286,8 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
license = licenses.asl20;
|
||||
# Swift doesn't support 32bit Linux, unknown on other platforms.
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = platforms.i686;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001
|
||||
From: Will Dietz <w@wdtz.org>
|
||||
Date: Tue, 28 Mar 2017 15:02:18 -0500
|
||||
Subject: [PATCH 3/4] build-presets: (linux) disable tests.
|
||||
|
||||
---
|
||||
utils/build-presets.ini | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
|
||||
index 1095cbaab7..1739e91dc2 100644
|
||||
--- a/utils/build-presets.ini
|
||||
+++ b/utils/build-presets.ini
|
||||
@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra
|
||||
|
||||
# Executes the lit tests for the installable package that is created
|
||||
# Assumes the swift-integration-tests repo is checked out
|
||||
-test-installable-package
|
||||
+# test-installable-package
|
||||
|
||||
# Path to the root of the installation filesystem.
|
||||
install-destdir=%(install_destdir)s
|
||||
@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation
|
||||
build-subdir=buildbot_linux
|
||||
lldb
|
||||
release
|
||||
-test
|
||||
-validation-test
|
||||
-long-test
|
||||
+#test
|
||||
+#validation-test
|
||||
+#long-test
|
||||
foundation
|
||||
libdispatch
|
||||
lit-args=-v
|
||||
--
|
||||
2.12.2
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
--- a/stdlib/public/stubs/UnicodeNormalization.cpp
|
||||
+++ b/stdlib/public/stubs/UnicodeNormalization.cpp
|
||||
@@ -86,11 +86,8 @@ ASCIICollation() {
|
||||
for (unsigned char c = 0; c < 128; ++c) {
|
||||
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||||
intptr_t NumCollationElts = 0;
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
UChar Buffer[1];
|
||||
-#else
|
||||
- uint16_t Buffer[1];
|
||||
-#endif
|
||||
+
|
||||
Buffer[0] = c;
|
||||
|
||||
UCollationElements *CollationIterator =
|
||||
@@ -127,18 +124,9 @@ swift::_swift_stdlib_unicode_compare_utf16_utf16(const uint16_t *LeftString,
|
||||
int32_t LeftLength,
|
||||
const uint16_t *RightString,
|
||||
int32_t RightLength) {
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
- // ICU UChar type is platform dependent. In Cygwin, it is defined
|
||||
- // as wchar_t which size is 2. It seems that the underlying binary
|
||||
- // representation is same with swift utf16 representation.
|
||||
return ucol_strcoll(GetRootCollator(),
|
||||
reinterpret_cast<const UChar *>(LeftString), LeftLength,
|
||||
reinterpret_cast<const UChar *>(RightString), RightLength);
|
||||
-#else
|
||||
- return ucol_strcoll(GetRootCollator(),
|
||||
- LeftString, LeftLength,
|
||||
- RightString, RightLength);
|
||||
-#endif
|
||||
}
|
||||
|
||||
/// Compares the strings via the Unicode Collation Algorithm on the root locale.
|
||||
@@ -156,12 +144,8 @@ swift::_swift_stdlib_unicode_compare_utf8_utf16(const unsigned char *LeftString,
|
||||
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||||
|
||||
uiter_setUTF8(&LeftIterator, reinterpret_cast<const char *>(LeftString), LeftLength);
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
uiter_setString(&RightIterator, reinterpret_cast<const UChar *>(RightString),
|
||||
RightLength);
|
||||
-#else
|
||||
- uiter_setString(&RightIterator, RightString, RightLength);
|
||||
-#endif
|
||||
|
||||
uint32_t Diff = ucol_strcollIter(GetRootCollator(),
|
||||
&LeftIterator, &RightIterator, &ErrorCode);
|
||||
@@ -199,14 +183,10 @@ swift::_swift_stdlib_unicode_compare_utf8_utf8(const unsigned char *LeftString,
|
||||
void *swift::_swift_stdlib_unicodeCollationIterator_create(
|
||||
const __swift_uint16_t *Str, __swift_uint32_t Length) {
|
||||
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
UCollationElements *CollationIterator = ucol_openElements(
|
||||
GetRootCollator(), reinterpret_cast<const UChar *>(Str), Length,
|
||||
&ErrorCode);
|
||||
-#else
|
||||
- UCollationElements *CollationIterator = ucol_openElements(
|
||||
- GetRootCollator(), Str, Length, &ErrorCode);
|
||||
-#endif
|
||||
+
|
||||
if (U_FAILURE(ErrorCode)) {
|
||||
swift::crash("_swift_stdlib_unicodeCollationIterator_create: ucol_openElements() failed.");
|
||||
}
|
||||
@@ -244,17 +224,12 @@ swift::_swift_stdlib_unicode_strToUpper(uint16_t *Destination,
|
||||
const uint16_t *Source,
|
||||
int32_t SourceLength) {
|
||||
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
uint32_t OutputLength = u_strToUpper(reinterpret_cast<UChar *>(Destination),
|
||||
DestinationCapacity,
|
||||
reinterpret_cast<const UChar *>(Source),
|
||||
SourceLength,
|
||||
"", &ErrorCode);
|
||||
-#else
|
||||
- uint32_t OutputLength = u_strToUpper(Destination, DestinationCapacity,
|
||||
- Source, SourceLength,
|
||||
- "", &ErrorCode);
|
||||
-#endif
|
||||
+
|
||||
if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
|
||||
swift::crash("u_strToUpper: Unexpected error uppercasing unicode string.");
|
||||
}
|
||||
@@ -271,17 +246,12 @@ swift::_swift_stdlib_unicode_strToLower(uint16_t *Destination,
|
||||
const uint16_t *Source,
|
||||
int32_t SourceLength) {
|
||||
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||||
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||||
uint32_t OutputLength = u_strToLower(reinterpret_cast<UChar *>(Destination),
|
||||
DestinationCapacity,
|
||||
reinterpret_cast<const UChar *>(Source),
|
||||
SourceLength,
|
||||
"", &ErrorCode);
|
||||
-#else
|
||||
- uint32_t OutputLength = u_strToLower(Destination, DestinationCapacity,
|
||||
- Source, SourceLength,
|
||||
- "", &ErrorCode);
|
||||
-#endif
|
||||
+
|
||||
if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
|
||||
swift::crash("u_strToLower: Unexpected error lowercasing unicode string.");
|
||||
}
|
||||
@@ -300,9 +300,9 @@
|
||||
|
||||
swift::__swift_stdlib_UBreakIterator *swift::__swift_stdlib_ubrk_open(
|
||||
swift::__swift_stdlib_UBreakIteratorType type, const char *locale,
|
||||
- const UChar *text, int32_t textLength, __swift_stdlib_UErrorCode *status) {
|
||||
+ const __swift_stdlib_UChar * text, __swift_int32_t textLength, __swift_stdlib_UErrorCode *status) {
|
||||
return ptr_cast<swift::__swift_stdlib_UBreakIterator>(
|
||||
- ubrk_open(static_cast<UBreakIteratorType>(type), locale, text, textLength,
|
||||
+ ubrk_open(static_cast<UBreakIteratorType>(type), locale, reinterpret_cast<const UChar *>(text), textLength,
|
||||
ptr_cast<UErrorCode>(status)));
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user