forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
4650511a9c
|
|
@ -22,6 +22,11 @@
|
|||
, enableWayland ? stdenv.isLinux
|
||||
, wayland
|
||||
, xorg
|
||||
, xcbuild
|
||||
, Security
|
||||
, ApplicationServices
|
||||
, AppKit
|
||||
, Carbon
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neovide";
|
||||
|
|
@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec {
|
|||
python2 # skia-bindings
|
||||
python3 # rust-xcb
|
||||
llvmPackages.clang # skia
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
# All tests passes but at the end cargo prints for unknown reason:
|
||||
# error: test failed, to rerun pass '--bin neovide'
|
||||
|
|
@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec {
|
|||
}))
|
||||
];
|
||||
}))
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ];
|
||||
|
||||
postFixup = let
|
||||
libPath = lib.makeLibraryPath ([
|
||||
|
|
@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/Kethku/neovide";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
mainProgram = "neovide";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "105.0.5195.102",
|
||||
"sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
|
||||
"sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
|
||||
"version": "105.0.5195.125",
|
||||
"sha256": "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0",
|
||||
"sha256bin64": "14knj758nzihs4yh6gb6w0l4i985cnrd0y5hdmz3yd49n9a7s5hv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "106.0.5249.30",
|
||||
"sha256": "11sn0syhxzjz4lcw09aifcnrj2nf72siqh8v60zx6cpqj8jpgk48",
|
||||
"sha256bin64": "13yg8kb1k3n2vgh5l71vjyx6jf5zsibn41wvqnk0qds0kq6vnxxm",
|
||||
"version": "106.0.5249.40",
|
||||
"sha256": "14nidf49nqpirsd0qpq91pvsyhc7ngkhcyq3n3yl37mswvaalnm1",
|
||||
"sha256bin64": "17x0mx4kzrrl2calibi9cjsq80kn30c396pv20qf5n6850dc0rx2",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
@ -32,22 +32,22 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "107.0.5286.2",
|
||||
"sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz",
|
||||
"sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk",
|
||||
"version": "107.0.5300.0",
|
||||
"sha256": "1h059sma9g6kzaip3rvnb569d3x11h669330a68sif2krpl91bnv",
|
||||
"sha256bin64": "1kwmhjc15d35lxmdn7f5v8nm8yfs4ckaks9zvxm73wlnvwv0i1qj",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-31",
|
||||
"version": "2022-09-08",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78",
|
||||
"sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g"
|
||||
"rev": "b4851eb2062f76a880c07f7fa0d12913beb6d79e",
|
||||
"sha256": "1cz7155rzsydg02j1yprczm4qjk5g4lqbnh5qdky8p1ghg3miq3i"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "105.0.5195.102",
|
||||
"sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
|
||||
"sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
|
||||
"version": "105.0.5195.127",
|
||||
"sha256": "1q15i5vcb7q20awib7csh2v7mzjnppb4pqgqzgqiixs9wj710j3m",
|
||||
"sha256bin64": null,
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "105.0.5195.102-1",
|
||||
"sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc"
|
||||
"rev": "105.0.5195.127-1",
|
||||
"sha256": "0iinags8lvfiw0l55fc3ldq92qw6p01a62zs8q2av0srzpx0xd0b"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "0.3.12";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wzbyBofWYXkOx+kNAmo9lDQdfkYLndh+Pw09+bxNqbU=";
|
||||
sha256 = "sha256-pYqaBLrGEZUhIqaoYhkXrf2OoaAfswQntSa8FnYMBLA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0KMs4YeWMj4Wz+iIVQ5XEwswVRs0q5Vibcy5fFNbH04=";
|
||||
cargoSha256 = "sha256-ud6bhyWePINiddSuWcpUkMjp3q6/Xd9TK3CaoFZFB20=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy-healpix";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = lib.replaceStrings ["-"] ["_"] pname;
|
||||
sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690";
|
||||
sha256 = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace bitcoin/core/key.py --replace \
|
||||
"ctypes.util.find_library('ssl') or 'libeay32'" \
|
||||
"ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \
|
||||
"'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "2.1.7";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hudPySVFewKrXI5FAYBCPTkjI4W7/kmnNwhnjxMhkrw=";
|
||||
hash = "sha256-3K8dIKeb9bqopu8B8f1fHLIzXHTfmn4ZtDztRBSm10k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,27 +5,25 @@
|
|||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.10.4";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U3B/Tb7q61R5jmBni1QKqqul2JJgjtmh3st04apu0xE=";
|
||||
hash = "sha256-TqRz1Og5wsKsiIESmplnTsGLRboEQ20cViWgXfwEHGQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-e8ICBRI6kNfItu3CxxbIY+56/2ho0Rnn1B3w/WJX+KM=";
|
||||
cargoSha256 = "sha256-4DVek/R7VABzSJ8vEb6f3Tgf1vVLIKAWj80Il5gWu2g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.12.0";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk=";
|
||||
sha256 = "sha256-qwOlYy9pNAKEJDgt3ML4dxDwlkyPIVO+X/q/YijEHo0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY=";
|
||||
cargoSha256 = "sha256-8x2B8WBN9u17HS58bAwMNPEoSabNX6KzyPBLEvaGOBk=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
97
pkgs/games/vcmi/default.nix
Normal file
97
pkgs/games/vcmi/default.nix
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
, SDL2_ttf
|
||||
, boost
|
||||
, cmake
|
||||
, ffmpeg
|
||||
, innoextract
|
||||
, luajit
|
||||
, minizip
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, tbb
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
, testers
|
||||
, vcmi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vcmi";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vcmi";
|
||||
repo = "vcmi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Version.cpp.in \
|
||||
--subst-var-by GIT_SHA1 "0000000";
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_mixer
|
||||
SDL2_ttf
|
||||
boost
|
||||
ffmpeg
|
||||
luajit
|
||||
minizip
|
||||
qtbase
|
||||
tbb
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_TEST:BOOL=NO"
|
||||
"-DENABLE_PCH:BOOL=NO"
|
||||
# Make libvcmi.so discoverable in a non-standard location.
|
||||
"-DCMAKE_INSTALL_RPATH:STRING=${placeholder "out"}/lib/vcmi"
|
||||
# Upstream assumes relative value while Nixpkgs passes absolute.
|
||||
# Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
|
||||
# Meanwhile work it around by passing a relative value.
|
||||
"-DCMAKE_INSTALL_LIBDIR:STRING=lib"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/vcmibuilder \
|
||||
--prefix PATH : "${lib.makeBinPath [ innoextract ]}"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = vcmi;
|
||||
command = ''
|
||||
XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \
|
||||
vcmiclient --version
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source engine for Heroes of Might and Magic III";
|
||||
homepage = "https://vcmi.eu";
|
||||
changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog";
|
||||
license = with licenses; [ gpl2Only cc-by-sa-40 ];
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "vcmiclient";
|
||||
};
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ let
|
|||
in
|
||||
{
|
||||
discourse-assign = callPackage ./discourse-assign {};
|
||||
discourse-bbcode-color = callPackage ./discourse-bbcode-color {};
|
||||
discourse-calendar = callPackage ./discourse-calendar {};
|
||||
discourse-canned-replies = callPackage ./discourse-canned-replies {};
|
||||
discourse-chat-integration = callPackage ./discourse-chat-integration {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-bbcode-color";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-bbcode-color";
|
||||
rev = "e58c38930122772aef15738676683f7d7ff68411";
|
||||
sha256 = "sha256-/uHJ9HMXx7YMYsAc3t/s//ucI8I9Wh3wtC/dQCbtbGU=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-bbcode-color";
|
||||
maintainers = with maintainers; [ ryantm ];
|
||||
license = licenses.mit;
|
||||
description = "Support BBCode color tags.";
|
||||
};
|
||||
}
|
||||
|
|
@ -283,6 +283,7 @@ def update_plugins():
|
|||
"""Update plugins to their latest revision."""
|
||||
plugins = [
|
||||
{'name': 'discourse-assign'},
|
||||
{'name': 'discourse-bbcode-color'},
|
||||
{'name': 'discourse-calendar'},
|
||||
{'name': 'discourse-canned-replies'},
|
||||
{'name': 'discourse-chat-integration'},
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [ "PREFIX=$(out)" "DEP_CXX:=$(CXX)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to convert Android sparse images to raw images";
|
||||
homepage = "https://github.com/anestisb/android-simg2img";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dezgeg arkivm ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
pkgs/tools/misc/ripdrag/default.nix
Normal file
24
pkgs/tools/misc/ripdrag/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, rustPlatform, fetchCrate, pkg-config, gtk4 }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripdrag";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Pa/QYxdPt95deEjSXEVhm2jR3r8rTaKQj2DltT7EVAw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jI7nF8Q8sA4AxkXvQ43r5GqcbTWffuf453DLGUs7I98=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ gtk4 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An application that lets you drag and drop files from and to the terminal";
|
||||
homepage = "https://github.com/nik012003/ripdrag";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "comma";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "comma";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-emhvBaicLAnu/Kn4oxHngGa5BSxOEwbkhTLO5XvauMw=";
|
||||
sha256 = "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mQxNo4VjW2Q0MYfU+RCb4Ayl9ClpxrSV8X4EKZ7PewA=";
|
||||
cargoSha256 = "sha256-9PVbiWmaTDx4iob5g9tXC+FV5Jmy6Id9tQxm05fJLkM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10312,6 +10312,8 @@ with pkgs;
|
|||
|
||||
rig = callPackage ../tools/misc/rig { };
|
||||
|
||||
ripdrag = callPackage ../tools/misc/ripdrag { };
|
||||
|
||||
riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn {
|
||||
provider = "riseup";
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
|
|
@ -12018,6 +12020,8 @@ with pkgs;
|
|||
|
||||
vcftools = callPackage ../applications/science/biology/vcftools { };
|
||||
|
||||
vcmi = libsForQt5.callPackage ../games/vcmi { };
|
||||
|
||||
vcsh = callPackage ../applications/version-management/vcsh { };
|
||||
|
||||
vcs_query = callPackage ../tools/misc/vcs_query { };
|
||||
|
|
@ -31815,7 +31819,9 @@ with pkgs;
|
|||
|
||||
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
||||
|
||||
neovide = callPackage ../applications/editors/neovim/neovide { };
|
||||
neovide = callPackage ../applications/editors/neovim/neovide {
|
||||
inherit (darwin.apple_sdk.frameworks) Security ApplicationServices Carbon AppKit;
|
||||
};
|
||||
|
||||
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1345,7 +1345,9 @@ in {
|
|||
|
||||
bitbox02 = callPackage ../development/python-modules/bitbox02 { };
|
||||
|
||||
bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
|
||||
bitcoinlib = callPackage ../development/python-modules/bitcoinlib {
|
||||
openssl = pkgs.openssl_1_1;
|
||||
};
|
||||
|
||||
bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue