Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-01-31 06:01:59 +00:00 committed by GitHub
commit 82c24e442d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 341 additions and 186 deletions

View File

@ -14124,6 +14124,15 @@
githubId = 5991987;
name = "Alexander Sosedkin";
};
t4ccer = {
email = "t4ccer@gmail.com";
github = "t4ccer";
githubId = 64430288;
name = "Tomasz Maciosowski";
keys = [{
fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19";
}];
};
tadeokondrak = {
email = "me@tadeo.ca";
github = "tadeokondrak";

View File

@ -170,6 +170,6 @@ Packages
```
The latter option definition changes the default PostgreSQL package
used by NixOS's PostgreSQL service to 10.x. For more information on
used by NixOS's PostgreSQL service to 14.x. For more information on
packages, including how to add new ones, see
[](#sec-custom-packages).

View File

@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14;
</programlisting>
<para>
The latter option definition changes the default PostgreSQL
package used by NixOSs PostgreSQL service to 10.x. For more
package used by NixOSs PostgreSQL service to 14.x. For more
information on packages, including how to add new ones, see
<xref linkend="sec-custom-packages" />.
</para>

View File

@ -0,0 +1,50 @@
{ lib
, fetchFromGitHub
, buildGoModule
, clangStdenv
, pkg-config
, alsa-lib
, flac
}:
# gcc only supports objc on darwin
buildGoModule.override { stdenv = clangStdenv; } rec {
pname = "go-musicfox";
version = "3.6.1";
src = fetchFromGitHub {
owner = "anhoder";
repo = pname;
rev = "v${version}";
hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY=";
};
deleteVendor = true;
vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo=";
subPackages = [ "cmd/musicfox.go" ];
ldflags = [
"-s"
"-w"
"-X go-musicfox/pkg/constants.AppVersion=${version}"
];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsa-lib
flac
];
meta = with lib; {
description = "Terminal netease cloud music client written in Go";
homepage = "https://github.com/anhoder/go-musicfox";
license = licenses.mit;
mainProgram = "musicfox";
maintainers = with maintainers; [ zendo ];
};
}

View File

@ -1,13 +1,13 @@
{
"version": "3.139.0",
"version": "3.142.1",
"appimage": {
"x86_64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage",
"hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage",
"hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA=="
},
"aarch64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage",
"hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage",
"hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg=="
}
}
}

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
version = "0.1.11";
version = "0.2.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA=";
sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U=";
};
cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8=";
cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8=";
meta = with lib; {
description = "A simple tui to view & control docker containers";

View File

@ -442,22 +442,22 @@
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
},
"google": {
"hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=",
"hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.50.0",
"rev": "v4.51.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
"google-beta": {
"hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=",
"hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.50.0",
"rev": "v4.51.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
@ -571,13 +571,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=",
"hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.49.0",
"rev": "v1.50.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY="
"vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -843,11 +843,11 @@
"vendorHash": null
},
"opennebula": {
"hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=",
"hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
"rev": "v1.1.0",
"rev": "v1.1.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk="
},
@ -870,11 +870,11 @@
"vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ="
},
"opsgenie": {
"hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=",
"hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
"owner": "opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.19",
"rev": "v0.6.20",
"spdx": "MPL-2.0",
"vendorHash": null
},

View File

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "2.2.3";
version = "2.2.4";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE=";
hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY=";
};
installPhase = ''

View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-slang=${slang.dev}"
"--with-ssl=${openssl.dev}"
"--with-slrnpull"
];
buildInputs = [ slang ncurses openssl ];

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "flex-ndax";
version = "0.2-20221007.1";
version = "0.3-20230126.0";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nDAX";
rev = "v${version}";
hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k=";
hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ=";
};
buildInputs = [ libpulseaudio ];
vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
meta = with lib; {
broken = stdenv.isDarwin;

View File

@ -3,13 +3,13 @@
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
stdenvNoCC.mkDerivation {
pname = "mpv_sponsorblock";
version = "unstable-2022-09-24";
version = "unstable-2023-01-30";
src = fetchFromGitHub {
owner = "po5";
repo = "mpv_sponsorblock";
rev = "248d108c1280e05de551c42867aebb72cf0c83b9";
sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld";
rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d";
sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ=";
};
dontBuild = true;

View File

@ -0,0 +1,25 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "w_scan2";
version = "1.0.14";
src = fetchFromGitHub {
owner = "stefantalpalaru";
repo = "w_scan2";
rev = version;
sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ=";
};
meta = {
description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files";
homepage = "https://github.com/stefantalpalaru/w_scan2";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ _0x4A6F ] ;
license = lib.licenses.gpl2Only;
};
}

View File

@ -1,36 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, libX11
, libinput
, libxcb
, libxkbcommon
, pixman
, pkg-config
, substituteAll
, wayland
, wayland-protocols
, wlroots
, wlroots_0_16
, writeText
, enable-xwayland ? true, xwayland, libX11
, xcbutilwm
, xwayland
, enableXWayland ? true
, conf ? null
, patches ? [ ]
}:
let
totalPatches = patches ++ [ ];
wlroots = wlroots_0_16;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "dwl";
version = "0.3.1";
version = "0.4";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ=";
repo = "dwl";
rev = "v${self.version}";
hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
libinput
@ -40,18 +46,13 @@ stdenv.mkDerivation rec {
wayland
wayland-protocols
wlroots
] ++ lib.optionals enable-xwayland [
] ++ lib.optionals enableXWayland [
libX11
xcbutilwm
xwayland
];
# Allow users to set their own list of patches
patches = totalPatches;
# Last line of config.mk enables XWayland
prePatch = lib.optionalString enable-xwayland ''
sed -i -e '$ s|^#||' config.mk
'';
outputs = [ "out" "man" ];
# Allow users to set an alternative config.def.h
postPatch = let
@ -60,21 +61,19 @@ stdenv.mkDerivation rec {
else writeText "config.def.h" conf;
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
NIX_CFLAGS_COMPILE = [
# https://github.com/djpohly/dwl/issues/186
"-Wno-error=unused-result"
];
dontConfigure = true;
installPhase = ''
runHook preInstall
install -d $out/bin
install -m755 dwl $out/bin
runHook postInstall
preBuild = ''
makeFlagsArray+=(
XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""}
XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""}
)
'';
meta = with lib; {
installFlags = [
"PREFIX=$(out)"
"MANDIR=$(man)/share/man/man1"
];
meta = {
homepage = "https://github.com/djpohly/dwl/";
description = "Dynamic window manager for Wayland";
longDescription = ''
@ -88,9 +87,10 @@ stdenv.mkDerivation rec {
- Limited to 2000 SLOC to promote hackability
- Tied to as few external dependencies as possible
'';
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.AndersonTorres ];
inherit (wayland.meta) platforms;
};
}
})
# TODO: custom patches from upstream website

View File

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.3.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU=";
hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM=";
};
nativeBuildInputs = [

View File

@ -1,28 +1,37 @@
{ lib, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
let
version = "2021-07-29";
in fetchFromGitHub rec {
name = "comfortaa-${version}";
stdenvNoCC.mkDerivation rec {
pname = "comfortaa";
version = "unstable-2021-07-29";
owner = "googlefonts";
repo = "comfortaa";
rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b";
src = fetchFromGitHub {
owner = "googlefonts";
repo = pname;
rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b";
postFetch = ''
# Remove the OTF fonts as they are not needed and cause a hash mismatch
rm -rf $out/fonts/{OTF,otf}
'';
hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
postFetch = ''
tar -xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa
cp fonts/TTF/*.ttf $out/share/fonts/truetype
cp FONTLOG.txt README.md $out/share/doc/comfortaa
'';
sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k";
runHook postInstall
'';
meta = with lib; {
homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949";
description = "A clean and modern font suitable for headings and logos";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
maintainers = [ maintainers.rycee ];
};
}

View File

@ -17,17 +17,15 @@
stdenv.mkDerivation rec {
pname = "hashlink";
version = "1.12";
version = "1.13";
src = fetchFromGitHub {
owner = "HaxeFoundation";
repo = "hashlink";
rev = version;
sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ=";
sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE=";
};
patches = [ ./hashlink.patch ];
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [

View File

@ -1,32 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64
endif
LIBOPENAL = -lopenal
+LIBOPENGL = -lGL
RELEASE_NAME = linux
endif
--- a/libs/sdl/gl.c
+++ b/libs/sdl/gl.c
@@ -7,7 +7,7 @@
# include <OpenGLES/ES3/gl.h>
# define HL_GLES
#elif defined(HL_MAC)
-# include <SDL.h>
+# include <SDL2/SDL.h>
# include <OpenGL/gl3.h>
# define glBindImageTexture(...) hl_error("Not supported on OSX")
# define glDispatchCompute(...) hl_error("Not supported on OSX")
--- a/libs/sdl/sdl.c
+++ b/libs/sdl/sdl.c
@@ -7,7 +7,7 @@
# include <SDL.h>
# include <SDL_syswm.h>
#elif defined(HL_MAC)
-# include <SDL.h>
+# include <SDL2/SDL.h>
#else
# include <SDL2/SDL.h>
#endif

View File

@ -52,6 +52,15 @@ let
++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0"
;
# LuaJIT requires build for 32bit architectures to be build on x86 not x86_64
# TODO support also other build architectures. The ideal way would be to use
# stdenv_32bit but that doesn't work due to host platform mismatch:
# https://github.com/NixOS/nixpkgs/issues/212494
buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit
then buildPackages.pkgsi686Linux.buildPackages.stdenv
else buildPackages.stdenv;
in
stdenv.mkDerivation rec {
pname = "luajit";
@ -88,8 +97,7 @@ stdenv.mkDerivation rec {
"PREFIX=$(out)"
"DEFAULT_CC=cc"
"CROSS=${stdenv.cc.targetPrefix}"
# TODO: when pointer size differs, we would need e.g. -m32
"HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
"HOST_CC=${buildStdenv.cc}/bin/cc"
] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = XCFLAGS;

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
hash = "sha256-e5S3K0kYCB6nVZDi/DVKzMvrVk6IgXC2g7217sr8xUo=";
hash = "sha256-f/tM8b2JGZw2OzhlhMvjzLjgvgj5qncEepYsEwSxeAI=";
};
nativeBuildInputs = [

View File

@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "libsidplayfp";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-stfpyJC1AVmDh1Nk5c5Lv0j6ic2AU6mwY02L/IDr8tE=";
sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds=";
};
postPatch = ''

View File

@ -4,6 +4,7 @@
, pythonOlder
, pytest
, pysha3
, safe-pysha3
, pycryptodome
}:
@ -31,7 +32,7 @@ buildPythonPackage rec {
passthru.optional-dependencies = {
pycryptodome = [ pycryptodome ];
pysha3 = [ pysha3 ];
pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ];
};
meta = with lib; {

View File

@ -16,7 +16,7 @@
let
pname = "hassil";
version = "0.2.5";
version = "0.2.6";
in
buildPythonPackage {
inherit pname version;
@ -24,7 +24,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-/KEYTY3Y/KKP/r2OBf3R/jE7Sp/hNygC/Gdzk9XIf/0=";
hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY=";
};
nativeBuildInputs = [

View File

@ -12,20 +12,20 @@
buildPythonPackage rec {
pname = "pathy";
version = "0.6.1";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "838624441f799a06b446a657e4ecc9ebc3fdd05234397e044a7c87e8f6e76b1c";
hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs=";
};
propagatedBuildInputs = [
google-cloud-storage
smart-open
typer
google-cloud-storage
];
nativeCheckInputs = [
@ -33,15 +33,6 @@ buildPythonPackage rec {
pytestCheckHook
];
patches = [
# Support for smart-open >= 6.0.0, https://github.com/justindujardin/pathy/pull/71
(fetchpatch {
name = "support-later-smart-open.patch";
url = "https://github.com/justindujardin/pathy/commit/ba1c23df6ee5d1e57bdfe845ff6a9315cba3df6a.patch";
sha256 = "sha256-V1i4tx73Xkdqb/wZhQIv4p6FVpF9SEfDhlBkwaaRE3w=";
})
];
disabledTestPaths = [
# Exclude tests that require provider credentials
"pathy/_tests/test_clients.py"

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2023.1.1";
version = "2023.1.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew=";
hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM=";
};
nativeBuildInputs = [

View File

@ -1,13 +1,15 @@
{ lib, libgpiod, buildPythonPackage, fetchurl }:
{ lib, libgpiod, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "rpi-gpio2";
version = "0.3.0a3";
# PyPi source does not work for some reason
src = fetchurl {
url = "https://github.com/underground-software/RPi.GPIO2/archive/refs/tags/v${version}.tar.gz";
sha256 = "sha256-AY1AD2Yu66eJUqB4OStZnUeEhmISLVRrTOAcmEHjuOM=";
src = fetchFromGitHub {
owner = "underground-software";
repo = "RPi.GPIO2";
rev = "v${version}";
hash = "sha256-8HQbEnO+4Ppo2Z3HBulbBcSKJF1bNNQYz8k6aUt65oc=";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "spacy-legacy";
version = "3.0.9";
version = "3.0.12";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM=";
sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q=";
};
# nativeCheckInputs = [ pytestCheckHook spacy ];

View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cpm-cmake";
version = "0.36.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = "cpm-cmake";
repo = "cpm.cmake";
rev = "v${finalAttrs.version}";
hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA=";
hash = "sha256-zZUk0brG9dAfQRN1LzKRo5/ZAG35TblY0nZvVhy6azE=";
};
dontConfigure = true;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "micronaut";
version = "3.8.2";
version = "3.8.3";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-a07vFya7c8ai0YjNvXCAWSoQLH81U4cIr0QsgX3WcJY=";
sha256 = "sha256-IrgypySq5RUi9X3pVC0t+Ezw7aNu8mIKZYY4CEaKhU4=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "devspace";
version = "6.2.4";
version = "6.2.5";
src = fetchFromGitHub {
owner = "loft-sh";
repo = "devspace";
rev = "v${version}";
sha256 = "sha256-Y2MFxceOS3H4Ya0EupgQqtOnkhEk6DXbg6rix3J9OtM=";
sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I=";
};
vendorSha256 = null;

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.237";
version = "0.0.238";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c2mD03gxbBnnifTXPpdJk4kwpeHdrwckymaFGKJwDc8=";
sha256 = "sha256-hsJJsPJQrkzn+otpFhsESLRhfYEcUSXJULkScWPyQNk=";
};
cargoSha256 = "sha256-pYOMCmNrI4uzqXkbc2D9UvNHg2PlibmEhtml+A1V1BQ=";
cargoSha256 = "sha256-stEPoiXKXnjYcKqlJPwcjWAV4W2GLIp2lQ0ejVd/EF8=";
nativeBuildInputs = [
installShellFiles

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iUeEZ6u5IIRP0NEXzgMcleuUQ11meCFIpweTdod5SIk=";
sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4=";
};
cargoSha256 = "sha256-Fct5ebwGDGMqAHP+2NRseKTIsVQlQZFeZfbssaBzRgg=";
cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0=";
nativeBuildInputs = [ pkg-config ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-temp";
version = "0.2.14";
version = "0.2.15";
src = fetchFromGitHub {
owner = "yozhgoor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-N5PRwUSUAFwvbyq5Uo6nEr05QqmeA1yI9ru0VRnrXa8=";
sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk=";
};
cargoSha256 = "sha256-vzru7+EA41kQGciA4q03bvcIYOMGYLAiws35ZMh413g=";
cargoSha256 = "sha256-EDdOnkOk5VIrzjJSTojdjmGAEDPMqW4PPE0JP+GUYnE=";
meta = with lib; {
description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";

View File

@ -0,0 +1,35 @@
{ lib
, python3Packages
, fetchFromGitHub
}:
python3Packages.buildPythonApplication rec {
pname = "itchiodl";
version = "2.1.2";
src = fetchFromGitHub {
owner = "Emersont1";
repo = "itchio";
rev = "v${version}";
hash = "sha256-U9oLrocwVdTqTQ26/MMiYO++yFGdOjnn8g+ea1jCl/A=";
};
format = "pyproject";
nativeBuildInputs = with python3Packages; [
poetry-core
];
propagatedBuildInputs = with python3Packages; [
beautifulsoup4
clint
requests
];
meta = with lib; {
homepage = "https://github.com/Emersont1/itchio";
description = "itch.io download tool";
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
};
}

View File

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "restic";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
hash = "sha256-qWVmsW16eQM7d+HoHR2qE7GpcC5HK7TIhhx6J2glKpA=";
hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o=";
};
patches = [
@ -17,7 +17,7 @@ buildGoModule rec {
./0001-Skip-testing-restore-with-permission-failure.patch
];
vendorHash = "sha256-zhLFMvp97mQclaLwH4Hl8jFNMmoYrf8AtVv49RDq7lM=";
vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms=";
subPackages = [ "cmd/restic" ];

View File

@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "scarab";
version = "1.19.0.0";
version = "1.20.0.0";
src = fetchFromGitHub {
owner = "fifty-six";
repo = pname;
rev = "v${version}";
sha256 = "10pmzy7nhcam0686kpn64cgar59shzzy5k7j3vrgmnm27zgkr22v";
sha256 = "sha256-VfXIxir4SaELuF2QpqbVzTvlkYxwERa0ddGEn1OAh04=";
};
nugetDeps = ./deps.nix;

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "10.2.4";
version = "10.3.0";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
hash = "sha256-b1nWTQ+m4b6XzDTR36ubf5nTdUuWK94F2P4Q3tUvHAw=";
hash = "sha256-BKrErM1d90o+yJ/R0vVgXDBwPgQSP3Qj26x4JmB7SXw=";
};
cargoHash = "sha256-7GSkFh0Fefl9VlCdPdVZ9IsyN0IKUob5c43v84PtrcI=";
cargoHash = "sha256-jm97lfWHTtd3tE+Yql9CIss78B+bW9nUQAhs5anDb6c=";
nativeBuildInputs = [
installShellFiles

View File

@ -0,0 +1,23 @@
{ lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec {
pname = "twspace-crawler";
version = "1.11.13";
src = fetchFromGitHub {
owner = "HitomaruKonpaku";
repo = "twspace-crawler";
rev = "v${version}";
hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA=";
};
npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888=";
meta = with lib; {
description = "Script to monitor & download Twitter Spaces 24/7";
homepage = "https://github.com/HitomaruKonpaku/twspace-crawler";
changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md";
license = licenses.isc;
maintainers = [ maintainers.marsam ];
};
}

View File

@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "wakapi";
version = "2.6.1";
src = fetchFromGitHub {
owner = "muety";
repo = pname;
rev = version;
sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb";
};
vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I";
# Not a go module required by the project, contains development utilities
excludedPackages = [ "scripts" ];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
homepage = "https://wakapi.dev/";
changelog = "https://github.com/muety/wakapi/releases/tag/${version}";
description = "A minimalist self-hosted WakaTime-compatible backend for coding statistics";
license = licenses.gpl3Only;
maintainers = with maintainers; [ t4ccer ];
};
}

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "brutespray";
version = "1.8";
version = "1.8.1";
src = fetchFromGitHub {
owner = "x90skysn3k";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70=";
sha256 = "sha256-O9HOsj0R6oHI7jjG4FBqbrSAQSVomgeD7tyPDNCNmIo=";
};
postPatch = ''

View File

@ -4,34 +4,27 @@
, autoreconfHook
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "secp256k1";
version = "unstable-2022-02-06";
version = "0.2.0";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "secp256k1";
rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af";
sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU=";
rev = "refs/tags/v${version}";
sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU=";
};
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [
"--enable-benchmark=no"
"--enable-exhaustive-tests=no"
"--enable-experimental"
"--enable-module-ecdh"
"--enable-module-recovery"
"--enable-module-schnorrsig"
"--enable-tests=yes"
];
doCheck = true;
checkPhase = "./tests";
meta = with lib; {
description = "Optimized C library for EC operations on curve secp256k1";
longDescription = ''

View File

@ -5,17 +5,18 @@ stdenv.mkDerivation rec {
version = "2.36";
src = fetchurl {
url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz";
url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz";
sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg=";
};
buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A quite complete and fast LATEX to HTML translator";
homepage = "http://pauillac.inria.fr/~maranget/hevea/";
homepage = "https://hevea.inria.fr/";
changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES";
license = licenses.qpl;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; unix;

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "govc";
version = "0.30.0";
version = "0.30.1";
subPackages = [ "govc" ];
@ -10,10 +10,10 @@ buildGoModule rec {
rev = "v${version}";
owner = "vmware";
repo = "govmomi";
sha256 = "sha256-BMkty2H42fAILw/zRiAWE5cOX9WCZIs0503QODLHqxo=";
sha256 = "sha256-hG+yaaSmABosCIkVPLzv0J5VnoPaYqCMpDingQ1apEs=";
};
vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
ldflags = [
"-s"

View File

@ -3319,6 +3319,8 @@ with pkgs;
itch = callPackage ../games/itch {};
itchiodl = callPackage ../games/itchiodl { };
itd = callPackage ../applications/misc/itd { };
kord = callPackage ../applications/misc/kord { };
@ -12730,6 +12732,8 @@ with pkgs;
twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
twspace-crawler = callPackage ../tools/misc/twspace-crawler { };
twspace-dl = callPackage ../tools/misc/twspace-dl { };
twtxt = python3Packages.callPackage ../applications/networking/twtxt { };
@ -13007,6 +13011,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
wakapi = callPackage ../tools/misc/wakapi { };
wakatime = python2Packages.callPackage ../tools/misc/wakatime { };
weather = callPackage ../applications/misc/weather { };
@ -29030,6 +29036,8 @@ with pkgs;
go-motion = callPackage ../development/tools/go-motion { };
go-musicfox = callPackage ../applications/audio/go-musicfox { };
gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
greenfoot = callPackage ../applications/editors/greenfoot {
@ -29401,6 +29409,8 @@ with pkgs;
w_scan = callPackage ../applications/video/w_scan { };
w_scan2 = callPackage ../applications/video/w_scan2 { };
wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };