nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 01:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-17 18:16:14 +00:00 committed by GitHub
commit 70da3334cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 747 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/airwindows-lv2/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "11.0";
version = "12.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IMVcspdWotNbdIZ2IpsNhI0k3+ZdXHEHVxrgOMoROEQ=";
sha256 = "sha256-e5iMhkcIhQikPcDrMILqBkmBjh8Ngnr2odqyefnrekI=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

4
pkgs/applications/blockchains/besu/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "besu";
version = "21.10.8";
version = "22.7.6";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-0yXi42vDinB6nuv5IGj1AhYGqMa2Rku0tNWQCO+AFPw=";
sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM=";
};
nativeBuildInputs = [ makeWrapper ];

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

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "CopyQ";
version = "6.2.0";
version = "6.3.2";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
hash = "sha256-0XCqSF1oc2B3FD5OmOxqgt9sqCIrzK0KjkntVFXlRWI=";
hash = "sha256-Ge/TD9Llq4YTAqaL9LBEsgNI9qrf2jLDt7q2ZTI9rmE=";
};
nativeBuildInputs = [

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.4.33";
version = "6.4.34";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-gpVOvSbHeQZGPOIK3KRcvPgGiVdEHheUG9MFKlwVQy4=";
sha256 = "sha256-w73e0bXOI2lgvRzu7j8yVyIO2Zw+7ISl12u1YY4yWNQ=";
};
buildInputs = [ openssl ];

67
pkgs/applications/misc/gnome-extension-manager/default.nix Normal file
View File

@ -0,0 +1,67 @@
{ stdenv
, lib
, fetchFromGitHub
, wrapGAppsHook4
, libadwaita
, meson
, ninja
, gettext
, gtk4
, appstream-glib
, desktop-file-utils
, gobject-introspection
, blueprint-compiler
, pkg-config
, json-glib
, libsoup_3
, glib
, libbacktrace
, python3
, text-engine
}:
stdenv.mkDerivation rec {
pname = "gnome-extension-manager";
version = "0.4.0";
src = fetchFromGitHub {
owner = "mjakeman";
repo = "extension-manager";
rev = "v${version}";
sha256 = "sha256-M+jMEJXtzUP6dQp9vpyMhh1wuKG9YJ8i0ys92nbmmpw=";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
glib
gobject-introspection
libadwaita
meson
ninja
pkg-config
python3
wrapGAppsHook4
];
buildInputs = [
blueprint-compiler
gtk4
json-glib
libsoup_3
libbacktrace
text-engine
];
# See https://github.com/NixOS/nixpkgs/issues/36468.
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
meta = with lib; {
description = "Desktop app for managing GNOME shell extensions";
homepage = "https://github.com/mjakeman/extension-manager";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ foo-dogsquared ];
};
}

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "105.0.3";
version = "106.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "8a60ed26f3a6e3fafb1eb13a8daf067056d011a17835310f8ce814b86121014796e790f611058aea75334428529028a2e29ba81d9d2653e09517dc7c3cf48e76";
sha512 = "30ced2fff818858267eaab23974f6962c5d39433ce8e26507589535fc9348f00cf5e45b90997dfb6e2361b70900547fdb0e70d741127cc6705089ea585ea2296";
};
meta = {
@ -28,11 +28,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.3.0esr";
version = "102.4.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "35357791f4de8b474780083a22fb52b7846b8012cbf01403f2b9526151d11c196ce0f9fba8e0f16d8235d7259af6fba1bc3acbb5b7e79129a28f390467aa7556";
sha512 = "30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28";
};
meta = {

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, openh264, usrsctp, libevent, libvpx
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
@ -24,7 +24,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [
libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
libjpeg libopus ffmpeg alsa-lib libpulseaudio protobuf
openh264 usrsctp libevent libvpx
libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
@ -38,7 +38,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [
# Required for linking downstream binaries.
abseil-cpp openh264 usrsctp libevent libvpx
abseil-cpp openh264 usrsctp libevent libvpx openssl_1_1
];
meta = with lib; {

11
pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
View File

@ -1,4 +1,11 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
@ -12,7 +19,7 @@ rustPlatform.buildRustPackage rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc=";

4
pkgs/applications/networking/p2p/gnunet/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
version = "0.17.2";
version = "0.17.6";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "sha256-OLE7V44kkKmSInV8ZHJ965eTn995cQf5hih8KUTudUE=";
sha256 = "sha256-JJNY7zsQzpmBB4H+2uxSam6rlDwSDku6CWrt+Rwa/EA=";
};
enableParallelBuilding = true;

6
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
version = "4.3.0";
version = "4.4.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "sha256-LlE+Wj+Q5of6miU8SLV/EUlcj5eQ6m4ZVtU0JOsz/kM=";
sha256 = "sha256-gXzGjELVcZ7LIOCu+Nub6K+zx8b6InkZk2NTfDHw8/E=";
};
hardeningDisable = [ "format" ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The ultimate desktop calculator";
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner doronbehar ];
maintainers = with maintainers; [ gebner doronbehar alyaeanyx ];
license = licenses.gpl2Plus;
platforms = platforms.all;
};

4
pkgs/applications/version-management/git-and-tools/git-nomad/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "git-nomad";
@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A=";
};
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0=";
meta = with lib; {

24
pkgs/applications/version-management/p4v/darwin.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, undmg }:
{ pname, version, src, meta }:
stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications $out/bin
# Install Qt applications.
for f in p4admin.app p4merge.app p4v.app; do
mv $f $out/Applications
done
# Install p4vc separately (it's a tiny shell script).
mv p4vc $out/bin
substituteInPlace $out/bin/p4vc \
--replace /Applications $out/Applications
'';
}

92
pkgs/applications/version-management/p4v/default.nix
View File

@ -1,84 +1,38 @@
{ stdenv
, fetchurl
, lib
, qtbase
, qtwebengine
, qtdeclarative
, qtwebchannel
, syntax-highlighting
, openssl
, xkeyboard_config
, patchelfUnstable
, wrapQtAppsHook
, writeText
, callPackage
, libsForQt5
}:
let
# This abomination exists because p4v calls CRYPTO_set_mem_functions and
# expects it to succeed. The function will fail if CRYPTO_malloc has already
# been called, which happens at init time via qtwebengine -> ... -> libssh. I
# suspect it was meant to work with a version of Qt where openssl is
# statically linked or some other library is used.
crypto-hack = writeText "crypto-hack.c" ''
#include <stddef.h>
int CRYPTO_set_mem_functions(
void *(*m)(size_t, const char *, int),
void *(*r)(void *, size_t, const char *, int),
void (*f)(void *, const char *, int)) { return 1; }
'';
in stdenv.mkDerivation rec {
pname = "p4v";
version = "2021.3.2186916";
src = fetchurl {
url = "http://web.archive.org/web/20211118024745/https://cdist2.perforce.com/perforce/r21.3/bin.linux26x86_64/p4v.tgz";
sha256 = "1zldg21xq4srww9pcfbv3p8320ghjnh333pz5r70z1gwbq4vf3jq";
# Upstream replaces minor versions, so use archived URLs.
srcs = {
"x86_64-linux" = fetchurl {
url = "https://web.archive.org/web/20220902181457id_/https://ftp.perforce.com/perforce/r22.2/bin.linux26x86_64/p4v.tgz";
sha256 = "8fdade4aafe25f568a61cfd80823aa90599c2a404b7c6b4a0862c84b07a9f8d2";
};
"x86_64-darwin" = fetchurl {
url = "https://web.archive.org/web/20220902194716id_/https://ftp.perforce.com/perforce/r22.2/bin.macosx1015x86_64/P4V.dmg";
sha256 = "c4a9460c0f849be193c68496c500f8a785c740f5bea5b5e7f617969c20be3cd7";
};
};
dontBuild = true;
nativeBuildInputs = [ patchelfUnstable wrapQtAppsHook ];
mkDerivation =
if stdenv.isDarwin then callPackage ./darwin.nix { }
else libsForQt5.callPackage ./linux.nix { };
in mkDerivation {
pname = "p4v";
version = "2022.2.2336701";
ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc.lib
qtbase
qtwebengine
qtdeclarative
qtwebchannel
syntax-highlighting
openssl
];
dontWrapQtApps = true;
installPhase = ''
mkdir $out
cp -r bin $out
mkdir -p $out/lib
cp -r lib/P4VResources $out/lib
$CC -fPIC -shared -o $out/lib/libcrypto-hack.so ${crypto-hack}
for f in $out/bin/*.bin ; do
patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
# combining this with above breaks rpath (patchelf bug?)
patchelf --add-needed libstdc++.so \
--add-needed $out/lib/libcrypto-hack.so \
--clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \
--clear-symbol-version _ZTVSt20bad_array_new_length \
--clear-symbol-version _ZTISt20bad_array_new_length \
--clear-symbol-version _ZdlPvm \
$f
wrapQtApp $f \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
done
'';
dontFixup = true;
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
meta = {
description = "Perforce Visual Client";
description = "Perforce Helix Visual Client";
homepage = "https://www.perforce.com";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ nathyong nioncode ];
platforms = builtins.attrNames srcs;
maintainers = with lib.maintainers; [ impl nathyong nioncode ];
};
}

89
pkgs/applications/version-management/p4v/linux.nix Normal file
View File

@ -0,0 +1,89 @@
{ stdenv
, autoPatchelfHook
, cups
, dbus
, fontconfig
, gccForLibs
, libX11
, libXcomposite
, libXcursor
, libXdamage
, libXext
, libXi
, libXrandr
, libXrender
, libXtst
, libinput
, libxcb
, libxkbcommon
, nss
, qttools
, qtwebengine
, xcbutilimage
, xcbutilkeysyms
, xcbutilrenderutil
, xcbutilwm
}:
{ pname, version, src, meta }:
let
unwrapped = stdenv.mkDerivation {
pname = "${pname}-unwrapped";
inherit version src meta;
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
cups
dbus
fontconfig
gccForLibs
libX11
libXcomposite
libXcursor
libXdamage
libXext
libXi
libXrandr
libXrender
libXtst
libinput
libxcb
libxkbcommon
nss
qttools
qtwebengine
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
];
dontBuild = true;
# Don't wrap the Qt apps; upstream has its own wrapper scripts.
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out
cp -r bin lib $out
addAutoPatchelfSearchPath $out/lib
'';
};
in
stdenv.mkDerivation {
inherit pname version;
# Build a "clean" version of the package so that we don't add extra ".bin" or
# configuration files to users' PATHs. We can't easily put the unwrapped
# package files in libexec (where they belong, probably) because the upstream
# wrapper scripts have the bin directory hardcoded.
buildCommand = ''
mkdir -p $out/bin
for f in p4admin p4merge p4v p4vc; do
ln -s ${unwrapped}/bin/$f $out/bin
done
'';
preferLocalBuild = true;
inherit (unwrapped) meta passthru;
}

6
pkgs/applications/virtualization/nixpacks/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.9.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dIQS/Z1vAVHyX58RfpQWcNHyNvNdYbnx73TDEQGQt80=";
sha256 = "sha256-7lr4Ym8E3o8dWyy1GlBQfhLGWoR6uzjiWTWmuSGXmMM=";
};
cargoSha256 = "sha256-actzR0YCHOydqFp6KhwTUUj3dhGV6D+zk9+PHU3FKlM=";
cargoSha256 = "sha256-v2OC69YpVbJ52z9iO98kfzC3A4fpotcGBhpwESjdvU4=";
# skip test due FHS dependency
doCheck = false;

6
pkgs/applications/virtualization/pods/default.nix
View File

@ -15,19 +15,19 @@
stdenv.mkDerivation rec {
pname = "pods";
version = "1.0.0-beta.5";
version = "1.0.0-beta.6";
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Bp/ILQY5Xa8wrq7v9O9QohWzlevdN3MwMjjnlimt6HM=";
sha256 = "sha256-ndsxa4d4lB1kZtRoLmAs/3e93qoKlS1YjB1GK9xby/A=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-iToznqaNXArVrSdDXGPJol3OeFdM3J8VgYSs+mjM0SE=";
sha256 = "sha256-qgR7wVXGJyAYCh9B9uJ63njXjiZa4BswfFMBhBpvKoM=";
};
nativeBuildInputs = [

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

@ -1,6 +1,6 @@
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
let
version = "2201.1.0";
version = "2201.2.1";
codeName = "swan-lake";
in stdenv.mkDerivation {
pname = "ballerina";
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
src = fetchzip {
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
sha256 = "sha256-WZ6CvgnES1indYeMSuC3odDqwR2J27k+D8RktvHsELs=";
sha256 = "sha256-QNXaEivwlqBdbpxGCYnfIN/fQkWlVu8lqGWKfLlVB5s=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/interpreters/python/pypy/default.nix
View File

@ -23,11 +23,12 @@ with lib;
let
isPy3k = substring 0 1 pythonVersion == "3";
isPy39OrNewer = versionAtLeast pythonVersion "3.9";
passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
executable = "pypy${if isPy3k then "3" else ""}";
executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else if isPy3k then "3" else ""}";
sitePackages = "site-packages";
hasDistutilsCxxPatch = false;
inherit pythonAttr;
@ -148,6 +149,7 @@ in with passthru; stdenv.mkDerivation rec {
cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c
cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
${optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"}
# other packages expect to find stuff according to libPrefix
ln -s $out/${executable}-c/include $out/include/${libPrefix}

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

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc
, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages
, Foundation, AppKit
}:
stdenv.mkDerivation rec {
@ -35,6 +36,9 @@ stdenv.mkDerivation rec {
glib
libxml2
libsoup
] ++ lib.optionals stdenv.isDarwin [
Foundation
AppKit
];
configureFlags = [

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
version = "4.3.0";
version = "4.4.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "sha256-yQJykD6ew8LzYzuVP7ycPv+wGGe7LWWlgdI6Z2N87go=";
sha256 = "sha256-/TgsGlO8RJ3L+2425odye365QqBzCHrr1Z4zUj+Ld8I=";
};
outputs = [ "out" "dev" "doc" ];
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
description = "An advanced calculator library";
homepage = "http://qalculate.github.io";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ gebner doronbehar ];
maintainers = with maintainers; [ gebner doronbehar alyaeanyx ];
mainProgram = "qalc";
platforms = platforms.all;
};

34
pkgs/development/libraries/text-engine/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv
, lib
, fetchFromGitHub
, meson
, ninja
, json-glib
, gtk4
, libxml2
, gobject-introspection
, pkg-config
, libadwaita
}:
stdenv.mkDerivation rec {
pname = "text-engine";
version = "0.1.1";
src = fetchFromGitHub {
owner = "mjakeman";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes=";
};
nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ];
buildInputs = [ libadwaita json-glib libxml2 ];
meta = with lib; {
description = "Rich text framework for GTK";
homepage = "https://github.com/mjakeman/text-engine";
license = with licenses; [ mpl20 lgpl21Plus ];
maintainers = with maintainers; [ foo-dogsquared ];
};
}

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "openstacksdk";
version = "0.101.0";
version = "0.102.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-YIAMenWg0WXFnwa7yLPnUxVHG4hrmf3EGy76qVpLd5o=";
hash = "sha256-sqGP66eerCrDRpyNr+AdQAjIrDC+OkxrUydbTxxroq0=";
};
propagatedBuildInputs = [

2
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -315,7 +315,7 @@ in
};
grpc = attrs: {
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin libtool;
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools;
buildInputs = [ openssl ];
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = toString [

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "0.8.3";
version = "0.9.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Mv56NpzDBsqzHwUkqL6d828E3hVrNT9FXLL6IqWJYeQ=";
sha256 = "sha256-8sqOhhuneLFxhmZjoMYYfWw9wv55zWzw3QQEZW+hxBU=";
};
vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M=";

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

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.76";
version = "0.0.79";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PWJkn96QInAOgR0T5ISuhfI4OYQ+jMBBqFRlewoGyjI=";
sha256 = "sha256-RNj87WeqCdv9foh+eAOpDJrgRnF2ZuWhZg1n7zB1uHY=";
};
cargoSha256 = "sha256-c0GxKyQtgkTY8mAgtLgH8S9TKKLyhJvxJR9uc+nVOh0=";
cargoSha256 = "sha256-bWecC1jgqy4W+97QTTr7b52nZF+8hOS9JOKUkCPH8Lc=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

6
pkgs/development/tools/rust/cargo-nextest/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
version = "0.9.38";
version = "0.9.39";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
sha256 = "sha256-gBYtO9lnxtrgn5cmmgPeaFQ2Ls3WSO9X4RwDBHKbRO8=";
sha256 = "sha256-8BPKH5dfLALU1WaiinZx7IHVcUmL2wPckMDU+FVfgBs=";
};
cargoSha256 = "sha256-Xz5X2I4Lj4lPv18vYjambdlwcRcbHKAbjqPpSuei96Q=";
cargoSha256 = "sha256-GYryj+evMuDsridRD1GaeaTWyD5yQi6pRhpPOrW24nI=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

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

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "duckscript_cli";
version = "0.8.15";
version = "0.8.16";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-o8tbeKHdu4t0xQR+ZqUoCd6ekrSDkccFveZ2WL822nU=";
sha256 = "sha256-H9lZIIJrE6onqGHw0l8Y58IW9EAcQ7eCHxgqqeSLgGY=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-wIRX8n7mt6xMyJh/zwganZ9Dmr0BdtualQJW6833a40=";
cargoSha256 = "sha256-DQw3DDOUo4ogf6PIY7/1U0uiyX8dpXE5D2P8QDdie9M=";
meta = with lib; {
description = "Simple, extendable and embeddable scripting language.";

4
pkgs/development/web/cypress/default.nix
View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "10.8.0";
version = "10.10.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "sha256-QKzdK/3WGcNoPPgsCO08rmOFgwgYTI9yvP70HoGvojg=";
sha256 = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk=";
};
# don't remove runtime deps

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

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.2.11";
version = "4.2.13";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-bA1rz4PvpcdMSGob+KIdSpyq6ePlLj8l61r0+XclfZY=";
sha256 = "sha256-xYYuToo+19qaVyWFKrgjsqVs78rHdX/hyZ/nXYlPFMU=";
};
dontUnpack = true;

20
pkgs/servers/calibre-web/db-migrations.patch
View File

@ -1,14 +1,14 @@
diff --git a/cps/__init__.py b/cps/__init__.py
index 627cca0b..233bb2dd 100644
index 1ba1f778..fd5dc2f1 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -87,6 +87,9 @@ db.CalibreDB.setup_db(config, cli.settingspath)
calibre_db = db.CalibreDB()
+if os.environ.get('__RUN_MIGRATIONS_AND_EXIT'):
+ sys.exit(0)
@@ -116,6 +116,9 @@ def create_app():
db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
calibre_db.init_db()
+ if os.environ.get('__RUN_MIGRATIONS_AND_EXIT'):
+ sys.exit(0)
+
def create_app():
app.wsgi_app = ReverseProxied(app.wsgi_app)
# For python2 convert path to unicode
updater_thread.init_updater(config, web_server)
# Perform dry run of updater and exit afterwards
if cli_param.dry_run:

7
pkgs/servers/calibre-web/default.nix
View File

@ -6,16 +6,17 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.18";
version = "0.6.19";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "sha256-KjmpFetNhNM5tL34e/Pn1i3hc86JZglubSMsHZWu198=";
hash = "sha256-mNYLQ+3u6xRaoZ5oH6HdylFfgz1fq1ZB86AWk9vULWQ=";
};
propagatedBuildInputs = with python3.pkgs; [
APScheduler
advocate
backports_abc
chardet
@ -57,7 +58,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
--replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
--replace "Flask-Login>=0.3.2,<0.5.1" "Flask-Login>=0.3.2" \
--replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \
--replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
--replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \

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

@ -2,7 +2,7 @@
let
pname = "miniflux";
version = "2.0.38";
version = "2.0.39";
in buildGoModule {
inherit pname version;
@ -11,10 +11,10 @@ in buildGoModule {
owner = pname;
repo = "v2";
rev = version;
sha256 = "sha256-y6g5HGIgEgb+Z26aKgj90oHIrXmrTmrpQyflKPOS0No=";
sha256 = "sha256-vvGQc+Ot7w9gZuXV8yCGvMcRIRJJez59bMudX6D34es=";
};
vendorSha256 = "sha256-ED4Rq+ks+75PdJvIye17eI7MLEJdP9yXHhbonqw2oMI=";
vendorSha256 = "sha256-IbOfEdCAuK70+3Z4rWkxVZKPw1rD1hHkohQoWAK1Z3w=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/servers/nosql/victoriametrics/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.82.0";
version = "1.82.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-JIl2WeveDoAHzqJ2cqMxpWeNf4yQC9fIdfECOJywJ2A=";
sha256 = "sha256-Lor4rpL19xc/eA2quJ1D0WrJiviEcKnArBKUQhb9Z0k=";
};
vendorSha256 = null;

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

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
hash = "sha256-MM4o7d3L3XIRYWJ/KPM2OltlVfVA/BgMuyhJMm/BS3c=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace gcc clang
'';
nativeBuildInputs = [ installShellFiles ];
enableParallelBuilding = true;

6
pkgs/shells/carapace/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "carapace";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "rsteube";
repo = "${pname}-bin";
rev = "v${version}";
sha256 = "sha256-nRxNa0Knq2rmm57+7m/LnHFt4eic6bop+yhjHoX0Jc4=";
sha256 = "sha256-RDT6glOK5+qNiwrmNHUrOE7wgu8FnKltjt4QPlDpGF4=";
};
vendorSha256 = "sha256-iYZk2G9axC2jVjLwz6PkQKDQCQVmXqRvYmhTOz0OS2U=";
vendorSha256 = "sha256-isNW+6x2Q/mFl0LzsYP6IIHFrCzCzwtAVwSxZjPOJVg=";
subPackages = [ "./cmd/carapace" ];

19
pkgs/tools/misc/tere/brokentest.patch
View File

@ -1,19 +0,0 @@
diff --git a/src/app_state.rs b/src/app_state.rs
index e44acb6..713642a 100644
--- a/src/app_state.rs
+++ b/src/app_state.rs
@@ -1272,7 +1272,7 @@ mod tests {
assert_eq!(s.cursor_pos, 1);
assert_eq!(s.scroll_pos, 2);
}
-
+ /*
#[test]
fn test_advance_search_with_filter_search_and_scrolling2() {
let mut s = create_test_state_with_buf(
@@ -1302,4 +1302,5 @@ mod tests {
assert_eq!(s.cursor_pos, 1);
assert_eq!(s.scroll_pos, 0);
}
+ */
}

12
pkgs/tools/misc/tere/default.nix
View File

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "tere";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "mgunyho";
repo = "tere";
rev = "v${version}";
sha256 = "sha256-2DpJYOzswT7dHEIj+qaTx1Jm28NE+61opoxuMChNwbM=";
sha256 = "sha256-jousyoro1Mn1+yBzUkGxW7/zbNvF7+Y4/WLRj99Iuy0=";
};
cargoSha256 = "sha256-8qSikfsHX8xwBqSSxWwNbiOpXmfzwGTAOALPjxVHadc=";
cargoSha256 = "sha256-hMAxKijmlckkCtQZiC5ubaZQKU2m99gL/MkYoU7zQxU=";
# This test confirmed not working.
# https://github.com/mgunyho/tere/issues/44
cargoPatches = [ ./brokentest.patch ];
postPatch = ''
rm .cargo/config.toml;
'';
meta = with lib; {
description = "A faster alternative to cd + ls";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tio";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "tio";
repo = "tio";
rev = "v${version}";
hash = "sha256-0gLkfHGU3f/GU2PuSEoKD1K2Z42JNpfcIyIOFYcGLbk=";
hash = "sha256-1GKwJylC57es2zM0ON3y4DLgJ7Q6bDYZW/L49U8GBLo=";
};
nativeBuildInputs = [ meson ninja cmake pkg-config inih bash-completion ];

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

@ -5345,7 +5345,9 @@ with pkgs;
keyd = callPackage ../tools/inputmethods/keyd { };
twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { };
twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui {
inherit (darwin.apple_sdk.frameworks) Security;
};
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
@ -7008,7 +7010,9 @@ with pkgs;
git-my = callPackage ../applications/version-management/git-and-tools/git-my { };
git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad { };
git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { };
@ -7165,6 +7169,8 @@ with pkgs;
gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; };
};
gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { };
gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {};
gnome-frog = callPackage ../applications/misc/gnome-frog { };
@ -13316,7 +13322,7 @@ with pkgs;
avra = callPackage ../development/compilers/avra { };
ballerina = callPackage ../development/compilers/ballerina { };
ballerina = callPackage ../development/compilers/ballerina { openjdk = openjdk11; };
beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { };
@ -19918,7 +19924,9 @@ with pkgs;
libgringotts = callPackage ../development/libraries/libgringotts { };
libgrss = callPackage ../development/libraries/libgrss { };
libgrss = callPackage ../development/libraries/libgrss {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
};
libgweather = callPackage ../development/libraries/libgweather { };
@ -22366,6 +22374,8 @@ with pkgs;
tet = callPackage ../development/tools/misc/tet { };
text-engine = callPackage ../development/libraries/text-engine { };
the-foundation = callPackage ../development/libraries/the-foundation { };
theft = callPackage ../development/libraries/theft { };
@ -30392,7 +30402,7 @@ with pkgs;
openssl = openssl_1_1;
};
p4d = callPackage ../applications/version-management/p4d { };
p4v = libsForQt515.callPackage ../applications/version-management/p4v { };
p4v = callPackage ../applications/version-management/p4v { };
partio = callPackage ../development/libraries/partio {};