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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-06-25 12:01:14 +00:00 committed by GitHub
commit aa5d107299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 648 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/licenses.nix
View File

@ -995,6 +995,14 @@ in mkLicense lset) ({
url = "https://github.com/thestk/stk/blob/master/LICENSE";
};
sustainableUse = {
shortName = "sustainable";
fullName = "Sustainable Use License";
url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md";
free = false;
redistributable = false; # only free to redistribute "for non-commercial purposes"
};
tsl = {
shortName = "TSL";
fullName = "Timescale License Agreegment";

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

@ -25,13 +25,13 @@ let
in
mkDerivation rec {
pname = "jamesdsp";
version = "2.4";
version = "2.5.1";
src = fetchFromGitHub rec {
owner = "Audio4Linux";
repo = "JDSP4Linux";
fetchSubmodules = true;
rev = version;
hash = "sha256-wD1JZQD8dR24cBN4QJCSrEsS4aoMD+MQmqnOIFKOeoE=";
hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4=";
};
nativeBuildInputs = [

18
pkgs/applications/editors/pulsar/001-patch-wrapper.patch
View File

@ -1,27 +1,11 @@
--- a/resources/pulsar.sh 2023-03-16 04:11:14.000000000 +0100
+++ b/resources/pulsar.sh 2023-03-24 14:37:13.468813964 +0100
@@ -123,22 +123,9 @@
@@ -123,7 +123,7 @@
elif [ $OS == 'Linux' ]; then
SCRIPT=$(readlink -f "$0")
- PULSAR_PATH="/opt/Pulsar/pulsar"
+ # PULSAR_PATH is set-up via `wrapProgram` in the postFixup phase
- #Will allow user to get context menu on cinnamon desktop enviroment
- #Add a check to make sure that DESKTOP_SESSION is set before attempting to grep it
- #expr substr is expecting 3 arguments string, index, length
- #If grep doesnt find anything is provides an empty string which causes the expr: syntax error: missing argument after '8' error - see pulsar-edit/pulsar#174
- #Im also not quite sure why they used grep instead of simply [ "${DESKTOP_SESSION}" == "cinnamon" ]
- if [ -n "${DESKTOP_SESSION}" ] && [ "$(expr substr $(printenv | grep 'DESKTOP_SESSION=') 17 8)" == "cinnamon" ]; then
- #This local path is almost assuredly wrong as it shouldnt exist in a standard install
- ACTION_PATH="resources/linux/desktopenviroment/cinnamon/pulsar.nemo_action"
-
- #Validate the file exists before attempting to copy it
- if [ -f "${ACTION_PATH}" ]; then
- cp "${$ACTION_PATH}" "/usr/share/nemo/actions/pulsar.nemo_action"
- fi
- fi
+ # We remove the nemo integration. It is handled by the postFixup phase
#Set tmpdir only if tmpdir is unset
: ${TMPDIR:=/tmp}

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

@ -23,13 +23,13 @@
let
pname = "pulsar";
version = "1.105.0";
version = "1.106.0";
sourcesPath = {
x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
x86_64-linux.hash = "sha256-j2d83m8B6lt1eRAwOOTEq4o+CNe8I+6rkz9qyux55Qw=";
x86_64-linux.hash = "sha256-Wd0z6kHd6qZgrgZBxZQjwVC1dDqYtJ94L7aAnbuJoO8=";
aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
aarch64-linux.hash = "sha256-iZVE1R30Tynyn/cAwNIiGrsCMTkWKFUforOkGXSzMsw=";
aarch64-linux.hash = "sha256-Xadjqw8PRrq0ksif6te0gxn8xeYTCYnJcsrezfl2SYs=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
additionalLibs = lib.makeLibraryPath [

16
pkgs/applications/emulators/retroarch/cores.nix
View File

@ -426,6 +426,14 @@ in
};
};
fuse = mkLibretroCore {
core = "fuse";
meta = {
description = "A port of the Fuse Unix Spectrum Emulator to libretro";
license = lib.licenses.gpl3Only;
};
};
gambatte = mkLibretroCore {
core = "gambatte";
meta = {
@ -970,6 +978,14 @@ in
};
};
twenty-fortyeight = mkLibretroCore {
core = "2048";
meta = {
description = "Port of 2048 puzzle game to the libretro API";
license = lib.licenses.unlicense;
};
};
vba-m = mkLibretroCore {
core = "vbam";
src = getCoreSrc "vba-m";

12
pkgs/applications/emulators/retroarch/hashes.json
View File

@ -1,4 +1,10 @@
{
"2048": {
"owner": "libretro",
"repo": "libretro-2048",
"rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2",
"sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA="
},
"atari800": {
"owner": "libretro",
"repo": "libretro-atari800",
@ -180,6 +186,12 @@
"rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb",
"sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424="
},
"fuse": {
"owner": "libretro",
"repo": "fuse-libretro",
"rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e",
"sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM="
},
"gambatte": {
"owner": "libretro",
"repo": "gambatte-libretro",

2
pkgs/applications/emulators/retroarch/update_cores.py
View File

@ -12,6 +12,7 @@ SCRIPT_PATH = Path(__file__).absolute().parent
HASHES_PATH = SCRIPT_PATH / "hashes.json"
GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8))
CORES = {
"2048": {"repo": "libretro-2048"},
"atari800": {"repo": "libretro-atari800"},
"beetle-gba": {"repo": "beetle-gba-libretro"},
"beetle-lynx": {"repo": "beetle-lynx-libretro"},
@ -42,6 +43,7 @@ CORES = {
"flycast": {"repo": "flycast"},
"fmsx": {"repo": "fmsx-libretro"},
"freeintv": {"repo": "freeintv"},
"fuse": {"repo": "fuse-libretro"},
"gambatte": {"repo": "gambatte-libretro"},
"genesis-plus-gx": {"repo": "Genesis-Plus-GX"},
"gpsp": {"repo": "gpsp"},

5
pkgs/applications/emulators/wine/base.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, pkgArches, callPackage, makeSetupHook,
{ stdenv, lib, pkgArches, makeSetupHook,
pname, version, src, mingwGccs, monos, geckos, platforms,
bison, flex, fontforge, makeWrapper, pkg-config,
nixosTests,
@ -84,8 +84,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional sdlSupport pkgs.SDL2
++ lib.optional usbSupport pkgs.libusb1
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
(gst-plugins-bad.override { enableZbar = false; }) ])
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]

22
pkgs/applications/emulators/wine/builder-wow.sh
View File

@ -1,4 +1,4 @@
## build described at http://wiki.winehq.org/Wine64
## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64
source $stdenv/setup
preFlags="${configureFlags}"
@ -17,6 +17,26 @@ configurePhase
buildPhase
# checkPhase
# Remove 64 bit gstreamer from PKG_CONFIG_PATH
IFS=":" read -ra LIST_ARRAY <<< "$PKG_CONFIG_PATH"
IFS=":" read -ra REMOVE_ARRAY <<< "@pkgconfig64remove@"
NEW_LIST_ARRAY=()
for ELEMENT in "${LIST_ARRAY[@]}"; do
TO_ADD=1
for REMOVE in "${REMOVE_ARRAY[@]}"; do
if [[ "$REMOVE" == "$ELEMENT" ]]; then
TO_ADD=0
break
fi
done
if [[ $TO_ADD -eq 1 ]]; then
NEW_LIST_ARRAY+=("$ELEMENT")
fi
done
PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}")
cd $TMP/wine-wow
sourceRoot=`pwd`
configureFlags="${preFlags} --with-wine64=../wine64"

8
pkgs/applications/emulators/wine/packages.nix
View File

@ -1,4 +1,4 @@
{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, moltenvk,
{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, substituteAll, moltenvk,
wineRelease ? "stable",
supportFlags
}:
@ -34,7 +34,11 @@ in with src; {
geckos = [ gecko32 gecko64 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
monos = [ mono ];
buildScript = ./builder-wow.sh;
buildScript = substituteAll {
src = ./builder-wow.sh;
# pkgconfig has trouble picking the right architecture
pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.glib pkgs.gst_all_1.gstreamer ];
};
platforms = [ "x86_64-linux" ];
mainProgram = "wine64";
};

6
pkgs/applications/networking/browsers/vieb/default.nix
View File

@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "vieb";
version = "10.0.0";
version = "10.1.0";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
hash = "sha256-twTP/EvUUySG9RRHoljVZFIfFK5mjPA4KcQUvOXg2xI=";
hash = "sha256-g3TW3hl2D9pulEPpbcP1s536yY1o+dMv6nuMrVjgxGI=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
npmDepsHash = "sha256-RbkZ3lK4t5HcFDeaM6rXnGXZpsJxj4JPObZtHn0TVcU=";
npmDepsHash = "sha256-P3VdG8JQ0JVbjdhOIfx8CxwSiWr0pYUJ4e2oOgAgtU0=";
dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;

8
pkgs/applications/networking/n8n/default.nix
View File

@ -38,12 +38,6 @@ nodePackages.n8n.override {
meta = with lib; {
description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services.";
maintainers = with maintainers; [ freezeboy k900 ];
license = {
fullName = "Sustainable Use License";
url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md";
free = false;
# only free to redistribute "for non-commercial purposes"
redistributable = false;
};
license = licenses.sustainableUse;
};
}

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.6.5";
version = "23.6.6";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
hash = "sha256-FTGptp6RWVJYdLXtDI5cymt1bNr+0yHk0wLCOuTbxlE=";
hash = "sha256-UXEnoe8TovzghKtEXDis5Gk93oDEyJhhNXMnGaK5VXI=";
};
nativeBuildInputs = [

4
pkgs/applications/radio/sdrangel/default.nix
View File

@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "sdrangel";
version = "7.14.2";
version = "7.15.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
hash = "sha256-A9/uOecV1qRbAGcKI1brPFsbjfJG/8/zKrMwKMGw9rE=";
hash = "sha256-APDrVujz/2ZYqxGggabAj8ght72Vuf+oMS/kuVaWkWM=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];

2
pkgs/applications/video/jellyfin-media-player/default.nix
View File

@ -99,7 +99,7 @@ mkDerivation rec {
homepage = "https://github.com/jellyfin/jellyfin-media-player";
description = "Jellyfin Desktop Client based on Plex Media Player";
license = with licenses; [ gpl2Only mit ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ jojosch kranzes ];
mainProgram = "jellyfinmediaplayer";
};

4
pkgs/applications/video/kodi/addons/joystick/default.nix
View File

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "peripheral.joystick";
version = "20.1.0";
version = "20.1.9";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ=";
sha256 = "sha256-xJh9Rj+PcxrgGomEsKnQcO/yZDQCnG6gNBwfK2JGuNA=";
};
extraBuildInputs = [ tinyxml udev ];

38
pkgs/applications/window-managers/sway/default.nix
View File

@ -2,7 +2,7 @@
, meson, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, gdk-pixbuf, librsvg
, wlroots_0_16, wayland-protocols, libdrm
, wlroots, wayland-protocols, libdrm
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
@ -11,21 +11,15 @@
, trayEnabled ? systemdSupport
}:
# The "sd-bus-provider" meson option does not include a "none" option,
# but it is silently ignored iff "-Dtray=disabled". We use "basu"
# (which is not in nixpkgs) instead of "none" to alert us if this
# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761
assert trayEnabled -> systemdSupport;
let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "sway-unwrapped";
version = "1.8.1";
inherit enableXWayland isNixOS systemdSupport trayEnabled;
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
rev = finalAttrs.version;
hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g=";
};
@ -42,11 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
})
] ++ lib.optionals (!isNixOS) [
] ++ lib.optionals (!finalAttrs.isNixOS) [
# References to /nix/store/... will get GC'ed which causes problems when
# copying the default configuration:
./sway-config-no-nix-store-references.patch
] ++ lib.optionals isNixOS [
] ++ lib.optionals finalAttrs.isNixOS [
# Use /run/current-system/sw/share and /etc instead of /nix/store
# references:
./sway-config-nixos-paths.patch
@ -65,15 +59,23 @@ stdenv.mkDerivation rec {
wayland libxkbcommon pcre2 json_c libevdev
pango cairo libinput gdk-pixbuf librsvg
wayland-protocols libdrm
(wlroots_0_16.override { inherit enableXWayland; })
] ++ lib.optionals enableXWayland [
(wlroots.override { inherit (finalAttrs) enableXWayland; })
] ++ lib.optionals finalAttrs.enableXWayland [
xorg.xcbutilwm
];
mesonFlags =
mesonFlags = let
# The "sd-bus-provider" meson option does not include a "none" option,
# but it is silently ignored iff "-Dtray=disabled". We use "basu"
# (which is not in nixpkgs) instead of "none" to alert us if this
# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761
# assert trayEnabled -> systemdSupport && dbusSupport;
sd-bus-provider = if systemdSupport then "libsystemd" else "basu";
in
[ "-Dsd-bus-provider=${sd-bus-provider}" ]
++ lib.optional (!enableXWayland) "-Dxwayland=disabled"
++ lib.optional (!trayEnabled) "-Dtray=disabled"
++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"
++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled"
;
passthru.tests.basic = nixosTests.sway;
@ -95,4 +97,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
}
})

2
pkgs/applications/window-managers/sway/wrapper.nix
View File

@ -16,7 +16,7 @@ assert extraSessionCommands != "" -> withBaseWrapper;
with lib;
let
sway = sway-unwrapped.override { inherit isNixOS enableXWayland; };
sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; });
baseWrapper = writeShellScriptBin "sway" ''
set -o errexit
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then

2
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -206,7 +206,7 @@ checkout_ref(){
# Update submodules
init_submodules(){
clean_git submodule update --init --recursive -j $NIX_BUILD_CORES
clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1}
}
clone(){

20
pkgs/development/interpreters/wasmer/default.nix
View File

@ -14,18 +14,20 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "3.1.1";
version = "4.0.0";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-797I3FBBfnAgNfOdMajm3WNkMo3MUXb1347LBggXrLk=";
hash = "sha256-vpIvoKvIqXgJ6MtuqM3dryR8nxLB/diLyQYcuGkZDLU=";
};
cargoHash = "sha256-zUTwhfRLKUixgj3JXiz2QOuwbFhfget+GcFSRL1QJ3w=";
cargoHash = "sha256-1Gx8MLPAA/LV9jdK8gkztcsjltju0ousETLEiTEAaEo=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
nativeBuildInputs = [
rustPlatform.bindgenHook
];
buildInputs = lib.optionals withLLVM [
llvmPackages.llvm
@ -37,14 +39,8 @@ rustPlatform.buildRustPackage rec {
Security
];
LLVM_SYS_120_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
# check references to `compiler_features` in Makefile on update
buildFeatures = checkFeatures ++ [
"webc_runner"
];
checkFeatures = [
buildFeatures = [
"cranelift"
"wasmer-artifact-create"
"static-artifact-create"
@ -56,6 +52,8 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ];
env.LLVM_SYS_140_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
meta = with lib; {
description = "The Universal WebAssembly Runtime";
longDescription = ''

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

@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
pname = "miniaudio";
version = "0.11.16";
version = "0.11.17";
src = fetchFromGitHub {
owner = "mackron";
repo = "miniaudio";
rev = version;
hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM=";
hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI=";
};
installPhase = ''

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mongoc";
version = "1.23.5";
version = "1.24.1";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-c-driver";
rev = "refs/tags/${version}";
hash = "sha256-gdf3+EsAIf2yfuw75bNAPlwZbi9NFhVB9Q5MmS6KSo8=";
hash = "sha256-IVy2PxFM//AKffYfeLyCNjattnFZmqeg6WNTqXI/yMY=";
};
postPatch = ''
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
cyrus_sasl
snappy
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk_11_0.frameworks.Security
];
cmakeFlags = [
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = stdenv.isDarwin && stdenv.isx86_64;
description = "The official C client library for MongoDB";
homepage = "http://mongoc.org";
license = licenses.asl20;

14
pkgs/development/libraries/wlroots/default.nix
View File

@ -28,15 +28,17 @@
let
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "wlroots";
inherit version;
inherit enableXWayland;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = version;
rev = finalAttrs.version;
inherit hash;
};
@ -70,11 +72,11 @@ let
xorg.xcbutilrenderutil
xorg.xcbutilwm
]
++ lib.optional enableXWayland xwayland
++ lib.optional finalAttrs.enableXWayland xwayland
++ extraBuildInputs;
mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"
;
postFixup = ''
@ -98,13 +100,13 @@ let
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
inherit (finalAttrs.src.meta) homepage;
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
};
});
in
rec {

41
pkgs/development/python-modules/argos-translate-files/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, lxml
, translatehtml
}:
buildPythonPackage rec {
pname = "argos-translate-files";
version = "1.1.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba";
};
propagatedBuildInputs = [
lxml
translatehtml
];
postPatch = ''
ln -s */requires.txt requirements.txt
'';
# required for import check to work (argostranslate)
env.HOME = "/tmp";
pythonImportsCheck = [ "argostranslatefiles" ];
doCheck = false; # no tests
meta = with lib; {
description = "Translate files using Argos Translate";
homepage = "https://www.argosopentech.com";
license = licenses.mit;
maintainers = with maintainers; [ misuzu ];
};
}

64
pkgs/development/python-modules/argostranslate/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, ctranslate2
, ctranslate2-cpp
, sentencepiece
, stanza
}:
let
ctranslate2OneDNN = ctranslate2.override {
ctranslate2-cpp = ctranslate2-cpp.override {
# https://github.com/OpenNMT/CTranslate2/issues/1294
withOneDNN = true;
withOpenblas = false;
};
};
in
buildPythonPackage rec {
pname = "argostranslate";
version = "1.8.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64";
};
propagatedBuildInputs = [
ctranslate2OneDNN
sentencepiece
stanza
];
postPatch = ''
ln -s */requires.txt requirements.txt
substituteInPlace requirements.txt \
--replace "==" ">="
'';
doCheck = false; # needs network access
nativeCheckInputs = [
pytestCheckHook
];
# required for import check to work
# PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
env.HOME = "/tmp";
pythonImportsCheck = [
"argostranslate"
"argostranslate.translate"
];
meta = with lib; {
description = "Open-source offline translation library written in Python";
homepage = "https://www.argosopentech.com";
license = licenses.mit;
maintainers = with maintainers; [ misuzu ];
};
}

6
pkgs/development/python-modules/bthome-ble/default.nix
View File

@ -7,12 +7,13 @@
, pycryptodomex
, pytestCheckHook
, pythonOlder
, pytz
, sensor-state-data
}:
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.11.3";
version = "2.12.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w=";
hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8=";
};
nativeBuildInputs = [
@ -33,6 +34,7 @@ buildPythonPackage rec {
bluetooth-sensor-state-data
sensor-state-data
pycryptodomex
pytz
];
nativeCheckInputs = [

6
pkgs/development/python-modules/exceptiongroup/default.nix
View File

@ -33,6 +33,12 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = if (pythonAtLeast "3.11") then [
# regression in 3.11.4
# https://github.com/agronholm/exceptiongroup/issues/64
"test_catch_handler_raises"
] else null;
pythonImportsCheck = [
"exceptiongroup"
];

4
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-clusters";
version = "2023.5.3";
version = "2023.6.0";
format = "wheel";
src = fetchPypi {
@ -15,7 +15,7 @@ buildPythonPackage rec {
pname = "home_assistant_chip_clusters";
dist = "py3";
python = "py3";
hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY=";
hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/home-assistant-chip-core/default.nix
View File

@ -8,6 +8,7 @@
, autoPatchelfHook
# runtime
, libnl
, openssl_1_1
# propagates
@ -27,7 +28,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-core";
version = "2023.5.3";
version = "2023.6.0";
format = "wheel";
disabled = pythonOlder "3.7";
@ -36,11 +37,11 @@ buildPythonPackage rec {
system = {
"aarch64-linux" = {
name = "aarch64";
hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ=";
hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA=";
};
"x86_64-linux" = {
name = "x86_64";
hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0=";
hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI=";
};
}.${stdenv.system} or (throw "Unsupported system");
in fetchPypi {
@ -58,6 +59,7 @@ buildPythonPackage rec {
];
buildInputs = [
libnl
openssl_1_1
];

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

@ -13,12 +13,13 @@
, pytest-golden
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
}:
buildPythonPackage rec {
pname = "ical";
version = "4.5.3";
version = "4.5.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -27,9 +28,17 @@ buildPythonPackage rec {
owner = "allenporter";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU=";
hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"tzdata"
];
propagatedBuildInputs = [
emoji
python-dateutil

93
pkgs/development/python-modules/libretranslate/default.nix Normal file
View File

@ -0,0 +1,93 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, argostranslate
, flask
, flask-swagger
, flask-swagger-ui
, flask-limiter
, flask-babel
, flask-session
, waitress
, expiringdict
, ltpycld2
, morfessor
, appdirs
, apscheduler
, translatehtml
, argos-translate-files
, requests
, redis
, prometheus-client
, polib
}:
buildPythonPackage rec {
pname = "libretranslate";
version = "1.3.11";
format = "setuptools";
src = fetchFromGitHub {
owner = "LibreTranslate";
repo = "LibreTranslate";
rev = "refs/tags/v${version}";
hash = "sha256-S2J7kcoZFHOjVm2mb3TblWf9/FzkxZEB3h27BCaPYgY=";
};
propagatedBuildInputs = [
argostranslate
flask
flask-swagger
flask-swagger-ui
flask-limiter
flask-babel
flask-session
waitress
expiringdict
ltpycld2
morfessor
appdirs
apscheduler
translatehtml
argos-translate-files
requests
redis
prometheus-client
polib
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "==" ">="
substituteInPlace setup.py \
--replace "'pytest-runner'" ""
'';
postInstall = ''
# expose static files to be able to serve them via web-server
mkdir -p $out/share/libretranslate
ln -s $out/lib/python*/site-packages/libretranslate/static $out/share/libretranslate/static
'';
doCheck = false; # needs network access
nativeCheckInputs = [
pytestCheckHook
];
# required for import check to work (argostranslate)
env.HOME = "/tmp";
pythonImportsCheck = [ "libretranslate" ];
meta = with lib; {
description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services";
homepage = "https://libretranslate.com";
changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ misuzu ];
};
}

29
pkgs/development/python-modules/ltpycld2/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "LTpycld2";
version = "0.42";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516";
};
doCheck = false; # completely broken tests
pythonImportsCheck = [ "pycld2" ];
meta = with lib; {
description = "Python bindings around Google Chromium's embedded compact language detection library (CLD2)";
homepage = "https://github.com/LibreTranslate/pycld2";
license = licenses.asl20;
maintainers = with maintainers; [ misuzu ];
broken = stdenv.isDarwin;
};
}

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

@ -10,6 +10,17 @@
, CoreAudio
}:
let
# TODO: recheck after 1.59
miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec {
version = "0.11.16"; # cffi breakage with 0.11.17
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/${version}";
hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM=";
};
});
in
buildPythonPackage rec {
pname = "miniaudio";
version = "1.59";
@ -27,7 +38,7 @@ buildPythonPackage rec {
postPatch = ''
rm -r miniaudio
ln -s ${miniaudio} miniaudio
ln -s ${miniaudio'} miniaudio
substituteInPlace build_ffi_module.py \
--replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";
substituteInPlace miniaudio.c \

4
pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "mkdocs-swagger-ui-tag";
version = "0.6.1";
version = "0.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw=";
hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo=";
};
propagatedBuildInputs = [

27
pkgs/development/python-modules/morfessor/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "Morfessor";
version = "2.0.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2";
};
checkPhase = "python -m unittest -v morfessor/test/*";
pythonImportsCheck = [ "morfessor" ];
meta = with lib; {
description = "A tool for unsupervised and semi-supervised morphological segmentation";
homepage = "https://github.com/aalto-speech/morfessor";
license = licenses.bsd2;
maintainers = with maintainers; [ misuzu ];
};
}

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

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "python-matter-server";
version = "3.4.2";
version = "3.5.2";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I=";
hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA=";
};
nativeBuildInputs = [

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

@ -3,6 +3,7 @@
, fetchPypi
, pytest-mock
, pytestCheckHook
, pythonAtLeast
, pythonOlder
}:
@ -24,6 +25,10 @@ buildPythonPackage rec {
pytest-mock
];
disabledTests = lib.optionals (pythonAtLeast "3.11") [
"test_compile__compile_restricted_exec__5"
];
pythonImportsCheck = [
"RestrictedPython"
];

