Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d6b748b2b3
42 changed files with 1602 additions and 1285 deletions
|
|
@ -1,3 +0,0 @@
|
|||
Moved to: ./contributing-to-this-manual.xml. Link:
|
||||
|
||||
https://nixos.org/manual/nixos/unstable/#chap-contributing
|
||||
3
nixos/doc/manual/README.md
Normal file
3
nixos/doc/manual/README.md
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[Moved to ./contributing-to-this-manual.chapter.md](./contributing-to-this-manual.chapter.md). Link:
|
||||
|
||||
https://nixos.org/manual/nixos/unstable/#chap-contributing
|
||||
|
|
@ -5,7 +5,7 @@ trivialBuild rec {
|
|||
version = "1.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz";
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
|
||||
sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -125,20 +125,16 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
aggressive-indent = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
aggressive-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "aggressive-indent";
|
||||
ename = "aggressive-indent";
|
||||
version = "1.8.3";
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el";
|
||||
sha256 = "0jnzccl50x0wapprgwxinp99pwwa6j43q6msn4gv437j7swy8wnj";
|
||||
url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar";
|
||||
sha256 = "166jk1z0vw481lfi3gbg7f9vsgwfv8fiyxpkfphgvgcmf5phv4q1";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -670,10 +666,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.9.tar";
|
||||
sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.10.tar";
|
||||
sha256 = "0sqr4cld84vgfnf0fjgvbbix1p23s0n2xsszfap6d8a2xzzpp044";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -775,10 +771,10 @@
|
|||
elpaBuild {
|
||||
pname = "dash";
|
||||
ename = "dash";
|
||||
version = "2.18.1";
|
||||
version = "2.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dash-2.18.1.tar";
|
||||
sha256 = "17mrvmrfh5c3kri4r3gf1c3gz4i5vl9ac60grpx4103b56y4cgra";
|
||||
url = "https://elpa.gnu.org/packages/dash-2.19.0.tar";
|
||||
sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1015,10 +1011,10 @@
|
|||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.6.24";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar";
|
||||
sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.7.tar";
|
||||
sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1075,10 +1071,10 @@
|
|||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20210618";
|
||||
version = "20210710";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20210618.tar";
|
||||
sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf";
|
||||
url = "https://elpa.gnu.org/packages/eev-20210710.tar";
|
||||
sha256 = "19k5yncyjg7afvkx54k9mplm86jyr3svjjyprrj1frdi219i5piw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2321,10 +2317,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.4.0.tar";
|
||||
sha256 = "0ssckl06jk08vaq4g7sxpzvc3ybm339fzbn9qw21w82v1l60rzpm";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.5.0.tar";
|
||||
sha256 = "0y5a7g66iiai20fvc6qff3ki792bzca87zxbmxl8hpks4a6znc80";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2889,10 +2885,10 @@
|
|||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.8.2";
|
||||
version = "3.9.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar";
|
||||
sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw";
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar";
|
||||
sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
|
|
@ -3430,10 +3426,10 @@
|
|||
elpaBuild {
|
||||
pname = "slime-volleyball";
|
||||
ename = "slime-volleyball";
|
||||
version = "1.1.7";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/slime-volleyball-1.1.7.tar";
|
||||
sha256 = "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy";
|
||||
url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar";
|
||||
sha256 = "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
|
@ -3561,16 +3557,16 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
spinner = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "spinner";
|
||||
ename = "spinner";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
|
||||
sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd";
|
||||
url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar";
|
||||
sha256 = "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/spinner.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -3824,10 +3820,10 @@
|
|||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/transient-0.3.5.tar";
|
||||
sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68";
|
||||
url = "https://elpa.gnu.org/packages/transient-0.3.6.tar";
|
||||
sha256 = "11n2551kvfjrqyk0x78bz6pirnfs126cbchiv1pchqwyk8z8c9ks";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210628";
|
||||
version = "20210712";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210628.tar";
|
||||
sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl";
|
||||
url = "https://orgmode.org/elpa/org-20210712.tar";
|
||||
sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210628";
|
||||
version = "20210712";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar";
|
||||
sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar";
|
||||
sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.74";
|
||||
version = "0.75";
|
||||
pname = "putty";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx";
|
||||
sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcftools";
|
||||
version = "1.11";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw";
|
||||
sha256 = "sha256-E7+h2ipe3aj6URlqR6C0r7P+8XUWRR5PDnhHfz3TC5A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -64,11 +64,9 @@ buildGoModule rec {
|
|||
installShellCompletion --fish completions/fish/*
|
||||
installShellCompletion --zsh completions/zsh/*
|
||||
MANDIR=$man/share/man make install.man-nobuild
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d
|
||||
install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
|
||||
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, runCommand
|
||||
, makeWrapper
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
, podman # Docker compat
|
||||
, runc # Default container runtime
|
||||
|
|
@ -13,12 +14,14 @@
|
|||
, cni-plugins # not added to path
|
||||
, iptables
|
||||
, iproute2
|
||||
, qemu
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
podman = podman-unwrapped;
|
||||
|
||||
binPath = lib.makeBinPath ([
|
||||
binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
|
|
@ -27,6 +30,9 @@ let
|
|||
util-linux
|
||||
iptables
|
||||
iproute2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
qemu
|
||||
xz
|
||||
] ++ extraPackages);
|
||||
|
||||
in runCommand podman.name {
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ url_to_name(){
|
|||
fi
|
||||
}
|
||||
|
||||
# Fetch everything and checkout the right sha1
|
||||
# Fetch and checkout the right sha1
|
||||
checkout_hash(){
|
||||
local hash="$1"
|
||||
local ref="$2"
|
||||
|
|
@ -149,6 +149,7 @@ checkout_hash(){
|
|||
hash=$(hash_from_ref "$ref")
|
||||
fi
|
||||
|
||||
clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \
|
||||
clean_git fetch -t ${builder:+--progress} origin || return 1
|
||||
|
||||
local object_type=$(git cat-file -t "$hash")
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "unstable-2021-06-21";
|
||||
version = "6.0.0";
|
||||
|
||||
repoName = "mail";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = "c64c87fabb31dea8dc388152d5a835401993acf4";
|
||||
sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4=";
|
||||
rev = version;
|
||||
sha256 = "07iiipl0nsp63g5bn1y2hg6bmgj6i9cxqcfpd7q3vmldnkijvaxs";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ with lib; mkCoqDerivation {
|
|||
owner = "math-comp";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.12"; out = "1.0.0"; }
|
||||
{ case = isGe "8.12"; out = "1.1.0"; }
|
||||
{ case = range "8.11" "8.12"; out = "0.10.0"; }
|
||||
] null;
|
||||
release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
|
||||
release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
|
||||
release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
|
||||
releaseRev = v: "v${v}";
|
||||
|
|
@ -16,11 +17,14 @@ with lib; mkCoqDerivation {
|
|||
|
||||
propagatedBuildInputs = [ coq-elpi ];
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
|
||||
extraInstallFlags = [ "VFILES=structures.v" ];
|
||||
|
||||
meta = {
|
||||
description = "Coq plugin embedding ELPI.";
|
||||
maintainers = [ maintainers.cohencyril ];
|
||||
license = licenses.lgpl21;
|
||||
description = "High level commands to declare a hierarchy based on packed classes";
|
||||
maintainers = with maintainers; [ cohencyril siraben ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@ with lib; mkCoqDerivation {
|
|||
|
||||
pname = "math-classes";
|
||||
inherit version;
|
||||
defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null;
|
||||
defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "8.13.0" else
|
||||
if versions.range "8.6" "8.10" coq.coq-version then "8.12.0" else null;
|
||||
release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
|
||||
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
|
||||
|
||||
extraBuildInputs = [ bignums ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ let mca = mkCoqDerivation {
|
|||
pname = "analysis";
|
||||
owner = "math-comp";
|
||||
|
||||
release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4=";
|
||||
release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
|
||||
release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
|
||||
release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
|
||||
|
|
@ -16,7 +17,7 @@ let mca = mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.9"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
|
||||
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
opString = lib.optionalString;
|
||||
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
|
||||
config = import ./config.nix { inherit fetchFromSavannah; };
|
||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; };
|
||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
|
||||
|
||||
# Contains the ruby version heuristics
|
||||
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch }:
|
||||
{ stdenv, lib, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rubygems";
|
||||
version = "3.2.16";
|
||||
version = "3.2.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0";
|
||||
sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-add-post-extract-hook.patch
|
||||
./0002-binaries-with-env-shebang.patch
|
||||
./0003-gem-install-default-to-user.patch
|
||||
# Ensure tmp directory are not left behind
|
||||
# https://github.com/rubygems/rubygems/pull/4610
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch";
|
||||
sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.15.1";
|
||||
version = "3.15.3";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-aUYerhg5iqKsZ5SW3dI6EpFnaB7dRGjXpIDVsjwS7vY=";
|
||||
sha256 = "sha256-cmeCh54dwYwbL1AwGrPwTDp4F6VONclV7iu2Sm1g33Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "beniget";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1";
|
||||
sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
28
pkgs/development/python-modules/editables/default.nix
Normal file
28
pkgs/development/python-modules/editables/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "editables";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6918f16225258f24ef9800c2327e14eded42ddac344e77982380749464024f35";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests not included in archive.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Editable installations";
|
||||
homepage = https://github.com/pfmoore/editables;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gast";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1";
|
||||
sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f";
|
||||
};
|
||||
checkInputs = [ astunparse ] ;
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, intreehooks
|
||||
, pytoml
|
||||
, toml
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
|
@ -12,17 +12,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mesonpep517";
|
||||
version = "0.1.9999994";
|
||||
version = "0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b5bcca61024164c4a51d29e6921ea1f756d54197c8f052e4c66a2b8399aa9349";
|
||||
sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intreehooks ];
|
||||
|
||||
propagatedBuildInputs = [ pytoml ];
|
||||
propagatedBuildInputs = [ toml ];
|
||||
|
||||
# postPatch = ''
|
||||
# # Meson tries to detect ninja as well, so we should patch meson as well.
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, python-dateutil
|
||||
, pkgs
|
||||
, coreutils
|
||||
, which
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.3";
|
||||
pname = "pync";
|
||||
disabled = ! isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.coreutils ];
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
checkInputs = [ which ];
|
||||
propagatedBuildInputs = [ python-dateutil ];
|
||||
|
||||
preInstall = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
@ -25,7 +26,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python Wrapper for Mac OS 10.8 Notification Center";
|
||||
homepage = "https://pypi.python.org/pypi/pync/1.4";
|
||||
homepage = "https://pypi.python.org/pypi/pync";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
From 208fe98f10c580a5a2fb6a8cfdd56de109073925 Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Sat, 17 Jul 2021 18:36:27 +0200
|
||||
Subject: [PATCH] hardcode path to libgomp
|
||||
|
||||
---
|
||||
omp/__init__.py | 40 ++++------------------------------------
|
||||
1 file changed, 4 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/omp/__init__.py b/omp/__init__.py
|
||||
index bddae3063..9ba3678d8 100644
|
||||
--- a/omp/__init__.py
|
||||
+++ b/omp/__init__.py
|
||||
@@ -69,43 +69,11 @@ class OpenMP(object):
|
||||
|
||||
def init_not_msvc(self):
|
||||
""" Find OpenMP library and try to load if using ctype interface. """
|
||||
- # find_library() does not search automatically LD_LIBRARY_PATH
|
||||
- paths = os.environ.get('LD_LIBRARY_PATH', '').split(':')
|
||||
+ libgomp_path = "@gomp@"
|
||||
|
||||
- for libomp_name in self.get_libomp_names():
|
||||
- if cxx is None or sys.platform == 'win32':
|
||||
- # Note: Clang supports -print-file-name, but not yet for
|
||||
- # clang-cl as of v12.0.0 (April '21)
|
||||
- continue
|
||||
-
|
||||
- cmd = [cxx, '-print-file-name=' + libomp_name]
|
||||
- # the subprocess can fail in various ways in that case just give up
|
||||
- try:
|
||||
- path = os.path.dirname(check_output(cmd).decode().strip())
|
||||
- if path:
|
||||
- paths.append(path)
|
||||
- except (OSError, CalledProcessError):
|
||||
- pass
|
||||
-
|
||||
- # Try to load find libgomp shared library using loader search dirs
|
||||
- libgomp_path = find_library("gomp")
|
||||
-
|
||||
- # Try to use custom paths if lookup failed
|
||||
- for path in paths:
|
||||
- if libgomp_path:
|
||||
- break
|
||||
- path = path.strip()
|
||||
- if os.path.isdir(path):
|
||||
- libgomp_path = find_library(os.path.join(str(path), "libgomp"))
|
||||
-
|
||||
- if not libgomp_path:
|
||||
- raise ImportError("I can't find a shared library for libgomp,"
|
||||
- " you may need to install it or adjust the "
|
||||
- "LD_LIBRARY_PATH environment variable.")
|
||||
- else:
|
||||
- # Load the library (shouldn't fail with an absolute path right?)
|
||||
- self.libomp = ctypes.CDLL(libgomp_path)
|
||||
- self.version = 45
|
||||
+ # Load the library (shouldn't fail with an absolute path right?)
|
||||
+ self.libomp = ctypes.CDLL(libgomp_path)
|
||||
+ self.version = 45
|
||||
|
||||
def __getattr__(self, name):
|
||||
"""
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestrunner
|
||||
|
|
@ -12,19 +13,31 @@
|
|||
, pytestCheckHook
|
||||
, scipy
|
||||
, isPy3k
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
inherit (python) stdenv;
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "pythran";
|
||||
version = "0.9.8post3";
|
||||
version = "0.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serge-sans-paille";
|
||||
repo = "pythran";
|
||||
rev = version;
|
||||
sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4=";
|
||||
sha256 = "sha256-lQbVq4K/Q8RzlFhE+l3HPCmUGmauXawcKe31kfbUHsI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Hardcode path to mp library
|
||||
(substituteAll {
|
||||
src = ./0001-hardcode-path-to-libgomp.patch;
|
||||
gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytestrunner
|
||||
];
|
||||
|
|
@ -62,7 +75,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Ahead of Time compiler for numeric kernels";
|
||||
homepage = https://github.com/serge-sans-paille/pythran;
|
||||
homepage = "https://github.com/serge-sans-paille/pythran";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -242,7 +242,10 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
|
|||
propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs;
|
||||
|
||||
passthru = passthru // { isRubyGem = true; };
|
||||
inherit meta;
|
||||
meta = {
|
||||
# default to Ruby's platforms
|
||||
platforms = ruby.meta.platforms;
|
||||
} // meta;
|
||||
})
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9AYFC10AYbt/qHj5hfuLRxUwibizKk4n9rgtd5RBEQg=";
|
||||
sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.51.0";
|
||||
version = "0.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE=";
|
||||
sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA=";
|
||||
vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.planetscale.com/";
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxc";
|
||||
version = "4.0.9";
|
||||
version = "4.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
|
||||
sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz";
|
||||
sha256 = "1sgsic9dzj3wv2k5bx2vhcgappivhp1glkqfc2yrgr6jas052351";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
callPackage ../nginx/generic.nix args rec {
|
||||
pname = "openresty";
|
||||
nginxVersion = "1.19.3";
|
||||
version = "${nginxVersion}.1";
|
||||
version = "${nginxVersion}.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://openresty.org/download/openresty-${version}.tar.gz";
|
||||
sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk";
|
||||
sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f";
|
||||
};
|
||||
|
||||
# generic.nix applies fixPatch on top of every patch defined there. This
|
||||
|
|
@ -44,7 +44,7 @@ callPackage ../nginx/generic.nix args rec {
|
|||
|
||||
meta = {
|
||||
description = "A fast web application server built on Nginx";
|
||||
homepage = "http://openresty.org";
|
||||
homepage = "https://openresty.org";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ];
|
||||
|
|
|
|||
|
|
@ -152,4 +152,16 @@
|
|||
| tee "$out/scheme-infraonly/$fname.patch"
|
||||
done
|
||||
'';
|
||||
|
||||
# test that fmtutil.cnf is fully regenerated on scheme-full
|
||||
fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" {
|
||||
kpathsea = lib.head texlive.kpathsea.pkgs;
|
||||
schemeFull = texlive.combined.scheme-full;
|
||||
} ''
|
||||
mkdir -p "$out"
|
||||
|
||||
diff --ignore-matching-lines='^# Generated by ' -u \
|
||||
{"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \
|
||||
| tee "$out/fmtutil.cnf.patch"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchCrate, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "4.0.3";
|
||||
version = "5.0.0";
|
||||
pname = "oxipng";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w=";
|
||||
sha256 = "sha256-rTAY+3ViPkOsRjT9FHKnVOEGfLscuBdMAiQq+N9PRNU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sxvOFxSZCANBa/448SpjoLqk/HjqtaFrOhjrQro446Q=";
|
||||
cargoSha256 = "sha256-Z5tA2bUE/5qGKXP2hIKo6tBegaSUALRzEZ/Xext3EWY=";
|
||||
|
||||
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "siege";
|
||||
version = "4.0.9";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz";
|
||||
sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx";
|
||||
sha256 = "1a74py0ib1gr3znv9ah5acw67ngl08b14dbc90ww9clvgdr2ag0l";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-15";
|
||||
version = "2021-07-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WqLKdvJh22j9lwoO1iFIhjPCReeR4TQ91zqkVV/PN14=";
|
||||
sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "vulnix";
|
||||
version = "1.9.6";
|
||||
version = "1.10.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0anyxmqgn4kx102l3qjhh1f2b0cg7mnlapfhriyjw0zyy5gyqvng";
|
||||
sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
|
|
|||
|
|
@ -121,10 +121,12 @@ in (buildEnv {
|
|||
mkdir $out/share/texmf-local
|
||||
)
|
||||
'' +
|
||||
# now filter hyphenation patterns, in a hacky way ATM
|
||||
# now filter hyphenation patterns and formats
|
||||
(let
|
||||
hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong;
|
||||
pnames = uniqueStrings (map (p: p.pname) hyphens);
|
||||
hyphenPNames = uniqueStrings (map (p: p.pname) hyphens);
|
||||
formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong;
|
||||
formatPNames = uniqueStrings (map (p: p.pname) formats);
|
||||
# sed expression that prints the lines in /start/,/end/ except for /end/
|
||||
section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n";
|
||||
script =
|
||||
|
|
@ -134,7 +136,7 @@ in (buildEnv {
|
|||
# pick up the header
|
||||
+ "2,/^% from/{ /^% from/!p; };\n"
|
||||
# pick up all sections matching packages that we combine
|
||||
+ lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") pnames
|
||||
+ lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") hyphenPNames
|
||||
# pick up the footer (for language.def)
|
||||
+ "/^%%% No changes may be made beyond this point.$/,$p;\n"
|
||||
);
|
||||
|
|
@ -142,9 +144,15 @@ in (buildEnv {
|
|||
writeText "hyphens.lua.sed" (
|
||||
"1{ s/^(-- Generated by .*)$/\\1, modified by texlive.combine/; p; }\n"
|
||||
+ "2,/^-- END of language.us.lua/p;\n"
|
||||
+ lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") pnames
|
||||
+ lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames
|
||||
+ "$p;\n"
|
||||
);
|
||||
fmtutilSed =
|
||||
writeText "fmtutil.sed" (
|
||||
"1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n"
|
||||
+ "2,/^# from/{ /^# from/!p; };\n"
|
||||
+ lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames
|
||||
);
|
||||
in ''
|
||||
(
|
||||
cd ./share/texmf/tex/generic/config/
|
||||
|
|
@ -153,6 +161,10 @@ in (buildEnv {
|
|||
done
|
||||
[[ -e language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i language.dat.lua
|
||||
)
|
||||
(
|
||||
cd ./share/texmf/web2c/
|
||||
[[ -e fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i fmtutil.cnf
|
||||
)
|
||||
'') +
|
||||
|
||||
# function to wrap created executables with required env vars
|
||||
|
|
@ -213,7 +225,7 @@ in (buildEnv {
|
|||
|
||||
perl `type -P mktexlsr.pl` ./share/texmf
|
||||
${bin.texlinks} "$out/bin" && wrapBin
|
||||
(perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose
|
||||
perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose
|
||||
#${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links?
|
||||
|
||||
# Disable unavailable map files
|
||||
|
|
|
|||
|
|
@ -109,10 +109,11 @@ let
|
|||
pkgs =
|
||||
# tarball of a collection/scheme itself only contains a tlobj file
|
||||
[( if (attrs.hasRunfiles or false) then mkPkgV "run"
|
||||
# the fake derivations are used for filtering of hyphenation patterns
|
||||
# the fake derivations are used for filtering of hyphenation patterns and formats
|
||||
else {
|
||||
inherit pname version;
|
||||
tlType = "run";
|
||||
hasFormats = attrs.hasFormats or false;
|
||||
hasHyphens = attrs.hasHyphens or false;
|
||||
}
|
||||
)]
|
||||
|
|
@ -171,6 +172,7 @@ let
|
|||
# metadata for texlive.combine
|
||||
passthru = {
|
||||
inherit pname tlType version;
|
||||
hasFormats = args.hasFormats or false;
|
||||
hasHyphens = args.hasHyphens or false;
|
||||
};
|
||||
} // lib.optionalAttrs (fixedHash != null) {
|
||||
|
|
|
|||
|
|
@ -584,6 +584,7 @@ tl: { # no indentation
|
|||
deps."lambda" = tl."lambda";
|
||||
deps."latex" = tl."latex";
|
||||
deps."plain" = tl."plain";
|
||||
hasFormats = true;
|
||||
sha512.run = "7d9241eab3e1e34f8c1aef85c4f2278680cd147cc4f188194c8c27147df3b9bf2a3bee7c651227aac79996e0745124990950ddc010a4f6662fda4a2f72575211";
|
||||
sha512.doc = "87de188abf9880f2e680d6582cfb20d8166eb0c3ed2d3a85971eeac6ba8abea2d7f46b8037c26b719c1289f778d4e94ae1813598e73f8f56f6224e3299852cf6";
|
||||
};
|
||||
|
|
@ -862,6 +863,7 @@ tl: { # no indentation
|
|||
deps."knuth-lib" = tl."knuth-lib";
|
||||
deps."plain" = tl."plain";
|
||||
deps."tex" = tl."tex";
|
||||
hasFormats = true;
|
||||
sha512.run = "d52e4a817f839c95b7718c65b6cba571443f9f25533a9c7412a69b3f15c89e995494ed812ead2ddac9f0952e0e842216a7fd443ecf2360f50a36107241397c19";
|
||||
sha512.doc = "ed91ca4af98a72f081aa021b598ed58888150a73346d5d8da9ef7171f7d757c6d690169e1eb4b3e409ed8b988b8ffff9475f35ca7a443074080c1c9568ebaa0d";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -10423,6 +10425,7 @@ tl: { # no indentation
|
|||
deps."pdftex" = tl."pdftex";
|
||||
deps."stmaryrd" = tl."stmaryrd";
|
||||
deps."xetex" = tl."xetex";
|
||||
hasFormats = true;
|
||||
sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69";
|
||||
sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -11077,6 +11080,7 @@ tl: { # no indentation
|
|||
deps."latex-fonts" = tl."latex-fonts";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "dd6b98eb22786f39c830a4c012396507dca694d727f1a7eb147a1c8c2d4442d8120e016de4c08c038239dfac866f828bc7686d8fd124d1af63edd0994db80f9f";
|
||||
sha512.doc = "8ec3527c25c07641788b809cca4f4cc8bb034f63f1100b74270041b503dbc8926a410429a370692502596bd6ffec69a970a19b1c32178e4722f81acdbf0ea934";
|
||||
sha512.source = "0563f453bf7e34b4948a29d832207f8148082c5186a6915a6bdc1c41d0c08399505491ccdea0b45e8bf326a8e8459d37eeaca546143d9f622ce4dacba11cac7f";
|
||||
|
|
@ -11094,6 +11098,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex" = tl."tex";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
hasFormats = true;
|
||||
sha512.run = "27fc3fbb1aa29693fcd1d39abf92e3248fa769b8c4e0171948c2a7957e52dad2e08759050321401f7cb900285de62246bc0013d22141281111a82681c11802e4";
|
||||
hasRunfiles = true;
|
||||
version = "Mar._2021";
|
||||
|
|
@ -13810,6 +13815,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479";
|
||||
sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67";
|
||||
sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89";
|
||||
|
|
@ -19379,6 +19385,7 @@ tl: { # no indentation
|
|||
deps."url" = tl."url";
|
||||
deps."wasysym" = tl."wasysym";
|
||||
deps."zapfding" = tl."zapfding";
|
||||
hasFormats = true;
|
||||
sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22";
|
||||
sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895";
|
||||
sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f";
|
||||
|
|
@ -20306,6 +20313,7 @@ tl: { # no indentation
|
|||
deps."pdftex" = tl."pdftex";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "b349e8fad2765c4a87b471532dcfafedc0a9711237c6e967011727da7bad3a5ed27a89eca81af324aa84958872d0b78c68e6d9490fced44eb7636b2fbf36611f";
|
||||
sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041";
|
||||
};
|
||||
|
|
@ -20336,6 +20344,7 @@ tl: { # no indentation
|
|||
deps."pdftex" = tl."pdftex";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "31c364be709db593c1a1d4e5250a7d8899fe0f5eb534c61c5f67d1a032b4afca9a91c5d2d1a541e96045d294c87d7ca1758a6a59bce8a3e94bf5511e20cf8854";
|
||||
sha512.doc = "94474a52fb6a2bb801405c83562d6dd69038cca8d73705f382c2acc6c63d57e057a6b6c1b93556e41f5d0d9f9adfa269f0857c35e6523108eb230985752c3261";
|
||||
};
|
||||
|
|
@ -21427,6 +21436,7 @@ tl: { # no indentation
|
|||
revision = 45678;
|
||||
deps."cm" = tl."cm";
|
||||
deps."hyphen-base" = tl."hyphen-base";
|
||||
hasFormats = true;
|
||||
sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78";
|
||||
sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -21924,6 +21934,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "bb198606ca33912f75327b0799061a81aeb9e2315182001710929d5a7c786fc11b58a5eadcc186f2db21df01777904ada31058c0a03376c04020b213d9f7c519";
|
||||
sha512.doc = "9b7c72ad24d459b345552ee8ae05c047c61cf3e0b6eabb927e2a02bf62558f143e937463574bdb0cc60a0a4c8b2da3f86b1d9361275142519044051039275f1c";
|
||||
};
|
||||
|
|
@ -21979,6 +21990,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "01777af9a468b6216417c5158034c3dea3cfb1c3ca7d28f1c4ca2b239fe569fbde410d17662bf9a10f5fddfd1bb6541c505d772e705832b52a1c2d6225d0fc6f";
|
||||
sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924";
|
||||
};
|
||||
|
|
@ -22104,6 +22116,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "c16a8cfa5ce0991d4b667471dd32f692c4e340d1856a36fd684811d40322f912b94125ae101ba095ca6c54b2afa3a37f1ab9af83e4a10328f8c1a1906a02a44b";
|
||||
sha512.doc = "0d2492075eb2bb6b9cc8a67b0ed53cf5a8c4c700797d8bce8061a4cf938db5cf19fa4ed6f7adb59b1da0701ff365504e813289dea3c245ad717c82bc58df9128";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -22996,6 +23009,7 @@ tl: { # no indentation
|
|||
revision = 57972;
|
||||
deps."kpathsea" = tl."kpathsea";
|
||||
deps."modes" = tl."modes";
|
||||
hasFormats = true;
|
||||
sha512.run = "7ea3271c2a9682ae5ee29a05a95e794f4a6dc5a6244a6c243e856aaa857310127d5593b0643d4ca53eae7feb9c205574f5ea216b7c3c0b731e7f98be99bf1588";
|
||||
sha512.doc = "95e7221ac9e3438d4cae336296e7db855df9a7e49ebaaec5dfea294565824938f3d6544459cee9ecbf17312daad4e44c92a7a9a65269feebd2b819f226f305bc";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -23149,6 +23163,7 @@ tl: { # no indentation
|
|||
deps."tex" = tl."tex";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."utf8mex" = tl."utf8mex";
|
||||
hasFormats = true;
|
||||
sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be";
|
||||
sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e";
|
||||
sha512.source = "6f20a7e4f80670f7dfe5b2cfe3357a5d16b0f627b5e9e95c2d7d46598e00b989d5ae8c797589c56c594b7d3610f5f79cad42f3bb64a628be968e4e9e5d541e98";
|
||||
|
|
@ -23192,6 +23207,7 @@ tl: { # no indentation
|
|||
revision = 54074;
|
||||
deps."luatex" = tl."luatex";
|
||||
deps."metafont" = tl."metafont";
|
||||
hasFormats = true;
|
||||
sha512.run = "ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6";
|
||||
hasRunfiles = true;
|
||||
};
|
||||
|
|
@ -23549,6 +23565,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5";
|
||||
sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -23877,6 +23894,7 @@ tl: { # no indentation
|
|||
"mptopdf" = {
|
||||
revision = 57347;
|
||||
deps."plain" = tl."plain";
|
||||
hasFormats = true;
|
||||
sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd";
|
||||
sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -25321,6 +25339,7 @@ tl: { # no indentation
|
|||
deps."lm" = tl."lm";
|
||||
deps."luatex" = tl."luatex";
|
||||
deps."rsfs" = tl."rsfs";
|
||||
hasFormats = true;
|
||||
sha512.run = "d734139205c47599f3490dfbf13e6f71532ed7c311c3c76b6e444e539f1be6dd1bfffc612f8d019c38923d46ea7c98be72b28cf83c2b00885d787f6f526b0f0a";
|
||||
sha512.doc = "285d74614c05d3776a41269da1156930024359eef282b3d5479a5397bdb928357ff3020d3fcf47bc92d8ce4ae37a9c4fd68c9e601d7083911145a2bed2bad4f9";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -26068,6 +26087,7 @@ tl: { # no indentation
|
|||
deps."kpathsea" = tl."kpathsea";
|
||||
deps."plain" = tl."plain";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
hasFormats = true;
|
||||
sha512.run = "17c2b07af5e14f9f581d1094f4a3657ec1fe2b19fa96d952d1e4859265dc26e42743dc1fd7e8d6a7de56867be1b50a7071524d0580a8a680c605146893e7ff1b";
|
||||
sha512.doc = "8422210dceae381676a4c03784ab2c9b0e9233913eca6d25a9a7d5c5675f9ecb32f0a93dd624dbcc715f20d7e386a7844ea00e6e85473c1af14f8e384cd3f61e";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -26781,6 +26801,7 @@ tl: { # no indentation
|
|||
deps."ptex-fonts" = tl."ptex-fonts";
|
||||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
hasFormats = true;
|
||||
sha512.run = "787554d26ec4acb3811efbe96349a51b517e5b3b4677754d94dfe1d0ce61088d016f21995e5e9f49e1ace76a1e1f2c057c126981a9e340a9e047597f637aae3e";
|
||||
sha512.doc = "f0085548bc20f0389d475a9abf294a8713d36184aef1c65e12d5a7621a4f60e26cf8b63f6a1d558afe964f633455fffd9f492e749938c290b91c10e02c6cb4d7";
|
||||
sha512.source = "50afb0b5a1b766f89d7f3dda64b74f080a06d25d66618a4466018209fe4e3245f8deb274b22e30b45fac0a8a9f903ae70ec0301bfb72a394ebc3759e065205fd";
|
||||
|
|
@ -28314,6 +28335,7 @@ tl: { # no indentation
|
|||
deps."plain" = tl."plain";
|
||||
deps."ptex-base" = tl."ptex-base";
|
||||
deps."ptex-fonts" = tl."ptex-fonts";
|
||||
hasFormats = true;
|
||||
sha512.run = "d59108f06a06b7ac46195ef05c0ba6fb4873a88d327839a6143e94392faf3df73ae7b128548ae1ab69915f9883bad554f0e2dbd8d36b8f8c959897210895fba0";
|
||||
sha512.doc = "4f863d89fca4c137a84fe75365f600da96f3901d29dd98e9d5733523648b746861a22284707c6e9df90a9939c83adc7bcdf21b310785b8d403459d65294d1133";
|
||||
};
|
||||
|
|
@ -32455,6 +32477,7 @@ tl: { # no indentation
|
|||
deps."knuth-lib" = tl."knuth-lib";
|
||||
deps."kpathsea" = tl."kpathsea";
|
||||
deps."plain" = tl."plain";
|
||||
hasFormats = true;
|
||||
sha512.run = "e38f62fcc5ccee22a909eae5ea196e055eae59eedc652ce9788a3b4520995e97f64c683f1ba940853a06030a7ea6f1d749ed4dda1cb30433f87f5f9cdce5a9a7";
|
||||
sha512.doc = "3056263569276ca7a62ccb03542eac99b648d36c398ded17204a2624f06920c506985aedd1a639a48bc60af6394d091cdfd9ec44000730bd8e8c83c2234bb569";
|
||||
version = "3.141592653";
|
||||
|
|
@ -32862,6 +32885,7 @@ tl: { # no indentation
|
|||
deps."knuth-lib" = tl."knuth-lib";
|
||||
deps."plain" = tl."plain";
|
||||
deps."tex" = tl."tex";
|
||||
hasFormats = true;
|
||||
sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e";
|
||||
sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -34981,6 +35005,7 @@ tl: { # no indentation
|
|||
deps."unicode-data" = tl."unicode-data";
|
||||
deps."uptex" = tl."uptex";
|
||||
deps."uptex-fonts" = tl."uptex-fonts";
|
||||
hasFormats = true;
|
||||
sha512.run = "8acef423a0359136795301e1deaba156c702ee360f309d1884a90b3ed89842389bcc015e70c1461611ebb4a21fb9d5853db5ef40226ce0f61eb11f2a424a70f4";
|
||||
sha512.doc = "7cbc40c770c1e04114add004fc4920e3c7dea62f959d06fcbfe54b9fdc45893214ef3e960ac685cce258b07fab424aa7a242da368aa1ee0015ddf8579d582820";
|
||||
sha512.source = "9c1c1d0fec518410938e6642123f64242a6ff0bbb6425945897c10754e436fbd82d6739d31717152d183da385800a569d9209f37dd38c8eb77767842e0822a67";
|
||||
|
|
@ -35021,6 +35046,7 @@ tl: { # no indentation
|
|||
deps."ptex-base" = tl."ptex-base";
|
||||
deps."uptex-base" = tl."uptex-base";
|
||||
deps."uptex-fonts" = tl."uptex-fonts";
|
||||
hasFormats = true;
|
||||
sha512.run = "1ee2679e7531fe4406fea72f7efc482f7900da50cb74045a62c0b5e5596862011509c3d966a795bc13538170afd7db26e8cf4f406391a746e45804414f26cff0";
|
||||
sha512.doc = "06a3459702bc9838f2246aad7af99c427413a43356d88165e68a132bf8b926d9ab668e6dc10127c27eaac6526085c3fa069bb9709833cef241c94d0f4fb3e02a";
|
||||
};
|
||||
|
|
@ -35954,6 +35980,7 @@ tl: { # no indentation
|
|||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
deps."xetex" = tl."xetex";
|
||||
hasFormats = true;
|
||||
sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00";
|
||||
};
|
||||
"xellipsis" = {
|
||||
|
|
@ -36021,6 +36048,7 @@ tl: { # no indentation
|
|||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
deps."xetexconfig" = tl."xetexconfig";
|
||||
hasFormats = true;
|
||||
sha512.run = "dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6";
|
||||
sha512.doc = "544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa";
|
||||
hasRunfiles = true;
|
||||
|
|
@ -36247,6 +36275,7 @@ tl: { # no indentation
|
|||
deps."tex-ini-files" = tl."tex-ini-files";
|
||||
deps."unicode-data" = tl."unicode-data";
|
||||
deps."xmltexconfig" = tl."xmltexconfig";
|
||||
hasFormats = true;
|
||||
sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead";
|
||||
sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb";
|
||||
hasRunfiles = true;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ s/^catalogue-version_(.*)/ version = "\1";/p
|
|||
# extract deps
|
||||
s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p
|
||||
|
||||
# extract hyphenation patterns
|
||||
# extract hyphenation patterns and formats
|
||||
# (this may create duplicate lines, use uniq to remove them)
|
||||
/^execute\sAddHyphen/i\ hasHyphens = true;
|
||||
/^execute\sAddFormat/i\ hasFormats = true;
|
||||
|
|
|
|||
|
|
@ -11,23 +11,24 @@
|
|||
}:
|
||||
|
||||
let
|
||||
specVersion = "4.98.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
specVersion = "4.99.0";
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
|
||||
sha256 = "sha256-3SweDMfgq2+QQIdeb6EjL7A2Grd/7KQzsbMNZKPtXts=";
|
||||
sha256 = "10z63a2clbiskdnmnyf4m8v2hgc4bdm703y7s2dpw0q09msx9aca";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "linode-cli";
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hljvcYtck89Lzje0XgnvYqh+jebOEOFnOkgEnGZJm0o=";
|
||||
sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA=";
|
||||
};
|
||||
|
||||
# remove need for git history
|
||||
|
|
|
|||
|
|
@ -8050,10 +8050,7 @@ in
|
|||
|
||||
podiff = callPackage ../tools/text/podiff { };
|
||||
|
||||
podman = if stdenv.isDarwin then
|
||||
callPackage ../applications/virtualization/podman { }
|
||||
else
|
||||
callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman { };
|
||||
|
||||
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
|
||||
|
|
|
|||
|
|
@ -2247,6 +2247,8 @@ in {
|
|||
|
||||
ed25519 = callPackage ../development/python-modules/ed25519 { };
|
||||
|
||||
editables = callPackage ../development/python-modules/editables { };
|
||||
|
||||
editdistance = callPackage ../development/python-modules/editdistance { };
|
||||
|
||||
editdistance-s = callPackage ../development/python-modules/editdistance-s { };
|
||||
|
|
@ -6278,7 +6280,9 @@ in {
|
|||
|
||||
pynanoleaf = callPackage ../development/python-modules/pynanoleaf { };
|
||||
|
||||
pync = callPackage ../development/python-modules/pync { };
|
||||
pync = callPackage ../development/python-modules/pync {
|
||||
inherit (pkgs) coreutils which;
|
||||
};
|
||||
|
||||
pynest2d = callPackage ../development/python-modules/pynest2d { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue