mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
94a7cf0dcd
28 changed files with 211 additions and 68 deletions
|
|
@ -4219,6 +4219,12 @@
|
|||
githubId = 6430643;
|
||||
name = "Henry Till";
|
||||
};
|
||||
heph2 = {
|
||||
email = "srht@mrkeebs.eu";
|
||||
github = "heph2";
|
||||
githubId = 87579883;
|
||||
name = "Marco";
|
||||
};
|
||||
herberteuler = {
|
||||
email = "herberteuler@gmail.com";
|
||||
github = "herberteuler";
|
||||
|
|
|
|||
38
pkgs/applications/blockchains/eclair.nix
Normal file
38
pkgs/applications/blockchains/eclair.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, jq
|
||||
, openjdk11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eclair";
|
||||
version = "0.6.1";
|
||||
revision = "d3ae323";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip";
|
||||
sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jq openjdk11 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -a * $out
|
||||
mv $out/bin/eclair-node.sh $out/bin/eclair-node
|
||||
rm $out/bin/eclair-node.bat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A scala implementation of the Lightning Network";
|
||||
homepage = "https://github.com/ACINQ/eclair";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,68 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, cmake
|
||||
, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git
|
||||
, webkitSupport ? true
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qtscript
|
||||
, libXfixes
|
||||
, libXtst
|
||||
, qtx11extras
|
||||
, git
|
||||
, knotifications
|
||||
, qtwayland
|
||||
, wayland
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "CopyQ";
|
||||
version = "3.13.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah";
|
||||
sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
git qtbase qtscript libXfixes libXtst qtx11extras
|
||||
] ++ lib.optional webkitSupport qtwebkit;
|
||||
qtbase
|
||||
qtscript
|
||||
libXfixes
|
||||
libXtst
|
||||
qtx11extras
|
||||
knotifications
|
||||
qtwayland
|
||||
wayland
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Install the bash completion script correctly
|
||||
# Remove once 4.1.1 is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
|
||||
sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace shared/com.github.hluk.copyq.desktop.in \
|
||||
--replace copyq "$out/bin/copyq"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://hluk.github.io/CopyQ";
|
||||
homepage = "https://hluk.github.io/CopyQ";
|
||||
description = "Clipboard Manager with Advanced Features";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.willtim ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ willtim artturin ];
|
||||
# NOTE: CopyQ supports windows and osx, but I cannot test these.
|
||||
# OSX build requires QT5.
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ mkChromiumDerivation (base: rec {
|
|||
license = if enableWideVine then licenses.unfree else licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "chromium";
|
||||
hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
|
||||
hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium" || channel == "beta")
|
||||
then ["aarch64-linux" "x86_64-linux"]
|
||||
else [];
|
||||
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
|
||||
|
|
|
|||
38
pkgs/applications/networking/browsers/telescope/default.nix
Normal file
38
pkgs/applications/networking/browsers/telescope/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, bison
|
||||
, libevent
|
||||
, libressl
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telescope";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz";
|
||||
sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
bison
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libevent
|
||||
libressl
|
||||
ncurses
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Telescope is a w3m-like browser for Gemini";
|
||||
homepage = "https://telescope.omarpolo.com/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ heph2 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "2.6.17";
|
||||
version = "2.6.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-MHwLTSyMF7vYiVTof3xePW2eOySCr4/xYlPvWSzBZUg=";
|
||||
sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ gtest ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-ffmpegdirect";
|
||||
namespace = "inputstream.ffmpegdirect";
|
||||
version = "1.21.3";
|
||||
version = "1.21.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.ffmpegdirect";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs=";
|
||||
sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "netflix";
|
||||
namespace = "plugin.video.netflix";
|
||||
version = "1.16.0";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CastagnaIT";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k";
|
||||
sha256 = "0yycwm8vrpkr4fsbf713mhpnaxfd849nhzp5r1898sb9vldab4xk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "8.3.0";
|
||||
version = "8.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y";
|
||||
sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "7.6.5";
|
||||
version = "7.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA=";
|
||||
sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
sourceforge = [
|
||||
"https://downloads.sourceforge.net/"
|
||||
"https://prdownloads.sourceforge.net/"
|
||||
"https://heanet.dl.sourceforge.net/sourceforge/"
|
||||
"https://surfnet.dl.sourceforge.net/sourceforge/"
|
||||
"https://dfn.dl.sourceforge.net/sourceforge/"
|
||||
"https://netcologne.dl.sourceforge.net/sourceforge/"
|
||||
"https://versaweb.dl.sourceforge.net/sourceforge/"
|
||||
"https://freefr.dl.sourceforge.net/sourceforge/"
|
||||
"https://osdn.dl.sourceforge.net/sourceforge/"
|
||||
"https://kent.dl.sourceforge.net/sourceforge/"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "6.000";
|
||||
version = "6.001";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "andika-${version}";
|
||||
|
|
@ -14,7 +14,7 @@ in
|
|||
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
|
||||
'';
|
||||
|
||||
sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q=";
|
||||
sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://software.sil.org/andika";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2105.24";
|
||||
version = "2106.17";
|
||||
in
|
||||
fetchzip {
|
||||
name = "cascadia-code-${version}";
|
||||
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
|
||||
|
||||
sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8=";
|
||||
sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "40.1";
|
||||
version = "40.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8=";
|
||||
sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-sound-theme";
|
||||
version = "1.0";
|
||||
version = "1.1.0";
|
||||
|
||||
repoName = "sound-theme";
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-v8ludbPCJaMHCxuzjZchTJwpGiF6UJlVMIMFg+lAhbU=";
|
||||
sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folks";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg";
|
||||
sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
|
||||
sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o=";
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
|
|||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
# this is mostly downloading a pre-built artifact
|
||||
preferLocal = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 "$src" "$out/bin/.mill-wrapped"
|
||||
|
|
@ -25,6 +28,13 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
# The default release is a script which will do an impure download
|
||||
# just ensure that the application can run without network
|
||||
installCheckPhase = ''
|
||||
$out/bin/mill --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.lihaoyi.com/mill";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY=";
|
||||
sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -43,6 +43,14 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
|
|||
exec ${unpacked}/bin/anki
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
cp -R ${unpacked}/share/applications \
|
||||
${unpacked}/share/man \
|
||||
${unpacked}/share/pixmaps \
|
||||
$out/share/
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
}) else stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2021.707.0";
|
||||
version = "2021.720.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k=";
|
||||
sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0=";
|
||||
};
|
||||
|
||||
patches = [ ./bypass-tamper-detection.patch ];
|
||||
|
|
|
|||
20
pkgs/games/osu-lazer/deps.nix
generated
20
pkgs/games/osu-lazer/deps.nix
generated
|
|
@ -26,8 +26,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Fody";
|
||||
version = "6.5.1";
|
||||
sha256 = "08zpyrniajjba5isjb09spggfh0af2z6x4h2zy5ilk3y5bb9vdch";
|
||||
version = "6.5.2";
|
||||
sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "HidSharpCore";
|
||||
|
|
@ -781,13 +781,13 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.LocalisationAnalyser";
|
||||
version = "2021.706.0";
|
||||
sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556";
|
||||
version = "2021.716.0";
|
||||
sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework";
|
||||
version = "2021.707.0";
|
||||
sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna";
|
||||
version = "2021.714.0";
|
||||
sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework.NativeLibs";
|
||||
|
|
@ -816,13 +816,13 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Realm";
|
||||
version = "10.2.1";
|
||||
sha256 = "14pi7vz7nl8ag0bmlbyds52z5nx9wbg154qkm6jai10rm02ws86l";
|
||||
version = "10.3.0";
|
||||
sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Realm.Fody";
|
||||
version = "10.2.1";
|
||||
sha256 = "1zv57wb7zcgyigsxqikf2yq2h7an4c3dbydl9la5xdpa76dgmxdi";
|
||||
version = "10.3.0";
|
||||
sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Remotion.Linq";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squashfs-tools-ng";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
|
||||
sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq";
|
||||
sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "esptool";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espressif";
|
||||
repo = "esptool";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln";
|
||||
sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI=";
|
||||
};
|
||||
|
||||
checkInputs = with python3.pkgs;
|
||||
|
|
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "ESP8266 and ESP32 serial bootloader utility";
|
||||
homepage = "https://github.com/espressif/esptool";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dezgeg dotlambda ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg=";
|
||||
sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM=";
|
||||
cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "corerad";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdlayher";
|
||||
repo = "corerad";
|
||||
rev = "v${version}";
|
||||
sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y";
|
||||
sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k";
|
||||
};
|
||||
|
||||
vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck";
|
||||
vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-17";
|
||||
version = "2021-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg=";
|
||||
sha256 = "sha256-WjCayhpWeZ19DygKNLfwE5OGi4sQI+I+j3BMLuce9Z4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -9246,6 +9246,8 @@ in
|
|||
|
||||
teler = callPackage ../tools/security/teler { };
|
||||
|
||||
telescope = callPackage ../applications/networking/browsers/telescope { };
|
||||
|
||||
termius = callPackage ../applications/networking/termius { };
|
||||
|
||||
termplay = callPackage ../tools/misc/termplay { };
|
||||
|
|
@ -23447,7 +23449,7 @@ in
|
|||
|
||||
confclerk = callPackage ../applications/misc/confclerk { };
|
||||
|
||||
copyq = libsForQt514.callPackage ../applications/misc/copyq { };
|
||||
copyq = libsForQt5.callPackage ../applications/misc/copyq { };
|
||||
|
||||
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
|
||||
|
||||
|
|
@ -28531,6 +28533,8 @@ in
|
|||
dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
|
||||
dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
|
||||
|
||||
eclair = callPackage ../applications/blockchains/eclair.nix { };
|
||||
|
||||
electrs = callPackage ../applications/blockchains/electrs.nix { };
|
||||
|
||||
elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; };
|
||||
|
|
|
|||
|
|
@ -296,6 +296,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
|||
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
|
||||
};
|
||||
|
||||
# configurePhase breaks the binary and results in
|
||||
# `File does not contain a valid CIL image.`
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
outputFiles = [ "*" ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue