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] 2023-06-06 12:02:04 +00:00 committed by GitHub
commit 6162feee0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
89 changed files with 1298 additions and 1109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@ -1,7 +1,7 @@
{
x86_64-linux = "/nix/store/mc43d38fibi94pp5crfwacl5gbslccd0-nix-2.13.3";
i686-linux = "/nix/store/09m966pj26cgd4ihlg8ihl1106j3vih8-nix-2.13.3";
aarch64-linux = "/nix/store/7f191d125akld27gc6jl0r13l8pl7x0h-nix-2.13.3";
x86_64-darwin = "/nix/store/1wn9jkvi2zqfjnjgg7lnp30r2q2y8whd-nix-2.13.3";
aarch64-darwin = "/nix/store/8w0v2mffa10chrf1h66cbvbpw86qmh85-nix-2.13.3";
x86_64-linux = "/nix/store/ny9r65799s7xhp605bc2753sjvzkxrrs-nix-2.15.1";
i686-linux = "/nix/store/ck55dz5klc7szi8rx9ghhm8gi2b5q5bw-nix-2.15.1";
aarch64-linux = "/nix/store/cl0a02vr28913dgw98hrm45a4baqr3z1-nix-2.15.1";
x86_64-darwin = "/nix/store/wq228jdbz16pp2lnxf32n8dv27pw53p8-nix-2.15.1";
aarch64-darwin = "/nix/store/x11cpsjg4q236msfz5scc325pfp9xy64-nix-2.15.1";
}

7
nixos/modules/services/misc/nix-daemon.nix
View File

@ -520,10 +520,17 @@ in
will set up automatically for each build. This prevents impurities
in builds by disallowing access to dependencies outside of the Nix
store by using network and mount namespaces in a chroot environment.
This is enabled by default even though it has a possible performance
impact due to the initial setup time of a sandbox for each build. It
doesn't affect derivation hashes, so changing this option will not
trigger a rebuild of packages.
When set to "relaxed", this option permits derivations that set
`__noChroot = true;` to run outside of the sandboxed environment.
Exercise caution when using this mode of operation! It is intended to
be a quick hack when building with packages that are not easily setup
to be built reproducibly.
'';
};

4
nixos/modules/virtualisation/libvirtd.nix
View File