44
pkgs/development/python-modules/translatehtml/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, argostranslate
, beautifulsoup4
}:
buildPythonPackage rec {
pname = "translatehtml";
version = "1.5.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "6b30ceb8b6f174917e2660caf2d2ccbaa71d8d24c815316edf56b061d678820d";
};
propagatedBuildInputs = [
argostranslate
beautifulsoup4
];
postPatch = ''
ln -s */requires.txt requirements.txt
substituteInPlace requirements.txt \
--replace "==" ">="
'';
# required for import check to work (argostranslate)
env.HOME = "/tmp";
pythonImportsCheck = [ "translatehtml" ];
doCheck = false; # no tests
meta = with lib; {
description = "Translate HTML using Beautiful Soup and Argos Translate.";
homepage = "https://www.argosopentech.com";
license = licenses.mit;
maintainers = with maintainers; [ misuzu ];
};
}

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

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "argc";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = pname;
rev = "v${version}";
hash = "sha256-3e15knnM9CQn/nIh4H1Kd91qyE1KJ18jO0gk7UWz08Y=";
hash = "sha256-jtE1OwDEo533wGY1zya09LscED6zyjn0qu+HxyWXO1E=";
};
cargoHash = "sha256-NnK3SNBZNvXoSJhMu7Gg9HjAmAws8eD051iSZEfhfIw=";
cargoHash = "sha256-+K551Am9sHUj/+0aFVxuf8/M/pnqofoVLPqqnBZWOZA=";
nativeBuildInputs = [ installShellFiles ];

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.18.7";
version = "0.18.8";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-KwBucWZwgOtS167IO2cTdSM9OvL766cHdyJlbI33Md4=";
hash = "sha256-yFMPUvRh+sP45qGf65QXmrqy2mBlGZsSizeeV53DvP0=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

