Merge branch 'master' into staging-next
This commit is contained in:
Martin Weinelt
commit
286f8cdbfc
|
|
@ -105,6 +105,16 @@ in
|
|||
}));
|
||||
};
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.podman.serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
|
||||
};
|
||||
|
||||
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
|
||||
|
||||
systemd.tmpfiles.packages = [ cfg.package ];
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
|
||||
|
|
|
|||
|
|
@ -223,10 +223,10 @@
|
|||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.0.3";
|
||||
version = "13.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar";
|
||||
sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.0.4.tar";
|
||||
sha256 = "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
|
@ -955,10 +955,10 @@
|
|||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.6.21";
|
||||
version = "0.6.22";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.21.tar";
|
||||
sha256 = "0pp190wr6z98kggmw9ls486f9vxfimdjdbqsp263qiyi21ws98if";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.22.tar";
|
||||
sha256 = "0dljl21n6508c7ash7l6zgxhpn2wdfzga0va63d4k9nwnqmkvsgz";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -985,10 +985,10 @@
|
|||
elpaBuild {
|
||||
pname = "ebdb-i18n-chn";
|
||||
ename = "ebdb-i18n-chn";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el";
|
||||
sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar";
|
||||
sha256 = "06ii9xi2y157vfbhx75mn80ash22d1xgcyp9kzz1s0lkxwlv74zj";
|
||||
};
|
||||
packageRequires = [ ebdb pyim ];
|
||||
meta = {
|
||||
|
|
@ -1205,10 +1205,10 @@
|
|||
elpaBuild {
|
||||
pname = "excorporate";
|
||||
ename = "excorporate";
|
||||
version = "0.9.1";
|
||||
version = "0.9.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar";
|
||||
sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j";
|
||||
url = "https://elpa.gnu.org/packages/excorporate-0.9.3.tar";
|
||||
sha256 = "1ybj0ww7x7l7ymykk6hs720whabavmwnrwq7x8dkn41wma181zzy";
|
||||
};
|
||||
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
|
||||
meta = {
|
||||
|
|
@ -1588,6 +1588,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hiddenquote = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hiddenquote";
|
||||
ename = "hiddenquote";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hiddenquote-1.1.tar";
|
||||
sha256 = "1j692ka84z6k9c3bhcn28irym5fga4d1wvhmvzvixdbfwn58ivw5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
highlight-escape-sequences = callPackage ({ elpaBuild
|
||||
, fetchurl
|
||||
, lib }:
|
||||
|
|
@ -2598,10 +2613,10 @@
|
|||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.3.65";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.3.65.tar";
|
||||
sha256 = "18pqxwfmciz9d2w808mvspkcifrja85y2qjwmb6pbdnkj9dr6yad";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.1.tar";
|
||||
sha256 = "11d1gsvvj26h9d7a28v87b022vbi3syzngn1x9v1d2g55iv01x38";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2643,10 +2658,10 @@
|
|||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.8.4.tar";
|
||||
sha256 = "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp";
|
||||
url = "https://elpa.gnu.org/packages/posframe-0.8.5.tar";
|
||||
sha256 = "0rls0rsj9clx4wd0gbdi5jzwyslparlf7phib649637gq6gs90ds";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2778,10 +2793,10 @@
|
|||
elpaBuild {
|
||||
pname = "rcirc-color";
|
||||
ename = "rcirc-color";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.1.el";
|
||||
sha256 = "1zs3i3xr8zbjr8hzr1r1qx7mqb2wckpn25qh9444c9as2dnh9sn9";
|
||||
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.2.tar";
|
||||
sha256 = "0pa9p018kwsy44cmkli7x6cz1abxkyi26ac7w3vh99qp7x97dia3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2994,6 +3009,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
repology = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "repology";
|
||||
ename = "repology";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/repology-1.1.0.tar";
|
||||
sha256 = "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/repology.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "rich-minority";
|
||||
|
|
@ -3533,10 +3563,10 @@
|
|||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.0";
|
||||
version = "2.5.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar";
|
||||
sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.0.1.tar";
|
||||
sha256 = "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3677,10 +3707,10 @@
|
|||
elpaBuild {
|
||||
pname = "valign";
|
||||
ename = "valign";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/valign-3.0.0.el";
|
||||
sha256 = "16f889x6yc1af2bmbly2lww4sy1s864ll75xdxp28i5m57gj25w8";
|
||||
url = "https://elpa.gnu.org/packages/valign-3.1.0.tar";
|
||||
sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210111";
|
||||
version = "20210208";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210111.tar";
|
||||
sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313";
|
||||
url = "https://orgmode.org/elpa/org-20210208.tar";
|
||||
sha256 = "1awqk2dk3sgglq6fqgaz8y8rqw3p5rcnkp7i6m15n7wlq9nx7njp";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210111";
|
||||
version = "20210208";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar";
|
||||
sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210208.tar";
|
||||
sha256 = "13yrzx7sdndf38hamm1m82kfgnqgm8752mjxmmqw1iqr3r33ihi3";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchgit, buildGoModule }:
|
||||
{ lib, fetchgit, buildGoModule, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bombadillo";
|
||||
|
|
@ -10,8 +10,16 @@ buildGoModule rec {
|
|||
sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage bombadillo.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Non-web client for the terminal, supporting Gopher, Gemini and more";
|
||||
homepage = "https://bombadillo.colorfield.space/";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ in runCommand cri-o.name {
|
|||
name = "${cri-o.pname}-wrapper-${cri-o.version}";
|
||||
inherit (cri-o) pname version passthru;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ];
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, yajl
|
||||
, nixosTests
|
||||
, criu
|
||||
, system
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -48,7 +49,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
|
||||
|
||||
buildInputs = [ criu libcap libseccomp systemd yajl ];
|
||||
buildInputs = [ libcap libseccomp systemd yajl ]
|
||||
# Criu currently only builds on x86_64-linux
|
||||
++ lib.optional (lib.elem system criu.meta.platforms) criu;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -63,6 +63,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 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
|
||||
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ in runCommand podman.name {
|
|||
ln -s ${podman.man} $man
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${podman-unwrapped}/lib $out/lib
|
||||
ln -s ${podman-unwrapped}/share $out/share
|
||||
makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \
|
||||
--prefix PATH : ${binPath}
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.14.14";
|
||||
version = "1.14.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132";
|
||||
sha256 = "0jci03f5z09xibbdqg4lnv2k3crhal1phzwr6lc4ajp514i3plby";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.15.7";
|
||||
version = "1.15.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6";
|
||||
sha256 = "1hlphkrsvb5nza5ajm24x4nrhyg4b0afs88kk4jd310hg2vhl32l";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./darwin-rpath-universal.patch ];
|
||||
|
||||
configureFlags = "--with-bzip2=${bzip2.out}";
|
||||
configureFlags = [ "--with-bzip2=${bzip2.out}" ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncwhois";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb";
|
||||
sha256 = "84677e90bc2d2975788e905ae9841bc91a732a452bc870991105b0a6cc3cd22f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fritzconnection";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
# no tests on PyPI
|
||||
src = fetchFromGitHub {
|
||||
owner = "kbr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q";
|
||||
sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "immutables";
|
||||
|
|
@ -10,10 +15,14 @@ buildPythonPackage rec {
|
|||
sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b";
|
||||
};
|
||||
|
||||
meta = {
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "immutables" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An immutable mapping type for Python";
|
||||
homepage = "https://github.com/MagicStack/immutables";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ catern ];
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ catern ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "myfitnesspal";
|
||||
version = "1.16.1";
|
||||
version = "1.16.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6";
|
||||
sha256 = "44b31623fd71fedd891c3f66be3bc1caa6f1caf88076a75236ab74f8807f6ae5";
|
||||
};
|
||||
|
||||
# Remove overly restrictive version constraints
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, ffmpeg
|
||||
, netcdf
|
||||
, qscintilla
|
||||
, zlib
|
||||
, boost
|
||||
, git
|
||||
, fftw
|
||||
, hdf5
|
||||
, libssh
|
||||
, qt5
|
||||
, python
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.5";
|
||||
pname = "ovito";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stuko";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git ];
|
||||
buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scientific visualization and analysis software for atomistic simulation data";
|
||||
homepage = "https://www.ovito.org";
|
||||
license = with licenses; [ gpl3Only mit ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
# ensures not built on hydra
|
||||
# https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,6 +25,10 @@ buildGoModule rec {
|
|||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
patches = [
|
||||
../../../applications/virtualization/podman/remove-unconfigured-runtime-warn.patch
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
let
|
||||
buildah = buildah-unwrapped;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
binPath = lib.makeBinPath ([
|
||||
runc
|
||||
crun
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ in
|
|||
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
|
||||
++ [ zlib libuv openssl http-parser icu ];
|
||||
|
||||
nativeBuildInputs = [ which util-linux pkg-config python ]
|
||||
nativeBuildInputs = [ which pkg-config python ]
|
||||
++ optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
configureFlags = let
|
||||
|
|
|
|||
|
|
@ -689,6 +689,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
tomoki1207.pdf = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "pdf";
|
||||
publisher = "tomoki1207";
|
||||
version = "1.1.0";
|
||||
sha256 = "0pcs4iy77v4f04f8m9w2rpdzfq7sqbspr7f2sm1fv7bm515qgsvb";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
tyriar.sort-lines = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "sort-lines";
|
||||
|
|
@ -745,6 +757,18 @@ let
|
|||
llvm-org.lldb-vscode = llvmPackages_8.lldb;
|
||||
|
||||
WakaTime.vscode-wakatime = callPackage ./wakatime {};
|
||||
|
||||
wholroyd.jinja = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jinja";
|
||||
publisher = "wholroyd";
|
||||
version = "0.0.8";
|
||||
sha256 = "1ln9gly5bb7nvbziilnay4q448h9npdh7sd9xy277122h0qawkci";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
aliases = self: super: {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oauth2-proxy";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "oauth2-proxy";
|
||||
sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I=";
|
||||
sha256 = "sha256-PvoCR+JYaQeHlnO6H75LcY7Lszi1nNNe6SCd3sJJ6R4=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, curl, openssl, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hcxtools";
|
||||
version = "6.0.3";
|
||||
version = "6.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZerBea";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0s9l5mvzcv6hnj7h28piabnm66b09hk2l57vb85ny35w99hzpkc0";
|
||||
sha256 = "1xvr89r6287788bx5qbw9sr8jvmajps0rpc7fvh9bfzb6zw2rq6w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ curl openssl zlib ];
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -4627,8 +4627,6 @@ in {
|
|||
|
||||
ovh = callPackage ../development/python-modules/ovh { };
|
||||
|
||||
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });
|
||||
|
||||
owslib = callPackage ../development/python-modules/owslib { };
|
||||
|
||||
oyaml = callPackage ../development/python-modules/oyaml { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue