Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
a28a9ac156
|
|
@ -2228,6 +2228,15 @@
|
|||
email = "tkatchev@gmail.com";
|
||||
name = "Ivan Tkatchev";
|
||||
};
|
||||
ivanbrennan = {
|
||||
email = "ivan.brennan@gmail.com";
|
||||
github = "ivanbrennan";
|
||||
name = "Ivan Brennan";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x79C3C47DC652EA54";
|
||||
fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54";
|
||||
}];
|
||||
};
|
||||
ivegotasthma = {
|
||||
email = "ivegotasthma@protonmail.com";
|
||||
github = "ivegotasthma";
|
||||
|
|
@ -5536,6 +5545,11 @@
|
|||
github = "vskilet";
|
||||
name = "Victor SENE";
|
||||
};
|
||||
vyorkin = {
|
||||
email = "vasiliy.yorkin@gmail.com";
|
||||
github = "vyorkin";
|
||||
name = "Vasiliy Yorkin";
|
||||
};
|
||||
vyp = {
|
||||
email = "elisp.vim@gmail.com";
|
||||
github = "vyp";
|
||||
|
|
|
|||
|
|
@ -31,9 +31,12 @@ sub new {
|
|||
|
||||
if (!$startCommand) {
|
||||
# !!! merge with qemu-vm.nix.
|
||||
my $netArgs = "";
|
||||
$netArgs .= ",romfile=$args->{netRomFile}"
|
||||
if defined $args->{netRomFile};
|
||||
$startCommand =
|
||||
"qemu-kvm -m 384 " .
|
||||
"-net nic,model=virtio \$QEMU_OPTS ";
|
||||
"-device virtio-net-pci,netdev=net0${netArgs} \$QEMU_OPTS ";
|
||||
|
||||
if (defined $args->{hda}) {
|
||||
if ($args->{hdaInterface} eq "scsi") {
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ with lib;
|
|||
|
||||
system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
|
||||
#!ipxe
|
||||
kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
|
||||
kernel ${pkgs.stdenv.hostPlatform.platform.kernelTarget} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
|
||||
initrd initrd
|
||||
boot
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -552,6 +552,8 @@ in {
|
|||
description = "Grafana user";
|
||||
home = cfg.dataDir;
|
||||
createHome = true;
|
||||
group = "grafana";
|
||||
};
|
||||
users.groups.grafana = {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,46 +17,33 @@ let
|
|||
];
|
||||
}).config.system.build.isoImage;
|
||||
|
||||
makeBootTest = name: machineConfig:
|
||||
makeTest {
|
||||
inherit iso;
|
||||
name = "boot-" + name;
|
||||
nodes = { };
|
||||
testScript =
|
||||
''
|
||||
my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' });
|
||||
$machine->start;
|
||||
$machine->waitForUnit("multi-user.target");
|
||||
$machine->succeed("nix verify -r --no-trust /run/current-system");
|
||||
perlAttrs = params: "{ ${concatStringsSep "," (mapAttrsToList (name: param: "${name} => '${toString param}'") params)} }";
|
||||
|
||||
# Test whether the channel got installed correctly.
|
||||
$machine->succeed("nix-instantiate --dry-run '<nixpkgs>' -A hello");
|
||||
$machine->succeed("nix-env --dry-run -iA nixos.procps");
|
||||
makeBootTest = name: extraConfig:
|
||||
let
|
||||
machineConfig = perlAttrs ({ qemuFlags = "-m 768"; } // extraConfig);
|
||||
in
|
||||
makeTest {
|
||||
inherit iso;
|
||||
name = "boot-" + name;
|
||||
nodes = { };
|
||||
testScript =
|
||||
''
|
||||
my $machine = createMachine(${machineConfig});
|
||||
$machine->start;
|
||||
$machine->waitForUnit("multi-user.target");
|
||||
$machine->succeed("nix verify -r --no-trust /run/current-system");
|
||||
|
||||
$machine->shutdown;
|
||||
'';
|
||||
};
|
||||
in {
|
||||
# Test whether the channel got installed correctly.
|
||||
$machine->succeed("nix-instantiate --dry-run '<nixpkgs>' -A hello");
|
||||
$machine->succeed("nix-env --dry-run -iA nixos.procps");
|
||||
|
||||
biosCdrom = makeBootTest "bios-cdrom" ''
|
||||
cdrom => glob("${iso}/iso/*.iso")
|
||||
'';
|
||||
$machine->shutdown;
|
||||
'';
|
||||
};
|
||||
|
||||
biosUsb = makeBootTest "bios-usb" ''
|
||||
usb => glob("${iso}/iso/*.iso")
|
||||
'';
|
||||
|
||||
uefiCdrom = makeBootTest "uefi-cdrom" ''
|
||||
cdrom => glob("${iso}/iso/*.iso"),
|
||||
bios => '${pkgs.OVMF.fd}/FV/OVMF.fd'
|
||||
'';
|
||||
|
||||
uefiUsb = makeBootTest "uefi-usb" ''
|
||||
usb => glob("${iso}/iso/*.iso"),
|
||||
bios => '${pkgs.OVMF.fd}/FV/OVMF.fd'
|
||||
'';
|
||||
|
||||
netboot = let
|
||||
makeNetbootTest = name: extraConfig:
|
||||
let
|
||||
config = (import ../lib/eval-config.nix {
|
||||
inherit system;
|
||||
modules =
|
||||
|
|
@ -65,35 +52,54 @@ in {
|
|||
{ key = "serial"; }
|
||||
];
|
||||
}).config;
|
||||
ipxeScriptDir = pkgs.writeTextFile {
|
||||
name = "ipxeScriptDir";
|
||||
text = ''
|
||||
#!ipxe
|
||||
dhcp
|
||||
kernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} console=ttyS0
|
||||
initrd initrd
|
||||
boot
|
||||
'';
|
||||
destination = "/boot.ipxe";
|
||||
};
|
||||
ipxeBootDir = pkgs.symlinkJoin {
|
||||
name = "ipxeBootDir";
|
||||
paths = [
|
||||
config.system.build.netbootRamdisk
|
||||
config.system.build.kernel
|
||||
ipxeScriptDir
|
||||
config.system.build.netbootIpxeScript
|
||||
];
|
||||
};
|
||||
machineConfig = perlAttrs ({
|
||||
qemuFlags = "-boot order=n -netdev user,id=net0,tftp=${ipxeBootDir}/,bootfile=netboot.ipxe -m 2000";
|
||||
} // extraConfig);
|
||||
in
|
||||
makeTest {
|
||||
name = "boot-netboot";
|
||||
name = "boot-netboot-" + name;
|
||||
nodes = { };
|
||||
testScript =
|
||||
''
|
||||
my $machine = createMachine({ qemuFlags => '-boot order=n -net nic,model=e1000 -net user,tftp=${ipxeBootDir}/,bootfile=boot.ipxe -m 2000M' });
|
||||
my $machine = createMachine(${machineConfig});
|
||||
$machine->start;
|
||||
$machine->waitForUnit("multi-user.target");
|
||||
$machine->shutdown;
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
biosCdrom = makeBootTest "bios-cdrom" {
|
||||
cdrom = ''glob("${iso}/iso/*.iso")'';
|
||||
};
|
||||
|
||||
biosUsb = makeBootTest "bios-usb" {
|
||||
usb = ''glob("${iso}/iso/*.iso")'';
|
||||
};
|
||||
|
||||
uefiCdrom = makeBootTest "uefi-cdrom" {
|
||||
cdrom = ''glob("${iso}/iso/*.iso"'';
|
||||
bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
|
||||
};
|
||||
|
||||
uefiUsb = makeBootTest "uefi-usb" {
|
||||
usb = ''glob("${iso}/iso/*.iso")'';
|
||||
bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
|
||||
};
|
||||
|
||||
biosNetboot = makeNetbootTest "bios" {};
|
||||
|
||||
uefiNetboot = makeNetbootTest "uefi" {
|
||||
bios = ''"${pkgs.OVMF.fd}/FV/OVMF.fd"'';
|
||||
# Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI.
|
||||
netRomFile = ''"${pkgs.ipxe}/ipxe.efirom"'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,91 @@
|
|||
import ./make-test.nix ({ lib, ... }:
|
||||
{
|
||||
name = "grafana";
|
||||
import ./make-test.nix ({ lib, pkgs, ... }:
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ willibutz ];
|
||||
};
|
||||
let
|
||||
inherit (lib) mkMerge nameValuePair maintainers;
|
||||
|
||||
machine = { ... }: {
|
||||
baseGrafanaConf = {
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
addr = "localhost";
|
||||
analytics.reporting.enable = false;
|
||||
domain = "localhost";
|
||||
security.adminUser = "testusername";
|
||||
security = {
|
||||
adminUser = "testadmin";
|
||||
adminPassword = "snakeoilpwd";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
extraNodeConfs = {
|
||||
postgresql = {
|
||||
services.grafana.database = {
|
||||
host = "127.0.0.1:5432";
|
||||
user = "grafana";
|
||||
};
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "grafana" ];
|
||||
ensureUsers = [{
|
||||
name = "grafana";
|
||||
ensurePermissions."DATABASE grafana" = "ALL PRIVILEGES";
|
||||
}];
|
||||
};
|
||||
systemd.services.grafana.after = [ "postgresql.service" ];
|
||||
};
|
||||
|
||||
mysql = {
|
||||
services.grafana.database.user = "grafana";
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "grafana" ];
|
||||
ensureUsers = [{
|
||||
name = "grafana";
|
||||
ensurePermissions."grafana.*" = "ALL PRIVILEGES";
|
||||
}];
|
||||
package = pkgs.mariadb;
|
||||
};
|
||||
systemd.services.grafana.after = [ "mysql.service" ];
|
||||
};
|
||||
};
|
||||
|
||||
nodes = builtins.listToAttrs (map (dbName:
|
||||
nameValuePair dbName (mkMerge [
|
||||
baseGrafanaConf
|
||||
(extraNodeConfs.${dbName} or {})
|
||||
])) [ "sqlite" "postgresql" "mysql" ]);
|
||||
|
||||
in {
|
||||
name = "grafana";
|
||||
|
||||
meta = with maintainers; {
|
||||
maintainers = [ willibutz ];
|
||||
};
|
||||
|
||||
inherit nodes;
|
||||
|
||||
testScript = ''
|
||||
$machine->start;
|
||||
$machine->waitForUnit("grafana.service");
|
||||
$machine->waitForOpenPort(3000);
|
||||
$machine->succeed("curl -sSfL http://127.0.0.1:3000/");
|
||||
startAll();
|
||||
|
||||
subtest "Grafana sqlite", sub {
|
||||
$sqlite->waitForUnit("grafana.service");
|
||||
$sqlite->waitForOpenPort(3000);
|
||||
$sqlite->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
|
||||
};
|
||||
|
||||
subtest "Grafana postgresql", sub {
|
||||
$postgresql->waitForUnit("grafana.service");
|
||||
$postgresql->waitForUnit("postgresql.service");
|
||||
$postgresql->waitForOpenPort(3000);
|
||||
$postgresql->waitForOpenPort(5432);
|
||||
$postgresql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
|
||||
};
|
||||
|
||||
subtest "Grafana mysql", sub {
|
||||
$mysql->waitForUnit("grafana.service");
|
||||
$mysql->waitForUnit("mysql.service");
|
||||
$mysql->waitForOpenPort(3000);
|
||||
$mysql->waitForOpenPort(3306);
|
||||
$mysql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
|
||||
};
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.16";
|
||||
version = "0.9.17";
|
||||
name = "drumgizmo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
|
||||
sha256 = "0ivr61n9gpigsfgn20rh3n09li8sxh1q095r6wiw0shqhn3vaxlg";
|
||||
sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-lv2" ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
|
||||
{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
|
||||
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
|
||||
, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS
|
||||
, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "grass-7.2.2";
|
||||
src = fetchurl {
|
||||
url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;
|
||||
sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grass";
|
||||
version = "7.6.1";
|
||||
|
||||
src = with stdenv.lib; fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "grass";
|
||||
rev = "${name}_${replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
|
||||
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
|
||||
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
|
||||
libLAS ]
|
||||
libLAS proj-datumgrid ]
|
||||
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
|
||||
|
||||
# On Darwin the installer tries to symlink the help files into a system
|
||||
|
|
@ -22,6 +26,8 @@ stdenv.mkDerivation {
|
|||
|
||||
configureFlags = [
|
||||
"--with-proj-share=${proj}/share/proj"
|
||||
"--with-proj-includes=${proj.dev}/include"
|
||||
"--with-proj-lib=${proj}/lib"
|
||||
"--without-opengl"
|
||||
"--with-readline"
|
||||
"--with-wxwidgets"
|
||||
|
|
@ -49,9 +55,11 @@ stdenv.mkDerivation {
|
|||
scripts/d.what.vect/d.what.vect.py \
|
||||
scripts/g.extension/g.extension.py \
|
||||
scripts/g.extension.all/g.extension.all.py \
|
||||
scripts/r.drain/r.drain.py \
|
||||
scripts/r.pack/r.pack.py \
|
||||
scripts/r.tileset/r.tileset.py \
|
||||
scripts/r.unpack/r.unpack.py \
|
||||
scripts/v.clip/v.clip.py \
|
||||
scripts/v.rast.stats/v.rast.stats.py \
|
||||
scripts/v.to.lines/v.to.lines.py \
|
||||
scripts/v.what.strds/v.what.strds.py \
|
||||
|
|
@ -72,13 +80,15 @@ stdenv.mkDerivation {
|
|||
done
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/grass72 \
|
||||
wrapProgram $out/bin/grass76 \
|
||||
--set PYTHONPATH $PYTHONPATH \
|
||||
--set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \
|
||||
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
|
||||
ln -s $out/grass-*/lib $out/lib
|
||||
ln -s $out/grass-*/include $out/include
|
||||
ln -s $out/grass*/lib $out/lib
|
||||
ln -s $out/grass*/include $out/include
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
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"
|
||||
|
|
@ -43,6 +40,8 @@ stdenv.mkDerivation rec {
|
|||
"-DMapper_PACKAGE_GDAL=0"
|
||||
]);
|
||||
|
||||
# Needs to be available when proj_api.h gets evaluted by CPP
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
|
||||
|
||||
postInstall =
|
||||
stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
|
||||
, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
|
||||
, txt2tags, openssl, libzip, hdf5, netcdf
|
||||
, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
|
||||
, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
|
||||
, withGrass ? true, grass
|
||||
}:
|
||||
|
|
@ -10,12 +10,15 @@ let
|
|||
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
|
||||
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "3.4.8";
|
||||
name = "qgis-unwrapped-${version}";
|
||||
version = "3.8.0";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://qgis.org/downloads/qgis-${version}.tar.bz2";
|
||||
sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
@ -23,7 +26,7 @@ in stdenv.mkDerivation rec {
|
|||
inherit python3Packages;
|
||||
};
|
||||
|
||||
buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt
|
||||
buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
|
||||
fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
|
||||
qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
|
||||
(stdenv.lib.optional withGrass grass) ++ pythonBuildInputs;
|
||||
|
|
@ -36,7 +39,7 @@ in stdenv.mkDerivation rec {
|
|||
# build to use PYQT5_SIP_DIR consistently.
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/FindPyQt5.py \
|
||||
--replace 'pyqtcfg.pyqt_sip_dir' '"${python3Packages.pyqt5}/share/sip/PyQt5"'
|
||||
--replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"'
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "saga-7.2.0";
|
||||
pname = "saga";
|
||||
version = "7.3.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
||||
# for why the have additional buildInputs on darwin
|
||||
|
|
@ -17,8 +19,8 @@ stdenv.mkDerivation rec {
|
|||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/saga-gis/SAGA%20-%207/SAGA%20-%207.2.0/saga-7.2.0.tar.gz";
|
||||
sha256 = "10gjc5mc5kwg2c2la22hgwx6s5q60z9xxffjpjw0zrlhksijl5an";
|
||||
url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.3.0/saga-7.3.0.tar.gz";
|
||||
sha256 = "1g7v6vx7b8mfhbbg03pdk4kyks20maqbcdbasnxazhs8pl2zih7k";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
{ stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
|
||||
libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa
|
||||
, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "saga-2.3.2";
|
||||
|
||||
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
||||
# for why the have additional buildInputs on darwin
|
||||
buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra
|
||||
postgresql libiodbc lzma jasper
|
||||
unixODBC poppler hdf4.out hdf5 netcdf sqlite qhull giflib ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin Cocoa ;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
|
||||
|
||||
sourceRoot = "code-b6f474f/saga-gis";
|
||||
|
||||
patches = [ ./clang_patch.patch ./finite.patch];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/saga-gis/code.git";
|
||||
rev = "b6f474f8af4af7f0ff82548cc6f88c53547d91f5";
|
||||
sha256 = "0iakynai8mhcwj6wxvafkqhd7b417ss7hyhbcp9wf6092l6vc2zd";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "System for Automated Geoscientific Analyses";
|
||||
homepage = http://www.saga-gis.org;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.mpickering ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,11 +6,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "feh-${version}";
|
||||
version = "3.1.3";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://feh.finalrewind.org/${name}.tar.bz2";
|
||||
sha256 = "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z";
|
||||
sha256 = "004vapxpl001yanqvw3cq37fmkdr527jyz0s5nybz1mnl4926660";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.44.0";
|
||||
version = "3.45.2";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "13d3cbn8qbjd8a19qprra6gmib1d818c3zgf3q70kx6b2fq58lzi";
|
||||
sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cointop";
|
||||
version = "1.2.0";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmota";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vhsbk55rrsmnh9b3cxjiv1pzdiip54cyj31j4aj33vlr4hkampn";
|
||||
sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n";
|
||||
};
|
||||
|
||||
modSha256 = "0vvypp97b3bjwxb96hajpjzr52sb5lc4r3zdkrdgg3vjwwacjwsn";
|
||||
modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jgmenu";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanmalm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
|
||||
sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ let
|
|||
};
|
||||
|
||||
in with python.pkgs; buildPythonApplication rec {
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
name = "khard-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
|
||||
sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
|
||||
sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq";
|
||||
};
|
||||
|
||||
# setup.py reads the UTF-8 encoded readme.
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/merkaartor \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
|||
"INSTALL_SHAREDIR=$(out)/share/"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
buildInputs = [ libroxml proj libyamlcpp boost ];
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-346";
|
||||
name = "xterm-347";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
|
||||
];
|
||||
sha256 = "0xwamhawgh77q2nlibciv77hznirwhnbs3r52rl4sdaqq1rpscng";
|
||||
sha256 = "025r22vi5s0328ybhcj0g9js64vabr98hlw8ngy6vyby4zhp63s0";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
|
|||
let
|
||||
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
|
||||
|
||||
version = "2.8.252201.0616";
|
||||
version = "2.8.264592.0714";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
|
||||
sha256 = "1w7pwn6pvyacbz6s795r1qp5qaszr5yn9anq63zz6cgmzy8d1366";
|
||||
sha256 = "0ndrsyyawls487v7vlga0yn574xvhmfc14vdjxg23nvn0jxh2dvw";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpop";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "0j21cp8bw12vgfymxi3i4av3j97lrcyb5y9xa3mb59wr17izz73x";
|
||||
sha256 = "1m6743j8g777lijvxqw2wz6pv2g5a9wlh6zq7awk0hvd44xp4sav";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kmymoney-${version}";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
|
||||
sha256 = "06lbavhl9b8cybnss2mmy3g5w8qn2vl6zhipvbl11lsr3j9bsa8q";
|
||||
sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
|
||||
};
|
||||
|
||||
# Hidden dependency that wasn't included in CMakeLists.txt:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }:
|
||||
let
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "multimon-ng-${version}";
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
|||
owner = "EliasOenal";
|
||||
repo = "multimon-ng";
|
||||
rev = "${version}";
|
||||
sha256 = "11wfk8jw86z44y0ji4jr4s8ig3zwxp6g9h3sl81pvk6l3ipqqbgi";
|
||||
sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 libpulseaudio ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
stdenv.mkDerivation rec {
|
||||
version = "0.11.1";
|
||||
name = "openspace-${version}";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSpace";
|
||||
repo = "OpenSpace";
|
||||
|
|
@ -13,37 +13,37 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper cmake
|
||||
curl boost gdal glew soil
|
||||
libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
|
||||
];
|
||||
|
||||
|
||||
glmPlatformH = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
|
||||
sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
|
||||
};
|
||||
|
||||
|
||||
# See <https://github.com/g-truc/glm/issues/726>
|
||||
prePatch = ''
|
||||
cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h
|
||||
cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h
|
||||
'';
|
||||
|
||||
|
||||
patches = [
|
||||
# See <https://github.com/opensgct/sgct/issues/13>
|
||||
./vrpn.patch
|
||||
|
||||
|
||||
./constexpr.patch
|
||||
./config.patch
|
||||
|
||||
# WARNING: This patch disables some slow torrents in a very dirty way.
|
||||
./assets.patch
|
||||
./assets.patch
|
||||
];
|
||||
|
||||
|
||||
bundle = "$out/usr/share/openspace";
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray=(
|
||||
$cmakeFlagsArray
|
||||
|
|
@ -51,28 +51,28 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_INSTALL_PREFIX=${bundle}"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p ${bundle}
|
||||
'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
cp ext/spice/libSpice.so ${bundle}/lib
|
||||
cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib
|
||||
'';
|
||||
|
||||
|
||||
postFixup = ''
|
||||
for bin in ${bundle}/bin/*
|
||||
do
|
||||
rpath=$(patchelf --print-rpath $bin)
|
||||
patchelf --set-rpath $rpath:${bundle}/lib $bin
|
||||
|
||||
|
||||
name=$(basename $bin)
|
||||
makeWrapper $bin $out/bin/$name --run "cd ${bundle}"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Open-source astrovisualization project";
|
||||
longDescription = ''
|
||||
|
|
@ -85,5 +85,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://www.openspaceproject.com/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
broken = true; # fails to build
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "gp2c-${version}";
|
||||
version = "0.0.11pl1";
|
||||
version = "0.0.11pl2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
|
||||
sha256 = "1c6f6vmncw032kfzrfyr8bynw6yd3faxpy2285r009fmr0zxfs5s";
|
||||
sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
|
||||
};
|
||||
|
||||
buildInputs = [ pari perl ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fossil-${version}";
|
||||
version = "2.8";
|
||||
version = "2.9";
|
||||
|
||||
src = fetchurl {
|
||||
urls =
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
|
||||
];
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka";
|
||||
sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl readline sqlite which ed ]
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "git-absorb-${version}";
|
||||
version = "0.3.0";
|
||||
pname = "git-absorb";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tummychow";
|
||||
repo = "git-absorb";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1dm442lyk7f44bshm2ajync5pzdwvdc5xfpw2lkvjzxflmh5572z";
|
||||
sha256 = "1clmd1b90vppbzng1kq0vzfh7964m3fk64q6h1vfcd1cfqj63r5v";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/tummychow/git-absorb";
|
||||
description = "git commit --fixup, but automatic";
|
||||
license = [ licenses.bsd3 ];
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, libvirt, spice-gtk, python3
|
||||
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
|
||||
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
|
||||
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
|
||||
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, libsecret
|
||||
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
|
||||
}:
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}")
|
||||
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
|
||||
|
||||
let
|
||||
defaultVersion = "84";
|
||||
defaultVersion = "86";
|
||||
|
||||
# Map from git revs to SHA256 hashes
|
||||
sha256s = {
|
||||
"version_84" = "189zqc5gp8fm7clsgby9h2s758ijil7ma4liwbf81wnwkb4kqxc0";
|
||||
"version_86" = "12h5018rdwg7vjni0mz91vkpdwyqw0nfacig3vg9dvyn4fnfm76z";
|
||||
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
(rec {
|
||||
name = "guile-${version}";
|
||||
version = "2.2.4";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/guile/${name}.tar.xz";
|
||||
sha256 = "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r";
|
||||
sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mujs-${version}";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
|
||||
sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l";
|
||||
sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "picoLisp-${version}";
|
||||
version = "18.12";
|
||||
version = "19.6";
|
||||
src = fetchurl {
|
||||
url = "https://www.software-lab.de/${name}.tgz";
|
||||
sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
|
||||
sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
|
||||
};
|
||||
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
|
||||
patchPhase = ''
|
||||
|
|
|
|||
29
pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
Normal file
29
pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff a/swig/python/setup.py b/swig/python/setup.py
|
||||
--- a/swig/python/setup.py
|
||||
+++ b/swig/python/setup.py
|
||||
@@ -268,17 +268,17 @@ class gdal_ext(build_ext):
|
||||
if ext.name != 'osgeo._gdalconst':
|
||||
ext.extra_compile_args += [cxx11_flag]
|
||||
|
||||
- # Adding arch flags here if OS X and compiler is clang
|
||||
- if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]:
|
||||
- # since MacOS X 10.9, clang no longer accepts -mno-fused-madd
|
||||
- # extra_compile_args.append('-Qunused-arguments')
|
||||
- clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future'
|
||||
- if has_flag(self.compiler, clang_flag):
|
||||
- ext.extra_compile_args += [clang_flag]
|
||||
- else:
|
||||
- clang_flag = '-Wno-error=unused-command-line-argument'
|
||||
- if has_flag(self.compiler, clang_flag):
|
||||
- ext.extra_compile_args += [clang_flag]
|
||||
+ # Adding arch flags here if OS X and compiler is clang
|
||||
+ if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]:
|
||||
+ # since MacOS X 10.9, clang no longer accepts -mno-fused-madd
|
||||
+ # extra_compile_args.append('-Qunused-arguments')
|
||||
+ clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future'
|
||||
+ if has_flag(self.compiler, clang_flag):
|
||||
+ ext.extra_compile_args += [clang_flag]
|
||||
+ else:
|
||||
+ clang_flag = '-Wno-error=unused-command-line-argument'
|
||||
+ if has_flag(self.compiler, clang_flag):
|
||||
+ ext.extra_compile_args += [clang_flag]
|
||||
95
pkgs/development/libraries/gdal/2.4.0.nix
Normal file
95
pkgs/development/libraries/gdal/2.4.0.nix
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
|
||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||
, libiconv, libxml2
|
||||
, netcdfSupport ? true, netcdf, hdf5, curl
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdal-${version}";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
|
||||
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||
++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
++ stdenv.lib.optional stdenv.isDarwin libiconv
|
||||
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-expat=${expat.dev}"
|
||||
"--with-jpeg=${libjpeg.dev}"
|
||||
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
||||
"--with-png=${libpng.dev}" # optional
|
||||
"--with-poppler=${poppler.dev}" # optional
|
||||
"--with-libz=${zlib.dev}" # optional
|
||||
"--with-pg=${postgresql}/bin/pg_config"
|
||||
"--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff.dev}"
|
||||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--with-spatialite=${libspatialite}"
|
||||
"--with-python" # optional
|
||||
"--with-proj=${proj.dev}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config"# optional
|
||||
"--with-hdf4=${hdf4.dev}" # optional
|
||||
"--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
|
||||
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
CXXFLAGS = "-fpermissive";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/ifdef bool/i\
|
||||
#ifdef swap\
|
||||
#undef swap\
|
||||
#endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
||||
# poppler 0.73.0 support
|
||||
patch -lp2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff";
|
||||
sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734";
|
||||
}
|
||||
} || true
|
||||
patch -p2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff";
|
||||
sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj";
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# - Unset CC and CXX as they confuse libtool.
|
||||
# - teach gdal that libdf is the legacy name for libhdf
|
||||
preConfigure = ''
|
||||
unset CC CXX
|
||||
substituteInPlace configure \
|
||||
--replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace swig/python/GNUmakefile \
|
||||
--replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = https://www.gdal.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
|
||||
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
|
||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||
, libiconv, libxml2
|
||||
, libiconv, libxml2, autoreconfHook
|
||||
, netcdfSupport ? true, netcdf, hdf5, curl
|
||||
}:
|
||||
|
||||
|
|
@ -9,15 +9,23 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdal-${version}";
|
||||
version = "2.4.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
|
||||
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
|
||||
patches = [ ./001.3_0_1.darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
|
||||
libspatialite poppler hdf4 qhull giflib expat libxml2 ]
|
||||
libspatialite libgeotiff poppler hdf4 qhull giflib expat libxml2 ]
|
||||
++ (with pythonPackages; [ python numpy wrapPython ])
|
||||
++ stdenv.lib.optional stdenv.isDarwin libiconv
|
||||
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
|
@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--with-spatialite=${libspatialite}"
|
||||
"--with-python" # optional
|
||||
"--with-proj=${proj}" # optional
|
||||
"--with-proj=${proj.dev}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config"# optional
|
||||
"--with-hdf4=${hdf4.dev}" # optional
|
||||
"--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
|
||||
|
|
@ -46,31 +54,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
CXXFLAGS = "-fpermissive";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/ifdef bool/i\
|
||||
#ifdef swap\
|
||||
#undef swap\
|
||||
#endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
||||
|
||||
# poppler 0.73.0 support
|
||||
patch -lp2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff";
|
||||
sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734";
|
||||
}
|
||||
} || true
|
||||
patch -p2 <${
|
||||
fetchpatch {
|
||||
url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff";
|
||||
sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj";
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# - Unset CC and CXX as they confuse libtool.
|
||||
# - teach gdal that libdf is the legacy name for libhdf
|
||||
preConfigure = ''
|
||||
unset CC CXX
|
||||
substituteInPlace configure \
|
||||
--replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
|
||||
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
|
||||
|
||||
patches = [
|
||||
# This ensures that the python package is installed into gdal's prefix,
|
||||
|
|
@ -33,12 +33,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
"--with-pg=${postgresql}/bin/pg_config"
|
||||
"--with-mysql=${mysql57.connector-c}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-geotiff=${libgeotiff.dev}"
|
||||
"--with-python" # optional
|
||||
"--with-static-proj4=${proj}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config"# optional
|
||||
];
|
||||
|
||||
# Allow use of old proj_api.h
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
|
||||
];
|
||||
|
||||
# Prevent this:
|
||||
#
|
||||
# Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6";
|
||||
version = "3.9";
|
||||
name = "commons-lang-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
|
||||
sha256 = "0r1wdjw48k2mk2wzyq5c3cx2zmark4q9psw52ma6v2i0sh6a9il0";
|
||||
sha256 = "0l0q1hnicvpbjmxl81ig3rwc212x5sdfnlg3cniwbmnx8fxjgbki";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}:
|
||||
{ stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.3";
|
||||
version = "1.5.1";
|
||||
name = "libgeotiff-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz";
|
||||
sha256 = "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "libgeotiff";
|
||||
rev = version;
|
||||
sha256 = "081ag23pn2n5y4fkb2rnh4hmcnq92siqiqv0s20jmx0j3s2nvfxy";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
sourceRoot = "source/libgeotiff";
|
||||
|
||||
configureFlags = [
|
||||
"--with-jpeg=${libjpeg.dev}"
|
||||
"--with-zlib=${zlib.dev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ libtiff proj ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -11,12 +11,15 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ libxml2 sqlite zlib proj geos libiconv ];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
|
||||
|
||||
postInstall = "" + optionalString stdenv.isDarwin ''
|
||||
ln -s $out/lib/mod_spatialite.{so,dylib}
|
||||
'';
|
||||
|
|
|
|||
32
pkgs/development/libraries/proj-datumgrid/default.nix
Normal file
32
pkgs/development/libraries/proj-datumgrid/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "proj-datumgrid";
|
||||
version = "world-1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "proj-datumgrid";
|
||||
rev = version;
|
||||
sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am";
|
||||
};
|
||||
|
||||
sourceRoot = "source/scripts";
|
||||
|
||||
buildPhase = ''
|
||||
$CC nad2bin.c -o nad2bin
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp nad2bin $out/bin/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Repository for proj datum grids";
|
||||
homepage = https://proj4.org;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
20
pkgs/development/libraries/proj/5.2.nix
Normal file
20
pkgs/development/libraries/proj/5.2.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "proj-5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz;
|
||||
sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
|
||||
};
|
||||
|
||||
doCheck = stdenv.is64bit;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = https://proj4.org;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,22 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "proj-5.2.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "proj";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz;
|
||||
sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "0w2v2l22kv0xzq5hwl7n8ki6an8vfsr0lg0cdbkwcl4xv889ysma";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
doCheck = stdenv.is64bit;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
24
pkgs/development/libraries/tdlib/default.nix
Normal file
24
pkgs/development/libraries/tdlib/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.0";
|
||||
pname = "tdlib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "td";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ijyn14rjb87rqm39hg7md8ab33yiy8cgzw3p0m37scn58gabpp7";
|
||||
};
|
||||
|
||||
buildInputs = [ gperf openssl readline zlib ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross-platform library for building Telegram clients";
|
||||
homepage = "https://core.telegram.org/tdlib/";
|
||||
license = [ licenses.boost ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.vyorkin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="3.3.2";
|
||||
version="3.3.3";
|
||||
name="${baseName}-${version}";
|
||||
hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz";
|
||||
sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
|
||||
hash="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.3.tar.gz";
|
||||
sha256="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "acme-tiny";
|
||||
version = "4.0.4";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0vqlmvk34jgvgx3qdsh50q7m4aiy02786jyjjcq45dcws7a4f9f1";
|
||||
sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ buildPythonPackage, lib, fetchPypi
|
||||
, pytest, filelock, mock, pep8
|
||||
, cython, isPy27
|
||||
, six, pyshp, shapely, geos, proj, numpy
|
||||
, six, pyshp, shapely, geos, numpy
|
||||
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
|
||||
, xvfb_run
|
||||
, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -27,17 +28,17 @@ buildPythonPackage rec {
|
|||
export HOME=$(mktemp -d)
|
||||
${maybeXvfbRun} pytest --pyargs cartopy \
|
||||
-m "not network and not natural_earth" \
|
||||
-k "not test_nightshade_image"
|
||||
-k "not test_nightshade_image and not background_img"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos # for geos-config
|
||||
proj
|
||||
proj_5
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geos proj
|
||||
geos proj_5
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
|
||||
, attrs, click, cligj, click-plugins, six, munch, enum34
|
||||
, pytest, boto3, mock
|
||||
, gdal
|
||||
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,11 +16,11 @@ buildPythonPackage rec {
|
|||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gdal # for gdal-config
|
||||
gdal_2 # for gdal-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
gdal_2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
47
pkgs/development/python-modules/pyproj/001.proj.patch
Normal file
47
pkgs/development/python-modules/pyproj/001.proj.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
diff a/pyproj/datadir.py b/pyproj/datadir.py
|
||||
--- a/pyproj/datadir.py
|
||||
+++ b/pyproj/datadir.py
|
||||
@@ -52,6 +52,7 @@ def get_data_dir():
|
||||
str: The valid data directory.
|
||||
|
||||
"""
|
||||
+ return "@proj@/share/proj"
|
||||
# to avoid re-validating
|
||||
global _VALIDATED_PROJ_DATA
|
||||
if _VALIDATED_PROJ_DATA is not None:
|
||||
diff a/setup.py b/setup.py
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ
|
||||
|
||||
def check_proj_version(proj_dir):
|
||||
"""checks that the PROJ library meets the minimum version"""
|
||||
- proj = os.path.join(proj_dir, "bin", "proj")
|
||||
+ proj = "@proj@/bin/proj"
|
||||
proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT)
|
||||
proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",")
|
||||
proj_version = parse_version(proj_ver_bytes)
|
||||
@@ -33,6 +33,7 @@ def get_proj_dir():
|
||||
"""
|
||||
This function finds the base PROJ directory.
|
||||
"""
|
||||
+ return "@proj@"
|
||||
proj_dir = os.environ.get("PROJ_DIR")
|
||||
if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR):
|
||||
proj_dir = INTERNAL_PROJ_DIR
|
||||
@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir):
|
||||
"""
|
||||
This function finds the library directories
|
||||
"""
|
||||
+ return ["@proj@/lib"]
|
||||
proj_libdir = os.environ.get("PROJ_LIBDIR")
|
||||
libdirs = []
|
||||
if proj_libdir is None:
|
||||
@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir):
|
||||
"""
|
||||
This function finds the include directories
|
||||
"""
|
||||
+ return ["@proj@/include"]
|
||||
proj_incdir = os.environ.get("PROJ_INCDIR")
|
||||
incdirs = []
|
||||
if proj_incdir is None:
|
||||
|
|
@ -1,38 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, nose2
|
||||
{ lib, buildPythonPackage, fetchPypi, python, pkgs, pythonOlder, substituteAll
|
||||
, aenum
|
||||
, cython
|
||||
, proj ? null
|
||||
, pytest
|
||||
, mock
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage (rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "pyproj";
|
||||
version = "unstable-2018-11-13";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jswhit";
|
||||
repo = pname;
|
||||
rev = "78540f5ff40da92160f80860416c91ee74b7643c";
|
||||
sha256 = "1vq5smxmpdjxialxxglsfh48wx8kaq9sc5mqqxn4fgv1r5n1m3n9";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yigcxwmx5cczipf2mpmy2gq1dnl0635yjvjq86ay47j1j5fd2gc";
|
||||
};
|
||||
|
||||
buildInputs = [ cython ];
|
||||
# force pyproj to use ${pkgs.proj}
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./001.proj.patch;
|
||||
proj = pkgs.proj;
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ nose2 ];
|
||||
buildInputs = [ cython pkgs.proj ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
] ++ lib.optional (pythonOlder "3.6") aenum;
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
|
||||
# ignore rounding errors, and impure docgen
|
||||
# datadir is ignored because it does the proj look up logic, which isn't relevant
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
pushd unittest # changing directory should ensure we're importing the global pyproj
|
||||
${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])"
|
||||
popd
|
||||
runHook postCheck
|
||||
pytest . -k 'not alternative_grid_name \
|
||||
and not transform_wgs84_to_alaska \
|
||||
and not repr' \
|
||||
--ignore=test/test_doctest_wrapper.py \
|
||||
--ignore=test/test_datadir.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Python interface to PROJ.4 library";
|
||||
homepage = https://github.com/jswhit/pyproj;
|
||||
homepage = "https://github.com/jswhit/pyproj";
|
||||
license = with lib.licenses; [ isc ];
|
||||
};
|
||||
} // (if proj == null then {} else { PROJ_DIR = proj; }))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python, isPy3k }:
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikitlearn, python }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sklearn-deap";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
# No tests in Pypi
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteca";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava";
|
||||
sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch";
|
||||
sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy deap scikitlearn ];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
@ -23,7 +31,6 @@ buildPythonPackage rec {
|
|||
homepage = https://github.com/rsteca/sklearn-deap;
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
broken = isPy3k; # https://github.com/rsteca/sklearn-deap/issues/65
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
30
pkgs/development/python-modules/vsts/default.nix
Normal file
30
pkgs/development/python-modules/vsts/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonPackage
|
||||
, lib
|
||||
, python
|
||||
, fetchPypi
|
||||
, msrest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.25";
|
||||
pname = "vsts";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ msrest ];
|
||||
|
||||
# Tests are highly impure
|
||||
checkPhase = ''
|
||||
${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python APIs for interacting with and managing Azure DevOps";
|
||||
homepage = https://github.com/microsoft/azure-devops-python-api;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,12 +5,12 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ammonite-${version}";
|
||||
version = "1.6.8";
|
||||
version = "1.6.9";
|
||||
scalaVersion = "2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
|
||||
sha256 = "1lqc071v5f8dy1da669l0bfw9p8l6yavzlizzig9m441zcrmbj5d";
|
||||
sha256 = "1fi5j0kcndq00x72d8bkx6qiy9nh2i6c6m29gzfqql52qgbq1fd0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib, writeText }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj";
|
||||
};
|
||||
|
||||
modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a";
|
||||
|
||||
subPackages = [ "fly" ];
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X github.com/concourse/concourse.Version=${version}
|
||||
'';
|
||||
|
||||
# The fly.bash file included with this derivation can be replaced by a
|
||||
# call to `fly completion bash` once the `completion` subcommand has
|
||||
# made it into a release. Similarly, `fly completion zsh` will provide
|
||||
# zsh completions. https://github.com/concourse/concourse/pull/4012
|
||||
postInstall = ''
|
||||
install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line interface to Concourse CI";
|
||||
homepage = https://concourse-ci.org;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ivanbrennan ];
|
||||
};
|
||||
}
|
||||
10
pkgs/development/tools/continuous-integration/fly/fly.bash
Normal file
10
pkgs/development/tools/continuous-integration/fly/fly.bash
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# credits:
|
||||
# https://godoc.org/github.com/jessevdk/go-flags#hdr-Completion
|
||||
# https://github.com/concourse/concourse/issues/1309#issuecomment-452893900
|
||||
_fly_compl() {
|
||||
args=("${COMP_WORDS[@]:1:$COMP_CWORD}")
|
||||
local IFS=$'\n'
|
||||
COMPREPLY=($(GO_FLAGS_COMPLETION=1 ${COMP_WORDS[0]} "${args[@]}"))
|
||||
return 0
|
||||
}
|
||||
complete -F _fly_compl fly
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "babeltrace-1.5.6";
|
||||
name = "babeltrace-1.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2";
|
||||
sha256 = "1dxv2pwyqx2p7kzhcfansij40m9kanl85x2r68dmgp98g0hvq22k";
|
||||
sha256 = "0yw05cnk5w8b5nbznycglyn4h3hq56a1n8rlb9k9rlzz4ph32lr1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "merlin";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
minimumOCamlVersion = "4.02.1";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildDunePackage rec {
|
|||
owner = "ocaml";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1z2m6jykgn3nylh4bfirhxlb0bwamifv4fgml6j34ggk1drs8xrl";
|
||||
sha256 = "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9";
|
||||
};
|
||||
|
||||
buildInputs = [ yojson ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ assert lib.versionAtLeast ocaml.version "4.02.3";
|
|||
let
|
||||
srcs = {
|
||||
cmdliner = fetchurl {
|
||||
url = "https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz";
|
||||
url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz";
|
||||
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
|
||||
};
|
||||
cppo = fetchurl {
|
||||
|
|
@ -23,16 +23,16 @@ let
|
|||
sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm";
|
||||
};
|
||||
dune-local = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz";
|
||||
sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9";
|
||||
url = "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz";
|
||||
sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz";
|
||||
};
|
||||
extlib = fetchurl {
|
||||
url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz";
|
||||
sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
|
||||
};
|
||||
mccs = fetchurl {
|
||||
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz";
|
||||
sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv";
|
||||
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz";
|
||||
sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg";
|
||||
};
|
||||
ocamlgraph = fetchurl {
|
||||
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
|
||||
|
|
@ -55,13 +55,13 @@ let
|
|||
sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r";
|
||||
};
|
||||
opam = fetchurl {
|
||||
url = "https://github.com/ocaml/opam/archive/2.0.4.zip";
|
||||
sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c";
|
||||
url = "https://github.com/ocaml/opam/archive/2.0.5.zip";
|
||||
sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "opam-${version}";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
|
||||
|
||||
|
|
@ -117,4 +117,4 @@ in stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch
|
||||
# Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grails-${version}";
|
||||
version = "3.3.10";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
|
||||
sha256 = "1lykawfi47c2k6lq4vrnghlz8gcnmqsslxsnaq4d2n78g0y3yyr2";
|
||||
sha256 = "13y0q3gcdpfwib3ahrgh36rhr4smbrq2g4xgvnk8c0a6wvmz85sx";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "cups-filters-${version}";
|
||||
version = "1.23.0";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
|
||||
sha256 = "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2";
|
||||
sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -95,10 +95,25 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||
((map (links "share/wine/gecko") geckos)
|
||||
++ (map (links "share/wine/mono") monos))}
|
||||
'' + lib.optionalString supportFlags.gstreamerSupport ''
|
||||
for i in wine ; do
|
||||
if [ -e "$out/bin/$i" ]; then
|
||||
wrapProgram "$out/bin/$i" \
|
||||
# Wrapping Wine is tricky.
|
||||
# https://github.com/NixOS/nixpkgs/issues/63170
|
||||
# https://github.com/NixOS/nixpkgs/issues/28486
|
||||
# The main problem is that wine-preloader opens and loads the wine(64) binary, and
|
||||
# breakage occurs if it finds a shell script instead of the real binary. We solve this
|
||||
# by setting WINELOADER to point to the original binary. Additionally, the locations
|
||||
# of the 32-bit and 64-bit binaries must differ only by the presence of "64" at the
|
||||
# end, due to the logic Wine uses to find the other binary (see get_alternate_loader
|
||||
# in dlls/kernel32/process.c). Therefore we do not use wrapProgram which would move
|
||||
# the binaries to ".wine-wrapped" and ".wine64-wrapped", but use makeWrapper directly,
|
||||
# and move the binaries to ".wine" and ".wine64".
|
||||
for i in wine wine64 ; do
|
||||
prog="$out/bin/$i"
|
||||
if [ -e "$prog" ]; then
|
||||
hidden="$(dirname "$prog")/.$(basename "$prog")"
|
||||
mv "$prog" "$hidden"
|
||||
makeWrapper "$hidden" "$prog" \
|
||||
--argv0 "" \
|
||||
--set WINELOADER "$hidden" \
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
fi
|
||||
done
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eventstat-${version}";
|
||||
version = "0.04.05";
|
||||
version = "0.04.06";
|
||||
src = fetchzip {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
|
||||
sha256 = "1s9d6wl7f8cyn21fwj894dhfvl6f6f2h5xv26hg1yk3zfb5rmyn7";
|
||||
sha256 = "1w0lb94rmyrcl03s6ajn7mcdbhh2s6xhsg7kfchy1bpwqcjh2yli";
|
||||
};
|
||||
buildInputs = [ ncurses ];
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fnotifystat-${version}";
|
||||
version = "0.02.01";
|
||||
version = "0.02.02";
|
||||
src = fetchurl {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
|
||||
sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx";
|
||||
sha256 = "14d6cikny9rn7fcc6ncwh02mg6jrgfi1abpxifr46gyvp3w38w55";
|
||||
};
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "forkstat-${version}";
|
||||
version = "0.02.09";
|
||||
version = "0.02.10";
|
||||
src = fetchurl {
|
||||
url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
|
||||
sha256 = "1h5ha9w6rawh9kx39swjxs029202qxi0j9w38y7ilwq5pj447bxw";
|
||||
sha256 = "1nmnvgajvpas1azbr27nlgq5v3cwgrfwdhln3mr7dvhikz6rn0xg";
|
||||
};
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -59,5 +59,19 @@ in stdenv.mkDerivation {
|
|||
license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos lheckemann ];
|
||||
|
||||
longDescription = ''
|
||||
A set of small useful utilities for Linux networking including:
|
||||
|
||||
arping
|
||||
clockdiff
|
||||
ninfod
|
||||
ping
|
||||
rarpd
|
||||
rdisc
|
||||
tftpd
|
||||
tracepath
|
||||
traceroute6
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipvsadm-${version}";
|
||||
version = "1.29";
|
||||
version = "1.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz";
|
||||
sha256 = "c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149";
|
||||
sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.1.2019.07.11";
|
||||
version = "5.1.2019.07.13";
|
||||
modDirVersion = "5.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs.git";
|
||||
rev = "44dc1f269553f33cce43628444970efb85a7e802";
|
||||
sha256 = "1i32s15r0a844dnp3h9ac37xm9h69g0jn75pqz2gbfrafpk3pac1";
|
||||
rev = "22776fe9902b0b06d6aa18cd4c7f0c5ad35a95fa";
|
||||
sha256 = "0ly4vxawj8skh55c541zll3b8g6igiaq7aj33fklfjh0icmgzs60";
|
||||
};
|
||||
|
||||
extraConfig = "BCACHEFS_FS m";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dovecot-2.3.6";
|
||||
name = "dovecot-2.3.7";
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
buildInputs =
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
|
||||
sha256 = "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd";
|
||||
sha256 = "1al382ykm94if5agasb9h2442a8s7wn43hlwh292ir1rhnp5dq8i";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "metabase-${version}";
|
||||
version = "0.32.2";
|
||||
version = "0.32.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.metabase.com/v${version}/metabase.jar";
|
||||
sha256 = "1df2cvlqm0pz7w5094fv20308m0d2z4szlv46dzsfdw03hny50xn";
|
||||
sha256 = "08iybb1m2pmimn0fs95kd948yf6c1xmg5kkzm9ykx4cpb9pn1yw0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, expat, libxml2, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "squid-4.7";
|
||||
name = "squid-4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
|
||||
sha256 = "0kimbvp2mzask9k58va4s829vv3m54fzxrj7ryqshw5bfxgzd752";
|
||||
sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
|
||||
, expat, libxml2, openssl }:
|
||||
, expat, libxml2, openssl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "squid-3.5.28";
|
||||
|
|
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "3.5-CVE-2019-13345.patch";
|
||||
url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch";
|
||||
sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
perl openldap db cyrus_sasl expat libxml2 openssl
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchurl }:
|
||||
let
|
||||
version = "0.6.pre15";
|
||||
version = "0.6.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "oil-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
sha256 = "1azdmicv39rp30msl6fpw6921gi6ib8lxiyc8kanljqk5d7zg4p6";
|
||||
sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-07-01";
|
||||
version = "2019-07-13";
|
||||
name = "oh-my-zsh-${version}";
|
||||
rev = "b259cdf7e71ad6c3cc1a66a48c6c79cf63f38590";
|
||||
rev = "17f4cfca99398cb5511557b8515a17bf1bf2948a";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "1vk9misnvjs1lxlwzy4ld30vh67nhghzra1y5ckgxa019l9cvann";
|
||||
sha256 = "19f29mrvnhvndvl48fd5kdiixfs0apmb27h4mck5v95p6yw27b6f";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ckbcomp-${version}";
|
||||
version = "1.191";
|
||||
version = "1.192";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "installer-team";
|
||||
repo = "console-setup";
|
||||
rev = version;
|
||||
sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim";
|
||||
sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
|
|
|||
29
pkgs/tools/X11/libstrangle/default.nix
Normal file
29
pkgs/tools/X11/libstrangle/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrangle";
|
||||
version = "2017-02-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milaq";
|
||||
repo = pname;
|
||||
rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e";
|
||||
sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=" "DESTDIR=$(out)" ];
|
||||
|
||||
patches = [ ./nixos.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteAllInPlace src/strangle.sh
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/milaq/libstrangle";
|
||||
description = "Frame rate limiter for Linux/OpenGL";
|
||||
license = licenses.gpl3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aske ];
|
||||
};
|
||||
}
|
||||
29
pkgs/tools/X11/libstrangle/nixos.patch
Normal file
29
pkgs/tools/X11/libstrangle/nixos.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
diff --git a/makefile b/makefile
|
||||
index eb13054..a3a1125 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES)
|
||||
|
||||
install: all
|
||||
- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
|
||||
install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
|
||||
install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so
|
||||
install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle
|
||||
install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE
|
||||
- ldconfig
|
||||
|
||||
clean:
|
||||
rm -f $(BUILDDIR)libstrangle64.so
|
||||
diff --git a/src/strangle.sh b/src/strangle.sh
|
||||
index e280e86..b2dd42b 100755
|
||||
--- a/src/strangle.sh
|
||||
+++ b/src/strangle.sh
|
||||
@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-# Execute the strangled program under a clean environment
|
||||
# pass through the FPS and overriden LD_PRELOAD environment variables
|
||||
-exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@"
|
||||
+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@"
|
||||
|
|
@ -1,30 +1,29 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto,
|
||||
libXi }:
|
||||
|
||||
let
|
||||
baseName = "xcape";
|
||||
version = "1.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${baseName}-${version}";
|
||||
pname = "xcape";
|
||||
version = "unstable-20180301";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alols";
|
||||
repo = baseName;
|
||||
rev = "v${version}";
|
||||
sha256 = "09a05cxgrip6nqy1qmwblamp2bhknqnqmxn7i2a1rgxa0nba95dm";
|
||||
repo = pname;
|
||||
rev = "a34d6bae27bbd55506852f5ed3c27045a3c0bd9e";
|
||||
sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ libX11 libXtst xorgproto libXi ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "MANDIR=/share/man/man1" ];
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"MANDIR=/share/man/man1"
|
||||
];
|
||||
|
||||
postInstall = "install -D --target-directory $out/share/doc README.md";
|
||||
postInstall = "install -Dm444 --target-directory $out/share/doc README.md";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utility to configure modifier keys to act as other keys";
|
||||
longDescription = ''
|
||||
xcape allows you to use a modifier key as another key when
|
||||
|
|
@ -35,8 +34,8 @@ stdenv.mkDerivation rec {
|
|||
released on its own.
|
||||
'';
|
||||
homepage = https://github.com/alols/xcape;
|
||||
license = stdenv.lib.licenses.gpl3 ;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
license = licenses.gpl3 ;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcachefs-tools";
|
||||
version = "2019-07-11";
|
||||
version = "2019-07-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
|
||||
rev = "33c91e2ff4e228cb618ca22d642a34ec1c2cf0ef";
|
||||
sha256 = "0glldbnda61xwf7309mk48qmxqnipjmcgsibab77nr6v3bg13ip1";
|
||||
rev = "692eadd6ca9b45f12971126b326b6a89d7117e67";
|
||||
sha256 = "0d2kqy5p89qjrk38iqfk9zsh14c2x40d21kic9kcybdhalfq5q31";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, fuse, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
name = "bindfs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bindfs.org/downloads/${name}.tar.gz";
|
||||
sha256 = "1f1znixdaz4wnr9j6rkrplhbnkz7pdw9927yfikbjvxz8cl6qsdz";
|
||||
sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl";
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2psf";
|
||||
version = "1.191";
|
||||
version = "1.192";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk";
|
||||
sha256 = "0yjylbj88p2a7qi1wicicl1ivrhp52pnzy44mc1yg6l3n7zifcwn";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@ with rustPlatform;
|
|||
|
||||
buildRustPackage rec {
|
||||
name = "exa-${version}";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
cargoSha256 = "0kaldln4fb9n53190m2r130mcblkjx32glzj9rk8hrz6dd6yhfb0";
|
||||
cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ogham";
|
||||
repo = "exa";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jy11a3xfnfnmyw1kjmv4ffavhijs8c940kw24vafklnacx5n88m";
|
||||
sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig perl ];
|
||||
|
|
@ -52,6 +52,6 @@ buildRustPackage rec {
|
|||
'';
|
||||
homepage = https://the.exa.website;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ehegnes ];
|
||||
maintainers = with maintainers; [ ehegnes lilyball ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,28 @@
|
|||
{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi
|
||||
{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools
|
||||
, embedScript ? null
|
||||
, additionalTargets ? {}
|
||||
}:
|
||||
|
||||
let
|
||||
date = "20190318";
|
||||
rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218";
|
||||
targets = (lib.optional stdenv.isx86_64 "bin-x86_64-efi/ipxe.efi") ++ [
|
||||
"bin/ipxe.dsk"
|
||||
"bin/ipxe.usb"
|
||||
"bin/ipxe.iso"
|
||||
"bin/ipxe.lkrn"
|
||||
"bin/undionly.kpxe"
|
||||
];
|
||||
targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 {
|
||||
"bin-x86_64-efi/ipxe.efi" = null;
|
||||
"bin-x86_64-efi/ipxe.efirom" = null;
|
||||
"bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";
|
||||
} // {
|
||||
"bin/ipxe.dsk" = null;
|
||||
"bin/ipxe.usb" = null;
|
||||
"bin/ipxe.iso" = null;
|
||||
"bin/ipxe.lkrn" = null;
|
||||
"bin/undionly.kpxe" = null;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ipxe-${date}-${builtins.substring 0 7 rev}";
|
||||
|
||||
buildInputs = [ perl cdrkit syslinux xz openssl gnu-efi ];
|
||||
nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ];
|
||||
|
||||
src = fetchgit {
|
||||
url = https://git.ipxe.org/ipxe.git;
|
||||
|
|
@ -37,7 +42,12 @@ stdenv.mkDerivation {
|
|||
] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
|
||||
|
||||
|
||||
enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ];
|
||||
enabledOptions = [
|
||||
"PING_CMD"
|
||||
"IMAGE_TRUST_CMD"
|
||||
"DOWNLOAD_PROTO_HTTP"
|
||||
"DOWNLOAD_PROTO_HTTPS"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
|
@ -49,11 +59,14 @@ stdenv.mkDerivation {
|
|||
|
||||
preBuild = "cd src";
|
||||
|
||||
buildFlags = targets;
|
||||
buildFlags = lib.attrNames targets;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp ${lib.concatStringsSep " " targets} $out
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to:
|
||||
if to == null
|
||||
then "cp -v ${from} $out"
|
||||
else "cp -v ${from} $out/${to}") targets)}
|
||||
|
||||
# Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
|
||||
# let's provide it as a symlink to be compatible in this case.
|
||||
|
|
@ -67,6 +80,6 @@ stdenv.mkDerivation {
|
|||
homepage = http://ipxe.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.all;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,26 @@
|
|||
{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
|
||||
{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
|
||||
|
||||
let
|
||||
version = "0.92.1-unstable";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "osm2pgsql-${version}";
|
||||
version = "0.96.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/openstreetmap/osm2pgsql.git";
|
||||
rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66";
|
||||
# Still waiting on release after:
|
||||
# https://github.com/openstreetmap/osm2pgsql/pull/684
|
||||
# https://github.com/openstreetmap/osm2pgsql/issues/634
|
||||
#rev = "refs/tags/${version}";
|
||||
sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = "osm2pgsql";
|
||||
rev = version;
|
||||
sha256 = "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl";
|
||||
};
|
||||
nativeBuildInputs = [cmake];
|
||||
buildInputs = [expat proj bzip2 zlib boost postgresql lua];
|
||||
|
||||
meta = {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ expat proj bzip2 zlib boost postgresql lua ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "OpenStreetMap data to PostgreSQL converter";
|
||||
version = "0.92.1-unstable";
|
||||
homepage = https://github.com/openstreetmap/osm2pgsql;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
name = "davix-${version}";
|
||||
nativeBuildInputs = [ cmake pkgconfig python3 ];
|
||||
buildInputs = [ openssl libxml2 boost libuuid ];
|
||||
|
||||
# using the url below since the 0.7.3 release did carry a broken CMake file,
|
||||
# using the url below since the 0.7.4 release did carry a broken CMake file,
|
||||
# supposedly fixed in the next release
|
||||
# https://github.com/cern-fts/davix/issues/40
|
||||
src = fetchurl {
|
||||
url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
|
||||
sha256 = "12ij7p1ahgvicqmccrvpd0iw1909qmpbc3nk58gdm866f9p2find";
|
||||
sha256 = "1k407ckvsw1w212k3lp2867i0sscnrbigsx79l1sp5ymj3n62aih";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
name = "htpdate-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz";
|
||||
sha256 = "00xwppq3aj951m0srjvxmr17kiaaflyjmbfkvpnfs3jvqhzczci2";
|
||||
sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
|
|||
pname = "tridactyl-native";
|
||||
# this is actually the version of tridactyl itself; the native messenger will
|
||||
# probably not change with every tridactyl version
|
||||
version = "1.15.0";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tridactyl";
|
||||
repo = "tridactyl";
|
||||
rev = version;
|
||||
sha256 = "12pq95pw5g777kpgad04n9az1fl8y0x1vismz81mqqij3jr5qwzb";
|
||||
sha256 = "07pipvxxa4bw11f0fxm8vjwd5ap7i82nsq93sw1kj353jn1mpwxw";
|
||||
};
|
||||
sourceRoot = "source/native";
|
||||
|
||||
|
|
|
|||
|
|
@ -195,12 +195,12 @@ in rec {
|
|||
|
||||
nixFlakes = lib.lowPrio (callPackage common rec {
|
||||
name = "nix-2.3${suffix}";
|
||||
suffix = "pre20190612_06010ea";
|
||||
suffix = "pre20190712_aa82f8b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "06010eaf199005a393f212023ec5e8bc97978537";
|
||||
sha256 = "1fq99fmlag5hxvgzxrclgfsnc1fhhfwnslyshad1934wi9nzx1s2";
|
||||
rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108";
|
||||
hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU=";
|
||||
};
|
||||
fromGit = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fio-${version}";
|
||||
version = "3.14";
|
||||
version = "3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axboe";
|
||||
repo = "fio";
|
||||
rev = "fio-${version}";
|
||||
sha256 = "1qpv9saar0ik9mqpdyv93miyllfn7n7czcpffhk13lcrxasmjcp9";
|
||||
sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9";
|
||||
};
|
||||
|
||||
buildInputs = [ python zlib ]
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monit-5.25.3";
|
||||
name = "monit-5.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}dist/${name}.tar.gz";
|
||||
sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1";
|
||||
sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "amazon-ecs-cli-${version}";
|
||||
version = "1.14.1";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
|
||||
sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj";
|
||||
sha256 = "0p0z12b6z00sxzjfsvb37czgczrsi61klr5azan0f8wf32x6wc28";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -9242,6 +9242,8 @@ in
|
|||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
fly = callPackage ../development/tools/continuous-integration/fly { };
|
||||
|
||||
foreman = callPackage ../tools/system/foreman { };
|
||||
goreman = callPackage ../tools/system/goreman { };
|
||||
|
||||
|
|
@ -10560,6 +10562,8 @@ in
|
|||
|
||||
gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
|
||||
|
||||
gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { };
|
||||
|
||||
gdcm = callPackage ../development/libraries/gdcm { };
|
||||
|
||||
ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
|
||||
|
|
@ -12706,6 +12710,10 @@ in
|
|||
|
||||
proj = callPackage ../development/libraries/proj { };
|
||||
|
||||
proj_5 = callPackage ../development/libraries/proj/5.2.nix { };
|
||||
|
||||
proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };
|
||||
|
||||
proselint = callPackage ../tools/text/proselint {
|
||||
inherit (python3Packages)
|
||||
buildPythonApplication click future six;
|
||||
|
|
@ -13439,6 +13447,8 @@ in
|
|||
|
||||
tdb = callPackage ../development/libraries/tdb {};
|
||||
|
||||
tdlib = callPackage ../development/libraries/tdlib { };
|
||||
|
||||
tecla = callPackage ../development/libraries/tecla { };
|
||||
|
||||
tectonic = callPackage ../tools/typesetting/tectonic {
|
||||
|
|
@ -19060,7 +19070,9 @@ in
|
|||
|
||||
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
|
||||
|
||||
merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { };
|
||||
merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor {
|
||||
gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179
|
||||
};
|
||||
|
||||
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
|
||||
|
||||
|
|
@ -20215,6 +20227,10 @@ in
|
|||
|
||||
insync = callPackage ../applications/networking/insync { };
|
||||
|
||||
libstrangle = callPackage ../tools/X11/libstrangle {
|
||||
stdenv = stdenv_32bit;
|
||||
};
|
||||
|
||||
lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { };
|
||||
|
||||
lightdm_qt = lightdm.override { withQt5 = true; };
|
||||
|
|
@ -21898,10 +21914,6 @@ in
|
|||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
samplv1 = callPackage ../applications/audio/samplv1 { };
|
||||
|
||||
sauerbraten = callPackage ../games/sauerbraten {};
|
||||
|
|
|
|||
|
|
@ -2712,7 +2712,7 @@ in {
|
|||
|
||||
filelock = callPackage ../development/python-modules/filelock {};
|
||||
|
||||
fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; };
|
||||
fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; };
|
||||
|
||||
fitbit = callPackage ../development/python-modules/fitbit { };
|
||||
|
||||
|
|
@ -4028,11 +4028,7 @@ in {
|
|||
|
||||
pyotp = callPackage ../development/python-modules/pyotp { };
|
||||
|
||||
pyproj = callPackage ../development/python-modules/pyproj {
|
||||
# pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by
|
||||
# a few decimal places, so caveat emptor.
|
||||
proj = null;
|
||||
};
|
||||
pyproj = callPackage ../development/python-modules/pyproj { };
|
||||
|
||||
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
|
||||
|
||||
|
|
@ -4230,7 +4226,9 @@ in {
|
|||
|
||||
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
|
||||
|
||||
rasterio = callPackage ../development/python-modules/rasterio { };
|
||||
rasterio = callPackage ../development/python-modules/rasterio {
|
||||
gdal = pkgs.gdal_2; # gdal 3.0 not supported yet
|
||||
};
|
||||
|
||||
radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {};
|
||||
|
||||
|
|
@ -4637,6 +4635,8 @@ in {
|
|||
|
||||
virtualenv = callPackage ../development/python-modules/virtualenv { };
|
||||
|
||||
vsts = callPackage ../development/python-modules/vsts { };
|
||||
|
||||
weasyprint = callPackage ../development/python-modules/weasyprint { };
|
||||
|
||||
webassets = callPackage ../development/python-modules/webassets { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue