Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-08-23 00:06:39 +00:00 committed by GitHub
commit aa389961de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 979 additions and 328 deletions

View File

@ -91,7 +91,7 @@ let
concatImapStringsSep makeSearchPath makeSearchPathOutput
makeLibraryPath makeBinPath optionalString
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
escapeShellArg escapeShellArgs replaceChars lowerChars
escapeShellArg escapeShellArgs escapeRegex replaceChars lowerChars
upperChars toLower toUpper addContextFrom splitString
removePrefix removeSuffix versionOlder versionAtLeast
getName getVersion

View File

@ -3419,6 +3419,12 @@
githubId = 454695;
name = "Artur Taranchiev";
};
exarkun = {
email = "exarkun@twistedmatrix.com";
github = "exarkun";
githubId = 254565;
name = "Jean-Paul Calderone";
};
exfalso = {
email = "0slemi0@gmail.com";
github = "exfalso";

View File

@ -84,6 +84,9 @@ in
Restart = "on-failure";
RestartSec = 10;
};
unitConfig = {
StartLimitIntervalSec = 0;
};
};
services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled

View File

@ -398,6 +398,10 @@ in
Restart = "on-failure";
RestartSec = 5;
};
unitConfig = {
StartLimitIntervalSec = 0;
};
};
services.etcd = {

View File

@ -146,6 +146,9 @@ in
User = "kubernetes";
Group = "kubernetes";
};
unitConfig = {
StartLimitIntervalSec = 0;
};
path = top.path;
};

View File

@ -337,6 +337,9 @@ in
'';
WorkingDirectory = top.dataDir;
};
unitConfig = {
StartLimitIntervalSec = 0;
};
};
# Allways include cni plugins

View File

@ -77,6 +77,9 @@ in
Restart = "on-failure";
RestartSec = 5;
};
unitConfig = {
StartLimitIntervalSec = 0;
};
};
services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;

View File

@ -79,6 +79,9 @@ in
Restart = "on-failure";
RestartSec = 5;
};
unitConfig = {
StartLimitIntervalSec = 0;
};
};
services.kubernetes.pki.certs = {

View File

@ -221,10 +221,7 @@ in
knot = handleTest ./knot.nix {};
krb5 = discoverTests (import ./krb5 {});
ksm = handleTest ./ksm.nix {};
kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};
# kubernetes.e2e should eventually replace kubernetes.rbac when it works
#kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {};
kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; };
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
leaps = handleTest ./leaps.nix {};

View File

@ -1,7 +1,15 @@
{ system ? builtins.currentSystem }:
{ system ? builtins.currentSystem
, pkgs ? import <nixpkgs> { inherit system; }
}:
let
dns = import ./dns.nix { inherit system pkgs; };
rbac = import ./rbac.nix { inherit system pkgs; };
# TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works
# e2e = import ./e2e.nix { inherit system pkgs; };
in
{
dns = import ./dns.nix { inherit system; };
# e2e = import ./e2e.nix { inherit system; }; # TODO: make it pass
# the following test(s) can be removed when e2e is working:
rbac = import ./rbac.nix { inherit system; };
dns-single-node = dns.singlenode.test;
dns-multi-node = dns.multinode.test;
rbac-single-node = rbac.singlenode.test;
rbac-multi-node = rbac.multinode.test;
}

View File

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.9";
version = "0.9.9-1";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-GsGa2y718qWQlP0pLy8X3mVsFpNNnOTVQZpp4+e1RhA=";
sha256 = "sha256-EmnrwBMHb9jpEZAG393yyMaFRRQJ6YYDRvsp+ATT7MY=";
};
cargoSha256 = "03lnw61pgp88iwz2gbcp8y3jvz6v94cn0ynjz6snb9jq88gf25dz";
cargoHash = "sha256-WzsaUrqe7F4x+ShqG14kq78MTSWIxIMRa3pdr3RXrwk=";
nativeBuildInputs = [ clang ];

View File

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "texmaker";
version = "5.1.0";
version = "5.1.1";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6";
sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4=";
};
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];

View File

@ -1,18 +1,17 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
stdenv.mkDerivation {
name = "meh-unstable-2015-04-11";
pname = "meh";
version = "unstable-2018-10-22";
src = fetchFromGitHub {
owner = "jhawthorn";
repo = "meh";
rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758";
sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk";
rev = "69f653a1f16d11b12e5b600e808a740898f3223e";
sha256 = "sha256-srSwoaajW4H4+kmE7NQAqVz9d/1q2XQ5ayQaOcGwzI0=";
};
installPhase = ''
make PREFIX=$out install
'';
installFlags = [ "PREFIX=${placeholder "out"}" ];
outputs = [ "out" "man" ];

View File

@ -0,0 +1,92 @@
{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems
, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
}:
stdenv.mkDerivation rec {
pname = "premid";
version = "2.3.2";
src = fetchurl {
url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-TuID63cVZkQ2kBl2iZeuVvjRUJYBt62ppPvgffBlOXY=";
};
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
copyDesktopItems
];
buildInputs = [
alsa-lib
cups
libdrm
libuuid
libXdamage
libX11
libXScrnSaver
libXtst
libxcb
libxshmfence
mesa
nss
];
dontWrapGApps = true;
dontBuild = true;
dontConfigure = true;
libPath = lib.makeLibraryPath [
libcxx systemd libpulseaudio libdrm mesa
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
libappindicator-gtk3 libdbusmenu
];
installPhase = ''
mkdir -p $out/{bin,opt/PreMiD,share/pixmaps}
mv * $out/opt/PreMiD
chmod +x $out/opt/PreMiD/${pname}
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
$out/opt/PreMiD/${pname}
wrapProgram $out/opt/PreMiD/${pname} \
"''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${pname}
ln -s $out/opt/PreMiD/${pname} $out/bin/
'';
# This is the icon used by the desktop file
postInstall = ''
ln -s $out/opt/PreMiD/assets/appIcon.png $out/share/pixmaps/${pname}.png
'';
desktopItems = [
(makeDesktopItem {
name = pname;
exec = "PreMiD";
icon = pname;
desktopName = "PreMiD";
genericName = meta.description;
mimeType = "x-scheme-handler/premid";
})
];
meta = with lib; {
description = "A simple, configurable utility to show your web activity as playing status on Discord";
homepage = "https://premid.app";
downloadPage = "https://premid.app/downloads";
license = licenses.mpl20;
maintainers = with maintainers; [ natto1784 ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "usql";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
sha256 = "sha256-vLGoPttl7f4qCVM8e0F0llIODuNqJ7GxXqbUgokv7Qw=";
sha256 = "sha256-NHeJSWrcX4hYBJpZu/UjQ1ZWfcUnWFCV0Meo+XveDOw=";
};
vendorSha256 = "sha256-sGECp1L6WzIPGbQbBoV1IrTgyy4/c95OLAmj9D0FjXs=";
vendorSha256 = "sha256-EsLLBhyOcupx5LrJyWWMu4RAGWDKo3keflyZOASKldE=";
buildInputs = [ unixODBC icu ];

View File

@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "92.0.4515.131",
"sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n",
"sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g",
"version": "92.0.4515.159",
"sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
"sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
"deps": {
"gn": {
"version": "2021-05-07",
@ -55,8 +55,8 @@
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
},
"ungoogled-patches": {
"rev": "92.0.4515.131-1",
"sha256": "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd"
"rev": "92.0.4515.159-1",
"sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0"
}
}
}

View File

@ -97,10 +97,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
passthru.tests = with nixosTests.kubernetes; {
dns-single-node = dns.singlenode;
dns-multi-node = dns.multinode;
rbac-single-node = rbac.singlenode;
rbac-multi-node = rbac.multinode;
};
passthru.tests = nixosTests.kubernetes;
}

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "hyprspace";
version = "0.1.5";
version = "0.1.6";
propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;
@ -10,7 +10,7 @@ buildGoModule rec {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-aLODIaDbSLVEog/F0FVx6ykadCggE0Vebzwjw0sqYJ0=";
sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg=";
};
vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cadical";
version = "1.3.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "cadical";
rev = "rel-${version}";
sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
sha256 = "0y44z3np4gssgdh4aj5qila7pshrbphycdxn2083i8ayyyjbxshp";
};
outputs = [ "out" "dev" "lib" ];

View File

@ -4,7 +4,7 @@
let
name = "maxima";
version = "5.44.0";
version = "5.45.0";
lisp-compiler = if ecl-fasl then ecl else sbcl;
@ -18,7 +18,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr";
sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng=";
};
nativeBuildInputs = [

View File

@ -1,4 +1,5 @@
{ lib, stdenv
, fetchpatch
, fetchFromGitHub
, autoreconfHook
, pkg-config
@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A=";
};
patches = [
# the patch below is included in sage 9.4 and should be included
# in a future pynac release. see https://trac.sagemath.org/ticket/28357
(fetchpatch {
name = "realpartloop.patch";
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/realpartloop.patch?h=9.4.beta5";
sha256 = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4=";
})
];
buildInputs = [
flint
gmp

View File

@ -1,8 +1,8 @@
diff --git a/src/sage/env.py b/src/sage/env.py
index 2908f5d04f..81dfd75c0d 100644
index 95980cc2df..37107a30e1 100644
--- a/src/sage/env.py
+++ b/src/sage/env.py
@@ -218,93 +218,12 @@ NTL_LIBDIR = var("NTL_LIBDIR")
@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "")
SAGE_BANNER = var("SAGE_BANNER", "")
SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes")
@ -51,10 +51,9 @@ index 2908f5d04f..81dfd75c0d 100644
- if sys.platform == 'cygwin':
- # Later down we take the first matching DLL found, so search
- # SAGE_LOCAL first so that it takes precedence
- search_directories = [
- Path(SAGE_LOCAL) / 'bin',
- Path(sysconfig.get_config_var('BINDIR')),
- ]
- if SAGE_LOCAL:
- search_directories.append(Path(SAGE_LOCAL) / 'bin')
- search_directories.append(Path(sysconfig.get_config_var('BINDIR')))
- # Note: The following is not very robust, since if there are multible
- # versions for the same library this just selects one more or less
- # at arbitrary. However, practically speaking, on Cygwin, there
@ -66,14 +65,15 @@ index 2908f5d04f..81dfd75c0d 100644
- else:
- ext = 'so'
-
- search_directories = [Path(SAGE_LOCAL) / 'lib']
- if SAGE_LOCAL:
- search_directories.append(Path(SAGE_LOCAL) / 'lib')
- libdir = sysconfig.get_config_var('LIBDIR')
- if libdir is not None:
- libdir = Path(libdir)
- search_directories.append(libdir)
-
- multiarchlib = sysconfig.get_config_var('MULTIARCH')
- if multiarchlib is not None:
- if multiarchlib is not None:
- search_directories.append(libdir / multiarchlib),
-
- patterns = [f'lib{libname}.{ext}']
@ -97,4 +97,4 @@ index 2908f5d04f..81dfd75c0d 100644
+GAP_SO = var("GAP_SO", '/default')
# post process
if ' ' in DOT_SAGE:
if DOT_SAGE is not None and ' ' in DOT_SAGE:

View File

@ -1,24 +0,0 @@
diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
index 6e034dcb5a..8ec60ec72b 100644
--- a/src/sage/tests/cmdline.py
+++ b/src/sage/tests/cmdline.py
@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
sage: with open(input, 'w') as F:
....: _ = F.write(s)
sage: L = ["sage", "--rst2ipynb", input, output]
- sage: test_executable(L) # optional - rst2ipynb
- ('', '', 0)
+ sage: test_executable(L)[2] # optional - rst2ipynb
+ 0
sage: import json # optional - rst2ipynb
sage: d = json.load(open(output,'r')) # optional - rst2ipynb
sage: type(d) # optional - rst2ipynb
@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
///
4
}}}
- sage: err # py2 # optional -- sagenb
- ''
sage: ret # py2 # optional -- sagenb
0

View File

@ -29,14 +29,14 @@ let
);
in
stdenv.mkDerivation rec {
version = "9.3";
version = "9.4";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo=";
sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A=";
};
# Patches needed because of particularities of nix or the way this is packaged.
@ -77,64 +77,9 @@ stdenv.mkDerivation rec {
# be empty since dependencies update all the time.
packageUpgradePatches = [
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
# now set the cache dir to be withing the .sage directory. This is not
# now set the cache dir to be within the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
# ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests
./patches/ignore-cmp-deprecation.patch
# remove use of matplotlib function deprecated in 3.4
# https://trac.sagemath.org/ticket/31827
(fetchSageDiff {
base = "9.3";
name = "remove-matplotlib-deprecated-function.patch";
rev = "32b2bcaefddc4fa3d2aee6fa690ce1466cbb5948";
sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo=";
})
# pari 2.13 update
# https://trac.sagemath.org/ticket/30801
#
# the last commit in that ticket is
# c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after
# 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit
# and post-26635 breakage, none of which is relevant to us. since
# there are post-9.4.beta0 rebases after that, we just skip later
# commits.
(fetchSageDiff {
base = "9.3";
name = "pari-2.13.1.patch";
rev = "10a4531721d2700fd717e2b3a1364508ffd971c3";
sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E=";
})
# sympy 1.8 update
# https://trac.sagemath.org/ticket/31647
(fetchSageDiff {
base = "9.4.beta0";
name = "sympy-1.8.patch";
rev = "fa864b36e15696450c36d54215b1e68183b29d25";
sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o=";
})
# sphinx 4 update
# https://trac.sagemath.org/ticket/31696
(fetchSageDiff {
base = "9.4.beta3";
name = "sphinx-4.patch";
rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8";
sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM=";
})
# eclib 20210625 update
# https://trac.sagemath.org/ticket/31443
(fetchSageDiff {
base = "9.4.beta3";
name = "eclib-20210625.patch";
rev = "789550ca04c94acfb1e803251538996a34962038";
sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

View File

@ -27,6 +27,7 @@
, linbox
, m4ri
, m4rie
, memory-allocator
, libmpc
, mpfi
, ntl
@ -107,6 +108,7 @@ buildPythonPackage rec {
lrcalc
m4ri
m4rie
memory-allocator
mpfi
ntl
blas

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "git-delete-merged-branches";
version = "6.0.5";
version = "6.3.0";
src = fetchFromGitHub {
owner = "hartwork";
repo = pname;
rev = version;
sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp";
sha256 = "sha256-mUgSIwU39BT0bCA2UQANe2Yzkgl2xAmXQQ9P2bLoEMc=";
};
propagatedBuildInputs = with python3Packages; [

View File

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.14.6";
version = "1.15.0";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-IIoOJlafMD6Kg8Zde3LcoK97PKLmqOUMQN3nmIgqe1o=";
sha256 = "sha256-Wu5rtVoQql/0XWkszYOqE4QJxKUY/CsCpmjkaB+E6Hc=";
};
unpackPhase = ''

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.3";
version = "0.20.4";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g=";
sha256 = "sha256-lohMrsMCAnb2p7H+xfa24Wx3LEFxCAlGHfP9A70Hg48=";
};
cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54=";
cargoSha256 = "sha256-pe96VNTH49qgQ4yxKcAcQPN31W2k1mD9TdhNKBp4x5Q=";
nativeBuildInputs = [ pkg-config makeWrapper ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "theme-obsidian2";
version = "2.18";
version = "2.19";
src = fetchurl {
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r";
sha256 = "sha256-GGnrix8utJ34pszuoxcMY5Yr0stwL17Y812FIiRZOUk=";
};
sourceRoot = ".";

View File

@ -6,6 +6,7 @@ mkCoqDerivation rec {
releaseRev = v: "v${v}";
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ=";
release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A=";
release."8.9.0".sha256 = "sha256-ZJh1BM34iZOQ75zqLIA+KtBjO2y33y0UpAw/ydCWQYc=";
@ -15,16 +16,16 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.12"; out = "8.12.0"; }
{ case = "8.11"; out = "8.12.0"; }
{ case = "8.10"; out = "8.10.0"; }
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }
{ case = "8.6"; out = "8.6.0"; }
] null;
propagatedBuildInputs = optional (versions.isLe "8.12" defaultVersion) zorns-lemma;
propagatedBuildInputs = [ zorns-lemma ];
useDune2ifVersion = versions.isGe "9.0";
meta = {
description = "General topology in Coq";

View File

@ -3,9 +3,11 @@ with lib;
mkCoqDerivation {
pname = "zorns-lemma";
repo = "topology";
releaseRev = v: "v${v}";
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k=";
release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4=";
release."8.9.0".sha256 = "sha256-lEh978cXehglFX9D92RVltEuvN8umfPo/hvmFZm2NGo=";
@ -16,8 +18,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "8.11.0"; }
{ case = "8.10"; out = "8.10.0"; }
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }
@ -25,6 +26,8 @@ mkCoqDerivation {
{ case = "8.5"; out = "8.5.0"; }
] null;
useDune2ifVersion = versions.isGe "9.0";
meta = {
description = "Development of basic set theory";
longDescription = ''

View File

@ -46,6 +46,9 @@
# Not needed with buildGoModule
, goPackagePath ? ""
# needed for buildFlags warning
, buildFlags ? ""
, ... }@args':
with builtins;
@ -268,4 +271,6 @@ let
};
});
in
lib.warnIf (buildFlags != "")
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
package

View File

@ -43,6 +43,9 @@
, CGO_ENABLED ? go.CGO_ENABLED
# needed for buildFlags warning
, buildFlags ? ""
, meta ? {}, ... } @ args:
@ -257,4 +260,6 @@ let
} // meta;
});
in
lib.warnIf (buildFlags != "")
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
package

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
version = "1.39.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd";
sha256 = "1yrr04g6faphh4hwzryqrwzgcr0hqqh05x9mc3vhpzmdkrrbz4zn";
fetchSubmodules = true;
};

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpqxx";
version = "7.5.2";
version = "7.6.0";
src = fetchFromGitHub {
owner = "jtv";
repo = pname;
rev = version;
sha256 = "15ifd28v6xbbx931icydy8xmkd8030b20xzqjja6vwwvzss2w9fa";
sha256 = "sha256-shcGJebjXJ3ORvcdINJFLiuW7ySqe6HyPUQioeUG/wM=";
};
nativeBuildInputs = [ gnused python3 ];

View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "talloc";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c=";
sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo=";
};
nativeBuildInputs = [

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
, flex, twisted
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
, flex
}:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
boost zlib libevent openssl python bison flex twisted
boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
];
preConfigure = "export PY_PREFIX=$out";

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config
, bison, flex, twisted
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config
, bison, flex
, static ? stdenv.hostPlatform.isStatic
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config bison flex ];
buildInputs = [ boost zlib libevent openssl ]
++ lib.optionals (!static) [ python twisted ];
++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ];
preConfigure = "export PY_PREFIX=$out";

View File

@ -1,17 +1,19 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5
{ stdenv, lib, fetchFromGitHub
, mcpp, bzip2, expat, openssl, db5
, darwin, libiconv, Security
, zeroc-ice # to share meta
, cpp11 ? false
}:
stdenv.mkDerivation rec {
pname = "zeroc-ice";
version = "3.6.3";
version = "3.6.5";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15";
};
buildInputs = [ mcpp bzip2 expat openssl db5 ]
@ -27,13 +29,8 @@ stdenv.mkDerivation rec {
'';
patches = [
# Fixes compilation issues with GCC 8 using one of the patches
# provided in https://github.com/zeroc-ice/ice/issues/82
( fetchpatch {
url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch";
sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56";
stripLen = 1;
})
# Fixes compilation warning about uninitialied variables (in test code)
./uninitialized-variable-warning.patch
];
preBuild = ''
@ -58,10 +55,5 @@ stdenv.mkDerivation rec {
rm -rf $out/share/slice
'';
meta = with lib; {
homepage = "http://www.zeroc.com/ice.html";
description = "The internet communications engine";
license = licenses.gpl2;
platforms = platforms.unix;
};
inherit (zeroc-ice) meta;
}

View File

@ -1,5 +1,7 @@
{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb
{ stdenv, lib, fetchFromGitHub
, bzip2, expat, libedit, lmdb, openssl
, darwin, libiconv, Security
, python3 # for tests only
, cpp11 ? false
}:
@ -21,16 +23,16 @@ let
in stdenv.mkDerivation rec {
pname = "zeroc-ice";
version = "3.7.2";
version = "3.7.6";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg";
sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4";
};
buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy";
@ -51,12 +53,25 @@ in stdenv.mkDerivation rec {
)
'';
buildFlags = [ "srcs" ]; # no tests; they require network
enableParallelBuilding = true;
outputs = [ "out" "bin" "dev" ];
doCheck = true;
checkInputs = with python3.pkgs; [ passlib ];
checkPhase = with lib; let
# these tests require network access so we need to skip them.
brokenTests = map escapeRegex [
"Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple"
];
# matches CONFIGS flag in makeFlagsArray
configFlag = optionalString cpp11 "--config=cpp11-shared";
in ''
runHook preCheck
${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${concatStringsSep "|" brokenTests}'
runHook postCheck
'';
postInstall = ''
mkdir -p $bin $dev/share
mv $out/bin $bin
@ -66,7 +81,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.zeroc.com/ice.html";
description = "The internet communications engine";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};

View File

@ -0,0 +1,20 @@
diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h
index 7e21639..1279200 100644
--- a/test/Glacier2/dynamicFiltering/TestControllerI.h
+++ b/test/Glacier2/dynamicFiltering/TestControllerI.h
@@ -21,13 +21,12 @@ struct SessionTuple
{
Glacier2::SessionPrx session;
Glacier2::SessionControlPrx sessionControl;
- bool configured;
+ bool configured = false;
SessionTuple() {}
SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control):
session(s),
- sessionControl(control),
- configured(false)
+ sessionControl(control)
{}
SessionTuple&

View File

@ -3,6 +3,8 @@
, "@antora/cli"
, "@antora/site-generator-default"
, "@bitwarden/cli"
, "@commitlint/cli"
, "@commitlint/config-conventional"
, "@hyperspace/cli"
, "@nestjs/cli"
, "@squoosh/cli"

View File

@ -1687,6 +1687,132 @@ let
sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ==";
};
};
"@commitlint/ensure-13.1.0" = {
name = "_at_commitlint_slash_ensure";
packageName = "@commitlint/ensure";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-13.1.0.tgz";
sha512 = "NRGyjOdZQnlYwm9it//BZJ2Vm+4x7G9rEnHpLCvNKYY0c6RA8Qf7hamLAB8dWO12RLuFt06JaOpHZoTt/gHutA==";
};
};
"@commitlint/execute-rule-13.0.0" = {
name = "_at_commitlint_slash_execute-rule";
packageName = "@commitlint/execute-rule";
version = "13.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-13.0.0.tgz";
sha512 = "lBz2bJhNAgkkU/rFMAw3XBNujbxhxlaFHY3lfKB/MxpAa+pIfmWB3ig9i1VKe0wCvujk02O0WiMleNaRn2KJqw==";
};
};
"@commitlint/format-13.1.0" = {
name = "_at_commitlint_slash_format";
packageName = "@commitlint/format";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/format/-/format-13.1.0.tgz";
sha512 = "n46rYvzf+6Sm99TJjTLjJBkjm6JVcklt31lDO5Q+pCIV0NnJ4qIUcwa6wIL9a9Vqb1XzlMgtp27E0zyYArkvSg==";
};
};
"@commitlint/is-ignored-13.1.0" = {
name = "_at_commitlint_slash_is-ignored";
packageName = "@commitlint/is-ignored";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-13.1.0.tgz";
sha512 = "P6zenLE5Tn3FTNjRzmL9+/KooTXEI0khA2TmUbuei9KiycemeO4q7Xk7w7aXwFPNAbN0O9oI7z3z7cFpzKJWmQ==";
};
};
"@commitlint/lint-13.1.0" = {
name = "_at_commitlint_slash_lint";
packageName = "@commitlint/lint";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/lint/-/lint-13.1.0.tgz";
sha512 = "qH9AYSQDDTaSWSdtOvB3G1RdPpcYSgddAdFYqpFewlKQ1GJj/L+sM7vwqCG7/ip6AiM04Sry1sgmFzaEoFREUA==";
};
};
"@commitlint/load-13.1.0" = {
name = "_at_commitlint_slash_load";
packageName = "@commitlint/load";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/load/-/load-13.1.0.tgz";
sha512 = "zlZbjJCWnWmBOSwTXis8H7I6pYk6JbDwOCuARA6B9Y/qt2PD+NCo0E/7EuaaFoxjHl+o56QR5QttuMBrf+BJzg==";
};
};
"@commitlint/message-13.0.0" = {
name = "_at_commitlint_slash_message";
packageName = "@commitlint/message";
version = "13.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/message/-/message-13.0.0.tgz";
sha512 = "W/pxhesVEk8747BEWJ+VGQ9ILHmCV27/pEwJ0hGny1wqVquUR8SxvScRCbUjHCB1YtWX4dEnOPXOS9CLH/CX7A==";
};
};
"@commitlint/parse-13.1.0" = {
name = "_at_commitlint_slash_parse";
packageName = "@commitlint/parse";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/parse/-/parse-13.1.0.tgz";
sha512 = "xFybZcqBiKVjt6vTStvQkySWEUYPI0AcO4QQELyy29o8EzYZqWkhUfrb7K61fWiHsplWL1iL6F3qCLoxSgTcrg==";
};
};
"@commitlint/read-13.1.0" = {
name = "_at_commitlint_slash_read";
packageName = "@commitlint/read";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/read/-/read-13.1.0.tgz";
sha512 = "NrVe23GMKyL6i1yDJD8IpqCBzhzoS3wtLfDj8QBzc01Ov1cYBmDojzvBklypGb+MLJM1NbzmRM4PR5pNX0U/NQ==";
};
};
"@commitlint/resolve-extends-13.0.0" = {
name = "_at_commitlint_slash_resolve-extends";
packageName = "@commitlint/resolve-extends";
version = "13.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-13.0.0.tgz";
sha512 = "1SyaE+UOsYTkQlTPUOoj4NwxQhGFtYildVS/d0TJuK8a9uAJLw7bhCLH2PEeH5cC2D1do4Eqhx/3bLDrSLH3hg==";
};
};
"@commitlint/rules-13.1.0" = {
name = "_at_commitlint_slash_rules";
packageName = "@commitlint/rules";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/rules/-/rules-13.1.0.tgz";
sha512 = "b6F+vBqEXsHVghrhomG0Y6YJimHZqkzZ0n5QEpk03dpBXH2OnsezpTw5e+GvbyYCc7PutGbYVQkytuv+7xCxYA==";
};
};
"@commitlint/to-lines-13.0.0" = {
name = "_at_commitlint_slash_to-lines";
packageName = "@commitlint/to-lines";
version = "13.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-13.0.0.tgz";
sha512 = "mzxWwCio1M4/kG9/69TTYqrraQ66LmtJCYTzAZdZ2eJX3I5w52pSjyP/DJzAUVmmJCYf2Kw3s+RtNVShtnZ+Rw==";
};
};
"@commitlint/top-level-13.0.0" = {
name = "_at_commitlint_slash_top-level";
packageName = "@commitlint/top-level";
version = "13.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-13.0.0.tgz";
sha512 = "baBy3MZBF28sR93yFezd4a5TdHsbXaakeladfHK9dOcGdXo9oQe3GS5hP3BmlN680D6AiQSN7QPgEJgrNUWUCg==";
};
};
"@commitlint/types-13.1.0" = {
name = "_at_commitlint_slash_types";
packageName = "@commitlint/types";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/types/-/types-13.1.0.tgz";
sha512 = "zcVjuT+OfKt8h91vhBxt05RMcTGEx6DM7Q9QZeuMbXFk6xgbsSEDMMapbJPA1bCZ81fa/1OQBijSYPrKvtt06g==";
};
};
"@corestore/networker-1.2.0" = {
name = "_at_corestore_slash_networker";
packageName = "@corestore/networker";
@ -1696,6 +1822,16 @@ let
sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA==";
};
};
"cosmiconfig-7.0.1" = {
name = "cosmiconfig";
packageName = "cosmiconfig";
version = "7.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz";
sha512 =
"a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==";
};
};
"@cronvel/get-pixels-3.4.0" = {
name = "_at_cronvel_slash_get-pixels";
packageName = "@cronvel/get-pixels";
@ -4090,6 +4226,17 @@ let
sha512 = "iWtpXfn1Zh4Vm37BzY8OSJ60Y9TqNOjk8J+KLIwcql9EuP+0C/C4WUn+vIQMfmnut3MxRmAYFE2B/LFYrjGC5Q==";
};
};
"resolve-global-1.0.0" = {
name = "resolve-global";
packageName = "resolve-global";
version = "1.0.0";
src = fetchurl {
url =
"https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz";
sha512 =
"zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==";
};
};
"@netflix/nerror-1.1.3" = {
name = "_at_netflix_slash_nerror";
packageName = "@netflix/nerror";
@ -102355,6 +102502,227 @@ in
bypassCache = true;
reconstructLock = true;
};
"@commitlint/config-conventional" = nodeEnv.buildNodePackage {
name = "_at_commitlint_slash_config-conventional";
packageName = "@commitlint/config-conventional";
version = "13.1.0";
src = fetchurl {
url =
"https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz";
sha512 =
"zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw==";
};
dependencies = [
sources."array-ify-1.0.0"
sources."compare-func-2.0.0"
sources."conventional-changelog-conventionalcommits-4.6.0"
sources."dot-prop-5.3.0"
sources."is-obj-2.0.0"
sources."lodash-4.17.21"
sources."q-1.5.1"
];
buildInputs = globalBuildInputs;
meta = {
description =
"Shareable commitlint config enforcing conventional commits";
homepage = "https://github.com/conventional-changelog/commitlint#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"@commitlint/cli" = nodeEnv.buildNodePackage {
name = "_at_commitlint_slash_cli";
packageName = "@commitlint/cli";
version = "13.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz";
sha512 =
"xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w==";
};
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/helper-validator-identifier-7.14.9"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."has-flag-3.0.0"
sources."supports-color-5.5.0"
];
})
sources."@commitlint/ensure-13.1.0"
sources."@commitlint/execute-rule-13.0.0"
sources."@commitlint/format-13.1.0"
sources."@commitlint/is-ignored-13.1.0"
sources."@commitlint/lint-13.1.0"
sources."@commitlint/load-13.1.0"
sources."@commitlint/message-13.0.0"
sources."@commitlint/parse-13.1.0"
sources."@commitlint/read-13.1.0"
sources."@commitlint/resolve-extends-13.0.0"
sources."@commitlint/rules-13.1.0"
sources."@commitlint/to-lines-13.0.0"
(sources."@commitlint/top-level-13.0.0" // {
dependencies = [
sources."find-up-5.0.0"
sources."locate-path-6.0.0"
sources."p-limit-3.1.0"
sources."p-locate-5.0.0"
];
})
sources."@commitlint/types-13.1.0"
sources."@types/minimist-1.2.2"
sources."@types/normalize-package-data-2.4.1"
sources."@types/parse-json-4.0.0"
sources."JSONStream-1.3.5"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."array-ify-1.0.0"
sources."arrify-1.0.1"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
sources."chalk-4.1.2"
sources."cliui-7.0.4"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."compare-func-2.0.0"
sources."conventional-changelog-angular-5.0.12"
sources."conventional-commits-parser-3.2.1"
sources."cosmiconfig-7.0.1"
sources."cross-spawn-7.0.3"
sources."dargs-7.0.0"
sources."decamelize-1.2.0"
(sources."decamelize-keys-1.1.0" // {
dependencies = [ sources."map-obj-1.0.1" ];
})
sources."dot-prop-5.3.0"
sources."emoji-regex-8.0.0"
sources."error-ex-1.3.2"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
sources."execa-5.1.1"
sources."find-up-4.1.0"
sources."fs-extra-10.0.0"
sources."function-bind-1.1.1"
sources."get-caller-file-2.0.5"
sources."get-stream-6.0.1"
sources."git-raw-commits-2.0.10"
sources."global-dirs-0.1.1"
sources."graceful-fs-4.2.8"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."hosted-git-info-4.0.2"
sources."human-signals-2.1.0"
(sources."import-fresh-3.3.0" // {
dependencies = [ sources."resolve-from-4.0.0" ];
})
sources."indent-string-4.0.0"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-arrayish-0.2.1"
sources."is-core-module-2.6.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-obj-2.0.0"
sources."is-plain-obj-1.1.0"
sources."is-stream-2.0.1"
sources."is-text-path-1.0.1"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."json-parse-even-better-errors-2.3.1"
sources."jsonfile-6.1.0"
sources."jsonparse-1.3.1"
sources."kind-of-6.0.3"
sources."lines-and-columns-1.1.6"
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lru-cache-6.0.0"
sources."map-obj-4.2.1"
sources."meow-8.1.2"
sources."merge-stream-2.0.0"
sources."mimic-fn-2.1.0"
sources."min-indent-1.0.1"
sources."minimist-options-4.1.0"
sources."normalize-package-data-3.0.3"
sources."npm-run-path-4.0.1"
sources."onetime-5.1.2"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
sources."parent-module-1.0.1"
sources."parse-json-5.2.0"
sources."path-exists-4.0.0"
sources."path-key-3.1.1"
sources."path-parse-1.0.7"
sources."path-type-4.0.0"
sources."q-1.5.1"
sources."quick-lru-4.0.1"
(sources."read-pkg-5.2.0" // {
dependencies = [
sources."hosted-git-info-2.8.9"
sources."normalize-package-data-2.5.0"
sources."semver-5.7.1"
sources."type-fest-0.6.0"
];
})
(sources."read-pkg-up-7.0.1" // {
dependencies = [ sources."type-fest-0.8.1" ];
})
sources."readable-stream-3.6.0"
sources."redent-3.0.0"
sources."require-directory-2.1.1"
sources."resolve-1.20.0"
sources."resolve-from-5.0.0"
sources."resolve-global-1.0.0"
sources."safe-buffer-5.2.1"
sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
sources."spdx-correct-3.1.1"
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.10"
sources."split2-3.2.2"
sources."string-width-4.2.2"
sources."string_decoder-1.3.0"
sources."strip-ansi-6.0.0"
sources."strip-final-newline-2.0.0"
sources."strip-indent-3.0.0"
sources."supports-color-7.2.0"
sources."text-extensions-1.9.0"
sources."through-2.3.8"
sources."through2-4.0.2"
sources."trim-newlines-3.0.1"
sources."trim-off-newlines-1.0.1"
sources."type-fest-0.18.1"
sources."universalify-2.0.0"
sources."util-deprecate-1.0.2"
sources."validate-npm-package-license-3.0.4"
sources."which-2.0.2"
sources."wrap-ansi-7.0.0"
sources."y18n-5.0.8"
sources."yallist-4.0.0"
sources."yaml-1.10.2"
sources."yargs-17.1.1"
sources."yargs-parser-20.2.9"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Lint your commit messages";
homepage = "https://github.com/conventional-changelog/commitlint#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";

View File

@ -1,32 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, pytest-runner
, pytestCheckHook
, six
, html5lib
, setuptools
, packaging
, pythonOlder
}:
buildPythonPackage rec {
pname = "bleach";
version = "3.3.1";
version = "4.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1yma53plrlw2llaqxv8yk0g5al0vvlywwzym18b78m3rm6jq6r1h";
sha256 = "sha256-/6kiHGrCk5nMUPzDNHM2bt0M+NXiy7u2MpbcMn+2fMg=";
};
checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ packaging six html5lib setuptools ];
propagatedBuildInputs = [
packaging
six
html5lib
setuptools
];
# Disable network tests
checkPhase = ''
pytest -k "not protocols"
'';
checkInputs = [
pytestCheckHook
];
meta = {
disabledTests = [
# Disable network tests
"protocols"
];
pythonImportsCheck = [ "bleach" ];
meta = with lib; {
description = "An easy, HTML5, whitelisting HTML sanitizer";
longDescription = ''
Bleach is an HTML sanitizing library that escapes or strips markup and
@ -41,7 +52,7 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/mozilla/bleach";
downloadPage = "https://github.com/mozilla/bleach/releases";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ prikhi ];
license = licenses.asl20;
maintainers = with maintainers; [ prikhi ];
};
}

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-07UfTIZUbRD19BQ0xlZXlZo/oiVLDFNq+N2pDnWwbwI=";
sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk=";
};
sourceRoot = "source/${pname}";

View File

@ -0,0 +1,33 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, datasette
, pytestCheckHook
, pytest-asyncio
, sqlite-utils
}:
buildPythonPackage rec {
pname = "datasette-template-sql";
version = "1.0.2";
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "1ag5f62y445jscxnklcfd84pjinkknmrpk1kmm2j121p7484hrsn";
};
propagatedBuildInputs = [ datasette ];
checkInputs = [ pytestCheckHook pytest-asyncio sqlite-utils ];
pythonImportsCheck = [ "datasette_template_sql" ];
meta = with lib; {
description = "Datasette plugin for executing SQL queries from templates";
homepage = "https://datasette.io/plugins/datasette-template-sql";
license = licenses.asl20;
maintainers = [ maintainers.MostAwesomeDude ];
};
}

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "djangoql";
version = "0.15.0";
version = "0.15.2";
src = fetchPypi {
inherit pname version;
sha256 = "ddd876b640faf941aface6e8554dc7e79a79ec00fee12da8a20f9f74301f7943";
sha256 = "bd9d3accc5e84c439d22211676cf74ab746e557da9bc57afb27fee0ccd00e563";
};
propagatedBuildInputs = [ ply ];

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "ftfy";
version = "5.9";
version = "6.0.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9";
sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b";
};
propagatedBuildInputs = [

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "hiredis";
version = "1.1.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132";
sha256 = "81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a";
};
propagatedBuildInputs = [ redis ];

View File

@ -1,21 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, mypy
, typing-extensions
}:
buildPythonPackage rec {
pname = "immutables";
version = "0.15";
disabled = pythonOlder "3.5";
version = "0.16";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b";
src = fetchFromGitHub {
owner = "MagicStack";
repo = pname;
rev = "v${version}";
sha256 = "1f6nlpvrs41cjrnikx48qd0rlf7d89h6dzlr5zcndzsim7fgsmgz";
};
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [
typing-extensions
];
checkInputs = [
mypy
pytestCheckHook
];
disabledTests = [
# Version mismatch
"testMypyImmu"
];
pythonImportsCheck = [ "immutables" ];

View File

@ -1,35 +1,29 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
, six, twisted, werkzeug, incremental
, mock }:
{ lib, buildPythonPackage, fetchPypi, python
, attrs, enum34, hyperlink, incremental, six, twisted, typing, tubes, werkzeug, zope_interface
, hypothesis, treq
}:
buildPythonPackage rec {
pname = "klein";
version = "17.10.0";
version = "21.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0";
sha256 = "1mpydmz90d0n9dwa7mr6pgj5v0kczfs05ykssrasdq368dssw7ch";
};
patches = [
(fetchpatch {
name = "tests-expect-werkzeug-308.patch";
url = "https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch";
sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w";
})
];
propagatedBuildInputs = [ attrs enum34 hyperlink incremental six twisted typing tubes werkzeug zope_interface ];
propagatedBuildInputs = [ six twisted werkzeug incremental ];
checkInputs = [ mock twisted ];
checkInputs = [ hypothesis treq ];
checkPhase = ''
trial klein
${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES klein
'';
meta = with lib; {
description = "Klein Web Micro-Framework";
homepage = "https://github.com/twisted/klein";
license = licenses.mit;
maintainers = with maintainers; [ exarkun ];
};
}

View File

@ -0,0 +1,27 @@
{ lib
, fetchPypi
, buildPythonPackage
, cython
}:
buildPythonPackage rec {
pname = "memory-allocator";
version = "0.1.0";
src = fetchPypi {
inherit version;
pname = "memory_allocator";
sha256 = "sha256-UUcR71e3eAQIQpmWM+AVQxVtgHvrNjaIlHo5pURUln0=";
};
propagatedBuildInputs = [ cython ];
pythonImportsCheck = [ "memory_allocator" ];
meta = with lib; {
description = "An extension class to allocate memory easily with cython";
homepage = "https://github.com/sagemath/memory_allocator/";
maintainers = teams.sage.members;
license = licenses.lgpl3Plus;
};
}

View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pycdio";
version = "2.1.0";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
sha256 = "61734db8c554b7b1a2cb2da2e2c15d3f9f5973a57cfb06f8854c38029004a9f8";
};
prePatch = ''

View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyenchant";
version = "3.2.0";
version = "3.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "6b97e9a9f132fa7c9029a6635d821ccad67d4980e68186d02c765b4256b6f152";
sha256 = "5e206a1d6596904a922496f6c9f7d0b964b243905f401f5f2f40ea4d1f74e2cf";
};
propagatedBuildInputs = [ enchant2 ];

View File

@ -22,6 +22,15 @@
, setuptools
, ujson
, yapf
, withAutopep8 ? true
, withFlake8 ? true
, withMccabe ? true
, withPycodestyle ? true
, withPydocstyle ? true
, withPyflakes ? true
, withPylint ? true
, withRope ? true
, withYapf ? true
}:
buildPythonPackage rec {
@ -37,21 +46,20 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
autopep8
flake8
jedi
mccabe
pluggy
pycodestyle
pydocstyle
pyflakes
pylint
python-lsp-jsonrpc
rope
setuptools
ujson
yapf
];
] ++ lib.optional withAutopep8 autopep8
++ lib.optional withFlake8 flake8
++ lib.optional withMccabe mccabe
++ lib.optional withPycodestyle pycodestyle
++ lib.optional withPydocstyle pydocstyle
++ lib.optional withPyflakes pyflakes
++ lib.optional withPylint pylint
++ lib.optional withRope rope
++ lib.optional withYapf yapf;
checkInputs = [
flaky
@ -62,6 +70,19 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config";
disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py"
++ lib.optional (!withRope) "test/plugins/test_completion.py"
++ lib.optional (!withFlake8) "test/plugins/test_flake8_lint.py"
++ lib.optional (!withMccabe) "test/plugins/test_mccabe_lint.py"
++ lib.optional (!withPycodestyle) "test/plugins/test_pycodestyle_lint.py"
++ lib.optional (!withPydocstyle) "test/plugins/test_pydocstyle_lint.py"
++ lib.optional (!withPyflakes) "test/plugins/test_pyflakes_lint.py"
++ lib.optional (!withPylint) "test/plugins/test_pylint_lint.py"
++ lib.optional (!withRope) "test/plugins/test_rope_rename.py"
++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py";
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \

View File

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "stumpy";
version = "1.8.0";
version = "1.9.2";
src = fetchFromGitHub {
owner = "TDAmeritrade";
repo = "stumpy";
rev = "v${version}";
sha256 = "0s7pamn39ymm1lp9z28isbdrd6ix98y9i4lfdk3ii95wvd3y50my";
sha256 = "0x5kac8fqsi3fkfwjdn0d7anslprxaz6cizky9cyj0rpbp0b0yc3";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchPypi, python
, characteristic, six, twisted
}:
buildPythonPackage rec {
pname = "tubes";
version = "0.2.0";
src = fetchPypi {
pname = "Tubes";
inherit version;
sha256 = "0sg1gg2002h1xsgxigznr1zk1skwmhss72dzk6iysb9k9kdgymcd";
};
propagatedBuildInputs = [ characteristic six twisted ];
checkPhase = ''
${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tubes
'';
pythonImportsCheck = [ "tubes" ];
meta = with lib; {
description = "a data-processing and flow-control engine for event-driven programs";
homepage = "https://github.com/twisted/tubes";
license = licenses.mit;
maintainers = with maintainers; [ exarkun ];
};
}

View File

@ -13,18 +13,19 @@
, service-identity
, setuptools
, idna
, typing-extensions
}:
buildPythonPackage rec {
pname = "Twisted";
version = "20.3.0";
version = "21.7.0";
src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p";
extension = "tar.gz";
sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic";
};
propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];
propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ];
passthru.extras.tls = [ pyopenssl service-identity idna ];
@ -32,7 +33,7 @@ buildPythonPackage rec {
# twisted.python.runtime.platform.supportsINotify() == False
patchPhase = lib.optionalString stdenv.isLinux ''
substituteInPlace src/twisted/python/_inotify.py --replace \
"ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
"ctypes.util.find_library(\"c\")" "'${stdenv.glibc.out}/lib/libc.so.6'"
'';
# Generate Twisted's plug-in cache. Twisted users must do it as well. See

View File

@ -1,4 +1,4 @@
{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
{ lib, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
, GeoIP, isPy27}:
@ -18,21 +18,18 @@ buildPythonPackage rec {
sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
};
# zope.interface issue
doCheck = isPy3k;
# Skip a failing test until fixed upstream:
# https://github.com/meejah/txtorcon/issues/250
# Based on what txtorcon tox.ini will automatically test, allow back as far
# as Python 3.5.
disabled = pythonOlder "3.5";
checkPhase = ''
pytest --ignore=test/test_util.py .
${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test
'';
meta = {
description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";
homepage = "https://github.com/meejah/txtorcon";
maintainers = with lib.maintainers; [ jluttine ];
# Currently broken on Python 2.7. See
# https://github.com/NixOS/nixpkgs/issues/71826
broken = isPy27;
maintainers = with lib.maintainers; [ jluttine exarkun ];
license = lib.licenses.mit;
};
}

View File

@ -1,8 +1,8 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytest
, pythonOlder
, pytestCheckHook
, pyyaml
, ruamel_yaml
}:
@ -11,7 +11,7 @@ buildPythonPackage rec {
pname = "yamale";
version = "3.0.8";
disabled = !isPy3k;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "23andMe";
@ -26,8 +26,9 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
];
pythonImportsCheck = [ "yamale" ];
meta = with lib; {

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "0.6.3";
version = "0.6.4";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-rGtaxa75cFv7LjRI5yuTgKW7F2t8llejcrnjKlUdyEY=";
sha256 = "sha256-etnHr0epu7L/qIYNnJ2NOEL1ZmE/U62KpXSsiWsJJn0=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "grpc-tools";
version = "1.10.0";
version = "1.11.2";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-node";
rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged
sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm";
rev = "grpc-tools@${version}";
sha256 = "00432y19pjcimwachjcqpzra21vzmlqchhhlqxnk98bfh25kxdcb";
fetchSubmodules = true;
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terracognita";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
sha256 = "119rbjg3lsm73mdw6ymvslyj4y4ghj3a3dvxnvkrm55v9g0s03l9";
sha256 = "sha256-n+aCNKGujvmXSFmLo2h1d29NFgdk/G+ehGwMHCJQoU8=";
};
vendorSha256 = "1fvp53d694a4aj8l4hj7q2lvyadn9y9c52q4bzl6yrfjq6708y8d";
vendorSha256 = "sha256-i6AkLAXGOXe3jmAKKQN6aX/DvovSS9CYFYO28bYIdUw=";
doCheck = false;

View File

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.6.2";
sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547";
version = "16.7.0";
sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}

View File

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "filtron";
version = "0.2.0";
src = fetchFromGitHub {
owner = "asciimoo";
repo = "filtron";
rev = "v${version}";
sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26";
};
vendorSha256 = "05q2g591xl08h387mm6njabvki19yih63dfsafgpc9hyk5ydf2n9";
# The upstream test checks are obsolete/unmaintained.
doCheck = false;
meta = with lib; {
description = "Reverse HTTP proxy to filter requests by different rules.";
homepage = "https://github.com/asciimoo/filtron";
license = licenses.agpl3;
maintainers = [ maintainers.dasj19 ];
platforms = platforms.linux;
};
}

View File

@ -30,14 +30,14 @@ let
php80-unit = php80.override phpConfig;
in stdenv.mkDerivation rec {
version = "1.24.0";
version = "1.25.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = pname;
rev = version;
sha256 = "0214dvwz31hxjxnqk3fkqhn2xznaqdrb96m5s2k8ll8rldmk1gd6";
sha256 = "sha256-8Xv7YTvwuI0evBO1Te4oI1IoJ0AnK8OVZoZTYtfYKfw=";
};
nativeBuildInputs = [ which ];

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "icinga2${nameSuffix}";
version = "2.13.0";
version = "2.13.1";
src = fetchFromGitHub {
owner = "icinga";
repo = "icinga2";
rev = "v${version}";
sha256 = "sha256-ibZruP9/8D3DJSTFkIi84ADPGjwWeyTCHv/tTEcy6ns=";
sha256 = "sha256-cGVUNO3p00bkPd4tPbipevuixHz8ptk6W8y1rl3dge8=";
};
patches = [

View File

@ -13,15 +13,15 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU=";
sha256 = "sha256-3XwnlSPlyEE4oznXK59/rooZLtj1+VbozprXU2W0J5I=";
};
cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ=";
cargoSha256 = "sha256-g5yfE/s1N6EgI2ikiJbypI4iQbXPu6zGNoSVC6ldoWo=";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.174.2";
version = "0.175.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-o/rDqYjOI+HxThQA7cflWUhCdsb6m4XOuzI753upmio=";
sha256 = "sha256-4mdQTcaIIGNZ0pgVNfy3LBtc1te2dpkMA29nAUzg9aE=";
};
vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0=";
vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk=";
buildFlagsArray = [
"-ldflags="

View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, popt, ncurses, python3, readline, lib }:
stdenv.mkDerivation rec {
pname = "OpenIPMI";
version = "2.0.31";
src = fetchurl {
url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz";
sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh";
};
buildInputs = [ ncurses popt python3 readline ];
outputs = [ "out" "lib" "dev" "man" ];
meta = with lib; {
homepage = "https://openipmi.sourceforge.io/";
description = "A user-level library that provides a higher-level abstraction of IPMI and generic services";
license = with licenses; [ gpl2Only lgpl2Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ arezvov SuperSandro2000 ];
};
}

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "2.10.4";
version = "2.10.5";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
sha256 = "0gw7b6gvzp2f7la1mb74bg92nd8zk5fiajsihcqpni2a79js1s6y";
sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ=";
};
vendorSha256 = "15r97mpsailsa4ja6mh5wrjcjacppm0vwma9q6znsa2f1x2apc6y";
vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc=";
postInstall = ''
mkdir -p $data/share/vale

