Merge master into staging-next
This commit is contained in:
commit
f89e74dbcc
|
@ -39,6 +39,11 @@
|
||||||
modules = modules ++ [
|
modules = modules ++ [
|
||||||
./nixos/modules/virtualisation/qemu-vm.nix
|
./nixos/modules/virtualisation/qemu-vm.nix
|
||||||
{ virtualisation.useBootLoader = true; }
|
{ virtualisation.useBootLoader = true; }
|
||||||
|
({ config, ... }: {
|
||||||
|
virtualisation.useEFIBoot =
|
||||||
|
config.boot.loader.systemd-boot.enable ||
|
||||||
|
config.boot.loader.efi.canTouchEfiVariables;
|
||||||
|
})
|
||||||
];
|
];
|
||||||
})).config;
|
})).config;
|
||||||
in
|
in
|
||||||
|
|
|
@ -22,6 +22,11 @@ let
|
||||||
[ configuration
|
[ configuration
|
||||||
./modules/virtualisation/qemu-vm.nix
|
./modules/virtualisation/qemu-vm.nix
|
||||||
{ virtualisation.useBootLoader = true; }
|
{ virtualisation.useBootLoader = true; }
|
||||||
|
({ config, ... }: {
|
||||||
|
virtualisation.useEFIBoot =
|
||||||
|
config.boot.loader.systemd-boot.enable ||
|
||||||
|
config.boot.loader.efi.canTouchEfiVariables;
|
||||||
|
})
|
||||||
];
|
];
|
||||||
}).config;
|
}).config;
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,19 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
cfg = config.services.getty;
|
||||||
|
|
||||||
autologinArg = optionalString (config.services.getty.autologinUser != null) "--autologin ${config.services.getty.autologinUser}";
|
loginArgs = [
|
||||||
gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
|
"--login-program" "${pkgs.shadow}/bin/login"
|
||||||
|
] ++ optionals (cfg.autologinUser != null) [
|
||||||
|
"--autologin" cfg.autologinUser
|
||||||
|
] ++ optionals (cfg.loginOptions != null) [
|
||||||
|
"--login-options" cfg.loginOptions
|
||||||
|
];
|
||||||
|
|
||||||
|
gettyCmd = extraArgs:
|
||||||
|
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "
|
||||||
|
+ extraArgs;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -30,6 +40,23 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
loginOptions = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Template for arguments to be passed to
|
||||||
|
<citerefentry><refentrytitle>login</refentrytitle>
|
||||||
|
<manvolnum>1</manvolnum></citerefentry>.
|
||||||
|
|
||||||
|
See <citerefentry><refentrytitle>agetty</refentrytitle>
|
||||||
|
<manvolnum>1</manvolnum></citerefentry> for details,
|
||||||
|
including security considerations. If unspecified, agetty
|
||||||
|
will not be invoked with a <option>--login-options</option>
|
||||||
|
option.
|
||||||
|
'';
|
||||||
|
example = "-h darkstar -- \u";
|
||||||
|
};
|
||||||
|
|
||||||
greetingLine = mkOption {
|
greetingLine = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = ''
|
description = ''
|
||||||
|
|
|
@ -1,26 +1,28 @@
|
||||||
{ stdenv, fetchFromGitHub
|
{ stdenv, fetchFromGitHub
|
||||||
, pkgconfig
|
, pkg-config
|
||||||
, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
|
, freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
p_name = "mtPaint";
|
p_name = "mtPaint";
|
||||||
ver_maj = "3.49";
|
ver_maj = "3.50";
|
||||||
ver_min = "12";
|
ver_min = "01";
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wjaguar";
|
owner = "wjaguar";
|
||||||
repo = p_name;
|
repo = p_name;
|
||||||
rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8";
|
rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
|
||||||
sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
|
sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
|
freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle
|
||||||
];
|
];
|
||||||
|
|
||||||
|
configureFlags = [ "gtk3" "intl" "man" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A simple GTK painting program";
|
description = "A simple GTK painting program";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||||
GNU/Linux, Windows and older PC hardware.
|
GNU/Linux, Windows and older PC hardware.
|
||||||
'';
|
'';
|
||||||
homepage = "http://mtpaint.sourceforge.net/";
|
homepage = "http://mtpaint.sourceforge.net/";
|
||||||
license = stdenv.lib.licenses.gpl3;
|
license = stdenv.lib.licenses.gpl3Plus;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
maintainers = [ stdenv.lib.maintainers.vklquevs ];
|
maintainers = [ stdenv.lib.maintainers.vklquevs ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "starboard";
|
pname = "starboard";
|
||||||
version = "0.7.1";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aquasecurity";
|
owner = "aquasecurity";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr";
|
sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0";
|
vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0=";
|
||||||
|
|
||||||
subPackages = [ "cmd/starboard" ];
|
subPackages = [ "cmd/starboard" ];
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "lieer";
|
pname = "lieer";
|
||||||
version = "1.2";
|
version = "1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gauteh";
|
owner = "gauteh";
|
||||||
repo = "lieer";
|
repo = "lieer";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5";
|
sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
oauth2client
|
oauth2client
|
||||||
google_api_python_client
|
google_api_python_client
|
||||||
tqdm
|
tqdm
|
||||||
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "pijul";
|
pname = "pijul";
|
||||||
version = "1.0.0-alpha.24";
|
version = "1.0.0-alpha.31";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit version pname;
|
inherit version pname;
|
||||||
sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s";
|
sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44";
|
cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA";
|
||||||
|
|
||||||
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
|
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
system, # Note: This is the cross system we're compiling for
|
system, # Note: This is the cross system we're compiling for
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
|
|
||||||
let
|
let
|
||||||
|
|
||||||
mkDbExtraCommand = contents: let
|
mkDbExtraCommand = contents: let
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv, fetchFromGitHub
|
{ stdenv, fetchFromGitHub
|
||||||
, cmake, pkg-config
|
, cmake, pkg-config
|
||||||
, libva, libpciaccess, intel-gmmlib, libX11
|
, libva, libpciaccess, intel-gmmlib
|
||||||
|
, enableX11 ? true, libX11
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -23,7 +24,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
|
buildInputs = [ libva libpciaccess intel-gmmlib ]
|
||||||
|
++ stdenv.lib.optional enableX11 libX11;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
|
description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
|
||||||
|
@ -38,4 +40,9 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ primeos jfrankenau ];
|
maintainers = with maintainers; [ primeos jfrankenau ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postFixup = stdenv.lib.optionalString enableX11 ''
|
||||||
|
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \
|
||||||
|
$out/lib/dri/iHD_drv_video.so
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
|
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
|
||||||
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
|
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
|
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
|
||||||
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
|
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
|
||||||
|
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [ libtiff ]
|
buildInputs = [ libpng libtiff ]
|
||||||
++ optionals enableQt [ qtbase qtx11extras qttools ]
|
++ optionals enableQt [ qtbase qtx11extras qttools ]
|
||||||
++ optionals stdenv.isLinux [
|
++ optionals stdenv.isLinux [
|
||||||
libGLU
|
libGLU
|
||||||
|
@ -65,6 +65,7 @@ in stdenv.mkDerivation rec {
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_C_FLAGS=-fPIC"
|
"-DCMAKE_C_FLAGS=-fPIC"
|
||||||
"-DCMAKE_CXX_FLAGS=-fPIC"
|
"-DCMAKE_CXX_FLAGS=-fPIC"
|
||||||
|
"-DVTK_USE_SYSTEM_PNG=ON"
|
||||||
"-DVTK_USE_SYSTEM_TIFF=1"
|
"-DVTK_USE_SYSTEM_TIFF=1"
|
||||||
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
|
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
|
||||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boto3";
|
pname = "boto3";
|
||||||
version = "1.16.50"; # N.B: if you change this, change botocore too
|
version = "1.16.51"; # N.B: if you change this, change botocore too
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-TVAqhCuB/axLlQ07iKW5BnzhGCE7Eisg9BkgA8sGeYY=";
|
sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "botocore";
|
pname = "botocore";
|
||||||
version = "1.19.50"; # N.B: if you change this, change boto3 and awscli to a matching version
|
version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-cJCQumG7p9+oMbQ31hy0aahSmNjzzluOEs30G9KyvGE=";
|
sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "golangci-lint";
|
pname = "golangci-lint";
|
||||||
version = "1.33.0";
|
version = "1.35.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "golangci";
|
owner = "golangci";
|
||||||
repo = "golangci-lint";
|
repo = "golangci-lint";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin";
|
sha256 = "03pg8qfysjdbpxzdcs4y5cn0gshr5k53p7rjqak7q8vdykva60s1";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj";
|
vendorSha256 = "18dgx087jixwcfcab546qhy5qq1n1ahrsr7i7d7d3v9vklslics8";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
"x86_64-linux": {
|
"x86_64-linux": {
|
||||||
"alpha": {
|
"alpha": {
|
||||||
"experimental": {
|
"experimental": {
|
||||||
"name": "factorio_alpha_x64-1.1.7.tar.xz",
|
"name": "factorio_alpha_x64-1.1.8.tar.xz",
|
||||||
"needsAuth": true,
|
"needsAuth": true,
|
||||||
"sha256": "0wqrs5w5giybq47hfv5wwg7c36351kfsa5x06nvxls2znyl43qv8",
|
"sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m",
|
||||||
"tarDirectory": "x64",
|
"tarDirectory": "x64",
|
||||||
"url": "https://factorio.com/get-download/1.1.7/alpha/linux64",
|
"url": "https://factorio.com/get-download/1.1.8/alpha/linux64",
|
||||||
"version": "1.1.7"
|
"version": "1.1.8"
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
||||||
|
@ -38,12 +38,12 @@
|
||||||
},
|
},
|
||||||
"headless": {
|
"headless": {
|
||||||
"experimental": {
|
"experimental": {
|
||||||
"name": "factorio_headless_x64-1.1.7.tar.xz",
|
"name": "factorio_headless_x64-1.1.8.tar.xz",
|
||||||
"needsAuth": false,
|
"needsAuth": false,
|
||||||
"sha256": "1s52p6cvd2v0pmj4gppc2pf8r6bpbzkmwpw8451j3ic58fhjvypr",
|
"sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf",
|
||||||
"tarDirectory": "x64",
|
"tarDirectory": "x64",
|
||||||
"url": "https://factorio.com/get-download/1.1.7/headless/linux64",
|
"url": "https://factorio.com/get-download/1.1.8/headless/linux64",
|
||||||
"version": "1.1.7"
|
"version": "1.1.8"
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
||||||
|
|
|
@ -4453,6 +4453,18 @@ let
|
||||||
meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
|
meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vim-capslock = buildVimPluginFrom2Nix {
|
||||||
|
pname = "vim-capslock";
|
||||||
|
version = "2021-01-07";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tpope";
|
||||||
|
repo = "vim-capslock";
|
||||||
|
rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c";
|
||||||
|
sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/tpope/vim-capslock/";
|
||||||
|
};
|
||||||
|
|
||||||
vim-carbon-now-sh = buildVimPluginFrom2Nix {
|
vim-carbon-now-sh = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-carbon-now-sh";
|
pname = "vim-carbon-now-sh";
|
||||||
version = "2020-10-28";
|
version = "2020-10-28";
|
||||||
|
|
|
@ -550,6 +550,7 @@ tommcdo/vim-ninja-feet
|
||||||
tomtom/tcomment_vim
|
tomtom/tcomment_vim
|
||||||
tomtom/tlib_vim
|
tomtom/tlib_vim
|
||||||
tpope/vim-abolish
|
tpope/vim-abolish
|
||||||
|
tpope/vim-capslock
|
||||||
tpope/vim-commentary
|
tpope/vim-commentary
|
||||||
tpope/vim-dadbod
|
tpope/vim-dadbod
|
||||||
tpope/vim-dispatch
|
tpope/vim-dispatch
|
||||||
|
|
|
@ -63,6 +63,18 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "nixfmt-vscode";
|
||||||
|
publisher = "brettm12345";
|
||||||
|
version = "0.0.1";
|
||||||
|
sha256 = "07w35c69vk1l6vipnq3qfack36qcszqxn8j3v332bl0w6m02aa7k";
|
||||||
|
};
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
license = licenses.mpl20;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
cmschuetz12.wal = buildVscodeMarketplaceExtension {
|
cmschuetz12.wal = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "wal";
|
name = "wal";
|
||||||
|
@ -75,6 +87,18 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "bracket-pair-colorizer-2";
|
||||||
|
publisher = "CoenraadS";
|
||||||
|
version = "0.2.0";
|
||||||
|
sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh";
|
||||||
|
};
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
dhall.dhall-lang = buildVscodeMarketplaceExtension {
|
dhall.dhall-lang = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "dhall-lang";
|
name = "dhall-lang";
|
||||||
|
@ -107,6 +131,18 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
formulahendry.auto-rename-tag = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "auto-rename-tag";
|
||||||
|
publisher = "formulahendry";
|
||||||
|
version = "0.1.6";
|
||||||
|
sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs";
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
golang.Go = buildVscodeMarketplaceExtension {
|
golang.Go = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "Go";
|
name = "Go";
|
||||||
|
@ -131,6 +167,18 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ibm.output-colorizer = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "output-colorizer";
|
||||||
|
publisher = "IBM";
|
||||||
|
version = "0.1.2";
|
||||||
|
sha256 = "0i9kpnlk3naycc7k8gmcxas3s06d67wxr3nnyv5hxmsnsx5sfvb7";
|
||||||
|
};
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "latex-workshop";
|
name = "latex-workshop";
|
||||||
|
@ -143,6 +191,18 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
jnoortheen.nix-ide = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "nix-ide";
|
||||||
|
publisher = "jnoortheen";
|
||||||
|
version = "0.1.7";
|
||||||
|
sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm";
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
justusadam.language-haskell = buildVscodeMarketplaceExtension {
|
justusadam.language-haskell = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "language-haskell";
|
name = "language-haskell";
|
||||||
|
@ -297,10 +357,34 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
tyriar.sort-lines = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "sort-lines";
|
||||||
|
publisher = "Tyriar";
|
||||||
|
version = "1.9.0";
|
||||||
|
sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl";
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
vadimcn.vscode-lldb = callPackage ./vscode-lldb {
|
vadimcn.vscode-lldb = callPackage ./vscode-lldb {
|
||||||
lldb = llvmPackages_latest.lldb;
|
lldb = llvmPackages_latest.lldb;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "highlight-matching-tag";
|
||||||
|
publisher = "vincaslt";
|
||||||
|
version = "0.10.0";
|
||||||
|
sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49";
|
||||||
|
};
|
||||||
|
meta = {
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
|
ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
|
||||||
|
|
||||||
vscodevim.vim = buildVscodeMarketplaceExtension {
|
vscodevim.vim = buildVscodeMarketplaceExtension {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "timescaledb";
|
pname = "timescaledb";
|
||||||
version = "1.7.4";
|
version = "2.0.0";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ postgresql openssl ];
|
buildInputs = [ postgresql openssl ];
|
||||||
|
@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
|
||||||
owner = "timescale";
|
owner = "timescale";
|
||||||
repo = "timescaledb";
|
repo = "timescaledb";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc";
|
sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];
|
# -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream
|
||||||
|
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DWARNINGS_AS_ERRORS=OFF" ];
|
||||||
|
|
||||||
# Fix the install phase which tries to install into the pgsql extension dir,
|
# Fix the install phase which tries to install into the pgsql extension dir,
|
||||||
# and cannot be manually overridden. This is rather fragile but works OK.
|
# and cannot be manually overridden. This is rather fragile but works OK.
|
||||||
|
|
|
@ -5,15 +5,15 @@
|
||||||
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2021-01-05";
|
version = "2021-01-07";
|
||||||
pname = "oh-my-zsh";
|
pname = "oh-my-zsh";
|
||||||
rev = "86f805280f6a8cf65d8d0a9380489aae4b72f767";
|
rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
inherit rev;
|
inherit rev;
|
||||||
owner = "ohmyzsh";
|
owner = "ohmyzsh";
|
||||||
repo = "ohmyzsh";
|
repo = "ohmyzsh";
|
||||||
sha256 = "1wf4g1z7fvravsp020xdqvczf4kcw1nh3b22djlsgd97n8qgziaz";
|
sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -28,11 +28,11 @@ let
|
||||||
|
|
||||||
in with py.pkgs; buildPythonApplication rec {
|
in with py.pkgs; buildPythonApplication rec {
|
||||||
pname = "awscli";
|
pname = "awscli";
|
||||||
version = "1.18.210"; # N.B: if you change this, change botocore to a matching version too
|
version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-kt12Dc58UpsdlMen3IeTvRzcZ0HnwArs2q3ojqUBEPw=";
|
sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in a new issue