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

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2021-09-11 02:29:58 +02:00
parent 36ce45efae b72ad04a8a
commit bae10ead99
17 changed files with 78 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/boops/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "boops";
version = "1.6.4";
version = "1.8.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BOops";
rev = version;
sha256 = "sha256-rljUb0fj231MQh+7jTpjAsZm1QkNzfdSpcI1cS5fs/c=";
sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/audio/libopenmpt/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libopenmpt";
version = "0.5.10";
version = "0.5.11";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o=";
sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4";
};
enableParallelBuilding = true;

4
pkgs/applications/graphics/foxotron/default.nix
View file

@ -25,14 +25,14 @@
stdenv.mkDerivation rec {
pname = "foxotron";
version = "2021-04-19";
version = "2021-08-13";
src = fetchFromGitHub {
owner = "Gargaj";
repo = "Foxotron";
rev = version;
fetchSubmodules = true;
sha256 = "sha256-YTCnWHXBNqvJmhRqRQRFCVvBcqbjKzcc3AKVXS0jvno=";
sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w=";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper ];

13
pkgs/applications/graphics/megapixels/default.nix
View file

@ -4,6 +4,7 @@
, meson
, ninja
, pkg-config
, glib
, wrapGAppsHook
, epoxy
, gtk4
@ -35,7 +36,13 @@ stdenv.mkDerivation rec {
sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
nativeBuildInputs = [
meson
ninja
pkg-config
glib
wrapGAppsHook
];
buildInputs = [
epoxy
@ -43,6 +50,10 @@ stdenv.mkDerivation rec {
zbar
];
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';
preFixup = optionalString (tiffSupport || jpgSupport) ''
gappsWrapperArgs+=(
--prefix PATH : ${runtimePath}

9
pkgs/applications/science/astronomy/kstars/default.nix
View file

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
version = "3.5.3";
version = "3.5.4";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g=";
sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@ -33,6 +33,11 @@ mkDerivation rec {
cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver
];
# See https://bugs.kde.org/show_bug.cgi?id=439541
preConfigure = ''
rm po/de/docs/kstars/index.docbook
'';
cmakeFlags = [
"-DINDI_PREFIX=${indi-full}"
"-DXPLANET_PREFIX=${xplanet}"

11
pkgs/applications/science/misc/root/5.nix
View file

@ -47,6 +47,17 @@ stdenv.mkDerivation rec {
# disable dictionary generation for stuff that includes libc headers
# our glibc requires a modern compiler
./disable_libc_dicts_root5.patch
(fetchpatch {
name = "root5-gcc9-fix.patch";
url = "https://github.com/root-project/root/commit/348f30a6a3b5905ef734a7bd318bc0ee8bca6dc9.diff";
sha256 = "0dvrsrkpacyn5z87374swpy7aciv9a8s6m61b4iqd7a956r67rn3";
})
(fetchpatch {
name = "root5-gcc10-fix.patch";
url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff";
sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z";
})
];
preConfigure = ''

7
pkgs/applications/version-management/fossil/default.nix
View file

@ -15,12 +15,11 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.15.1";
version = "2.16";
src = fetchurl {
url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy";
};
nativeBuildInputs = [ installShellFiles tcl tcllib ];

1
pkgs/development/compilers/miranda/default.nix
View file

@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ siraben ];
platforms = platforms.all;
mainProgram = "mira";
};
}

20
pkgs/development/libraries/howard-hinnant-date/default.nix
View file

@ -1,20 +1,23 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }:
stdenv.mkDerivation rec {
pname = "howard-hinnant-date-unstable";
version = "2020-03-09";
pname = "howard-hinnant-date";
version = "3.0.1";
src = fetchFromGitHub {
owner = "HowardHinnant";
repo = "date";
rev = "4c1968b8f038483037cadfdbad3215ce21d934bb";
sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3";
rev = "v${version}";
sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35";
};
patches = [
# Add pkg-config file
# https://github.com/HowardHinnant/date/pull/538
(fetchpatch {
url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
name = "output-date-pc-for-pkg-config.patch";
url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
})
# Without this patch, this library will drop a `tzdata` directory into
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
@ -26,7 +29,6 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ];
buildInputs = [ curl ];
cmakeFlags = [
"-DBUILD_TZ_LIB=true"
@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
description = "A date and time library based on the C++11/14/17 <chrono> header";
homepage = "https://github.com/HowardHinnant/date";
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ r-burns ];
};
}

4
pkgs/development/libraries/libaom/default.nix
View file

@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
"-DCONFIG_RUNTIME_CPU_DETECT=0"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as"
] ++ lib.optionals stdenv.isAarch32 [
# armv7l-hf-multiplatform does not support NEON
# see lib/systems/platform.nix
"-DENABLE_NEON=0"
];
postFixup = ''

