Merge master into staging-next
This commit is contained in:
commit
fd2af5a1f2
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2
|
||||
, glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver
|
||||
, discord-gamesdk, libpcap
|
||||
, discord-gamesdk, libpcap, libslirp
|
||||
|
||||
, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch
|
||||
, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "86Box";
|
||||
version = "3.11";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "86Box";
|
||||
repo = "86Box";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n3Q/NUiaC6/EZyBUn6jUomnQCqr8tvYKPI5JrRRFScI=";
|
||||
hash = "sha256-VTfYCVEbArcYVzh3NkX1yBXhtRnGZ/+khk0KG42fs24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
fluidsynth
|
||||
SDL2
|
||||
glib
|
||||
openal
|
||||
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
pcre2
|
||||
jack2
|
||||
libpcap
|
||||
libslirp
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
] ++ lib.optional stdenv.isLinux alsa-lib
|
||||
@ -60,7 +62,6 @@ stdenv.mkDerivation rec {
|
||||
postFixup = let
|
||||
libPath = lib.makeLibraryPath ([
|
||||
libpcap
|
||||
fluidsynth
|
||||
] ++ lib.optional unfreeEnableDiscord discord-gamesdk);
|
||||
libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
in
|
||||
|
@ -24,13 +24,13 @@ assert withEmojis -> (withIcons == false && withNerdIcons == false);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nnn";
|
||||
version = "4.8";
|
||||
version = "4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "nnn";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QbKW2wjhUNej3zoX18LdeUHqjNLYhEKyvPH2MXzp/iQ=";
|
||||
hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -38,11 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# By default, nnn expects the macOS default file command, not the one provided by Nix.
|
||||
# However, both commands use different arguments to obtain the MIME type.
|
||||
./darwin-fix-file-mime-opts.patch
|
||||
# FIXME: remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch";
|
||||
hash = "sha256-RxG3AU8i3lRPCjRVZPnej4m1No/SKtsHwbghj9JQ7RQ=";
|
||||
})
|
||||
];
|
||||
|
||||
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
|
||||
|
@ -5,15 +5,15 @@
|
||||
, x11Support ? true, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bemenu";
|
||||
version = "0.6.15";
|
||||
version = "0.6.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gdeNaqtxqxBtG9bkxozPE/DLQgLqCt1vh2A2WmgNn7w=";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-K9a9BUodpKwvEOhnF2/TGo5zLm7F9RzqSCcWzuhKcWA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Dynamic menu library and client program inspired by dmenu";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lheckemann ];
|
||||
mainProgram = "bemenu";
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,18 +1,18 @@
|
||||
{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }:
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "nimdow";
|
||||
version = "0.7.36";
|
||||
|
||||
version = "0.7.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avahe-kellenberger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+36wxKgboOd3HvGnD555WySzJWGL39DaFXmIaFYtSN8=";
|
||||
hash = "sha256-930wDS0UW65QzpUHHOuM25oi/OhFmG0Q7N05ftu7XlI=";
|
||||
};
|
||||
|
||||
|
||||
buildInputs = with nimPackages; [ parsetoml x11 safeset libX11 libXft libXinerama ];
|
||||
buildInputs = with nimPackages; [ parsetoml x11 safeseq safeset libX11 libXft libXinerama ];
|
||||
|
||||
postInstall = ''
|
||||
install -D config.default.toml $out/share/nimdow/config.default.toml
|
||||
|
1388
pkgs/development/libraries/gstreamer/rs/Cargo.lock
generated
1388
pkgs/development/libraries/gstreamer/rs/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -103,7 +103,7 @@ let
|
||||
"threadshare" # tests cannot bind to localhost on darwin
|
||||
"webp" # not supported on darwin (upstream crate issue)
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
# these require gstreamer-gl which requires darwin sdk bump
|
||||
# these require gstreamer-gl
|
||||
"gtk4"
|
||||
"livesync"
|
||||
"fallbackswitch"
|
||||
@ -130,7 +130,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-rs";
|
||||
version = "0.10.11";
|
||||
version = "0.11.0+fixup";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "gstreamer";
|
||||
repo = "gst-plugins-rs";
|
||||
rev = version;
|
||||
hash = "sha256-oOoUGzbg/ib1pA0T81hxgLlHnTRlNCWH5qZUNAutn8U=";
|
||||
hash = "sha256-nvDvcY/WyVhcxitcoqgEUT8A1synZqxG2e51ct7Fgss=";
|
||||
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
|
||||
postFetch = ''
|
||||
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
|
||||
@ -164,12 +164,12 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"cairo-rs-0.17.10" = "sha256-g7d1ccSbGIPVMu73mb5QvWVSN8XAB1xLZuWfgdd1cfU=";
|
||||
"cairo-rs-0.18.1" = "sha256-k+YIAZXxejbxPQqbUU91qbx2AR98gTrseknLHtNZDEE=";
|
||||
"color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
|
||||
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
|
||||
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
|
||||
"gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM=";
|
||||
"gstreamer-0.20.7" = "sha256-o4o4mPFAZOshNNkCkykjG/b+UtT2z6TNLOEzJsfs+Mk=";
|
||||
"gdk4-0.7.1" = "sha256-UMGmZivVdvmKRAjIGlj6pjDxwfNJyz8/6C0eYH1OOw4=";
|
||||
"gstreamer-0.21.0" = "sha256-2uilK8wYG8e59fdL3q+kmixc1zw+EBwqvGs/EgfCGhk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
21
pkgs/development/nim-packages/safeseq/default.nix
Normal file
21
pkgs/development/nim-packages/safeseq/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
buildNimPackage rec {
|
||||
pname = "safeseq";
|
||||
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avahe-kellenberger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JSz2TPrbl5N8l+YDquad78aJMBsx+Lise27cMQKMdAc=";
|
||||
};
|
||||
|
||||
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
description = "safeseq library for nim";
|
||||
license = [ licenses.gpl2 ];
|
||||
maintainers = [ maintainers.marcusramberg ];
|
||||
};
|
||||
}
|
60
pkgs/development/php-packages/castor/default.nix
Normal file
60
pkgs/development/php-packages/castor/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, installShellFiles
|
||||
, php
|
||||
, nix-update-script
|
||||
, testers
|
||||
, castor
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "castor";
|
||||
version = "0.8.0";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jolicode/castor/releases/download/v${finalAttrs.version}/castor.linux-amd64.phar";
|
||||
hash = "sha256-0lnn4mS1/DgUoRoMFvCjwQ0j9CX9XWlskbtX9roFCfc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/castor/castor.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/castor \
|
||||
--add-flags "$out/libexec/castor/castor.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# castor requires to be initialized to generate completion files
|
||||
postInstall = ''
|
||||
echo "yes" | ${php}/bin/php $src
|
||||
installShellCompletion --cmd castor \
|
||||
--bash <($out/bin/castor completion bash) \
|
||||
--fish <($out/bin/castor completion fish) \
|
||||
--zsh <($out/bin/castor completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
inherit (finalAttrs) version;
|
||||
package = castor;
|
||||
command = "castor --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "DX oriented task runner and command launcher built with PHP";
|
||||
homepage = "https://github.com/jolicode/castor";
|
||||
changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
};
|
||||
})
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-config";
|
||||
version = "2.2.11";
|
||||
version = "2.2.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nkCNzOg6JYQkIlmcFm3VIjHvoHDK7hfw4PhrUwnNp28=";
|
||||
hash = "sha256-blrT/yCQ2vxaociSqKvRX3fUyKLsAFT3UyFGB/AzZHI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.9";
|
||||
version = "0.36.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-68t6l7/30euGo0dX5HTnGMl65j6UVF2f9fYZH6EhlzI=";
|
||||
hash = "sha256-HaZXhbYL/mrkjxV7AA6OOuBzHGy1wLutxLtLgL7XGwE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certipy-ad";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "ly4k";
|
||||
repo = "Certipy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o=";
|
||||
hash = "sha256-CyTwaCYhxUqvycZBKSzTWLKmKvebCNyE4vqTUnaX1V0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.35.2";
|
||||
version = "0.36.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Sskz14aAPqUXhQjetPfhjVm8gjG4yrck3sHpgD37DPU=";
|
||||
hash = "sha256-tpr26vVsNhCRKUk0Wj07BAEy0iS2pWHoOFQxtrqN9ic=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "23.4.0";
|
||||
version = "23.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko=";
|
||||
hash = "sha256-W49jmFwLrCu8NhQ65ll3iu+QbnHBA5sCeUgSLYLrui0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-filter";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiogram";
|
||||
repo = "magic-filter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mfSq47UWOLyEDkAsdHsJuVl/rJ4KgiGPpDL7qSKEfws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peft";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-riOCe43/2xUpE6TTCEpMndeFTbaBN4JFDlv90tqVO4Y=";
|
||||
hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -7,11 +7,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "python-pptx";
|
||||
version = "0.6.21";
|
||||
version = "0.6.22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-d5iiqviVY1ZbPHEgwKz+mv93XbDbNYBUTjv0hAwuN48=";
|
||||
hash = "sha256-OPjukt3jHSS0ViVg5hsDV+XZfs91xDUq5mFtWjKXhlQ=";
|
||||
};
|
||||
|
||||
# postPatch = ''
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "2.1.9";
|
||||
version = "2.1.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-88aCnPzC4RfmEsL05pgFoOCfz42R1eqaJGTmXoWu0gA=";
|
||||
hash = "sha256-ddtTtTAUpvS8DN1vKVN+CjnmYp20xyxHydwOaDRjWzo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,31 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
||||
# build time
|
||||
, setuptools-scm
|
||||
|
||||
# runtime
|
||||
, pytz
|
||||
, jaraco-functools
|
||||
|
||||
# tests
|
||||
, freezegun
|
||||
, jaraco-functools
|
||||
, pytest-freezegun
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tempora";
|
||||
version = "5.2.1";
|
||||
version = "5.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-txdkhsWUinUgHo0LIe8sI8qAhHQGDfRyGMkilb3OUnY=";
|
||||
hash = "sha256-E+T8yZfQUJwzBtaEHwPpOBt+Xkayvr+ukVGvkAhfDCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -53,6 +47,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Objects and routines pertaining to date and time";
|
||||
homepage = "https://github.com/jaraco/tempora";
|
||||
changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "allure";
|
||||
version = "2.23.1";
|
||||
version = "2.24.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
|
||||
sha256 = "sha256-B06QKq6X9epmRt1wbGORzh8fLUXRAHo1Tv2hWUXJ9Ds=";
|
||||
sha256 = "sha256-rLVvLqLC2hSxXWDxrw/PFq4o9DeDGU9aBxZuRHkxWfo=";
|
||||
};
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.19.2";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f0vH+GIWTlE23xWMiqbdOJFGWsrEGgz4YJt+4WEdruw=";
|
||||
hash = "sha256-ODhkIDt9x6ZfQy9TM6CKAkDI9RdtuVG7XrzaQeH0s2Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gqks+q8HxQ54UjRANXBvnfTzE14M8FxbnTMG/JN4ntk=";
|
||||
vendorHash = "sha256-CUQtfAEyFrkdtoZEWRaUPh1rJV5/0HP1clcmRAAinTI=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bearer"
|
||||
|
@ -1,39 +1,46 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php81 }:
|
||||
{
|
||||
stdenv
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, php
|
||||
, lib
|
||||
, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n98-magerun";
|
||||
version = "2.3.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun1-dist";
|
||||
rev = version;
|
||||
sha256 = "sha256-T7wQmEEYMG0J6+9nRt+tiMuihjnjjQ7UWy1C0vKoQY4=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/netz98/n98-magerun/releases/download/${finalAttrs.version}/n98-magerun-${finalAttrs.version}.phar";
|
||||
hash = "sha256-s+Cdr8zU3VBaBzxOh4nXjqPe+JPPxHWiFOEVS/86qOQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar
|
||||
makeWrapper ${php81}/bin/php $out/bin/n98-magerun \
|
||||
--add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \
|
||||
|
||||
mkdir -p $out/bin $out/libexec/n98-magerun
|
||||
|
||||
install -D $src $out/libexec/n98-magerun/n98-magerun.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/n98-magerun \
|
||||
--add-flags "$out/libexec/n98-magerun/n98-magerun.phar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The swiss army knife for Magento1/OpenMage developers";
|
||||
license = licenses.mit;
|
||||
homepage = "https://magerun.net/";
|
||||
changelog = "https://magerun.net/category/magerun/";
|
||||
maintainers = teams.php.members;
|
||||
meta = {
|
||||
broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275
|
||||
changelog = "https://magerun.net/category/magerun/";
|
||||
description = "The swiss army knife for Magento1/OpenMage developers";
|
||||
homepage = "https://magerun.net/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,38 +1,45 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php }:
|
||||
{
|
||||
stdenv
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, php
|
||||
, lib
|
||||
, unzip
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n98-magerun2";
|
||||
version = "6.1.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun2-dist";
|
||||
rev = version;
|
||||
sha256 = "sha256-D2U1kLG6sOpBHDzNQ/LbiFUknvFhK+rkOPgWvW0pNmY=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/netz98/n98-magerun2/releases/download/${finalAttrs.version}/n98-magerun2.phar";
|
||||
hash = "sha256-DE5q1zoWZ4gJSs5JM5cr157oh5ufD1gaNt9X9vtuW/c=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src/n98-magerun2 $out/libexec/n98-magerun2/n98-magerun2-${version}.phar
|
||||
|
||||
mkdir -p $out/bin $out/libexec/n98-magerun2
|
||||
|
||||
install -D $src $out/libexec/n98-magerun2/n98-magerun2.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \
|
||||
--add-flags "$out/libexec/n98-magerun2/n98-magerun2-${version}.phar" \
|
||||
--add-flags "$out/libexec/n98-magerun2/n98-magerun2.phar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The swiss army knife for Magento2 developers";
|
||||
license = licenses.mit;
|
||||
homepage = "https://magerun.net/";
|
||||
meta = {
|
||||
changelog = "https://magerun.net/category/magerun/";
|
||||
maintainers = teams.php.members;
|
||||
description = "The swiss army knife for Magento2 developers";
|
||||
homepage = "https://magerun.net/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -2,28 +2,32 @@
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, libgit2_1_5
|
||||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.17.6";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ICNcBqlkX1k3J5vc/bfoXw/+l2LdHOchv4PfY0G7Y94=";
|
||||
hash = "sha256-XK2SsyT4CyDjCF56v/g7tX5SZKC3krBQNs/ddeFu35A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ViqaiSLVfDJhMuHjHGi+NVRLPcRhe2a+oKXl4UNM+K8=";
|
||||
cargoHash = "sha256-1Uifk1W7NCmHAbUl83GpMUBD6WWUl1J/HjtGv4dEuiA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2_1_5
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
@ -36,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Audit Cargo.lock files for crates with security vulnerabilities";
|
||||
homepage = "https://rustsec.org";
|
||||
changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/${version}/cargo-audit/CHANGELOG.md";
|
||||
changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ basvandijk figsoda jk ];
|
||||
};
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-nuke";
|
||||
version = "2.24.1";
|
||||
version = "2.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebuy-de";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AftmWmZFi9NIXNxbMEO1eIzRl3UwS3rxXZ4htJClEfo=";
|
||||
hash = "sha256-Zy+ULmGDUK4KGMJ5PXTyT8CSp0nC71AW/4Udl2ElOCg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cYQlHl0fmLH5f+QNdJ+V6L9Ts8sa9y8l0oOIqdpJlL0=";
|
||||
vendorHash = "sha256-srQuR9ZoTjZR1XfewFv7wF188Q5FggMdicm71v6MY/8=";
|
||||
|
||||
overrideModAttrs = _: {
|
||||
preBuild = ''
|
||||
|
@ -16,12 +16,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgbackup";
|
||||
version = "1.2.4";
|
||||
version = "1.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pL1U6UaegbejCmcRQjEVq8gY2c2ETsscoOYQS8U3Tag=";
|
||||
hash = "sha256-t6b48IYDnu7HkHC5FPPGUe1/NhLJZTdK+RDSd8eiE50=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "0.20.10";
|
||||
version = "0.20.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v0ZVyiFHiRsn6ARA7sLCfNfoljTFegCXb1/C4sY0vfg=";
|
||||
sha256 = "sha256-idMVQyRpWc4ZT9GZvQvShwIY9I9t9MArfih57trhJvc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tgpt";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aandrew-me";
|
||||
repo = "tgpt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JOCoyGSIdHWa7/4fwSoaTFLqk5EE9Ni4UFCD7BvFeoQ=";
|
||||
hash = "sha256-68+cP/s4YR7y6ok2mctcMTqDoyErIs8Bf6Ce/x1P8pU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";
|
||||
|
@ -96,6 +96,8 @@ lib.makeScope newScope (self:
|
||||
inherit (pkgs) rocksdb;
|
||||
};
|
||||
|
||||
safeseq = callPackage ../development/nim-packages/safeseq { };
|
||||
|
||||
safeset = callPackage ../development/nim-packages/safeset { };
|
||||
|
||||
sass = callPackage ../development/nim-packages/sass { };
|
||||
|
@ -169,6 +169,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
tools = {
|
||||
box = callPackage ../development/php-packages/box { };
|
||||
|
||||
castor = callPackage ../development/php-packages/castor { };
|
||||
|
||||
composer = callPackage ../development/php-packages/composer { };
|
||||
|
||||
deployer = callPackage ../development/php-packages/deployer { };
|
||||
|
Loading…
Reference in New Issue
Block a user