Merge master into staging-next
This commit is contained in:
commit
f77112cc67
@ -14501,6 +14501,15 @@
|
||||
}];
|
||||
name = "Rahul Butani";
|
||||
};
|
||||
rs0vere = {
|
||||
email = "rs0vere@outlook.com";
|
||||
github = "rs0vere";
|
||||
githubId = 140035635;
|
||||
keys = [{
|
||||
fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D";
|
||||
}];
|
||||
name = "Red Star Over Earth";
|
||||
};
|
||||
rski = {
|
||||
name = "rski";
|
||||
email = "rom.skiad+nix@gmail.com";
|
||||
|
@ -150,6 +150,8 @@ The module update takes care of the new config syntax and the data itself (user
|
||||
|
||||
- `wrapHelm` now exposes `passthru.pluginsDir` which can be passed to `helmfile`. For convenience, a top-level package `helmfile-wrapped` has been added, which inherits `passthru.pluginsDir` from `kubernetes-helm-wrapped`. See [#217768](https://github.com/NixOS/nixpkgs/issues/217768) for details.
|
||||
|
||||
- `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to.
|
||||
|
||||
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
|
||||
|
||||
- The `qemu-vm.nix` module by default now identifies block devices via
|
||||
|
@ -7,8 +7,8 @@ let
|
||||
cfg = config.boot.initrd.network;
|
||||
|
||||
dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
|
||||
doDhcp = config.networking.useDHCP || dhcpInterfaces != [];
|
||||
dhcpIfShellExpr = if config.networking.useDHCP
|
||||
doDhcp = cfg.udhcpc.enable || dhcpInterfaces != [];
|
||||
dhcpIfShellExpr = if config.networking.useDHCP || cfg.udhcpc.enable
|
||||
then "$(ls /sys/class/net/ | grep -v ^lo$)"
|
||||
else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces;
|
||||
|
||||
@ -79,13 +79,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.network.udhcpc.enable = mkOption {
|
||||
default = config.networking.useDHCP;
|
||||
defaultText = "networking.useDHCP";
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Enables the udhcpc service during stage 1 of the boot process. This
|
||||
defaults to {option}`networking.useDHCP`. Therefore, this useful if
|
||||
useDHCP is off but the initramfs should do dhcp.
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.network.udhcpc.extraArgs = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
description = lib.mdDoc ''
|
||||
Additional command-line arguments passed verbatim to udhcpc if
|
||||
{option}`boot.initrd.network.enable` and {option}`networking.useDHCP`
|
||||
are enabled.
|
||||
Additional command-line arguments passed verbatim to
|
||||
udhcpc if {option}`boot.initrd.network.enable` and
|
||||
{option}`boot.initrd.network.udhcpc.enable` are enabled.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -1,19 +1,33 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,
|
||||
wrapQtAppsHook, poppler, zlib, pkg-config }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip
|
||||
, hunspell
|
||||
, wrapQtAppsHook, poppler, zlib, pkg-config }:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.5.2";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
|
||||
buildInputs = [ qtbase qtscript qtsvg poppler zlib ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
hunspell
|
||||
poppler
|
||||
qt5compat
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
quazip
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "TeX and LaTeX editor";
|
||||
@ -28,4 +42,4 @@ mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ajs124 cfouche ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -5,11 +5,21 @@
|
||||
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
|
||||
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "spectacle";
|
||||
|
||||
patches = [
|
||||
# backport fix for region capture with multi-display high-dpi setups
|
||||
# FIXME: remove in 23.08
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
|
||||
hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.115.4";
|
||||
version = "0.116.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-//WWdU6vKgc+X4R3/GClABbsAp+ZBnG3xsVh4YozPFg=";
|
||||
hash = "sha256-Q5aSpKBgPa2EBEI9qJAw/WRM9LjHa2rdsThMFRV2/F8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";
|
||||
vendorHash = "sha256-ScAjE+va/5K/9sYt05X1GmTJp8AUopMukWN/WlPG1sg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
python3, rsync, cron, openssh, sshfs-fuse, encfs }:
|
||||
|
||||
let
|
||||
python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]);
|
||||
python' = python3.withPackages (ps: with ps; [ dbus-python keyring packaging ]);
|
||||
|
||||
apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];
|
||||
in stdenv.mkDerivation rec {
|
||||
|
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-WwO46x6McV18ebGFjXQ8fvqRh6ih1Wt5JTbfTxVWTi0=";
|
||||
hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,6 +6,7 @@
|
||||
, gzip
|
||||
, lib
|
||||
, makeWrapper
|
||||
, nix-update-script
|
||||
, nixosTests
|
||||
, openssh
|
||||
, pam
|
||||
@ -38,17 +39,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.20.1-0";
|
||||
version = "1.20.2-0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "forgejo";
|
||||
repo = "forgejo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3L43hm6Tx4h5UHm3jGTGiOWBgAGx49zVGB0D6om6ayk=";
|
||||
hash = "sha256-8mFI5Zt2J6EQZqu/qcirFp8WMz+IlrkvHeA+oUb0X5U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n2fqqQ6jqHEAWLlaY9t6nd6Ty0viOuTwDWDhTECve+Q=";
|
||||
vendorHash = "sha256-ZoFs2T3NNixrbTDdp7fqTgjJ+G8DpkxHW8K6BM8tZ9w=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -95,6 +96,9 @@ buildGoModule rec {
|
||||
});
|
||||
|
||||
passthru = {
|
||||
# allow nix-update to handle npmDepsHash
|
||||
inherit (frontend) npmDeps;
|
||||
|
||||
data-compressed = runCommand "forgejo-data-compressed" {
|
||||
nativeBuildInputs = [ brotli xorg.lndir ];
|
||||
} ''
|
||||
@ -108,6 +112,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
tests = nixosTests.forgejo;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -115,7 +120,7 @@ buildGoModule rec {
|
||||
homepage = "https://forgejo.org";
|
||||
changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ emilylange urandom bendlas ];
|
||||
maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ];
|
||||
broken = stdenv.isDarwin;
|
||||
mainProgram = "gitea";
|
||||
};
|
||||
|
@ -27,72 +27,85 @@
|
||||
, libXxf86vm
|
||||
, xorgproto
|
||||
# darwin
|
||||
, Cocoa
|
||||
, darwin
|
||||
# optional
|
||||
, withNvidiaCg ? false
|
||||
, nvidia_cg_toolkit
|
||||
, withSamples ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ogre";
|
||||
version = "13.6.4";
|
||||
let
|
||||
common = { version, hash }: stdenv.mkDerivation {
|
||||
pname = "ogre";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OGRECave";
|
||||
repo = "ogre";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OGRECave";
|
||||
repo = "ogre";
|
||||
rev = "v${version}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
boost
|
||||
freeimage
|
||||
freetype
|
||||
libpng
|
||||
ois
|
||||
pugixml
|
||||
zziplib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
libXaw
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libXt
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
] ++ lib.optionals withNvidiaCg [
|
||||
nvidia_cg_toolkit
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
|
||||
"-DOGRE_BUILD_DEPENDENCIES=OFF"
|
||||
"-DOGRE_BUILD_SAMPLES=${toString withSamples}"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "3D Object-Oriented Graphics Rendering Engine";
|
||||
homepage = "https://www.ogre3d.org/";
|
||||
maintainers = with lib.maintainers; [ raskin wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
ogre_14 = common {
|
||||
version = "14.0.1";
|
||||
hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
boost
|
||||
freeimage
|
||||
freetype
|
||||
libpng
|
||||
ois
|
||||
pugixml
|
||||
zziplib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
libXaw
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libXt
|
||||
libXxf86vm
|
||||
xorgproto
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
] ++ lib.optionals withNvidiaCg [
|
||||
nvidia_cg_toolkit
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE"
|
||||
"-DOGRE_BUILD_DEPENDENCIES=OFF"
|
||||
"-DOGRE_BUILD_SAMPLES=${toString withSamples}"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "3D Object-Oriented Graphics Rendering Engine";
|
||||
homepage = "https://www.ogre3d.org/";
|
||||
maintainers = with lib.maintainers; [ raskin wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
ogre_13 = common {
|
||||
version = "13.6.5";
|
||||
hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE=";
|
||||
};
|
||||
}
|
||||
|
@ -4,6 +4,7 @@
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
, pkg-config
|
||||
, asciidoc
|
||||
@ -71,6 +72,8 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
vala
|
||||
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,28 +1,40 @@
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, ocaml
|
||||
, findlib
|
||||
, ocamlbuild
|
||||
, topkg
|
||||
}:
|
||||
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
|
||||
"ptime is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.1.0";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
|
||||
sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs=";
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
buildInputs = [ topkg ];
|
||||
nativeBuildInputs = [
|
||||
findlib
|
||||
ocaml
|
||||
ocamlbuild
|
||||
topkg
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
topkg
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = "https://erratique.ch/software/ptime";
|
||||
description = "POSIX time for OCaml";
|
||||
homepage = "https://erratique.ch/software/ptime";
|
||||
license = lib.licenses.isc;
|
||||
longDescription = ''
|
||||
Ptime has platform independent POSIX time support in pure OCaml.
|
||||
It provides a type to represent a well-defined range of POSIX timestamps
|
||||
@ -35,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
Ptime is not a calendar library.
|
||||
'';
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.40.1";
|
||||
version = "0.41.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nGLguMbenfKONcY1W5S+BZ6zHmnW/Sivs2/NpDqrEck=";
|
||||
hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
38
pkgs/development/python-modules/ttstokenizer/default.nix
Normal file
38
pkgs/development/python-modules/ttstokenizer/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, anyascii
|
||||
, inflect
|
||||
, nltk
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttstokenizer";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HtDXDKlZ3jpwIgb5DvaqurEkRe8TRJ2xqKl2IKElnKU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyascii
|
||||
inflect
|
||||
nltk
|
||||
numpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ttstokenizer" ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tokenizer for Text to Speech (TTS) models";
|
||||
homepage = "https://pypi.org/project/ttstokenizer";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.12.4";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-OieIbWgc5l7HS6otkRxsKYQmNIjPbADQ+C3A6qJr2h0=";
|
||||
sha256 = "sha256-E/QX3J/ux7GAG93b1K7OdDjYBAzte2HMa6bfALtXgcU=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-0Svz0VFmNW/f8Po+DpIQi0bJB1ICLcSJM1sG/Nju+ZY=";
|
||||
vendorSha256 = "sha256-e83y8bu0xKGEg7o2BWt4CzM2YosLDefFRgTfA0f3ZmI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
97
pkgs/games/hmcl/default.nix
Normal file
97
pkgs/games/hmcl/default.nix
Normal file
@ -0,0 +1,97 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, makeDesktopItem
|
||||
, wrapGAppsHook
|
||||
, copyDesktopItems
|
||||
, imagemagick
|
||||
, jre
|
||||
, xorg
|
||||
, libGL
|
||||
, glfw
|
||||
, openal
|
||||
, libglvnd
|
||||
, alsa-lib
|
||||
, wayland
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.5.5";
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico";
|
||||
hash = "sha256-MWp78rP4b39Scz5/gpsjwaJhSu+K9q3S2B2cD/V31MA=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hmcl";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar";
|
||||
hash = "sha256-bXZF38pd8I8cReuDNrZzDj1hp1Crk+P26JNiikUCg4g=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "HMCL";
|
||||
exec = "hmcl";
|
||||
icon = "hmcl";
|
||||
comment = finalAttrs.meta.description;
|
||||
desktopName = "HMCL";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
libpath = lib.makeLibraryPath ([
|
||||
libGL
|
||||
glfw
|
||||
openal
|
||||
libglvnd
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
xorg.libX11
|
||||
xorg.libXxf86vm
|
||||
xorg.libXext
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
xorg.libXtst
|
||||
libpulseaudio
|
||||
wayland
|
||||
alsa-lib
|
||||
]);
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,lib/hmcl}
|
||||
cp $src $out/lib/hmcl/hmcl.jar
|
||||
magick ${icon} hmcl.png
|
||||
install -Dm644 hmcl.png $out/share/icons/hicolor/32x32/apps/hmcl.png
|
||||
makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \
|
||||
--add-flags "-jar $out/lib/hmcl/hmcl.jar" \
|
||||
--set LD_LIBRARY_PATH ${libpath}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://hmcl.huangyuhui.net";
|
||||
description = "A Minecraft Launcher which is multi-functional, cross-platform and popular";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
inherit (jre.meta) platforms;
|
||||
};
|
||||
})
|
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ogre
|
||||
, ogre_13
|
||||
, cegui
|
||||
, boost
|
||||
, sfml
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
ogre' = ogre.overrideAttrs (old: {
|
||||
ogre' = ogre_13.overrideAttrs (old: {
|
||||
cmakeFlags = old.cmakeFlags ++ [
|
||||
"-DOGRE_RESOURCEMANAGER_STRICT=0"
|
||||
];
|
||||
|
@ -3,7 +3,7 @@
|
||||
, stdenv
|
||||
, cmake
|
||||
, boost
|
||||
, ogre
|
||||
, ogre_13
|
||||
, mygui
|
||||
, ois
|
||||
, SDL2
|
||||
@ -19,7 +19,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
stuntrally_ogre = ogre.overrideAttrs (old: {
|
||||
stuntrally_ogre = ogre_13.overrideAttrs (old: {
|
||||
cmakeFlags = old.cmakeFlags ++ [
|
||||
"-DOGRE_NODELESS_POSITIONING=ON"
|
||||
"-DOGRE_RESOURCEMANAGER_STRICT=0"
|
||||
@ -27,7 +27,7 @@ let
|
||||
});
|
||||
stuntrally_mygui = mygui.override {
|
||||
withOgre = true;
|
||||
inherit ogre;
|
||||
ogre = stuntrally_ogre;
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -71,18 +71,18 @@ let
|
||||
# To compute the commit when upgrading this derivation, do:
|
||||
# `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src`
|
||||
# Example: `$ git rev-parse v4.14.1`
|
||||
commit = "5c511237970f4be0f1e5785feaa254da951bc367";
|
||||
commit = "e37b35278d4b529fd774469c3e1807ec8f4d1eb0";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "code-server";
|
||||
version = "4.15.0";
|
||||
version = "4.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder";
|
||||
repo = "code-server";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-2/zIfeCROPrlwHuKk0ySPMLdI504aNLNZge+XUSrZB8=";
|
||||
hash = "sha256-oGtYrCW9ZweWEkx7uQkQCQx53QoyV5Y3BMsvApGiY9Y=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
|
@ -1,26 +1,29 @@
|
||||
{ stdenv, lib, fetchurl }:
|
||||
{ maven, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "keycloak-metrics-spi";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar";
|
||||
sha256 = "sha256-D0NNBuc9YBiywGoq5hG4dcoiunyG/C2ZX73p4lS5v4s=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aerogear";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A=";
|
||||
|
||||
nativeBuildInputs = [ maven ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
install "$src" "$out"
|
||||
runHook preInstall
|
||||
install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aerogear/keycloak-metrics-spi";
|
||||
description = "Keycloak Service Provider that adds a metrics endpoint";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
};
|
||||
|
@ -3,8 +3,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "mastodon";
|
||||
repo = "mastodon";
|
||||
rev = "v4.1.5";
|
||||
hash = "sha256-1bWrKcw+EQyu7WBujR5sptiUOjbhJvIM76h9jcX24jw=";
|
||||
rev = "v4.1.6";
|
||||
hash = "sha256-UjTN9vEuZX9tDeHnW41TEZtnchNu2IOleHPisrv18Qk=";
|
||||
};
|
||||
in applyPatches {
|
||||
inherit src;
|
||||
|
@ -1 +1 @@
|
||||
"4.1.5"
|
||||
"4.1.6"
|
||||
|
@ -5,5 +5,6 @@
|
||||
matrix-synapse-ldap3 = callPackage ./ldap3.nix { };
|
||||
matrix-synapse-mjolnir-antispam = callPackage ./mjolnir-antispam.nix { };
|
||||
matrix-synapse-pam = callPackage ./pam.nix { };
|
||||
matrix-synapse-s3-storage-provider = callPackage ./s3-storage-provider.nix { };
|
||||
matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { };
|
||||
}
|
||||
|
33
pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
Normal file
33
pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted, humanize, boto3, tqdm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-s3-storage-provider";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse-s3-storage-provider";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-92Xkq54jrUE2I9uVOxI72V9imLNU6K4JqDdOZb+4f+Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "humanize>=0.5.1,<0.6" "humanize>=0.5.1"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "s3_storage_provider" ];
|
||||
|
||||
buildInputs = [ matrix-synapse ];
|
||||
propagatedBuildInputs = [ twisted humanize boto3 tqdm ]
|
||||
# for the s3_media_upload script
|
||||
++ matrix-synapse.propagatedBuildInputs;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Synapse storage provider to fetch and store media in Amazon S3";
|
||||
homepage = "https://github.com/matrix-org/synapse-s3-storage-provider";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yuka ];
|
||||
};
|
||||
}
|
@ -31,15 +31,15 @@
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxysql";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysown";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-D/AUjndpu4QJmlgLBXRqMj9gsHYitEYhHVMQzoab1ik=";
|
||||
repo = "proxysql";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-HFhfAWyDB20t+c4s9NlVwdANrFobVyr+vnmZqx+X20Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
GIT_VERSION = version;
|
||||
GIT_VERSION = finalAttrs.version;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -165,12 +165,12 @@ stdenv.mkDerivation rec {
|
||||
sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://proxysql.com/";
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "High-performance MySQL proxy";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ ajs124 ];
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://proxysql.com/";
|
||||
license = with lib.licenses; [ gpl3Only ];
|
||||
maintainers = with lib.maintainers; [ ajs124 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.35.2";
|
||||
version = "2.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-drydLWt0B7mQKMn1GzEe/I352b2hvhCKV8tUicZoVHk=";
|
||||
hash = "sha256-OZrQxF5fuKpauy3wk6q3bUh1uUw14nkEldrzYPiOVIQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HZYYENQIkmAhm0oDfUUpiAqWTbmNsy6u6hOyUvd8iC8=";
|
||||
vendorHash = "sha256-H7sbpDZMkPF5qw9urb/Gfmy8b9T4UEsnl6CGlZ1LThQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
242
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
242
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
@ -18,6 +18,16 @@ version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
|
||||
|
||||
[[package]]
|
||||
name = "accesskit"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de"
|
||||
dependencies = [
|
||||
"enumn",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "adler"
|
||||
version = "1.0.2"
|
||||
@ -33,12 +43,13 @@ dependencies = [
|
||||
"cfg-if",
|
||||
"getrandom",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "amdgpu_top"
|
||||
version = "0.1.9"
|
||||
version = "0.1.11"
|
||||
dependencies = [
|
||||
"amdgpu_top_gui",
|
||||
"amdgpu_top_json",
|
||||
@ -142,6 +153,12 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
@ -199,6 +216,12 @@ dependencies = [
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.4.0"
|
||||
@ -265,6 +288,43 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cocoa"
|
||||
version = "0.24.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"block",
|
||||
"cocoa-foundation",
|
||||
"core-foundation",
|
||||
"core-graphics",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cocoa-foundation"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"block",
|
||||
"core-foundation",
|
||||
"core-graphics-types",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||
|
||||
[[package]]
|
||||
name = "combine"
|
||||
version = "4.6.6"
|
||||
@ -442,6 +502,16 @@ dependencies = [
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "directories-next"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "4.0.0"
|
||||
@ -462,6 +532,17 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dispatch"
|
||||
version = "0.2.0"
|
||||
@ -485,87 +566,100 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
||||
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.21.0"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
|
||||
checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.21.3"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3df3ce60931e5f2d83bab4484d1a283908534d5308cc6b0c5c22c59cd15ee7cc"
|
||||
checksum = "bf4596583a2c680c55b6feaa748f74890c4f9cb9c7cb69d6117110444cb65b2f"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cocoa",
|
||||
"directories-next",
|
||||
"egui",
|
||||
"egui-winit",
|
||||
"egui_glow",
|
||||
"glow",
|
||||
"glutin",
|
||||
"glutin-winit",
|
||||
"image",
|
||||
"js-sys",
|
||||
"log",
|
||||
"objc",
|
||||
"percent-encoding",
|
||||
"raw-window-handle",
|
||||
"ron",
|
||||
"serde",
|
||||
"thiserror",
|
||||
"tracing",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
"web-sys",
|
||||
"winapi",
|
||||
"winit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.21.0"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
|
||||
checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"ahash",
|
||||
"epaint",
|
||||
"log",
|
||||
"nohash-hasher",
|
||||
"tracing",
|
||||
"ron",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui-winit"
|
||||
version = "0.21.1"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab43597ba41f0ce39a364ad83185594578bfd8b3409b99dbcbb01df23afc3dbb"
|
||||
checksum = "4a49155fd4a0a4fb21224407a91de0030847972ef90fc64edb63621caea61cb2"
|
||||
dependencies = [
|
||||
"android-activity",
|
||||
"arboard",
|
||||
"egui",
|
||||
"instant",
|
||||
"log",
|
||||
"raw-window-handle",
|
||||
"serde",
|
||||
"smithay-clipboard",
|
||||
"tracing",
|
||||
"webbrowser",
|
||||
"winit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui_glow"
|
||||
version = "0.21.0"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8257332fb168a965b3dca81d6a344e053153773c889cabdba0b3b76f1629ae81"
|
||||
checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui",
|
||||
"glow",
|
||||
"log",
|
||||
"memoffset",
|
||||
"tracing",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.21.0"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
|
||||
checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -588,6 +682,17 @@ dependencies = [
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumn"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumset"
|
||||
version = "1.0.12"
|
||||
@ -611,9 +716,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.21.0"
|
||||
version = "0.22.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
|
||||
checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"ahash",
|
||||
@ -621,8 +726,10 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"ecolor",
|
||||
"emath",
|
||||
"log",
|
||||
"nohash-hasher",
|
||||
"parking_lot",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -814,6 +921,20 @@ dependencies = [
|
||||
"unicode-normalization",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "image"
|
||||
version = "0.24.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder",
|
||||
"color_quant",
|
||||
"num-rational",
|
||||
"num-traits",
|
||||
"png",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.3"
|
||||
@ -896,7 +1017,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libamdgpu_top"
|
||||
version = "0.1.9"
|
||||
version = "0.1.10"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"libdrm_amdgpu_sys",
|
||||
@ -910,9 +1031,9 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
|
||||
|
||||
[[package]]
|
||||
name = "libdrm_amdgpu_sys"
|
||||
version = "0.1.4"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbba2720dc87ad23aaa9bbfb7f8cc25a826edfbe0fcfbb99fec1774ad1fb81a0"
|
||||
checksum = "8e6441089848c428085639f12ef420bcae8ac6650f4cf1d7f9215611a34176bb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
@ -1299,12 +1420,6 @@ version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.26"
|
||||
@ -1387,6 +1502,17 @@ dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ron"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"bitflags",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.13"
|
||||
@ -1432,6 +1558,20 @@ name = "serde"
|
||||
version = "1.0.159"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.159"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
@ -1670,26 +1810,6 @@ dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing"
|
||||
version = "0.1.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"pin-project-lite",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.18.1"
|
||||
@ -1770,9 +1890,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
|
||||
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"wasm-bindgen-macro",
|
||||
@ -1780,16 +1900,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
|
||||
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@ -1807,9 +1927,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
|
||||
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@ -1817,22 +1937,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
|
||||
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.84"
|
||||
version = "0.2.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
|
||||
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
|
||||
|
||||
[[package]]
|
||||
name = "wayland-client"
|
||||
|
@ -14,16 +14,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amdgpu_top";
|
||||
version = "0.1.9";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Umio-Yasuno";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RR+YK8LyrPz7Pfv8moSOPei+56088lhoz8HxoB6+0B8=";
|
||||
hash = "sha256-jeKwvecB67U+TACr4uXGjRWvRG3GUleiqyu5MYlFwq0=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libdrm
|
||||
@ -51,5 +53,6 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ geri1701 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
26
pkgs/tools/text/tesh/default.nix
Normal file
26
pkgs/tools/text/tesh/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ python3Packages, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "0.3.0";
|
||||
in python3Packages.buildPythonPackage rec {
|
||||
pname = "tesh";
|
||||
inherit version;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OceanSprint";
|
||||
repo = "tesh";
|
||||
rev = version;
|
||||
sha256 = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "poetry.masonry" "poetry.core.masonry"
|
||||
'';
|
||||
|
||||
checkInputs = [ python3Packages.pytest ];
|
||||
nativeBuildInputs = [ python3Packages.poetry-core ];
|
||||
propagatedBuildInputs = with python3Packages; [ click pexpect ];
|
||||
}
|
@ -13465,7 +13465,7 @@ with pkgs;
|
||||
|
||||
texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
|
||||
|
||||
texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
|
||||
texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };
|
||||
|
||||
textadept = callPackage ../applications/editors/textadept { };
|
||||
|
||||
@ -19984,6 +19984,8 @@ with pkgs;
|
||||
|
||||
terrascan = callPackage ../tools/security/terrascan { };
|
||||
|
||||
tesh = callPackage ../tools/text/tesh {};
|
||||
|
||||
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
|
||||
texinfo4 = texinfo413;
|
||||
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
|
||||
@ -23907,9 +23909,10 @@ with pkgs;
|
||||
|
||||
ode = callPackage ../development/libraries/ode { };
|
||||
|
||||
ogre = callPackage ../development/libraries/ogre {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
inherit (callPackages ../development/libraries/ogre { })
|
||||
ogre_13 ogre_14;
|
||||
|
||||
ogre = ogre_14;
|
||||
|
||||
olm = callPackage ../development/libraries/olm { };
|
||||
|
||||
@ -37412,6 +37415,8 @@ with pkgs;
|
||||
|
||||
hikounomizu = callPackage ../games/hikounomizu { };
|
||||
|
||||
hmcl = callPackage ../games/hmcl { };
|
||||
|
||||
hyperrogue = callPackage ../games/hyperrogue { };
|
||||
|
||||
ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
|
||||
|
@ -1433,7 +1433,10 @@ let
|
||||
|
||||
psq = callPackage ../development/ocaml-modules/psq { };
|
||||
|
||||
ptime = callPackage ../development/ocaml-modules/ptime { };
|
||||
ptime =
|
||||
if lib.versionAtLeast ocaml.version "4.08"
|
||||
then callPackage ../development/ocaml-modules/ptime { }
|
||||
else null;
|
||||
|
||||
ptmap = callPackage ../development/ocaml-modules/ptmap { };
|
||||
|
||||
|
@ -12868,6 +12868,8 @@ self: super: with self; {
|
||||
|
||||
ttp-templates = callPackage ../development/python-modules/ttp-templates { };
|
||||
|
||||
ttstokenizer = callPackage ../development/python-modules/ttstokenizer { };
|
||||
|
||||
tubes = callPackage ../development/python-modules/tubes { };
|
||||
|
||||
tunigo = callPackage ../development/python-modules/tunigo { };
|
||||
|
Loading…
Reference in New Issue
Block a user