Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/tools/rust/cargo-expand/default.nix pkgs/tools/misc/blflash/default.nix
This commit is contained in:
commit
7507aed4e1
@ -8,7 +8,7 @@
|
||||
, curl
|
||||
, dbus
|
||||
, doxygen
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, fftwSinglePrec
|
||||
, flac
|
||||
@ -56,13 +56,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ardour";
|
||||
version = "6.5";
|
||||
version = "6.7";
|
||||
|
||||
# don't fetch releases from the GitHub mirror, they are broken
|
||||
src = fetchgit {
|
||||
url = "git://git.ardour.org/ardour/ardour.git";
|
||||
rev = version;
|
||||
sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx";
|
||||
sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
||||
cppunit
|
||||
curl
|
||||
dbus
|
||||
ffmpeg_3
|
||||
ffmpeg
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
flac
|
||||
@ -148,8 +148,8 @@ stdenv.mkDerivation rec {
|
||||
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
|
||||
patchShebangs ./tools/
|
||||
substituteInPlace libs/ardour/video_tools_paths.cc \
|
||||
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \
|
||||
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");'
|
||||
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
|
||||
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "linuxsampler";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1gijf50x5xbpya5dj3v2mzj7azx4qk9p012csgddp73f0qi0n190";
|
||||
sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -90,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.24.85";
|
||||
version = "1.24.86";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "jE9INGYz78Vyvps4ESimtH1rL4GdboAUtMx1p31XQGk=";
|
||||
sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "cni";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw";
|
||||
sha256 = "sha256-vxwNHIc3rFi7HKIEZrBcr7Oxs2iUtFYcfJK7aXDUv3k=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/containernetworking/cni";
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YK/QGx6QzSeyeZ61KgdYO3POJQFK1F6yJayd2gcRWS4=";
|
||||
sha256 = "sha256-Vj7qk1x4d94GgthmHhWbQvsfnZE1UL3Bdk5zjAb3vWs=";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
vendorSha256 = "sha256-tnjgs8Ziqdo1ciVOWtL0D8puv2SZGqSHgo2SV7N8F0M=";
|
||||
vendorSha256 = "sha256-JsBseRIbStsX44rLsGAERFUSWUuLcNycRDAcOMconnE=";
|
||||
|
||||
# Rename the binary instead of symlinking to avoid conflict with the
|
||||
# Azure version of kubelogin
|
||||
|
@ -3,13 +3,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.37.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.38.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mjlz2cax5v37g7xnrbf5px88bm7xzl4a5pds112yk096d7wmxm5";
|
||||
sha256 = "0an903nh8lz3xlf79zsh2v55nrwnjzzavkjlrsl7j9aysgwmgn4r";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.37.1";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d775fb07cc6561174d6c86d11727a156c4ade969f7bf5edf623ffe2a428bee4e";
|
||||
sha256 = "c609678cf6faf4b467259757f848de4fbc7baca3c1e3f7b0e55c701c50fd94ae";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazelisk";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24=";
|
||||
sha256 = "sha256-APHRNCJNQ4cheY+wBB8q4fcOOL6SFeg5SflvnrxjYhI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo=";
|
||||
vendorSha256 = "sha256-+B+5GQTEiCwLCoGB5uIIJEWJRjylgt9txcsJCXcOAQs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hobbes";
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation {
|
||||
ncurses
|
||||
readline
|
||||
zlib
|
||||
libxml2
|
||||
];
|
||||
|
||||
doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";
|
||||
sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-C9lpA2n7EI7Ga3Nnj80dkvbZmqjuxf0wjoQUEr0N8FE=";
|
||||
cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ckan";
|
||||
version = "1.30.0";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
|
||||
sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ=";
|
||||
sha256 = "sha256-ggmUsJb3xKpI3ygTmzR5f3na/oU4OEa3r3edjlN5R+Q=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -327,6 +327,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
|
||||
};
|
||||
|
||||
bracey-vim = buildVimPluginFrom2Nix {
|
||||
pname = "bracey-vim";
|
||||
version = "2021-05-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbio";
|
||||
repo = "bracey.vim";
|
||||
rev = "457933c107db65ff7e2695e07209a9a2934544b7";
|
||||
sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh";
|
||||
};
|
||||
meta.homepage = "https://github.com/turbio/bracey.vim/";
|
||||
};
|
||||
|
||||
brainfuck-vim = buildVimPluginFrom2Nix {
|
||||
pname = "brainfuck-vim";
|
||||
version = "2021-01-28";
|
||||
@ -405,8 +417,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "a54a87e651ca985b0d10e293f824f3493778b64e";
|
||||
sha256 = "1cn1knxldl0qqv8p125fqa1fpn3n7cfq7lw9nfj8giaxpr8bag7f";
|
||||
rev = "6769987c13e313497e0fe98a59ccee0e70388927";
|
||||
sha256 = "1xaddhij0f652rx2k5iar8892ly84nslw8j74l7srfxs7l91kpyi";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@ -1895,12 +1907,12 @@ final: prev:
|
||||
|
||||
hologram-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hologram-nvim";
|
||||
version = "2021-05-20";
|
||||
version = "2021-05-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "edluffy";
|
||||
repo = "hologram.nvim";
|
||||
rev = "7466e360040f14a828fe07cfa7fb6089d50f618e";
|
||||
sha256 = "1gjns7dkyzl8yj0vq3103r0f6wjk1fjryz7xa8gi67rchbrxrls4";
|
||||
rev = "593a458d04f7457669280373d98e41195c106d13";
|
||||
sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c";
|
||||
};
|
||||
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
|
||||
};
|
||||
@ -2628,12 +2640,12 @@ final: prev:
|
||||
|
||||
mkdx = buildVimPluginFrom2Nix {
|
||||
pname = "mkdx";
|
||||
version = "2021-05-01";
|
||||
version = "2021-05-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SidOfc";
|
||||
repo = "mkdx";
|
||||
rev = "84c9a59087e74d6bd7761cd4a920d9390c2a65f9";
|
||||
sha256 = "0qf4q5yh5f9kzxc96aq925ppj304hjnb4xxzjijc38jpvsmchjba";
|
||||
rev = "b45099a18e88cd61c93a073e2b15cc6025e4774e";
|
||||
sha256 = "0yawlfnghbkr3bcqqcf3znsdjjbh13a46dhkn4sj108adc9c4y56";
|
||||
};
|
||||
meta.homepage = "https://github.com/SidOfc/mkdx/";
|
||||
};
|
||||
@ -3148,8 +3160,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "cf62f64c8ec1e92fb8e46c23e3b89d8621551e4b";
|
||||
sha256 = "0c49170891ar7439fyp1phki46pyw8iinszpyaj0gf0pwmqhsdhg";
|
||||
rev = "065bf84b0b86266b267adfc2584e67eabef49815";
|
||||
sha256 = "1v2jckl4gaai77rqnv1hwv4bb0d6vyk7hy63nlyy3fcnc1z1ic8v";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
@ -3396,12 +3408,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-05-19";
|
||||
version = "2021-05-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "d23816b7b00028375e53dba2aa30f2b56573cf54";
|
||||
sha256 = "0m5fgjjks15vzqscgvl9m2di8clxizc8ky3lwlw9j8m4zy8jh8kw";
|
||||
rev = "2f26391ccf88cd4adff8f11e96412a3536624bd7";
|
||||
sha256 = "0y8r879lcpwjnk9rcrafkdh59gcxzpvid0rm80db22vpp6a9l9rq";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -7559,8 +7571,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "ojroques";
|
||||
repo = "vim-oscyank";
|
||||
rev = "fc88da94f3cd85e0e44778484b678c4d144275fe";
|
||||
sha256 = "0flc8lxmhv99bisxxip5f6p4196i5215f5fa86mmqs6anff5pfyr";
|
||||
rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0";
|
||||
sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl";
|
||||
};
|
||||
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
|
||||
};
|
||||
|
@ -684,6 +684,7 @@ travitch/hasksyn
|
||||
tremor-rs/tremor-vim@main
|
||||
triglav/vim-visual-increment
|
||||
troydm/zoomwintab.vim
|
||||
turbio/bracey.vim
|
||||
tversteeg/registers.nvim@main
|
||||
tweekmonster/wstrip.vim
|
||||
twerth/ir_black
|
||||
|
@ -21,7 +21,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \
|
||||
--replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \
|
||||
--replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \
|
||||
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main"
|
||||
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
|
||||
--replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "blflash";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spacemeowx2";
|
||||
repo = "blflash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg=";
|
||||
sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hgymSNivcNT9aXws20sBrk76ToDnCQh/dqfUHBzK1Ls=";
|
||||
cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An bl602 serial flasher written in Rust";
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "burpsuite";
|
||||
version = "2021.4.2";
|
||||
version = "2021.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
"https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";
|
||||
sha256 = "sha256-nPz6IZpXCyg6cg2nuyqK2f5BI4dNb5tA2NriH3ZC198=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -1,11 +0,0 @@
|
||||
diff --git a/download_model.sh b/download_model.sh
|
||||
index 9cb401f..ad1dc62 100755
|
||||
--- a/download_model.sh
|
||||
+++ b/download_model.sh
|
||||
@@ -13,5 +13,5 @@ mkdir -p models/$model
|
||||
for filename in checkpoint encoder.json hparams.json model.ckpt.data-00000-of-00001 model.ckpt.index model.ckpt.meta vocab.bpe; do
|
||||
fetch=$model/$filename
|
||||
echo "Fetching $fetch"
|
||||
- curl --output models/$fetch https://storage.googleapis.com/gpt-2/models/$fetch
|
||||
+ curl --output models/$fetch https://openaipublic.blob.core.windows.net/gpt-2/models/$fetch
|
||||
done
|
@ -2,20 +2,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpt2tc";
|
||||
version = "2020-12-30";
|
||||
version = "2021-04-24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bellard.org/nncp/gpt2tc-${version}.tar.gz";
|
||||
hash = "sha256-KFcl7E6iGx50JaJI1jwzKAdkrkbNngPbrEA/ZSyG+uY=";
|
||||
url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz";
|
||||
hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add a shebang to the python script so that nix detects it as such and
|
||||
# wraps it properly. Otherwise, it runs in shell and freezes the system.
|
||||
./0001-add-python-shebang.patch
|
||||
|
||||
# Update the source URL for the models because the old one is down.
|
||||
./0002-fix-download-url.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
@ -24,11 +21,11 @@ stdenv.mkDerivation rec {
|
||||
(python3.withPackages (p: with p; [ numpy tensorflow ]))
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m755 -t $out/lib libnc${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
addAutoPatchelfSearchPath $out/lib
|
||||
install -D -m755 -t $out/bin gpt2tc
|
||||
install -T -m755 download_model.sh $out/bin/gpt2-download-model
|
||||
install -T -m755 gpt2convert.py $out/bin/gpt2-convert
|
||||
|
Loading…
Reference in New Issue
Block a user