mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-13 05:57:30 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fad49da923
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "3.165.9",
|
||||
"version": "3.166.9",
|
||||
"deb": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb",
|
||||
"hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-amd64.deb",
|
||||
"hash": "sha512-D85W50K3jRBKhrPz3Wa9aClnHFMRPQ0YgP71uypfcCcuKVnKd3Ol1sFzsyMzl2uhB0aGOkpd2OB+OHceVFqmag=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb",
|
||||
"hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.166.9/standard-notes-3.166.9-linux-arm64.deb",
|
||||
"hash": "sha512-pbBLqIaDjQoVGCOfpOxwjWRSMoQsefsYOHTRNTNlDDNO7DRUa/WeSbOYOgLJM5yGIBVXQoRmO7ycWfAWVAPIDQ=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,23 +1,32 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "x16-emulator";
|
||||
version = "41";
|
||||
version = "43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commanderx16";
|
||||
owner = "X16Community";
|
||||
repo = "x16-emulator";
|
||||
rev = "r${finalAttrs.version}";
|
||||
hash = "sha256-pnWqtSXQzUfQ8ADIXL9r2YjuBwHDQ2NAffAEFCN5Qzw=";
|
||||
hash = "sha256-cZB7MRYlchD3zcBSWBIzyBiGHJobJvozkVT/7ftFkNg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '/bin/echo' 'echo'
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
zlib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -28,19 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.commanderx16.com/forum/index.php?/home/";
|
||||
description = "The official emulator of CommanderX16 8-bit computer";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
mainProgram = "x16emu";
|
||||
inherit (SDL2.meta) platforms;
|
||||
broken = with stdenv; isDarwin && isAarch64;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
# upstream project recommends emulator and rom to be synchronized;
|
||||
# passing through the version is useful to ensure this
|
||||
# upstream project recommends emulator and rom to be synchronized; passing
|
||||
# through the version is useful to ensure this
|
||||
inherit (finalAttrs) version;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://cx16forum.com/";
|
||||
description = "The official emulator of CommanderX16 8-bit computer";
|
||||
changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
mainProgram = "x16emu";
|
||||
inherit (SDL2.meta) platforms;
|
||||
broken = stdenv.isAarch64; # ofborg fails to compile it
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cc65
|
||||
, python3
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "x16-rom";
|
||||
version = "41";
|
||||
version = "43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commanderx16";
|
||||
owner = "X16Community";
|
||||
repo = "x16-rom";
|
||||
rev = "r${finalAttrs.version}";
|
||||
hash = "sha256-kowdyUVi3hliqkL8VQo5dS3Dpxd4LQi5+5brkdnv0lE=";
|
||||
hash = "sha256-LkGHfralxlishG1oyBojDnLMJ3c3KYp5YwJSZ2SIrbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -22,11 +22,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/
|
||||
patchShebangs findsymbols scripts/
|
||||
substituteInPlace Makefile \
|
||||
--replace '/bin/echo' 'echo'
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [ "PRERELEASE_VERSION=${finalAttrs.version}" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -36,18 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.commanderx16.com/forum/index.php?/home/";
|
||||
description = "ROM file for CommanderX16 8-bit computer";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (cc65.meta) platforms;
|
||||
broken = with stdenv; isDarwin && isAarch64;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
# upstream project recommends emulator and rom to be synchronized;
|
||||
# passing through the version is useful to ensure this
|
||||
# upstream project recommends emulator and rom to be synchronized; passing
|
||||
# through the version is useful to ensure this
|
||||
inherit (finalAttrs) version;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/X16Community/x16-rom";
|
||||
description = "ROM file for CommanderX16 8-bit computer";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
inherit (cc65.meta) platforms;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
@ -25,14 +25,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foxotron";
|
||||
version = "2023-02-23";
|
||||
version = "2023-07-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0=";
|
||||
sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xv";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = "xv";
|
||||
rev = "v${version}";
|
||||
sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM=";
|
||||
sha256 = "TXUcdrwtPNiS7z795RbzBXzNYRADeVtF5uz4aovLo/M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -51,11 +51,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yandex-browser";
|
||||
version = "23.5.1.754-1";
|
||||
version = "23.5.4.682-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
|
||||
sha256 = "sha256-ngtwrq8vDEt39Zd5jpBadouN1V8ly03la69M0AUyhGM=";
|
||||
sha256 = "sha256-ZhPX4K9huCO2uyjfUsWEkaspdvUurB7jNfUMqqIFO4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.14.11";
|
||||
version = "1.14.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c9JYrStbYhFWVAHHYz036k7DzKfVjy3LD4wg+GYcKkE=";
|
||||
hash = "sha256-0ZrR3y3bTXLCOgN+c96lEfNnT+GKXeEBHifM9jfWTBI=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-07-08";
|
||||
version = "unstable-2023-07-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "7c0967ed28e3d5b100a668015e38993dab7e3e34";
|
||||
sha256 = "969Ogxcoto2pNVr5itijeYXqytJxgUJ8rH97P6K8O1A=";
|
||||
rev = "65855787063b62ca048aa1cb9b5e6e42a009a150";
|
||||
sha256 = "Hb+fP5hL2x9BH16jRPMjGDz8EelI1n4Scl3tWheyeh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,13 +32,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayst";
|
||||
version = "unstable-2021-04-05";
|
||||
version = "unstable-2023-07-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "91861";
|
||||
repo = pname;
|
||||
rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98";
|
||||
hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ=";
|
||||
rev = "f8b218eec1af706fd5ae287f5073e6422eb8b6d8";
|
||||
hash = "sha256-tA2R6Snk5nqWkPXSbs7wmovWkT97xafdK0e/pKBUIUg=";
|
||||
};
|
||||
|
||||
makeFlags = [ "INSTALL_DIR=\${out}/bin" ];
|
||||
@ -56,11 +56,7 @@ stdenv.mkDerivation rec {
|
||||
utf8proc
|
||||
wayland
|
||||
];
|
||||
|
||||
# This patch forces the Makefile to use utf8proc
|
||||
# The makefile relies on ldconfig to find the utf8proc libraries
|
||||
# which is not possible on nixpkgs
|
||||
patches = [ ./utf8proc.patch ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/settings.c \
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
commit caa5a6bed31937f2d1b322da204e11eae57a720f
|
||||
Author: Nicolas Berbiche <nicolas@normie.dev>
|
||||
Date: Tue Oct 20 18:14:44 2020 -0400
|
||||
|
||||
PATCH: use nixpkgs utf8proc
|
||||
|
||||
This patch forces the Makefile to use utf8proc from `buildInputs`.
|
||||
The Makefile relies on ldconfig to find the utf8proc libraries,
|
||||
which is not possible with nixpkgs.
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index caccdf7..90b11ea 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -29,7 +29,7 @@ else
|
||||
LDFLAGS = -O2 -flto
|
||||
endif
|
||||
|
||||
-ifeq ($(shell ldconfig -p | grep libutf8proc.so > /dev/null || echo fail),fail)
|
||||
+ifeq (false,fail)
|
||||
$(info libutf8proc not found. Support for language-specific combining characters and unicode normalization will be disabled.)
|
||||
CFLAGS += -DNOUTF8PROC
|
||||
else
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-codereview";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "review";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GZ1qdFjWhEO1fd+G5qWaV7OTUaalBZFbLTrIO58hKOQ=";
|
||||
hash = "sha256-N6L+TlPU/lStMPTFYKFH2GiwyGkEJJuKtkH7wKLuM00=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,52 +1,92 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, dbus
|
||||
, sqlite
|
||||
, rustPlatform
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, pkg-config
|
||||
, libiconv
|
||||
, openssl
|
||||
, gzip
|
||||
, libssh2
|
||||
, libgit2
|
||||
, zstd
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
, testers
|
||||
, jujutsu
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8=";
|
||||
sha256 = "sha256-kbJWkCnb77VRKemA8WejaChaQYCxNiVMbqW5PCrDoE8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc=";
|
||||
cargoHash = "sha256-qbCOVcKpNGWGonRAwPsr3o3yd+7qUTy3IVmC3Ifn4xE=";
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
# enable 'packaging' feature, which enables extra features such as support
|
||||
# for watchman
|
||||
"packaging"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# this patch (hopefully!) fixes a very, very rare test failure that can
|
||||
# occasionally be cajoled out of Nix and GitHub CI builds. go ahead and
|
||||
# apply it to be safe.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/martinvonz/jj/commit/8e7e32710d29010423f3992bb920aaf2a0fa04ec.patch";
|
||||
hash = "sha256-ySieobB1P/DpWOurcCb4BXoHk9IqrjzMfzdc3O5cTXk=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
|
||||
useNextest = true; # nextest is the upstream integration framework
|
||||
ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib
|
||||
LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2
|
||||
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
sqlite
|
||||
zstd
|
||||
libgit2
|
||||
libssh2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
SystemConfiguration
|
||||
libiconv
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = jujutsu;
|
||||
command = "jj --version";
|
||||
postInstall = ''
|
||||
$out/bin/jj util mangen > ./jj.1
|
||||
installManPage ./jj.1
|
||||
|
||||
installShellCompletion --cmd jj \
|
||||
--bash <($out/bin/jj util completion --bash) \
|
||||
--fish <($out/bin/jj util completion --fish) \
|
||||
--zsh <($out/bin/jj util completion --zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = jujutsu;
|
||||
command = "jj --version";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -55,7 +95,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/martinvonz/jj";
|
||||
changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
maintainers = with maintainers; [ _0x4A6F thoughtpolice ];
|
||||
mainProgram = "jj";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@ let
|
||||
sha512 = "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==";
|
||||
};
|
||||
|
||||
tests = callPackage ./tests {};
|
||||
|
||||
in {
|
||||
prefetch-yarn-deps = stdenv.mkDerivation {
|
||||
name = "prefetch-yarn-deps";
|
||||
@ -38,6 +40,8 @@ in {
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = { inherit tests; };
|
||||
};
|
||||
|
||||
fetchYarnDeps = let
|
||||
@ -75,6 +79,6 @@ in {
|
||||
} // hash_ // (removeAttrs args ["src" "name" "hash" "sha256"]));
|
||||
|
||||
in lib.setFunctionArgs f (lib.functionArgs f) // {
|
||||
tests = callPackage ./tests {};
|
||||
inherit tests;
|
||||
};
|
||||
}
|
||||
|
||||
@ -78,12 +78,21 @@ const isGitUrl = pattern => {
|
||||
}
|
||||
|
||||
const downloadPkg = (pkg, verbose) => {
|
||||
const [ name, spec ] = pkg.key.split('@', 2);
|
||||
if (spec.startsWith('file:')) {
|
||||
console.info(`ignoring relative file:path dependency "${spec}"`)
|
||||
return
|
||||
}
|
||||
|
||||
const [ url, hash ] = pkg.resolved.split('#')
|
||||
if (verbose) console.log('downloading ' + url)
|
||||
const fileName = urlToName(url)
|
||||
if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) {
|
||||
const s = url.split('/')
|
||||
downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[6])
|
||||
return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1])
|
||||
} else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz')) {
|
||||
const s = url.split('/')
|
||||
return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, ''))
|
||||
} else if (isGitUrl(url)) {
|
||||
return downloadGit(fileName, url.replace(/^git\+/, ''), hash)
|
||||
} else if (url.startsWith('https://')) {
|
||||
|
||||
@ -3,14 +3,18 @@
|
||||
{
|
||||
simple = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./simple.lock;
|
||||
sha256 = "sha256-Erdkw2E8wWT09jFNLXGkrdwKl0HuSZWnUDJUrV95vSE=";
|
||||
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
|
||||
};
|
||||
gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./git.lock;
|
||||
sha256 = "sha256-lAqN4LpoE+jgsQO1nDtuORwcVEO7ogEV53jCu2jFJUI=";
|
||||
sha256 = "sha256-f90IiEzHDiBdswWewRBHcJfqqpPipaMg8N0DVLq2e8Q=";
|
||||
};
|
||||
githubDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./github.lock;
|
||||
sha256 = "sha256-Tsfgyjxz8x6gNmfN0xR7G/NQNoEs4svxRN/N+26vfJU=";
|
||||
sha256 = "sha256-DIKrhDKoqm7tHZmcuh9eK9VTqp6BxeW0zqDUpY4F57A=";
|
||||
};
|
||||
gitUrlDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./giturl.lock;
|
||||
sha256 = "sha256-VPnyqN6lePQZGXwR7VhbFnP7/0/LB621RZwT1F+KzVQ=";
|
||||
};
|
||||
}
|
||||
|
||||
11
pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock
Normal file
11
pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock
Normal file
@ -0,0 +1,11 @@
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
"autocomplete-atom-api@https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7":
|
||||
version "0.10.7"
|
||||
resolved "https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7#c9d51fa721d543ccfc1b2189101155e81db6b97d"
|
||||
|
||||
"find-and-replace@https://github.com/atom-community/find-and-replace/archive/refs/tags/v0.220.1.tar.gz":
|
||||
version "0.220.1"
|
||||
resolved "https://github.com/atom-community/find-and-replace/archive/refs/tags/v0.220.1.tar.gz#d7a0f56511e38ee72a89895a795bbbcab4a1a405"
|
||||
@ -14,7 +14,7 @@ let compcert = mkCoqDerivation rec {
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.14" "8.16"; out = "3.12"; }
|
||||
{ case = range "8.14" "8.17"; out = "3.13"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
@ -26,6 +26,7 @@ let compcert = mkCoqDerivation rec {
|
||||
"3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
|
||||
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
|
||||
"3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0=";
|
||||
"3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -153,6 +154,15 @@ compcert.overrideAttrs (o:
|
||||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.17") (isEq "3.13") ];
|
||||
out = [
|
||||
# Support for Coq 8.17.0 & Coq 8.17.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/030a0fafe6a1a315bb13c5276e0af536e4f713ce.patch";
|
||||
hash = "sha256-iRdmgYuun1wp6chRoDy99KKmFyvY79NGWzrltyQaW1o=";
|
||||
})
|
||||
];
|
||||
}
|
||||
] [];
|
||||
}
|
||||
)
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6Wa/rnm5lPATeqbQJ6QC+pn8D3l/petPvokEewXYEUA=";
|
||||
sha256 = "sha256-JJFHRoG/w5PLSrn99i4EUjRtbNUYDF19/xlsYOwwFZA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
|
||||
{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"gsl is not available for OCaml ${ocaml.version}"
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gsl";
|
||||
@ -36,8 +39,6 @@ buildDunePackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dune-configurator gsl ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ buildDunePackage, printbox, uucp, uutf, mdx }:
|
||||
{ buildDunePackage, lib, ocaml, printbox, uucp, uutf, mdx }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "printbox-text";
|
||||
inherit (printbox) src version useDune2 doCheck;
|
||||
inherit (printbox) src version;
|
||||
|
||||
propagatedBuildInputs = [ printbox uucp uutf ];
|
||||
|
||||
doCheck = printbox.doCheck && lib.versionOlder ocaml.version "5.0";
|
||||
nativeCheckInputs = [ mdx.bin ];
|
||||
|
||||
meta = printbox.meta // {
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
# build inputs
|
||||
, torch
|
||||
, numpy
|
||||
@ -19,7 +20,7 @@ let
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
@ -30,10 +31,16 @@ buildPythonPackage {
|
||||
hash = "sha256-L2Rl/qL6l0OLAofygzJBGQdp/2ZrgDFarwZRjyAR3dw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja ];
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
dontUseNinjaCheck = true;
|
||||
# setup.py depends on ninja python dependency, but we have the binary in nixpkgs
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'setup_requires=["ninja"]' 'setup_requires=[]'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.3";
|
||||
version = "1.28.3.post2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wrRUQTEmB5pkNKPgWnXLTK2UfHYk5TujhGy4KaIjDEs=";
|
||||
hash = "sha256-wjt4ArgKA4ihRtfoAlVS8h1E40kCahj7dR2caY7XFLE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
# build inputs
|
||||
@ -9,12 +8,9 @@
|
||||
, backoff
|
||||
, python-dateutil
|
||||
# check inputs
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, freezegun
|
||||
, pylint
|
||||
, flake8
|
||||
, coverage
|
||||
, pytest
|
||||
}:
|
||||
let
|
||||
pname = "posthog";
|
||||
@ -40,18 +36,22 @@ buildPythonPackage {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
freezegun
|
||||
pylint
|
||||
flake8
|
||||
coverage
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"posthog"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_load_feature_flags_wrong_key"
|
||||
# Tests require network access
|
||||
"test_request"
|
||||
"test_upload"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official PostHog python library";
|
||||
homepage = "https://github.com/PostHog/posthog-python";
|
||||
|
||||
86
pkgs/development/python-modules/tf2onnx/default.nix
Normal file
86
pkgs/development/python-modules/tf2onnx/default.nix
Normal file
@ -0,0 +1,86 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, pytest-runner
|
||||
# runtime dependencies
|
||||
, numpy
|
||||
, onnx
|
||||
, requests
|
||||
, six
|
||||
, flatbuffers
|
||||
, protobuf
|
||||
, tensorflow
|
||||
# check dependencies
|
||||
, pytestCheckHook
|
||||
, graphviz
|
||||
, parameterized
|
||||
, pytest-cov
|
||||
, pyyaml
|
||||
, timeout-decorator
|
||||
, onnxruntime
|
||||
, keras
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tf2onnx";
|
||||
version = "1.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "tensorflow-onnx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"flatbuffers"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
onnx
|
||||
requests
|
||||
six
|
||||
flatbuffers
|
||||
protobuf
|
||||
tensorflow
|
||||
onnxruntime
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tf2onnx" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
graphviz
|
||||
parameterized
|
||||
pytest-cov
|
||||
pyyaml
|
||||
timeout-decorator
|
||||
keras
|
||||
];
|
||||
|
||||
# TODO investigate the failures
|
||||
disabledTestPaths = [
|
||||
"tests/test_backend.py"
|
||||
"tests/test_einsum_helper.py"
|
||||
"tests/test_einsum_optimizers.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_profile_conversion_time"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX";
|
||||
homepage = "https://github.com/onnx/tensorflow-onnx";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@ -18,6 +18,7 @@
|
||||
, scikit-learn
|
||||
, tensorflow
|
||||
, onnxconverter-common
|
||||
, tf2onnx
|
||||
, torch
|
||||
, accelerate
|
||||
, faiss
|
||||
@ -99,7 +100,7 @@ buildPythonPackage rec {
|
||||
tf = [
|
||||
tensorflow
|
||||
onnxconverter-common
|
||||
# tf2onnx
|
||||
tf2onnx
|
||||
# tensorflow-text
|
||||
# keras-nlp
|
||||
];
|
||||
@ -119,7 +120,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
onnx = [
|
||||
onnxconverter-common
|
||||
# tf2onnx
|
||||
tf2onnx
|
||||
onnxruntime
|
||||
];
|
||||
modelcreation = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cpm-cmake";
|
||||
version = "0.38.1";
|
||||
version = "0.38.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpm-cmake";
|
||||
repo = "cpm.cmake";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gH12lO8XiSlPHyifJeaZ5mdk8ylIbLYTKKkitTK4jCA=";
|
||||
hash = "sha256-/qractCyItq1dNc8rBoipwmt4SGkdylxHu0Lnt4Jb/Q=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mermerd";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KarnerTh";
|
||||
repo = "mermerd";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fqM+sOWk3gqbZ5xKR6CS1SY5bSRrAhHcM1d6ugqFbw4=";
|
||||
hash = "sha256-L/ieDhducOpdJ0vu578YcjSLTARlih81xAyly4pVE80=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-toml";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pelletier";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pMy/cYyB9ncOuYysX0a9PmTuJdIrMcKL///57bniixI=";
|
||||
sha256 = "sha256-zix04tIP9nhvYx8N7uk2cUWjSpMjb0XiPDK3km82XzQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-44mxDswHIfVfAyvtyDHS4MnHCTPRlUvdhzHALICUJR4=";
|
||||
vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U=";
|
||||
|
||||
excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ];
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.59";
|
||||
version = "1.0.61";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qY7OulMMhrsS0ROh1XeaMex10X66/0PuCQnG/bjK7jc=";
|
||||
sha256 = "sha256-dkjrdqDpwqpGKPqDmiHpBhIn2HohINSOQ3LaczBOyhk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9X+kR8zcrkFQno1D3OAXqVccBzy9T0p14Iaq1qJYUMM=";
|
||||
cargoHash = "sha256-WU22YxQV9H6tVKtDVGY3dBi7yM06YDrnYjA5lH90svI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
sha256 = "sha256-h9kWeq7NgJUChqH49nJNuG/6fzAOteZlKUs6Vtbv7Ww=";
|
||||
sha256 = "sha256-FTxmcRD6PlY46HuakD/7wcBa26nEHYdWYUGmOR4R58Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "smokeping_prober";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
ldflags = let
|
||||
setVars = rec {
|
||||
@ -20,9 +20,9 @@ buildGoModule rec {
|
||||
owner = "SuperQ";
|
||||
repo = "smokeping_prober";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tph9TZwMWKlJC/YweO9BU3+QRIugqc3ob5rqXThyR1c=";
|
||||
sha256 = "sha256-kpg4oUDv1C5NQuxfFNLmRIMkc8hbMkjiKL16HkYrUyU=";
|
||||
};
|
||||
vendorHash = "sha256-emabuOm5tuPNZWmPHJWUWzFVjuLrY7biv8V/3ru73aU=";
|
||||
vendorHash = "sha256-TgieqjE23gwyKLuKSqc5pkxRpou8lg+yVnVoINZDkGU=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "simplotask";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "umputun";
|
||||
repo = "spot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u2Nj8AgkqwocxQMcPszzLaUu9vrbAA/cKjEqqxnbnr8=";
|
||||
hash = "sha256-8QlxZ41t7tbi1Z5wjEp6BcjgVFoywM5T5PQGlImZWMk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,20 +1,30 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dysk";
|
||||
version = "2.6.1";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "dysk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rSnj38U4Rt5Wh+3A610tTeT2Q1BVGvpMa7rpDf4YzTI=";
|
||||
hash = "sha256-5KUTb2mSYQdkT3K5BrBCQqq45q0MzFYG1UmE+5eBnuc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-or1vLbtA2tPnGJ3tYWrmaXmPCIutojBlIWMLRNpxpY4=";
|
||||
cargoHash = "sha256-YmA1Qx3oKHXlXs3FWoLMRAnFdIQaFdLJaNwj/FxIS5Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage $releaseDir/build/*/out/dysk.1
|
||||
installShellCompletion $releaseDir/build/*/out/{dysk.bash,dysk.fish,_dysk}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get information on your mounted disks";
|
||||
|
||||
@ -7,30 +7,44 @@
|
||||
, v2ray-geoip
|
||||
, v2ray-domain-list-community
|
||||
, symlinkJoin
|
||||
, fetchYarnDeps
|
||||
}:
|
||||
let
|
||||
pname = "v2raya";
|
||||
version = "2.0.2";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2rayA";
|
||||
repo = "v2rayA";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C7N23s/GA66gQ5SVXtXcM9lXIjScR3pLYCrf0w2nHfY=";
|
||||
hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU=";
|
||||
postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
|
||||
};
|
||||
guiSrc = "${src}/gui";
|
||||
|
||||
web = mkYarnPackage {
|
||||
inherit pname version;
|
||||
src = "${src}/gui";
|
||||
yarnNix = ./yarn.nix;
|
||||
|
||||
src = guiSrc;
|
||||
packageJSON = ./package.json;
|
||||
yarnLock = ./yarn.lock;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${guiSrc}/yarn.lock";
|
||||
sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
export NODE_OPTIONS=--openssl-legacy-provider
|
||||
ln -s $src/postcss.config.js postcss.config.js
|
||||
OUTPUT_DIR=$out yarn --offline build
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
cp -r $node_modules node_modules
|
||||
chmod +w node_modules
|
||||
'';
|
||||
|
||||
distPhase = "true";
|
||||
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
};
|
||||
@ -45,7 +59,7 @@ buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = "${src}/service";
|
||||
vendorSha256 = "sha256-vnhqI9G/p+SLLA4sre2wfmg1RKIYZmzeL0pSTbHb+Ck=";
|
||||
vendorSha256 = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
"@nuintun/qrcode": "^3.3.0",
|
||||
"@vue/babel-preset-app": "^4.2.2",
|
||||
"axios": "^0.21.1",
|
||||
"buefy": "0.9.3",
|
||||
"buefy": "^0.9.22",
|
||||
"clipboard": "^2.0.4",
|
||||
"dayjs": "^1.10.6",
|
||||
"js-base64": "^2.5.1",
|
||||
@ -22,8 +22,7 @@
|
||||
"pace-js": "^1.2.4",
|
||||
"qrcode": "^1.4.2",
|
||||
"register-service-worker": "^1.6.2",
|
||||
"uglifyjs-webpack-plugin": "^1.1.1",
|
||||
"vue": "^2.6.10",
|
||||
"vue": "^2.7.14",
|
||||
"vue-i18n": "^8.15.3",
|
||||
"vue-router": "^3.0.6",
|
||||
"vue-virtual-scroller": "^1.0.10",
|
||||
@ -31,22 +30,24 @@
|
||||
"webpack-iconfont-plugin-nodejs": "^1.0.16"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^4.2.2",
|
||||
"@vue/cli-plugin-eslint": "^4.0.5",
|
||||
"@vue/cli-plugin-router": "^4.0.0",
|
||||
"@vue/cli-plugin-vuex": "^4.0.0",
|
||||
"@vue/cli-service": "^4.0.0",
|
||||
"@babel/core": "^7.12.16",
|
||||
"@babel/eslint-parser": "^7.12.16",
|
||||
"@vue/cli-plugin-babel": "~5.0.8",
|
||||
"@vue/cli-plugin-eslint": "~5.0.8",
|
||||
"@vue/cli-plugin-router": "~5.0.8",
|
||||
"@vue/cli-plugin-vuex": "~5.0.8",
|
||||
"@vue/cli-service": "~5.0.8",
|
||||
"@vue/eslint-config-prettier": "^5.0.0",
|
||||
"babel-eslint": "^10.0.3",
|
||||
"css-loader": "^5.2.0",
|
||||
"eslint": "^5.16.0",
|
||||
"eslint-plugin-prettier": "^3.1.1",
|
||||
"eslint-plugin-vue": "^5.0.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-vue": "^8.0.3",
|
||||
"highlight.js": "^11.4.0",
|
||||
"prettier": "^1.18.2",
|
||||
"prettier": "^2.4.1",
|
||||
"sass": "^1.19.0",
|
||||
"sass-loader": "^8.0.0",
|
||||
"urijs": "^1.19.11",
|
||||
"vue-template-compiler": "^2.6.10"
|
||||
"terser-webpack-plugin": "^5.3.6",
|
||||
"urijs": "^1.19.11"
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "saml2aws";
|
||||
version = "2.36.9";
|
||||
version = "2.36.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Versent";
|
||||
repo = "saml2aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eV922fUtNAHGFxuDwTKoakSzf1lMzVg+vOeaBbOP4V0=";
|
||||
sha256 = "sha256-YoQ22AJOpNW7WVy9lCb/KzZ7/CkOMHSsgzh0gAfnqP0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-20IggKOPS+Pu4tQIdYU5SXQhu2FrW0MdCdB9dvmqs7E=";
|
||||
vendorHash = "sha256-hbsURcFOLYP//1UXmxWfnNEb6PqJDqwAjJc5Au5+BOQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
|
||||
@ -15175,7 +15175,7 @@ with pkgs;
|
||||
|
||||
comby = callPackage ../development/tools/comby { };
|
||||
|
||||
inherit (coqPackages_8_16) compcert;
|
||||
inherit (coqPackages) compcert;
|
||||
|
||||
computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
|
||||
computecpp = wrapCCWith rec {
|
||||
|
||||
@ -12387,6 +12387,8 @@ self: super: with self; {
|
||||
|
||||
textx = callPackage ../development/python-modules/textx { };
|
||||
|
||||
tf2onnx = callPackage ../development/python-modules/tf2onnx { };
|
||||
|
||||
tflearn = callPackage ../development/python-modules/tflearn { };
|
||||
|
||||
tftpy = callPackage ../development/python-modules/tftpy { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user