colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-16 18:01:52 +00:00 committed by GitHub
commit 14be0e5a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 210 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -992,6 +992,12 @@ signald -d /var/lib/signald/db \
<literal>[ &quot;lua54&quot; &quot;luau&quot; ]</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>ocamlPackages.ocaml_extlib</literal> has been renamed
to <literal>ocamlPackages.extlib</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.fetchNextcloudApp</literal> has been rewritten

2
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -307,6 +307,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
- `ocamlPackages.ocaml_extlib` has been renamed to `ocamlPackages.extlib`.
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
are no longer accepted.

3
nixos/modules/system/boot/systemd.nix
View File

@ -558,7 +558,8 @@ in
# Environment of PID 1
systemd.managerEnvironment = {
# Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
PATH = lib.makeBinPath config.system.fsPackages;
# util-linux is needed for the main fsck utility wrapping the fs-specific ones
PATH = lib.makeBinPath (config.system.fsPackages ++ [cfg.package.util-linux]);
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
TZDIR = "/etc/zoneinfo";
# If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable

6
nixos/modules/tasks/filesystems.nix
View File

@ -300,11 +300,7 @@ in
boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
# Add the mount helpers to the system path so that `mount' can find them.
system.fsPackages = [
pkgs.dosfstools
# This is needed for the main fsck utility wrapping the fs-specific ones.
pkgs.util-linux
];
system.fsPackages = [ pkgs.dosfstools ];
environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;

32
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, tree-sitter, nodejs }:
{ lib, callPackage, tree-sitter, neovim, runCommand }:
self: super:
@ -21,7 +21,7 @@ let
replaced = lib.replaceStrings [ "_" ] [ "-" ] k;
in
map (lib.flip lib.nameValuePair v)
([ ("tree-sitter-${k}") ] ++ lib.optionals (k != replaced) [
([ "tree-sitter-${k}" ] ++ lib.optionals (k != replaced) [
replaced
"tree-sitter-${replaced}"
]))
@ -44,15 +44,37 @@ let
ln -s ${grammars} parser
'';
});
withAllGrammars = withPlugins (_: allGrammars);
in
{
passthru = {
inherit builtGrammars allGrammars withPlugins;
inherit builtGrammars allGrammars withPlugins withAllGrammars;
tests.builtGrammars = lib.recurseIntoAttrs builtGrammars;
tests.check-queries =
let
nvimWithAllGrammars = neovim.override {
configure.packages.all.start = [ withAllGrammars ];
};
in
runCommand "nvim-treesitter-check-queries"
{
nativeBuildInputs = [ nvimWithAllGrammars ];
CI = true;
}
''
touch $out
export HOME=$(mktemp -d)
ln -s ${withAllGrammars}/CONTRIBUTING.md .
withAllGrammars = withPlugins (_: allGrammars);
nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log
if grep -q Warning log; then
echo "Error: warnings were emitted by the check"
exit 1
fi
'';
};
meta.maintainers = with lib.maintainers; [ figsoda ];

4
pkgs/applications/misc/meerk40t/default.nix
View File

@ -11,14 +11,14 @@ let
in
buildPythonApplication rec {
pname = "MeerK40t";
version = "0.8.0031";
version = "0.8.1000";
format = "setuptools";
src = fetchFromGitHub {
owner = "meerk40t";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7Vc7Z+mxy+xRbUBeivkqVwO86ovZDo42M4G0ZD23vMk=";
hash = "sha256-YCcnqaH4Npmct5IBHsnufswRz8bS7mUb1YFwTta/Dxc=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchFromGitHub
, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
, extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
, tiny_httpd
, ounit
}:
@ -18,7 +18,7 @@ buildDunePackage rec {
doCheck = true;
checkInputs = [ ounit ];
buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
meta = {
inherit (src.meta) homepage;

2
pkgs/applications/science/logic/beluga/default.nix
View File

@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
useDune2 = true;
buildInputs = with ocamlPackages; [
gen sedlex ocaml_extlib dune-build-info linenoise
gen sedlex extlib dune-build-info linenoise
];
postPatch = ''

14
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -189,9 +189,21 @@ in ''
EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
# We want to read part of every line that has cargo:rustc-env= prefix and
# export it as environment variables. This turns out tricky if the lines
# have spaces: we can't wrap the command in double quotes as that captures
# all the lines in single output. We can't use while read loop because
# exporting from inside of it doesn't make it to the outside scope. We
# can't use xargs as export is a built-in and does not work from it. As a
# last resort then, we change the IFS so that the for loop does not split
# on spaces and reset it after we are done. See ticket #199298.
#
_OLDIFS="$IFS"
IFS=$'\n'
for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
export $env
export "$env"
done
IFS="$_OLDIFS"
CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g")
grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \

4
pkgs/data/themes/adw-gtk3/default.nix
View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "adw-gtk3";
version = "4.0";
version = "4.1";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PR0MmTOXGrMicRLXqIOUpCVSu68HeCaG2z/o+lbHnjk=";
sha256 = "sha256-7E+eBbsavWdraCxxtwFdvFkxTWN/XMz8obvnpxf6PQc=";
};
nativeBuildInputs = [

4
pkgs/development/compilers/haxe/default.nix
View File

@ -13,7 +13,7 @@ let
sha
dune_2
luv
ocaml_extlib
extlib
] else if lib.versionAtLeast version "4.0"
then with ocaml-ng.ocamlPackages_4_10; [
ocaml
@ -25,7 +25,7 @@ let
sha
dune_2
luv
ocaml_extlib-1-7-7
extlib-1-7-7
] else with ocaml-ng.ocamlPackages_4_05; [
ocaml
camlp4

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1189";
version = "1.11.1.1200";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-wg5iN5/UT6jb68vF98mgSl21fLG9BdEcXH0EEmvnEOs=";
sha256 = "sha256-296cS91Ct9paZ9h5VItFKOSQPOc+4mwylia2Fl1Xthw=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.100.0";
version = "1.101.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-p7IqvxV9C3Ej0xNUA9iRtmkXrUgGWx1OR+/SBDzhcZE=";
hash = "sha256-EhFxun80s5tNZT4d7vbszTfHbYK9X3PohsQl20wRzlg=";
};
patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-Wfk2cHGTO2ZvhVAvOs6xOSnldyrkiAinMc6ErLy8QpA=";
hash = "sha256-8uu4i4WfW9pmdLAWWUU1QP09B1/ws+DeVf8baYfikw4=";
};
nativeBuildInputs = [

4
pkgs/development/ocaml-modules/cudf/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, ocaml_extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
stdenv.mkDerivation {
pname = "ocaml${ocaml.version}-cudf";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
stdlib-shims
];
propagatedBuildInputs = [
ocaml_extlib
extlib
];
checkTarget = [

4
pkgs/development/ocaml-modules/dose3/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchFromGitLab
, camlzip, ocamlgraph, parmap, re, stdlib-shims
, base64, bz2, ocaml_extlib, cudf
, base64, bz2, extlib, cudf
, dpkg, git, ocaml, ounit, python39, python39Packages
}:
@ -27,7 +27,7 @@ buildDunePackage rec {
bz2
camlzip
cudf
ocaml_extlib
extlib
ocamlgraph
re
stdlib-shims

29
pkgs/development/ocaml-modules/extlib/1.7.7.nix
View File

@ -1,14 +1,33 @@
# Older version of extlib for Haxe 4.0 and 4.1.
# May be replaceable by the next extlib + extlib-base64 release.
{ lib, fetchurl, ocaml, ocaml_extlib }:
{ stdenv, lib, fetchurl, ocaml, findlib, cppo
# De facto, option minimal seems to be the default. See the README.
, minimal ? true
}:
ocaml_extlib.overrideAttrs (x: rec {
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-extlib";
version = "1.7.7";
src = fetchurl {
url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
url = "https://ygrek.org/p/release/ocaml-extlib/extlib-${version}.tar.gz";
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
};
meta = x.meta // {
nativeBuildInputs = [ ocaml findlib cppo ];
strictDeps = true;
createFindlibDestdir = true;
makeFlags = lib.optional minimal "minimal=1";
meta = {
homepage = "https://github.com/ygrek/ocaml-extlib";
description = "Enhancements to the OCaml Standard Library modules";
license = lib.licenses.lgpl21Only;
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.sternenseemann ];
broken = lib.versionAtLeast ocaml.version "4.12";
};
})
}

26
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -1,30 +1,24 @@
{ stdenv, lib, fetchurl, ocaml, findlib, cppo
# De facto, option minimal seems to be the default. See the README.
, minimal ? true
}:
{ buildDunePackage, lib, fetchurl, cppo }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-extlib";
version = "1.7.8";
buildDunePackage rec {
pname = "extlib";
version = "1.7.9";
minimalOCamlVersion = "4.02";
src = fetchurl {
url = "https://ygrek.org/p/release/ocaml-extlib/extlib-${version}.tar.gz";
sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k";
url = "https://ygrek.org/p/release/ocaml-${pname}/${pname}-${version}.tar.gz";
sha512 = "2386ac69f037ea520835c0624d39ae9fbffe43a20b18e247de032232ed6f419d667b53d2314c6f56dc71d368bf0b6201a56c2f3f2a5bdfd933766c5a6cb98768";
};
nativeBuildInputs = [ ocaml findlib cppo ];
nativeBuildInputs = [ cppo ];
strictDeps = true;
createFindlibDestdir = true;
makeFlags = lib.optional minimal "minimal=1";
doCheck = true;
meta = {
homepage = "https://github.com/ygrek/ocaml-extlib";
description = "Enhancements to the OCaml Standard Library modules";
license = lib.licenses.lgpl21Only;
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.sternenseemann ];
};
}

4
pkgs/development/ocaml-modules/lustre-v6/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, ocaml_extlib, lutils, rdbg }:
{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg }:
buildDunePackage rec {
pname = "lustre-v6";
@ -14,7 +14,7 @@ buildDunePackage rec {
};
propagatedBuildInputs = [
ocaml_extlib
extlib
lutils
rdbg
];

4
pkgs/development/ocaml-modules/tcslib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, extlib, num }:
buildOasisPackage rec {
pname = "tcslib";
@ -14,7 +14,7 @@ buildOasisPackage rec {
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ ocaml_extlib num ];
propagatedBuildInputs = [ extlib num ];
meta = {
homepage = "https://github.com/tcsprojects/tcslib";

12
pkgs/development/python-modules/aprslib/default.nix
View File

@ -1,21 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, mox3
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aprslib";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "rossengeorgiev";
repo = "aprs-python";
rev = "v${version}";
hash = "sha256-wWlzOFhWJ7hJeM3RWsPTEsLjRzN4SMXsb2Cd612HB4w=";
hash = "sha256-2bYTnbJ8wF/smTpZ2tV+3ZRae7FpbNBtXoaR2Sc9Pek=";
};
patches = [
(fetchpatch {
url = "https://github.com/rossengeorgiev/aprs-python/commit/c2a0f18ce028a4cced582567a73d57f0d03cd00f.patch";
hash = "sha256-uxiLIagz1PIUUa6/qdBW15yhm/0QXqznVzZnzUVCWuQ=";
})
];
checkInputs = [
mox3
pytestCheckHook

4
pkgs/development/python-modules/graphviz/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "graphviz";
version = "0.20";
version = "0.20.1";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "xflr6";
repo = "graphviz";
rev = version;
hash = "sha256-QyZwXxRbcMushxh/Ypy+v4FOTM4H1u5b7IZMSVgLyEs=";
hash = "sha256-plhWG9mE9DoTMg7mWCvFLAgtBx01LAgJ0gQ/mqBU3yc=";
};
patches = [

4
pkgs/development/python-modules/huawei-lte-api/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "huawei-lte-api";
version = "1.6.6";
version = "1.6.7";
format = "setuptools";
disabled = pythonOlder "3.4";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Salamek";
repo = "huawei-lte-api";
rev = "refs/tags/${version}";
hash = "sha256-LVWhHSHiixjZjakXgGnEIcJkQ0+VU3Xhlh8uY76Prxg=";
hash = "sha256-CMGOR5b8Uc8ZIuMlkCkxZqTqUA/Im2RgXK4uFZdoHeU=";
};
postPatch = ''

2
pkgs/development/python-modules/ibm-watson/default.nix
View File

@ -5,7 +5,6 @@
, pytestCheckHook
, python-dotenv
, pytest-rerunfailures
, tox
, requests
, python-dateutil
, websocket-client
@ -39,7 +38,6 @@ buildPythonPackage rec {
pytestCheckHook
python-dotenv
pytest-rerunfailures
tox
];
postPatch = ''

13
pkgs/development/python-modules/keyring/default.nix
View File

@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "keyring";
version = "23.9.3";
version = "23.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-abAd2DxC9ZAlD+eh9QP8IpsU3oOFcxSxkzo92/WVxKU=";
hash = "sha256-rRkiY+LN1fEodd7cLaE1NDWafnYOd/jQS1CWioIcI2E=";
};
nativeBuildInputs = [
@ -32,11 +32,10 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isLinux [
jeepney
secretstorage
] ++ lib.optionals (pythonOlder "3.10") [
] ++ lib.optionals (pythonOlder "3.12") [
importlib-metadata
];
pythonImportsCheck = [
"keyring"
"keyring.backend"
@ -46,11 +45,6 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# E ValueError: too many values to unpack (expected 1)
"test_entry_point"
];
disabledTestPaths = [
"tests/backends/test_macOS.py"
];
@ -58,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Store and access your passwords safely";
homepage = "https://github.com/jaraco/keyring";
changelog = "https://github.com/jaraco/keyring/blob/v${version}/CHANGES.rst";
license = licenses.mit;
maintainers = with maintainers; [ lovek323 dotlambda ];
platforms = platforms.unix;

39
pkgs/development/python-modules/latexify-py/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, dill
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "latexify-py";
version = "0.2.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "google";
repo = "latexify_py";
rev = "refs/tags/v${version}";
hash = "sha256-b0/cKMfIONVd6A5AYRyLx/qsFVpUjeAsadQyu/mPYxo=";
};
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [ dill ];
preCheck = ''
cd src
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "latexify" ];
meta = with lib; {
description = "Generates LaTeX math description from Python functions";
homepage = "https://github.com/google/latexify_py";
license = licenses.asl20;
maintainers = with maintainers; [ prusnak ];
};
}

