forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bde8bf2c6b
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deltachat-cursed";
|
||||
version = "0.4.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbenitez";
|
||||
repo = "deltachat-cursed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-li6HsatiRJPVKKBBHyWhq2b8HhvDrOUiVT2tSupjuag=";
|
||||
hash = "sha256-qFX5CjrF0HLR41BbrCPT+rI9vAP6VLzXXAaVq/Loabs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
deltachat
|
||||
emoji
|
||||
notify-py
|
||||
urwid-readline
|
||||
];
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.82.0";
|
||||
version = "1.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-cc5DFQucG1b+1QN0HTJLKAfCF3UvRunL07d4WdT6368=";
|
||||
hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-WYjTpHTYJGqvsUI8De6+tGgjYY1nKqPyfKP9IdZfrNY=";
|
||||
hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lhapdf";
|
||||
version = "6.4.0";
|
||||
version = "6.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
|
||||
sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw=";
|
||||
sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E=";
|
||||
};
|
||||
|
||||
# The Apple SDK only exports locale_t from xlocale.h whereas glibc
|
||||
|
|
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ];
|
||||
buildInputs = [ python ];
|
||||
|
||||
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
|
||||
|
||||
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
|
||||
rm wrappers/python/lhapdf.cpp
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
|
||||
{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}:
|
||||
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
|
||||
patchInstructions = lib.optionalString (os == "linux") ''
|
||||
autoPatchelf $packageBaseDir/bin
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ rec {
|
|||
|
||||
cmake = map (version:
|
||||
import ./cmake.nix {
|
||||
inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
|
||||
inherit deployAndroidPackage os autoPatchelfHook pkgs lib stdenv;
|
||||
package = packages.cmake.${version};
|
||||
}
|
||||
) cmakeVersions;
|
||||
|
|
@ -179,7 +179,7 @@ rec {
|
|||
# Creates a NDK bundle.
|
||||
makeNdkBundle = ndkVersion:
|
||||
import ./ndk-bundle {
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools;
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv;
|
||||
package = packages.ndk-bundle.${ndkVersion};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,33 +2,35 @@
|
|||
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
buildInputs = [ autoPatchelfHook makeWrapper ]
|
||||
++ lib.optionals (os == "linux") [
|
||||
pkgs.glibc
|
||||
pkgs.xorg.libX11
|
||||
pkgs.xorg.libXext
|
||||
pkgs.xorg.libXdamage
|
||||
pkgs.xorg.libXfixes
|
||||
pkgs.xorg.libxcb
|
||||
pkgs.xorg.libXcomposite
|
||||
pkgs.xorg.libXcursor
|
||||
pkgs.xorg.libXi
|
||||
pkgs.xorg.libXrender
|
||||
pkgs.xorg.libXtst
|
||||
pkgs.libcxx
|
||||
pkgs.libGL
|
||||
pkgs.libpulseaudio
|
||||
pkgs.libuuid
|
||||
pkgs.zlib
|
||||
pkgs.ncurses5
|
||||
pkgs.stdenv.cc.cc
|
||||
pkgs_i686.glibc
|
||||
pkgs.expat
|
||||
pkgs.freetype
|
||||
pkgs.nss
|
||||
pkgs.nspr
|
||||
pkgs.alsa-lib
|
||||
];
|
||||
buildInputs = [ makeWrapper ]
|
||||
++ lib.optionals (os == "linux") (with pkgs; [
|
||||
autoPatchelfHook
|
||||
glibc
|
||||
libcxx
|
||||
libGL
|
||||
libpulseaudio
|
||||
libuuid
|
||||
zlib
|
||||
ncurses5
|
||||
stdenv.cc.cc
|
||||
i686.glibc
|
||||
expat
|
||||
freetype
|
||||
nss
|
||||
nspr
|
||||
alsa-lib
|
||||
]) ++ (with pkgs.xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXdamage
|
||||
libXfixes
|
||||
libxcb
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXi
|
||||
libXrender
|
||||
libXtst
|
||||
]);
|
||||
patchInstructions = lib.optionalString (os == "linux") ''
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib
|
||||
addAutoPatchelfSearchPath $packageBaseDir/lib64
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook
|
||||
{ stdenv, lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook
|
||||
, deployAndroidPackage, package, os, platform-tools
|
||||
}:
|
||||
|
||||
|
|
@ -9,7 +9,8 @@ let
|
|||
in
|
||||
deployAndroidPackage {
|
||||
inherit package os;
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
autoPatchelfIgnoreMissingDeps = true;
|
||||
buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ];
|
||||
patchInstructions = lib.optionalString (os == "linux") (''
|
||||
|
|
|
|||
|
|
@ -3,8 +3,12 @@
|
|||
deployAndroidPackage {
|
||||
name = "androidsdk";
|
||||
inherit os package;
|
||||
buildInputs = [ autoPatchelfHook makeWrapper ]
|
||||
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
|
||||
buildInputs = [ makeWrapper ]
|
||||
++ lib.optional (os == "linux") (
|
||||
(with pkgs; [ autoPatchelfHook glibc freetype fontconfig fontconfig.lib])
|
||||
++ (with pkgs.xorg; [ libX11 libXrender libXext ])
|
||||
++ (with pkgs_i686; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])
|
||||
);
|
||||
|
||||
patchInstructions = ''
|
||||
${lib.optionalString (os == "linux") ''
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ lib, buildPythonPackage, python, pythonOlder, glibcLocales, fetchFromGitHub, ipaddress, six, simplejson }:
|
||||
{ lib, buildPythonPackage, python, pythonOlder, glibcLocales, fetchFromGitHub, six, simplejson }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mail-parser";
|
||||
version = "3.15.0";
|
||||
|
||||
# no tests in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpamScope";
|
||||
repo = pname;
|
||||
|
|
@ -15,7 +14,7 @@ buildPythonPackage rec {
|
|||
LC_ALL = "en_US.utf-8";
|
||||
|
||||
nativeBuildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress;
|
||||
propagatedBuildInputs = [ simplejson six ];
|
||||
|
||||
# Taken from .travis.yml
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ stdenv, lib, buildPythonPackage, pythonOlder, pythonAtLeast
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, fetchPypi
|
||||
, libmaxminddb
|
||||
, ipaddress
|
||||
, mock
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.2.0";
|
||||
pname = "maxminddb";
|
||||
version = "2.2.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -18,8 +21,6 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ libmaxminddb ];
|
||||
|
||||
propagatedBuildInputs = [ ipaddress ];
|
||||
|
||||
checkInputs = [ nose mock ];
|
||||
|
||||
# Tests are broken for macOS on python38
|
||||
|
|
@ -27,7 +28,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Reader for the MaxMind DB format";
|
||||
homepage = "https://www.maxmind.com/en/home";
|
||||
homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pretend
|
||||
, setuptools
|
||||
}:
|
||||
|
|
@ -13,6 +14,8 @@ let
|
|||
version = "21.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s=";
|
||||
|
|
|
|||
|
|
@ -4,12 +4,10 @@
|
|||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, idna
|
||||
, ipaddress
|
||||
, pyasn1
|
||||
, pyasn1-modules
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -30,8 +28,6 @@ buildPythonPackage rec {
|
|||
pyasn1
|
||||
pyasn1-modules
|
||||
six
|
||||
] ++ lib.optionals (pythonOlder "3.3") [
|
||||
ipaddress
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytestCheckHook, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "swagger-spec-validator";
|
||||
|
|
@ -7,25 +7,23 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Yelp";
|
||||
repo = "swagger_spec_validator";
|
||||
rev = "v" + version;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
mock
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
jsonschema
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "swagger_spec_validator" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Yelp/swagger_spec_validator";
|
||||
license = licenses.asl20;
|
||||
|
|
@ -33,5 +31,3 @@ buildPythonPackage rec {
|
|||
maintainers = with maintainers; [ vanschelven ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,22 @@
|
|||
{ lib, stdenv, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
|
||||
, automat, zope_interface, idna, pyopenssl, service-identity, pytestCheckHook, mock, lsof
|
||||
, GeoIP }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, cryptography
|
||||
, incremental
|
||||
, twisted
|
||||
, automat
|
||||
, zope_interface
|
||||
, idna
|
||||
, pyopenssl
|
||||
, service-identity
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, lsof
|
||||
, GeoIP
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "txtorcon";
|
||||
|
|
@ -12,9 +28,12 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
incremental twisted automat zope_interface
|
||||
] ++ twisted.optional-dependencies.tls
|
||||
++ lib.optionals (!isPy3k) [ ipaddress ];
|
||||
cryptography
|
||||
incremental
|
||||
twisted
|
||||
automat
|
||||
zope_interface
|
||||
] ++ twisted.optional-dependencies.tls;
|
||||
|
||||
checkInputs = [ pytestCheckHook mock lsof GeoIP ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7";
|
||||
};
|
||||
|
||||
buildInputs = [ pyyaml ];
|
||||
propagatedBuildInputs = [ pyyaml ];
|
||||
|
||||
doCheck = false; # requires files from uap-core
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of
|
||||
# `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here
|
||||
# TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged.
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +1,70 @@
|
|||
{ lib, stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, libuuid
|
||||
, makeWrapper
|
||||
, mtools
|
||||
, nasm
|
||||
, perl
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "syslinux";
|
||||
version = "unstable-20190207";
|
||||
version = "unstable-2019-02-07";
|
||||
|
||||
# This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run.
|
||||
# Same issue here https://www.syslinux.org/archives/2019-February/026330.html
|
||||
src = fetchgit {
|
||||
url = "https://repo.or.cz/syslinux";
|
||||
rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7";
|
||||
sha256 = "1acf6byx7i6vz8hq6mra526g8mf7fmfhid211y8nq0v6px7d3aqs";
|
||||
sha256 = "sha256-GqvRTr9mA2yRD0G0CF11x1X0jCgqV4Mh+tvE0/0yjqk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = let
|
||||
mkURL = commit: patchName:
|
||||
"https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/"
|
||||
+ patchName;
|
||||
fetchDebianPatch = name: commit: hash:
|
||||
fetchurl {
|
||||
url = "https://salsa.debian.org/images-team/syslinux/raw/"
|
||||
+ commit + "/debian/patches/" + name;
|
||||
inherit name hash;
|
||||
};
|
||||
fetchArchlinuxPatch = name: commit: hash:
|
||||
fetchurl {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/"
|
||||
+ commit + "/trunk/" + name;
|
||||
inherit name hash;
|
||||
};
|
||||
in [
|
||||
(fetchurl {
|
||||
url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch";
|
||||
sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0005-gnu-efi-version-compatibility.patch";
|
||||
name = "0005-gnu-efi-version-compatibility.patch";
|
||||
sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0025-reproducible-build.patch";
|
||||
name = "0025-reproducible-build.patch";
|
||||
sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls";
|
||||
})
|
||||
(fetchurl {
|
||||
./gcc10.patch
|
||||
(fetchDebianPatch
|
||||
"0002-gfxboot-menu-label.patch"
|
||||
"fa1349f1"
|
||||
"sha256-0f6QhM4lJmGflLige4n7AZTodL7vnyAvi5dIedd/Lho=")
|
||||
(fetchArchlinuxPatch
|
||||
"0005-gnu-efi-version-compatibility.patch"
|
||||
"821c3da473d1399d930d5b4a086e46a4179eaa45"
|
||||
"sha256-hhCVnfbAFWj/R4yh60qsMB87ofW9RznarsByhl6L4tc=")
|
||||
(fetchArchlinuxPatch
|
||||
"0025-reproducible-build.patch"
|
||||
"821c3da473d1399d930d5b4a086e46a4179eaa45"
|
||||
"sha256-mnb291pCSFvDNxY7o4BosJ94ib3BpOGRQIiY8Q3jZmI=")
|
||||
(fetchDebianPatch
|
||||
# mbr.bin: too big (452 > 440)
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414
|
||||
url = mkURL "7468ef0e38c43" "0016-strip-gnu-property.patch";
|
||||
sha256 = "17n63b8wz6szv8npla1234g1ip7lqgzx2whrpv358ppf67lq8vwm";
|
||||
})
|
||||
(fetchurl {
|
||||
"0016-strip-gnu-property.patch"
|
||||
"7468ef0e38c43"
|
||||
"sha256-lW+E6THuXlTGvhly0f/D9NwYHhkiKHot2l+bz9Eaxp4=")
|
||||
(fetchDebianPatch
|
||||
# mbr.bin: too big (452 > 440)
|
||||
url = mkURL "012e1dd312eb" "0017-single-load-segment.patch";
|
||||
sha256 = "0azqzicsjw47b9ppyikhzaqmjl4lrvkxris1356bkmgcaiv6d98b";
|
||||
})
|
||||
(fetchurl {
|
||||
url = mkURL "26f0e7b2" "0018-prevent-pow-optimization.patch";
|
||||
sha256 = "1c8g0jz5yj9a0rsmryx9vdjsw4hw8mjfcg05c9pmyjg85w3dfp3m";
|
||||
})
|
||||
./gcc10.patch
|
||||
"0017-single-load-segment.patch"
|
||||
"012e1dd312eb"
|
||||
"sha256-C6VmdlTs1blMGUHH3OfOlFBZsfpwRn9vWodwqVn8+Cs=")
|
||||
(fetchDebianPatch
|
||||
"0018-prevent-pow-optimization.patch"
|
||||
"26f0e7b2"
|
||||
"sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -63,10 +80,20 @@ stdenv.mkDerivation {
|
|||
touch gnu-efi/inc/ia32/gnu/stubs-32.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ nasm perl python3 makeWrapper ];
|
||||
buildInputs = [ libuuid ];
|
||||
nativeBuildInputs = [
|
||||
nasm
|
||||
perl
|
||||
python3
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libuuid
|
||||
];
|
||||
|
||||
# Fails very rarely with 'No rule to make target: ...'
|
||||
enableParallelBuilding = false;
|
||||
|
||||
enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
|
||||
hardeningDisable = [ "pic" "stackprotector" "fortify" ];
|
||||
|
||||
stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ];
|
||||
|
|
@ -85,9 +112,10 @@ stdenv.mkDerivation {
|
|||
"PERL=perl"
|
||||
"HEXDATE=0x00000000"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ];
|
||||
++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ];
|
||||
|
||||
doCheck = false; # fails. some fail in a sandbox, others require qemu
|
||||
# Some tests require qemu, some others fail in a sandboxed environment
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/syslinux \
|
||||
|
|
@ -100,7 +128,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
homepage = "http://www.syslinux.org/";
|
||||
description = "A lightweight bootloader";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.samueldr ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.10.10";
|
||||
version = "0.10.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "kqI5zswQSjWlYwMVHCZSYr7OOHYXoWOYOPc9MuC0yw0=";
|
||||
sha256 = "Q69XltTdJgRLCwjt+oLSUWexO3MGd2HB11dN/edRGes=";
|
||||
};
|
||||
|
||||
cargoSha256 = "zpcfywc2TZQksLugb6fWTN+/wu3aq6AoaNnzc+3V78w=";
|
||||
cargoSha256 = "2nQE/5SPAaih4TunHgZHcYKPoAaA+4KDLxxcK0RLUgw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pathvector";
|
||||
version = "5.11.1";
|
||||
version = "5.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natesales";
|
||||
repo = "pathvector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OgIDk+05bG2KrBQOyyMPaH0OJXU3gLM9OBab9lI+yXw=";
|
||||
sha256 = "sha256-RdUZkkALEdyq+YKtgGE/P8eTX2v3fdYHF1wpZEyfkgY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0=";
|
||||
vendorSha256 = "sha256-oxLMfmHLaOQwpRYwnHRQY0mIV5/fZ65RDgKVs0Kzd2Q=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -33191,7 +33191,7 @@ with pkgs;
|
|||
|
||||
mcfm = callPackage ../applications/science/physics/MCFM {
|
||||
stdenv = gccStdenv;
|
||||
lhapdf = lhapdf.override { stdenv = gccStdenv; };
|
||||
lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; };
|
||||
};
|
||||
|
||||
nnpdf = callPackage ../applications/science/physics/nnpdf { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue