MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-11-16 06:01:37 +00:00 committed by GitHub
commit 112c228b4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 227 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/databases/influxdb2.nix
View file

@ -17,7 +17,7 @@ in
};
settings = mkOption {
default = { };
description = "configuration options for influxdb2, see https://docs.influxdata.com/influxdb/v2.0/reference/config-options for details.";
description = ''configuration options for influxdb2, see <link xlink:href="https://docs.influxdata.com/influxdb/v2.0/reference/config-options"/> for details.'';
type = format.type;
};
};

6
nixos/modules/services/x11/desktop-managers/pantheon.xml
View file

@ -107,12 +107,6 @@ switchboard-with-plugs.override {
<para>
AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. The Flatpak backend will not work before <link xlink:href="https://github.com/elementary/appcenter/issues/1076">flag for Flatpak-only</link> is provided. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>.
</para>
<para>
To use AppCenter on NixOS, add <literal>pantheon.appcenter</literal> to <xref linkend="opt-environment.systemPackages" />, <link linkend="module-services-flatpak">enable Flatpak support</link> and optionally add the <literal>appcenter</literal> Flatpak remote:
</para>
<screen>
<prompt>$ </prompt>flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo
</screen>
</listitem>
</varlistentry>
</variablelist>

14
pkgs/applications/graphics/c3d/default.nix
View file

@ -1,20 +1,22 @@
{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }:
{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }:
stdenv.mkDerivation rec {
pname = "c3d";
version = "unstable-2020-10-05";
version = "unstable-2021-09-14";
src = fetchFromGitHub {
owner = "pyushkevich";
repo = pname;
rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465";
sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf";
rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388";
sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ itk4 ]
buildInputs = [ itk ]
++ lib.optional stdenv.isDarwin Cocoa;
cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ];
meta = with lib; {
homepage = "https://github.com/pyushkevich/c3d";
description = "Medical imaging processing tool";
@ -22,6 +24,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.gpl3;
broken = stdenv.isAarch64;
# /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory
# /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory
};
}

6
pkgs/applications/misc/sqls/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sqls";
version = "0.2.19";
version = "0.2.20";
src = fetchFromGitHub {
owner = "lighttiger2505";
repo = pname;
rev = "v${version}";
sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az";
sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ=";
};
vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz";
vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ];

41
pkgs/applications/networking/cluster/clusterctl/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "clusterctl";
version = "1.0.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780=";
};
vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU=";
subPackages = [ "cmd/clusterctl" ];
nativeBuildInputs = [ installShellFiles ];
ldflags = let t = "sigs.k8s.io/cluster-api/version"; in [
"-X ${t}.gitMajor=${lib.versions.major version}"
"-X ${t}.gitMinor=${lib.versions.minor version}"
"-X ${t}.gitVersion=v${version}"
];
postInstall = ''
# errors attempting to write config to read-only $HOME
export HOME=$(mktemp -d)
installShellCompletion --cmd clusterctl \
--bash <($out/bin/clusterctl completion bash) \
--zsh <($out/bin/clusterctl completion zsh)
'';
meta = with lib; {
description = "Kubernetes cluster API tool";
homepage = "https://cluster-api.sigs.k8s.io/";
license = licenses.asl20;
maintainers = with maintainers; [ zowoq ];
};
}

8
pkgs/applications/networking/cluster/sonobuoy/default.nix
View file

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub }:
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3";
let rev = "dc78b39a6ff0a1a94a29fa0fd72bcbe5d95004be";
in
buildGoModule rec {
pname = "sonobuoy";
version = "0.54.0"; # Do not forget to update `rev` above
version = "0.55.0"; # Do not forget to update `rev` above
ldflags =
let t = "github.com/vmware-tanzu/sonobuoy";
@ -20,10 +20,10 @@ buildGoModule rec {
owner = "vmware-tanzu";
repo = "sonobuoy";
rev = "v${version}";
sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs=";
sha256 = "sha256-fMZju0Cd1JtVC+EKHwW3ZGsB2m0V3UIHsKQMbvf4i5Y=";
};
vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24=";
vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg=";
subPackages = [ "." ];

6
pkgs/applications/networking/seafile-client/default.nix
View file

@ -4,13 +4,13 @@
mkDerivation rec {
pname = "seafile-client";
version = "8.0.4";
version = "8.0.5";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ=";
sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx";
};
nativeBuildInputs = [ pkg-config cmake ];
@ -29,6 +29,6 @@ mkDerivation rec {
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ schmittlauch ];
maintainers = with maintainers; [ schmittlauch greizgh ];
};
}

4
pkgs/applications/office/qownnotes/default.nix
View file

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "21.10.9";
version = "21.11.4";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "2c86d66ae427bdcd16d706b982cedaa669a27340f7819fc97a8e2b24c709e74f";
sha256 = "3eb025873160cecd4fa35ae5079c150d4aa5dd3152fd58c5e216b592af43e8dc";
};
nativeBuildInputs = [ qmake qttools ];

6
pkgs/data/fonts/meslo-lgs-nf/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "meslo-lgs-nf";
version = "2020-03-22";
version = "2021-09-03";
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k-media";
rev = "32c7d40239c93507277f14522be90b5750f442c9";
sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd";
rev = "389133fb8c9a2347929a23702ce3039aacc46c3d";
sha256 = "sha256-dWqRxjqsa/Tiv0Ww8VLHRDhftD3eqa1t2/T0irFeMFI=";
};
installPhase = ''

4
pkgs/development/compilers/fennel/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fennel";
version = "0.10.0";
version = "1.0.0";
src = fetchFromSourcehut {
owner = "~technomancy";
repo = pname;
rev = version;
sha256 = "sha256-/xCnaDNZJTBGxIgjPUVeEyMVeRWg8RCNuo5nPpLrJXY=";
sha256 = "sha256-HhxFTWC1gBY76pQzhn6EdgYHpYQr9zkUox0r4YC7mTQ=";
};
nativeBuildInputs = [ installShellFiles ];

28
pkgs/development/coq-modules/smpl/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, mkCoqDerivation, coq, version ? null }:
with lib;
mkCoqDerivation {
pname = "smpl";
owner = "uds-psl";
release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs=";
release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg=";
release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg=";
releaseRev = v: "v${v}";
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = "8.13.2"; out = "8.13"; }
{ case = "8.12.2"; out = "8.12"; }
{ case = "8.10.2"; out = "8.10.2"; }
] null;
mlPlugin = true;
meta = {
description = "A Coq plugin providing an extensible tactic similar to first";
maintainers = with maintainers; [ siraben ];
license = licenses.mit;
platforms = platforms.unix;
};
}

22
pkgs/development/libraries/apr/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "apr";
@ -17,6 +17,16 @@ stdenv.mkDerivation rec {
# convince fetchpatch to restore missing `a/`, `b/` to paths
extraPrefix = "";
})
# Fix cross.
(fetchpatch {
url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch";
sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y";
})
(fetchpatch {
url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
})
] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
# This test needs the net
@ -35,19 +45,19 @@ stdenv.mkDerivation rec {
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_file__dev_zero=yes"
"ac_cv_func_setpgrp_void=0"
"apr_cv_process_shared_works=1"
"apr_cv_tcp_nodelay_with_cork=1"
"CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
# Including the Windows headers breaks unistd.h.
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
"ac_cv_header_windows_h=no"
];
CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED";
# - Update libtool for macOS 11 support
# - Regenerate for cross fix patch
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs =
# Update libtool for macOS 11 support
lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ];
doCheck = true;
enableParallelBuilding = true;

4
pkgs/development/libraries/audio/libmysofa/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
version = "1.2";
version = "1.2.1";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY=";
sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg=";
};
nativeBuildInputs = [ cmake ];

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
, pkg-config, libX11, libuuid, xz, vtk_7, Cocoa }:
, pkg-config, libX11, libuuid, xz, vtk, Cocoa }:
stdenv.mkDerivation rec {
pname = "itk";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake xz makeWrapper ];
buildInputs = [ libX11 libuuid vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
postInstall = ''
wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcouchbase";
version = "3.2.1";
version = "3.2.3";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
sha256 = "sha256-6TMWWXAgt4e+De1ebmqQhaqcia1ZXT8IXn9fTGsr3qY=";
sha256 = "sha256-pCqSsmddgNtQJnOVIHz5ft0gJN5T7T3ehHtjuexhBxI=";
};
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];

11
pkgs/development/libraries/physics/rivet/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";
};
patches = [
# Fixes build
(fetchpatch {
name = "rivet-3.1.5-namespace-fix.patch";
url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff";
sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms=";
})
];
latex = texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks

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

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "libupnp";
version = "1.14.10";
version = "1.14.12";
outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "pupnp";
repo = "pupnp";
rev = "release-${version}";
sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U=";
sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME=";
};
nativeBuildInputs = [

2
pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
View file

@ -3,7 +3,7 @@
ppx_jane, sexplib, typerep, variantslib}:
buildOcamlJane {
name = "async_rpc_kernel";
pname = "async_rpc_kernel";
hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw";
propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib
ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane

2
pkgs/development/ocaml-modules/janestreet/bin_prot.nix
View file

@ -1,7 +1,7 @@
{lib, buildOcamlJane, type_conv}:
buildOcamlJane {
name = "bin_prot";
pname = "bin_prot";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.02";
hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh";

2
pkgs/development/ocaml-modules/janestreet/core_bench.nix
View file

@ -6,7 +6,7 @@
}:
buildOcamlJane {
name = "core_bench";
pname = "core_bench";
hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
propagatedBuildInputs =
[ core core_extended textutils ];

2
pkgs/development/ocaml-modules/janestreet/fieldslib.nix
View file

@ -1,7 +1,7 @@
{ lib, type_conv, buildOcamlJane }:
buildOcamlJane {
name = "fieldslib";
pname = "fieldslib";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.02";

2
pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
View file

@ -2,7 +2,7 @@
ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:
buildOcamlJane {
name = "ppx_assert";
pname = "ppx_assert";
hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4";
propagatedBuildInputs =
[ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools

2
pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:
buildOcamlJane {
name = "ppx_bench";
pname = "ppx_bench";
minimumSupportedOcamlVersion = "4.02";
hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk";

2
pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv, bin_prot}:
buildOcamlJane {
name = "ppx_bin_prot";
pname = "ppx_bin_prot";
hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];

2
pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:
buildOcamlJane {
name = "ppx_compare";
pname = "ppx_compare";
hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459";
propagatedBuildInputs =
[ppx_core ppx_driver ppx_tools ppx_type_conv ];

2
pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:
buildOcamlJane {
name = "ppx_custom_printf";
pname = "ppx_custom_printf";
hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv}:
buildOcamlJane {
name = "ppx_enumerate";
pname = "ppx_enumerate";
hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];

2
pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
View file

@ -4,7 +4,7 @@
ppx_variants_conv, re, sexplib, variantslib, fieldslib}:
buildOcamlJane {
name = "ppx_expect";
pname = "ppx_expect";
hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx";
propagatedBuildInputs =
[ ppx_assert ppx_compare ppx_core ppx_custom_printf ppx_driver

2
pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv}:
buildOcamlJane {
name = "ppx_fields_conv";
pname = "ppx_fields_conv";
hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];

2
pkgs/development/ocaml-modules/janestreet/ppx-here.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver}:
buildOcamlJane {
name = "ppx_here";
pname = "ppx_here";
hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
propagatedBuildInputs = [ ppx_core ppx_driver ];

2
pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_tools}:
buildOcamlJane {
name = "ppx_inline_test";
pname = "ppx_inline_test";
hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
View file

@ -6,7 +6,7 @@
ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}:
buildOcamlJane {
name = "ppx_jane";
pname = "ppx_jane";
hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9";
propagatedBuildInputs =
[ ppx_assert ppx_bench ppx_bin_prot ppx_compare ppx_custom_printf

2
pkgs/development/ocaml-modules/janestreet/ppx-let.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver}:
buildOcamlJane {
name = "ppx_let";
pname = "ppx_let";
hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
propagatedBuildInputs = [ ppx_core ppx_driver ];

2
pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools}:
buildOcamlJane {
name = "ppx_optcomp";
pname = "ppx_optcomp";
hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd";
propagatedBuildInputs =
[ ppx_core ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_tools}:
buildOcamlJane {
name = "ppx_pipebang";
pname = "ppx_pipebang";
hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv, sexplib}:
buildOcamlJane {
name = "ppx_sexp_conv";
pname = "ppx_sexp_conv";
hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];

2
pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
buildOcamlJane {
name = "ppx_sexp_message";
pname = "ppx_sexp_message";
hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
buildOcamlJane {
name = "ppx_sexp_value";
pname = "ppx_sexp_value";
hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];

2
pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv, typerep}:
buildOcamlJane {
name = "ppx_typerep_conv";
pname = "ppx_typerep_conv";
hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];

2
pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
View file

@ -2,7 +2,7 @@
ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:
buildOcamlJane {
name = "ppx_variants_conv";
pname = "ppx_variants_conv";
hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];

2
pkgs/development/ocaml-modules/janestreet/sexplib.nix
View file

@ -2,7 +2,7 @@
buildOcamlJane {
minimumSupportedOcamlVersion = "4.02";
name = "sexplib";
pname = "sexplib";
version = "113.33.03";
hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22";

2
pkgs/development/ocaml-modules/janestreet/typerep.nix
View file

@ -1,7 +1,7 @@
{lib, buildOcamlJane, type_conv}:
buildOcamlJane {
name = "typerep";
pname = "typerep";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.00";

2
pkgs/development/ocaml-modules/janestreet/variantslib.nix
View file

@ -1,7 +1,7 @@
{lib, buildOcamlJane, type_conv}:
buildOcamlJane {
name = "variantslib";
pname = "variantslib";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.00";

4
pkgs/development/python-modules/braintree/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
version = "4.12.0";
version = "4.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6";
sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/certbot/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SO8vy9x2jwK5AOHety7RuxRK+OEIHpMXqetW3bqfzZI=";
sha256 = "0sbhg8gdcszi4q5091s1by0hz6qxpkdfazs5lbfrlw33fkck2d3i";
};
sourceRoot = "source/${pname}";

4
pkgs/development/python-modules/clustershell/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "ClusterShell";
version = "1.8.3";
version = "1.8.4";
src = fetchPypi {
inherit pname version;
sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b";
sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081";
};
propagatedBuildInputs = [ pyyaml ];

4
pkgs/development/python-modules/cupy/default.nix
View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "cupy";
version = "9.5.0";
version = "9.6.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187";
sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91";
};
preConfigure = ''

4
pkgs/development/python-modules/dropbox/default.nix
View file

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "dropbox";
version = "11.22.0";
version = "11.23.0";
src = fetchFromGitHub {
owner = "dropbox";
repo = "dropbox-sdk-python";
rev = "v${version}";
sha256 = "0fhzpss3zs5x3hr4amrmw8hras75qc385ikpw0sx5a907kigk7w5";
sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx";
};
postPatch = ''

4
pkgs/development/python-modules/elasticsearch/default.nix
View file

@ -12,11 +12,11 @@ buildPythonPackage (rec {
# there's a clear path forward. See
# https://github.com/elastic/elasticsearch-py/issues/1639 for more
# info.
version = "7.15.1";
version = "7.15.2";
src = fetchPypi {
inherit pname version;
sha256 = "1e9a6302945d98046899a7c9b3d345c881ac7b05ba176d3a49c9d2702b1e8bc8";
sha256 = "436f871848a5020bf9b47495812b229b59bd0c5d7e40adbd5e3c89896b311704";
};
# Check is disabled because running them destroy the content of the local cluster!

8
pkgs/development/python-modules/johnnycanencrypt/default.nix
View file

@ -13,6 +13,7 @@
, pytestCheckHook
, pythonOlder
, PCSC
, libiconv
}:
buildPythonPackage rec {
@ -55,7 +56,10 @@ buildPythonPackage rec {
buildInputs = [
pcsclite
nettle
] ++ lib.optionals stdenv.isDarwin [ PCSC ];
] ++ lib.optionals stdenv.isDarwin [
PCSC
libiconv
];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
@ -70,6 +74,8 @@ buildPythonPackage rec {
# for compatibility with maturin 0.9.0.
postPatch = ''
sed '/project-url = /d' -i Cargo.toml
substituteInPlace pyproject.toml \
--replace 'manylinux = "off"' 'skip-auditwheel = true'
'';
preCheck = ''

4
pkgs/development/python-modules/kombu/default.nix
View file

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "kombu";
version = "5.1.0";
version = "5.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "01481d99f4606f6939cdc9b637264ed353ee9e3e4f62cfb582324142c41a572d";
sha256 = "f262a2adc71b53e5b7dad4933bbdee65d8766ca4df6a9043b13edaad2144aaec";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pycm/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pycm";
version = "3.2";
version = "3.3";
disabled = !isPy3k;
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "sepandhaghighi";
repo = pname;
rev = "v${version}";
sha256 = "1p2scgb4aghjlxak4zvm3s9ydkpg42mdxy6vjxlnqw0wpnsskfni";
sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw";
};
# remove a trivial dependency on the author's `art` Python ASCII art library

8
pkgs/development/python-modules/threadpoolctl/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, isPy27
, pythonOlder
, fetchFromGitHub
, flit
, pytestCheckHook
@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "threadpoolctl";
version = "2.2.0";
version = "3.0.0";
disabled = isPy27;
disabled = pythonOlder "3.6";
format = "flit";
src = fetchFromGitHub {
owner = "joblib";
repo = pname;
rev = version;
sha256 = "7UUjbX1IpXtUAgN48Db43Zr1u360UETSUnIHD6rQRLs=";
sha256 = "02zccsiq4gvawy7q2fh3m3hvr40hl2ylmwwny6dv0lqsr2iwgnmn";
};
checkInputs = [ pytestCheckHook numpy scipy ];

6
pkgs/development/python-modules/typer/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, click
@ -42,6 +43,11 @@ buildPythonPackage rec {
preCheck = ''
export HOME=$(mktemp -d);
'';
disabledTests = lib.optionals stdenv.isDarwin [
# likely related to https://github.com/sarugaku/shellingham/issues/35
"test_show_completion"
"test_install_completion"
];
pythonImportsCheck = [ "typer" ];

6
pkgs/development/tools/typos/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7L+hRr+/sphH4fq4vX7lI9KR6Tks1uLveSJ/wLqO1Ek=";
sha256 = "Y+sIyueLdREoq/NR6LwppyhWxB8s0iBjdFaDUSKnlRw=";
};
cargoSha256 = "sha256-AxhFQxtT3PfG3Y9nJlp8n4HjaOXxs9KDPY9Ha5Lr4VE=";
cargoSha256 = "3oqmiHH9QU8uHs9q2CgE0uTvfyaRxV3rFBxkXxC5/Tw=";
meta = with lib; {
description = "Source code spell checker";

4
pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj";
sha256 = "sha256-hGpcHV4ai9mxaJ/u/o9LNFWPGsW22W7ak2pbvAUgmwU=";
};
buildInputs = [ postgresql openssl zlib readline libkrb5 ];

9
pkgs/tools/backup/hpe-ltfs/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }:
{ lib, stdenv, fetchFromGitHub, fuse, icu66, pkg-config, libxml2, libuuid }:
stdenv.mkDerivation rec {
version = "3.4.2_Z7550-02501";
@ -13,10 +13,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/ltfs";
# include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used
# for Apple to determine the kernel version. Because this build only targets
# Linux is it safe to remove.
patches = [ ./remove-sysctl.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fuse icu libxml2 libuuid
fuse icu66 libxml2 libuuid
];
meta = with lib; {

14
pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/src/libltfs/arch/arch_info.c b/src/libltfs/arch/arch_info.c
index 179428f..114acf0 100644
--- a/src/libltfs/arch/arch_info.c
+++ b/src/libltfs/arch/arch_info.c
@@ -47,9 +47,6 @@
*/
#include "libltfs/ltfs.h"
-#ifndef mingw_PLATFORM
-#include <sys/sysctl.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

6
pkgs/tools/misc/interactsh/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "interactsh";
version = "0.0.4";
version = "0.0.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9tmEeYuMRZVkcUupBzJv3rCuy7Il46yh5i0UEUNCNtc=";
sha256 = "sha256-9h2RdP0rVmStl+obMbBHcbfiOBiJ/2sbk2XvH3YaHRo=";
};
vendorSha256 = "sha256-YTzo8YjnJUNXZrYKYTCHOgZAUrMlYzbEEP3yXYfNZqo=";
vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU=";
modRoot = ".";
subPackages = [

4
pkgs/tools/misc/vimwiki-markdown/default.nix
View file

@ -6,12 +6,12 @@
}:
buildPythonApplication rec {
version = "0.3.3";
version = "0.4.0";
pname = "vimwiki-markdown";
src = fetchPypi {
inherit version pname;
sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945";
sha256 = "e898c58fa6ecbb7474738d79c44db2b6ab3adfa958bffe80089194c2a70b1ec0";
};
propagatedBuildInputs= [

4
pkgs/tools/networking/ytcc/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ytcc";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitHub {
owner = "woefe";
repo = "ytcc";
rev = "v${version}";
sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8";
sha256 = "1skhg8ca2bjjfi02pjsi3w7v3f4xhzg7bqyy0cajxsymzqzqp7lm";
};
postPatch = ''

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

@ -2459,6 +2459,8 @@ with pkgs;
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
clusterctl = callPackage ../applications/networking/cluster/clusterctl { };
coloredlogs = with python3Packages; toPythonApplication coloredlogs;
colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
@ -15541,7 +15543,9 @@ with pkgs;
appstream-glib = callPackage ../development/libraries/appstream-glib { };
apr = callPackage ../development/libraries/apr { };
apr = callPackage ../development/libraries/apr {
autoreconfHook = buildPackages.autoreconfHook269;
};
aprutil = callPackage ../development/libraries/apr-util {
db = if stdenv.isFreeBSD then db4 else db;

1
pkgs/top-level/coq-packages.nix
View file

@ -88,6 +88,7 @@ let
semantics = callPackage ../development/coq-modules/semantics {};
serapi = callPackage ../development/coq-modules/serapi {};
simple-io = callPackage ../development/coq-modules/simple-io { };
smpl = callPackage ../development/coq-modules/smpl { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};
tlc = callPackage ../development/coq-modules/tlc {};