Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
This commit is contained in:
Matthew Justin Bauer
GitHub
commit
75616ceb49
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@ -13,6 +13,7 @@
|
||||
# Libraries
|
||||
/lib @edolstra @nbp
|
||||
/lib/systems @nbp @ericson2314
|
||||
/lib/generators.nix @edolstra @nbp @Profpatsch
|
||||
|
||||
# Nixpkgs Internals
|
||||
/default.nix @nbp
|
||||
|
||||
@ -284,7 +284,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
|
||||
gpl2Oss = {
|
||||
fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
|
||||
url = http://www.mysql.com/about/legal/licensing/foss-exception;
|
||||
url = https://www.mysql.com/about/legal/licensing/foss-exception;
|
||||
};
|
||||
|
||||
gpl2Plus = spdx {
|
||||
|
||||
@ -140,14 +140,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
tosHash = mkOption {
|
||||
type = types.string;
|
||||
default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b";
|
||||
description = ''
|
||||
SHA256 of the Terms of Services document. This changes once in a while.
|
||||
'';
|
||||
};
|
||||
|
||||
production = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -196,7 +188,7 @@ in
|
||||
let
|
||||
cpath = "${cfg.directory}/${cert}";
|
||||
rights = if data.allowKeysForGroup then "750" else "700";
|
||||
cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ]
|
||||
cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
|
||||
++ optionals (data.email != null) [ "--email" data.email ]
|
||||
++ concatMap (p: [ "-f" p ]) data.plugins
|
||||
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
|
||||
|
||||
@ -386,7 +386,7 @@ in
|
||||
echo Resetting znapzend zetups
|
||||
${pkgs.znapzend}/bin/znapzendzetup list \
|
||||
| grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
|
||||
| xargs ${pkgs.znapzend}/bin/znapzendzetup delete
|
||||
| xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
|
||||
'' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
|
||||
echo Importing znapzend zetup ${config} for dataset ${dataset}
|
||||
${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}
|
||||
|
||||
@ -279,7 +279,7 @@ in {
|
||||
tokenAuthFile = mkOption {
|
||||
description = ''
|
||||
Kubernetes apiserver token authentication file. See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
|
||||
'';
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
@ -288,7 +288,7 @@ in {
|
||||
basicAuthFile = mkOption {
|
||||
description = ''
|
||||
Kubernetes apiserver basic authentication file. See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
|
||||
'';
|
||||
default = pkgs.writeText "users" ''
|
||||
kubernetes,admin,0
|
||||
@ -299,7 +299,7 @@ in {
|
||||
authorizationMode = mkOption {
|
||||
description = ''
|
||||
Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
|
||||
'';
|
||||
default = ["RBAC" "Node"];
|
||||
type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
|
||||
@ -308,7 +308,7 @@ in {
|
||||
authorizationPolicy = mkOption {
|
||||
description = ''
|
||||
Kubernetes apiserver authorization policy file. See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
|
||||
'';
|
||||
default = [];
|
||||
type = types.listOf types.attrs;
|
||||
@ -332,7 +332,7 @@ in {
|
||||
runtimeConfig = mkOption {
|
||||
description = ''
|
||||
Api runtime configuration. See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/cluster-management.html"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/cluster-management.html"/>
|
||||
'';
|
||||
default = "authentication.k8s.io/v1beta1=true";
|
||||
example = "api/all=false,api/v1=true";
|
||||
@ -342,7 +342,7 @@ in {
|
||||
admissionControl = mkOption {
|
||||
description = ''
|
||||
Kubernetes admission control plugins to use. See
|
||||
<link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/>
|
||||
<link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>
|
||||
'';
|
||||
default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
|
||||
example = [
|
||||
|
||||
@ -80,8 +80,9 @@ let
|
||||
+ optionalString isEfi (if pkgs.stdenv.isAarch64
|
||||
then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
|
||||
else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
|
||||
in
|
||||
''
|
||||
in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
|
||||
throw "Non-EFI boot methods are only supported on i686 / x86_64"
|
||||
else ''
|
||||
$machine->start;
|
||||
|
||||
# Make sure that we get a login prompt etc.
|
||||
|
||||
@ -96,7 +96,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
|
||||
$machine->succeed("systemctl start systemd-udev-settle.service");
|
||||
subtest "udev-auto-load", sub {
|
||||
$machine->waitForUnit('systemd-udev-settle.service');
|
||||
$machine->succeed('lsmod | grep psmouse');
|
||||
$machine->succeed('lsmod | grep mousedev');
|
||||
};
|
||||
|
||||
# Test whether systemd-tmpfiles-clean works.
|
||||
|
||||
@ -52,7 +52,7 @@ buildGoPackage rec {
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/dapphub/ethsign;
|
||||
homepage = https://github.com/dapphub/ethsign;
|
||||
description = "Make raw signed Ethereum transactions";
|
||||
license = [licenses.gpl3];
|
||||
};
|
||||
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Audio player";
|
||||
homepage = http://audacious-media-player.org/;
|
||||
homepage = https://audacious-media-player.org/;
|
||||
maintainers = with maintainers; [ eelco ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
license = with licenses; [
|
||||
|
||||
@ -81,7 +81,7 @@ mkDerivation {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio player";
|
||||
homepage = http://audacious-media-player.org/;
|
||||
homepage = https://audacious-media-player.org/;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
platforms = with platforms; linux;
|
||||
license = with licenses; [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "kid3-${version}";
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
|
||||
sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8";
|
||||
sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
|
||||
url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
|
||||
sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
installCommand = "python setup.py install --prefix=$out";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
|
||||
homepage = https://www.red-bean.com/decklin/lastfmsubmitd/;
|
||||
description = "An last.fm audio scrobbler and daemon";
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.mopidy.com/;
|
||||
homepage = https://www.mopidy.com/;
|
||||
description = "Mopidy extension for playing music from Google Play Music";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.jgillich ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.14.0";
|
||||
version = "3.14.2";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb";
|
||||
sha256 = "19affzk45wby50gwxwzqgwa7h7618lcs48ngdsa06sd66s8x2fza";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.mopidy.com/;
|
||||
homepage = https://www.mopidy.com/;
|
||||
description = "Mopidy extension for playing music from Spotify";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.rickynils ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, ncurses, libvorbis }:
|
||||
{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "3.2.6";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libvorbis
|
||||
];
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin SDL;
|
||||
|
||||
buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snd-18.1";
|
||||
name = "snd-18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/${name}.tar.gz";
|
||||
sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh";
|
||||
sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
let
|
||||
ver_branch = "2.0";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lightdm-gtk-greeter-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
|
||||
sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1";
|
||||
sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vis-${version}";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k";
|
||||
sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb";
|
||||
repo = "vis";
|
||||
owner = "martanne";
|
||||
};
|
||||
|
||||
66
pkgs/applications/gis/openorienteering-mapper/default.nix
Normal file
66
pkgs/applications/gis/openorienteering-mapper/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools
|
||||
, qtlocation, qtsensors, doxygen, cups, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "OpenOrienteering-Mapper-${version}";
|
||||
version = "0.8.1";
|
||||
|
||||
buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ninja ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
# Required by the build to be specified
|
||||
"-DPROJ4_ROOT=${proj}"
|
||||
|
||||
# Building the manual and bundling licenses fails
|
||||
"-DLICENSING_PROVIDER:BOOL=OFF"
|
||||
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
|
||||
] ++
|
||||
(stdenv.lib.optionals stdenv.isDarwin
|
||||
[
|
||||
# Usually enabled on Darwin
|
||||
"-DCMAKE_FIND_FRAMEWORK=never"
|
||||
# FindGDAL is broken and always finds /Library/Framework unless this is
|
||||
# specified
|
||||
"-DGDAL_INCLUDE_DIR=${gdal}/include"
|
||||
"-DGDAL_CONFIG=${gdal}/bin/gdal-config"
|
||||
"-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
|
||||
# Don't bundle libraries
|
||||
"-DMapper_PACKAGE_PROJ=0"
|
||||
"-DMapper_PACKAGE_QT=0"
|
||||
"-DMapper_PACKAGE_ASSISTANT=0"
|
||||
"-DMapper_PACKAGE_GDAL=0"
|
||||
]);
|
||||
|
||||
|
||||
postInstall =
|
||||
stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# Fixes "This application failed to start because it could not find or load the Qt
|
||||
# platform plugin "cocoa"."
|
||||
wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
OpenOrienteering Mapper is an orienteering mapmaking program
|
||||
and provides a free alternative to the existing proprietary solution.
|
||||
'';
|
||||
homepage = https://www.openorienteering.org/apps/mapper/;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = with stdenv.lib.platforms; darwin;
|
||||
maintainers = with stdenv.lib.maintainers; [mpickering];
|
||||
};
|
||||
}
|
||||
@ -14,8 +14,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.7-22";
|
||||
sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam";
|
||||
version = "7.0.7-27";
|
||||
sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,31 +1,41 @@
|
||||
{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
|
||||
gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
|
||||
librsvg, gst_all_1, autoreconfHook, makeWrapper }:
|
||||
{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
|
||||
gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
|
||||
librsvg, gst_all_1, autoreconfHook, makeWrapper,
|
||||
useUnrar ? false, unrar
|
||||
}:
|
||||
|
||||
assert useUnrar -> unrar != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ahoviewer-${version}";
|
||||
version = "1.4.9";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahodesuka";
|
||||
repo = "ahoviewer";
|
||||
rev = version;
|
||||
sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
|
||||
sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
|
||||
buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
|
||||
libsecret curl unrar libzip librsvg
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base ];
|
||||
|
||||
buildInputs = [
|
||||
glibmm libconfig gtkmm2 glibmm libxml2
|
||||
libsecret curl libzip librsvg
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
] ++ stdenv.lib.optional useUnrar unrar;
|
||||
|
||||
# https://github.com/ahodesuka/ahoviewer/issues/60
|
||||
# Already fixed in the master branch
|
||||
# TODO: remove this next release
|
||||
makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
|
||||
|
||||
postPatch = ''patchShebangs version.sh'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ahoviewer \
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
|
||||
|
||||
@ -13,7 +13,7 @@ mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
|
||||
sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
|
||||
sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CAD program for creating virtual LEGO models";
|
||||
homepage = http://www.leocad.org/;
|
||||
homepage = https://www.leocad.org/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, dos2unix, which, qt }:
|
||||
{ stdenv, fetchurl, dos2unix, which, qt, Carbon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qscreenshot-1.0";
|
||||
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
|
||||
};
|
||||
|
||||
buildInputs = [ dos2unix which qt ];
|
||||
buildInputs = [ dos2unix which qt ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin Carbon;
|
||||
|
||||
# Remove carriage returns that cause /bin/sh to abort
|
||||
preConfigure = ''
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.3";
|
||||
version = "5.4";
|
||||
name = "rawtherapee-" + version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beep6581";
|
||||
repo = "RawTherapee";
|
||||
rev = version;
|
||||
sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
|
||||
sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
mupdf_modded = mupdf.overrideAttrs (attrs: {
|
||||
name = "mupdf-1.10a";
|
||||
src = fetchurl {
|
||||
url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
|
||||
url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
|
||||
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
|
||||
};
|
||||
# Excluded the pdf-*.c files, since they mostly just broke the #includes
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "17.12";
|
||||
version = "18.03";
|
||||
name = "mediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
|
||||
sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
|
||||
name = "mupdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
|
||||
url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
|
||||
sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
url http://mupdf.com/downloads/archive/
|
||||
url https://mupdf.com/downloads/archive/
|
||||
do_overwrite(){
|
||||
ensure_hash
|
||||
ensure_version
|
||||
|
||||
@ -2,15 +2,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pgmanage-${version}";
|
||||
version = "10.1.0";
|
||||
version = "10.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgManage";
|
||||
repo = "pgManage";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
|
||||
sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs src/configure
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
./configure --prefix $out
|
||||
'';
|
||||
|
||||
buildInputs = [ postgresql openssl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
|
||||
{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps
|
||||
, qtbase, qtwebengine, qtwebkit
|
||||
, cmake
|
||||
, syncthing
|
||||
|
||||
@ -1,101 +1,38 @@
|
||||
{ stdenv, fetchFromGitHub, curl, fribidi, mpv, less, rlwrap, gawk, bash, emacs, groff, ncurses, pandoc }:
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "translate-shell";
|
||||
version = "0.9.6.6";
|
||||
version = "0.9.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soimort";
|
||||
repo = "translate-shell";
|
||||
rev = "v" + version;
|
||||
sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq";
|
||||
rev = "v${version}";
|
||||
sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase" "postFixup" ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share
|
||||
mkdir -p $out/share/man/man1
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp $src/translate $out/bin/trans
|
||||
cp $src/translate $out/bin/translate
|
||||
cp $src/translate $out/bin/translate-shell
|
||||
|
||||
cp $src/translate.awk $out/share/translate.awk
|
||||
cp $src/build.awk $out/share/build.awk
|
||||
cp $src/metainfo.awk $out/share/metainfo.awk
|
||||
cp $src/test.awk $out/share/test.awk
|
||||
|
||||
cp -r $src/include $out/share
|
||||
cp -r $src/test $out/share
|
||||
cp $src/man/trans.1 $out/share/man/man1
|
||||
|
||||
chmod +x $out/bin/translate
|
||||
chmod +x $out/share/translate.awk
|
||||
chmod +x $out/share/build.awk
|
||||
chmod +x $out/share/metainfo.awk
|
||||
chmod +x $out/share/test.awk
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/trans --replace "/bin/sh" "${bash}/bin/bash"
|
||||
substituteInPlace $out/bin/trans --replace "gawk " "${gawk}/bin/gawk "
|
||||
substituteInPlace $out/bin/trans --replace "translate.awk" "$out/share/translate.awk"
|
||||
|
||||
substituteInPlace $out/bin/translate --replace "/bin/sh" "${bash}/bin/bash"
|
||||
substituteInPlace $out/bin/translate --replace "gawk " "${gawk}/bin/gawk "
|
||||
substituteInPlace $out/bin/translate --replace "translate.awk" "$out/share/translate.awk"
|
||||
|
||||
substituteInPlace $out/bin/translate-shell --replace "/bin/sh" "${bash}/bin/bash"
|
||||
substituteInPlace $out/bin/translate-shell --replace "gawk " "${gawk}/bin/gawk "
|
||||
substituteInPlace $out/bin/translate-shell --replace "translate.awk" "$out/share/translate.awk"
|
||||
|
||||
substituteInPlace $out/share/translate.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
|
||||
substituteInPlace $out/share/translate.awk --replace "metainfo" "$out/share/metainfo"
|
||||
substituteInPlace $out/share/translate.awk --replace "include/" "$out/share/include/"
|
||||
|
||||
substituteInPlace $out/share/build.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
|
||||
substituteInPlace $out/share/build.awk --replace "include/" "$out/share/include/"
|
||||
substituteInPlace $out/share/build.awk --replace "metainfo.awk" "$out/share/metainfo.awk"
|
||||
|
||||
substituteInPlace $out/share/metainfo.awk --replace "translate.awk" "$out/share/translate.awk"
|
||||
|
||||
substituteInPlace $out/share/test.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
|
||||
substituteInPlace $out/share/test.awk --replace "include/" "$out/share/include/"
|
||||
substituteInPlace $out/share/test.awk --replace "test/" "$out/share/test/"
|
||||
|
||||
substituteInPlace $out/share/include/Translators/\*.awk --replace "include/" "$out/share/include/"
|
||||
|
||||
substituteInPlace $out/share/test/Test.awk --replace "test/" "$out/share/test/"
|
||||
substituteInPlace $out/share/test/TestUtils.awk --replace "include/" "$out/share/include/"
|
||||
substituteInPlace $out/share/test/TestParser.awk --replace "include/" "$out/share/include/"
|
||||
substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""
|
||||
substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"
|
||||
|
||||
substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\""
|
||||
substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""
|
||||
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""
|
||||
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "
|
||||
substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""
|
||||
substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""
|
||||
substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\""
|
||||
|
||||
substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "
|
||||
|
||||
substituteInPlace $out/share/include/Translate.awk --replace "\"mpv " "\"${mpv}/bin/mpv "
|
||||
substituteInPlace $out/share/include/Translate.awk --replace "\"less " "\"${less}/bin/less "
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/trans \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [
|
||||
gawk
|
||||
curl
|
||||
ncurses
|
||||
rlwrap
|
||||
groff
|
||||
fribidi
|
||||
]}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.soimort.org/translate-shell;
|
||||
description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.ebzzry ];
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ ebzzry infinisil ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
for computational linguistics and natural language processing.
|
||||
'';
|
||||
|
||||
homepage = http://wordnet.princeton.edu/;
|
||||
homepage = https://wordnet.princeton.edu/;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
|
||||
@ -15,15 +15,15 @@ let
|
||||
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
|
||||
# currently https://storage.googleapis.com/minikube/k8s_releases.json
|
||||
|
||||
localkube-version = "1.9.0";
|
||||
localkube-version = "1.9.4";
|
||||
localkube-binary = fetchurl {
|
||||
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
|
||||
sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh";
|
||||
sha256 = "0c1n8p7q38hx864xvcsr01d028cizjfpsqbfpf1y24fnrpzacajw";
|
||||
};
|
||||
in buildGoPackage rec {
|
||||
pname = "minikube";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.25.0";
|
||||
version = "0.25.2";
|
||||
|
||||
goPackagePath = "k8s.io/minikube";
|
||||
|
||||
@ -31,7 +31,7 @@ in buildGoPackage rec {
|
||||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby";
|
||||
sha256 = "1h8sxs6xxmli7xkb33kdl4nyn1sgq2b8b2d6aj5wim11ric3l7pb";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
FireHOL, an iptables stateful packet filtering firewall for humans!
|
||||
FireQOS, a TC based bandwidth shaper for humans!
|
||||
'';
|
||||
homepage = http://firehol.org/;
|
||||
homepage = https://firehol.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ geistesk ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
name = "telepathy-gabble-0.18.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
|
||||
url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
|
||||
sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
|
||||
};
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
ostinatoIcon = fetchurl {
|
||||
url = "http://ostinato.org/images/site-logo.png";
|
||||
url = "https://ostinato.org/images/site-logo.png";
|
||||
sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
name = "pulseview-0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
|
||||
url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
|
||||
sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
|
||||
};
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
|
||||
homepage = http://sigrok.org/;
|
||||
homepage = https://sigrok.org/;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@ -2,20 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geogebra-${version}";
|
||||
version = "5-0-382-0";
|
||||
version = "5-0-444-0";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
|
||||
# Fallback for 5-0-382-0
|
||||
# To avoid breaks when latest geogebra version is
|
||||
# removed from `download.geogebra.org`
|
||||
"http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2"
|
||||
];
|
||||
sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv";
|
||||
urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
|
||||
sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
|
||||
};
|
||||
|
||||
srcIcon = fetchurl {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-extras-${version}";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
|
||||
sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn";
|
||||
sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-open-${version}";
|
||||
version = "1.3.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulirish";
|
||||
repo = "git-open";
|
||||
rev = "v${version}";
|
||||
sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr";
|
||||
sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -11,13 +11,13 @@ let
|
||||
++ stdenv.lib.optional (utillinux != null) utillinux);
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "git-recent-${version}";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulirish";
|
||||
repo = "git-recent";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4";
|
||||
sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "git-remote-gcrypt-${version}";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
rev = version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "spwhitton";
|
||||
repo = "git-remote-gcrypt";
|
||||
sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379";
|
||||
sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv
|
||||
, ruby, tzdata, git, procps, dpkg, nettools
|
||||
, ruby, tzdata, git, ps, dpkg, nettools
|
||||
}:
|
||||
|
||||
/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
rubyEnv ruby bundler tzdata git procps dpkg nettools
|
||||
rubyEnv ruby bundler tzdata git ps dpkg nettools
|
||||
];
|
||||
|
||||
patches = [
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
rm config/initializers/gitlab_shell_secret_token.rb
|
||||
|
||||
substituteInPlace app/controllers/admin/background_jobs_controller.rb \
|
||||
--replace "ps -U" "${procps}/bin/ps -U"
|
||||
--replace "ps -U" "${ps}/bin/ps -U"
|
||||
|
||||
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@ with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "gogs-${version}";
|
||||
version = "0.11.29";
|
||||
version = "0.11.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gogits";
|
||||
repo = "gogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0";
|
||||
sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz";
|
||||
};
|
||||
|
||||
patches = [ ./static-root-path.patch ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, lirc, shared-mime-info, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xine-ui-0.99.9";
|
||||
name = "xine-ui-0.99.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xine/${name}.tar.xz";
|
||||
sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd";
|
||||
sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig shared-mime-info ];
|
||||
|
||||
@ -195,28 +195,16 @@ rec {
|
||||
});
|
||||
|
||||
# Get revisions from
|
||||
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
|
||||
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
|
||||
|
||||
docker_17_12 = dockerGen rec {
|
||||
version = "17.12.1-ce";
|
||||
rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
|
||||
sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
|
||||
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
|
||||
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
|
||||
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
|
||||
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
|
||||
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
|
||||
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
|
||||
};
|
||||
|
||||
docker_18_02 = dockerGen rec {
|
||||
version = "18.02.0-ce";
|
||||
rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit
|
||||
sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m";
|
||||
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
|
||||
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
|
||||
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
|
||||
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
|
||||
docker_18_03 = dockerGen rec {
|
||||
version = "18.03.0-ce";
|
||||
rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit
|
||||
sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g";
|
||||
runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
|
||||
runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
|
||||
containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c";
|
||||
containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
|
||||
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
|
||||
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
version = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/downloads/${name}.tar.bz2";
|
||||
url = "https://i3wm.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91";
|
||||
};
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
i3.overrideDerivation (super : rec {
|
||||
|
||||
name = "i3-gaps-${version}";
|
||||
version = "4.14.1";
|
||||
releaseDate = "2017-09-24";
|
||||
version = "4.15.0.1";
|
||||
releaseDate = "2018-03-13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
|
||||
sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7";
|
||||
sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
|
||||
};
|
||||
|
||||
nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
name = "i3status-2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://i3wm.org/i3status/${name}.tar.bz2";
|
||||
url = "https://i3wm.org/i3status/${name}.tar.bz2";
|
||||
sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
|
||||
};
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{stdenv, fetchzip}:
|
||||
|
||||
let
|
||||
version = "10.0.2";
|
||||
version = "11.0.0";
|
||||
in fetchzip {
|
||||
name = "babelstone-han-${version}";
|
||||
|
||||
url = http://www.babelstone.co.uk/Fonts/7932/BabelStoneHan.zip;
|
||||
url = http://www.babelstone.co.uk/Fonts/3902/BabelStoneHan.zip;
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
|
||||
'';
|
||||
sha256 = "17r5cf028v66yzjf9qbncn4rchv2xxkl2adxr35ppg1l7zssz9v6";
|
||||
sha256 = "1w3v69lacsy0nha20rkbs6f0dskf5xm6p250qx4a1m69d4a1gx7v";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Unicode CJK font with over 32600 Han characters";
|
||||
|
||||
@ -19,7 +19,7 @@ in fetchzip rec {
|
||||
sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://software.sil.org/gentium/;
|
||||
homepage = https://software.sil.org/gentium/;
|
||||
description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.ofl;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz";
|
||||
sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6272b092cf23aa30154cd90ab0f5786c69bceb17.tar.gz";
|
||||
sha256 = "11qs8whpqkj1l3mhx9ibpwh5pwgwj0xb6r9r8c7wk414vdmaa5mw";
|
||||
}
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}:
|
||||
{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix
|
||||
, singleWordlist ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "scowl";
|
||||
@ -11,10 +14,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
|
||||
};
|
||||
|
||||
buildInputs = [];
|
||||
nativeBuildInputs = [unzip zip perl aspell dos2unix];
|
||||
postPatch = ''
|
||||
substituteInPlace scowl/src/Makefile \
|
||||
--replace g++ c++
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = " -Wno-narrowing ";
|
||||
nativeBuildInputs = [ unzip zip perl aspell dos2unix ];
|
||||
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
@ -34,8 +42,8 @@ stdenv.mkDerivation rec {
|
||||
installPhase = if singleWordlist == null then ''
|
||||
eval "$preInstall"
|
||||
|
||||
mkdir -p "$out/share/scowl"
|
||||
mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell"
|
||||
mkdir -p "$out/share/scowl"
|
||||
mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell"
|
||||
mkdir -p "$out/share/dict"
|
||||
|
||||
cp -r scowl/speller/aspell "$out/lib/aspell"
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation";
|
||||
homepage = http://docbook.org/xml/5.0/;
|
||||
homepage = https://docbook.org/xml/5.0/;
|
||||
maintainers = [ lib.maintainers.eelco ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "efl-${version}";
|
||||
version = "1.20.6";
|
||||
version = "1.20.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
|
||||
sha256 = "1h9jkb1pkp2g6ld7ra9mxgblx3x5id4162ja697klx9mfjkpxijn";
|
||||
sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
|
||||
, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
|
||||
, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
|
||||
, libSM }:
|
||||
, libSM, docbook_xml_dtd_412 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnome-control-center-2.32.1";
|
||||
@ -15,9 +15,9 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils
|
||||
gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2
|
||||
gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2
|
||||
libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon
|
||||
libSM
|
||||
libSM docbook_xml_dtd_412
|
||||
];
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
}
|
||||
|
||||
@ -38,4 +38,6 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = optionalString stdenv.isDarwin ''
|
||||
intltoolize --force
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
|
||||
, gnome-doc-utils, intltool, libglade, libX11, which }:
|
||||
, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zenity-2.32.1";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
buildInputs = [ gtk libglade libxml2 libxslt libX11 ];
|
||||
buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ intltool ];
|
||||
|
||||
meta = {
|
||||
homepage = http://lxde.org/;
|
||||
homepage = https://lxde.org/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
description = "Freedesktop.org desktop menus for LXDE";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Lightweight X11 desktop panel for LXDE";
|
||||
homepage = http://lxde.org/;
|
||||
homepage = https://lxde.org/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.ryneeverett ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Flex SDK for Adobe Flash / ActionScript";
|
||||
homepage = "http://www.adobe.com/products/flex.html";
|
||||
homepage = "https://www.adobe.com/products/flex.html";
|
||||
license = stdenv.lib.licenses.mpl11;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -158,5 +158,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = { targetPrefix = ""; };
|
||||
|
||||
meta.license = stdenv.lib.licenses.bsd3;
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
|
||||
# AArch64 should work in theory but eventually some builds start segfaulting
|
||||
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
|
||||
}
|
||||
|
||||
@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
|
||||
++ optionals stdenv.isLinux [ procps ];
|
||||
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
|
||||
buildInputs = [ cacert pcre ]
|
||||
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
|
||||
++ optionals stdenv.isLinux [ procps ];
|
||||
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
|
||||
buildInputs = [ cacert pcre ]
|
||||
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
@ -90,6 +90,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
|
||||
};
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nekovm.org/media/neko-${version}-src.tar.gz";
|
||||
url = "https://nekovm.org/media/neko-${version}-src.tar.gz";
|
||||
sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
|
||||
};
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@ stdenv.mkDerivation {
|
||||
name = "opendylan-2013.2";
|
||||
|
||||
src = if stdenv.system == "x86_64-linux" then fetchurl {
|
||||
url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
|
||||
url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
|
||||
sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then fetchurl {
|
||||
url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
|
||||
url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
|
||||
sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5";
|
||||
}
|
||||
else throw "platform ${stdenv.system} not supported.";
|
||||
|
||||
222
pkgs/development/compilers/openjdk/10.nix
Normal file
222
pkgs/development/compilers/openjdk/10.nix
Normal file
@ -0,0 +1,222 @@
|
||||
{ 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 "amd64";
|
||||
|
||||
update = "10";
|
||||
build = "46";
|
||||
baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
|
||||
repover = "jdk-${update}+${build}";
|
||||
paxflags = if stdenv.isi686 then "msp" else "m";
|
||||
jdk10 = fetchurl {
|
||||
url = "${baseurl}/archive/${repover}.tar.gz";
|
||||
sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
|
||||
};
|
||||
openjdk10 = stdenv.mkDerivation {
|
||||
name = "openjdk-${update}-b${build}";
|
||||
|
||||
srcs = [ jdk10 ];
|
||||
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
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
cd jdk10*
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk10.patch
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
./currency-date-range-jdk10.patch
|
||||
] ++ lib.optionals (!minimal && enableGnome2) [
|
||||
./swing-use-gtk-jdk10.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 = ["i686-linux" "x86_64-linux"];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit architecture;
|
||||
home = "${openjdk10}/lib/openjdk";
|
||||
};
|
||||
};
|
||||
in openjdk10
|
||||
@ -0,0 +1,13 @@
|
||||
--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
+++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
@@ -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;
|
||||
14
pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
Normal file
14
pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400
|
||||
@@ -2270,8 +2270,5 @@
|
||||
assert(ret, "cannot locate libjvm");
|
||||
char *rp = NULL;
|
||||
if (ret && dli_fname[0] != '\0') {
|
||||
- rp = os::Posix::realpath(dli_fname, buf, buflen);
|
||||
- }
|
||||
- if (rp == NULL) {
|
||||
- return;
|
||||
+ snprintf(buf, buflen, "%s", dli_fname);
|
||||
}
|
||||
|
||||
if (Arguments::sun_java_launcher_is_altjvm()) {
|
||||
@ -0,0 +1,20 @@
|
||||
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
|
||||
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 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};
|
||||
24
pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
Normal file
24
pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
|
||||
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
|
||||
@@ -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,5 +1,5 @@
|
||||
{ stdenv, targetPackages
|
||||
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
|
||||
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
|
||||
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
|
||||
, which, libffi, gdb
|
||||
, version
|
||||
@ -19,8 +19,6 @@ let
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
||||
procps = if stdenv.isDarwin then darwin.ps else args.procps;
|
||||
|
||||
llvmShared = llvm.override { enableSharedLibraries = true; };
|
||||
|
||||
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
|
||||
@ -127,7 +125,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# ps is needed for one of the test cases
|
||||
nativeBuildInputs =
|
||||
[ file python2 procps rustPlatform.rust.rustc git cmake
|
||||
[ file python2 ps rustPlatform.rust.rustc git cmake
|
||||
which libffi
|
||||
]
|
||||
# Only needed for the debuginfo tests
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, swingSupport ? true }:
|
||||
|
||||
let
|
||||
version = "9.0.0.15";
|
||||
openjdk = "9.0.0";
|
||||
version = "10.1+11";
|
||||
openjdk = "10";
|
||||
|
||||
sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi";
|
||||
sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b";
|
||||
sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8";
|
||||
sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
|
||||
|
||||
platform = if stdenv.isDarwin then "macosx" else "linux";
|
||||
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
|
||||
|
||||
@ -112,7 +112,13 @@ self: super: {
|
||||
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
|
||||
# see: https://github.com/psibi/shell-conduit/issues/12
|
||||
doCheck = !pkgs.stdenv.isDarwin;
|
||||
}));
|
||||
})).overrideScope (self: super: {
|
||||
# shell-conduit doesn't build with conduit 1.3
|
||||
# see https://github.com/psibi/shell-conduit/issues/15
|
||||
conduit = self.conduit_1_2_13_1;
|
||||
conduit-extra = self.conduit-extra_1_2_3_2;
|
||||
resourcet = self.resourcet_1_1_11;
|
||||
});
|
||||
|
||||
# https://github.com/froozen/kademlia/issues/2
|
||||
kademlia = dontCheck super.kademlia;
|
||||
|
||||
@ -66,11 +66,6 @@ self: super: {
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free >=4.9 && <5
|
||||
either = super.either_5;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## Cabal <2.2
|
||||
@ -646,13 +641,6 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
# Fix missing semigroup instance for Journal.
|
||||
hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch
|
||||
{ url = https://github.com/simonmichael/hledger/pull/718.patch;
|
||||
sha256 = "1gcs9j934wvk9hbn27zm42dnvf4x1gxr54li4kdw3zi3160y2l5c";
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# Fix missing semigroup instance.
|
||||
data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
|
||||
{ url = https://github.com/luqui/data-inttrie/pull/5.patch;
|
||||
@ -660,7 +648,7 @@ self: super: {
|
||||
});
|
||||
|
||||
# Older versions don't compile.
|
||||
brick = self.brick_0_35;
|
||||
brick = self.brick_0_35_1;
|
||||
getopt-generics = self.getopt-generics_0_13_0_2;
|
||||
HaTeX = self.HaTeX_3_19_0_0;
|
||||
json = self.json_0_9_2;
|
||||
|
||||
@ -2474,7 +2474,6 @@ package-maintainers:
|
||||
- bson-lens
|
||||
- cased
|
||||
- elm-export-persistent
|
||||
- pipes-csv
|
||||
- pipes-mongodb
|
||||
- skeletons
|
||||
- streaming-wai
|
||||
@ -2492,9 +2491,6 @@ package-maintainers:
|
||||
- shakespeare
|
||||
abbradar:
|
||||
- Agda
|
||||
alunduil:
|
||||
- network-arbitrary
|
||||
- network-uri-json
|
||||
|
||||
dont-distribute-packages:
|
||||
# hard restrictions that really belong into meta.platforms
|
||||
@ -3509,6 +3505,7 @@ dont-distribute-packages:
|
||||
clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
clash: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6505,6 +6502,7 @@ dont-distribute-packages:
|
||||
lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
load-font: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
local-search: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
loch: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6990,6 +6988,7 @@ dont-distribute-packages:
|
||||
network-address: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7008,6 +7007,7 @@ dont-distribute-packages:
|
||||
network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-uri-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7107,6 +7107,7 @@ dont-distribute-packages:
|
||||
octohat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
octopus: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
oculus: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
odbc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
odpic-raw: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7372,6 +7373,7 @@ dont-distribute-packages:
|
||||
pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pipes-fastx: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -8523,6 +8525,7 @@ dont-distribute-packages:
|
||||
stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stream: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
streamed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -9175,6 +9178,7 @@ dont-distribute-packages:
|
||||
wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
||||
1600
pkgs/development/haskell-modules/hackage-packages.nix
generated
1600
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -12,8 +12,8 @@ let
|
||||
};
|
||||
|
||||
in mkDerivation rec {
|
||||
version = "18.3.4.7";
|
||||
sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l";
|
||||
version = "18.3.4.8";
|
||||
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
|
||||
|
||||
patches = [
|
||||
rmAndPwdPatch
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ mkDerivation, fetchurl, fetchpatch }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "19.3.6.4";
|
||||
sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071";
|
||||
version = "19.3.6.6";
|
||||
sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg";
|
||||
|
||||
patches = [
|
||||
# macOS 10.13 crypto fix from OTP-20.1.2
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ mkDerivation, fetchurl }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "20.2.2";
|
||||
sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
|
||||
version = "20.3.1";
|
||||
sha256 = "13qh3an98qm477zr1dvcklbhar001cikp177295llcqpchamgzx3";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
|
||||
|
||||
@ -19,7 +19,7 @@ in rec {
|
||||
m2Path = "/junit/junit/${version}";
|
||||
|
||||
meta = {
|
||||
homepage = http://junit.org/junit4/;
|
||||
homepage = https://junit.org/junit4/;
|
||||
description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
|
||||
license = stdenv.lib.licenses.epl10;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accounts-qt-${version}";
|
||||
version = "1.13";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
|
||||
rev = version;
|
||||
sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w";
|
||||
rev = "VERSION_${version}";
|
||||
repo = "libaccounts-qt";
|
||||
owner = "accounts-sso";
|
||||
};
|
||||
|
||||
27
pkgs/development/libraries/clipper/default.nix
Normal file
27
pkgs/development/libraries/clipper/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchurl, cmake, ninja, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.4.2";
|
||||
name = "Clipper-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
|
||||
sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
|
||||
};
|
||||
|
||||
sourceRoot = "cpp";
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja unzip ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
longDescription = ''
|
||||
The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
|
||||
and line & polygon offsetting. The library is based on Vatti's clipping algorithm.
|
||||
'';
|
||||
homepage = https://www.angusj.com/delphi/clipper.php;
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ mpickering ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
@ -5,11 +5,11 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fdk-aac-${version}";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
|
||||
sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11";
|
||||
sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma";
|
||||
};
|
||||
|
||||
configureFlags = [ ]
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation (rec {
|
||||
name = "gamin-0.1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
|
||||
url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
|
||||
sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
|
||||
};
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://ignitionrobotics.org/libraries/math;
|
||||
homepage = https://ignitionrobotics.org/libraries/math;
|
||||
description = "Math library by Ingition Robotics, created for the Gazebo project";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pxc ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||
homepage = https://www.kotnet.org/~skimo/isl/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||
homepage = https://www.kotnet.org/~skimo/isl/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||
homepage = https://www.kotnet.org/~skimo/isl/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||
homepage = https://www.kotnet.org/~skimo/isl/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||
homepage = https://www.kotnet.org/~skimo/isl/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://math.nist.gov/tnt/jama125.zip;
|
||||
url = https://math.nist.gov/tnt/jama125.zip;
|
||||
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
|
||||
};
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://math.nist.gov/tnt/;
|
||||
homepage = https://math.nist.gov/tnt/;
|
||||
description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4";
|
||||
version = "2.6";
|
||||
name = "commons-io-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
|
||||
sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1";
|
||||
sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Legacy D-Bus client library for Audacious";
|
||||
homepage = http://audacious-media-player.org/;
|
||||
homepage = https://audacious-media-player.org/;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; unix;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
|
||||
libiconv, IOKit, DiskArbitration}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libcdio-paranoia-0.94+2";
|
||||
@ -11,7 +12,14 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ libcdio ];
|
||||
buildInputs = [ libcdio ] ++
|
||||
stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
|
||||
|
||||
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
|
||||
|
||||
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
"--disable-ld-version-script"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CD paranoia on top of libcdio";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, cmake }:
|
||||
|
||||
let version = "2.0.1"; in
|
||||
let version = "2.1.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "p8-platform-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
|
||||
sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9";
|
||||
sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user