swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 17:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144128 from Stunkymonkey/development-github-5

Browse source
This commit is contained in:
Sandro 2021-11-13 23:28:53 +01:00 committed by GitHub
parent beff4b8178 60cee1103d
commit 770da1783a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 213 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/luabind/default.nix
View file

@ -1,11 +1,14 @@
{lib, stdenv, fetchurl, boost-build, lua, boost}:
{ lib, stdenv, fetchFromGitHub, boost-build, lua, boost }:
stdenv.mkDerivation {
name = "luabind-0.9.1";
stdenv.mkDerivation rec {
pname = "luabind";
version = "0.9.1";
src = fetchurl {
url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz";
sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d";
src = fetchFromGitHub {
owner = "luabind";
repo = "luabind";
rev = version;
sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag=";
};
patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];

8
pkgs/development/libraries/nco/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
pname = "nco";
version = "5.0.3";
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "nco";
repo = "nco";
rev = version;
sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw=";
};

10
pkgs/development/libraries/netcdf-cxx4/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }:
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }:
stdenv.mkDerivation rec {
pname = "netcdf-cxx4";
version = "4.3.1";
src = fetchzip {
url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr";
src = fetchFromGitHub {
owner = "Unidata";
repo = "netcdf-cxx4";
rev = "v${version}";
sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";
};
preConfigure = ''

10
pkgs/development/libraries/netcdf-fortran/default.nix
View file

@ -1,11 +1,13 @@
{ lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }:
stdenv.mkDerivation rec {
pname = "netcdf-fortran";
version = "4.4.5";
src = fetchurl {
url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz";
sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01";
src = fetchFromGitHub {
owner = "Unidata";
repo = "netcdf-fortran";
rev = "v${version}";
sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0=";
};
nativeBuildInputs = [ gfortran ];

76
pkgs/development/libraries/ogre/default.nix
View file

@ -1,40 +1,76 @@
{ fetchurl, stdenv, lib
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkg-config
, libXxf86vm, libICE
{ fetchFromGitHub
, stdenv
, lib
, cmake
, libGLU
, libGL
, freetype
, freeimage
, zziplib
, xorgproto
, libXrandr
, libXaw
, freeglut
, libXt
, libpng
, boost
, ois
, libX11
, libXmu
, libSM
, pkg-config
, libXxf86vm
, libICE
, unzip
, libXrender
, SDL2
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
, withNvidiaCg ? false
, nvidia_cg_toolkit
, withSamples ? false
}:
stdenv.mkDerivation rec {
pname = "ogre";
version = "1.12.1";
src = fetchurl {
url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
src = fetchFromGitHub {
owner = "OGRECave";
repo = "ogre";
rev = "v${version}";
sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM=";
};
cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs =
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM
libXxf86vm libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
[
cmake
libGLU
libGL
freetype
freeimage
zziplib
xorgproto
libXrandr
libXaw
freeglut
libXt
libpng
boost
ois
libX11
libXmu
libSM
libXxf86vm
libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {
description = "A 3D engine";

10
pkgs/development/libraries/ogrepaged/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec {
pname = "ogre-paged";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz";
sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82";
src = fetchFromGitHub {
owner = "RigsOfRods";
repo = "ogre-pagedgeometry";
rev = "v${version}";
sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U=";
};
patches = [

14
pkgs/development/libraries/openbabel/default.nix
View file

@ -1,15 +1,16 @@
{stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
{ stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "3.1.1";
src = fetchurl {
url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";
};
buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];
nativeBuildInputs = [ cmake pkg-config ];
@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
"-DPYTHON_BINDINGS=ON"
];
postFixup = ''
cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
from distutils.core import setup
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
package_data = {'openbabel' : ['_openbabel.so']}
)
EOF
'';
'';
meta = with lib; {
description = "A toolbox designed to speak the many languages of chemical data";

11
pkgs/development/libraries/science/math/openlibm/default.nix
View file

@ -1,11 +1,14 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "openlibm";
version = "0.8.0";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4=";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "openlibm";
rev = "v${version}";
sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI=";
};
makeFlags = [ "prefix=$(out)" ];

12
pkgs/development/libraries/science/math/primesieve/default.nix
View file

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "primesieve";
version = "7.6";
nativeBuildInputs = [cmake];
nativeBuildInputs = [ cmake ];
src = fetchurl {
url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
sha256 = "sha256-rSNYoWBy80BgPi1c+BSKbWTyGGb7/fxmu+mq1DXakHY=";
};
meta = with lib; {

40
pkgs/development/libraries/sfml/default.nix
View file

@ -1,15 +1,33 @@
{ lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libX11
, freetype
, libjpeg
, openal
, flac
, libvorbis
, glew
, libXrandr
, libXrender
, udev
, xcbutilimage
, IOKit
, Foundation
, AppKit
, OpenAL
}:
stdenv.mkDerivation rec {
pname = "sfml";
version = "2.5.1";
src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
src = fetchFromGitHub {
owner = "SFML";
repo = "SFML";
rev = version;
sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk=";
};
nativeBuildInputs = [ cmake ];
@ -18,10 +36,12 @@ stdenv.mkDerivation rec {
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes" ];
cmakeFlags = [
"-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes"
];
meta = with lib; {
homepage = "https://www.sfml-dev.org/";

13
pkgs/development/libraries/stxxl/default.nix
View file

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, cmake
{ lib
, stdenv
, fetchFromGitHub
, cmake
, parallel ? true
}:
@ -10,9 +13,11 @@ stdenv.mkDerivation rec {
pname = "stxxl";
version = "1.4.1";
src = fetchurl {
url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz";
sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c";
src = fetchFromGitHub {
owner = "stxxl";
repo = "stxxl";
rev = version;
sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/libraries/vaapi-intel-hybrid/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }:
stdenv.mkDerivation rec {
pname = "intel-hybrid-driver";
version = "1.0.2";
src = fetchurl {
url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz";
sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n";
src = fetchFromGitHub {
owner = "01org";
repo = "intel-hybrid-driver";
rev = version;
sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
};
patches = [

54
pkgs/development/libraries/vigra/default.nix
View file

@ -1,35 +1,65 @@
{ lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
, libjpeg, libpng, libtiff, openexr, python2Packages }:
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, boost
, cmake
, fftw
, fftwSinglePrec
, hdf5
, ilmbase
, libjpeg
, libpng
, libtiff
, openexr
, python2Packages
}:
let
inherit (python2Packages) python numpy;
# Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "vigra";
version = "1.11.1";
src = fetchurl {
url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz";
sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
src = fetchFromGitHub {
owner = "ukoethe";
repo = "vigra";
rev = "Version-${lib.replaceChars ["."] ["-"] version}";
sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk=";
};
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
# Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
patches =
let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
let clangPatch = fetchurl {
url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi";
};
in [ clangPatch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
libtiff numpy openexr python ];
buildInputs = [
boost
fftw
fftwSinglePrec
hdf5
ilmbase
libjpeg
libpng
libtiff
numpy
openexr
python
];
preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
cmakeFlags = [ "-DWITH_OPENEXR=1" ]
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
# fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
doCheck = false;

21
pkgs/development/libraries/vo-amrwbenc/default.nix
View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
let
version = "0.1.3";
in
stdenv.mkDerivation {
name = "vo-amrwbenc-${version}";
stdenv.mkDerivation rec{
pname = "vo-amrwbenc";
version = "0.1.3";
buildInputs = [ autoreconfHook ];
src = fetchurl {
url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz";
sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c";
src = fetchFromGitHub {
owner = "mstorsjo";
repo = "vo-amrwbenc";
rev = "v${version}";
sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w=";
};
nativeBuildInputs = [ autoreconfHook ];
meta = {
homepage = "https://sourceforge.net/projects/opencore-amr/";
description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";

10
pkgs/development/mobile/imgpatchtools/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, bzip2, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "imgpatchtools";
version = "0.3";
src = fetchzip {
url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz";
sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd";
src = fetchFromGitHub {
owner = "erfanoabdi";
repo = "imgpatchtools";
rev = version;
sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M=";
};
buildInputs = [ bzip2 openssl zlib ];