9
pkgs/development/tools/ocaml/dune-release/default.nix
View File

@ -10,14 +10,14 @@
let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
in buildDunePackage rec {
pname = "dune-release";
version = "1.6.2";
version = "2.0.0";
duneVersion = "3";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4=";
hash = "sha256-u8TgaoeDaDLenu3s1Km/Kh85WHMtvUy7C7Q+OY588Ss=";
};
nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs;
@ -34,6 +34,10 @@ in buildDunePackage rec {
'';
preCheck = ''
export HOME=$TMPDIR
git config --global user.email "nix-builder@nixos.org"
git config --global user.name "Nix Builder"
# it fails when it tries to reference "./make_check_deterministic.exe"
rm -r tests/bin/check
'';
@ -47,6 +51,7 @@ in buildDunePackage rec {
meta = with lib; {
description = "Release dune packages in opam";
homepage = "https://github.com/ocamllabs/dune-release";
changelog = "https://github.com/tarides/dune-release/blob/${version}/CHANGES.md";
license = licenses.isc;
maintainers = with maintainers; [ sternenseemann ];
};

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.6.2";
version = "2023.6.3";
components = {
"3_day_blinds" = ps: with ps; [
];

17
pkgs/servers/home-assistant/default.nix
View File

@ -231,15 +231,6 @@ let
doCheck = false;
});
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "2.0.12";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w=";
};
});
# Pinned due to API changes in 0.3.0
tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
version = "0.2.0";
@ -296,7 +287,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.6.2";
hassVersion = "2023.6.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -312,7 +303,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0=";
hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc=";
};
# Secondary source is git for tests
@ -320,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8=";
hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY=";
};
nativeBuildInputs = with python.pkgs; [
@ -357,7 +348,7 @@ in python.pkgs.buildPythonApplication rec {
"PyJWT"
"pyOpenSSL"
"requests"
"typing-extensions"
"typing_extensions"
"voluptuous-serialize"
"yarl"
];

5
pkgs/servers/home-assistant/stubs.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.6.2";
version = "2023.6.3";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms=";
hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc=";
};
nativeBuildInputs = [
@ -30,7 +30,6 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml --replace \
'homeassistant = "${version}"' \
'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"'
cat pyproject.toml
'';
pythonImportsCheck = [

12
pkgs/servers/home-assistant/tests.nix
View File

@ -47,6 +47,9 @@ let
};
extraPytestFlagsArray = {
conversation = [
"--deselect tests/components/conversation/test_init.py::test_get_agent_list"
];
dnsip = [
# Tries to resolve DNS entries
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
@ -63,10 +66,19 @@ let
# aioserial mock produces wrong state
"--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
];
sonos = [
# KeyError: 'sonos_media_player'
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings"
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3"
];
unifiprotect = [
# "TypeError: object Mock can't be used in 'await' expression
"--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix"
];
zha = [
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp"
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp"
];
};
in lib.listToAttrs (map (component: lib.nameValuePair component (
home-assistant.overridePythonAttrs (old: {

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

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.275";
version = "0.21.314";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-MQrIzt/V6MWhRvdpBFR1sg8CeJNE3r05+DdxVYssRjFSqDOLTAOoL8Dd0S2upuzFTBcxB2dIYDYfdKrtUT8suA==";
hash = "sha512-ty9EYS02nTeOq2RrSS0NoVMQVq9tVaaX4ulbbGzvjECkKKGIjtWxUCTxN3cgm2GNI0YjwEr7/S41HDUnJGD73g==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

8
pkgs/servers/readarr/default.nix
View File

@ -8,13 +8,13 @@ let
x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-XKgjLlm53jfZz94lq6DtVVIwMkTjArzMWQ2+ePH+pzU=";
arm64-linux_hash = "sha256-xbw/ObIe/wPEnBekikkN7bykb+pQZ9wIMEqjOzvf4NQ=";
x64-osx_hash = "sha256-/U+YV5Y3MY5ibo6eBzYgFq2bWz3JP9XBZd8jFSMlkBM=";
x64-linux_hash = "sha256-TKK0009ZEFWpzR9jYRanG3sMVp8hQcTd9G/FvUu00tQ=";
arm64-linux_hash = "sha256-u1vjSYu751VoOYsCPyPzcNnmG0rrKk7VgbXMG8X96jU=";
x64-osx_hash = "sha256-IHJ6hZP4DVTotoGxfLLbOveA8TD+6DHXkC+8QqmgTeg=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "readarr";
version = "0.1.8.1889";
version = "0.1.9.1905";
src = fetchurl {
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";

4
pkgs/servers/search/zincsearch/default.nix
View File

@ -5,12 +5,12 @@
}:
let
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "zinclabs";
repo = "zincsearch";
rev = "v${version}";
hash = "sha256-M2QNrQFMZJuJ2BlGmHT1eGGWccXqjLSjuEppP8uTWJw=";
hash = "sha256-6ZwEH9Xm+iIZ0SDa8qb82lIN3KU6DMe2wt0q9doKgkE=";
};
webui = buildNpmPackage {

4
pkgs/servers/web-apps/snipe-it/default.nix
View File

@ -34,13 +34,13 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.1.0";
version = "6.1.1";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "0c8cjywhyiywfav2syjkah777qj5f1jrckgri70ypqyxbwgb4rpm";
sha256 = "0kqrq0blamqbfh8dxfyvn2m4q7yphamh4yvpfs7iyb3lb7z7a75i";
};
passthru.tests = nixosTests.snipe-it;

20
pkgs/servers/web-apps/snipe-it/php-packages.nix
View File

@ -492,6 +492,16 @@ let
};
};
};
"laravel/socialite" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "laravel-socialite-a14a177f2cc71d8add71e2b19e00800e83bdda09";
src = fetchurl {
url = "https://api.github.com/repos/laravel/socialite/zipball/a14a177f2cc71d8add71e2b19e00800e83bdda09";
sha256 = "1fxlywrr2pansda2p9k475i20il2b5sz93w9b0kr7lihf242rz1z";
};
};
};
"laravel/tinker" = {
targetDir = "";
src = composerEnv.buildZipPackage {
@ -622,6 +632,16 @@ let
};
};
};
"league/oauth1-client" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "league-oauth1-client-d6365b901b5c287dd41f143033315e2f777e1167";
src = fetchurl {
url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167";
sha256 = "0hkh8l7884g8ssja1biwfb59x0jj951lwk6kmiacjqvyvzs07qmx";
};
};
};
"league/oauth2-server" = {
targetDir = "";
src = composerEnv.buildZipPackage {

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

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

68
pkgs/tools/games/trigger-control/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, makeWrapper
, pkg-config
, SDL2
, dbus
, libdecor
, libnotify
, dejavu_fonts
, gnome
}:
let
inherit (gnome) zenity;
in
stdenv.mkDerivation rec {
pname = "trigger-control";
version = "unstable-2023-06-18";
src = fetchFromGitHub {
owner = "Etaash-mathamsetty";
repo = "trigger-control";
rev = "d457ebd9e0844cfc456bfa4fa4bb694bb8ad982a";
hash = "sha256-QWhUQ8xqS8oRVF0KUpEthlrOoXmhcfEkIHauDI1/5a8=";
};
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
];
buildInputs = [
SDL2
dbus
libnotify
] ++ lib.optionals stdenv.isLinux [
libdecor
];
# The app crashes without a changed fontdir and upstream recommends dejavu as font
postPatch = ''
substituteInPlace trigger-control.cpp --replace "/usr/share/fonts/" "${dejavu_fonts}/share/fonts/"
'';
installPhase = ''
runHook preInstall
install -D trigger-control $out/bin/trigger-control
runHook postInstall
'';
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/trigger-control \
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
meta = with lib; {
description = "Control the dualsense's triggers on Linux (and Windows) with a gui and C++ api";
homepage = "https://github.com/Etaash-mathamsetty/trigger-control";
license = licenses.mit;
maintainers = with maintainers; [ azuwis ];
};
}

6
pkgs/tools/misc/onefetch/default.nix
View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.18.0";
version = "2.18.1";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = version;
hash = "sha256-XjsKdfz4uQ1W8ul/2dbKiz7oVksUv5UNBF0U0MNsUPs=";
hash = "sha256-xa7LdIeeSzCoSUVe9CzC3hKDiKlQdr011+iF/WOVGx0=";
};
cargoHash = "sha256-G7cJoUxkOn6pQtRwzI8/KFvvbkN8JLgZcdUUZffIydo=";
cargoHash = "sha256-zaRoL5fV0Vyca0Ay1WIl/1jAlPSeuoBevgrEFER6XJU=";
cargoPatches = [
# enable pkg-config feature of zstd

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
version = "20230522";
version = "20230622";
src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
sha256 = "sha256-GvRrdgUCOxQ2C7lohF3mQT2yS/D5UfXgII0jgDy2QgI=";
sha256 = "sha256-3jokrXAhmKZCEVzrmygGJf1Jxt2IQrCGhf8FfGuEI44=";
};
outputs = [ "out" "man" "doc" ];

6
pkgs/tools/misc/tagref/default.nix
View File

@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tagref";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BZ0by5H6yZuvksMneor02rx0kXlvO9tdpWivRDB9qDs=";
sha256 = "sha256-wjCehdCZR/97nD4HsTZCiVZZb2GQaOTfyU72Ez5kjW8=";
};
cargoHash = "sha256-w+YU0+/vba/fRYbLAmOloOuHMWbFiEyt3b0mfIvFE0Q=";
cargoHash = "sha256-Wis6C4Wlz7NScFeKXWODA8BKmRtL7adaYxPVR13wNsg=";
meta = with lib; {
description = "Tagref helps you refer to other locations in your codebase.";

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

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.61.0";
version = "3.62.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-qX8W9tI8oVQXKA+RfJ7Y69mS7yf2nEgfu1IRvhmM48Y=";
sha256 = "sha256-Li/eDD5v4b+DHlScZIIrwvlu8KgHQadwxDrS9P4wVP0=";
};
vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";

12
pkgs/tools/security/vault/vault-bin.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "vault-bin";
version = "1.13.2";
version = "1.13.3";
src =
let
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-RVqhObAw1M4zNK5cXzbD+cbITtsUPBXoc7O7zqVRJhI=";
aarch64-linux = "sha256-WLw6GKNZc5a7HGTAI4kzsel8N9EwoTWda7Z05pXNeDA=";
i686-linux = "sha256-v1f5yDrarKmWFtL9fIr03H5tH/bDi83XVYsTnLgLq5Q=";
x86_64-darwin = "sha256-f1f6KFgr/A62PxEZEzzkNkQF4YI/xISYKVczcXn3r0k=";
aarch64-darwin = "sha256-TQ9Wi6rBXWCYBkkvCyoMMbRiUOEBykvbwp6hdqUUO4I=";
x86_64-linux = "sha256-heC2VX656nAlYoTwfa4Tv+tlkclfKxNTTpWa+Y6XWLA=";
aarch64-linux = "sha256-Alx8Lacb0IO8kSjYwkeytGxQkCM57zTSk+JXATxZ1eU=";
i686-linux = "sha256-eJW6boE0KG4oF/Sf1UxWVXkwLOx5R6ohrpog3YXKfvY=";
x86_64-darwin = "sha256-lWLEr0arVR7fpgxGEZqkoj/w4YHzNQo+jILZRQ53Eok=";
aarch64-darwin = "sha256-hGlmOKLpb9P/pO8ilxG2dLYDULXarp55/e8HoSbHz98=";
};
in
fetchzip {

6
pkgs/tools/system/automatic-timezoned/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "1.0.94";
version = "1.0.100";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MeglBAWmEqRtWKzvNMixXUPOkGGTFCCyO9A+RE/joTw=";
sha256 = "sha256-RyfUJJ4XgC8mNss4mPMxogQ4nL1uvPwDisVPtgF6+OU=";
};
cargoHash = "sha256-NkGWjvIN6Be12tuDEd7PhdFQgVUwzz2CEg6XASn9DKY=";
cargoHash = "sha256-Dp8UUMWAOYdNAljktrMHpPxTIPDCY/VPWA33kzZNCuc=";
meta = with lib; {
description = "Automatically update system timezone based on location";

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

@ -1811,6 +1811,8 @@ with pkgs;
topicctl = callPackage ../tools/misc/topicctl { };
trigger-control = callPackage ../tools/games/trigger-control { };
ttchat = callPackage ../tools/misc/ttchat { };
ukmm = callPackage ../tools/games/ukmm { };
@ -2581,6 +2583,8 @@ with pkgs;
retroarch-assets = callPackage ../applications/emulators/retroarch/retroarch-assets.nix { };
libretranslate = with python3.pkgs; toPythonApplication libretranslate;
libretro = recurseIntoAttrs
(callPackage ../applications/emulators/retroarch/cores.nix {
retroarch = retroarchBare;
@ -31751,7 +31755,9 @@ with pkgs;
wlroots_0_16
wlroots;
sway-unwrapped = callPackage ../applications/window-managers/sway { };
sway-unwrapped = callPackage ../applications/window-managers/sway {
wlroots = wlroots_0_16;
};
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
@ -39522,7 +39528,7 @@ with pkgs;
openzwave = callPackage ../development/libraries/openzwave { };
mongoc = callPackage ../development/libraries/mongoc { };
mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { };
mongoose = callPackage ../development/libraries/science/math/mongoose { };
@ -40305,7 +40311,7 @@ with pkgs;
wamr = callPackage ../development/interpreters/wamr { };
wasmer = callPackage ../development/interpreters/wasmer {
llvmPackages = llvmPackages_12;
llvmPackages = llvmPackages_14;
inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security;
};

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

@ -612,6 +612,12 @@ self: super: with self; {
argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { };
argostranslate = callPackage ../development/python-modules/argostranslate {
ctranslate2-cpp = pkgs.ctranslate2;
};
argos-translate-files = callPackage ../development/python-modules/argos-translate-files { };
argparse-addons = callPackage ../development/python-modules/argparse-addons { };
argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { };
@ -5728,6 +5734,8 @@ self: super: with self; {
(p: p.py)
];
libretranslate = callPackage ../development/python-modules/libretranslate { };
librosa = callPackage ../development/python-modules/librosa { };
librouteros = callPackage ../development/python-modules/librouteros { };
@ -5947,6 +5955,8 @@ self: super: with self; {
lsprotocol = callPackage ../development/python-modules/lsprotocol { };
ltpycld2 = callPackage ../development/python-modules/ltpycld2 { };
luddite = callPackage ../development/python-modules/luddite { };
ludios_wpull = callPackage ../development/python-modules/ludios_wpull { };
@ -6434,6 +6444,8 @@ self: super: with self; {
moretools = callPackage ../development/python-modules/moretools { };
morfessor = callPackage ../development/python-modules/morfessor { };
morphys = callPackage ../development/python-modules/morphys { };
mortgage = callPackage ../development/python-modules/mortgage { };
@ -12438,6 +12450,8 @@ self: super: with self; {
transitions = callPackage ../development/python-modules/transitions { };
translatehtml = callPackage ../development/python-modules/translatehtml { };
translatepy = callPackage ../development/python-modules/translatepy { };
translationstring = callPackage ../development/python-modules/translationstring { };