@ -308,7 +308,9 @@ in
libvirt/nwfilter/*.xml );
do
mkdir -p /var/lib/$(dirname $i) -m 755
cp -npd ${cfg.package}/var/lib/$i /var/lib/$i
if [ ! -e /var/lib/$i ]; then
cp -pd ${cfg.package}/var/lib/$i /var/lib/$i
fi
done
# Copy generated qemu config to libvirt directory

4
pkgs/applications/audio/vkeybd/default.nix
View File

@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
makeFlags = [ "TKLIB=-l${tk.libPrefix}" "TCLLIB=-l${tcl.libPrefix}" ];
postInstall = ''
wrapProgram $out/bin/vkeybd --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
'';
meta = with lib; {
description = "Virtual MIDI keyboard";
homepage = "https://www.alsa-project.org/~tiwai/alsa.html";

10
pkgs/applications/blockchains/litecoin/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch
, pkg-config, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, glib, protobuf, util-linux, qrencode
@ -20,6 +20,14 @@ mkDerivation rec {
sha256 = "sha256-TuDc47TZOEQA5Lr4DQkEhnO/Szp9h71xPjaBL3jFWuM=";
};
patches = [
(fetchpatch {
name = "boost1770.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/boost1770.patch?h=litecoin-qt&id=dc75ad854af123f375b5b683be64aa14573170d7";
hash = "sha256-PTkYQRA8n5a9yR2AvpzH5natsXT2W6Xjo0ONCPJx78k=";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl db48 boost zlib zeromq fmt
miniupnpc glib protobuf util-linux libevent ]

12
pkgs/applications/editors/lapce/Cargo.lock generated
View File

@ -2556,7 +2556,7 @@ dependencies = [
[[package]]
name = "lapce"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"lapce-proxy",
"lapce-ui",
@ -2564,7 +2564,7 @@ dependencies = [
[[package]]
name = "lapce-core"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"anyhow",
"arc-swap",
@ -2637,7 +2637,7 @@ dependencies = [
[[package]]
name = "lapce-data"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"alacritty_terminal",
"anyhow",
@ -2689,7 +2689,7 @@ dependencies = [
[[package]]
name = "lapce-proxy"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"alacritty_terminal",
"anyhow",
@ -2742,7 +2742,7 @@ dependencies = [
[[package]]
name = "lapce-rpc"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"anyhow",
"crossbeam-channel",
@ -2758,7 +2758,7 @@ dependencies = [
[[package]]
name = "lapce-ui"
version = "0.2.7"
version = "0.2.8"
dependencies = [
"Inflector",
"alacritty_terminal",

6
pkgs/applications/editors/lapce/default.nix
View File

@ -24,21 +24,19 @@
rustPlatform.buildRustPackage rec {
pname = "lapce";
version = "0.2.7";
version = "0.2.8";
src = fetchFromGitHub {
owner = "lapce";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xq/xLoVvETGp+Yxlh3wbg74R+U9eqjFOKJyt/AUybvU=";
sha256 = "sha256-cfQQ+PaInUB6B61sZ9iS/zt3L6Vc/vPOJTtEwR0BLco=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"druid-0.7.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
"druid-derive-0.4.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
"druid-shell-0.7.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o=";
"font-kit-0.11.0" = "sha256-MsUbFhWd3GdqchzwrRPuzpz3mNYde00HwA9EIRBc2SQ=";
"fount-0.1.0" = "sha256-ptPnisGuzip3tQUuwtPU+ETiIzxMvIgAvlIGyGw/4wI=";
"human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w=";

8
pkgs/applications/emulators/emulationstation/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost169, eigen
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen
, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive
, fetchpatch }:
@ -20,8 +20,12 @@ stdenv.mkDerivation {
})
];
postPatch = ''
sed -i "7i #include <stack>" es-app/src/views/gamelist/ISimpleGameListView.h
'';
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ alsa-lib boost169 curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
installPhase = ''
install -D ../emulationstation $out/bin/emulationstation

6
pkgs/applications/misc/hugo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.112.7";
version = "0.113.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-8vvIMCnxS/1MsooSmNPeHE9VxYYOVyKiExr8oSgcYF4=";
hash = "sha256-oKGRbgr4jaau6wfo6Q/yhYgambGa+wb3ENtk6wrb0J0=";
};
vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c=";
vendorHash = "sha256-+eVaV6iGsubMt6cq0lKP0i69BlYW8jwx6lT6rwhZAoA=";
doCheck = false;

1
pkgs/applications/misc/wordnet/default.nix
View File

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
];
postInstall = ''
wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
wrapProgram $out/bin/wnb --prefix PATH : "$out/bin"
'';

10
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,11 +1,11 @@
{
"packageVersion": "113.0-3",
"packageVersion": "113.0.2-1",
"source": {
"rev": "113.0-3",
"sha256": "0pqjchkpdgsxdsylawsnbszjmx4aybyvlsc2a8qdnck5rpnxl1p2"
"rev": "113.0.2-1",
"sha256": "0wbs6bgcjrxjnh0wk6qz329zy0dlma0wdwb3law877y9dphilh47"
},
"firefox": {
"version": "113.0",
"sha512": "96b0f0774083270f4fcce06085b177ced25ba05da7291d777f1da1d5bbad30721bc6363b76e06ccb64fc092778c8326a426a8bfdfa3cbaafd4f1169b924744a5"
"version": "113.0.2",
"sha512": "7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743"
}
}

4
pkgs/applications/networking/cluster/kluctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kluctl";
version = "2.20.2";
version = "2.20.4";
src = fetchFromGitHub {
owner = "kluctl";
repo = "kluctl";
rev = "v${version}";
hash = "sha256-VCPRGICbALYoD1LIrNnPXQLWGqWr+IznQP70K+L4tvk=";
hash = "sha256-Z3tXfzbVs0FWTsi6vbM6BNQBLeCseWn4yBR5PNeRz2s=";
};
vendorHash = "sha256-z0eiWU5CFMfK6fz+LUtxtSP/MAuVn7iOHB+A7Uv2OQY=";

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-1wqPMT8JJ29K0BcooPj7jaXMKIVlN6YvFwneYnqaeDk=";
hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo=";
};
vendorHash = "sha256-ix18Mi4a1kW7C6rcwwFc6TDwzs3vYxNz3M3d5pD8l6c=";
vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

6
pkgs/applications/networking/cluster/pluto/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pluto";
version = "5.16.3";
version = "5.16.4";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
sha256 = "sha256-TlXwjgk+sT5lvswbDKjun0PhkfqDfk1IzGZ9NCMdw9s=";
sha256 = "sha256-X/ei4BXj2tuFeHt4QZQ4QI6m15emOMjSrK+GxAqRMFM=";
};
vendorHash = "sha256-ahneuZExefFKGYDxa+F8IhKPDjw8+kdZ5Hj+k1BDxcU=";
vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY=";
ldflags = [
"-w" "-s"

4
pkgs/applications/science/electronics/dataexplorer/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "dataexplorer";
version = "3.7.7";
version = "3.7.8";
src = fetchurl {
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
sha256 = "sha256-tZ/+m+CeOE+84LbqXYPBGSMRkRU2oGnJpAP5OQkYmfY=";
sha256 = "sha256-NiCtUqavYNUXsTkgi2V9u2qn8dBTLTEm52ju450d5Lw=";
};
nativeBuildInputs = [ ant makeWrapper ];

12
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{
"version": "16.0.1",
"repo_hash": "sha256-TApZSavGA361Pue0u21Der6CUABhp/hwewUe9YExLAs=",
"version": "16.0.2",
"repo_hash": "sha256-qAwO/5eyyYdpwSUg3lC8jOFoBc8H6yhgiHUbx+Ww6Uc=",
"yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.0.1-ee",
"rev": "v16.0.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.0.1",
"GITLAB_PAGES_VERSION": "16.0.1",
"GITALY_SERVER_VERSION": "16.0.2",
"GITLAB_PAGES_VERSION": "16.0.2",
"GITLAB_SHELL_VERSION": "14.20.0",
"GITLAB_WORKHORSE_VERSION": "16.0.1"
"GITLAB_WORKHORSE_VERSION": "16.0.2"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -13,7 +13,7 @@
}:
let
version = "16.0.1";
version = "16.0.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-2OlCjwcJ0RydbKI15X4wZ20XVclC44McNig95UndDGg=";
sha256 = "sha256-dtGtWV+lfTp9pKipAHx3FUIPaUobiRLsKYbULpuIgRY=";
};
vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.0.1";
version = "16.0.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-RbsPWc3Dc/rMLnSID0dZmHMg3+uK91kI+DXBYPSy81w=";
sha256 = "sha256-AUX6JIkElYZHjy/RFBVXRb3ZnbWkaNyApZNMT6zsBAU=";
};
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.0.1";
version = "16.0.2";
src = fetchFromGitLab {
owner = data.owner;

4
pkgs/applications/video/kodi/addons/steam-library/default.nix
View File

@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "steam-library";
namespace = "plugin.program.steam.library";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "aanderse";
repo = namespace;
rev = "v${version}";
sha256 = "1ai8k55bamzkx7awk3dl8ksw93pan3h9b1xlylcldy7a0ddldzdg";
sha256 = "sha256-LVdFih0n/lkjyaYf8jw0IFlcDiXXOtUH2N9OduV1H9Q=";
};
propagatedBuildInputs = [

9
pkgs/desktops/gnome/extensions/buildGnomeExtension.nix
View File

@ -36,7 +36,14 @@ let
echo "${metadata}" | base64 --decode > $out/metadata.json
'';
};
dontBuild = true;
nativeBuildInputs = with pkgs; [ glib ];
buildPhase = ''
runHook preBuild
if [ -d schemas ]; then
glib-compile-schemas --strict schemas
fi
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/

306
pkgs/development/compilers/gcc/13/Added-mcf-thread-model-support-from-mcfgthread.patch
View File

@ -1,306 +0,0 @@
From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
From: Liu Hao <lh_mouse@126.com>
Date: Wed, 25 Apr 2018 21:54:19 +0800
Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
Signed-off-by: Liu Hao <lh_mouse@126.com>
---
config/gthr.m4 | 1 +
gcc/config.gcc | 3 +++
gcc/config/i386/mingw-mcfgthread.h | 1 +
gcc/config/i386/mingw-w64.h | 2 +-
gcc/config/i386/mingw32.h | 11 ++++++++++-
gcc/configure | 2 +-
gcc/configure.ac | 2 +-
libatomic/configure.tgt | 2 +-
libgcc/config.host | 6 ++++++
libgcc/config/i386/gthr-mcf.h | 1 +
libgcc/config/i386/t-mingw-mcfgthread | 2 ++
libgcc/configure | 1 +
libstdc++-v3/configure | 1 +
libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++
libstdc++-v3/src/c++11/thread.cc | 9 +++++++++
16 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 gcc/config/i386/mingw-mcfgthread.h
create mode 100644 libgcc/config/i386/gthr-mcf.h
create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
diff --git a/config/gthr.m4 b/config/gthr.m4
index 7b29f1f3327..82e21fe1709 100644
--- a/config/gthr.m4
+++ b/config/gthr.m4
@@ -21,6 +21,7 @@ case $1 in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
AC_SUBST(thread_header)
])
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 46a9029acec..112c24e95a3 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
if test x$enable_threads = xposix ; then
tm_file="${tm_file} i386/mingw-pthread.h"
fi
+ if test x$enable_threads = xmcf ; then
+ tm_file="${tm_file} i386/mingw-mcfgthread.h"
+ fi
tm_file="${tm_file} i386/mingw32.h"
# This makes the logic if mingw's or the w64 feature set has to be used
case ${target} in
diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
new file mode 100644
index 00000000000..ec381a7798f
--- /dev/null
+++ b/gcc/config/i386/mingw-mcfgthread.h
@@ -0,0 +1 @@
+#define TARGET_USE_MCFGTHREAD 1
diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
index 484dc7a9e9f..a15bbeea500 100644
--- a/gcc/config/i386/mingw-w64.h
+++ b/gcc/config/i386/mingw-w64.h
@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see
"%{mwindows:-lgdi32 -lcomdlg32} " \
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
fvtable-verify=std:-lvtv -lpsapi} " \
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
#undef SPEC_32
#undef SPEC_64
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 0612b87199a..76cea94f3b7 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see
| MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
| MASK_MS_BITFIELD_LAYOUT)
+#ifndef TARGET_USE_MCFGTHREAD
+#define CPP_MCFGTHREAD() ((void)0)
+#define LIB_MCFGTHREAD ""
+#else
+#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__"))
+#define LIB_MCFGTHREAD " -lmcfgthread "
+#endif
+
/* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
is for compatibility with native compiler. */
#define EXTRA_OS_CPP_BUILTINS() \
@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
builtin_define_std ("WIN64"); \
builtin_define ("_WIN64"); \
} \
+ CPP_MCFGTHREAD(); \
} \
while (0)
@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see
"%{mwindows:-lgdi32 -lcomdlg32} " \
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
fvtable-verify=std:-lvtv -lpsapi} " \
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
/* Weak symbols do not get resolved if using a Windows dll import lib.
Make the unwind registration references strong undefs. */
diff --git a/gcc/configure b/gcc/configure
index 6121e163259..52f0e00efe6 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -11693,7 +11693,7 @@ case ${enable_threads} in
target_thread_file='single'
;;
aix | dce | lynx | mipssde | posix | rtems | \
- single | tpf | vxworks | win32)
+ single | tpf | vxworks | win32 | mcf)
target_thread_file=${enable_threads}
;;
*)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index b066cc609e1..4ecdba88de7 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1612,7 +1612,7 @@ case ${enable_threads} in
target_thread_file='single'
;;
aix | dce | lynx | mipssde | posix | rtems | \
- single | tpf | vxworks | win32)
+ single | tpf | vxworks | win32 | mcf)
target_thread_file=${enable_threads}
;;
*)
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index ea8c34f8c71..23134ad7363 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -145,7 +145,7 @@ case "${target}" in
*-*-mingw*)
# OS support for atomic primitives.
case ${target_thread_file} in
- win32)
+ win32 | mcf)
config_path="${config_path} mingw"
;;
posix)
diff --git a/libgcc/config.host b/libgcc/config.host
index 11b4acaff55..9fbd38650bd 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
posix)
tmake_file="i386/t-mingw-pthread $tmake_file"
;;
+ mcf)
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
+ ;;
esac
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
if test x$ac_cv_sjlj_exceptions = xyes; then
@@ -761,6 +764,9 @@ x86_64-*-mingw*)
posix)
tmake_file="i386/t-mingw-pthread $tmake_file"
;;
+ mcf)
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
+ ;;
esac
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
if test x$ac_cv_sjlj_exceptions = xyes; then
diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
new file mode 100644
index 00000000000..5ea2908361f
--- /dev/null
+++ b/libgcc/config/i386/gthr-mcf.h
@@ -0,0 +1 @@
+#include <mcfgthread/gthread.h>
diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
new file mode 100644
index 00000000000..4b9b10e32d6
--- /dev/null
+++ b/libgcc/config/i386/t-mingw-mcfgthread
@@ -0,0 +1,2 @@
+SHLIB_PTHREAD_CFLAG =
+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
diff --git a/libgcc/configure b/libgcc/configure
index b2f3f870844..eff889dc3b3 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -5451,6 +5451,7 @@ case $target_thread_file in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ba094be6f15..979a5ab9ace 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15187,6 +15187,7 @@ case $target_thread_file in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
index de920d714c6..665fb74bd6b 100644
--- a/libstdc++-v3/libsupc++/atexit_thread.cc
+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
@@ -25,6 +25,22 @@
#include <cstdlib>
#include <new>
#include "bits/gthr.h"
+
+#ifdef __USING_MCFGTHREAD__
+
+#include <mcfgthread/gthread.h>
+namespace __cxxabiv1 {
+extern "C" int
+__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
+ void *obj, void *dso_handle)
+ _GLIBCXX_NOTHROW
+{
+ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
+ (void)dso_handle;
+}
+}
+#else // __USING_MCFGTHREAD__
+
#ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
}
#endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
+
+#endif // __USING_MCFGTHREAD__
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 3a2ec3ad0d6..8b4cc96199b 100644
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -28,6 +28,27 @@
#include <cxxabi.h>
#include <exception>
#include <new>
+
+#ifdef __USING_MCFGTHREAD__
+
+#include <mcfgthread/gthread.h>
+
+namespace __cxxabiv1 {
+
+extern "C" int __cxa_guard_acquire(__guard *g){
+ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
+}
+extern "C" void __cxa_guard_abort(__guard *g) throw() {
+ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
+}
+extern "C" void __cxa_guard_release(__guard *g) throw() {
+ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
+}
+
+}
+
+#else // __USING_MCFGTHREAD__
+
#include <ext/atomicity.h>
#include <ext/concurrence.h>
#include <bits/atomic_lockfree_defines.h>
@@ -425,3 +446,5 @@ namespace __cxxabiv1
#endif
}
}
+
+#endif
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
index 8238817c2e9..0c6a1f85f6f 100644
--- a/libstdc++-v3/src/c++11/thread.cc
+++ b/libstdc++-v3/src/c++11/thread.cc
@@ -55,6 +55,15 @@ static inline int get_nprocs()
#elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
# include <unistd.h>
# define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
+#elif defined(_WIN32)
+# include <windows.h>
+static inline int get_nprocs()
+{
+ SYSTEM_INFO sysinfo;
+ GetSystemInfo(&sysinfo);
+ return (int)sysinfo.dwNumberOfProcessors;
+}
+# define _GLIBCXX_NPROCS get_nprocs()
#else
# define _GLIBCXX_NPROCS 0
#endif
--
2.17.0

4
pkgs/development/compilers/gcc/13/default.nix
View File

@ -121,9 +121,7 @@ let majorVersion = "13";
# Use absolute path in GNAT dylib install names on Darwin
++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";

19
pkgs/development/compilers/mozart/default.nix
View File

@ -1,11 +1,10 @@
{ lib
, fetchFromGitHub
, fetchurl
, fetchpatch
, cmake
, unzip
, makeWrapper
, boost169
, pinnedBoost ? boost169
, boost
, llvmPackages
, gmp
, emacs
@ -33,7 +32,14 @@ in stdenv.mkDerivation rec {
sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
};
patches = [ ./patch-limits.diff ];
patches = [
./patch-limits.diff
(fetchpatch {
name = "remove-uses-of-deprecated-boost-apis.patch";
url = "https://github.com/mozart/mozart2/commit/4256d3a9122e1cbb01400a1807bdee66088ff274.patch";
hash = "sha256-AnOrBnxoCxqis+RdCsq8EKBg//jcNHSOFYUvf7vh+Hc=";
})
];
postConfigure = ''
cp ${bootcompiler} bootcompiler/bootcompiler.jar
@ -55,7 +61,7 @@ in stdenv.mkDerivation rec {
'';
buildInputs = [
pinnedBoost
boost
gmp
emacs
jre_headless
@ -68,6 +74,9 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ layus h7x4 ];
license = licenses.bsd2;
homepage = "https://mozart.github.io";
platforms = platforms.all;
# Trace/BPT trap: 5
broken = stdenv.isDarwin;
};
}

3
pkgs/development/coq-modules/mathcomp-word/default.nix
View File

@ -9,13 +9,14 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
release."2.1".sha256 = "sha256-oN/zvnePq64Nt7l/zIDLdhb4t9ayKxnZCsn+pzqS030=";
release."2.0".sha256 = "sha256-x9AEFadlYiIIOxAhjv4Vc/dxdRZC7AdWQ6AByvLOFDk=";
release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z";
release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; }
{ cases = [ (range "8.12" "8.17") (isGe "1.12") ]; out = "2.1"; }
] null;
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];

4
pkgs/development/libraries/amdvlk/default.nix
View File

@ -25,13 +25,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2023.Q2.1";
version = "2023.Q2.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "znjv50seqN2Rdzwnu/5ks6q1uiUacM/Z5fzMyCgv0b8=";
sha256 = "V6DszDpiwvIcfWh2f8+1sWTQJHxwsxm0LoxSLoJOWHo=";
};
buildInputs = [

6
pkgs/development/libraries/aqbanking/sources.nix
View File

@ -15,8 +15,8 @@
# https://www.aquamaniac.de/rdm/projects/aqbanking/files
aqbanking = {
version = "6.5.3";
hash = "sha256-bGK/JqpC5psh4Yi1T2pdgl1to03hoUy8O2fYWpcFE24=";
releaseId = "467";
version = "6.5.4";
hash = "sha256-DRbOrnbwcY5GZjj0VHqLFJJ/HY2YMiB5zWSBrd4wrJk=";
releaseId = "499";
};
}

7
pkgs/development/libraries/composable_kernel/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, runCommand
, cmake
, rocm-cmake
, hip
@ -88,9 +87,6 @@ let
};
});
ckProfiler = runCommand "ckProfiler" { preferLocalBuild = true; } ''
cp -a ${ck}/bin/ckProfiler $out
'';
in stdenv.mkDerivation {
inherit (ck) pname version outputs src passthru requiredSystemFeatures meta;
@ -102,8 +98,7 @@ in stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -as ${ckProfiler} $out/bin/ckProfiler
mkdir -p $out
cp -an ${ck}/* $out
'' + lib.optionalString buildTests ''
cp -a ${ck.test} $test

4
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -27,13 +27,13 @@
mkDerivation rec {
pname = "mlt";
version = "7.14.0";
version = "7.16.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "sha256-BmvgDj/zgGJNpTy5A9XPOl+9001Kc0qSFSqQ3gwZPmI=";
sha256 = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik=";
};
buildInputs = [

5
pkgs/development/libraries/science/biology/ciftilib/default.nix
View File

@ -24,13 +24,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ];
# error: no member named 'file_string' in 'boost::filesystem::path'
env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3";
doCheck = true;
meta = with lib; {
homepage = "https://github.com/Washington-University/CiftiLib";
description = "Library for reading and writing CIFTI files";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.bsd2;
};
}

6
pkgs/development/libraries/science/robotics/ispike/default.nix
View File

@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
};
postPatch = ''
sed -i "1i #include <map>" include/iSpike/YarpConnection.hpp
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
@ -16,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Spiking neural interface between iCub and a spiking neural simulator";
homepage = "https://sourceforge.net/projects/ispike/";
license = lib.licenses.lgpl3;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.nico202 ];
};
}

4
pkgs/development/libraries/sentry-native/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
hash = "sha256-cKDKdwkmvmB7O5tvCYtAHFdZFlcTk3I95AuA0dr+oX8=";
hash = "sha256-GefuMsMFmNyAn+xmnRqUjyWFHqiF/kIzqBCF6mk3vx0=";
};
nativeBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "47";
version = "48";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/BdSB7CD/ob8vinYDZVy0FNU23PSCiHF8jHGQUDsm1w=";
hash = "sha256-HxZoHul8Nef52st/e10jjtRUvI9NGXuX6/pFYoFI/80=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/croniter/default.nix
View File

@ -1,20 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-dateutil
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, tzlocal
}:
buildPythonPackage rec {
pname = "croniter";
version = "1.3.14";
version = "1.3.15";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0Gex+VtVPG6C2VqYPEZWlZE9zRL0eouaqTigRQ2U3V4=";
hash = "sha256-kko4/aiPZ17Gg1Zn4dMqw3/w1lUJwhUnKdFv8gXjKmU=";
};
propagatedBuildInputs = [
@ -34,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to iterate over datetime object with cron like format";
homepage = "https://github.com/kiorky/croniter";
changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
};

5
pkgs/development/python-modules/dwdwfsapi/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dwdwfsapi";
version = "1.0.6";
version = "1.0.7";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-zeSV2acjtSWUYnrMjEBtrSPlXRvrNQRX5SYPYHnaOy0=";
hash = "sha256-7le1F+581JwrBX/C1aaqsDaSpIt0yNsNKiGnJtHUg5s=";
};
propagatedBuildInputs = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
homepage = "https://github.com/stephan192/dwdwfsapi";
changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ elohmeier ];
};

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

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "elastic-apm";
version = "6.15.1";
version = "6.16.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "refs/tags/v${version}";
hash = "sha256-s07LZeT2vTtBU/48heGFrW74D1iqkxRaLh+LTD35mu8=";
hash = "sha256-BPk1F50aUNzROfK/r73AlMX2LIDgsn0R5HUthht/ItU=";
};
propagatedBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.10";
version = "0.5.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-M0G+UvFCegKEDA+0PI1voesMqIItKC0591ruZ4YvjMU=";
hash = "sha256-iX8Vb6uUn1a7qVxwL6ZFy1YAANaSrucpOOijI1ufZco=";
};
propagatedBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "glom";
version = "23.1.1";
version = "23.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-t0QjCeAT/rb+qyBhl6v4rsMoNexwnYqSqFFDIvZMDv8=";
hash = "sha256-AxaZKA+kZmBI5D0uq2i+EET/zUh6t0rLeS3i7rC8JRU=";
};
postPatch = ''

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.66.2";
version = "0.67.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nabucasa";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-LlVT5WRd2uhUaghThJ5ghPbX40QjqTenUC4txMx3Jlo=";
hash = "sha256-/cu7+fMbe9kyWGGBGBwjsiA6PXoUJZ7IFzpEcnVSLn0=";
};
postPatch = ''

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pyroute2";
version = "0.7.8";
version = "0.7.9";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-mJRHQ08XyyD9kvwfFV8LxqRoKr9hH94qeslaYed3f/0=";
hash = "sha256-tp2C8UCwd0MX17pA9sX6HXVQmLo/PrYZmC0W51DcYxo=";
};
nativeBuildInputs = [

53
pkgs/development/python-modules/pyschlage/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pycognito
, pytestCheckHook
, pythonOlder
, requests
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "pyschlage";
version = "2023.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dknowles2";
repo = "pyschlage";
rev = "refs/tags/${version}";
hash = "sha256-l9Xi1VffvobSjluParvQjCTsCMWvhSV975j1OVclBWw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
pycognito
requests
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pyschlage"
];
meta = with lib; {
description = "Library for interacting with Schlage Encode WiFi locks";
homepage = "https://github.com/dknowles2/pyschlage";
changelog = "https://github.com/dknowles2/pyschlage/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pysnooz";
version = "0.8.4";
version = "0.8.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "AustinBrunkhorst";
repo = pname;
rev = "v${version}";
hash = "sha256-PrjDGBmdYN5qWUh5fvtq1yOMa/Lobq181C2RNfwfARI=";
hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg=";
};
postPatch = ''

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

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "0.21.0";
version = "0.21.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-H65vINDjv9TZQePhyc3x9COX56qKnqRIzA06txEPizk=";
hash = "sha256-Qt+o6ugBk+RJN/v34vQv46CsB6l+3z65csBVPl0M/gw=";
};
nativeBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "transmission-rpc";
version = "4.2.2";
version = "4.3.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Trim21";
repo = "transmission-rpc";
rev = "refs/tags/v${version}";
hash = "sha256-8gNGBfU7k2SvpNqRGkT9BXyAyKizUCXY8Unuqw5IICE=";
hash = "sha256-kcrPUBpx8puhG4de55tDGDmOnJPAOZzr+zC5gRd8b0s=";
};
nativeBuildInputs = [

25
pkgs/development/python-modules/wagtail-localize/default.nix
View File

@ -1,4 +1,5 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, dj-database-url
, django
, django-rq
@ -6,9 +7,9 @@
, flit-core
, freezegun
, google-cloud-translate
, lib
, polib
, python
, pythonOlder
, typing-extensions
, wagtail
}:
@ -18,13 +19,19 @@ buildPythonPackage rec {
version = "1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
repo = pname;
owner = "wagtail";
rev = "v${version}";
sha256 = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8=";
rev = "refs/tags/v${version}";
hash = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
django
wagtail
@ -32,20 +39,22 @@ buildPythonPackage rec {
typing-extensions
];
checkInputs = [
nativeCheckInputs = [
dj-database-url
django-rq
freezegun
google-cloud-translate
];
nativeBuildInputs = [ flit-core ];
passthru.optional-dependencies = {
google = [ google-cloud-translate ];
google = [
google-cloud-translate
];
};
checkPhase = ''
# test_translate_html fails with later Beautifulsoup releases
rm wagtail_localize/machine_translators/tests/test_dummy_translator.py
${python.interpreter} testmanage.py test
'';

32
pkgs/development/python-modules/wagtail/default.nix
View File

@ -1,4 +1,5 @@
{ anyascii
{ lib
, anyascii
, beautifulsoup4
, buildPythonPackage
, callPackage
@ -12,10 +13,10 @@
, fetchPypi
, html5lib
, l18n
, lib
, openpyxl
, permissionedforms
, pillow
, pythonOlder
, requests
, telepath
, willow
@ -24,10 +25,13 @@
buildPythonPackage rec {
pname = "wagtail";
version = "4.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8=";
hash = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8=";
};
postPatch = ''
@ -36,23 +40,23 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
anyascii
beautifulsoup4
django
django_treebeard
django-filter
django-modelcluster
django-taggit
django_treebeard
djangorestframework
django-filter
pillow
beautifulsoup4
html5lib
willow
requests
openpyxl
anyascii
draftjs-exporter
permissionedforms
telepath
html5lib
l18n
openpyxl
permissionedforms
pillow
requests
telepath
willow
];
# Tests are in separate derivation because they require a package that depends

16
pkgs/development/python-modules/wallbox/default.nix
View File

@ -1,21 +1,22 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, aenum
, buildPythonPackage
, fetchPypi
, pythonOlder
, requests
, simplejson
}:
buildPythonPackage rec {
pname = "wallbox";
version = "0.4.12";
version = "0.4.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/RM1tqtGBCUa1fcqh5yvVQMNzaEqpAUPonciEIE6lC4=";
hash = "sha256-HKlq5DPG3HD9i9LLTJdlzEFim+2hBdSfKl43BojhEf8=";
};
propagatedBuildInputs = [
@ -27,11 +28,14 @@ buildPythonPackage rec {
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "wallbox" ];
pythonImportsCheck = [
"wallbox"
];
meta = with lib; {
description = "Module for interacting with Wallbox EV charger api";
homepage = "https://github.com/cliviu74/wallbox";
changelog = "https://github.com/cliviu74/wallbox/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.63.0";
version = "0.64.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-H0GEXLaMTlzDLV5PI3wscCZ4+B3rfyv2/EZHTxF4Sqg=";
hash = "sha256-u9MZoJyTmbUBeFbsw2EtwfNDzXKAZOwNc+4TanbQg3A=";
};
nativeBuildInputs = [

6
pkgs/development/tools/database/surrealdb-migrations/default.nix
View File

@ -10,7 +10,7 @@
let
pname = "surrealdb-migrations";
version = "0.9.5";
version = "0.9.8";
in
rustPlatform.buildRustPackage rec {
inherit pname version;
@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
owner = "Odonno";
repo = pname;
rev = "v${version}";
sha256 = "sha256-raDWqdOid4WSl6Ads8dmh7KI6NMWZrSwGfh+wbd/Vao=";
hash = "sha256-6q6JLrr5msK2l895BhBujHf7L0WW2NpMQNDf493tVuE=";
};
cargoSha256 = "sha256-1+cvOhDeH9vx/8J1RwKLPdkBmqBKFmbNXv3H44pZfj0=";
cargoHash = "sha256-UePxUSO0q1+y33pDdECbIN8uIRV8ApLUhKlWAF4gj2Q=";
buildInputs = [ ]
++ lib.optionals stdenv.isDarwin [ Security ];

6
pkgs/development/tools/gojq/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gojq";
version = "0.12.12";
version = "0.12.13";
src = fetchFromGitHub {
owner = "itchyny";
repo = pname;
rev = "v${version}";
hash = "sha256-axiIHy6vNs0ySVP4UnYZ9J+GeAOz3LJ9vOP1xT4dcME=";
hash = "sha256-tlnj0CCsPZRQjIZCvNPjN0JD6oqRDvdWOCYR3tYMPUA=";
};
vendorHash = "sha256-kHwCh/6yaPaFce5k3NgAQ1GsoVmvmfIJujVaMwqrLBM=";
vendorHash = "sha256-DVJZ35C+6SuhaaGDM3u+3fB1497qaW6oTByAUPVwhJI=";
ldflags = [ "-s" "-w" ];

2
pkgs/development/tools/language-servers/metals/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
-r bintray:scalacenter/releases \
-r sonatype:snapshots > deps
mkdir -p $out/share/java
cp -n $(< deps) $out/share/java/
cp $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";

6
pkgs/development/tools/rust/svd2rust/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "svd2rust";
version = "0.28.0";
version = "0.29.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-/Pt0eKS6Rfrh18nb1lR/T+T+b73rmX4jmGIjbXJtcMA=";
sha256 = "sha256-VxjoS93OwJAc9Cb0VL9R/49pAcXPYrzC7q6vYJSDYB4=";
};
cargoSha256 = "sha256-Vum7Ltq9h6BMXvIESO9jC2B775BZlCWmatazk1bavQs=";
cargoHash = "sha256-f8dht3HCgzeTfyhFhJS2F+TL5Y0qi+A5PGZkNXF1AUw=";
meta = with lib; {
description = "Generate Rust register maps (`struct`s) from SVD files";

4
pkgs/development/tools/skaffold/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-0sOj5U9GFDFOs6uvgGHQfRFLlAoGk1DwRW4kN0lOIK0=";
hash = "sha256-nCJcgWVQeX5QsMyH117PWBBW+7H5ZigjDxPmiaYER1Y=";
};
vendorHash = null;

6
pkgs/development/tools/toast/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "toast";
version = "0.47.3";
version = "0.47.4";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rPS0jLlfZFeSHY/zdD1mAPm+00UPJAQuPnK7/hCHeGg=";
sha256 = "sha256-9uIZPmvjRjR9rRVp+rfLEjp6yDmf+87OglKqOwlRSEQ=";
};
cargoHash = "sha256-zCM9h4sJlfeXKyNy5LWrPaAmo2+/um0WSoJcYchYa/E=";
cargoHash = "sha256-cO2mO7ZtFuoIs58Y53xb4q+Cr5V94WTEgYkOYB0aGvY=";
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails

6
pkgs/development/tools/worker-build/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "worker-build";
version = "0.0.16";
version = "0.0.17";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "workers-rs";
rev = "v${version}";
sha256 = "sha256-8+ifSCfHYrS5iAa4fsujmofzicbwk/00VRNZvIkIc+E=";
sha256 = "sha256-siKIE+RHAnZ8Lj3kWg7jEVo5t10dqc59OMrro26ClWo=";
};
cargoHash = "sha256-fj/l53AdgJXYz+IA45yfNYgSw7DKbBrGVyFCfbqxxq0=";
cargoHash = "sha256-j6WG8pRM6fIvMeXDdkjzRREE9tIug0w+UwWdOmPao4U=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

4
pkgs/games/chessdb/default.nix
View File

@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
"MANDIR=$(out)/man"
];
postInstall = ''
wrapProgram $out/bin/chessdb --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
'';
meta = {
homepage = "https://chessdb.sourceforge.net/";
description = "A free chess database";

6
pkgs/games/ddnet/default.nix
View File

@ -34,19 +34,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "17.0.2";
version = "17.0.3";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-+k+QiRSFvaGhifN/SKf6bKtooRbnArV2M9o64X5GckE=";
hash = "sha256-93zYa6Y5Da8ksaCbgRpePiehMHtcICs4hY6Ys+vUeHw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-kbVHeavCIrLq9ImA2Z7H2O0NXNPjA+3qiba5LoADyG0=";
hash = "sha256-OeTINJVe/Ov3A4UmCC3QtCMj8e3vi+Qmai0DXJ3DpVU=";
};
nativeBuildInputs = [

33
pkgs/games/pokerth/default.nix
View File

@ -1,19 +1,8 @@
{ lib, mkDerivation, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, qtbase
, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
, wrapQtAppsHook
, tinyxml2, target ? "client" }:
let
hiDPI = fetchpatch {
url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch";
sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig";
};
revertPatch = patch: runCommand "revert-${patch.name}" {} ''
${patchutils}/bin/interdiff ${patch} /dev/null > $out
'';
in
mkDerivation rec {
pname = "pokerth-${target}";
version = "1.1.2";
@ -21,12 +10,26 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "pokerth";
repo = "pokerth";
rev = "f5688e01b0efb37035e3b0e3a432200185b9a0c5";
sha256 = "0la8d036pbscjnbxf8lkrqjfq8a4ywsfwxil452fhlays6mr19h0";
rev = "v${version}";
hash = "sha256-j4E3VMpaPqX7+hE3wYRZZUeRD//F+K2Gp8oPmJqX5FQ=";
};
patches = [
(revertPatch hiDPI)
(fetchpatch {
name = "pokerth-1.1.2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-we2UOCFF5J/Wlji/rJeCHDu/dNsUU+R+bTw83AmvDxs=";
})
(fetchpatch {
name = "pokerth-1.1.2.patch.2019";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2019?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-m6uFPmPC3T9kV7EI1p33vQSi0d/w+YCH0dKjviAphMY=";
})
(fetchpatch {
name = "pokerth-1.1.2.patch.2020";
url = "https://aur.archlinux.org/cgit/aur.git/plain/pokerth-1.1.2.patch.2020?h=pokerth&id=7734029cf9c6ef58f42ed873e1b9c3c19eb1df3b";
hash = "sha256-I2qrgLGSMvFDHyUZFWGPGnuecZ914NBf2uGK02X/wOg=";
})
];
postPatch = ''

72
pkgs/games/scid/default.nix
View File

@ -1,59 +1,55 @@
{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, tcl
, tk
, libX11
, zlib
}:
tcl.mkTclDerivation {
tcl.mkTclDerivation rec {
pname = "scid";
version = "4.3";
version = "5.0.2";
src = fetchurl {
url = "mirror://sourceforge/scid/scid-4.3.tar.bz2";
sha256 = "0zb5qp04x8w4gn2kvfdfq2p44kmzfcqn7v167dixz6nlyxg41hrw";
src = fetchFromGitHub {
owner = "benini";
repo = "scid";
rev = "v${version}";
hash = "sha256-5WGZm7EwhZAMKJKxj/OOIFOJIgPBcc6/Bh4xVAlia4Y=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-e '/^ *set x11Path *{/a ${libX11}/lib/' \
configure
sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
tcl/config.tcl
postPatch = ''
substituteInPlace configure \
--replace "set var(INSTALL) {install_mac}" ""
'';
nativeBuildInputs = [
makeWrapper
];
buildInputs = [
tk
libX11
zlib
];
configureFlags = [
"BINDIR=$(out)/bin"
"SHAREDIR=$(out)/share"
];
hardeningDisable = [ "format" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
dontPatchShebangs = true;
# TODO: can this use tclWrapperArgs?
postFixup = ''
for cmd in sc_addmove sc_eco sc_epgn scidpgn \
sc_import sc_spell sc_tree spliteco
do
sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd"
done
sed -i -e '1c#!${tcl}/bin/tcslsh' "$out/bin/spf2spi"
sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
for cmd in $out/bin/*
do
wrapProgram "$cmd" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
enableParallelBuilding = true;
meta = {
description = "Chess database with play and training functionality";
maintainers = with lib.maintainers; [ agbrooks ];
homepage = "https://scid.sourceforge.net/";
license = lib.licenses.gpl2;
platforms = lib.platforms.all;
};
}

6
pkgs/servers/akkoma/akkoma-fe/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "akkoma-fe";
version = "unstable-2023-04-14";
version = "unstable-2023-05-23";
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "akkoma-fe";
rev = "9aa64d82c964265133be97b08b0cdf0e75680419";
hash = "sha256-WwjpYD8U+JvygPMo8VcQDdsjek3iKbpT18rXSVMPDG8=";
rev = "e530c2b4626fab3bc94736cb7d0774809717911f";
hash = "sha256-dowo4YzlkfuQv1G4NclPrKyBwtOq7bEXruQY/BVjNyM=";
};
offlineCache = fetchYarnDeps {

4
pkgs/servers/akkoma/default.nix
View File

@ -9,14 +9,14 @@
beamPackages.mixRelease rec {
pname = "pleroma";
version = "3.8.0";
version = "3.9.3";
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "akkoma";
rev = "v${version}";
hash = "sha256-KpaJ2xx3XEibMv1G8o9Lw7+LcnxPCUiWlmdcoi5wklQ=";
hash = "sha256-vXE7jv1GPAMKpWEAE9IUgWo7A+zkGYUzu0jlZ9oSbjA=";
};
postPatch = ''

54
pkgs/servers/akkoma/mix.nix
View File

@ -205,12 +205,12 @@ let
cowboy = buildErlangMk rec {
name = "cowboy";
version = "2.9.0";
version = "2.10.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic";
sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s";
};
beamDeps = [ cowlib ranch ];
@ -231,12 +231,12 @@ let
cowlib = buildRebar3 rec {
name = "cowlib";
version = "2.11.0";
version = "2.12.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib";
sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn";
};
beamDeps = [];
@ -257,25 +257,25 @@ let
db_connection = buildMix rec {
name = "db_connection";
version = "2.4.3";
version = "2.5.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "04iwywfqf8k125yfvm084l1mp0bcv82mwih7xlpb7kx61xdw29y1";
sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9";
};
beamDeps = [ connection telemetry ];
beamDeps = [ telemetry ];
};
decimal = buildMix rec {
name = "decimal";
version = "2.0.0";
version = "2.1.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril";
sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk";
};
beamDeps = [];
@ -296,12 +296,12 @@ let
dialyxir = buildMix rec {
name = "dialyxir";
version = "1.2.0";
version = "1.3.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0qw4zyd86fjwsav744jvz1wpdbmy9nz645xqr9s1d1bs88v221v1";
sha256 = "0vv90jip2w362n3l7dkhqfdwlz97nwji535kn3fbk3dassya9ch0";
};
beamDeps = [ erlex ];
@ -309,12 +309,12 @@ let
earmark = buildMix rec {
name = "earmark";
version = "1.4.37";
version = "1.4.38";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "01mibj51iys1l289mk2adqs50hfbpfj643mh459nvf4dhq95wvfq";
sha256 = "0zzcslyv92gcp4zs3rd1vmw844s1q0fv127m7f7pszhnwh6y6f7r";
};
beamDeps = [ earmark_parser ];
@ -322,12 +322,12 @@ let
earmark_parser = buildMix rec {
name = "earmark_parser";
version = "1.4.31";
version = "1.4.32";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0nfhxyklbz0ixkl33xqkchqgdzk948dcjikym0vz0pikw1z3cz9i";
sha256 = "0md7rhw1ix4fp31bql9scvl4jpijixczm2ky7mxffwq3srvxvc5q";
};
beamDeps = [];
@ -374,12 +374,12 @@ let
ecto_psql_extras = buildMix rec {
name = "ecto_psql_extras";
version = "0.7.10";
version = "0.7.11";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "123h3s4zpk5q618rcxlfz4axj3rz3cmyk68gps8c05sg3vc8qpjh";
sha256 = "08qbsk5njwz48vj4nq7bb6jc1mhjf8ay5fhbr18hvx6lj8gizxny";
};
beamDeps = [ ecto_sql postgrex table_rex ];
@ -478,12 +478,12 @@ let
ex_doc = buildMix rec {
name = "ex_doc";
version = "0.29.3";
version = "0.29.4";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1qdzflf1lbi5phg2vs8p3aznz0p8wmmx56qynp1ix008gdypiiix";
sha256 = "1xf49d0ni08a83iankdj8fb6jyxm67wjl0gdwihwnimf6ykrjric";
};
beamDeps = [ earmark_parser makeup_elixir makeup_erlang ];
@ -816,12 +816,12 @@ let
makeup_elixir = buildMix rec {
name = "makeup_elixir";
version = "0.16.0";
version = "0.16.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1rrqydcq2bshs577z7jbgdnrlg7cpnzc8n48kap4c2ln2gfcpci8";
sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1";
};
beamDeps = [ makeup nimble_parsec ];
@ -959,12 +959,12 @@ let
nimble_parsec = buildMix rec {
name = "nimble_parsec";
version = "1.2.3";
version = "1.3.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1c3hnppmjkwnqrc9vvm72kpliav0mqyyk4cjp7vsqccikgiqkmy8";
sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6";
};
beamDeps = [];
@ -998,12 +998,12 @@ let
open_api_spex = buildMix rec {
name = "open_api_spex";
version = "3.16.1";
version = "3.16.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1yyvvyzzi6k2l55fl4wijhrzzdjns95asxcbnikgh6hjmiwdfvzg";
sha256 = "1bgcp0sfj9j95nb353dn66m81085sq5pwdzwq80x1xc8mgpydjqv";
};
beamDeps = [ jason plug poison ];
@ -1336,12 +1336,12 @@ let
swoosh = buildMix rec {
name = "swoosh";
version = "1.9.1";
version = "1.10.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "07ipsrp34s18c9zd5kglqsdc8z7gxa9aadsrklj0zf6azzrzzpvn";
sha256 = "0fm0vp0azzrbs53r967x5dgqrj3879dzvka5304wcjgdfkrzldhp";
};
beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ];

10
pkgs/servers/dns/knot-dns/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.2.6";
version = "3.2.7";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "ac124fb17dbc4ac5310a30a396245a6ba304b3c89abed0f8a47d727462c8da4d";
sha256 = "d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b";
};
outputs = [ "bin" "out" "dev" ];
@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
./runtime-deps.patch
];
# Upstream mistake in 3.2.7: too strict constraint.
postPatch = ''
substituteInPlace configure.ac \
--replace 'libngtcp2 = 0.13.0' 'libngtcp2 = 0.13.1'
'';
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
gnutls liburcu libidn2 libunistring

71
pkgs/servers/networking/rustus/default.nix Normal file
View File

@ -0,0 +1,71 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, nix-update-script
, pkg-config
, openssl
, Security
}:
let
pname = "rustus";
version = "0.7.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "s3rius";
repo = pname;
rev = version;
hash = "sha256-In/GKtQbp52Zg1cePMJds9aagS3Ga/CKIM+k2efFnKs=";
};
cargoHash = "sha256-6pOXiTRquxumoS8fD/yjZI4fh8mGeF2XT4rvkjx0AuU=";
env.OPENSSL_NO_VENDOR = 1;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
Security
];
passthru.updateScript = nix-update-script { };
# too many tests fail for now
# doCheck = false;
# checkFlags = [
# # tries to make a network access
# "--skip=tests::curl_http_ockam"
# "--skip=medium_file_transfer"
# "--skip=medium_file_transfer_large_chunks"
# "--skip=medium_file_transfer_small_chunks"
# "--skip=tiny_file_transfer"
# "--skip=tiny_file_transfer_small_chunks"
# # tries to do IO
# "--skip=cli_state::tests::integration"
# "--skip=cli_state::tests::test_create_default_identity_state"
# "--skip=cli_state::tests::test_create_named_identity_state"
# "--skip=kafka::integration_test::test::producer__flow_with_mock_kafka__content_encryption_and_decryption"
# "--skip=kafka::portal_worker::test::kafka_portal_worker__metadata_exchange__response_changed"
# "--skip=full_flow"
# "--skip=run::parser::tests::detect_circular_dependency"
# "--skip=run::parser::tests::test_parse_config_with_depends_on"
# "--skip=util::tests::test_process_multi_addr"
# ];
meta = with lib; {
description = "TUS protocol implementation in Rust.";
homepage = "https://s3rius.github.io/rustus/";
license = licenses.asl20;
maintainers = with maintainers; [ happysalada ];
platforms = platforms.all;
};
}

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.16.3";
version = "0.16.4";
src = fetchFromGitHub {
owner = "pocketbase";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AKKCd80gxeL2s1yFX3pjwgxn7UDbrrhFUkMWDDcrN0c=";
sha256 = "sha256-xthv6/mTtOsT8Q4xk+XXO5TDDCFYcMPFLOv+pkagpU4=";
};
vendorHash = "sha256-J1vZn5x7wxM/UshcB+FdaiXiq4mZF7KvZxR5iPb37UQ=";
vendorHash = "sha256-4h3Q8w7emjfZkVr0xujoOUjipXnDQfHOn8Ii19cNllI=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];

1148
pkgs/servers/search/meilisearch/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@ -7,7 +7,7 @@
, nix-update-script
}:
let version = "1.1.1";
let version = "1.2.0";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "refs/tags/v${version}";
hash = "sha256-catbSe4KT52vNaMD/rq4B7myw76Ki4NSBPX8nTgxT18=";
hash = "sha256-j+tz47dQFyKy51UAzFOc2YkAeYDUdsiteenC38cWrLI=";
};
cargoBuildFlags = [
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
lockFile = ./Cargo.lock;
outputHashes = {
"actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII=";
"heed-0.12.5" = "sha256-atkKiK8rzqji47tJvUzbIXMw8U1uddHkHakPuEUvmFg=";
"heed-0.12.5" = "sha256-WOdpgc3sDNKBSYWB102xTxmY1SWljH9Q1+6xmj4Rb8Q=";
"lmdb-rkv-sys-0.15.1" = "sha256-zLHTprwF7aa+2jaD7dGYmOZpJYFijMTb4I3ODflNUII=";
"nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY=";
};

5
pkgs/tools/X11/xpra/default.nix
View File

@ -69,11 +69,11 @@ let
'';
in buildPythonApplication rec {
pname = "xpra";
version = "4.4.4";
version = "4.4.5";
src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
hash = "sha256-oPa9ECqCE9+PrcZufsHWYR6EHxTZVFJOMUlK2b0mwLE=";
hash = "sha256-o2vDPzZWgpEFe0yzNjwtuLPHO0GfWbSscKjvIfTi6Ro=";
};
patches = [
@ -211,6 +211,7 @@ in buildPythonApplication rec {
homepage = "https://xpra.org/";
downloadPage = "https://xpra.org/src/";
description = "Persistent remote applications for X";
changelog = "https://github.com/Xpra-org/xpra/releases/tag/v${version}";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ offline numinit mvnetbiz ];

2
pkgs/tools/backup/easysnap/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
cp -n easysnap* $out/bin/
cp easysnap* $out/bin/
for i in $out/bin/*; do
substituteInPlace $i \

16
pkgs/tools/compression/pigz/default.nix
View File

@ -1,16 +1,24 @@
{ lib, stdenv, fetchFromGitHub, zlib, util-linux }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, util-linux }:
stdenv.mkDerivation rec {
pname = "pigz";
version = "2.6";
version = "2.7";
src = fetchFromGitHub {
owner = "madler";
repo = "${pname}";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "146qkmzi199xwmmf6bllanqfyl702fm1rnad8cd5r5yyrp5ks115";
sha256 = "sha256-RYp3vRwlI6S/lcib+3t7qLYFWv11GUnj1Cmxm9eaVro=";
};
patches = [
# needed to build the pigzn test binary
(fetchpatch {
url = "https://github.com/madler/pigz/commit/67fd6e436f4f479aead529a719e24d6864cf1dfa.patch";
sha256 = "sha256-FkzLYob/WIVIB7eh03cdzpLy6SzoHLqEMsWyHdMTjbU=";
})
];
enableParallelBuilding = true;
buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux;

6
pkgs/tools/filesystems/apfsprogs/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2023-05-16";
version = "unstable-2023-06-06";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "7be75bcf1a533272bc69684b4b7d33c2adba315c";
hash = "sha256-WHAUrDiXy5HCwN876bZGc/OUHJITf6Fnpx4kAwAhcAs=";
rev = "91827679dfb1d6f5719fbe22fa67e89c17adb133";
hash = "sha256-gF7bOozAGGpuVP23mnPW81qH2gnVUdT9cxukzGJ+ydI=";
};
buildPhase = ''

4
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.3";
version = "6.3.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "sha256-QKC9/3h+y0kOVTPbzv1IUhdtrxKq5aEVggPbQ9itan0=";
sha256 = "sha256-mtmDlMeTbDZQRFoTQQOg22rTv28WORff/0n/d2FLPxQ=";
};
nativeBuildInputs = [

41
pkgs/tools/misc/lavat/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
,
}:
let
version = "2.0.0";
in
stdenv.mkDerivation {
pname = "lavat";
inherit version;
src = fetchFromGitHub {
owner = "AngelJumbo";
repo = "lavat";
rev = "v${version}";
hash = "sha256-xDjqKhwoaqCqo7tkpcEe2MBEpVTJUOpKtu7Fi9aPOPo=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp lavat $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Lava lamp simulation in the terminal";
longDescription = ''
Lavat puts ascii metaballs in your terminal to make it look a bit like a
lava lamp.
Lavat contains various options, including those to change the color and
speed of the metaballs. For a full list, run `lavat -h`
'';
maintainers = [ maintainers.minion3665 ];
license = licenses.mit;
homepage = "https://github.com/AngelJumbo/lavat";
platforms = platforms.all;
};
}

4
pkgs/tools/misc/vtm/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "vtm";
version = "0.9.9l";
version = "0.9.9m";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${version}";
sha256 = "sha256-thahwqgXMgEY02dLnmXsdOy0/WUYJJewB9ax7GP6LK0=";
sha256 = "sha256-l9EMoUUM4pH+YwzdrTXhBawiW1l2OzX9ou18U5kM36c=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/tools/networking/dae/default.nix
View File

@ -5,17 +5,17 @@
}:
buildGoModule rec {
pname = "dae";
version = "0.1.10";
version = "0.1.10.p1";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EWd7pKAXhsO7Nz3iRdY5eE7U8bkiZD/9SjouGLAdwF8=";
sha256 = "sha256-pURL2K05cp7/CUkC/rAJAhrQQWfalid53LDDGuQShQ4=";
fetchSubmodules = true;
};
vendorHash = "sha256-4LfnU3UCNhMBloSCUUXrseiUT6esqWFngrGIFjpAjUc=";
vendorHash = "sha256-i0z0O0qpirlCsxZNMX2ICLPZ/k6ykyKC21+cg+butEA=";
proxyVendor = true;

4
pkgs/tools/networking/grpc_cli/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.55.0";
version = "1.55.1";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-xEfYNqtMKeJpztUm39PaUrE8OKa8TQhtLBny2/D99VM=";
hash = "sha256-3FaNGrvd+EuknOsShLSZKAHmZoa8eLBw+BHbNK59PGU=";
fetchSubmodules = true;
};
nativeBuildInputs = [ automake cmake autoconf ];

4
pkgs/tools/networking/minidlna/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "minidlna";
version = "1.3.2";
version = "1.3.3";
in
stdenv.mkDerivation {
inherit pname version;
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://git.code.sf.net/p/${pname}/git";
rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-v+puglrbuLqHIAbrO7bhOA0npc/GYp0Bdi3DnD9qyII=";
hash = "sha256-InsSguoGi1Gp8R/bd4/c16xqRuk0bRsgw7wvcbokgKo=";
};
preConfigure = ''

2
pkgs/tools/package-management/nix/default.nix
View File

@ -204,7 +204,7 @@ in lib.makeExtensible (self: {
else
nix;
stable = self.nix_2_13;
stable = self.nix_2_15;
unstable = self.nix_2_16;
})

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.18"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.19"

42
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,15 +1,16 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 3641bc9666de2c52f5be49cb9e8c4a71529f8a75
ref: refs/tags/6.3.18
revision: 5465dc93856c5e82f37c297a627339278cc1ecec
ref: refs/tags/6.3.19
specs:
metasploit-framework (6.3.18)
metasploit-framework (6.3.19)
actionpack (~> 7.0)
activerecord (~> 7.0)
activesupport (~> 7.0)
aws-sdk-ec2
aws-sdk-iam
aws-sdk-s3
aws-sdk-ssm
bcrypt
bcrypt_pbkdf
bootsnap
@ -130,25 +131,28 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.772.0)
aws-sdk-core (3.173.1)
aws-partitions (1.774.0)
aws-sdk-core (3.174.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.380.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-ec2 (1.381.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.77.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-iam (1.78.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.65.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.122.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.123.1)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sdk-ssm (1.151.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.18)
@ -184,7 +188,7 @@ GEM
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday-retry (2.1.0)
faraday-retry (2.2.0)
faraday (~> 2.0)
faye-websocket (0.11.2)
eventmachine (>= 0.12.0)
@ -205,10 +209,10 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.8.0)
httpclient (2.8.3)
i18n (1.13.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
irb (1.6.4)
irb (1.7.0)
reline (>= 0.3.0)
jmespath (1.6.2)
jsobfu (0.4.2)
@ -293,7 +297,7 @@ GEM
ttfunk
pg (1.5.3)
public_suffix (5.0.1)
puma (6.2.2)
puma (6.3.0)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.7)
@ -321,7 +325,7 @@ GEM
recog (3.1.1)
nokogiri
redcarpet (3.6.0)
reline (0.3.4)
reline (0.3.5)
io-console (~> 0.5)
rex-arch (0.1.14)
rex-text
@ -446,4 +450,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
2.4.13
2.4.12

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.18";
version = "6.3.19";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-IUUxkNLbM+98c0RVguted9t21PEq1WPrVZgfPQQ8tUQ=";
sha256 = "sha256-eo3heJb6JVFl/Ik3aSsqdu+NLuS5ot3pDoseJOUjz0w=";
};
nativeBuildInputs = [ makeWrapper ];

60
pkgs/tools/security/metasploit/gemset.nix
View File

@ -104,60 +104,70 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18gr9x4pk8mgwgxvnbi8jc3j6dh3np5wfrck15ykpwgw4g0r1qi3";
sha256 = "1xn5b62gmp1l2xia49spny1yx3zf517a9dn1djk1wbaxpw36v4rj";
type = "gem";
};
version = "1.772.0";
version = "1.774.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xnrn7mixwna9cszlsmps7675kqrs9vv17bsx6ywps5wjp7wyak9";
sha256 = "1r29w7p08qp24z3qqvh5g7gchijlxw2x0bx9abcq7rnnzyqcd55n";
type = "gem";
};
version = "3.173.1";
version = "3.174.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r4b0rcbbzrl8acmzy276y9amcv9yqpr9s3k0xqxkp8l5zdrwz9w";
sha256 = "0zliqz8b08lzp1i75cr4gyq3a9vcz89qya3ax8r3zj8z2qhsrmab";
type = "gem";
};
version = "1.380.0";
version = "1.381.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0crb3m1apj6kszp9aqmc2lqw99i1xkxbp5fl1s5748718kld4s8v";
sha256 = "1njij81840f8nfd5rspyjr2n47mlzracb8vx1z77xc0n65v5p0fz";
type = "gem";
};
version = "1.77.0";
version = "1.78.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
sha256 = "17rva6b434g9is4x2d2k434y74b21ffqhmyx4akpxssa67kqsx05";
type = "gem";
};
version = "1.64.0";
version = "1.65.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
sha256 = "0bafrg895ps1v2fixlm9vsl65qs6ll0dd0n06vk1l0z0qs6xj1ra";
type = "gem";
};
version = "1.122.0";
version = "1.123.1";
};
aws-sdk-ssm = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qz1x5dizp32n1g3fshabfkm89yx83l1ak1dhjldad15ix4lga0i";
type = "gem";
};
version = "1.151.0";
};
aws-sigv4 = {
groups = ["default"];
@ -384,10 +394,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n";
sha256 = "1ia19zgni6cw96rvsr0s004vjs9m2r6la4s00zcff36xaia4m0l0";
type = "gem";
};
version = "2.1.0";
version = "2.2.0";
};
faye-websocket = {
groups = ["default"];
@ -504,10 +514,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.13.0";
version = "1.14.1";
};
io-console = {
groups = ["default"];
@ -524,10 +534,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04j4qaj3siaddjz5y310dh54zxsp50x68cshl51fiwayi7khw556";
sha256 = "0z7ksjik7phf6ygshg9bp6ldd38dfgxmgr73yipkpqq7b426hclq";
type = "gem";
};
version = "1.6.4";
version = "1.7.0";
};
jmespath = {
groups = ["default"];
@ -624,12 +634,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "3641bc9666de2c52f5be49cb9e8c4a71529f8a75";
sha256 = "0i5m7h23s7wqapmn7m9ay7a7dnvpbvmq4ma4fdyfycyvsa832i91";
rev = "5465dc93856c5e82f37c297a627339278cc1ecec";
sha256 = "0k6g4gjj87lb1vlxv8mrwhp8vvvn58mnjdw9zijm29gsjrwf33bs";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.18";
version = "6.3.19";
};
metasploit-model = {
groups = ["default"];
@ -947,10 +957,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5";
sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh";
type = "gem";
};
version = "6.2.2";
version = "6.3.0";
};
racc = {
groups = ["default"];
@ -1077,10 +1087,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c0vm2qd6yqya75zymh3szlq7k7wb1a53cidk3h5yr4g3wvhfija";
sha256 = "0k5rqi4b7qnwxslc54k0nnfg97842i6hmjnyy79pqyydwwcjhj0i";
type = "gem";
};
version = "0.3.4";
version = "0.3.5";
};
rex-arch = {
groups = ["default"];

4
pkgs/tools/typesetting/asciidoctorj/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "asciidoctorj";
version = "2.5.8";
version = "2.5.10";
src = fetchzip {
url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
sha256 = "sha256-Xn6uIHEsyIXA9ls0bZZHdW7aKcgdub9C6g7lQ853tiQ=";
sha256 = "sha256-uhGwZkr5DaoQGkH+romkD7bQTLr+O8Si+wQcZXyMWOI=";
};
nativeBuildInputs = [ makeWrapper ];

16
pkgs/tools/virtualization/shipyard/default.nix → pkgs/tools/virtualization/jumppad/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "shipyard";
version = "0.5.2";
pname = "jumppad";
version = "0.5.27";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
owner = "jumppad-labs";
repo = pname;
sha256 = "sha256-Fd0R067YGdigG9SyWjXQYyQEnJM7Oug7Qkb0v+zK09g=";
rev = "v${version}";
hash = "sha256-WTywuQ1sl5zKpwUYyHFb+eTRxlUUDWFIrmhsPDB+iyc=";
};
vendorHash = "sha256-aE58XYgEWdPtq+DZKtn8Jbw2YIiiJSPutmVEOsG7urk=";
vendorHash = "sha256-OtixGeQY1wPqs3WU6gKvrzEgxnMORxr4BWCpn/VYxRc=";
ldflags = [
"-s" "-w" "-X main.version=${version}"
@ -21,8 +21,8 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
description = "Shipyard is a tool for building modern cloud native development environments";
homepage = "https://shipyard.run";
description = "A tool for building modern cloud native development environments";
homepage = "https://jumppad.dev";
license = licenses.mpl20;
maintainers = with maintainers; [ cpcloud ];
};

4
pkgs/tools/virtualization/kubevirt/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubevirt";
version = "0.59.0";
version = "0.59.1";
src = fetchFromGitHub {
owner = "kubevirt";
repo = "kubevirt";
rev = "v${version}";
sha256 = "sha256-4mTq/V4X8eq7g+ltgFD2ZFC7k2yiszG2i2QErttPATE=";
sha256 = "sha256-5xdPzL0GwEw+WHRIf7aQnvTd7dsayKkFubP/RSY8N/8=";
};
vendorHash = null;

4
pkgs/tools/wayland/wlsunset/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wlsunset";
version = "0.2.0";
version = "0.3.0";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = pname;
rev = version;
sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w";
sha256 = "sha256-jGYPWaRUqDL4htdAOA9CAQfoHLBPvK7O9vAzcE81f/E=";
};
strictDeps = true;

1
pkgs/top-level/aliases.nix
View File

@ -1511,6 +1511,7 @@ mapAliases ({
shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15
shipyard = jumppad; # Added 2023-06-06
sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24

36
pkgs/top-level/all-packages.nix
View File

@ -1355,7 +1355,7 @@ with pkgs;
};
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
boost = boost16x; # checkPhase fails with Boost 1.77
boost = boost175; # checkPhase fails with Boost 1.77
};
adminer = callPackage ../servers/adminer { };
@ -5312,6 +5312,8 @@ with pkgs;
joystickwake = callPackage ../tools/games/joystickwake { };
jumppad = callPackage ../tools/virtualization/jumppad { };
jwt-cli = callPackage ../tools/security/jwt-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -5849,8 +5851,6 @@ with pkgs;
simdjson = callPackage ../development/libraries/simdjson { };
shipyard = callPackage ../tools/virtualization/shipyard { };
shisho = callPackage ../tools/security/shisho { };
sigslot = callPackage ../development/libraries/sigslot { };
@ -8894,9 +8894,7 @@ with pkgs;
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
ispike = callPackage ../development/libraries/science/robotics/ispike {
boost = boost16x;
};
ispike = callPackage ../development/libraries/science/robotics/ispike { };
isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; };
@ -9683,6 +9681,8 @@ with pkgs;
lazycli = callPackage ../tools/misc/lazycli { };
lavat = callPackage ../tools/misc/lavat { };
lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;
@ -25461,6 +25461,10 @@ with pkgs;
exabgp = callPackage ../servers/networking/exabgp { };
rustus = callPackage ../servers/networking/rustus {
inherit (darwin.apple_sdk.frameworks) Security;
};
exim = callPackage ../servers/mail/exim { };
fastnetmon-advanced = callPackage ../servers/fastnetmon-advanced { };
@ -35987,7 +35991,7 @@ with pkgs;
litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin {
inherit (darwin.apple_sdk.frameworks) AppKit;
boost = pkgs.boost174;
boost = pkgs.boost177;
};
litecoind = litecoin.override { withGui = false; };
@ -37012,12 +37016,9 @@ with pkgs;
pong3d = callPackage ../games/pong3d { };
pokerth = libsForQt5.callPackage ../games/pokerth {
boost = boost16x;
};
pokerth = libsForQt5.callPackage ../games/pokerth { };
pokerth-server = libsForQt5.callPackage ../games/pokerth {
boost = boost16x;
target = "server";
};
@ -37103,10 +37104,7 @@ with pkgs;
sauerbraten = callPackage ../games/sauerbraten { };
scid = callPackage ../games/scid {
tcl = tcl-8_5;
tk = tk-8_5;
};
scid = callPackage ../games/scid { };
scid-vs-pc = callPackage ../games/scid-vs-pc {
tcl = tcl-8_6;
@ -37715,9 +37713,7 @@ with pkgs;
inherit (llvmPackages) openmp;
};
ciftilib = callPackage ../development/libraries/science/biology/ciftilib {
boost = boost16x;
};
ciftilib = callPackage ../development/libraries/science/biology/ciftilib { };
cmtk = callPackage ../applications/science/biology/cmtk { };
@ -37803,9 +37799,7 @@ with pkgs;
minia = callPackage ../applications/science/biology/minia { };
mirtk = callPackage ../development/libraries/science/biology/mirtk {
boost = boost16x;
};
mirtk = callPackage ../development/libraries/science/biology/mirtk { };
muscle = callPackage ../applications/science/biology/muscle { };

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

@ -7756,6 +7756,8 @@ self: super: with self; {
pyschemes = callPackage ../development/python-modules/pyschemes { };
pyschlage = callPackage ../development/python-modules/pyschlage { };
pyshark = callPackage ../development/python-modules/pyshark { };
pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };