cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-08-16 00:02:25 +00:00 committed by GitHub
commit df465dde1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 366 additions and 214 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

@ -479,6 +479,12 @@
dbus service.
</para>
</listitem>
<listitem>
<para>
The <literal>nomad</literal> package now defaults to 1.3,
which no longer has a downgrade path to releases 1.2 or older.
</para>
</listitem>
</itemizedlist>
</section>
</section>

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

@ -165,4 +165,6 @@ Use `configure.packages` instead.
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

2
nixos/modules/tasks/filesystems.nix
View file

@ -279,7 +279,7 @@ in
environment.etc.fstab.text =
let
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ];
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" "9p" "cifs" "prl_fs" "vmhgfs" ];
isBindMount = fs: builtins.elem "bind" fs.options;
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces

13
pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
View file

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index f86b4b4..befc2bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
[[package]]
name = "neovide"
-version = "0.9.0"
+version = "0.10.0"
dependencies = [
"async-trait",
"cfg-if 1.0.0",

10
pkgs/applications/editors/neovim/neovide/default.nix
View file

@ -25,20 +25,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "neovide";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "Kethku";
repo = "neovide";
rev = version;
sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc=";
postFetch = ''
cd $out
patch -p1 -i ${./Cargo.lock.patch}
'';
sha256 = "sha256-PViSiK6+H79MLIOFe26cNqUZ6gZdqDC/S+ksTrbOm54=";
};
cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8=";
cargoSha256 = "sha256-GvueDUY4Hzfih/MyEfhdz/QNVd9atTC8SCF+PyuJJic=";
SKIA_SOURCE_DIR =
let

4
pkgs/applications/editors/texstudio/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
version = "4.2.3";
version = "4.3.0";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8";
hash = "sha256-nw6LG8U4ne5nngmE7F4yFE8mTEvaRSMfwwOxg2TnAdA=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

69
pkgs/applications/emulators/ppsspp/default.nix
View file

@ -3,20 +3,41 @@
, fetchFromGitHub
, SDL2
, cmake
, copyDesktopItems
, ffmpeg
, glew
, libffi
, libzip
, makeDesktopItem
, makeWrapper
, pkg-config
, python3
, qtbase
, qtmultimedia
, qtbase ? null
, qtmultimedia ? null
, snappy
, wrapQtAppsHook
, vulkan-loader
, wayland
, wrapQtAppsHook ? null
, zlib
, enableVulkan ? true
, forceWayland ? false
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ppsspp";
let
enableQt = (qtbase != null);
frontend = if enableQt then "Qt" else "SDL and headless";
vulkanPath = lib.makeLibraryPath [ vulkan-loader ];
# experimental, see https://github.com/hrydgard/ppsspp/issues/13845
vulkanWayland = enableVulkan && forceWayland;
in
# Only SDL front end needs to specify whether to use Wayland
assert forceWayland -> !enableQt;
stdenv.mkDerivation (finalAttrs: {
pname = "ppsspp"
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.13.1";
src = fetchFromGitHub {
@ -34,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
copyDesktopItems
makeWrapper
pkg-config
python3
wrapQtAppsHook
@ -42,37 +65,57 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
SDL2
ffmpeg
glew
(glew.override { enableEGL = forceWayland; })
libzip
qtbase
qtmultimedia
snappy
zlib
];
] ++ lib.optional enableVulkan vulkan-loader
++ lib.optionals vulkanWayland [ wayland libffi ];
cmakeFlags = [
"-DHEADLESS=OFF"
"-DHEADLESS=${if enableQt then "OFF" else "ON"}"
"-DOpenGL_GL_PREFERENCE=GLVND"
"-DUSE_SYSTEM_FFMPEG=ON"
"-DUSE_SYSTEM_LIBZIP=ON"
"-DUSE_SYSTEM_SNAPPY=ON"
"-DUSING_QT_UI=ON"
"-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}"
"-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}"
];
desktopItems = [(makeDesktopItem {
desktopName = "PPSSPP";
name = "ppsspp";
exec = "ppsspp";
icon = "ppsspp";
comment = "Play PSP games on your computer";
categories = [ "Game" "Emulator" ];
})];
installPhase = ''
runHook preInstall
mkdir -p $out/share/ppsspp
mkdir -p $out/share/{applications,ppsspp}
'' + (if enableQt then ''
install -Dm555 PPSSPPQt $out/bin/ppsspp
wrapProgram $out/bin/ppsspp \
'' else ''
install -Dm555 PPSSPPHeadless $out/bin/ppsspp-headless
install -Dm555 PPSSPPSDL $out/share/ppsspp/
makeWrapper $out/share/ppsspp/PPSSPPSDL $out/bin/ppsspp \
--set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"} \
'') + lib.optionalString enableVulkan ''
--prefix LD_LIBRARY_PATH : ${vulkanPath} \
'' + "\n" + ''
mv assets $out/share/ppsspp
runHook postInstall
'';
meta = with lib; {
homepage = "https://www.ppsspp.org/";
description = "A HLE Playstation Portable emulator, written in C++";
description = "A HLE Playstation Portable emulator, written in C++ (${frontend})";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
})
# TODO: add SDL headless port
})

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }:
stdenv.mkDerivation rec {
version = "4.0.3";
version = "4.1.1";
pname = "mozjpeg";
src = fetchFromGitHub {
owner = "mozilla";
repo = "mozjpeg";
rev = "v${version}";
sha256 = "1wb2ys0yjy6hgpb9qvzjxs7sb2zzs44p6xf7n026mx5nx85hjbyv";
sha256 = "sha256-tHiuQeBWjyXxy5F8jadYz5qfF2S3snagnlCPjI1Cj18=";
};
cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351

4
pkgs/applications/networking/cluster/clusterctl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA=";
sha256 = "sha256-/0CZFvCBesATVGGCJoiM3GfYvCrmDJBHMXhn/o8xhKg=";
};
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";

4
pkgs/applications/networking/cluster/kubeconform/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeconform";
version = "0.4.13";
version = "0.4.14";
src = fetchFromGitHub {
owner = "yannh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hKsGti04pUZj02uzah7ccImmg/qn31ceVfk11aTa9rk=";
sha256 = "sha256-iLZhd1e4i6omyGhOvRJ/VsHehpAPfPHnypXru5Ruv0o=";
};
vendorSha256 = null;

6
pkgs/applications/networking/cluster/nomad/1.3.nix
View file

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.3.2";
sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq";
vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj";
version = "1.3.3";
sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU=";
vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ=";
}

4
pkgs/applications/networking/cluster/werf/default.nix
View file

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "werf";
version = "1.2.153";
version = "1.2.154";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-BdGeafZvMgH6qRyYrFPQp0r2470me755J6gUK9XkIJQ=";
sha256 = "sha256-5tiJRxE8W2nvkQdJ3jL8P0+7LXEfNOdL15LdDjlDWpc=";
};
vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ=";

4
pkgs/applications/networking/mullvad-vpn/default.nix
View file

@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2022.3";
version = "2022.2";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "sha256-AxBVH5dHp1IBgeAMEUm+6xgHNuDChNs1+kOinbsUJu0=";
sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o=";
};
nativeBuildInputs = [

4
pkgs/applications/science/biology/messer-slim/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:
stdenv.mkDerivation rec {
version = "3.7.1";
version = "4.0";
pname = "messer-slim";
src = fetchFromGitHub {
owner = "MesserLab";
repo = "SLiM";
rev = "v${version}";
sha256 = "sha256-3ox+9hzqI8s4gmEkQ3Xm1Ih639LBtcSJNNmJgbpWaoM=";
sha256 = "sha256-2iEflSDknlQtCLz2MvEZExOT+MQlEYOMY2JI0XE6mw0=";
};
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];

5
pkgs/development/interpreters/lunatic/default.nix
View file

@ -17,6 +17,11 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optional stdenv.isDarwin Security;
checkFlags = [
# requires simd support which is not always available on hydra
"--skip=state::tests::import_filter_signature_matches"
];
meta = with lib; {
description = "An Erlang inspired runtime for WebAssembly";
homepage = "https://lunatic.solutions";

4
pkgs/development/libraries/backward-cpp/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "backward";
version = "1.3";
version = "1.6";
src = fetchFromGitHub {
owner = "bombela";
repo = "backward-cpp";
rev = "v${version}";
sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln";
sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";
};
installPhase = ''

12
pkgs/development/libraries/capnproto/default.nix
View file

@ -1,8 +1,10 @@
{ lib
, stdenv
, fetchFromGitHub
, capnproto
, cmake }:
, cmake
, openssl
, zlib
}:
stdenv.mkDerivation rec {
pname = "capnproto";
@ -16,10 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vBp4CAfPpd7/hdGk7JBxMTjtFFvXx16ODOfqDd8bAjc=";
};
nativeBuildInputs = [ cmake ]
++ lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) capnproto;
cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP";
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl zlib ];
meta = with lib; {
homepage = "https://capnproto.org/";

4
pkgs/development/python-modules/flask-jwt-extended/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "flask-jwt-extended";
version = "4.4.2";
version = "4.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Flask-JWT-Extended";
inherit version;
hash = "sha256-9YK7qYD89yirclDbtvvcqNTgdOJOspFbARhDdv//mMc=";
hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A=";
};
propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "genpy";
version = "2021.1";
version = "2022.1";
src = fetchPypi {
inherit pname version;
sha256 = "9bc062fa98c5c466ff464d8974be81a6bf67af9247b5e5176215ad1e81a6cdac";
sha256 = "sha256-FGZbQlUgbJjnuiDaKS/vVlraMVmFF1cAQk7S3aPWXx4=";
};
propagatedBuildInputs = [

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "limnoria";
version = "2022.6.23";
version = "2022.8.7";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-f5xrLeIl1KbHBx8csUNKPWLX1tMiMitPULnoW4+vCtI=";
hash = "sha256-TRTqhWQSVhjJkd9FLJk1lDwdzyzkeih9zHPSOvTf2oQ=";
};
propagatedBuildInputs = [

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "mailsuite";
version = "1.9.4";
version = "1.9.5";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-wgutyXxo1z3GxO3xikRlA4Og+oz+7+PrY2Hs6gicO/o=";
hash = "sha256-bvS+sH10LkQkH/nAGuk/rvPjPhaR/rArIf9W9CWjFMY=";
};
nativeBuildInputs = [

67
pkgs/development/python-modules/stim/default.nix Normal file
View file

@ -0,0 +1,67 @@
{ lib
, pkgs
, buildPythonPackage
, pythonOlder
, pytestCheckHook
, pytest-xdist
, fetchFromGitHub
, numpy
, pybind11
, cirq-core
, matplotlib
, networkx
, scipy
, pandas
}:
buildPythonPackage rec {
pname = "stim";
version = "1.9.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = pkgs.fetchFromGitHub {
owner = "quantumlib";
repo = "Stim";
rev = "refs/tags/v${version}";
sha256 = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0=";
};
propagatedBuildInputs = [
numpy
pybind11
];
checkInputs = [
pytestCheckHook
pytest-xdist
cirq-core
matplotlib
networkx
scipy
pandas
];
meta = {
description = "A tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits.";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ chrispattison ];
homepage = "https://github.com/quantumlib/stim";
};
pythonImportsCheck = [ "stim" ];
enableParallelBuilding = true;
disabledTestPaths = [
# No pymatching
"glue/sample/src/sinter/main_test.py"
"glue/sample/src/sinter/decoding_test.py"
"glue/sample/src/sinter/predict_test.py"
"glue/sample/src/sinter/collection_test.py"
"glue/sample/src/sinter/collection_work_manager.py"
"glue/sample/src/sinter/worker_test.py"
];
}

4
pkgs/development/tools/jira-cli-go/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "jira-cli-go";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "ankitpokhrel";
repo = "jira-cli";
rev = "v${version}";
sha256 = "sha256-+WkeiB4vgKxlVNnd5cEMmE9EYcGAqrzIrLsvPAA1eOE=";
sha256 = "sha256-UpDaKg6TA1qCkbzF7BARtj+tAyuCCGAyqOdItZU64Ls=";
};
vendorSha256 = "sha256-SpUggA9u8OGV2zF3EQ0CB8M6jpiVQi957UGaN+foEuk=";

6
pkgs/development/tools/misc/patchelf/unstable.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "patchelf";
version = "unstable-2022-02-21";
version = "unstable-2022-07-16";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "a35054504293f9ff64539850d1ed0bfd2f5399f2";
sha256 = "sha256-/hD/abmzWSkDhAWPLHiLQQ9cwJF8oFDuovNzRqs3Bho=";
rev = "c2b419dc2a0d6095eaa69b65ad5854ce847bdd01";
sha256 = "sha256-8U3EFO6nKTpPurrmdT3SjwiuU07Aztrp71Oe3CLQvcw=";
};
# Drop test that fails on musl (?)

34
pkgs/development/tools/moq/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ stdenv, buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "moq";
version = "0.2.7";
src = fetchFromGitHub {
owner = "matryer";
repo = "moq";
rev = "v${version}";
sha256 = "sha256-me/KD8bgzA+VU7WrfKlk8HZTInJqhijLAVTiZcJRzms=";
};
vendorSha256 = "sha256-XTe52pytjZYJALBOcnytA8z/d3UHSKcU1lJmJm8Iawo=";
subPackages = [ "." ];
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
];
meta = with lib; {
homepage = "https://github.com/matryer/moq";
description = "Interface mocking tool for go generate";
longDescription = ''
Moq is a tool that generates a struct from any interface. The struct can
be used in test code as a mock of the interface.
'';
license = licenses.mit;
maintainers = with maintainers; [ anpryl ];
};
}

24
pkgs/servers/sql/proxysql/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, autoconf
, automake
, bison
@ -18,9 +17,10 @@
, libgcrypt
, libinjection
, libmicrohttpd_0_9_70
, libuuid
, lz4
, nlohmann_json
, openssl
, openssl_3
, pcre
, perl
, python2
@ -30,22 +30,18 @@
stdenv.mkDerivation rec {
pname = "proxysql";
version = "2.3.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "sysown";
repo = pname;
rev = version;
sha256 = "13l4bf7zhfjy701qx9hfr40vlsm4d0pbfmwr5d6lf514xznvsnzl";
hash = "sha256-gh0x8wi1v/+iUlE4JymOyD/NI7rL+2/JJQYGAcsL7/g=";
};
patches = [
./makefiles.patch
./dont-phone-home.patch
(fetchpatch {
url = "https://github.com/sysown/proxysql/pull/3402.patch";
sha256 = "079jjhvx32qxjczmsplkhzjn9gl7c2a3famssczmjv2ffs65vibi";
})
];
nativeBuildInputs = [
@ -59,14 +55,16 @@ stdenv.mkDerivation rec {
buildInputs = [
bison
curl
(curl.override { openssl = openssl_3; })
flex
gnutls
libgcrypt
openssl
libuuid
zlib
];
enableParallelBuilding = true;
GIT_VERSION = version;
dontConfigure = true;
@ -103,7 +101,7 @@ stdenv.mkDerivation rec {
{ f = "libev"; p = libev; }
{ f = "libinjection"; p = libinjection; }
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; }
{ f = "libssl"; p = openssl; }
{ f = "libssl"; p = openssl_3; }
{ f = "lz4"; p = lz4; }
{ f = "pcre"; p = pcre; }
{ f = "re2"; p = re2; }
@ -126,10 +124,6 @@ stdenv.mkDerivation rec {
sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config
# https://github.com/sysown/proxysql/issues/3679
# TODO: remove when upgrading past 2.3.2
sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile
popd
patchShebangs .
'';

98
pkgs/servers/sql/proxysql/makefiles.patch
View file

@ -1,6 +1,8 @@
diff --git a/Makefile b/Makefile
index fba4e6a1..ceff4f3d 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,7 @@ endif
@@ -57,11 +57,7 @@ endif
export MAKEOPT=-j ${NPROCS}
@ -13,7 +15,7 @@
USERCHECK := $(shell getent passwd proxysql)
GROUPCHECK := $(shell getent group proxysql)
@@ -523,16 +519,10 @@ cleanbuild:
@@ -724,16 +720,10 @@ cleanbuild:
.PHONY: install
install: src/proxysql
@ -33,62 +35,58 @@
else
install -m 0755 etc/init.d/proxysql /etc/init.d
ifeq ($(DISTRO),"CentOS Linux")
diff --git a/deps/Makefile b/deps/Makefile
index 13eed9c5..9abb2262 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -40,22 +40,10 @@ endif
@@ -65,18 +65,11 @@ endif
libinjection/libinjection/src/libinjection.a:
- cd libinjection && rm -rf libinjection-3.10.0 || true
- cd libinjection && rm -rf libinjection-*/ || true
- cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/make_parens.py
- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/sqlparse_map.py
- sed -i -e 's/python/python2/' libinjection/libinjection-3.10.0/src/sqlparse2c.py
-ifneq ($(CENTOSVER),6)
- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
-endif
sed -i 's/CC=/CC?=/' libinjection/libinjection/src/Makefile
cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE}
libinjection: libinjection/libinjection/src/libinjection.a
libssl/openssl/libssl.a:
-# cd libssl && rm -rf openssl-1.1.0h || true
-# cd libssl && tar -zxf openssl-1.1.0h.tar.gz
- cd libssl && rm -rf openssl-1.1.1d || true
- cd libssl && rm -rf openssl-1.1.0h || true
- cd libssl && rm -rf openssl-1.1.1g || true
- cd libssl && rm -rf openssl-1.1.1j || true
- cd libssl && tar -zxf openssl-1.1.1j.tar.gz
cd libssl/openssl && ./config no-ssl3
cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE}
cd libssl/openssl && ln -s . lib # curl wants this path
@@ -70,9 +58,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION))))
- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true
- cd libssl && tar -zxf openssl-*.tar.gz
cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch
cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
cd libssl/openssl && ./config no-ssl3 no-tests
@@ -93,8 +86,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION))))
endif
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
- cd libhttpserver && rm -rf libhttpserver-master_20191121 || true
- cd libhttpserver && rm -rf libhttpserver-0.18.1 || true
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
- cd libhttpserver && rm -rf libhttpserver-*/ || true
- cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz
ifeq ($(REQUIRE_PATCH), true)
cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch
cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch
@@ -94,34 +79,15 @@ endif
@@ -117,34 +108,16 @@ endif
libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
libev/libev/.libs/libev.a:
- cd libev && rm -rf libev-4.24 || true
- cd libev && rm -rf libev-*/ || true
- cd libev && tar -zxf libev-4.24.tar.gz
cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
cd libev/libev && ./configure
cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
ev: libev/libev/.libs/libev.a
curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
- cd curl && rm -rf curl-7.57.0 || true
- cd curl && rm -rf curl-7.77.0 || true
- cd curl && tar -zxf curl-7.77.0.tar.gz
- cd curl && rm -rf curl-*/ || true
- cd curl && tar -zxf curl-*.tar.gz
- #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE}
cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE}
curl: curl/curl/lib/.libs/libcurl.a
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
- cd libmicrohttpd && rm -rf libmicrohttpd-0.9.55 || true
- cd libmicrohttpd && rm -rf libmicrohttpd-0.9.68 || true
- cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
- cd libmicrohttpd && rm -f libmicrohttpd || true
-ifeq ($(CENTOSVER),6)
- cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd
@ -96,6 +94,7 @@
-else
- cd libmicrohttpd && ln -s libmicrohttpd-0.9.68 libmicrohttpd
- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz
- cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch
-endif
-ifeq ($(OS),Darwin)
- cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch
@ -103,37 +102,29 @@
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
@@ -132,8 +98,6 @@ cityhash/cityhash/src/.libs/libcityhash.a:
@@ -155,8 +128,6 @@ cityhash/cityhash/src/.libs/libcityhash.a:
cityhash: cityhash/cityhash/src/.libs/libcityhash.a
lz4/lz4/liblz4.a:
- cd lz4 && rm -rf lz4-1.7.5 || true
- cd lz4 && rm -rf lz4-*/ || true
- cd lz4 && tar -zxf lz4-1.7.5.tar.gz
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
lz4: lz4/lz4/liblz4.a
@@ -148,16 +112,14 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
@@ -181,8 +152,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
- cd libdaemon && rm -rf libdaemon-0.14
- cd libdaemon && rm -rf libdaemon-*/ || true
- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && ./configure --disable-examples
cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a
jemalloc/jemalloc/lib/libjemalloc.a:
cd jemalloc && rm -rf jemalloc-5.2.0
cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch
cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch
cd jemalloc/jemalloc && ./configure ${MYJEOPT}
@@ -210,17 +170,12 @@ sqlite3/sqlite3/sqlite3.o:
@@ -253,17 +222,12 @@ sqlite3/sqlite3/sqlite3.o:
sqlite3: sqlite3/sqlite3/sqlite3.o
libconfig/libconfig/lib/.libs/libconfig++.a:
- cd libconfig && rm -rf libconfig-1.7.2
- cd libconfig && rm -rf libconfig-*/ || true
- cd libconfig && tar -zxf libconfig-1.7.2.tar.gz
cd libconfig/libconfig && ./configure --disable-examples
cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
@ -141,32 +132,29 @@
libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
- cd prometheus-cpp && rm -rf prometheus-cpp-0.9.0
- cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true
- cd prometheus-cpp && tar -zxf v0.9.0.tar.gz
- cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-v1.11.tar.gz -C prometheus-cpp/3rdparty/civetweb
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch
cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF
@@ -229,12 +184,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch
@@ -273,10 +237,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
re2/re2/obj/libre2.a:
- cd re2 && rm -rf re2-2018-07-01 || true
- cd re2 && rm -rf re2-2020-07-06 || true
-# cd re2 && tar -zxf re2-20140304.tgz
- cd re2 && rm -rf re2-*/ || true
- cd re2 && tar -zxf re2.tar.gz
-# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile
-# cd re2 && patch re2/util/mutex.h < mutex.h.patch
-# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch
cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch
cd re2/re2 && sed -i -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile
cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile
cd re2/re2 && CC=${CC} CXX=${CXX} ${MAKE}
@@ -242,9 +191,6 @@ re2/re2/obj/libre2.a:
@@ -285,8 +245,6 @@ re2/re2/obj/libre2.a:
re2: re2/re2/obj/libre2.a
pcre/pcre/.libs/libpcre.a:
- cd pcre && rm -rf pcre-8.39
- cd pcre && rm -rf pcre-8.44
- cd pcre && rm -rf pcre-*/ || true
- cd pcre && tar -zxf pcre-8.44.tar.gz
cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch
cd pcre/pcre && ./configure
cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE}
pcre: pcre/pcre/.libs/libpcre.a

6
pkgs/tools/backup/monolith/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "monolith";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "Y2Z";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JhQkoVGJpMesNz2hRe+kWNX4zYrIcKzT0Z6owrXlRN4=";
sha256 = "sha256-E+2D/oidqxRqKR70LN4uR1QkBa4oFfLiS8SoJkrgwtI=";
};
cargoSha256 = "sha256-BikzJr50Aua9llyQgbP/paIoC7dvsG0RYyVXmbdeGIA=";
cargoSha256 = "sha256-Acmo0p+WihRg3dU3ptaFw6uf9OQegvPUCQ63b5Ucdmk=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "latex2html";
version = "2022";
version = "2022.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-a+OFBNMtP6mDqg1k9rjDLEJhZDM+zdRpPbn3aeC+Qks=";
sha256 = "sha256-Vl7ozawd4Ra+yDarRpmPhjF7deJELaxo07L4/qVV4fw=";
};
buildInputs = [ ghostscript netpbm perl ];

23
pkgs/tools/misc/osm2pgsql/default.nix
View file

@ -2,6 +2,7 @@
, fetchFromGitHub
, cmake
, expat
, fmt
, proj
, bzip2
, zlib
@ -12,33 +13,43 @@
, luajit
, libosmium
, protozero
, rapidjson
}:
stdenv.mkDerivation rec {
pname = "osm2pgsql";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = pname;
rev = version;
sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI=";
hash = "sha256-MWJzCZdqvy/nH1Doj0fmGuzTubaHDnPOED7qgzvJ3ZU=";
};
postPatch = ''
# Remove bundled libraries
rm -r contrib
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ]
buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ]
++ lib.optional withLuaJIT luajit
++ lib.optional (!withLuaJIT) lua;
cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ]
++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
cmakeFlags = [
"-DEXTERNAL_LIBOSMIUM=ON"
"-DEXTERNAL_PROTOZERO=ON"
"-DEXTERNAL_RAPIDJSON=ON"
"-DEXTERNAL_FMT=ON"
] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
meta = with lib; {
description = "OpenStreetMap data to PostgreSQL converter";
homepage = "https://osm2pgsql.org";
license = licenses.gpl2Plus;
platforms = with platforms; linux ++ darwin;
platforms = platforms.unix;
maintainers = with maintainers; [ jglukasik das-g ];
};
}