View File

@ -104,6 +104,7 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://cloudinit.readthedocs.org";
description = "Provides configuration and customization of cloud instance";
license = with licenses; [ asl20 gpl3Plus ];
maintainers = with maintainers; [ madjar phile314 ];
platforms = platforms.all;
};

View File

@ -258,6 +258,8 @@ with pkgs;
comedilib = callPackage ../development/libraries/comedilib { };
commitlint = nodePackages."@commitlint/cli";
containerpilot = callPackage ../applications/networking/cluster/containerpilot { };
coordgenlibs = callPackage ../development/libraries/coordgenlibs { };
@ -6716,6 +6718,8 @@ with pkgs;
np2kai = callPackage ../misc/emulators/np2kai { };
openipmi = callPackage ../tools/system/openipmi { };
ox = callPackage ../applications/editors/ox { };
file-rename = callPackage ../tools/filesystems/file-rename { };
@ -15364,6 +15368,8 @@ with pkgs;
filter-audio = callPackage ../development/libraries/filter-audio {};
filtron = callPackage ../servers/filtron {};
flann = callPackage ../development/libraries/flann { };
flatcc = callPackage ../development/libraries/flatcc { };
@ -18916,13 +18922,9 @@ with pkgs;
theft = callPackage ../development/libraries/theft { };
thrift = callPackage ../development/libraries/thrift {
inherit (pythonPackages) twisted;
};
thrift = callPackage ../development/libraries/thrift { };
thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix {
inherit (pythonPackages) twisted;
};
thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };
tidyp = callPackage ../development/libraries/tidyp { };
@ -26875,6 +26877,8 @@ with pkgs;
qiv = callPackage ../applications/graphics/qiv { };
premid = callPackage ../applications/misc/premid { };
processing = callPackage ../applications/graphics/processing {
jdk = oraclejdk8;
};

View File

@ -1842,6 +1842,8 @@ in {
datasette = callPackage ../development/python-modules/datasette { };
datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { };
datashader = callPackage ../development/python-modules/datashader {
dask = self.dask.override { withExtraComplete = true; };
};
@ -4469,6 +4471,8 @@ in {
memcached = callPackage ../development/python-modules/memcached { };
memory-allocator = callPackage ../development/python-modules/memory-allocator { };
memory_profiler = callPackage ../development/python-modules/memory_profiler { };
mercantile = callPackage ../development/python-modules/mercantile { };
@ -8920,6 +8924,8 @@ in {
ttp = callPackage ../development/python-modules/ttp { };
tubes = callPackage ../development/python-modules/tubes { };
tunigo = callPackage ../development/python-modules/tunigo { };
tubeup = callPackage ../development/python-modules/tubeup { };

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wswkgwhmfk5j76ar76plhaxna12x0cyf2di57azahlcv88rrwra";
sha256 = "0ilq5mniarm0zlvnkagqj9n9p73ljrhphciz02aymrpfxxxclz2x";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "101r0x4lhzp23hksch7z24ajvp549lskxn2cr7pbgr64jjy6v17y";
sha256 = "16azdnjws215clb056b9mabglx4b8f61hr82hv7hm80dmn89zqq6";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mxqpiwgqam5vfk8wsfyj4dpxq0xqqvfbcwx1i4p9n1ahrx7wv7f";
sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pj4xz316b3z56vpb8pnrkwj4rlf3hgas5fhddk6yh7ifrl30sc9";
sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fn488la8dllfg5zhm74k8y23xl9czrzzs55b9v624j43wjhfxcl";
sha256 = "0m4fy4qqh09vnzbhx383vjdfid6fzbs49bzzg415x05nmmjkx582";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jqybz7h11xkjpqdffb9gphwmd56lms9xqskza00wd2pswxcwkn4";
sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q00vrknnnhmg02nik06ivrmz7hnq5snpy653kdpskvp4c9ys55c";
sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
activemodel = {
dependencies = ["activesupport"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjy8fg7n5wwv29ngvvdf5r6815s5f0knzyswxh8w6z8f8qj5wr7";
sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18897s9h9kha8vgky1yfq4x91m3p81k6rkrb1fgjlnqnvarh9vg0";
sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03gb6jbvdzm0xlr2g393jvf980ybjf9zzgspl0p4ixh3lcxxr51w";
sha256 = "17knzz9fvqg4x582vy0xmlgjkxfb13xyzl2rgw19qfma86hxsvvi";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
addressable = {
groups = ["default"];
@ -332,10 +332,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ljsx1inbbzj8njpk4sb40kdis6pjwpgcpy3677dm45bxw21dmkv";
sha256 = "1yi4dgl6w6fs35szsxb4z24d7svmqgxyr4ma4hsrcsb2pv4qk3xj";
type = "gem";
};
version = "1.0.5";
version = "1.1.0";
};
cocoapods-browser = {
dependencies = ["cocoapods"];
@ -395,10 +395,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn";
sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
cocoapods-dependencies = {
dependencies = ["ruby-graphviz"];
@ -519,10 +519,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6";
sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
cocoapods-stats = {
groups = ["default"];
@ -1559,10 +1559,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m";
sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw";
type = "gem";
};
version = "2.11.0";
version = "2.12.0";
};
mab = {
groups = ["default"];
@ -1876,10 +1876,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iav4jrklvm8938bxhby0khs36mdndhvwia4hc85zxcb0yl1k8ll";
sha256 = "1q71y7pdihz26m3n2fnm2hd7wllmnxgxk6vcbbh27rqa14q5x5yi";
type = "gem";
};
version = "1.12.2";
version = "1.12.3";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@ -2109,10 +2109,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k3d3acac2qn9fg185z3y79nvg4ghr4lyhqiz6mbwlsd7r2nd8mh";
sha256 = "1y59m2x8rdc581bjgyyr9dabi3vk3frqhhpbb5ldpbj622kxfpbz";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -2131,10 +2131,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
sha256 = "0whc4d4jqm8kd4x3jzbax54sscm1k4pfkr5d1gpapjbzqkfj77yy";
type = "gem";
};
version = "1.3.0";
version = "1.4.1";
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@ -2142,10 +2142,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hwp0qwkphp3fvbsq6ljp8s99v621si9bgqihysz5bv1d1z52mm4";
sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
rainbow = {
groups = ["default"];