4
pkgs/development/libraries/science/astronomy/stellarsolver/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "stellarsolver";
version = "1.5";
version = "1.8";
src = fetchFromGitHub {
owner = "rlancaste";
repo = pname;
rev = version;
sha256 = "12j20j9qbkkx55ix4nm1iw7wd36hamkpidbwhcnmj4yk5fqlyq4y";
sha256 = "sha256-eC45V0aqFSUVJrxhaEXFzgzaXkHVwA5Yj8YyGvii0QI=";
};
nativeBuildInputs = [ cmake ];

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

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
, python3Packages
, enableDeserialize ? false
}:
assert interactive -> readline != null && ncurses != null;
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
NIX_CFLAGS_COMPILE = toString [
NIX_CFLAGS_COMPILE = toString ([
"-DSQLITE_ENABLE_COLUMN_METADATA"
"-DSQLITE_ENABLE_DBSTAT_VTAB"
"-DSQLITE_ENABLE_JSON1"
@ -48,7 +49,10 @@ stdenv.mkDerivation rec {
"-DSQLITE_SECURE_DELETE"
"-DSQLITE_MAX_VARIABLE_NUMBER=250000"
"-DSQLITE_MAX_EXPR_DEPTH=10000"
];
] ++ lib.optionals enableDeserialize [
# Can be removed in v3.36+, as this will become the default
"-DSQLITE_ENABLE_DESERIALIZE"
]);
# Test for features which may not be available at compile time
preBuild = ''

4
pkgs/development/python-modules/sphinx-inline-tabs/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "sphinx-inline-tabs";
version = "2021.04.11.beta9";
version = "2021.08.17.beta10";
format = "flit";
src = fetchFromGitHub {
owner = "pradyunsg";
repo = "sphinx-inline-tabs";
rev = version;
sha256 = "sha256-UYrLQAXPProjpGPQNkju6+DmzjPG+jbjdKveoeViVTY=";
sha256 = "sha256-T3OqK0eXNiBs2zQURCSPLc8aIyf2an32UyDh4qSmxQ4=";
};
propagatedBuildInputs = [

4
pkgs/servers/hylafaxplus/default.nix
View file

@ -30,8 +30,8 @@
let
pname = "hylafaxplus";
version = "7.0.3";
sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4";
version = "7.0.4";
sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5";
configSite = substituteAll {
name = "${pname}-config.site";

10
pkgs/servers/hylafaxplus/libtiff-4.patch
View file

@ -2,11 +2,11 @@ https://bugs.gentoo.org/706154
--- a/configure
+++ b/configure
@@ -2583,7 +2583,7 @@ EOF
echo '#define TIFFSTRIPBYTECOUNTS uint32'
echo '#define TIFFSTRIPBYTECOUNTS uint32_t'
echo '#define TIFFVERSION TIFF_VERSION'
echo '#define TIFFHEADER TIFFHeader';;
- 4.[01]) tiff_runlen_t="uint32"
+ 4.[0-9]) tiff_runlen_t="uint32"
tiff_offset_t="uint64"
echo '#define TIFFSTRIPBYTECOUNTS uint64'
- 4.[0123]) tiff_runlen_t="uint32_t"
+ 4.[0-9]) tiff_runlen_t="uint32_t"
tiff_offset_t="uint64_t"
echo '#define TIFFSTRIPBYTECOUNTS uint64_t'
echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'

4
pkgs/tools/misc/nncp/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "nncp";
version = "6.5.0";
version = "7.6.0";
src = fetchurl {
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
sha256 = "16hbcwwf65h2avgdyya2bk42bmmqnfl1m5v7y23cyp174ykjl794";
sha256 = "1im43d9z2pwylsgd6lyxxi03jvkfcfpdsmamg8cm8la1f202x180";
};
nativeBuildInputs = [ go redo-apenwarr ];

6
pkgs/top-level/all-packages.nix
View file

@ -23974,7 +23974,9 @@ with pkgs;
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
fossil = callPackage ../applications/version-management/fossil { };
fossil = callPackage ../applications/version-management/fossil {
sqlite = sqlite.override { enableDeserialize = true; };
};
freebayes = callPackage ../applications/science/biology/freebayes { };
@ -30838,7 +30840,7 @@ with pkgs;
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
});
rink = callPackage ../applications/science/misc/rink {