Merge pull request #127151 from NixOS/staging-next
This commit is contained in:
commit
40bb731ec7
|
@ -463,6 +463,12 @@ The prefix under which the package must be installed, passed via the `--prefix`
|
|||
|
||||
The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages.
|
||||
|
||||
##### `dontAddStaticConfigureFlags`
|
||||
|
||||
By default, when building statically, stdenv will try to add build system appropriate configure flags to try to enable static builds.
|
||||
|
||||
If this is undesirable, set this variable to true.
|
||||
|
||||
##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack}
|
||||
|
||||
By default, the flag `--disable-dependency-tracking` is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true.
|
||||
|
@ -475,7 +481,7 @@ By default, the configure phase applies some special hackery to all files called
|
|||
|
||||
By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags.
|
||||
|
||||
If this is undesirable, set this variable to true.
|
||||
If this is undesirable, set this variable to true. It is automatically set to true when building statically, for example through `pkgsStatic`.
|
||||
|
||||
##### `configurePlatforms` {#var-stdenv-configurePlatforms}
|
||||
|
||||
|
|
|
@ -96,5 +96,5 @@ in {
|
|||
|
||||
embedded = filterDoubles predicates.isNone;
|
||||
|
||||
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin"];
|
||||
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"];
|
||||
}
|
||||
|
|
|
@ -697,6 +697,7 @@
|
|||
./services/networking/gdomap.nix
|
||||
./services/networking/ghostunnel.nix
|
||||
./services/networking/git-daemon.nix
|
||||
./services/networking/globalprotect-vpn.nix
|
||||
./services/networking/gnunet.nix
|
||||
./services/networking/go-neb.nix
|
||||
./services/networking/go-shadowsocks2.nix
|
||||
|
|
|
@ -52,7 +52,7 @@ in {
|
|||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 6379;
|
||||
description = "The port for Redis to listen to.";
|
||||
};
|
||||
|
|
|
@ -42,7 +42,7 @@ in
|
|||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 7777;
|
||||
description = ''
|
||||
Specifies the port to listen on.
|
||||
|
@ -50,7 +50,7 @@ in
|
|||
};
|
||||
|
||||
maxPlayers = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.u8;
|
||||
default = 255;
|
||||
description = ''
|
||||
Sets the max number of players (between 1 and 255).
|
||||
|
|
|
@ -462,7 +462,7 @@ in {
|
|||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 8080;
|
||||
description = ''
|
||||
GitLab server port for copy-paste URLs, e.g. 80 or 443 if you're
|
||||
|
|
|
@ -238,7 +238,7 @@ in {
|
|||
type = types.listOf (types.submodule {
|
||||
options = {
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
example = 8448;
|
||||
description = ''
|
||||
The port to listen for HTTP(S) requests on.
|
||||
|
|
|
@ -67,7 +67,7 @@ in
|
|||
};
|
||||
|
||||
listen.port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 5000;
|
||||
description = ''
|
||||
Port on which the sync server listen to.
|
||||
|
|
|
@ -74,7 +74,7 @@ in
|
|||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 9418;
|
||||
description = "Port to listen on.";
|
||||
};
|
||||
|
|
43
nixos/modules/services/networking/globalprotect-vpn.nix
Normal file
43
nixos/modules/services/networking/globalprotect-vpn.nix
Normal file
|
@ -0,0 +1,43 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.globalprotect;
|
||||
|
||||
execStart = if cfg.csdWrapper == null then
|
||||
"${pkgs.globalprotect-openconnect}/bin/gpservice"
|
||||
else
|
||||
"${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}";
|
||||
in
|
||||
|
||||
{
|
||||
options.services.globalprotect = {
|
||||
enable = mkEnableOption "globalprotect";
|
||||
|
||||
csdWrapper = mkOption {
|
||||
description = ''
|
||||
A script that will produce a Host Integrity Protection (HIP) report,
|
||||
as described at <link xlink:href="https://www.infradead.org/openconnect/hip.html" />
|
||||
'';
|
||||
default = null;
|
||||
example = literalExample "\${pkgs.openconnect}/libexec/openconnect/hipreport.sh";
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
services.dbus.packages = [ pkgs.globalprotect-openconnect ];
|
||||
|
||||
systemd.services.gpservice = {
|
||||
description = "GlobalProtect openconnect DBus service";
|
||||
serviceConfig = {
|
||||
Type="dbus";
|
||||
BusName="com.yuezk.qt.GPService";
|
||||
ExecStart=execStart;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -110,7 +110,7 @@ in
|
|||
};
|
||||
|
||||
rpc.port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 18081;
|
||||
description = ''
|
||||
Port the RPC server will bind to.
|
||||
|
|
|
@ -356,7 +356,7 @@ in
|
|||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 25;
|
||||
description = ''
|
||||
The port of the SMTP server Discourse should use to
|
||||
|
|
|
@ -19,7 +19,7 @@ in {
|
|||
|
||||
port = mkOption {
|
||||
default = 80;
|
||||
type = ints.u16;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
Pass 0 to let the system choose any free port for you.
|
||||
|
|
|
@ -134,7 +134,7 @@ in
|
|||
|
||||
port = mkOption {
|
||||
default = 80;
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = ''
|
||||
TCP port number for lighttpd to bind to.
|
||||
'';
|
||||
|
|
|
@ -201,6 +201,7 @@ in
|
|||
jitsi-meet = handleTest ./jitsi-meet.nix {};
|
||||
k3s = handleTest ./k3s.nix {};
|
||||
kafka = handleTest ./kafka.nix {};
|
||||
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
|
||||
keepalived = handleTest ./keepalived.nix {};
|
||||
keepassxc = handleTest ./keepassxc.nix {};
|
||||
kerberos = handleTest ./kerberos/default.nix {};
|
||||
|
|
21
nixos/tests/kbd-setfont-decompress.nix
Normal file
21
nixos/tests/kbd-setfont-decompress.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
{
|
||||
name = "kbd-setfont-decompress";
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ oxalica ];
|
||||
|
||||
machine = { ... }: {};
|
||||
|
||||
testScript = ''
|
||||
machine.succeed("gzip -cd ${pkgs.terminus_font}/share/consolefonts/ter-v16b.psf.gz >font.psf")
|
||||
machine.succeed("gzip <font.psf >font.psf.gz")
|
||||
machine.succeed("bzip2 <font.psf >font.psf.bz2")
|
||||
machine.succeed("xz <font.psf >font.psf.xz")
|
||||
machine.succeed("zstd <font.psf >font.psf.zst")
|
||||
# setfont returns 0 even on error.
|
||||
assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.gz 2>&1") == ""
|
||||
assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.bz2 2>&1") == ""
|
||||
assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.xz 2>&1") == ""
|
||||
assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.zst 2>&1") == ""
|
||||
'';
|
||||
})
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }:
|
||||
{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cdparanoia-III-10.2";
|
||||
|
@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch
|
||||
++ [./fix_private_keyword.patch];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isAarch64 autoreconfHook;
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
Carbon
|
||||
IOKit
|
||||
|
@ -29,7 +27,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preConfigure = "unset CC" + lib.optionalString stdenv.isAarch64 '';
|
||||
preConfigure = ''
|
||||
unset CC
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isx86) ''
|
||||
cp ${gnu-config}/config.sub configure.sub
|
||||
cp ${gnu-config}/config.guess configure.guess
|
||||
'';
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jamulus";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jamulussoftware";
|
||||
repo = "jamulus";
|
||||
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM=";
|
||||
sha256 = "sha256-Ni6N7XW34OFNuEkqBEgMcYGmIqb+UZ0uhLt/shRkWRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libcdio-paranoia
|
||||
, cdrdao
|
||||
, libsndfile
|
||||
|
@ -22,6 +23,15 @@ in python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Use custom YAML subclass to be compatible with ruamel_yaml>=0.17
|
||||
# https://github.com/whipper-team/whipper/pull/543
|
||||
url = "https://github.com/whipper-team/whipper/commit/3ce5964dfe8be1e625c3e3b091360dd0bc34a384.patch";
|
||||
sha256 = "0n9dmib884y8syvypsg88j0h71iy42n1qsrh0am8pwna63sl15ah";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
docutils
|
||||
|
|
|
@ -18,13 +18,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.0.11-12";
|
||||
version = "7.1.0-0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY=";
|
||||
sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
|
||||
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
|
||||
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
|
||||
, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphicsmagick";
|
||||
|
@ -27,8 +27,14 @@ stdenv.mkDerivation rec {
|
|||
zlib libtool libwebp
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ xz ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
nativeBuildInputs = [ xz nukeReferences ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
# Remove CFLAGS from the binaries to avoid closure bloat.
|
||||
# In the past we have had -dev packages in the closure of the binaries soley due to the string references.
|
||||
postConfigure = ''
|
||||
nuke-refs ./magick/magick_config.h
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maestral-qt";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+eBwBZx+kp2ACbFjtYK6ux9lcPmEQsunvxAAZ2HgAYw=";
|
||||
sha256 = "sha256-4IrLwpdMepXBxjgR6euENuVKaPRU0dLiApJO45DB2C4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -45,6 +45,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://maestral.app";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
, enableLdap ? true, openldap
|
||||
, enableNetworkManager ? true, networkmanager
|
||||
, enableLibetpan ? true, libetpan
|
||||
, enableValgrind ? true, valgrind
|
||||
, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind
|
||||
, enableSvg ? true, librsvg
|
||||
|
||||
# Configure claws-mail's plugins
|
||||
|
|
|
@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport;
|
|||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.31.1";
|
||||
version = "2.32.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "10367n5sv4nsgaxy486pbp7nscx34vjk8vrb06jm9ffm8ix42qcz";
|
||||
sha256 = "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
|
@ -290,11 +290,13 @@ stdenv.mkDerivation {
|
|||
fi
|
||||
}
|
||||
|
||||
# Shared permissions are forbidden in sandbox builds.
|
||||
disable_test t0001-init shared
|
||||
# Shared permissions are forbidden in sandbox builds:
|
||||
substituteInPlace t/test-lib.sh \
|
||||
--replace "test_set_prereq POSIXPERM" ""
|
||||
# TODO: Investigate while these still fail (without POSIXPERM):
|
||||
disable_test t0001-init 'shared overrides system'
|
||||
disable_test t0001-init 'init honors global core.sharedRepository'
|
||||
disable_test t1301-shared-repo
|
||||
disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository'
|
||||
disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files'
|
||||
|
||||
# Our patched gettext never fallbacks
|
||||
disable_test t0201-gettext-fallbacks
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, scdoc
|
||||
, wayland, wayland-protocols, cairo, gdk-pixbuf
|
||||
, wayland-scanner
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||
buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
@ -20,15 +20,25 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then
|
|||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
setDynamicLinker=1
|
||||
|
||||
# Optionally filter out paths not refering to the store.
|
||||
expandResponseParams "$@"
|
||||
|
||||
# NIX_LINK_TYPE is set if ld has been called through our cc wrapper. We take
|
||||
# advantage of this to avoid both recalculating it, and also repeating other
|
||||
# processing cc wrapper has already done.
|
||||
if [[ -n "${NIX_LINK_TYPE_@suffixSalt@:-}" ]]; then
|
||||
linkType=$NIX_LINK_TYPE_@suffixSalt@
|
||||
else
|
||||
linkType=$(checkLinkType "$@")
|
||||
fi
|
||||
|
||||
if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
|
||||
&& ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ) ]]; then
|
||||
&& ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ) ]]; then
|
||||
rest=()
|
||||
nParams=${#params[@]}
|
||||
declare -i n=0
|
||||
|
||||
while (( "$n" < "$nParams" )); do
|
||||
p=${params[n]}
|
||||
p2=${params[n+1]:-} # handle `p` being last one
|
||||
|
@ -48,11 +58,6 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
|
|||
# Our ld is not built with sysroot support (Can we fix that?)
|
||||
:
|
||||
else
|
||||
if [[ "$p" = -static || "$p" = -static-pie ]]; then
|
||||
# Using a dynamic linker for static binaries can lead to crashes.
|
||||
# This was observed for rust binaries.
|
||||
setDynamicLinker=0
|
||||
fi
|
||||
rest+=("$p")
|
||||
fi
|
||||
n+=1
|
||||
|
@ -61,22 +66,24 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
|
|||
params=(${rest+"${rest[@]}"})
|
||||
fi
|
||||
|
||||
|
||||
source @out@/nix-support/add-hardening.sh
|
||||
|
||||
extraAfter=()
|
||||
extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"})
|
||||
|
||||
if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then
|
||||
extraAfter+=($NIX_LDFLAGS_@suffixSalt@)
|
||||
extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@)
|
||||
if [ -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ]; then
|
||||
extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@))
|
||||
extraBefore+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@))
|
||||
|
||||
# By adding dynamic linker to extraBefore we allow the users set their
|
||||
# own dynamic linker as NIX_LD_FLAGS will override earlier set flags
|
||||
if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then
|
||||
if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then
|
||||
extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@")
|
||||
fi
|
||||
fi
|
||||
|
||||
extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@)
|
||||
extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_AFTER_@suffixSalt@))
|
||||
|
||||
# These flags *must not* be pulled up to -Wl, flags, so they can't go in
|
||||
# add-flags.sh. They must always be set, so must not be disabled by
|
||||
|
@ -173,7 +180,7 @@ do
|
|||
prev="$p"
|
||||
done
|
||||
|
||||
if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then
|
||||
if [[ "$link32" == "1" && "$linkType" == dynamic && -e "@out@/nix-support/dynamic-linker-m32" ]]; then
|
||||
# We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's
|
||||
# use it.
|
||||
extraAfter+=(
|
||||
|
@ -183,7 +190,7 @@ if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynami
|
|||
fi
|
||||
|
||||
# Add all used dynamic libraries to the rpath.
|
||||
if [ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 ]; then
|
||||
if [[ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 && "$linkType" != static-pie ]]; then
|
||||
# For each directory in the library search path (-L...),
|
||||
# see if it contains a dynamic library used by a -l... flag. If
|
||||
# so, add the directory to the rpath.
|
||||
|
|
|
@ -29,9 +29,10 @@ cc1=0
|
|||
cxxInclude=1
|
||||
cxxLibrary=1
|
||||
cInclude=1
|
||||
setDynamicLinker=1
|
||||
|
||||
expandResponseParams "$@"
|
||||
linkType=$(checkLinkType "$@")
|
||||
|
||||
declare -i n=0
|
||||
nParams=${#params[@]}
|
||||
while (( "$n" < "$nParams" )); do
|
||||
|
@ -60,8 +61,6 @@ while (( "$n" < "$nParams" )); do
|
|||
cxxInclude=0
|
||||
elif [ "$p" = -nostdinc++ ]; then
|
||||
cxxInclude=0
|
||||
elif [[ "$p" = -static || "$p" = -static-pie ]]; then
|
||||
setDynamicLinker=0
|
||||
elif [[ "$p" != -?* ]]; then
|
||||
# A dash alone signifies standard input; it is not a flag
|
||||
nonFlagArgs=1
|
||||
|
@ -151,24 +150,24 @@ if [ "$dontLink" != 1 ]; then
|
|||
|
||||
# Add the flags that should only be passed to the compiler when
|
||||
# linking.
|
||||
extraAfter+=($NIX_CFLAGS_LINK_@suffixSalt@)
|
||||
extraAfter+=($(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@))
|
||||
|
||||
# Add the flags that should be passed to the linker (and prevent
|
||||
# `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again).
|
||||
for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do
|
||||
for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do
|
||||
extraBefore+=("-Wl,$i")
|
||||
done
|
||||
if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then
|
||||
if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then
|
||||
extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@")
|
||||
fi
|
||||
for i in $NIX_LDFLAGS_@suffixSalt@; do
|
||||
for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do
|
||||
if [ "${i:0:3}" = -L/ ]; then
|
||||
extraAfter+=("$i")
|
||||
else
|
||||
extraAfter+=("-Wl,$i")
|
||||
fi
|
||||
done
|
||||
export NIX_LDFLAGS_SET_@suffixSalt@=1
|
||||
export NIX_LINK_TYPE_@suffixSalt@=$linkType
|
||||
fi
|
||||
|
||||
# As a very special hack, if the arguments are just `-v', then don't
|
||||
|
|
|
@ -129,3 +129,38 @@ expandResponseParams() {
|
|||
fi
|
||||
done
|
||||
}
|
||||
|
||||
checkLinkType() {
|
||||
local arg mode
|
||||
type="dynamic"
|
||||
for arg in "$@"; do
|
||||
if [[ "$arg" = -static ]]; then
|
||||
type="static"
|
||||
elif [[ "$arg" = -static-pie ]]; then
|
||||
type="static-pie"
|
||||
fi
|
||||
done
|
||||
echo "$type"
|
||||
}
|
||||
|
||||
# When building static-pie executables we cannot have rpath
|
||||
# set. At least glibc requires rpath to be empty
|
||||
filterRpathFlags() {
|
||||
local linkType=$1 ret="" i
|
||||
shift
|
||||
|
||||
if [[ "$linkType" == "static-pie" ]]; then
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
i="$1"; shift 1
|
||||
if [[ "$i" == -rpath ]]; then
|
||||
# also skip its argument
|
||||
shift
|
||||
else
|
||||
ret+="$i "
|
||||
fi
|
||||
done
|
||||
else
|
||||
ret=$@
|
||||
fi
|
||||
echo $ret
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
version = "3.63";
|
||||
version = "3.66";
|
||||
|
||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
||||
in
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
|
||||
sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q";
|
||||
sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9";
|
||||
};
|
||||
|
||||
certdata2pem = fetchurl {
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gettext
|
||||
, perlPackages
|
||||
, itstool
|
||||
, libxml2
|
||||
, glib
|
||||
|
@ -10,31 +13,47 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shared-mime-info";
|
||||
version = "1.13.1";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/xdg/${pname}/uploads/5349e18c86eb96eee258a5c1f19122d0/${pname}-${version}.tar.xz";
|
||||
sha256 = "1bic8z5nz08qxv1x6zlxnx2j4cmlzm12kygrn3rrh1djqxdhma3f";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "xdg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07bxv44p43pqq4ymfnyy50yli7lwdqymhvclna42rkn1cazq3vb5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# xmlto is only used for building the docs, which are not installed anyways.
|
||||
(fetchpatch {
|
||||
name = "xmlto-optional.patch";
|
||||
url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/110.patch";
|
||||
sha256 = "0p5gxlcmn8ji5bc7pd105s1halqwa1d28lfx9yj43rn6mav7allx";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
itstool
|
||||
] ++ (with perlPackages; [
|
||||
perl XMLParser
|
||||
]);
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
glib
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dupdate-mimedb=true"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A database of common MIME types";
|
||||
homepage = "http://freedesktop.org/wiki/Software/shared-mime-info";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.mimame ];
|
||||
maintainers = teams.freedesktop.members ++ [ maintainers.mimame ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tzdata";
|
||||
version = "2020f";
|
||||
version = "2021a";
|
||||
|
||||
srcs =
|
||||
[ (fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
|
||||
sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j";
|
||||
sha256 = "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
|
||||
sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng";
|
||||
sha256 = "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb";
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -68,6 +68,10 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.iana.org/time-zones";
|
||||
description = "Database of current and historical time zones";
|
||||
changelog = "https://github.com/eggert/tz/blob/${version}/NEWS";
|
||||
license = with licenses; [
|
||||
bsd3 # tzcode
|
||||
publicDomain # tzdata
|
||||
];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
|
|
|
@ -125,6 +125,9 @@ stdenv.mkDerivation (rec {
|
|||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
# Fix documentation configuration which causes a syntax error with sphinx 4.*
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6.
|
||||
./sphinx-4-configuration.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
|
|
|
@ -134,6 +134,9 @@ stdenv.mkDerivation (rec {
|
|||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
# Fix documentation configuration which causes a syntax error with sphinx 4.*
|
||||
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962
|
||||
./sphinx-4-configuration.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
11
pkgs/development/compilers/ghc/sphinx-4-configuration.patch
Normal file
11
pkgs/development/compilers/ghc/sphinx-4-configuration.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200
|
||||
+++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200
|
||||
@@ -100,7 +100,7 @@
|
||||
latex_elements = {
|
||||
'inputenc': '',
|
||||
'utf8extra': '',
|
||||
- 'preamble': '''
|
||||
+ 'preamble': r'''
|
||||
\usepackage{fontspec}
|
||||
\usepackage{makeidx}
|
||||
\setsansfont{DejaVu Sans}
|
|
@ -8,10 +8,12 @@ rec {
|
|||
};
|
||||
|
||||
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
|
||||
git = buildPackages.gitMinimal;
|
||||
inherit cargo;
|
||||
};
|
||||
|
||||
buildRustPackage = callPackage ../../../build-support/rust {
|
||||
git = buildPackages.gitMinimal;
|
||||
inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||
fetchCargoTarball importCargoLock rustc;
|
||||
};
|
||||
|
|
|
@ -28,7 +28,7 @@ let
|
|||
, embedSupport ? false
|
||||
, ipv6Support ? true
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
, valgrindSupport ? !stdenv.isDarwin
|
||||
, valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
|
||||
, ztsSupport ? apxs2Support
|
||||
}@args:
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
let
|
||||
computeUrl = {format ? "setuptools", ... } @attrs: let
|
||||
computeWheelUrl = {pname, version, python ? "py2.py3", abi ? "none", platform ? "any"}:
|
||||
computeWheelUrl = {pname, version, dist ? "py2.py3", python ? "py2.py3", abi ? "none", platform ? "any"}:
|
||||
# Fetch a wheel. By default we fetch an universal wheel.
|
||||
# See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
|
||||
"https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
|
||||
"https://files.pythonhosted.org/packages/${dist}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
|
||||
|
||||
computeSourceUrl = {pname, version, extension ? "tar.gz"}:
|
||||
# Fetch a source tarball.
|
||||
|
|
|
@ -5,6 +5,7 @@ pythonRemoveTestsDir() {
|
|||
echo "Executing pythonRemoveTestsDir"
|
||||
|
||||
rm -rf $out/@pythonSitePackages@/tests
|
||||
rm -rf $out/@pythonSitePackages@/test
|
||||
|
||||
echo "Finished executing pythonRemoveTestsDir"
|
||||
}
|
||||
|
@ -12,4 +13,3 @@ pythonRemoveTestsDir() {
|
|||
if [ -z "${dontUsePythonRemoveTestsDir-}" ]; then
|
||||
postFixupHooks+=(pythonRemoveTestsDir)
|
||||
fi
|
||||
|
||||
|
|
|
@ -217,8 +217,15 @@ def _get_latest_version_github(package, extension, current_version, target):
|
|||
|
||||
release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases))
|
||||
prefix = get_prefix(release['tag_name'])
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\
|
||||
.decode('utf-8').strip()
|
||||
try:
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\
|
||||
.decode('utf-8').strip()
|
||||
except:
|
||||
# this may fail if they have both a branch and a tag of the same name, attempt tag name
|
||||
tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags")
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\
|
||||
.decode('utf-8').strip()
|
||||
|
||||
|
||||
return version, sha256, prefix
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoconf213
|
||||
, pkg-config
|
||||
, perl
|
||||
|
@ -20,13 +21,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "78.8.0";
|
||||
version = "78.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw";
|
||||
sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build failure on armv7l using Debian patch
|
||||
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch";
|
||||
sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
# files.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "acl-2.3.0";
|
||||
name = "acl-2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/acl/${name}.tar.gz";
|
||||
sha256 = "sha256-vTj9u7A8eTdK9RRn6+VJfLwDNbgld/MMlRpBqVtTMAk=";
|
||||
sha256 = "sha256-dgxhxokBs3/dXu/ur0wMeia9/disdHoe3/HODiQ8Ea8=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||
|
|
|
@ -5,14 +5,13 @@
|
|||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let
|
||||
version = "2.2.10";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "expat-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "expat";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz";
|
||||
sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI=";
|
||||
url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-zwMtDbqbkoY2VI4ysyei1msaq2PE9KE90TLC0dLy+2o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ]; # TODO: fix referrers
|
||||
|
@ -25,12 +24,11 @@ in stdenv.mkDerivation rec {
|
|||
doCheck = true; # not cross;
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs ./run.sh
|
||||
patchShebangs ./test-driver-wrapper.sh
|
||||
patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.libexpat.org/";
|
||||
homepage = "https://libexpat.github.io/";
|
||||
description = "A stream-oriented XML parser library written in C";
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit; # expat version
|
||||
|
|
|
@ -22,11 +22,16 @@
|
|||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
withGtkDoc = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdk-pixbuf";
|
||||
version = "2.42.6";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
|
||||
outputs = [ "out" "dev" "man" ]
|
||||
++ lib.optional withGtkDoc "devdoc"
|
||||
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
|
@ -63,8 +68,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}"
|
||||
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
|
||||
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
|
||||
"-Dgio_sniffing=false"
|
||||
];
|
||||
|
||||
|
@ -85,9 +90,6 @@ stdenv.mkDerivation rec {
|
|||
moveToOutput "bin" "$dev"
|
||||
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
|
||||
|
||||
# So that devhelp can find this.
|
||||
mkdir -p "$devdoc/share/devhelp"
|
||||
mv "$out/share/doc" "$devdoc/share/devhelp/books"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# meson erroneously installs loaders with .dylib extension on Darwin.
|
||||
# Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
|
||||
|
@ -98,6 +100,10 @@ stdenv.mkDerivation rec {
|
|||
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
# We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
|
||||
$dev/bin/gdk-pixbuf-query-loaders --update-cache
|
||||
'' + lib.optionalString withGtkDoc ''
|
||||
# So that devhelp can find this.
|
||||
mkdir -p "$devdoc/share/devhelp"
|
||||
mv "$out/share/doc" "$devdoc/share/devhelp/books"
|
||||
'';
|
||||
|
||||
# The fixDarwinDylibNames hook doesn't patch binaries.
|
||||
|
|
Binary file not shown.
|
@ -42,7 +42,7 @@
|
|||
|
||||
let
|
||||
version = "2.32";
|
||||
patchSuffix = "-46";
|
||||
patchSuffix = "-48";
|
||||
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
|
||||
in
|
||||
|
||||
|
@ -61,7 +61,7 @@ stdenv.mkDerivation ({
|
|||
[
|
||||
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
|
||||
$ git fetch --all -p && git checkout origin/release/2.32/master && git describe
|
||||
glibc-2.32-46-g1799ac8eab
|
||||
glibc-2.32-48-g16949aeaa0
|
||||
$ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz
|
||||
|
||||
To compare the archive contents zdiff can be used.
|
||||
|
@ -153,6 +153,8 @@ stdenv.mkDerivation ({
|
|||
"--enable-add-ons"
|
||||
"--sysconfdir=/etc"
|
||||
"--enable-stackguard-randomization"
|
||||
"--enable-static-pie"
|
||||
"--enable-bind-now"
|
||||
(lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
|
||||
(lib.enableFeature profilingLibraries "profile")
|
||||
] ++ lib.optionals withLinuxHeaders [
|
||||
|
|
|
@ -8,23 +8,22 @@
|
|||
|
||||
assert guileBindings -> guile != null;
|
||||
let
|
||||
version = "3.7.1";
|
||||
|
||||
# XXX: Gnulib's `test-select' fails on FreeBSD:
|
||||
# https://hydra.nixos.org/build/2962084/nixlog/1/raw .
|
||||
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"
|
||||
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin
|
||||
&& stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
|
||||
inherit (stdenv.hostPlatform) isDarwin;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnutls-${version}";
|
||||
inherit version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnutls";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz";
|
||||
sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp";
|
||||
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
|
||||
sha256 = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
|
@ -42,7 +41,7 @@ stdenv.mkDerivation {
|
|||
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11)
|
||||
# - psk-file: no idea; it broke between 3.6.3 and 3.6.4
|
||||
# Change p11-kit test to use pkg-config to find p11-kit
|
||||
postPatch = lib.optionalString (lib.versionAtLeast version "3.6") ''
|
||||
postPatch = ''
|
||||
sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
|
||||
sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
|
||||
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
|
||||
|
|
|
@ -1,45 +0,0 @@
|
|||
>From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 27 Aug 2020 17:52:58 -0700
|
||||
Subject: [PATCH] perror, strerror_r: remove unportable tests
|
||||
|
||||
Problem reported by Florian Weimer in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
|
||||
* tests/test-perror2.c (main):
|
||||
* tests/test-strerror_r.c (main): Omit unportable tests.
|
||||
---
|
||||
tests/test-perror2.c | 3 ---
|
||||
tests/test-strerror_r.c | 3 ---
|
||||
2 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/gl/tests/test-perror2.c b/gl/tests/test-perror2.c
|
||||
index 1d14eda7b..c6214dd25 100644
|
||||
--- a/gl/tests/test-perror2.c
|
||||
+++ b/gl/tests/test-perror2.c
|
||||
@@ -79,9 +79,6 @@ main (void)
|
||||
errno = -5;
|
||||
perror ("");
|
||||
ASSERT (!ferror (stderr));
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
diff --git a/gl/tests/test-strerror_r.c b/gl/tests/test-strerror_r.c
|
||||
index b11d6fd9f..c1dbcf837 100644
|
||||
--- a/gl/tests/test-strerror_r.c
|
||||
+++ b/gl/tests/test-strerror_r.c
|
||||
@@ -165,9 +165,6 @@ main (void)
|
||||
|
||||
strerror_r (EACCES, buf, sizeof buf);
|
||||
strerror_r (-5, buf, sizeof buf);
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
--
|
||||
2.17.1
|
||||
|
|
@ -1,30 +1,44 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl
|
||||
, meson, ninja
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, glib
|
||||
, freetype
|
||||
, fontconfig
|
||||
, libintl
|
||||
, meson
|
||||
, ninja
|
||||
, gobject-introspection
|
||||
, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||
, ApplicationServices, CoreText
|
||||
, icu
|
||||
, graphite2
|
||||
, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||
, ApplicationServices
|
||||
, CoreText
|
||||
, withCoreText ? false
|
||||
, withIcu ? false # recommended by upstream as default, but most don't needed and it's big
|
||||
, withGraphite2 ? true # it is small and major distros do include it
|
||||
, python3
|
||||
, gtk-doc, docbook-xsl-nons, docbook_xml_dtd_43
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
inherit (lib) optional optionals optionalString;
|
||||
mesonFeatureFlag = opt: b:
|
||||
"-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
isNativeCompilation = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harfbuzz";
|
||||
repo = "harfbuzz";
|
||||
rev = version;
|
||||
sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4=";
|
||||
owner = "harfbuzz";
|
||||
repo = "harfbuzz";
|
||||
rev = version;
|
||||
sha256 = "107l9jhvwy6pnq5032kr7r21md65qg09j7iikr4jihf9pvh7gn5w";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -40,9 +54,17 @@ stdenv.mkDerivation {
|
|||
outputBin = "dev";
|
||||
|
||||
mesonFlags = [
|
||||
# upstream recommends cairo, but it is only used for development purposes
|
||||
# and is not part of the library.
|
||||
# Cairo causes transitive (build) dependencies on various X11 or other
|
||||
# GUI-related libraries, so it shouldn't be re-added lightly.
|
||||
(mesonFeatureFlag "cairo" false)
|
||||
# chafa is only used in a development utility, not in the library
|
||||
(mesonFeatureFlag "chafa" false)
|
||||
(mesonFeatureFlag "coretext" withCoreText)
|
||||
(mesonFeatureFlag "graphite" withGraphite2)
|
||||
(mesonFeatureFlag "icu" withIcu)
|
||||
(mesonFeatureFlag "coretext" withCoreText)
|
||||
(mesonFeatureFlag "introspection" isNativeCompilation)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -57,11 +79,11 @@ stdenv.mkDerivation {
|
|||
docbook_xml_dtd_43
|
||||
];
|
||||
|
||||
buildInputs = [ glib freetype cairo ] # recommended by upstream
|
||||
++ lib.optionals withCoreText [ ApplicationServices CoreText ];
|
||||
buildInputs = [ glib freetype ]
|
||||
++ lib.optionals withCoreText [ ApplicationServices CoreText ]
|
||||
++ lib.optionals isNativeCompilation [ gobject-introspection ];
|
||||
|
||||
propagatedBuildInputs = []
|
||||
++ optional withGraphite2 graphite2
|
||||
propagatedBuildInputs = optional withGraphite2 graphite2
|
||||
++ optionals withIcu [ icu harfbuzz ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libaom";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
|
||||
sha256 = "1v3i34jmbz1p3x8msj3vx46nl6jdzxbkr2lfbh06vard8adb16il";
|
||||
sha256 = "11fy2xw35ladkjcz71samhcpqlqr3y0n1n17nk90i13aydrll66f";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, yasm
|
||||
, freetype, fribidi, harfbuzz
|
||||
, encaSupport ? true, enca ? null # enca support
|
||||
, fontconfigSupport ? true, fontconfig ? null # fontconfig support
|
||||
, rasterizerSupport ? false # Internal rasterizer
|
||||
, largeTilesSupport ? false # Use larger tiles in the rasterizer
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
assert encaSupport -> enca != null;
|
||||
assert fontconfigSupport -> fontconfig != null;
|
||||
|
||||
let
|
||||
|
@ -25,7 +23,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
configureFlags = [
|
||||
(mkFlag encaSupport "enca")
|
||||
(mkFlag fontconfigSupport "fontconfig")
|
||||
(mkFlag rasterizerSupport "rasterizer")
|
||||
(mkFlag largeTilesSupport "large-tiles")
|
||||
|
@ -34,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config yasm ];
|
||||
|
||||
buildInputs = [ freetype fribidi harfbuzz ]
|
||||
++ optional encaSupport enca
|
||||
++ optional fontconfigSupport fontconfig
|
||||
++ optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libedit";
|
||||
version = "20210216-3.1";
|
||||
version = "20210522-3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o=";
|
||||
sha256 = "sha256-AiC8IEfpJ8DBmE7197TrKpRppbe/ErpXPKOyPKAru28=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -1,24 +1,20 @@
|
|||
{ fetchurl, lib, stdenv, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libidn-1.36";
|
||||
pname = "libidn";
|
||||
version = "1.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libidn/${name}.tar.gz";
|
||||
sha256 = "0f20n634whpmdwr81c2r0vxxjwchgkvhsr1i8s2bm0ad6h473dhl";
|
||||
url = "mirror://gnu/libidn/${pname}-${version}.tar.gz";
|
||||
sha256 = "1hljls9rkilh04dwiwg388wk8djkac8idijrdysqq2nqbh6rg3iw";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
|
||||
|
||||
# broken with gcc-7
|
||||
#doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/libidn/";
|
||||
description = "Library for internationalized domain names";
|
||||
|
@ -42,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
repositories.git = "git://git.savannah.gnu.org/libidn.git";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ lsix ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libimagequant";
|
||||
version = "2.14.1";
|
||||
version = "2.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o=";
|
||||
sha256 = "sha256-ElMwLeUdrJeJJ9YoieCF/CUNcNMwj5WcjXmMW/nMyAw=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libmnl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.9";
|
||||
version = "1.2.0";
|
||||
pname = "libnftnl";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
|
||||
sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9";
|
||||
sha256 = "1xblq1cbcxhr6qmjpy98i1qdza148idgz99vbhjc7s4vzvfizc4h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -4,11 +4,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpcap";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-jRK0JiPu7+6HLxI70NyF1TWwDfTULoZfmTxA97/JKx4=";
|
||||
sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ]
|
||||
|
|
|
@ -14,7 +14,9 @@
|
|||
, publicsuffix-list
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libpsl";
|
||||
version = "0.21.0";
|
||||
|
||||
|
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
libxslt
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals enableValgrindTests [
|
||||
valgrind
|
||||
];
|
||||
|
||||
|
@ -60,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
|
||||
"--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
|
||||
"--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals enableValgrindTests [
|
||||
"--enable-valgrind-tests"
|
||||
];
|
||||
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librsvg";
|
||||
version = "2.50.5";
|
||||
version = "2.50.6";
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j";
|
||||
sha256 = "iAdJGZOoevVgxdP1I7jUpLugxQilYPH5NxdytRR3rFc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, perl, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtasn1-4.16.0";
|
||||
name = "libtasn1-4.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libtasn1/${name}.tar.gz";
|
||||
sha256 = "179jskl7dmfp1rd2khkzmlibzgki4wi6hvmmwfv7q49r728b03qf";
|
||||
sha256 = "sha256-7OdVHOp5IrjhDX68cLwiSNH91zNRZGotao1oqUIcRaU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "libva";
|
||||
rev = version;
|
||||
sha256 = "0qk30p53mnwiqh2x68vyif11vg3gyjvw8v4qihg099m41qb44hws";
|
||||
sha256 = "1zfv4kjx0715sy62lkpv0s31f9xwy232z5zwqi5all4w1jr630i7";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libva-utils";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "libva-utils";
|
||||
rev = version;
|
||||
sha256 = "1arp5r0csahjbbsmdmf0dzpgwcpps9s2hlh68lgg6n5n85zkd4b5";
|
||||
sha256 = "1a4d75gc7rcfwpsh7fn8mygvi4w0jym4szdhw6jpfywvll37lffi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
, vulkanDrivers ? ["auto"]
|
||||
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
|
||||
, OpenGL, Xplugin
|
||||
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
|
||||
, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light
|
||||
, enableGalliumNine ? stdenv.isLinux
|
||||
, enableOSMesa ? stdenv.isLinux
|
||||
}:
|
||||
|
@ -31,7 +31,7 @@ with lib;
|
|||
let
|
||||
# Release calendar: https://www.mesa3d.org/release-calendar.html
|
||||
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
|
||||
version = "21.1.2";
|
||||
version = "21.1.3";
|
||||
branch = versions.major version;
|
||||
|
||||
self = stdenv.mkDerivation {
|
||||
|
@ -45,7 +45,7 @@ self = stdenv.mkDerivation {
|
|||
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13";
|
||||
sha256 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
@ -64,6 +64,12 @@ self = stdenv.mkDerivation {
|
|||
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
|
||||
sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
|
||||
})
|
||||
# For RISC-V support:
|
||||
(fetchpatch {
|
||||
name = "add-riscv-default-selections.patch";
|
||||
url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch";
|
||||
sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w";
|
||||
})
|
||||
] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
# Fix aarch64-darwin build, remove when upstreaam supports it out of the box.
|
||||
# See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
|
||||
sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald";
|
||||
sha256 = "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,15 +2,13 @@
|
|||
, CoreServices ? null
|
||||
, buildPackages }:
|
||||
|
||||
let version = "4.30"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nspr";
|
||||
inherit version;
|
||||
version = "4.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
|
||||
sha256 = "0fwivizfz88625lwv1ngxirnal7w9csq1q9i7m6dr14l83wdhk4d";
|
||||
sha256 = "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -18,7 +18,7 @@ let
|
|||
# It will rebuild itself using the version of this package (NSS) and if
|
||||
# an update is required do the required changes to the expression.
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
version = "3.64";
|
||||
version = "3.67";
|
||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "09hivz4qf3dw7m21lshw34l0yncinwn4ax5w3rpkm71f2wkm85yk";
|
||||
sha256 = "0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
@ -106,7 +106,7 @@ in stdenv.mkDerivation rec {
|
|||
runHook postBuild
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -96,6 +96,8 @@ let
|
|||
throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}"
|
||||
);
|
||||
|
||||
# OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
|
||||
dontAddStaticConfigureFlags = true;
|
||||
configureFlags = [
|
||||
"shared" # "shared" builds both shared and static libraries
|
||||
"--libdir=lib"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "popt";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz";
|
||||
url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz";
|
||||
sha256 = "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai";
|
||||
};
|
||||
|
||||
|
@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
|
|||
doCheck = false; # fails
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rpm-software-management/popt";
|
||||
description = "Command line option parsing library";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, perl, which
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which
|
||||
# Most packages depending on openblas expect integer width to match
|
||||
# pointer width, but some expect to use 32-bit integers always
|
||||
# (for compatibility with reference BLAS).
|
||||
|
@ -17,6 +17,10 @@
|
|||
, target ? null
|
||||
# Select whether DYNAMIC_ARCH is enabled or not.
|
||||
, dynamicArch ? null
|
||||
# enable AVX512 optimized kernels.
|
||||
# These kernels have been a source of trouble in the past.
|
||||
# Use with caution.
|
||||
, enableAVX512 ? false
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
@ -71,6 +75,7 @@ let
|
|||
BINARY = 64;
|
||||
TARGET = setTarget "ATHLON";
|
||||
DYNAMIC_ARCH = setDynamicArch true;
|
||||
NO_AVX512 = !enableAVX512;
|
||||
USE_OPENMP = false;
|
||||
MACOSX_DEPLOYMENT_TARGET = "10.7";
|
||||
};
|
||||
|
@ -79,6 +84,7 @@ let
|
|||
BINARY = 64;
|
||||
TARGET = setTarget "ATHLON";
|
||||
DYNAMIC_ARCH = setDynamicArch true;
|
||||
NO_AVX512 = !enableAVX512;
|
||||
USE_OPENMP = !stdenv.hostPlatform.isMusl;
|
||||
};
|
||||
|
||||
|
@ -88,6 +94,13 @@ let
|
|||
DYNAMIC_ARCH = setDynamicArch true;
|
||||
USE_OPENMP = !stdenv.hostPlatform.isMusl;
|
||||
};
|
||||
|
||||
riscv64-linux = {
|
||||
BINARY = 64;
|
||||
TARGET = setTarget "RISCV64_GENERIC";
|
||||
DYNAMIC_ARCH = setDynamicArch false;
|
||||
USE_OPENMP = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -127,6 +140,20 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w";
|
||||
};
|
||||
|
||||
# remove both patches when updating to 0.3.16
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "riscv64-imin-fix-wrong-comparison.patch";
|
||||
url = "https://github.com/xianyi/OpenBLAS/commit/1e0192a5ccac28fc0c749f49d36ec7eda9757428.patch";
|
||||
sha256 = "0kjkmrj8023vcjxhgin5dqs5w3gf93hzhwdhg0vsjhdra2ghkwzj";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "riscv64-generic-use-generic-kernel-for-dsdot.patch";
|
||||
url = "https://github.com/xianyi/OpenBLAS/commit/3521cd48cbfb3d50f6ae9a10377382d37075c696.patch";
|
||||
sha256 = "0ljwbldff4db377s8rzmqxrszilqdivy656yqvfq46x5338v3gi0";
|
||||
})
|
||||
];
|
||||
|
||||
inherit blas64;
|
||||
|
||||
# Some hardening features are disabled due to sporadic failures in
|
||||
|
|
|
@ -12,12 +12,12 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlite";
|
||||
version = "3.35.2";
|
||||
version = "3.35.5";
|
||||
|
||||
# NB! Make sure to update ./tools.nix src (in the same directory).
|
||||
src = fetchurl {
|
||||
url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz";
|
||||
sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j";
|
||||
sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];
|
||||
|
||||
# required for aarch64 but applied for all arches for simplicity
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
|
|
|
@ -4,11 +4,11 @@ let
|
|||
archiveVersion = import ./archive-version.nix lib;
|
||||
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "3.35.2";
|
||||
version = "3.35.5";
|
||||
|
||||
src = assert version == sqlite.version; fetchurl {
|
||||
url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip";
|
||||
sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva";
|
||||
sha256 = "049vdpk50sba786345ibmlxnkzk5zp4xj859658ancswb6jyrgpl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
|
||||
};
|
||||
|
||||
patches = [ ./enable-riscv.patch ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
|
||||
|
||||
patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h
|
||||
index d875490..ce1f3e8 100644
|
||||
--- a/webrtc/typedefs.h
|
||||
+++ b/webrtc/typedefs.h
|
||||
@@ -26,6 +26,13 @@
|
||||
#elif defined(__aarch64__)
|
||||
#define WEBRTC_ARCH_64_BITS
|
||||
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||
+#elif defined(__riscv) || defined(__riscv__)
|
||||
+#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||
+#if __riscv_xlen == 64
|
||||
+#define WEBRTC_ARCH_64_BITS
|
||||
+#else
|
||||
+#define WEBRTC_ARCH_32_BITS
|
||||
+#endif
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#define WEBRTC_ARCH_X86_FAMILY
|
||||
#define WEBRTC_ARCH_X86
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Babel";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys";
|
||||
sha256 = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytz ];
|
||||
|
|
|
@ -6,16 +6,18 @@
|
|||
, git
|
||||
, gitdb
|
||||
, ddt
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "GitPython";
|
||||
version = "3.1.14";
|
||||
version = "3.1.18";
|
||||
disabled = isPy27; # no longer supported
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61";
|
||||
sha256 = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -25,7 +27,12 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gitdb ddt ];
|
||||
propagatedBuildInputs = [
|
||||
gitdb
|
||||
ddt
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Tests require a git repo
|
||||
doCheck = false;
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "JPype1";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f210646127d24be73cfc6d807e2cda1c6b2ab39b7a293008e8b46367af6f2204";
|
||||
sha256 = "4fc27dba89750cb0c9d692466341ce60c0fe86a16051091cb5347a37cf884151";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Pygments";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6";
|
||||
sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils ];
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "absl-py";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b44f68984a5ceb2607d135a615999b93924c771238a63920d17d3387b0d229d5";
|
||||
sha256 = "6953272383486044699fd0e9f00aad167a27e08ce19aae66c6c4b10e7e767793";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adal";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "08b94d30676ceb78df31bce9dd0f05f1bc2b6172e44c437cbf5b968a00ac6489";
|
||||
sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests pyjwt dateutil ];
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-geojson-client";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-geojson-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8";
|
||||
sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-geojson-geonetnz-volcano";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-geojson-geonetnz-volcano";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn";
|
||||
sha256 = "0n97kij2fprzajh57sy1z57kaqiil7pd5y67lq2hqm2cnvkar5ci";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-client";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nhw2sf92dbizxdcil1wdmbaa3hbmsiriy8jfzpqxsliw5dc0kmh";
|
||||
sha256 = "0447scp5n906p8kfzy0lwdq06f6hkq71r2zala6g3vr6b3kla6h8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobotocore";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1";
|
||||
sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1";
|
||||
};
|
||||
|
||||
# relax version constraints: aiobotocore works with newer botocore versions
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1j25i7vh4fg56rzhzxlaj4ys1rvswld15ia44mwwzxfggw8w3rbk";
|
||||
sha256 = "11259cd1f115d31b91512a209779fa813dded747408100805bc8ecf7c1c1fa82";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs protobuf zeroconf ];
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiofiles";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092";
|
||||
sha256 = "a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.3";
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
, freezegun
|
||||
, gunicorn
|
||||
, pytest-mock
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, re-assert
|
||||
, trustme
|
||||
|
@ -52,16 +51,11 @@ buildPythonPackage rec {
|
|||
freezegun
|
||||
gunicorn
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
trustme
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-n auto"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable tests that require network access
|
||||
"test_mark_formdata_as_processed"
|
||||
|
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y";
|
||||
sha256 = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, backports-zoneinfo
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, holidays
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
|
@ -14,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvpc";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
|
@ -22,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "azogue";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr";
|
||||
sha256 = "1hk3giwzzlcqnpw9kx3zrr808nmdb7qwac60fki5395qffd2fpqw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
backports-zoneinfo
|
||||
holidays
|
||||
tzdata
|
||||
async-timeout
|
||||
];
|
||||
|
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1b5bqpl8wbs0nm6025wlz4n5sns6ca1x6kgw9wx227flwf3qjlgm";
|
||||
sha256 = "f5518987e3d41d213a4ffc4dd38362465b5d2cf99417014cb5402f8ee8c5abac";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostream";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ss41hzvlnyll5xc5ddxqyqqw4gnd67yyhci25xnb1vpcz0jqsq8";
|
||||
sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
|
||||
|
|
|
@ -2,19 +2,22 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, winacl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowinreg";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "956278a90ef6958f9e2392891b2a305273f695b15b14489cd2097197d6cbe155";
|
||||
sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ winacl ];
|
||||
|
||||
# Project doesn't have tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "aiowinreg" ];
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "alembic";
|
||||
version = "1.5.8";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56";
|
||||
sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest pytestcov mock coverage ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amazon_kclpy";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "amazon-kinesis-client-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "13iq217fg0bxafp2rl684pg1rz4jbwid8cc8ip4rim07kzn65lbg";
|
||||
sha256 = "12yxcwml6g86sv1pj3wc2k97md9szdj6xx07qwri1mr9bdkzw7rv";
|
||||
};
|
||||
|
||||
# argparse is just required for python2.6
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ambee";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-ambee";
|
||||
rev = "v${version}";
|
||||
sha256 = "11liw2206lyrnx09giqapjpi25lr2qnbmigi6rgynr2a1i9vxy1s";
|
||||
sha256 = "0vivzpfsmb4gy7k5wlbk5ylkpqy4jhki9lbgxyrrqj5yhhzz6cwy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amqp";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "affdd263d8b8eb3c98170b78bf83867cdb6a14901d586e00ddb65bfe2f0c4e60";
|
||||
sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ vine ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansicolor";
|
||||
version = "0.2.6";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d";
|
||||
sha256 = "3b840a6b1184b5f1568635b1adab28147947522707d41ceba02d5ed0a0877279";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, idna
|
||||
, sniffio
|
||||
, typing-extensions
|
||||
|
@ -18,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anyio";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -29,6 +30,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
idna
|
||||
sniffio
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "4.4.1";
|
||||
version = "4.6.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qt7UrkUXUsWLcOV5kj2Nt9rwtx9i3vjI/noqUr18BqI=";
|
||||
sha256 = "a896f97394b7d046d46c65262e51e45241dd8d9d71eedebcdb2d7024b775eec4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.11.9";
|
||||
version = "0.11.10";
|
||||
pname = "applicationinsights";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hyjdv6xnswgqvip8y164piwfach9hjkbp7vc2qzhd7amjpim89h";
|
||||
sha256 = "0b761f3ef0680acf4731906dfc1807faa6f2a57168ae74592db0084a6099f7b3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ portalocker ];
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "argcomplete";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04";
|
||||
sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445";
|
||||
};
|
||||
|
||||
doCheck = false; # meant to be ran with interactive interpreter
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Arpeggio";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e";
|
||||
sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1";
|
||||
};
|
||||
|
||||
# Shall not be needed for next release
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "arrow";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d";
|
||||
sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -41,6 +41,8 @@ buildPythonPackage rec {
|
|||
"test_parse_tz_name_zzz"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "arrow" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for date manipulation";
|
||||
homepage = "https://github.com/crsmithdev/arrow";
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue