forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
commit
3b6f03e497
|
@ -7264,6 +7264,17 @@
|
||||||
githubId = 1267527;
|
githubId = 1267527;
|
||||||
name = "Daniel Firth";
|
name = "Daniel Firth";
|
||||||
};
|
};
|
||||||
|
lockejan = {
|
||||||
|
email = "git@smittie.de";
|
||||||
|
matrix = "@jan:smittie.de";
|
||||||
|
github = "lockejan";
|
||||||
|
githubId = 25434434;
|
||||||
|
name = "Jan Schmitt";
|
||||||
|
keys = [{
|
||||||
|
longkeyid = "dsa2048/0xA2BC3C6F14351991";
|
||||||
|
fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991";
|
||||||
|
}];
|
||||||
|
};
|
||||||
lodi = {
|
lodi = {
|
||||||
email = "anthony.lodi@gmail.com";
|
email = "anthony.lodi@gmail.com";
|
||||||
github = "lodi";
|
github = "lodi";
|
||||||
|
|
|
@ -45,7 +45,8 @@ in
|
||||||
};
|
};
|
||||||
instance = mkOption {
|
instance = mkOption {
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
default = null;
|
default = config.services.varnish.stateDir;
|
||||||
|
defaultText = lib.literalExpression "config.services.varnish.stateDir";
|
||||||
description = ''
|
description = ''
|
||||||
varnishstat -n value.
|
varnishstat -n value.
|
||||||
'';
|
'';
|
||||||
|
@ -66,7 +67,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
serviceOpts = {
|
serviceOpts = {
|
||||||
path = [ pkgs.varnish ];
|
path = [ config.services.varnish.package ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
RestartSec = mkDefault 1;
|
RestartSec = mkDefault 1;
|
||||||
DynamicUser = false;
|
DynamicUser = false;
|
||||||
|
|
|
@ -568,7 +568,7 @@ in {
|
||||||
"pvcreate /dev/vda1 /dev/vda2",
|
"pvcreate /dev/vda1 /dev/vda2",
|
||||||
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
|
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
|
||||||
"lvcreate --size 1G --name swap MyVolGroup",
|
"lvcreate --size 1G --name swap MyVolGroup",
|
||||||
"lvcreate --size 3G --name nixos MyVolGroup",
|
"lvcreate --size 6G --name nixos MyVolGroup",
|
||||||
"mkswap -f /dev/MyVolGroup/swap -L swap",
|
"mkswap -f /dev/MyVolGroup/swap -L swap",
|
||||||
"swapon -L swap",
|
"swapon -L swap",
|
||||||
"mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
|
"mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "hydrus";
|
pname = "hydrus";
|
||||||
version = "477";
|
version = "478";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hydrusnetwork";
|
owner = "hydrusnetwork";
|
||||||
repo = "hydrus";
|
repo = "hydrus";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-/Gehlk+eMBPA+OT7xsTri6PDi2PBmzjckMVbqPGXT64=";
|
sha256 = "sha256-ZsQzKc2fOFTzI/kBS8ws2+XT9kRAn4L55n1EZgVy4Kk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -27,6 +27,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
|
cbor2
|
||||||
chardet
|
chardet
|
||||||
cloudscraper
|
cloudscraper
|
||||||
html5lib
|
html5lib
|
||||||
|
|
|
@ -43,7 +43,7 @@ let
|
||||||
homepage = "https://github.com/kubernetes/kops";
|
homepage = "https://github.com/kubernetes/kops";
|
||||||
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
|
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ offline zimbatm diegolelis ];
|
maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
} // attrs';
|
} // attrs';
|
||||||
|
@ -52,12 +52,6 @@ rec {
|
||||||
|
|
||||||
mkKops = generic;
|
mkKops = generic;
|
||||||
|
|
||||||
kops_1_20 = mkKops rec {
|
|
||||||
version = "1.20.3";
|
|
||||||
sha256 = "sha256-Yrh0wFz7MQgTDwENqQouYh3pr1gOq64Rqft5yxIiCAo=";
|
|
||||||
rev = "v${version}";
|
|
||||||
};
|
|
||||||
|
|
||||||
kops_1_21 = mkKops rec {
|
kops_1_21 = mkKops rec {
|
||||||
version = "1.21.4";
|
version = "1.21.4";
|
||||||
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
|
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
|
||||||
|
@ -69,4 +63,10 @@ rec {
|
||||||
sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE=";
|
sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE=";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
kops_1_23 = mkKops rec {
|
||||||
|
version = "1.23.0";
|
||||||
|
sha256 = "sha256-tiVNUaW0an6C8M9bxEX5pvB/W5IjZ/S24RdPikzm3bc=";
|
||||||
|
rev = "v${version}";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tektoncd-cli";
|
pname = "tektoncd-cli";
|
||||||
version = "0.23.0";
|
version = "0.23.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tektoncd";
|
owner = "tektoncd";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rzKEjLjX2bPqgNGJYdyTuu15+9bq9WnsrJtsBzL/oOo=";
|
sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
{ callPackage }:
|
||||||
|
|
||||||
|
{
|
||||||
|
isabelle-linter = callPackage ./isabelle-linter.nix {};
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, isabelle }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "isabelle-linter";
|
||||||
|
version = "Isabelle2021-1-v1.0.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "isabelle-prover";
|
||||||
|
repo = "isabelle-linter";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; };
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Linter component for Isabelle.";
|
||||||
|
homepage = "https://github.com/isabelle-prover/isabelle-linter";
|
||||||
|
maintainers = with maintainers; [ jvanbruegge ];
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
{ isabelle, path }:
|
||||||
|
|
||||||
|
let
|
||||||
|
dir = "$out/isabelle/${isabelle.dirname}";
|
||||||
|
iDir = "${isabelle}/${isabelle.dirname}";
|
||||||
|
in ''
|
||||||
|
shopt -s extglob
|
||||||
|
mkdir -p ${dir}/lib/classes
|
||||||
|
|
||||||
|
cDir=$out/${isabelle.dirname}/contrib/${path}
|
||||||
|
mkdir -p $cDir
|
||||||
|
cp -r !(isabelle) $cDir
|
||||||
|
|
||||||
|
cd ${dir}
|
||||||
|
ln -s ${iDir}/!(lib|bin) ./
|
||||||
|
ln -s ${iDir}/lib/!(classes) lib/
|
||||||
|
ln -s ${iDir}/lib/classes/* lib/classes/
|
||||||
|
|
||||||
|
mkdir bin/
|
||||||
|
cp ${iDir}/bin/* bin/
|
||||||
|
|
||||||
|
export HOME=$TMP
|
||||||
|
bin/isabelle components -u $cDir
|
||||||
|
bin/isabelle scala_build
|
||||||
|
|
||||||
|
cd lib/classes
|
||||||
|
for f in ${iDir}/lib/classes/*; do
|
||||||
|
rm $(basename $f)
|
||||||
|
done
|
||||||
|
|
||||||
|
lDir=$out/${isabelle.dirname}/lib/classes/
|
||||||
|
mkdir -p $lDir
|
||||||
|
cp -r * $lDir
|
||||||
|
cd $out
|
||||||
|
rm -rf isabelle
|
||||||
|
''
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem }:
|
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin }:
|
||||||
# nettools needed for hostname
|
# nettools needed for hostname
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -153,4 +153,29 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ];
|
maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
} // {
|
||||||
|
withComponents = f:
|
||||||
|
let
|
||||||
|
base = "$out/${isabelle.dirname}";
|
||||||
|
components = f isabelle-components;
|
||||||
|
in symlinkJoin {
|
||||||
|
name = "isabelle-with-components-${isabelle.version}";
|
||||||
|
paths = [ isabelle ] ++ components;
|
||||||
|
|
||||||
|
postBuild = ''
|
||||||
|
rm $out/bin/*
|
||||||
|
|
||||||
|
cd ${base}
|
||||||
|
rm bin/*
|
||||||
|
cp ${isabelle}/${isabelle.dirname}/bin/* bin/
|
||||||
|
rm etc/components
|
||||||
|
cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
|
||||||
|
|
||||||
|
export HOME=$TMP
|
||||||
|
bin/isabelle install $out/bin
|
||||||
|
patchShebangs $out/bin
|
||||||
|
'' + lib.concatMapStringsSep "\n" (c: ''
|
||||||
|
echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
|
||||||
|
'') components;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "git-team";
|
||||||
|
version = "1.7.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "hekmekk";
|
||||||
|
repo = "git-team";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0nl5j64b61jw4bkf29y51svjbndmqqrqx96yaip4vjzj2dx9ywm4";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-xJMWPDuqoNtCCUnKuUvwlYztyrej1uZttC0NsDvYnXI=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
go run main.go --generate-man-page > ${pname}.1
|
||||||
|
installManPage ${pname}.1
|
||||||
|
|
||||||
|
# Currently only bash completions are provided
|
||||||
|
installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash)
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Command line interface for managing and enhancing git commit messages with co-authors";
|
||||||
|
homepage = "https://github.com/hekmekk/git-team";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ lockejan ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "docker-compose";
|
pname = "docker-compose";
|
||||||
version = "2.3.3";
|
version = "2.3.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "docker";
|
owner = "docker";
|
||||||
repo = "compose";
|
repo = "compose";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-PFR7EcRkqn/d6gYlMNN36nRIslYEN0JFSbFU9niGc+Y=";
|
sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-L6PNKK1ID7ZVX/4sG72wn9ZjWlx0lsNuiBc/EtCN03E=";
|
vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M=";
|
||||||
|
|
||||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
, libnotify
|
, libnotify
|
||||||
, libexif
|
, libexif
|
||||||
, libseccomp
|
, libseccomp
|
||||||
, exempi
|
|
||||||
, librsvg
|
, librsvg
|
||||||
, tracker
|
, tracker
|
||||||
, tracker-miners
|
, tracker-miners
|
||||||
|
@ -68,7 +67,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
exempi
|
|
||||||
gexiv2
|
gexiv2
|
||||||
glib-networking
|
glib-networking
|
||||||
gnome-desktop
|
gnome-desktop
|
||||||
|
|
|
@ -34,14 +34,21 @@ let
|
||||||
sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
|
sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fmtlibVersion = "8.0.1";
|
||||||
|
fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz";
|
||||||
|
fmtlib = fetchzip {
|
||||||
|
url = fmtlibUrl;
|
||||||
|
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
|
||||||
|
};
|
||||||
|
|
||||||
solc = gccStdenv.mkDerivation rec {
|
solc = gccStdenv.mkDerivation rec {
|
||||||
pname = "solc";
|
pname = "solc";
|
||||||
version = "0.8.2";
|
version = "0.8.13";
|
||||||
|
|
||||||
# upstream suggests avoid using archive generated by github
|
# upstream suggests avoid using archive generated by github
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
|
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
|
||||||
sha256 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq";
|
hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -49,6 +56,8 @@ let
|
||||||
--replace "${jsoncppUrl}" ${jsoncpp}
|
--replace "${jsoncppUrl}" ${jsoncpp}
|
||||||
substituteInPlace cmake/range-v3.cmake \
|
substituteInPlace cmake/range-v3.cmake \
|
||||||
--replace "${range3Url}" ${range3}
|
--replace "${range3Url}" ${range3}
|
||||||
|
substituteInPlace cmake/fmtlib.cmake \
|
||||||
|
--replace "${fmtlibUrl}" ${fmtlib}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -53,14 +53,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "flatpak";
|
pname = "flatpak";
|
||||||
version = "1.12.6";
|
version = "1.12.7";
|
||||||
|
|
||||||
# TODO: split out lib once we figure out what to do with triggerdir
|
# TODO: split out lib once we figure out what to do with triggerdir
|
||||||
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # Taken from https://github.com/flatpak/flatpak/releases/
|
sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.7.20";
|
version = "0.7.21";
|
||||||
pname = "libsolv";
|
pname = "libsolv";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "openSUSE";
|
owner = "openSUSE";
|
||||||
repo = "libsolv";
|
repo = "libsolv";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM=";
|
sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }:
|
|
||||||
|
|
||||||
if lib.versionAtLeast ocaml.version "4.06"
|
|
||||||
then throw "ocaml-data-notation is not available for OCaml ${ocaml.version}"
|
|
||||||
else
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "ocaml-data-notation";
|
|
||||||
version = "0.0.11";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-${version}.tar.gz";
|
|
||||||
sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
|
||||||
buildInputs = [ type_conv ounit camlp4 ];
|
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
createFindlibDestdir = true;
|
|
||||||
|
|
||||||
configurePhase = "ocaml setup.ml -configure";
|
|
||||||
buildPhase = "ocaml setup.ml -build";
|
|
||||||
installPhase = "ocaml setup.ml -install";
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Store data using OCaml notation";
|
|
||||||
homepage = "https://forge.ocamlcore.org/projects/odn/";
|
|
||||||
license = licenses.lgpl21;
|
|
||||||
platforms = ocaml.meta.platforms or [ ];
|
|
||||||
maintainers = with maintainers; [
|
|
||||||
vbgl
|
|
||||||
maggesi
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,35 +1,46 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
|
||||||
, fetchPypi
|
|
||||||
, aiohttp
|
, aiohttp
|
||||||
, asyncio-throttle
|
, asyncio-throttle
|
||||||
|
, awesomeversion
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiohue";
|
pname = "aiohue";
|
||||||
version = "4.3.0";
|
version = "4.4.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = "home-assistant-libs";
|
||||||
hash = "sha256-PslmDeG/o9WAOc0FhidUNaISrlXa3rba3UEuvPVN/+A=";
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-zXjfPd40yYyAuuW4CmaGRvJuORyQJa+6CFQaO6RQPZo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
awesomeversion
|
||||||
aiohttp
|
aiohttp
|
||||||
asyncio-throttle
|
asyncio-throttle
|
||||||
];
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"aiohue"
|
"aiohue"
|
||||||
"aiohue.discovery"
|
"aiohue.discovery"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Project has no tests
|
disabledTestPaths = [
|
||||||
doCheck = false;
|
# File are prefixed with test_
|
||||||
|
"examples/"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python package to talk to Philips Hue";
|
description = "Python package to talk to Philips Hue";
|
||||||
|
|
48
pkgs/development/python-modules/anyconfig/default.nix
Normal file
48
pkgs/development/python-modules/anyconfig/default.nix
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
{ buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, lib
|
||||||
|
, pytestCheckHook
|
||||||
|
, setuptools
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "anyconfig";
|
||||||
|
version = "0.12.0";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.cfg \
|
||||||
|
--replace "--cov=src -vv" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# OSError: /build/anyconfig-0.12.0/tests/res/cli/no_template/10/e/10.* should exists but not
|
||||||
|
"test_runs_for_datasets"
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTestPaths = [
|
||||||
|
# NameError: name 'TT' is not defined
|
||||||
|
"tests/schema/test_jsonschema.py"
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "anyconfig" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Python library provides common APIs to load and dump configuration files in various formats";
|
||||||
|
homepage = "https://github.com/ssato/python-anyconfig";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ tboerger ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -8,6 +8,7 @@
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, setuptools
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -26,6 +27,7 @@ buildPythonPackage rec {
|
||||||
libcst
|
libcst
|
||||||
google-api-core
|
google-api-core
|
||||||
proto-plus
|
proto-plus
|
||||||
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
36
pkgs/development/python-modules/nested-lookup/default.nix
Normal file
36
pkgs/development/python-modules/nested-lookup/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
{ buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, lib
|
||||||
|
, pytestCheckHook
|
||||||
|
, six
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "nested-lookup";
|
||||||
|
version = "0.2.23";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "russellballestrini";
|
||||||
|
repo = "nested-lookup";
|
||||||
|
# https://github.com/russellballestrini/nested-lookup/issues/47
|
||||||
|
rev = "c1b0421479efa378545bc71efa3b72882e8fec17";
|
||||||
|
sha256 = "sha256-jgfYLSsFLQSsOH4NzbDPKFIG+tWWZ1zTWcZEaX2lthg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
six
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "nested_lookup" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Python functions for working with deeply nested documents (lists and dicts)";
|
||||||
|
homepage = "https://github.com/russellballestrini/nested-lookup";
|
||||||
|
license = licenses.publicDomain;
|
||||||
|
maintainers = with maintainers; [ tboerger ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
{ buildPythonPackage
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, nose
|
, nose
|
||||||
, bcrypt
|
, bcrypt
|
||||||
|
@ -18,8 +19,9 @@ buildPythonPackage rec {
|
||||||
propagatedBuildInputs = [ bcrypt argon2_cffi ];
|
propagatedBuildInputs = [ bcrypt argon2_cffi ];
|
||||||
propagatedNativeBuildInputs = [ argon2_cffi ];
|
propagatedNativeBuildInputs = [ argon2_cffi ];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "A password hashing library for Python";
|
description = "A password hashing library for Python";
|
||||||
homepage = "https://code.google.com/p/passlib/";
|
homepage = "https://foss.heptapod.net/python-libs/passlib";
|
||||||
|
license = licenses.bsdOriginal;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +1,28 @@
|
||||||
{ lib, buildPythonPackage, fetchFromGitHub, requests }:
|
{ lib, buildPythonPackage, fetchFromGitHub }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "publicsuffix2";
|
pname = "publicsuffix2";
|
||||||
version = "2.20191221";
|
version = "2.2019-12-21";
|
||||||
|
|
||||||
# Tests are missing in the sdist
|
|
||||||
# See: https://github.com/nexB/python-publicsuffix2/issues/12
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nexB";
|
owner = "nexB";
|
||||||
repo = "python-publicsuffix2";
|
repo = "python-publicsuffix2";
|
||||||
rev = "release-2.2019-12-21";
|
rev = "release-${version}";
|
||||||
sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r";
|
sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ requests ];
|
postPatch = ''
|
||||||
|
# only used to update the interal publicsuffix list
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace "'requests >= 2.7.0'," ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "publicsuffix2" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = ''
|
description = "Get a public suffix for a domain name using the Public Suffix List";
|
||||||
Get a public suffix for a domain name using the Public Suffix
|
homepage = "https://github.com/nexB/python-publicsuffix2";
|
||||||
List. Forked from and using the same API as the publicsuffix package.
|
|
||||||
'';
|
|
||||||
homepage = "https://pypi.python.org/pypi/publicsuffix2/";
|
|
||||||
license = licenses.mpl20;
|
license = licenses.mpl20;
|
||||||
|
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,27 +3,41 @@
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, cffi
|
, cffi
|
||||||
, hypothesis
|
, hypothesis
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "zstandard";
|
pname = "zstandard";
|
||||||
version = "0.17.0";
|
version = "0.17.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "fa9194cb91441df7242aa3ddc4cb184be38876cb10dd973674887f334bafbfb6";
|
sha256 = "fa9194cb91441df7242aa3ddc4cb184be38876cb10dd973674887f334bafbfb6";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedNativeBuildInputs = [ cffi ];
|
propagatedNativeBuildInputs = [
|
||||||
|
cffi
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ cffi ];
|
propagatedBuildInputs = [
|
||||||
|
cffi
|
||||||
|
];
|
||||||
|
|
||||||
checkInputs = [ hypothesis ];
|
checkInputs = [
|
||||||
|
hypothesis
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"zstandard"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "zstandard bindings for Python";
|
description = "zstandard bindings for Python";
|
||||||
homepage = "https://github.com/indygreg/python-zstandard";
|
homepage = "https://github.com/indygreg/python-zstandard";
|
||||||
license = licenses.bsdOriginal;
|
license = licenses.bsdOriginal;
|
||||||
maintainers = [ maintainers.arnoldfarkas ];
|
maintainers = with maintainers; [ arnoldfarkas ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
nixosTests }:
|
nixosTests }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "buildkite-agent";
|
pname = "buildkite-agent";
|
||||||
version = "3.33.3";
|
version = "3.34.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "buildkite";
|
owner = "buildkite";
|
||||||
repo = "agent";
|
repo = "agent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-RCKHVFYYcWraUwsGuD/anmWpNwc7cHc9jm0LwR9WRzA=";
|
sha256 = "sha256-OxZcMPJx83hBQOe4Pc8ERhO9QOc4euVVs+OMbPjA4U0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
|
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
|
||||||
|
|
|
@ -56,6 +56,6 @@ rustPlatform.buildRustPackage rec {
|
||||||
homepage = "https://www.prisma.io/";
|
homepage = "https://www.prisma.io/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ pamplemousse pimeys ];
|
maintainers = with maintainers; [ pamplemousse pimeys superherointj ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,5 +68,7 @@ buildPythonApplication rec {
|
||||||
license = licenses.unfreeRedistributable;
|
license = licenses.unfreeRedistributable;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ gebner ];
|
maintainers = with maintainers; [ gebner ];
|
||||||
|
# libusb1 1.9.3 uses setuptools' 2to3 translation feature, which has been removed in setuptools 58
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"url": "https://github.com/cstrahan/tree-sitter-nix",
|
"url": "https://github.com/cstrahan/tree-sitter-nix",
|
||||||
"rev": "470b15a60520ff7b86f51732b8d8f1118c86041e",
|
"rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
|
||||||
"date": "2022-03-18T01:42:08-05:00",
|
"date": "2021-11-29T00:27:21-06:00",
|
||||||
"path": "/nix/store/c5y76kz7wmfq05hfw4xpqz2ahcdy924f-tree-sitter-nix",
|
"path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
|
||||||
"sha256": "1hl0mpy0i6r160v6v3nflrdi5fnmd8i5zbx963h5nj9fg4srkb5r",
|
"sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
|
||||||
"fetchLFS": false,
|
"fetchLFS": false,
|
||||||
"fetchSubmodules": false,
|
"fetchSubmodules": false,
|
||||||
"deepClone": false,
|
"deepClone": false,
|
||||||
|
|
|
@ -3,34 +3,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "confluent-platform";
|
pname = "confluent-platform";
|
||||||
version = "5.3.0";
|
version = "7.0.1";
|
||||||
scalaVersion = "2.12";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz";
|
url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz";
|
||||||
sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp";
|
sha256 = "Q0/A/3M2tn530/+o1RpcgNsPKFQq6YJQnhgysRlpVfU=";
|
||||||
};
|
|
||||||
|
|
||||||
confluentCli = fetchFromGitHub {
|
|
||||||
owner = "confluentinc";
|
|
||||||
repo = "confluent-cli";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ jre bash ];
|
buildInputs = [ jre bash ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
cp -R $confluentCli confluent-cli
|
|
||||||
chmod -R +w confluent-cli
|
|
||||||
|
|
||||||
(
|
|
||||||
export CONFLUENT_HOME=$PWD
|
|
||||||
cd confluent-cli
|
|
||||||
make install
|
|
||||||
)
|
|
||||||
|
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -R bin etc share src $out
|
cp -R bin etc share src $out
|
||||||
rm -rf $out/bin/windows
|
rm -rf $out/bin/windows
|
||||||
|
@ -56,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://www.confluent.io/";
|
homepage = "https://www.confluent.io/";
|
||||||
description = "Confluent event streaming platform based on Apache Kafka";
|
description = "Confluent event streaming platform based on Apache Kafka";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = [ maintainers.offline ];
|
maintainers = with maintainers; [ zoedsoupe ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "libreddit";
|
pname = "libreddit";
|
||||||
version = "0.22.1";
|
version = "0.22.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "spikecodes";
|
owner = "spikecodes";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-k6GAxEGmDzC6nUCMYXahw/MTQanpZw8UMBVPCA4zSTs=";
|
sha256 = "sha256-6aOUhw+eQJDU3sgd9ymQUYLBuCCJXIQHzr0+zT8yEtU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-K31z5j/pBN84Egrfwe4/V3hpbIrlzn6ppFFNWFXFVcc=";
|
cargoSha256 = "sha256-ZlLzTg+TCRHRnrXHhv4OuYpD3Fd6qRfzHvdwWrBYQdU=";
|
||||||
|
|
||||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "alertmanager";
|
pname = "alertmanager";
|
||||||
version = "0.23.0";
|
version = "0.24.0";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
inherit rev;
|
inherit rev;
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "alertmanager";
|
repo = "alertmanager";
|
||||||
sha256 = "sha256-06mKgWUyw5jsjKiRXQ9/oqHvFdkY2nS9Z3eW60lTNbU=";
|
sha256 = "sha256-hoCE0wD9/Sh/oBce7kCg/wG44FmMs6dAKnEYP+2sH0w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-zJvzCC7Vn5repWssyDuGtoUSZC2ojQhMqDX5Orr0ST0=";
|
vendorSha256 = "sha256-ePb9qdCTEHHIV6JlbrBlaZjD5APwQuoGloO88W5S7Oc=";
|
||||||
|
|
||||||
subPackages = [ "cmd/alertmanager" "cmd/amtool" ];
|
subPackages = [ "cmd/alertmanager" "cmd/amtool" ];
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config
|
{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config
|
||||||
, icu, libuuid, readline, inih
|
, icu, libuuid, readline, inih, liburcu
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xfsprogs";
|
pname = "xfsprogs";
|
||||||
version = "5.13.0";
|
version = "5.14.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-ThQtS6vghq35AW2MYGyAWCnaCORjiaRDP0A0YgT5DNs=";
|
sha256 = "sha256-AczT753yg3dTpdh2uNqE6pV9E9ekYbjEbor6TrCaq8g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "doc" ];
|
outputs = [ "bin" "dev" "out" "doc" ];
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
autoconf automake libtool gettext pkg-config
|
autoconf automake libtool gettext pkg-config
|
||||||
libuuid # codegen tool uses libuuid
|
libuuid # codegen tool uses libuuid
|
||||||
];
|
];
|
||||||
buildInputs = [ readline icu inih ];
|
buildInputs = [ readline icu inih liburcu ];
|
||||||
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
|
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -48,10 +48,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
coreutils
|
coreutils
|
||||||
dosfstools
|
|
||||||
mtools
|
|
||||||
unzip
|
unzip
|
||||||
zip
|
zip
|
||||||
|
] ++ lib.optionals doCheck [
|
||||||
|
mtools
|
||||||
|
dosfstools
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "topgrade";
|
pname = "topgrade";
|
||||||
version = "8.2.0";
|
version = "8.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "r-darwish";
|
owner = "r-darwish";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-WyiEKC5WUwIGCaxXqiqNyOcGVZgfd2lVFMxQxhgJhMc=";
|
sha256 = "sha256-iFS8Bf2IF0GoW168DwfBbkiPd7IGJhGShofFnBESpUc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-ZcOSHEZHGa1XhGQlW4pR5hBJ2SpSbkKuRS6OSHGg9Lo=";
|
cargoSha256 = "sha256-8Ag4rDXnDZgxdwFpiWnYNjDeau9vr9EIfbJzeQlqSDM=";
|
||||||
|
|
||||||
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "frp";
|
pname = "frp";
|
||||||
version = "0.40.0";
|
version = "0.41.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fatedier";
|
owner = "fatedier";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-W+88Fq9oYDBLCNp+6rc9jACJzky7FCZg/xLDowGGdm0=";
|
sha256 = "sha256-JutR1yrxbwhfcw6qTh493yVeo7KzLl83himPTX8FJlA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-iBjMFOERWQ1aPn+2gEoI9og2ov2LlBVV1sLAZlvqZPM=";
|
vendorSha256 = "sha256-HOfcVPrJ6TBrhToqYN2CJ0i3re95awrIxQk2Mm8x3DU=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,6 @@ let
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Patch added by the mamba team
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/add_strict_repo_prio_rule.patch";
|
|
||||||
sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r";
|
|
||||||
})
|
|
||||||
# Patch added by the mamba team
|
# Patch added by the mamba team
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch";
|
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch";
|
||||||
|
|
|
@ -26227,6 +26227,8 @@ with pkgs;
|
||||||
|
|
||||||
git-review = python3Packages.callPackage ../applications/version-management/git-review { };
|
git-review = python3Packages.callPackage ../applications/version-management/git-review { };
|
||||||
|
|
||||||
|
git-team = callPackage ../applications/version-management/git-and-tools/git-team { };
|
||||||
|
|
||||||
github-cli = gh;
|
github-cli = gh;
|
||||||
|
|
||||||
gitolite = callPackage ../applications/version-management/gitolite { };
|
gitolite = callPackage ../applications/version-management/gitolite { };
|
||||||
|
@ -32725,6 +32727,7 @@ with pkgs;
|
||||||
java = openjdk17;
|
java = openjdk17;
|
||||||
z3 = z3_4_4_0;
|
z3 = z3_4_4_0;
|
||||||
};
|
};
|
||||||
|
isabelle-components = recurseIntoAttrs (callPackage ../applications/science/logic/isabelle/components { });
|
||||||
|
|
||||||
iprover = callPackage ../applications/science/logic/iprover { };
|
iprover = callPackage ../applications/science/logic/iprover { };
|
||||||
|
|
||||||
|
@ -33537,11 +33540,11 @@ with pkgs;
|
||||||
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
||||||
inherit (callPackage ../applications/networking/cluster/kops {})
|
inherit (callPackage ../applications/networking/cluster/kops {})
|
||||||
mkKops
|
mkKops
|
||||||
kops_1_20
|
|
||||||
kops_1_21
|
kops_1_21
|
||||||
kops_1_22
|
kops_1_22
|
||||||
|
kops_1_23
|
||||||
;
|
;
|
||||||
kops = kops_1_22;
|
kops = kops_1_23;
|
||||||
|
|
||||||
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
||||||
|
|
||||||
|
|
|
@ -886,8 +886,6 @@ let
|
||||||
|
|
||||||
ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
|
ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
|
||||||
|
|
||||||
ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
|
|
||||||
|
|
||||||
ocaml_expat =
|
ocaml_expat =
|
||||||
if lib.versionAtLeast ocaml.version "4.02"
|
if lib.versionAtLeast ocaml.version "4.02"
|
||||||
then callPackage ../development/ocaml-modules/expat { }
|
then callPackage ../development/ocaml-modules/expat { }
|
||||||
|
|
|
@ -546,6 +546,8 @@ in {
|
||||||
|
|
||||||
anybadge = callPackage ../development/python-modules/anybadge { };
|
anybadge = callPackage ../development/python-modules/anybadge { };
|
||||||
|
|
||||||
|
anyconfig = callPackage ../development/python-modules/anyconfig { };
|
||||||
|
|
||||||
anyio = callPackage ../development/python-modules/anyio { };
|
anyio = callPackage ../development/python-modules/anyio { };
|
||||||
|
|
||||||
anytree = callPackage ../development/python-modules/anytree {
|
anytree = callPackage ../development/python-modules/anytree {
|
||||||
|
@ -5468,6 +5470,8 @@ in {
|
||||||
|
|
||||||
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
|
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
|
||||||
|
|
||||||
|
nested-lookup = callPackage ../development/python-modules/nested-lookup { };
|
||||||
|
|
||||||
nestedtext = callPackage ../development/python-modules/nestedtext { };
|
nestedtext = callPackage ../development/python-modules/nestedtext { };
|
||||||
|
|
||||||
net2grid = callPackage ../development/python-modules/net2grid { };
|
net2grid = callPackage ../development/python-modules/net2grid { };
|
||||||
|
|
Loading…
Reference in a new issue