mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
03ca5eba08
@ -11044,6 +11044,16 @@
|
||||
githubId = 34162313;
|
||||
name = "Jason Wing";
|
||||
};
|
||||
netfox = {
|
||||
name = "netfox";
|
||||
email = "say-hi@netfox.rip";
|
||||
matrix = "@netfox:catgirl.cloud";
|
||||
github = "0xnetfox";
|
||||
githubId = 97521402;
|
||||
keys = [{
|
||||
fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7";
|
||||
}];
|
||||
};
|
||||
netixx = {
|
||||
email = "dev.espinetfrancois@gmail.com";
|
||||
github = "netixx";
|
||||
|
||||
@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmmp";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo=";
|
||||
hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.6.3";
|
||||
version = "7.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cNR4Ffn9HvgL5KV4FUSnbzEh6VfoKaIbfpb18/qKEns=";
|
||||
hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -2,22 +2,54 @@
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, IOKit
|
||||
, Security
|
||||
, AppKit
|
||||
, pkg-config
|
||||
, darwin
|
||||
, udev
|
||||
, zlib
|
||||
, protobuf
|
||||
, libcxx
|
||||
, rocksdb
|
||||
, pkg-config
|
||||
, openssl
|
||||
, nix-update-script
|
||||
# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
|
||||
, solanaPkgs ? [
|
||||
"solana"
|
||||
"solana-bench-tps"
|
||||
"solana-faucet"
|
||||
"solana-gossip"
|
||||
"solana-install"
|
||||
"solana-keygen"
|
||||
"solana-log-analyzer"
|
||||
"solana-net-shaper"
|
||||
"solana-sys-tuner"
|
||||
"rbpf-cli"
|
||||
"solana-validator"
|
||||
"solana-ledger-tool"
|
||||
"cargo-build-bpf"
|
||||
"cargo-test-bpf"
|
||||
"solana-dos"
|
||||
"solana-install-init"
|
||||
"solana-stake-accounts"
|
||||
"solana-test-validator"
|
||||
"solana-tokens"
|
||||
"solana-watchtower"
|
||||
"cargo-test-sbf"
|
||||
"cargo-build-sbf"
|
||||
] ++ [
|
||||
# XXX: Ensure `solana-genesis` is built LAST!
|
||||
# See https://github.com/solana-labs/solana/issues/5826
|
||||
"solana-genesis"
|
||||
]
|
||||
}:
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
version = pinData.version;
|
||||
sha256 = pinData.sha256;
|
||||
cargoSha256 = pinData.cargoSha256;
|
||||
version = "1.14.17";
|
||||
sha256 = "sha256-pYbnEF8MgF7fCBf/MOPT//UCeOQj9tuIkDj8UIVFz3E=";
|
||||
cargoSha256 = "sha256-n9nuBiKV3FCgq5fJ5BuqIIAp1yZ6IO+zHjrMaUBfgzs=";
|
||||
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "solana-testnet-cli";
|
||||
pname = "solana-cli";
|
||||
inherit version cargoSha256;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -27,35 +59,52 @@ rustPlatform.buildRustPackage rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "cli";
|
||||
strictDeps = true;
|
||||
verifyCargoDeps = true;
|
||||
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ udev zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit Security AppKit ];
|
||||
|
||||
# check phase fails
|
||||
# on darwin with missing framework System. This framework is not available in nixpkgs
|
||||
# on linux with some librocksdb-sys compilation error
|
||||
# Even tho the tests work, a shit ton of them try to connect to a local RPC
|
||||
# or access internet in other ways, eventually failing due to Nix sandbox.
|
||||
# Maybe we could restrict the check to the tests that don't require an RPC,
|
||||
# but judging by the quantity of tests, that seems like a lengthty work and
|
||||
# I'm not in the mood ((ΦωΦ))
|
||||
doCheck = false;
|
||||
|
||||
# all the following are needed for the checkphase
|
||||
# nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ];
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
# OPENSSL_NO_VENDOR = 1;
|
||||
# OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
# OPENSSL_DIR="${lib.getDev openssl}";
|
||||
# LLVM_CONFIG_PATH="${llvm}/bin/llvm-config";
|
||||
# LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
nativeBuildInputs = [ protobuf pkg-config ];
|
||||
buildInputs = [ openssl rustPlatform.bindgenHook ]
|
||||
++ lib.optionals stdenv.isLinux [ udev ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libcxx
|
||||
IOKit
|
||||
Security
|
||||
AppKit
|
||||
System
|
||||
Libsystem ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin/sdk/bpf
|
||||
cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
|
||||
'';
|
||||
|
||||
# Used by build.rs in the rocksdb-sys crate. If we don't set these, it would
|
||||
# try to build RocksDB from source.
|
||||
# ROCKSDB_INCLUDE_DIR="${rocksdb}/include";
|
||||
# ROCKSDB_LIB_DIR="${rocksdb}/lib";
|
||||
ROCKSDB_LIB_DIR="${rocksdb}/lib";
|
||||
|
||||
# Require this on darwin otherwise the compiler starts rambling about missing
|
||||
# cmath functions
|
||||
CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
|
||||
LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib";
|
||||
|
||||
# If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
|
||||
homepage = "https://solana.com";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
maintainers = with maintainers; [ netfox happysalada ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
}
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
"version": "1.10.9",
|
||||
"sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
|
||||
"cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4="
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
|
||||
|
||||
# TODO set to `verbose` or `extdebug` once implemented in oil
|
||||
shopt --set xtrace
|
||||
# we need failures inside of command subs to get the correct cargoSha256
|
||||
shopt --unset inherit_errexit
|
||||
|
||||
const directory = $(dirname $0 | xargs realpath)
|
||||
const owner = "solana-labs"
|
||||
const repo = "solana"
|
||||
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
|
||||
jq -r '.tag_name')
|
||||
const latest_version = $(echo $latest_rev | sd 'v' '')
|
||||
const current_version = $(jq -r '.version' $directory/pin.json)
|
||||
if ("$latest_version" === "$current_version") {
|
||||
echo "solana is already up-to-date"
|
||||
return 0
|
||||
} else {
|
||||
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
|
||||
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
|
||||
|
||||
jq ".version = \"$latest_version\" | \
|
||||
.\"sha256\" = \"$tarball_hash\" | \
|
||||
.\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
|
||||
|
||||
const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
|
||||
tail -n 2 | \
|
||||
head -n 1 | \
|
||||
sd '\s+got:\s+' '')
|
||||
|
||||
jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
|
||||
}
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, git
|
||||
, pkg-config
|
||||
, gperf
|
||||
, libmicrohttpd
|
||||
, openssl
|
||||
@ -12,25 +13,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ton";
|
||||
version = "2023.01";
|
||||
version = "2023.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ton-blockchain";
|
||||
repo = "ton";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8=";
|
||||
sha256 = "sha256-3HQF0wKk0iRV5fKzuCTv7X7MC+snMDrodgqScCZQVY4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1'
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'set(TON_ARCH "apple-m1")' ""
|
||||
'';
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -44,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "A fully decentralized layer-1 blockchain designed by Telegram";
|
||||
homepage = "https://ton.org/";
|
||||
changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md";
|
||||
license = licenses.lgpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
|
||||
@ -2975,14 +2975,14 @@ final: prev:
|
||||
|
||||
feline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "feline.nvim";
|
||||
version = "2022-12-22";
|
||||
version = "2023-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "famiu";
|
||||
owner = "freddiehaddad";
|
||||
repo = "feline.nvim";
|
||||
rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c";
|
||||
sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g";
|
||||
rev = "a02bcdde649cdfca0e25d2dd693ba140233b5c3e";
|
||||
sha256 = "0s646hd3pbzv5i8vpsk019hwgyqnrd3qhm6lzilqlydrz3yx3b87";
|
||||
};
|
||||
meta.homepage = "https://github.com/famiu/feline.nvim/";
|
||||
meta.homepage = "https://github.com/freddiehaddad/feline.nvim/";
|
||||
};
|
||||
|
||||
fennel-vim = buildVimPluginFrom2Nix {
|
||||
|
||||
@ -248,7 +248,7 @@ https://github.com/fenetikm/falcon/,,
|
||||
https://github.com/brooth/far.vim/,,
|
||||
https://github.com/konfekt/fastfold/,,
|
||||
https://github.com/lilydjwg/fcitx.vim/,fcitx5,
|
||||
https://github.com/feline-nvim/feline.nvim/,,
|
||||
https://github.com/freddiehaddad/feline.nvim/,,
|
||||
https://github.com/bakpakin/fennel.vim/,,
|
||||
https://github.com/lambdalisue/fern.vim/,,
|
||||
https://github.com/wincent/ferret/,,
|
||||
|
||||
@ -32,11 +32,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.16.0";
|
||||
version = "6.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-2Lhp9PBZ19svq26PoldJ1H8tmt95MwY0l7+g6mPUvFI=";
|
||||
hash = "sha256-HKSruKXYUMH1lj43CA3Rp3lXNlONXE1P9gFLaH16No4=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elfx86exts";
|
||||
version = "0.5.0";
|
||||
version = "unstable-2023-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkgw";
|
||||
repo = pname;
|
||||
rev = "${pname}@${version}";
|
||||
sha256 = "sha256-SDBs5/jEvoKEVKCHQLz2z+CZSSmESP7LoIITRN4qJWA=";
|
||||
rev = "26bf98cf1fc773196e594c48bfe808d7151076f6";
|
||||
hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fYtFRdH6U8uWshdD1Pb1baE8slo6qajx10tDK3Ukknw=";
|
||||
cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decode x86 binaries and print out which instruction set extensions they use.";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core, rbw }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rofi-rbw";
|
||||
@ -21,6 +21,10 @@ buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "rofi_rbw" ];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ rbw ]})
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rofi frontend for Bitwarden";
|
||||
homepage = "https://github.com/fdw/rofi-rbw";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K/RUEr9WJU1tocESvBF48F890vMgCRANM0lqn644eeg=";
|
||||
sha256 = "sha256-E/14YYX4EFakzBsaUxy1SZAaBCIKmgpWlY/9EazWWFI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "stable";
|
||||
version = "2.13.1";
|
||||
sha256 = "1qsf2d4haqs93qf88f2vvjsgm5a5gnmivkdpdbvpwy0q8bd8rfnj";
|
||||
version = "2.13.2";
|
||||
sha256 = "0pcb4f8s8l156y0zd9g9f0pyydvp52n02krjy2giajp00gaqx3s3";
|
||||
vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
|
||||
}
|
||||
|
||||
@ -1,19 +1,28 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0=";
|
||||
sha256 = "sha256-tIn5ty7faM9BBmUWCvok94QOAMVtz5daCPpZkDGOJfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs=";
|
||||
vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd nali \
|
||||
--bash <($out/bin/nali completion bash) \
|
||||
--fish <($out/bin/nali completion fish) \
|
||||
--zsh <($out/bin/nali completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An offline tool for querying IP geographic information and CDN provider";
|
||||
homepage = "https://github.com/zu1k/nali";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.14.0";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O1Miy0GV34YbE1UrLUWZsatpWyfzFLGvX6fQUJnwbuE=";
|
||||
hash = "sha256-QpSp+8gsFApp4i4PajAQHHYZgwej/gusAw4J3Zetk4M=";
|
||||
};
|
||||
|
||||
# Use specific package versions required by paperless-ngx
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
sha256 = "sha256-ngO2tj59vKmjz47UCi7sEynFNWVJmjSFxt2+oONkUlY=";
|
||||
sha256 = "sha256-XB5bplYpid2vxSjm1DCGYsd3d5kUk8PlnhFdCAORX6k=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-cinnabar";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glandium";
|
||||
repo = "git-cinnabar";
|
||||
rev = version;
|
||||
sha256 = "IV7K/49IN2HMek247GWr5ybZRozHsnCm8RItC9sqFXc=";
|
||||
sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sha256 = "YWhGAp64GAlySgUvDrD6qaNlc09swe1xCkvEpFR1ytg=";
|
||||
sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw=";
|
||||
};
|
||||
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chez-scheme";
|
||||
version = "9.5.8";
|
||||
version = "9.5.8a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cisco";
|
||||
repo = "ChezScheme";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-esCWEzny/I+Ors6+upKlt4h13oN0bRLWN9OTKuSqdl8=";
|
||||
sha256 = "sha256-d8DgHATZzZbOYODHFKTqg4oWg/wja8jQgcCVpj8j6yQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk=";
|
||||
};
|
||||
|
||||
# fix reported version
|
||||
patches = [ ./fix-version.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF"
|
||||
"-DCPP_JWT_BUILD_EXAMPLES=OFF"
|
||||
|
||||
12
pkgs/development/libraries/cpp-jwt/fix-version.patch
Normal file
12
pkgs/development/libraries/cpp-jwt/fix-version.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f35431..f08eb22 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.5.0)
|
||||
-project(cpp-jwt VERSION 1.2.0)
|
||||
+project(cpp-jwt VERSION 1.4.0)
|
||||
|
||||
option(CPP_JWT_BUILD_EXAMPLES "build examples" ON)
|
||||
option(CPP_JWT_BUILD_TESTS "build tests" ON)
|
||||
|
||||
@ -16,13 +16,14 @@
|
||||
, geocode-glib_2
|
||||
, vala
|
||||
, gnome
|
||||
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgweather";
|
||||
version = "4.2.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
@ -45,10 +46,12 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
vala
|
||||
glib
|
||||
(python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ]))
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
(python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ]))
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -61,8 +64,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
|
||||
"-Denable_vala=true"
|
||||
"-Dgtk_doc=true"
|
||||
(lib.mesonBool "introspection" withIntrospection)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
41
pkgs/development/libraries/vkd3d-proton/default.nix
Normal file
41
pkgs/development/libraries/vkd3d-proton/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, wine, glslang }:
|
||||
|
||||
let
|
||||
# these are both embedded in the output files
|
||||
rev = "83308675078e9ea263fa8c37af95afdd15b3ab71";
|
||||
# git describe --tags
|
||||
shortRev = builtins.substring 0 8 rev;
|
||||
realVersion = "v2.8-302-g${shortRev}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkd3d-proton";
|
||||
version = "unstable-2023-04-21";
|
||||
|
||||
nativeBuildInputs = [ meson ninja wine glslang ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HansKristian-Work";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "vkd3d_build = vcs_tag(" \
|
||||
"vkd3d_build = vcs_tag( fallback : '${shortRev}'", \
|
||||
--replace "vkd3d_version = vcs_tag(" \
|
||||
"vkd3d_version = vcs_tag( fallback : '${realVersion}'",
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
|
||||
description =
|
||||
"A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
26
pkgs/development/libraries/vkd3d/default.nix
Normal file
26
pkgs/development/libraries/vkd3d/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison
|
||||
, vulkan-headers, spirv-headers, vulkan-loader }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkd3d";
|
||||
version = "1.7";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ];
|
||||
buildInputs = [ vulkan-loader vulkan-headers spirv-headers ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-s5YNA+CjWoYk1tkBYYGfOsI2eXtXPtd1oHVeFFJIWn8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.winehq.org/wine/vkd3d";
|
||||
description = "A 3D graphics library with an API very similar, but not identical, to Direct3D 12";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -14,6 +14,7 @@
|
||||
, "@microsoft/rush"
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@nestjs/cli"
|
||||
, "@shopify/cli"
|
||||
, "@squoosh/cli"
|
||||
, "@tailwindcss/aspect-ratio"
|
||||
, "@tailwindcss/forms"
|
||||
|
||||
6932
pkgs/development/node-packages/node-packages.nix
generated
6932
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.33";
|
||||
version = "0.5.34";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-td4baHAtBuNqUpe11HBtsMl6fW9n5w12U+KUUc1SmIQ=";
|
||||
hash = "sha256-gnNncWhrqGTWq8cNVmNMzkgqW0hoglzVGrLjqyUvOIc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.8";
|
||||
version = "8.13.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S6kqkX+49uP+M/0EudhCmYUs4jcokSnuTtpHoEOlxsQ=";
|
||||
hash = "sha256-PjJ02IyrNgm1X/W5NBcHXbyi0TBk8QP79WLg6h3aD5o=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, isPyPy
|
||||
, pkgs
|
||||
@ -32,6 +33,14 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [
|
||||
./fix-test-pythonpath.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/07ba882d04fa2099b53d41370416b97957d2abcb.patch";
|
||||
hash = "sha256-yYfLdy+TOKfN3gtTMgOWPebPTRYyaOYh/yFTowCbdjg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/a01b4eeecf63b0580c192c7c2db7a5c406a7ad6d.patch";
|
||||
hash = "sha256-M/8hYiKUBzaTOxPYDFK5BAvCm6WJGx+693qwj3HzdRA=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.4.12";
|
||||
version = "1.4.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vuwD9NVomxwG1IQioy6TzEHnibCdpg+VyCXjnjnmw54=";
|
||||
hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/python-lsp-ruff/default.nix
Normal file
45
pkgs/development/python-modules/python-lsp-ruff/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ruff
|
||||
, lsprotocol
|
||||
, python-lsp-server
|
||||
, tomli
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-ruff";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "python-lsp-ruff";
|
||||
sha256 = "sha256-TqTeQc/lT5DcPcJbZXbEiUGbYjFP8idpzdSZlXD59Y4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# ruff binary is used directly, the ruff python package is not needed
|
||||
sed -i '/"ruff>=/d' pyproject.toml
|
||||
sed -i 's|sys.executable, "-m", "ruff"|"${ruff}/bin/ruff"|' pylsp_ruff/plugin.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lsprotocol
|
||||
python-lsp-server
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/python-lsp/python-lsp-ruff";
|
||||
description = "Ruff linting plugin for pylsp";
|
||||
changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
};
|
||||
}
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tldextract";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eK7xOsFFnVGbRXoD8fdMG/HCgIEiprzA5oQPgbpVrXM=";
|
||||
hash = "sha256-+p5QxKA77eKh2V3KYg1mFnhIRiaFjM84jPlnGg3Ul6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.29.0";
|
||||
version = "1.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZqdV1fvLuIMfGpVoZ2MptbrILDeZW8ya/QSLZFn5+kg=";
|
||||
hash = "sha256-LYPx0S9zPhYqh+BrF2FJ17ucW65Knl/OHHcdf3A/emU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tz05j2XkA3Dh1RlQf8KHuPSqGhbFc0fxSe0LC2d5FYU=";
|
||||
hash = "sha256-SNQhDmiRz0J3MlJbYUAQgiXeLv3oZVAMnavkAeRrnEA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QgNL7pp0KH1RUV69BFVtHpaLHrPp4UQhEtOEiRmfAi0=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.204.0";
|
||||
version = "0.205.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-263ZbEDGiZI/2dSLxs966+wtSHG2QMnTtzJ7hPQ4Ix8=";
|
||||
sha256 = "sha256-+F0NmE9BN8eSmyLnXkgdYy3qdyBvKfRM+hVgYmLvzOg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto
|
||||
, cmake, pkg-config, which, makeWrapper
|
||||
, libpfm, zlib, python3Packages, procps, gdb, capnproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -38,11 +39,11 @@ stdenv.mkDerivation rec {
|
||||
# See also https://github.com/NixOS/nixpkgs/pull/110846
|
||||
preConfigure = ''substituteInPlace CMakeLists.txt --replace "-flto" ""'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config which ];
|
||||
nativeBuildInputs = [ cmake pkg-config which makeWrapper ];
|
||||
buildInputs = [
|
||||
libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto
|
||||
libpfm zlib python3Packages.python python3Packages.pexpect procps capnproto
|
||||
];
|
||||
propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
|
||||
cmakeFlags = [
|
||||
"-Ddisable32bit=ON"
|
||||
];
|
||||
@ -57,6 +58,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preCheck = "export HOME=$TMPDIR";
|
||||
|
||||
# needs GDB to replay programs at runtime
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/rr" \
|
||||
--prefix PATH ":" "${lib.makeBinPath [
|
||||
gdb
|
||||
]}";
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://rr-project.org/";
|
||||
description = "Records nondeterministic executions and debugs them deterministically";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-entgrpc";
|
||||
version = "0.3.0";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ent";
|
||||
repo = "contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hK4I2LVvw7hkbUKRuDoaRuNX3nwlwipYucnXwzOCcXs=";
|
||||
sha256 = "sha256-5gFdfMSAb0DWCMCzG0nVGU+VWam6yC26QYUPF1YjekM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bAM+NxD7mNd2fFxRDHCAzJTD7PVfT/9XHF88v9RHKwE=";
|
||||
vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y=";
|
||||
|
||||
subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.17";
|
||||
version = "0.5.19";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kU8Wq0BRE/Tajmi/PV6dja9HJy0lbZwzGuMIXDnFUw0=";
|
||||
sha256 = "sha256-5xHDjNFQDmi+SnhxfoCxoBdCqHpZEk/87r2sBKsT+W4=";
|
||||
};
|
||||
cargoSha256 = "sha256-Zv6CkUhMTMqGM8PH+ciDV20vq88tU5THSw0NByO1v70=";
|
||||
cargoSha256 = "sha256-0fj5GJ/gjVBAdfYPHnT33kbnXBIE5+VRONcNBgBSoPc=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trunk-io";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trunk.io/releases/launcher/${version}/trunk";
|
||||
hash = "sha256-arWege61fb7NiYSIL3ZaDQr75QEbDDJ7rVgdRUKqP4A=";
|
||||
hash = "sha256-ylQ4tcPVO367PtLtBkw+MKxoIY7b14Gse3IxnIxMtqc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -1,49 +1,74 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, fetchFromGitHub
|
||||
, dart
|
||||
, buf
|
||||
, callPackage
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
let
|
||||
embedded-protocol = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "embedded-protocol";
|
||||
rev = "refs/tags/1.2.0";
|
||||
hash = "sha256-OHOWotI+cXjDhEYUNXa36FpMEW7hSIu8gVX3gVRvw2Y=";
|
||||
};
|
||||
|
||||
libExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dart-sass-embedded";
|
||||
version = "1.62.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass-embedded";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-GpSus5/QItbzCrOImMvrO6DTAQeODABRNiSYHJlLlIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
|
||||
nativeBuildInputs = [
|
||||
buf
|
||||
dart
|
||||
(callPackage ../../build-support/dart/fetch-dart-deps { } {
|
||||
buildDrvArgs = finalAttrs;
|
||||
vendorHash = "sha256-aEBE+z8M5ivMR9zL7kleBJ8c9T+4PGXoec56iwHVT+c=";
|
||||
})
|
||||
];
|
||||
|
||||
src = let base = "https://github.com/sass/dart-sass-embedded/releases/download/${version}/sass_embedded-${version}"; in
|
||||
fetchurl {
|
||||
"x86_64-linux" = {
|
||||
url = "${base}-linux-x64.tar.gz";
|
||||
hash = "sha256-NXTadacyKlOQNGSLj/hP8syhYuuSTXK2Y9cYzTk28HU=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
url = "${base}-linux-arm64.tar.gz";
|
||||
hash = "sha256-DX29U1AjmqVhKFgzP+71vsdoMjQ13IS93PZ1JLOA7bA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
url = "${base}-macos-x64.tar.gz";
|
||||
hash = "sha256-0oyb9YBKoPNaWFLbIUZOJc5yK11uDYyAKKW4urkmRJQ=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
url = "${base}-macos-arm64.tar.gz";
|
||||
hash = "sha256-dkBcdVbxolK8xXYaOHot0s9FxGmfhMNAEoZqo+2LRfk=";
|
||||
};
|
||||
}."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
strictDeps = true;
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
dart pub get --offline
|
||||
mkdir build
|
||||
ln -s ${embedded-protocol} build/embedded-protocol
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
UPDATE_SASS_PROTOCOL=false HOME="$TMPDIR" dart run grinder protobuf
|
||||
dart run grinder pkg-compile-native
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r * $out
|
||||
ln -s $out/dart-sass-embedded $out/bin/dart-sass-embedded
|
||||
runHook preInstall
|
||||
mkdir -p "$out/lib" "$out/bin"
|
||||
cp build/dart-sass-embedded.native "$out/lib/dart-sass-embedded${libExt}"
|
||||
echo '#!${runtimeShell}' > "$out/bin/dart-sass-embedded"
|
||||
echo "exec ${dart}/bin/dartaotruntime $out/lib/dart-sass-embedded${libExt} \"\$@\"" >> "$out/bin/dart-sass-embedded"
|
||||
chmod +x "$out/bin/dart-sass-embedded"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol";
|
||||
homepage = "https://github.com/sass/dart-sass-embedded";
|
||||
changelog = "https://github.com/sass/dart-sass-embedded/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/sass/dart-sass-embedded/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "20.0.3";
|
||||
version = "20.0.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-dDB3jG3k3ZkAzsG4p3VHpMBM8nxvxQ2sxGeRXWI1Wm0=";
|
||||
hash = "sha256-4h3q9J1+KufMaSuzbX9qaBwXPR8zhVpxQAXDBY3uPjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nats-exporter";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+qMhHmsvlUWjDhmSXv2TytuOPmJcXdSGBd7c5PdE9xI=";
|
||||
sha256 = "sha256-v8Afdz1X1s5P/soXB+9M4C01HbvPNlEXo7Hdf1o9NdM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ=";
|
||||
vendorHash = "sha256-YpiwRkujjuqfNH1Mmv6mtm6nNXx6kp272+6fzsK97xw=";
|
||||
|
||||
preCheck = ''
|
||||
# Fix `insecure algorithm SHA1-RSA` problem
|
||||
|
||||
@ -198,7 +198,7 @@ let
|
||||
./rubyEnv/sass-embedded-static.patch
|
||||
];
|
||||
postPatch = ''
|
||||
export SASS_EMBEDDED=${dart-sass-embedded}
|
||||
export SASS_EMBEDDED=${dart-sass-embedded}/bin
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.138.0";
|
||||
version = "0.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hZnNb6tsgllJUo3lz+qF/d3MQJJ6IauqVl5nG5J3aok=";
|
||||
hash = "sha256-KIg5A1fR1AmdSPUrYXrWRNj1Vdi1LPbS1MwV77SRskA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZjA89x+B0pT5jShr1Iv/geBYtH/bYnk/TIQZWLObAck=";
|
||||
vendorHash = "sha256-ea1MXllg3i0UmikzVoFNuki+5QvJret2+cBcN3kekBY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fuse, pkg-config }:
|
||||
{ lib, stdenv, fetchurl, fuse, fuse3, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.2";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse ];
|
||||
buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ];
|
||||
postFixup = ''
|
||||
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
|
||||
'';
|
||||
|
||||
33
pkgs/tools/graphics/didder/default.nix
Normal file
33
pkgs/tools/graphics/didder/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, pandoc }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "didder";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "makew0rld";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S1j2TdV0XCrSc7Ua+SdY3JJoWgnFuAMGhUinTKO2Xh4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TEp1YrQquqdEMVvZaNsEB1H/DZsTYmRL257RjQF2JqM=";
|
||||
|
||||
nativeBuildInputs = [ pandoc ];
|
||||
|
||||
postBuild = ''
|
||||
make man
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
gzip -c didder.1 > $out/share/man/man1/didder.1.gz
|
||||
'';
|
||||
|
||||
meta = src.meta // {
|
||||
description =
|
||||
"An extensive, fast, and accurate command-line image dithering tool";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mmv-go";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "mmv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5pVjonlVhIzov8YXgXIqpV3Hy/2ikW4YXJfz68zdxVo=";
|
||||
sha256 = "sha256-DNLiW0QX7WrBslwVCbvydLnE6JAcfcRALYqwsK/J5x0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XK+Puic5Bbb7QTc3SHltUuRfTTK7FpCEudN1+tVv18w=";
|
||||
vendorHash = "sha256-HHGiMSBu3nrIChSYaEu9i22nwhLKgVQkPvbTMHBWwAE=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ];
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.36.3";
|
||||
version = "1.36.4";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@ -82,7 +82,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-T4OBt47W0FTFmOQdp8T8CVlhrgmGP7pYYY1ijgfhzVA=";
|
||||
sha256 = "sha256-GAg5zj2ETXdXVfVwNvf4VjRVEHePNWf28xMDsTyjiEs=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nncp";
|
||||
version = "8.8.2";
|
||||
version = "8.8.3";
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
||||
sha256 = "02B98DC4654C46328A043209CD2DA28BF33A53BAF15574429C6C0747AE2FCF39";
|
||||
hash = "sha256-IldQCEdH6XDYK+DW5lB/5HFFFGuq1nDkCwEaVo7vIvE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go redo-apenwarr ];
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onefetch";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "o2sh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5d2u58i5VU+k1iC+bmiyKqe8qNTibryDxXNENxIflEI=";
|
||||
hash = "sha256-mIHaeEnMKOyEeEEkE5OZgQZWwFnm69GZui64iBZkfyo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PLxccKkJg9LNckAVG2iXU9XB1olAvVZQYRG8R6s+ibU=";
|
||||
cargoHash = "sha256-XFX3J/vgjboEu+xZWTkfo5jmZJkap1u3j9G9ewrzVqc=";
|
||||
|
||||
cargoPatches = [
|
||||
# enable pkg-config feature of zstd
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2039,6 +2039,7 @@ dependencies = [
|
||||
"tokei",
|
||||
"toml",
|
||||
@@ -2498,6 +2498,7 @@ dependencies = [
|
||||
"typetag",
|
||||
"winres",
|
||||
"yaml-rust",
|
||||
+ "zstd",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3286,4 +3287,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
||||
@@ -4052,4 +4053,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
@ -16,11 +16,11 @@
|
||||
]
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -58,6 +58,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
|
||||
@@ -49,6 +49,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
|
||||
tokei = "12.1.2"
|
||||
toml = "0.5.9"
|
||||
typetag = "0.2"
|
||||
yaml-rust = "0.4.5"
|
||||
+zstd = { version = "*", features = ["pkg-config"] }
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
enable-ansi-support = "0.1.2"
|
||||
[dev-dependencies]
|
||||
criterion = "0.4.0"
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parted";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parted/parted-${version}.tar.xz";
|
||||
sha256 = "sha256-STjdXBwSX2x4sfSz4pdSbxjudKpD1FwkhXix0kcMBaI=";
|
||||
sha256 = "sha256-O0Pb4zzKD5oYYB66tWt4UrEo7Bo986mzDM3l5zNZ5hI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" ];
|
||||
|
||||
@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2023.2";
|
||||
version = "2023.3";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-/C5la0b1plfqnsfSnfoSkSROIlAcvAfeg4m/PYV2UnY=";
|
||||
hash = "sha256-qIkGQqU+6EbSKmHwjZe+A1XsIZVnBQyM28DN9GFP/qE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-28";
|
||||
version = "2023-04-29";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1AF7TtPcciUX2RmxFsytzTMd22GfCH6Ccu+elcidgPw=";
|
||||
hash = "sha256-9GBGjpqsOe4FMcMg3whG/n9zF2h1M6LQp5bJHu0mu+E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.2.9";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-H9M4ZOQ/34GSDBYOqfzgJD/kz/PruLZn4NIKBdUJ370=";
|
||||
hash = "sha256-u4nftveDvwco5sZa21z4MHf/5F+M0cQUGffueeJpyL4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wQBLB5gASLOIDU7MMtex0TxYixfGBRnng5yCrr3TgjE=";
|
||||
vendorHash = "sha256-i/Fvuy9wzXot114BI0rIbLWDW70VEaDKGThTcTZLx1M=";
|
||||
|
||||
subPackages = [ "cmd/httpx" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
coreutils,
|
||||
libffi,
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, coreutils
|
||||
, libffi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "txr";
|
||||
version = "284";
|
||||
version = "285";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-dlAOThO2sJspkSYmR927iu13y3XRSllIGVh7ufu8ROU=";
|
||||
hash = "sha256-cI1wjxKPivTXwCSuhl6sIuRk68ZBUsOWTjQktGmmP6M=";
|
||||
};
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm ${disabledTests}
|
||||
'';
|
||||
|
||||
# TODO: ship vim plugin separately?
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/vim-plugins/txr/{syntax,ftdetect}
|
||||
|
||||
@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s $out/share/vim-plugins/txr $out/share/nvim/site
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://nongnu.org/txr";
|
||||
description = "An Original, New Programming Language for Convenient Data Munging";
|
||||
longDescription = ''
|
||||
@ -67,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
application development in a wide range of areas.
|
||||
'';
|
||||
changelog = "https://www.kylheku.com/cgit/txr/tree/RELNOTES?h=txr-${finalAttrs.version}";
|
||||
license = licenses.bsd2;
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres dtzWill ];
|
||||
platforms = platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@ -3,35 +3,39 @@
|
||||
, lib
|
||||
, wl-clipboard
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clipman";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yory8";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aZvtgeaS3xxl5/A/Pwlbu0sI7bw2MONbEIK42IDcMy0=";
|
||||
sha256 = "sha256-lahya0w1bgcTnpxANxNT2MIWu5yVUdqQl19kQzwUdAw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI=";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/clipman \
|
||||
--prefix PATH : ${lib.makeBinPath [ wl-clipboard ]}
|
||||
installManPage docs/*.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/yory8/clipman";
|
||||
description = "A simple clipboard manager for Wayland";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4497,6 +4497,8 @@ with pkgs;
|
||||
|
||||
dibbler = callPackage ../tools/networking/dibbler { };
|
||||
|
||||
didder = callPackage ../tools/graphics/didder { };
|
||||
|
||||
dieharder = callPackage ../tools/security/dieharder { };
|
||||
|
||||
diesel-cli = callPackage ../development/tools/diesel-cli {
|
||||
@ -24156,6 +24158,10 @@ with pkgs;
|
||||
hdf5 = hdf5.override { usev110Api = true; };
|
||||
};
|
||||
|
||||
vkd3d = callPackage ../development/libraries/vkd3d {};
|
||||
|
||||
vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {};
|
||||
|
||||
vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
|
||||
|
||||
vkdt = callPackage ../applications/graphics/vkdt { };
|
||||
@ -32205,7 +32211,11 @@ with pkgs;
|
||||
|
||||
moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
|
||||
|
||||
moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { };
|
||||
moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt {
|
||||
SDL2 = buildPackages.SDL2.override {
|
||||
drmSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
mooSpace = callPackage ../applications/audio/mooSpace { };
|
||||
|
||||
@ -35544,9 +35554,7 @@ with pkgs;
|
||||
boost = boost17x;
|
||||
};
|
||||
|
||||
solana-testnet = callPackage ../applications/blockchains/solana {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit;
|
||||
};
|
||||
solana-cli = callPackage ../applications/blockchains/solana { };
|
||||
|
||||
solana-validator = callPackage ../applications/blockchains/solana-validator {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit;
|
||||
|
||||
@ -9609,6 +9609,8 @@ self: super: with self; {
|
||||
|
||||
python-lsp-jsonrpc = callPackage ../development/python-modules/python-lsp-jsonrpc { };
|
||||
|
||||
python-lsp-ruff = callPackage ../development/python-modules/python-lsp-ruff { };
|
||||
|
||||
python-lsp-server = callPackage ../development/python-modules/python-lsp-server { };
|
||||
|
||||
python-ly = callPackage ../development/python-modules/python-ly { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user