Merge staging-next into staging
This commit is contained in:
commit
e8fb7d56a7
|
@ -10673,6 +10673,12 @@
|
||||||
githubId = 84886;
|
githubId = 84886;
|
||||||
name = "Paul Baecher";
|
name = "Paul Baecher";
|
||||||
};
|
};
|
||||||
|
pbar = {
|
||||||
|
email = "piercebartine@gmail.com";
|
||||||
|
github = "pbar1";
|
||||||
|
githubId = 26949935;
|
||||||
|
name = "Pierce Bartine";
|
||||||
|
};
|
||||||
pbogdan = {
|
pbogdan = {
|
||||||
email = "ppbogdan@gmail.com";
|
email = "ppbogdan@gmail.com";
|
||||||
github = "pbogdan";
|
github = "pbogdan";
|
||||||
|
|
|
@ -6,12 +6,12 @@ with python3Packages;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "miniplayer";
|
pname = "miniplayer";
|
||||||
version = "1.7.1";
|
version = "1.7.3";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-NrIDv61mRDe9JWpSP8cvlU4CGoN6Ou6XuNOIn1p47Pw=";
|
hash = "sha256-GxbsDIZ5LvxMqbDC81rerrk0mn94qHlX1uxrNL+vxSU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "stochas";
|
pname = "stochas";
|
||||||
version = "1.3.5";
|
version = "1.3.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "surge-synthesizer";
|
owner = "surge-synthesizer";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1z8q53qfigw6wwbvpca92b9pf9d0mv3nyb0fmszz5ikj3pcybi7m";
|
sha256 = "sha256-/YT2M/VbkABjFvtTjGPWaSKUZaznMIYKXV6gNSD2PeU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "itd";
|
pname = "itd";
|
||||||
version = "0.0.9";
|
version = "1.0.0";
|
||||||
|
|
||||||
# https://gitea.arsenm.dev/Arsen6331/itd/tags
|
# https://gitea.arsenm.dev/Arsen6331/itd/tags
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
|
@ -14,10 +14,10 @@ buildGoModule rec {
|
||||||
owner = "Arsen6331";
|
owner = "Arsen6331";
|
||||||
repo = "itd";
|
repo = "itd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-FefffF8YIEcB+eglifNWuuK7H5A1YXyxxZOXz1a8HfY=";
|
hash = "sha256-von/gvKnm69r/Z3Znm9IW97LfRq4v1cpv5z05h0ahek=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-LFzrpKQQ4nFoK4vVTzJDQ5OGDe1y5BSfXPX+FRVunjQ=";
|
vendorHash = "sha256-Sj1ASrb80AgZDfIwmSspArRXSaxP8FlXYi9xyWfCYWk=";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
echo r${version} > version.txt
|
echo r${version} > version.txt
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cilium-cli";
|
pname = "cilium-cli";
|
||||||
version = "0.12.7";
|
version = "0.12.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cilium";
|
owner = "cilium";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-libZapDj6Y/tGJEXAX3iZH2+pS64dg7IUsgTxT0Z6JA=";
|
sha256 = "sha256-o479F2xRFlX69lu4WJW56oZ9QEQkSk1jG2bedcdOJqI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cmctl";
|
pname = "cmctl";
|
||||||
version = "1.10.0";
|
version = "1.10.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cert-manager";
|
owner = "cert-manager";
|
||||||
repo = "cert-manager";
|
repo = "cert-manager";
|
||||||
rev = "da3265115bfd8be5780801cc6105fa857ef71965";
|
rev = "a96bae172ddb1fcd4b57f1859ab9d1a9e94f7451";
|
||||||
sha256 = "0s6nki61crx62v6ypmm0yjbyy71ygifffhkp5554jh4g9hvcfbmr";
|
sha256 = "0wj2fshkfdrqrjyq3khzpdjiw5x3djjw9x7qq8mdgzyj84cmz11w";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4=";
|
vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4=";
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubo";
|
pname = "kubo";
|
||||||
version = "0.16.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
version = "0.17.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version
|
passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version
|
||||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||||
# Kubo makes changes to it's source tarball that don't match the git source.
|
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||||
hash = "sha256-FS7lwQS7ybyoIKPkcUtPIe3srO1O/cZN+x1nzWUlF20=";
|
hash = "sha256-Ls46Dds8lRP2KTOkjiVWtqB8aqPW5jdQ/xwBcQYIwbQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# tarball contains multiple files/directories
|
# tarball contains multiple files/directories
|
||||||
|
|
|
@ -12,7 +12,7 @@ let
|
||||||
version = "0.7.0";
|
version = "0.7.0";
|
||||||
src = old.src.override {
|
src = old.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s";
|
hash = "sha256-ejyIIBqlRIH5OZRlYVy+e5rs6AgUlqbQKHt8uOIy9Ec=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,16 +12,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "gitui";
|
pname = "gitui";
|
||||||
version = "0.22.0";
|
version = "0.22.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "extrawurst";
|
owner = "extrawurst";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ZLGA0LHdGPqIoNG2k4nunVWYlOnwRT8nqTSwUWGkfCU=";
|
sha256 = "sha256-K6xWTPu2a5NKYAYBt/sCWQOmuw9TCoKPA4ZxkoLWmeY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-ArJerq3gLzPm66RWDCvkpPFyh7ZyaoqLO/3zSjFTL04=";
|
cargoSha256 = "sha256-MZrx72poA6uOIulWIQkfOr9gy5qr5f61UtLITfES/rk=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
7768
pkgs/applications/version-management/sapling/Cargo.lock
generated
Normal file
7768
pkgs/applications/version-management/sapling/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
141
pkgs/applications/version-management/sapling/default.nix
Normal file
141
pkgs/applications/version-management/sapling/default.nix
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
{ lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, sd, curl, pkg-config, openssl, rustPlatform, fetchYarnDeps, yarn, nodejs, fixup_yarn_lock }:
|
||||||
|
|
||||||
|
let
|
||||||
|
deps = import ./deps.nix { inherit lib fetchurl; };
|
||||||
|
version = deps.version;
|
||||||
|
versionHash = deps.versionHash;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "facebook";
|
||||||
|
repo = "sapling";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-IzbUaFrsSMojhsbpnRj1XLkhO9V2zYdmmZls4mtZquw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
addonsSrc = "${src}/addons";
|
||||||
|
|
||||||
|
# Fetches the Yarn modules in Nix to to be used as an offline cache
|
||||||
|
yarnOfflineCache = fetchYarnDeps {
|
||||||
|
yarnLock = "${addonsSrc}/yarn.lock";
|
||||||
|
sha256 = "sha256-B61T0ReZPRfrRjBC3iHLVkVYiifhzOXlaG1YL6rgmj4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Builds the NodeJS server that runs with `sl web`
|
||||||
|
isl = stdenv.mkDerivation {
|
||||||
|
pname = "sapling-isl";
|
||||||
|
src = addonsSrc;
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
fixup_yarn_lock
|
||||||
|
nodejs
|
||||||
|
yarn
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
fixup_yarn_lock yarn.lock
|
||||||
|
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
|
||||||
|
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||||
|
patchShebangs node_modules
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out
|
||||||
|
cd isl
|
||||||
|
node release.js $out
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# Builds the main `sl` binary and its Python extensions
|
||||||
|
sapling = python3Packages.buildPythonPackage {
|
||||||
|
pname = "sapling-main";
|
||||||
|
inherit src version;
|
||||||
|
|
||||||
|
sourceRoot = "source/eden/scm";
|
||||||
|
|
||||||
|
# Upstream does not commit Cargo.lock
|
||||||
|
cargoDeps = rustPlatform.importCargoLock {
|
||||||
|
lockFile = ./Cargo.lock;
|
||||||
|
outputHashes = {
|
||||||
|
"cloned-0.1.0" = "sha256-c3CPWVjOk+VKBLD6WuaYZvBoKi5PwgXmiwxKoCk0bsI=";
|
||||||
|
"deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs=";
|
||||||
|
"fb303_core-0.0.0" = "sha256-yoKKSBwqufFayLef2rRpX5oV1j8fL/kRkXBXIC++d7Q=";
|
||||||
|
"fbthrift-0.0.1+unstable" = "sha256-jtsDE5U/OavDUXRAE1N8/nujSPrWltImsFLzHaxfeM0=";
|
||||||
|
"reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE=";
|
||||||
|
"serde_bser-0.3.1" = "sha256-KCAC+rbczroZn/oKYTVpAPJl40yMrszt/PGol+JStDU=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
postPatch = ''
|
||||||
|
cp ${./Cargo.lock} Cargo.lock
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Since the derivation builder doesn't have network access to remain pure,
|
||||||
|
# fetch the artifacts manually and link them. Then replace the hardcoded URLs
|
||||||
|
# with filesystem paths for the curl calls.
|
||||||
|
postUnpack = ''
|
||||||
|
mkdir $sourceRoot/hack_pydeps
|
||||||
|
( cd $sourceRoot/hack_pydeps
|
||||||
|
${deps.links}
|
||||||
|
)
|
||||||
|
sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
curl
|
||||||
|
pkg-config
|
||||||
|
] ++ (with rustPlatform; [
|
||||||
|
cargoSetupHook
|
||||||
|
rust.cargo
|
||||||
|
rust.rustc
|
||||||
|
]);
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
openssl
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
HGNAME = "sl";
|
||||||
|
SAPLING_OSS_BUILD = "true";
|
||||||
|
SAPLING_VERSION = version;
|
||||||
|
SAPLING_VERSION_HASH = versionHash;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "sapling";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out
|
||||||
|
|
||||||
|
cp -r ${sapling}/* $out
|
||||||
|
|
||||||
|
sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages
|
||||||
|
chmod +w $sitepackages
|
||||||
|
cp -r ${isl} $sitepackages/edenscm-isl
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A Scalable, User-Friendly Source Control System";
|
||||||
|
homepage = "https://sapling-scm.com";
|
||||||
|
license = licenses.gpl2Only;
|
||||||
|
maintainers = with maintainers; [ pbar ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
mainProgram = "sl";
|
||||||
|
};
|
||||||
|
}
|
104
pkgs/applications/version-management/sapling/deps.nix
generated
Normal file
104
pkgs/applications/version-management/sapling/deps.nix
generated
Normal file
|
@ -0,0 +1,104 @@
|
||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# Generated by `gen-deps`
|
||||||
|
|
||||||
|
{ lib, fetchurl }:
|
||||||
|
let
|
||||||
|
ptyprocess = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab";
|
||||||
|
};
|
||||||
|
pexpect = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b";
|
||||||
|
};
|
||||||
|
ipython = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl";
|
||||||
|
sha256 = "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d";
|
||||||
|
};
|
||||||
|
simplegeneric = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
|
||||||
|
sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
|
||||||
|
};
|
||||||
|
toml = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl";
|
||||||
|
sha256 = "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0";
|
||||||
|
};
|
||||||
|
colorama = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl";
|
||||||
|
sha256 = "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz";
|
||||||
|
};
|
||||||
|
backcall = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v";
|
||||||
|
};
|
||||||
|
setuptools = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl";
|
||||||
|
sha256 = "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8";
|
||||||
|
};
|
||||||
|
wcwidth = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl";
|
||||||
|
sha256 = "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y";
|
||||||
|
};
|
||||||
|
prompt_toolkit = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl";
|
||||||
|
sha256 = "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26";
|
||||||
|
};
|
||||||
|
decorator = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl";
|
||||||
|
sha256 = "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f";
|
||||||
|
};
|
||||||
|
pickleshare = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn";
|
||||||
|
};
|
||||||
|
Pygments = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl";
|
||||||
|
sha256 = "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn";
|
||||||
|
};
|
||||||
|
traitlets = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h";
|
||||||
|
};
|
||||||
|
six = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl";
|
||||||
|
sha256 = "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa";
|
||||||
|
};
|
||||||
|
ipython_genutils = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl";
|
||||||
|
sha256 = "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj";
|
||||||
|
};
|
||||||
|
ipdb = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz";
|
||||||
|
sha256 = "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm";
|
||||||
|
};
|
||||||
|
Cython = fetchurl {
|
||||||
|
url = "https://files.pythonhosted.org/packages/bc/fa/8604d92ef753e0036d807f1b3179813ab2fa283e3b19c926e11673c8205b/Cython-0.29.26.tar.gz";
|
||||||
|
sha256 = "04m31z011arz2b70rwwkhvzkb9d4yxcfbxpw27d6fa3n79a7sdxg";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
links = ''
|
||||||
|
ln -s ${ptyprocess} ptyprocess-0.7.0-py2.py3-none-any.whl
|
||||||
|
ln -s ${pexpect} pexpect-4.8.0-py2.py3-none-any.whl
|
||||||
|
ln -s ${ipython} ipython-7.16.1-py3-none-any.whl
|
||||||
|
ln -s ${simplegeneric} simplegeneric-0.8.1.zip
|
||||||
|
ln -s ${toml} toml-0.10.2-py2.py3-none-any.whl
|
||||||
|
ln -s ${colorama} colorama-0.4.4-py2.py3-none-any.whl
|
||||||
|
ln -s ${backcall} backcall-0.2.0-py2.py3-none-any.whl
|
||||||
|
ln -s ${setuptools} setuptools-57.0.0-py3-none-any.whl
|
||||||
|
ln -s ${wcwidth} wcwidth-0.2.5-py2.py3-none-any.whl
|
||||||
|
ln -s ${prompt_toolkit} prompt_toolkit-2.0.10-py3-none-any.whl
|
||||||
|
ln -s ${decorator} decorator-5.0.9-py3-none-any.whl
|
||||||
|
ln -s ${pickleshare} pickleshare-0.7.5-py2.py3-none-any.whl
|
||||||
|
ln -s ${Pygments} Pygments-2.9.0-py3-none-any.whl
|
||||||
|
ln -s ${traitlets} traitlets-4.3.3-py2.py3-none-any.whl
|
||||||
|
ln -s ${six} six-1.16.0-py2.py3-none-any.whl
|
||||||
|
ln -s ${ipython_genutils} ipython_genutils-0.2.0-py2.py3-none-any.whl
|
||||||
|
ln -s ${ipdb} ipdb-0.13.9.tar.gz
|
||||||
|
ln -s ${Cython} Cython-0.29.26.tar.gz
|
||||||
|
'';
|
||||||
|
|
||||||
|
version = "0.1.20221118-210929-cfbb68aa";
|
||||||
|
|
||||||
|
versionHash = "5535144625961033752";
|
||||||
|
}
|
87
pkgs/applications/version-management/sapling/gen-deps
Executable file
87
pkgs/applications/version-management/sapling/gen-deps
Executable file
|
@ -0,0 +1,87 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" nixpkgs-fmt
|
||||||
|
|
||||||
|
# vim: set syntax=python:
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
import struct
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
|
gen_file = "deps.nix"
|
||||||
|
repo = "facebook/sapling"
|
||||||
|
source_file = "eden/scm/setup.py"
|
||||||
|
|
||||||
|
# Fetch the latest stable release metadata from GitHub
|
||||||
|
latest = requests.get(f"https://api.github.com/repos/{repo}/releases/latest").text
|
||||||
|
latest = json.loads(latest)
|
||||||
|
|
||||||
|
# Find latest's git tag which corresponds to the Sapling version. Also needed
|
||||||
|
# is a hash of the version, so calculate that here. Taken from Sapling source
|
||||||
|
# `$root/eden/scm/setup_with_version.py`.
|
||||||
|
version = str(latest["tag_name"])
|
||||||
|
version_hash = str(
|
||||||
|
struct.unpack(">Q", hashlib.sha1(version.encode("ascii")).digest()[:8])[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
# Fetch the `setup.py` source and look for instances of assets being downloaded
|
||||||
|
# from files.pythonhosted.org.
|
||||||
|
source = requests.get(
|
||||||
|
f"https://raw.githubusercontent.com/{repo}/{version}/{source_file}"
|
||||||
|
).text
|
||||||
|
matches = re.findall(
|
||||||
|
r'(https://files\.pythonhosted\.org/packages/.*?/.*?/.*?/)(.*?)(-.*?)"', source
|
||||||
|
)
|
||||||
|
|
||||||
|
# For each matched asset URL, prefetch said asset and build the corresponding
|
||||||
|
# Nix code needed to call `fetchurl` and perform symlinks in the actual build.
|
||||||
|
assets = ""
|
||||||
|
links = ""
|
||||||
|
for m in matches:
|
||||||
|
sha256 = (
|
||||||
|
subprocess.Popen(
|
||||||
|
["nix-prefetch-url", "--type", "sha256", f"{m[0]}{m[1]}{m[2]}"],
|
||||||
|
text=True,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
.stdout.read()
|
||||||
|
.strip()
|
||||||
|
)
|
||||||
|
assets += """ {} = fetchurl {{
|
||||||
|
url = "{}{}{}";
|
||||||
|
sha256 = "{}";
|
||||||
|
}};\n""".format(
|
||||||
|
m[1], m[0], m[1], m[2], sha256
|
||||||
|
)
|
||||||
|
links += " ln -s ${{{}}} {}{}\n".format(m[1], m[1], m[2])
|
||||||
|
assets = assets.strip()
|
||||||
|
links = links.strip()
|
||||||
|
|
||||||
|
# Render an autogenerated Nix file with the fetched dependency and version
|
||||||
|
# information for import in the main derivation.
|
||||||
|
out = f"""
|
||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# Generated by `gen-deps`
|
||||||
|
|
||||||
|
{{ lib, fetchurl }}:
|
||||||
|
let
|
||||||
|
{assets}
|
||||||
|
in
|
||||||
|
{{
|
||||||
|
links = ''
|
||||||
|
{links}
|
||||||
|
'';
|
||||||
|
|
||||||
|
version = "{version}";
|
||||||
|
|
||||||
|
versionHash = "{version_hash}";
|
||||||
|
}}
|
||||||
|
"""
|
||||||
|
with open(gen_file, "w+") as f:
|
||||||
|
f.write(out.strip())
|
||||||
|
|
||||||
|
# Formamt the generated Nix file, which also serves as a syntax sanity check.
|
||||||
|
subprocess.run(["nixpkgs-fmt", gen_file], check=True)
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "sub-batch";
|
pname = "sub-batch";
|
||||||
version = "1.0.0";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kl";
|
owner = "kl";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI=";
|
sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0=";
|
cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cmdstan";
|
pname = "cmdstan";
|
||||||
version = "2.30.1";
|
version = "2.31.0";
|
||||||
|
|
||||||
# includes stanc binaries needed to build cmdstand
|
# includes stanc binaries needed to build cmdstand
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
|
url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
|
||||||
sha256 = "sha256-urdtzvp/TJVVlcC/BJZ3BQf8arDfWJboz4wtsKF+7bk=";
|
sha256 = "sha256-BMqRRWIC/Z7It2qkESJd9L3ycyxvA6NHiWbAvzVMzIQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildFlags = [ "build" ];
|
buildFlags = [ "build" ];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||||
, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif
|
, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif
|
||||||
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
|
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
|
||||||
, gtk2, gitUpdater, libebur128
|
, gtk2, gitUpdater, libebur128, rubberband
|
||||||
, jack2, ladspa-sdk, swig, which, ncurses
|
, jack2, ladspa-sdk, swig, which, ncurses
|
||||||
, enablePython ? false, python3
|
, enablePython ? false, python3
|
||||||
}:
|
}:
|
||||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
|
SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
|
||||||
movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2
|
movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2
|
||||||
ladspa-sdk
|
ladspa-sdk rubberband
|
||||||
] ++ lib.optional enablePython ncurses;
|
] ++ lib.optional enablePython ncurses;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config makeWrapper which ]
|
nativeBuildInputs = [ pkg-config makeWrapper which ]
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
, ladspa-sdk
|
, ladspa-sdk
|
||||||
, gitUpdater
|
, gitUpdater
|
||||||
, ladspaPlugins
|
, ladspaPlugins
|
||||||
|
, rubberband
|
||||||
, mkDerivation
|
, mkDerivation
|
||||||
, which
|
, which
|
||||||
}:
|
}:
|
||||||
|
@ -53,6 +54,7 @@ mkDerivation rec {
|
||||||
opencv3
|
opencv3
|
||||||
ladspa-sdk
|
ladspa-sdk
|
||||||
ladspaPlugins
|
ladspaPlugins
|
||||||
|
rubberband
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake which pkg-config ];
|
nativeBuildInputs = [ cmake which pkg-config ];
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "brev-cli";
|
pname = "brev-cli";
|
||||||
version = "0.6.179";
|
version = "0.6.181";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "brevdev";
|
owner = "brevdev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-vU4pEVH6y72Z8H3QgrgxTp0tofAOMGUnez3Q343EOXw=";
|
sha256 = "sha256-p1H/aTxOK+glnjM9FsnW3jCtL6zQsH3yaZWH2BZr3ms=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8=";
|
vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8=";
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "adafruit-platformdetect";
|
pname = "adafruit-platformdetect";
|
||||||
version = "3.34.0";
|
version = "3.35.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "Adafruit-PlatformDetect";
|
pname = "Adafruit-PlatformDetect";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-3eOYkzeEKC5xTUt5RF5Sm4TKZREu4YiXBrrD3c0Z8+0=";
|
hash = "sha256-B0WxkloPTjILXfLl2FgoE9/7OkVdxU05mKAYcoPqCxM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boschshcpy";
|
pname = "boschshcpy";
|
||||||
version = "0.2.36";
|
version = "0.2.37";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||||
owner = "tschamm";
|
owner = "tschamm";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-X/nlu/hwdgmUOw7+hALRhyCG/vphnWAK22fSWuUAjs0=";
|
sha256 = "sha256-ax1tdqxY4VPuNdH9lJKh5Izmu03XALJ93x5zmSCbeJk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "FireflyAlgorithm";
|
pname = "FireflyAlgorithm";
|
||||||
version = "0.3.2";
|
version = "0.3.3";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "firefly-cpp";
|
owner = "firefly-cpp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-IlOIoP2aANE8y3+Qtb/H6w/+REnPWiUUQGRiAfxOpcM=";
|
sha256 = "sha256-C2bm2Eb2kqfCnGORAzHX7hh4qj1MtDSkAu77lcZWQKc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "generic";
|
pname = "generic";
|
||||||
version = "1.1.0";
|
version = "1.1.1";
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-/947oEvZSD5mjRD9qcuzKAFativTmaeejXxQ322UD+A=";
|
sha256 = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mitmproxy-wireguard";
|
pname = "mitmproxy-wireguard";
|
||||||
version = "0.1.18";
|
version = "0.1.19";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "decathorpe";
|
owner = "decathorpe";
|
||||||
repo = "mitmproxy_wireguard";
|
repo = "mitmproxy_wireguard";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-vDexI9ihZhisbtt7k9epYD3RjPUaUnEX1TuDQDHZO8A=";
|
hash = "sha256-6LgA8IaUCfScEr+tEG5lkt0MnWoA9Iab4kAseUvZFFo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-iVrF+9D4HHRx1E10GbGftcmil3Epw6iuRdf2m2o+/u8=";
|
hash = "sha256-wuroElBc0LQL0gf+P6Nffv3YsyDJliXksZCgcBfK0iw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Module has no tests, only a test client
|
# Module has no tests, only a test client
|
||||||
|
|
|
@ -1,22 +1,26 @@
|
||||||
{ absl-py
|
{ lib
|
||||||
|
, absl-py
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, chex
|
, chex
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, jaxlib
|
, jaxlib
|
||||||
, lib
|
|
||||||
, numpy
|
, numpy
|
||||||
, callPackage
|
, callPackage
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "optax";
|
pname = "optax";
|
||||||
version = "0.1.3";
|
version = "0.1.4";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "deepmind";
|
owner = "deepmind";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-XAYztMBQpLBHNuNED/iodbwIMJSN/0GxdmTGQ5jD9Ws=";
|
hash = "sha256-BvmRFA1KNS7F6kozH9LMG8v4XJY/T2DwKgf9IIY2shE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
@ -24,7 +28,9 @@ buildPythonPackage rec {
|
||||||
"testsout"
|
"testsout"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ jaxlib ];
|
buildInputs = [
|
||||||
|
jaxlib
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
absl-py
|
absl-py
|
||||||
|
@ -49,8 +55,9 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Optax is a gradient processing and optimization library for JAX.";
|
description = "Gradient processing and optimization library for JAX";
|
||||||
homepage = "https://github.com/deepmind/optax";
|
homepage = "https://github.com/deepmind/optax";
|
||||||
|
changelog = "https://github.com/deepmind/optax/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ ndl ];
|
maintainers = with maintainers; [ ndl ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, setuptools
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "patiencediff";
|
pname = "patiencediff";
|
||||||
version = "0.2.6";
|
version = "0.2.8";
|
||||||
format = "setuptools";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
@ -16,9 +17,13 @@ buildPythonPackage rec {
|
||||||
owner = "breezy-team";
|
owner = "breezy-team";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-oJOsqZ9XCbYHJ7VEbDpC9wquCkvfj05M0nerlV5jL7w=";
|
hash = "sha256-RmybTW2QENtZYzqe/hlMV8hKX+l0kGNS5PmEPCF/F0U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "persistent";
|
pname = "persistent";
|
||||||
version = "4.9.2";
|
version = "4.9.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-8j6yXqRbvKa/YgSwKKCn6qFz0ngdaP9XzVhhzBoNDtA=";
|
hash = "sha256-piFSIf6zlV1IX6kMe87E+yllDOOco9DBEmcQOS4Nwtw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Automatic persistence for Python objects";
|
description = "Automatic persistence for Python objects";
|
||||||
homepage = "https://github.com/zopefoundation/persistent/";
|
homepage = "https://github.com/zopefoundation/persistent/";
|
||||||
|
changelog = "https://github.com/zopefoundation/persistent/blob/${version}/CHANGES.rst";
|
||||||
license = licenses.zpl21;
|
license = licenses.zpl21;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pex";
|
pname = "pex";
|
||||||
version = "2.1.113";
|
version = "2.1.114";
|
||||||
format = "flit";
|
format = "flit";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-FykzeHQjBMBZ+NqOMzjwHiOCMLk1rvomjUaoHco2ZQg=";
|
hash = "sha256-EfeoSik6vYQS4MAulfM2xfRUGYG308QzWAj4buCXX4U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -31,6 +31,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library and tool for generating .pex (Python EXecutable) files";
|
description = "Python library and tool for generating .pex (Python EXecutable) files";
|
||||||
homepage = "https://github.com/pantsbuild/pex";
|
homepage = "https://github.com/pantsbuild/pex";
|
||||||
|
changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ copumpkin ];
|
maintainers = with maintainers; [ copumpkin ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "plaid-python";
|
pname = "plaid-python";
|
||||||
version = "11.1.0";
|
version = "11.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-TgSdhBcXxV8bNeKb1v8WVBRknm9qi6iRjWxdW5JZeew=";
|
hash = "sha256-hybWKNy1qicBcTiEc46iwJ/JhNVxqz9ZSSkR4Zm9m6I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pycmarkgfm";
|
pname = "pycmarkgfm";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
|
format = "setuptools";
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "694cb242f4961437c30b5b015dfbce9d1a1fa48305c2e39f902ce7c65b4cbe0e";
|
sha256 = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedNativeBuildInputs = [ cffi ];
|
propagatedNativeBuildInputs = [ cffi ];
|
||||||
|
@ -27,6 +28,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/zopieux/pycmarkgfm";
|
homepage = "https://github.com/zopieux/pycmarkgfm";
|
||||||
description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists";
|
description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists";
|
||||||
|
changelog = "https://github.com/zopieux/pycmarkgfm/raw/v${version}/CHANGELOG.md";
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ zopieux ];
|
maintainers = with maintainers; [ zopieux ];
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-homewizard-energy";
|
pname = "python-homewizard-energy";
|
||||||
version = "1.2.0";
|
version = "1.3.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "DCSBL";
|
owner = "DCSBL";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-tFIqlPeRMB0Q9XpA5zBBzjo0Dw2bhnYdJsXvl0A04vY=";
|
hash = "sha256-rj3WTDj2ey8unOxXkD4zbqwd0FDcyHPzsDrjtX7myj4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -10,11 +10,12 @@
|
||||||
, pytest-mock
|
, pytest-mock
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, typing-extensions
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "regenmaschine";
|
pname = "regenmaschine";
|
||||||
version = "2022.11.0";
|
version = "2022.11.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -23,7 +24,7 @@ buildPythonPackage rec {
|
||||||
owner = "bachya";
|
owner = "bachya";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-aCgMAaur2ljjiQ7tt/gXm/Vt+o6j/MsCOLN661CkFw4=";
|
hash = "sha256-Sm9gd5ezqrgcpDYJlFyEtzFmY29MbdY+pjWu6c86Rfg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
aiohttp
|
aiohttp
|
||||||
|
typing-extensions
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
@ -57,6 +59,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library for interacting with RainMachine smart sprinkler controllers";
|
description = "Python library for interacting with RainMachine smart sprinkler controllers";
|
||||||
homepage = "https://github.com/bachya/regenmaschine";
|
homepage = "https://github.com/bachya/regenmaschine";
|
||||||
|
changelog = "https://github.com/bachya/regenmaschine/releases/tag/${version}";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, tox, numpy }:
|
{ lib, buildPythonPackage, fetchPypi, numpy }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sgp4";
|
pname = "sgp4";
|
||||||
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||||
sha256 = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8=";
|
sha256 = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ tox numpy ];
|
checkInputs = [ numpy ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "sgp4" ];
|
pythonImportsCheck = [ "sgp4" ];
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "devbox";
|
pname = "devbox";
|
||||||
version = "0.1.0";
|
version = "0.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jetpack-io";
|
owner = "jetpack-io";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-TxHfgi3/Q4aa5of29OGTs1Qy5PPIK4Gcwd11KJ70NIc=";
|
hash = "sha256-E2zryUE7DyDDC4DecxCNG24hOndFKDJ2qP8h2bbPnfg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||||
# integration tests want file system access
|
# integration tests want file system access
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
vendorHash = "sha256-XeoQI5Rel0qP9cjguPqne7pfNdQJKN+uHRZGnrIGtHk=";
|
vendorHash = "sha256-0Jshdi1hcY6dhGaZRE7okJvAM7EPsEFO6NA8k3jk4sA=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,12 @@ buildGoModule rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X main.version=${version}"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installShellCompletion completion/*
|
installShellCompletion completion/*
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -15,16 +15,16 @@ let
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "texlab";
|
pname = "texlab";
|
||||||
version = "4.3.1";
|
version = "4.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "latex-lsp";
|
owner = "latex-lsp";
|
||||||
repo = "texlab";
|
repo = "texlab";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU=";
|
sha256 = "sha256-og/kDSoMaTNi+EpTHEwOlEkT8Y/UL8nLiqwjDFAUACg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-nu2KltPgexBTxG13kUgHgMrxefPD+Gaj5qBIWWFPdFs=";
|
cargoSha256 = "sha256-g3Uzohcy2AS7ybdyZqKQR7ybmSQmit8I9klZ0UIhiv8=";
|
||||||
|
|
||||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
# generate the man page
|
# generate the man page
|
||||||
postInstall = lib.optionalString (!isCross) ''
|
postInstall = lib.optionalString (!isCross) ''
|
||||||
# TexLab builds man page separately in CI:
|
# TexLab builds man page separately in CI:
|
||||||
# https://github.com/latex-lsp/texlab/blob/v4.3.1/.github/workflows/publish.yml#L126-L130
|
# https://github.com/latex-lsp/texlab/blob/v4.3.2/.github/workflows/publish.yml#L126-L130
|
||||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||||
installManPage texlab.1
|
installManPage texlab.1
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "moq";
|
pname = "moq";
|
||||||
version = "0.2.7";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "matryer";
|
owner = "matryer";
|
||||||
repo = "moq";
|
repo = "moq";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-me/KD8bgzA+VU7WrfKlk8HZTInJqhijLAVTiZcJRzms=";
|
sha256 = "sha256-RdFffcj17CZdI6kL+d5fp8B8gX493k8h0EzDq8BN+SY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-XTe52pytjZYJALBOcnytA8z/d3UHSKcU1lJmJm8Iawo=";
|
vendorSha256 = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "zq";
|
pname = "zq";
|
||||||
version = "1.2.0";
|
version = "1.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "brimdata";
|
owner = "brimdata";
|
||||||
repo = "zed";
|
repo = "zed";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM=";
|
hash = "sha256-DVQoWam5szELJ3OeIKHYF0CBZ0AJlhuIJRrdhqmyhQM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70=";
|
vendorSha256 = "sha256-2zSSjAoeb+7Nk/dxpvp5P2/bSJXgkA0TieTQHK4ym1Y=";
|
||||||
|
|
||||||
subPackages = [ "cmd/zq" ];
|
subPackages = [ "cmd/zq" ];
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "unciv";
|
pname = "unciv";
|
||||||
version = "4.2.20";
|
version = "4.3.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||||
sha256 = "sha256-SsEOewFbJqad8OCRiE1VHOx7kVFtF4DEInE3ETCGxDM=";
|
sha256 = "sha256-qgjMQSkSYp/Tk9Acr21Nd5gLq9JLmEYsfSC+Ia362+c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "do-agent";
|
pname = "do-agent";
|
||||||
version = "3.13.1";
|
version = "3.14.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "digitalocean";
|
owner = "digitalocean";
|
||||||
repo = "do-agent";
|
repo = "do-agent";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-f8sUm80Rw9QU1fa8mdepw+zOWEP/UqWLSLtQmwKeB+Q=";
|
sha256 = "sha256-hwNr/yb41vd0cuLGsGJYEbBLE6WHay9d4TUp7fbN8Es=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.40.0";
|
version = "2.40.2";
|
||||||
webUiStatic = fetchurl {
|
webUiStatic = fetchurl {
|
||||||
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
||||||
sha256 = "sha256-1uNwGs/UmwMhST7LyDq4hUEW9Y6xpmvCDDT3f58r3d4=";
|
sha256 = "sha256-U8hAtuCx+yi4dlbS07orKJGf/GE4V50nlt3VPyEkznk=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -45,7 +45,7 @@ buildGoModule rec {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "prometheus";
|
repo = "prometheus";
|
||||||
sha256 = "sha256-QKeZ4N5I4VjTIT5WmEGt+gXt1Nnx3tzecLaSlhvGGuE=";
|
sha256 = "sha256-QVPLTJdGaJINFNtq63qVWVkk2cvpbdwRN5H0Y5kf00M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM=";
|
vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM=";
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "unifi-poller";
|
pname = "unifi-poller";
|
||||||
version = "2.1.9";
|
version = "2.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "unifi-poller";
|
owner = "unifi-poller";
|
||||||
repo = "unifi-poller";
|
repo = "unifi-poller";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-eC+jEtSLWhiL3V+GKfRN5MVF18/2tnA1kI096j3XQB0=";
|
hash = "sha256-jPatTo+5nQ73AETXI88x/bma0wlY333DNvuyaYQTgz0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8=";
|
vendorHash = "sha256-Y4FcBLdVB3AjJOpP2CuoNVAIxaqlZxHI0yKzp7Wqpwc=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-w" "-s"
|
"-w" "-s"
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "clair";
|
pname = "clair";
|
||||||
version = "4.5.0";
|
version = "4.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quay";
|
owner = "quay";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-/Czgdl6OxfXSQGvoanA8eoGdzK/wCgGH3wy5aLf0DSM=";
|
hash = "sha256-4S9r8ez67bmhjEMp3w2xJVgkFN12B+pcyYVLc5P2Il0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-XWsnEjVA/fqiLevn6sxjzlDfuy937idIcXdTY56FrdA=";
|
vendorSha256 = "sha256-Ly0U13C3WaGHRlu5Lj5MtdnTStTAJb4NUQpCY+7PeT0=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
mkPulumiPackage rec {
|
mkPulumiPackage rec {
|
||||||
owner = "pulumi";
|
owner = "pulumi";
|
||||||
repo = "pulumi-azure-native";
|
repo = "pulumi-azure-native";
|
||||||
version = "1.81.0";
|
version = "1.85.0";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-xiifVjvtt4bKi0fBYLU/Gfkx2tziLIq2vddRNWwuyz0=";
|
hash = "sha256-12JjDHYCxx/eQBIGpMO9FnjYFu54QT80zvivDYiHWjM=";
|
||||||
vendorHash = "sha256-VSwT5I5casJiBpXAcV9vLEWU9XWuDTktmfGqE6H/HX4=";
|
vendorHash = "sha256-RhZBvFjleVxskFcuNZcjcq9Hc+bLfBL9PsZg5rIPJ3Y=";
|
||||||
cmdGen = "pulumi-gen-azure-native";
|
cmdGen = "pulumi-gen-azure-native";
|
||||||
cmdRes = "pulumi-resource-azure-native";
|
cmdRes = "pulumi-resource-azure-native";
|
||||||
extraLdflags = [
|
extraLdflags = [
|
||||||
|
|
|
@ -14,16 +14,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pulumi";
|
pname = "pulumi";
|
||||||
version = "3.47.0";
|
version = "3.47.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-r0VPWVyyWGZ2v2yKKiJGJV+ah77zxFm7Zwm9yag3fxc=";
|
hash = "sha256-Px1PPCnVNHTMdKyj1kwdfdsc+Hpuqwcnsin0+tPNtfU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-eipxqX2m425FnPkf+ao/k1dYwDHDmJf+eS3S0sEiXkk=";
|
vendorSha256 = "sha256-cijM5R2Z/g3MJPOYDIeLSqTuVJvIKQbun+26FWHn2AI=";
|
||||||
|
|
||||||
sourceRoot = "source/pkg";
|
sourceRoot = "source/pkg";
|
||||||
|
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pgbackrest";
|
pname = "pgbackrest";
|
||||||
version = "2.41";
|
version = "2.42";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pgbackrest";
|
owner = "pgbackrest";
|
||||||
repo = "pgbackrest";
|
repo = "pgbackrest";
|
||||||
rev = "release/${version}";
|
rev = "release/${version}";
|
||||||
sha256 = "sha256-AaFctLXhzq3Wk+KjxskxazpNEX7UAmXeiJxhYXYwksk=";
|
sha256 = "sha256-uI2/2zxCDgzapiGbZe+Y1lsZAMjScomvxFw4Lj/R1A0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
{ lib, fetchFromGitHub, rustPlatform, stdenv, darwin, installShellFiles }:
|
{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rustic-rs";
|
pname = "rustic-rs";
|
||||||
version = "0.3.2";
|
version = "0.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rustic-rs";
|
owner = "rustic-rs";
|
||||||
repo = "rustic";
|
repo = "rustic";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-MGFtJUfPK6IH3w8xe/RZaXS+QDIVS3jFSnf4VYiSLM4=";
|
hash = "sha256-IyGSyyWhwxrevxWbnlfLVK0+Y1ZoKx2Dg1SRydG3nuo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-siJrqL7HjUQvcyXpUN5rQWNeQNBc+693N1xTSvlOixI=";
|
cargoHash = "sha256-AE6z8/RO18FppLwsuz38JF/asI9dOLYmAErj1jzM3JA=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];
|
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
for shell in {ba,fi,z}sh; do
|
for shell in {ba,fi,z}sh; do
|
||||||
|
@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
homepage = "https://github.com/rustic-rs/rustic";
|
homepage = "https://github.com/rustic-rs/rustic";
|
||||||
changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt";
|
changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt";
|
||||||
description = "fast, encrypted, deduplicated backups powered by pure Rust";
|
description = "fast, encrypted, deduplicated backups powered by pure Rust";
|
||||||
|
mainProgram = "rustic";
|
||||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||||
license = [ lib.licenses.mit lib.licenses.asl20 ];
|
license = [ lib.licenses.mit lib.licenses.asl20 ];
|
||||||
maintainers = [ lib.maintainers.nobbz ];
|
maintainers = [ lib.maintainers.nobbz ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pspg";
|
pname = "pspg";
|
||||||
version = "5.5.9";
|
version = "5.5.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "okbob";
|
owner = "okbob";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-/tzv5/UvIkIUbFAlbNUDSd90DvpjGPcMh5ooDfZal80=";
|
sha256 = "sha256-HJ/uvaFdQMVpc+QPK3r3RYExFz85QUjrz1Y2kIaoIAU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
, ncurses
|
, ncurses
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd
|
, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd
|
||||||
, utf8proc
|
, withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc
|
||||||
, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter
|
, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
ncurses
|
ncurses
|
||||||
libevent
|
libevent
|
||||||
] ++ lib.optionals withSystemd [ systemd ]
|
] ++ lib.optionals withSystemd [ systemd ]
|
||||||
++ lib.optionals stdenv.isDarwin [ utf8proc ]
|
++ lib.optionals withUtf8proc [ utf8proc ]
|
||||||
++ lib.optionals withUtempter [ libutempter ];
|
++ lib.optionals withUtempter [ libutempter ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
] ++ lib.optionals withSystemd [ "--enable-systemd" ]
|
] ++ lib.optionals withSystemd [ "--enable-systemd" ]
|
||||||
++ lib.optionals withUtempter [ "--enable-utempter" ]
|
++ lib.optionals withUtempter [ "--enable-utempter" ]
|
||||||
++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ];
|
++ lib.optionals withUtf8proc [ "--enable-utf8proc" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -5,14 +5,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "mitmproxy2swagger";
|
pname = "mitmproxy2swagger";
|
||||||
version = "0.7.0";
|
version = "0.7.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alufers";
|
owner = "alufers";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-tLLz3nGIzsE6bkHbMC+Cfevv7E/NNHxtYqCUwo/5yF4=";
|
hash = "sha256-morBtuRZZ/d3ye8aB+m2dSwWoaF3JJ92c+CgF71MqH4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with python3.pkgs; [
|
nativeBuildInputs = with python3.pkgs; [
|
||||||
|
@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool to automagically reverse-engineer REST APIs";
|
description = "Tool to automagically reverse-engineer REST APIs";
|
||||||
homepage = "https://github.com/alufers/mitmproxy2swagger";
|
homepage = "https://github.com/alufers/mitmproxy2swagger";
|
||||||
|
changelog = "https://github.com/alufers/mitmproxy2swagger/releases/tag/${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "zlint";
|
pname = "zlint";
|
||||||
version = "3.4.0";
|
version = "3.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zmap";
|
owner = "zmap";
|
||||||
repo = "zlint";
|
repo = "zlint";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-l39GdfEKUAw5DQNjx6ZBgfGtengRlUUasm0G07kAA2A=";
|
hash = "sha256-edCZQeBZelDfZGBZgevvJ8fgm1G2QFILJKB3778D7ac=";
|
||||||
};
|
};
|
||||||
|
|
||||||
modRoot = "v3";
|
modRoot = "v3";
|
||||||
|
@ -25,9 +25,8 @@ buildGoModule rec {
|
||||||
rm -rf v3/cmd/genTestCerts
|
rm -rf v3/cmd/genTestCerts
|
||||||
'';
|
'';
|
||||||
|
|
||||||
subPackages = [
|
excludedPackages = [
|
||||||
"cmd/zlint"
|
"lints"
|
||||||
"cmd/zlint-gtld-update"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
@ -36,9 +35,6 @@ buildGoModule rec {
|
||||||
"-X main.version=${version}"
|
"-X main.version=${version}"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Checks rely on .git directory, leaveDotGit makes the source derivation flaky.
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
passthru.tests.version = testers.testVersion {
|
passthru.tests.version = testers.testVersion {
|
||||||
package = zlint;
|
package = zlint;
|
||||||
command = "zlint -version";
|
command = "zlint -version";
|
||||||
|
|
|
@ -24470,7 +24470,7 @@ with pkgs;
|
||||||
|
|
||||||
roon-server = callPackage ../servers/roon-server { };
|
roon-server = callPackage ../servers/roon-server { };
|
||||||
|
|
||||||
rustic-rs = callPackage ../tools/backup/rustic-rs { };
|
rustic-rs = callPackage ../tools/backup/rustic-rs { inherit (darwin) Security; };
|
||||||
|
|
||||||
supervise = callPackage ../tools/system/supervise { };
|
supervise = callPackage ../tools/system/supervise { };
|
||||||
|
|
||||||
|
@ -30353,6 +30353,8 @@ with pkgs;
|
||||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sapling = callPackage ../applications/version-management/sapling { };
|
||||||
|
|
||||||
mercurialFull = mercurial.override { fullBuild = true; };
|
mercurialFull = mercurial.override { fullBuild = true; };
|
||||||
|
|
||||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||||
|
|
Loading…
Reference in a new issue