38
pkgs/games/keeperrl/default.nix
View File

@ -1,17 +1,27 @@
{ lib, stdenv, fetchFromGitHub, requireFile
, openal, curl, libogg, libvorbis
, SDL2, SDL2_image, zlib
{ lib
, stdenv
, fetchFromGitHub
, requireFile
, openal
, curl
, libogg
, libvorbis
, SDL2
, SDL2_image
, zlib
, clang
, libtheora
, unfree_assets ? false }:
stdenv.mkDerivation rec {
pname = "keeperrl";
version = "alpha28";
version = "alpha34";
free-src = fetchFromGitHub {
owner = "miki151";
repo = "keeperrl";
rev = version;
sha256 = "0isj8ijn5a89m2r5cxk4lcsq0cydx7c0h87vgr8v5cndm3rd27cy";
sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
};
assets = if unfree_assets then requireFile rec {
@ -28,7 +38,7 @@ stdenv.mkDerivation rec {
"nix-prefetch-url file://\$PWD/${name}".
'';
sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nk53";
sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll";
} else null;
sourceRoot = "source";
@ -40,7 +50,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
openal curl libogg libvorbis SDL2 SDL2_image zlib
openal curl libogg libvorbis libtheora SDL2 SDL2_image zlib clang
];
NIX_CFLAGS_COMPILE = [
@ -49,11 +59,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "OPT=true"
"RELEASE=true"
"DATA_DIR=$(out)/share"
"ENABLE_LOCAL_USER_DIR=true"
];
makeFlags = [
"OPT=true"
"RELEASE=true"
"DATA_DIR=$(out)/share"
"ENABLE_LOCAL_USER_DIR=true"
"NO_STEAMWORKS=true"
];
installPhase = ''
install -Dm755 keeper $out/bin/keeper
@ -68,7 +80,7 @@ stdenv.mkDerivation rec {
description = "A dungeon management rogue-like";
homepage = "https://keeperrl.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ onny ];
# TODO: Add OS X
platforms = [ "i686-linux" "x86_64-linux" ];
};

6
pkgs/servers/consul/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
version = "1.13.3";
version = "1.14.0";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
sha256 = "sha256-pTBeR7WP25Ng1OiVkZ60wTYnSOWahkx6LYHScnX0fWw=";
sha256 = "sha256-so+JtDcIWRF8HaoiqalxKxzl8ITonDABXK07guwIYRA=";
};
passthru.tests.consul = nixosTests.consul;
@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
vendorSha256 = "sha256-ZarkaUP9jwwP9FReaVAfPaQzKFETUEHsCsVDGFYKJvU=";
vendorSha256 = "sha256-cCfC/PcpNRQ3UL7OGk2ydCN8wNPvyJTGYMANfqpMHKg=";
doCheck = false;

4
pkgs/servers/mail/sympa/default.nix
View File

@ -61,13 +61,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sympa";
version = "6.2.68";
version = "6.2.70";
src = fetchFromGitHub {
owner = "sympa-community";
repo = pname;
rev = version;
sha256 = "sha256-biTF2We9/ZBFBNpltyJonAe5tpXz+eNam+Bu6esJPiY=";
sha256 = "sha256-/gaJ17IwB6ZC7OT9gxA5uUhTAHXeqsEh/x4AzAARups=";
};
configureFlags = [

6
pkgs/servers/search/meilisearch/default.nix
View File

@ -8,7 +8,7 @@
, nixosTests
}:
let version = "0.29.1";
let version = "0.29.2";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@ -17,9 +17,9 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "v${version}";
sha256 = "sha256-1zZqarUxaSlux2ndSnQ3qAs+if2MxN9FPuEAxDnVv28=";
sha256 = "sha256-ltfJUwz/QFwsXJzES0GVOaCXh7QbziuKMILQNvaCG+4=";
};
cargoSha256 = "sha256-VhCpqCBQhr4GgHEUJ30KPGMbN3EqhdJRKr7/PGYQ3OY=";
cargoSha256 = "sha256-HrPve9x7dSQx/CTxV7t4+SUu4gRmVNRHIZj+2S3CbLQ=";
# Default features include mini dashboard which downloads something from the internet.
buildNoDefaultFeatures = true;
buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];

6
pkgs/tools/security/jwx/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "jwx";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "lestrrat-go";
repo = pname;
rev = "v${version}";
hash = "sha256-7X+UeguaWk7+IQ2/PgoFZR7OKpOTzgT/mo8k4eSl53A=";
hash = "sha256-rnzRl7pvX/qBteEbgXrFCzAvtP9Izy6YAZJhy/4nXl4=";
};
vendorSha256 = "sha256-XZk/cwbfg05RkUFMs+AHTfEZiEvqYYoPoSVZVFM967g=";
vendorSha256 = "sha256-96Vxl84+xjRGxudBOaMX8LpRxfYqC2c+hVsipT0NLwE=";
sourceRoot = "source/cmd/jwx";

21
pkgs/top-level/ocaml-packages.nix
View File

@ -411,6 +411,12 @@ let
ethernet = callPackage ../development/ocaml-modules/ethernet { };
extlib = extlib-1-7-9;
extlib-1-7-9 = callPackage ../development/ocaml-modules/extlib { };
extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
@ -561,9 +567,7 @@ let
iter = callPackage ../development/ocaml-modules/iter { };
javalib = callPackage ../development/ocaml-modules/javalib {
extlib = ocaml_extlib;
};
javalib = callPackage ../development/ocaml-modules/javalib { };
dypgen = callPackage ../development/ocaml-modules/dypgen { };
@ -1260,12 +1264,6 @@ let
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = ocaml_extlib-1-7-8;
ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
ocurl = callPackage ../development/ocaml-modules/ocurl { };
@ -1621,10 +1619,7 @@ let
omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse {
# needs Base64 module
ocaml_extlib = ocaml_extlib.override { minimal = false; };
};
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
hol_light = callPackage ../applications/science/logic/hol_light { };

2
pkgs/top-level/python-packages.nix
View File

@ -5055,6 +5055,8 @@ self: super: with self; {
latexcodec = callPackage ../development/python-modules/latexcodec { };
latexify-py = callPackage ../development/python-modules/latexify-py { };
launchpadlib = callPackage ../development/python-modules/launchpadlib { };
laundrify-aio = callPackage ../development/python-modules/laundrify-aio { };