6
pkgs/tools/networking/oapi-codegen/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oapi-codegen";
version = "1.9.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = "deepmap";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q=";
sha256 = "sha256-KeMtop91aTylBX95ZJQmveHaYDCYqcKMbPO9YDAfYoI=";
};
vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw=";
vendorSha256 = "sha256-Zt4a4riAzmXNn/mawkMqt9f5lmow1zqnWLiLLQsTG9M=";
# Tests use network
doCheck = false;

10
pkgs/tools/networking/unbound/default.nix
View file

@ -37,8 +37,13 @@
# Avoid .lib depending on lib.getLib openssl
# The build gets a little hacky, so in some cases we disable this approach.
, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP
# enable support for python plugins in unbound: note this is distinct from pyunbound
# see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html
, withPythonModule ? false
, libnghttp2
# for passthru.tests
, gnutls
}:
stdenv.mkDerivation rec {
@ -142,7 +147,10 @@ stdenv.mkDerivation rec {
(pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
(builtins.filter (p: p != null) buildInputs);
passthru.tests = nixosTests.unbound;
passthru.tests = {
inherit gnutls;
nixos-test = nixosTests.unbound;
};
meta = with lib; {
description = "Validating, recursive, and caching DNS resolver";

1
pkgs/tools/networking/unbound/python.nix
View file

@ -6,6 +6,7 @@ in
stdenv.mkDerivation rec {
pname = "pyunbound";
inherit (unbound) version src;
patches = unbound.patches or null;
nativeBuildInputs = [ swig ];

4
pkgs/tools/security/theharvester/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "theharvester";
version = "4.0.3";
version = "4.2.0";
src = fetchFromGitHub {
owner = "laramies";
repo = pname;
rev = version;
sha256 = "sha256-Ckouhe/Uq6Dv9p/LRpPQkiKuYrwrl/Z7KkYYamDHav8=";
sha256 = "sha256-P3yp6COwyQnVDfZM198ygu+HLdisRw068aZOVSLl7r4=";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/tools/text/ugrep/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9tHSdO9VlsbLqFFA/CKhbPvstU3+26jBaBw/tX5qJnw=";
sha256 = "sha256-KDAuGFoUJxaa0noW739+gxeHKZeouu14EDla0lWwaIQ=";
};
buildInputs = [

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

@ -1497,8 +1497,18 @@ with pkgs;
pcsxr = callPackage ../applications/emulators/pcsxr { };
ppsspp = callPackage ../applications/emulators/ppsspp {
ppsspp = callPackage ../applications/emulators/ppsspp { };
ppsspp-sdl = ppsspp;
ppsspp-sdl-wayland = ppsspp.override {
forceWayland = true;
enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845
};
ppsspp-qt = ppsspp.override {
inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook;
enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628
};
proton-caller = callPackage ../applications/emulators/proton-caller { };
@ -9028,7 +9038,7 @@ with pkgs;
noip = callPackage ../tools/networking/noip { };
nomad = nomad_1_2;
nomad = nomad_1_3;
# Nomad never updates major go versions within a release series and is unsupported
# on Go versions that it did not ship with. Due to historic bugs when compiled
@ -9036,12 +9046,10 @@ with pkgs;
# Upstream partially documents used Go versions here
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix {
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
buildGoModule = buildGo117Module;
};
nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix {
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
buildGoModule = buildGo117Module;
buildGoModule = buildGo118Module;
};
nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };
@ -9942,9 +9950,7 @@ with pkgs;
proxify = callPackage ../tools/networking/proxify { };
proxysql = callPackage ../servers/sql/proxysql {
stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv;
};
proxysql = callPackage ../servers/sql/proxysql { };
prs = callPackage ../tools/security/prs { };
@ -24304,6 +24310,8 @@ with pkgs;
impl = callPackage ../development/tools/impl { };
moq = callPackage ../development/tools/moq { };
quicktemplate = callPackage ../development/tools/quicktemplate { };
linux_logo = callPackage ../tools/misc/linux-logo { };

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

@ -10381,6 +10381,8 @@ in {
stickytape = callPackage ../development/python-modules/stickytape { };
stim = callPackage ../development/python-modules/stim { };
stm32loader = callPackage ../development/python-modules/stm32loader { };
stone = callPackage ../development/python-modules/stone { };