JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-09 18:16:33 +00:00 committed by GitHub
commit 8064cff79c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 2671 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/power-profiles-daemon.nix
View File

@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "power-profiles-daemon";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ mvnetbiz ];
};
machine = { pkgs, ... }: {

65
pkgs/applications/misc/free42/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, gtk3
, alsaLib
}:
stdenv.mkDerivation rec {
pname = "free42";
version = "2.5.24a";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "xP0kzpmX6Q5Dg7azvyUZIdoi52AYkUmiCkUA1aVY+nQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 alsaLib ];
postPatch = ''
sed -i -e "s|/bin/ls|ls|" gtk/Makefile
'';
dontConfigure = true;
buildPhase = ''
runHook preBuild
make -C gtk cleaner
make --jobs=$NIX_BUILD_CORES -C gtk
make -C gtk clean
make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1
runHook postBuild
'';
preInstall = ''
install --directory $out/bin \
$out/share/doc/${pname} \
$out/share/${pname}/skins \
$out/share/icons/hicolor/48x48/apps \
$out/share/icons/hicolor/128x128/apps
'';
installPhase = ''
runHook preInstall
install -m755 gtk/free42dec gtk/free42bin $out/bin
install -m644 gtk/README $out/share/doc/${pname}/README-GTK
install -m644 README $out/share/doc/${pname}/README
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
install -m644 skins/* $out/share/${pname}/skins
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/thomasokken/free42";
description = "A software clone of HP-42S Calculator";
license = licenses.gpl2Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

4
pkgs/applications/misc/mkgmap/splitter/default.nix
View File

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "splitter";
version = "597";
version = "598";
src = fetchurl {
url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61";
sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M=";
};
patches = [

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "88.0.4324.146",
"sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q",
"sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id",
"version": "88.0.4324.150",
"sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf",
"sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0",
"deps": {
"gn": {
"version": "2020-11-05",
@ -55,8 +55,8 @@
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
},
"ungoogled-patches": {
"rev": "88.0.4324.146-1",
"sha256": "0vp53b3jdsay6a17n27vi6cj10jj6zz94gr9ip4r5zf45qq6jx3w"
"rev": "88.0.4324.150-1",
"sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y"
}
}
}

6
pkgs/applications/networking/cluster/istioctl/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg=";
sha256 = "sha256-lZr5CHHFLnWZmPfCX6GFdhnSOPqf0BbqirkHu2+yqfM=";
};
vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno=";
vendorSha256 = "sha256-+0lsWpQr74GwYfO7UKqTwOoxifGWpAe/FhlZBVQmGog=";
doCheck = false;

4
pkgs/applications/terminal-emulators/xterm/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
version = "364";
version = "365";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
sha256 = "0fizaalpv96sc199dfc00696vq18fixqb4fxb3jsard19k96x4pb";
sha256 = "142glxr1gfq4v5rzmk9fblipha0x7sgdiwh4vyy4wfw00nqd49yn";
};
buildInputs = [

48
pkgs/applications/window-managers/dwm/default.nix
View File

@ -1,34 +1,46 @@
{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}:
{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}:
with lib;
let
name = "dwm-6.2";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
pname = "dwm";
version = "6.2";
src = fetchurl {
url = "https://dl.suckless.org/dwm/${name}.tar.gz";
url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p";
};
buildInputs = [ libX11 libXinerama libXft ];
prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
prePatch = ''
sed -i "s@/usr/local@$out@" config.mk
'';
# Allow users set their own list of patches
inherit patches;
# Allow users to set the config.def.h file containing the configuration
postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf;
in optionalString (conf!=null) "cp ${configFile} config.def.h";
postPatch =
let
configFile =
if lib.isDerivation conf || builtins.isPath conf
then conf else writeText "config.def.h" conf;
in
lib.optionalString (conf != null) "cp ${configFile} config.def.h";
meta = {
homepage = "https://suckless.org/";
description = "Dynamic window manager for X";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; all;
meta = with lib; {
homepage = "https://dwm.suckless.org/";
description = "An extremely fast, small, and dynamic window manager for X";
longDescription = ''
dwm is a dynamic window manager for X. It manages windows in tiled,
monocle and floating layouts. All of the layouts can be applied
dynamically, optimising the environment for the application in use and the
task performed.
Windows are grouped by tags. Each window can be tagged with one or
multiple tags. Selecting certain tags displays all windows with these
tags.
'';
license = licenses.mit;
maintainers = with maintainers; [ viric ];
platforms = platforms.all;
};
}

36
pkgs/applications/window-managers/dwm/git.nix
View File

@ -1,36 +0,0 @@
{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, writeText, patches ? [ ]
, conf ? null }:
stdenv.mkDerivation {
pname = "dwm-git";
version = "20200303";
src = fetchgit {
url = "git://git.suckless.org/dwm";
rev = "61bb8b2241d4db08bea4261c82e27cd9797099e7";
sha256 = "1j3vly8dln35vnwnwwlaa8ql9fmnlmrv43jcyc8dbfhfxiw6f34l";
};
buildInputs = [ libX11 libXinerama libXft ];
prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
# Allow users set their own list of patches
inherit patches;
# Allow users to set the config.def.h file containing the configuration
postPatch = let
configFile = if lib.isDerivation conf || builtins.isPath conf then
conf
else
writeText "config.def.h" conf;
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
meta = with lib; {
homepage = "https://suckless.org/";
description = "Dynamic window manager for X, development version";
license = licenses.mit;
maintainers = with maintainers; [ xeji ];
platforms = platforms.unix;
};
}

6
pkgs/data/themes/qogir/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
version = "2020-11-16";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5";
sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn";
};
buildInputs = [ gdk-pixbuf librsvg ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Flat Design theme for GTK based desktop environments";
homepage = "https://vinceliuice.github.io/Qogir-theme";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};

4
pkgs/development/libraries/amdvlk/default.nix
View File

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2021.Q1.2";
version = "2021.Q1.3";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "+oAetAHJ530e3IFPJDQiQn5vbUKeI1z0oF3Gy6mRVGM=";
sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4=";
};
buildInputs = [

14
pkgs/development/php-packages/smbclient/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ buildPecl, lib, pkgs }:
buildPecl {
pname = "smbclient";
version = "1.0.4";
sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8";
# TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66
LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0";
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.samba ];
meta.maintainers = lib.teams.php.members;
}

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.1"; # N.B: if you change this, change botocore too
version = "1.17.4"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-WKRA9MlqHy8HZXfHCFI3hUum20GnyR5KM/swBo+NRpI=";
sha256 = "sha256-ZVFEJ/X4SSRcmicvoGpaAUrjlFMz9PQHSJ0DT7mdxh8=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.1"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.4"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-lIi6NeLU0XN19nuP0wDfXsL4MXopJAMpAQCcmZ1WO1k=";
sha256 = "sha256-YWV6Hks83alicIQYS9+dykY3wVI9rq0xo2l0vg1RaG0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/icmplib/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "icmplib";
version = "2.0.1";
version = "2.0.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ValentinBELYN";
repo = pname;
rev = "v${version}";
sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h";
sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/yq/default.nix
View File

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "yq";
version = "2.11.1";
version = "2.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
sha256 = "sha256-HSrUA1BNMGtSWLhsaY+YVtetWLe7F6K4dWkaanuMTCA=";
};
patches = [

639
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix Normal file
View File

@ -0,0 +1,639 @@
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
# this package (through the fixpoint glass)
, bazel_self
# needed only for the updater
, bazel_3
, lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater
, python27, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, buildJdkName
, runtimeShell
# Downstream packages for tests
, bazel-watcher
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
, gcc-unwrapped
, autoPatchelfHook
, file
, substituteAll
, writeTextFile
}:
let
version = "4.0.0";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k";
};
# Update with `eval $(nix-build -A bazel.updater)`,
# then add new dependencies from the dict in ./src-deps.json as required.
srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet =
let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json));
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
urls = d.urls;
sha256 = d.sha256;
});
in builtins.listToAttrs (map toFetchurl [
srcs.desugar_jdk_libs
srcs.io_bazel_skydoc
srcs.bazel_skylib
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
then srcs."java_tools_javac11_darwin-v10.5.zip"
else srcs."java_tools_javac11_linux-v10.5.zip")
srcs."coverage_output_generator-v2.5.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.19.0rc3.tar.gz"
srcs.bazel_toolchains
srcs.com_github_grpc_grpc
srcs.upb
srcs.com_google_protobuf
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
srcs.rules_proto
srcs.com_google_absl
srcs.com_github_google_re2
srcs.com_github_cares_cares
]);
distDir = runCommand "bazel-deps" {} ''
mkdir -p $out
for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
'';
defaultShellPath = lib.makeBinPath
# Keep this list conservative. For more exotic tools, prefer to use
# @rules_nixpkgs to pull in tools from the nix repository. Example:
#
# WORKSPACE:
#
# nixpkgs_git_repository(
# name = "nixpkgs",
# revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
# )
#
# # This defines an external Bazel workspace.
# nixpkgs_package(
# name = "bison",
# repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
# )
#
# some/BUILD.bazel:
#
# genrule(
# ...
# cmd = "$(location @bison//:bin/bison) -other -args",
# tools = [
# ...
# "@bison//:bin/bison",
# ],
# )
#
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip python27 python3 ];
# Java toolchain used for the build and tests
javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
# This repository is fetched by bazel at runtime
# however it contains prebuilt java binaries, with wrong interpreter
# and libraries path.
# We prefetch it, patch it, and override it in a global bazelrc.
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
arch = stdenv.hostPlatform.parsed.cpu.name;
remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}";
src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";
buildPhase = ''
mkdir $out;
'';
installPhase = ''
cp -Ra * $out/
touch $out/WORKSPACE
'';
};
bazelRC = writeTextFile {
name = "bazel-rc";
text = ''
startup --server_javabase=${runJdk}
# Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
# Most commands inherit from 'build' anyway.
build --distdir=${distDir}
fetch --distdir=${distDir}
query --distdir=${distDir}
build --override_repository=${remote_java_tools.name}=${remote_java_tools}
fetch --override_repository=${remote_java_tools.name}=${remote_java_tools}
query --override_repository=${remote_java_tools.name}=${remote_java_tools}
# Provide a default java toolchain, this will be the same as ${runJdk}
build --host_javabase='@local_jdk//:jdk'
# load default location for the system wide configuration
try-import /etc/bazel.bazelrc
'';
};
in
stdenv.mkDerivation rec {
pname = "bazel";
inherit version;
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.mboes ];
inherit platforms;
};
inherit src;
inherit sourceRoot;
patches = [
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
../trim-last-argument-to-gcc-if-empty.patch
# On Darwin, using clang 6 to build fails because of a linker error (see #105573),
# but using clang 7 fails because libarclite_macosx.a cannot be found when linking
# the xcode_locator tool.
# This patch removes using the -fobjc-arc compiler option and makes the code
# compile without automatic reference counting. Caveat: this leaks memory, but
# we accept this fact because xcode_locator is only a short-lived process used during the build.
./no-arc.patch
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
# So we are replacing this bazel paths by defaultShellPath,
# improving hermeticity and making it work in nixos.
(substituteAll {
src = ../strict_action_env.patch;
strictActionEnvPatch = defaultShellPath;
})
# bazel reads its system bazelrc in /etc
# override this path to a builtin one
(substituteAll {
src = ../bazel_rc.patch;
bazelSystemBazelRCPath = bazelRC;
})
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
# Additional tests that check bazel’s functionality. Execute
#
# nix-build . -A bazel.tests
#
# in the nixpkgs checkout root to exercise them locally.
passthru.tests =
let
runLocal = name: attrs: script:
let
attrs' = removeAttrs attrs [ "buildInputs" ];
buildInputs = [ python3 ] ++ (attrs.buildInputs or []);
in
runCommandCC name ({
inherit buildInputs;
preferLocalBuild = true;
meta.platforms = platforms;
} // attrs') script;
# bazel wants to extract itself into $install_dir/install every time it runs,
# so let’s do that only once.
extracted = bazelPkg:
let install_dir =
# `install_base` field printed by `bazel info`, minus the hash.
# yes, this path is kinda magic. Sorry.
"$HOME/.cache/bazel/_bazel_nixbld";
in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
export HOME=$(mktemp -d)
touch WORKSPACE # yeah, everything sucks
install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
# assert it’s actually below install_dir
[[ "$install_base" =~ ${install_dir} ]] \
|| (echo "oh no! $install_base but we are \
trying to copy ${install_dir} to $out instead!"; exit 1)
cp -R ${install_dir} $out
'';
bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
let
be = extracted bazelPkg;
in runLocal name { inherit buildInputs; } (
# skip extraction caching on Darwin, because nobody knows how Darwin works
(lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
# set up home with pre-unpacked bazel
export HOME=$(mktemp -d)
mkdir -p ${be.install_dir}
cp -R ${be}/install ${be.install_dir}
# https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
# Bazel checks whether the mtime of the install dir files
# is >9 years in the future, otherwise it extracts itself again.
# see PosixFileMTime::IsUntampered in src/main/cpp/util
# What the hell bazel.
${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
'')
+
''
# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
# about why to create a subdir for the workspace.
cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
${bazelScript}
touch $out
'');
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
bazel-examples = fetchFromGitHub {
owner = "bazelbuild";
repo = "examples";
rev = "4183fc709c26a00366665e2d60d70521dc0b405d";
sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
};
in (if !stdenv.hostPlatform.isDarwin then {
# `extracted` doesn’t work on darwin
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
} else {}) // {
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; };
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; };
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
# downstream packages using buildBazelPackage
# fixed-output hashes of the fetch phase need to be spot-checked manually
downstream = recurseIntoAttrs ({
inherit bazel-watcher;
}
# dm-sonnet is only packaged for linux
// (lib.optionalAttrs stdenv.isLinux {
# TODO(timokau) dm-sonnet is broken currently
# dm-sonnet-linux = python3.pkgs.dm-sonnet;
}));
};
src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources";
inherit src;
buildInputs = [ unzip ];
inherit sourceRoot;
installPhase = ''
cp -r . "$out"
'';
};
# update the list of workspace dependencies
passthru.updater = writeScript "update-bazel-deps.sh" ''
#!${runtimeShell}
(cd "${src_for_updater}" &&
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
"${bazel_3}"/bin/bazel \
query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
--loading_phase_threads=1 \
--output build) \
| "${python3}"/bin/python3 "${./update-srcDeps.py}" \
"${builtins.toString ./src-deps.json}"
'';
# Necessary for the tests to pass on Darwin with sandbox enabled.
# Bazel starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true;
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
customBash = writeCBin "bash" ''
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
extern char **environ;
int main(int argc, char *argv[]) {
char *path = getenv("PATH");
char *pathToAppend = "${defaultShellPath}";
char *newPath;
if (path != NULL) {
int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
newPath = malloc(length * sizeof(char));
snprintf(newPath, length, "%s:%s", path, pathToAppend);
} else {
newPath = pathToAppend;
}
setenv("PATH", newPath, 1);
execve("${bash}/bin/bash", argv, environ);
return 0;
}
'';
postPatch = let
darwinPatches = ''
bazelLinkFlags () {
eval set -- "$NIX_LDFLAGS"
local flag
for flag in "$@"; do
printf ' -Wl,%s' "$flag"
done
}
# Disable Bazel's Xcode toolchain detection which would configure compilers
# and linkers from Xcode instead of from PATH
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
tools/osx/BUILD
substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
# clang installed from Xcode has a compatibility wrapper that forwards
# invocations of gcc to clang, but vanilla clang doesn't
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
for wrapper in "''${wrappers[@]}"; do
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
done
'';
genericPatches = ''
# Substitute j2objc and objc wrapper's python shebang to plain python path.
# These scripts explicitly depend on Python 2.7, hence we use python27.
# See also `postFixup` where python27 is added to $out/nix-support
substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
src/BUILD
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
--replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
# substituteInPlace is rather slow, so prefilter the files with grep
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
# We default to python3 where possible. See also `postFixup` where
# python3 is added to $out/nix-support
substituteInPlace "$path" \
--replace /bin/bash ${customBash}/bin/bash \
--replace "/usr/bin/env bash" ${customBash}/bin/bash \
--replace "/usr/bin/env python" ${python3}/bin/python \
--replace /usr/bin/env ${coreutils}/bin/env \
--replace /bin/true ${coreutils}/bin/true
done
# bazel test runner include references to /bin/bash
substituteInPlace tools/build_rules/test_rules.bzl \
--replace /bin/bash ${customBash}/bin/bash
for i in $(find tools/cpp/ -type f)
do
substituteInPlace $i \
--replace /bin/bash ${customBash}/bin/bash
done
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
substituteInPlace scripts/bootstrap/compile.sh \
--replace /bin/bash ${customBash}/bin/bash
# add nix environment vars to .bazelrc
cat >> .bazelrc <<EOF
# Limit the resources Bazel is allowed to use during the build to 1/2 the
# available RAM and 3/4 the available CPU cores. This should help avoid
# overwhelming the build machine.
build --local_ram_resources=HOST_RAM*.5
build --local_cpu_resources=HOST_CPUS*.75
build --distdir=${distDir}
fetch --distdir=${distDir}
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
build --host_javabase='@local_jdk//:jdk'
build --host_java_toolchain='${javaToolchain}'
build --verbose_failures
EOF
# add the same environment vars to compile.sh
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
-e "/\$command \\\\$/a --verbose_failures \\\\" \
-i scripts/bootstrap/compile.sh
# This is necessary to avoid:
# "error: no visible @interface for 'NSDictionary' declares the selector
# 'initWithContentsOfURL:error:'"
# This can be removed when the apple_sdk is upgraded beyond 10.13+
sed -i '/initWithContentsOfURL:versionPlistUrl/ {
N
s/error:nil\];/\];/
}' tools/osx/xcode_locator.m
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
patchShebangs .
'';
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+ genericPatches;
buildInputs = [
buildJdk
python3
];
# when a command can’t be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
installShellFiles
zip
python3
unzip
makeWrapper
which
customBash
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
# Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
# subdirectory.
# Failing to do this causes "infinite symlink expansion detected"
preBuildPhases = ["preBuildPhase"];
preBuildPhase = ''
mkdir bazel_src
shopt -s dotglob extglob
mv !(bazel_src) bazel_src
'';
# Needed to build fish completion
propagatedBuildInputs = [ python3.pkgs.absl-py ];
buildPhase = ''
# Increasing memory during compilation might be necessary.
# export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
# If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
# and `git rev-parse --short HEAD` which would result in
# "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
# Actual bazel releases use scripts/release/common.sh which is based
# on branch/tag information which we don't have with tarball releases.
# Note that .bazelversion is always correct and is based on bazel-*
# executable name, version checks should work fine
export EMBED_LABEL="${version}- (@non-git)"
${customBash}/bin/bash ./bazel_src/compile.sh
./bazel_src/scripts/generate_bash_completion.sh \
--bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.bash \
--prepend=./bazel_src/scripts/bazel-complete-header.bash \
--prepend=./bazel_src/scripts/bazel-complete-template.bash
${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
--bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.fish
'';
installPhase = ''
mkdir -p $out/bin
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
# if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
# The binary _must_ exist with this naming if your project contains a .bazelversion
# file.
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
# shell completion files
installShellCompletion --bash \
--name bazel.bash \
./bazel_src/output/bazel-complete.bash
installShellCompletion --zsh \
--name _bazel \
./bazel_src/scripts/zsh_completion/_bazel
installShellCompletion --fish \
--name bazel.fish \
./bazel_src/output/bazel-complete.fish
'';
doInstallCheck = true;
installCheckPhase = ''
export TEST_TMPDIR=$(pwd)
hello_test () {
$out/bin/bazel test \
--test_output=errors \
--java_toolchain='${javaToolchain}' \
examples/cpp:hello-success_test \
examples/java-native/src/test/java/com/example/myproject:hello
}
cd ./bazel_src
# test whether $WORKSPACE_ROOT/tools/bazel works
mkdir -p tools
cat > tools/bazel <<"EOF"
#!${runtimeShell} -e
exit 1
EOF
chmod +x tools/bazel
# first call should fail if tools/bazel is used
! hello_test
cat > tools/bazel <<"EOF"
#!${runtimeShell} -e
exec "$BAZEL_REAL" "$@"
EOF
# second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
hello_test
'';
# Save paths to hardcoded dependencies so Nix can detect them.
postFixup = ''
mkdir -p $out/nix-support
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tar’d up into a .jar,
# so nix can’t detect python is needed in the runtime closure
# Some of the scripts explicitly depend on Python 2.7. Otherwise, we
# default to using python3. Therefore, both python27 and python3 are
# runtime dependencies.
echo "${python27}" >> $out/nix-support/depends
echo "${python3}" >> $out/nix-support/depends
'' + lib.optionalString stdenv.isDarwin ''
echo "${cctools}" >> $out/nix-support/depends
'';
dontStrip = true;
dontPatchELF = true;
}

34
pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch Normal file
View File

@ -0,0 +1,34 @@
--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100
+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100
@@ -21,10 +21,6 @@
// 6,6.4,6.4.1 = 6.4.1
// 6.3,6.3.0 = 6.3
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
#import <CoreServices/CoreServices.h>
#import <Foundation/Foundation.h>
--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100
+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100
@@ -123,7 +123,6 @@
"macosx",
"clang",
"-mmacosx-version-min=10.9",
- "-fobjc-arc",
"-framework",
"CoreServices",
"-framework",
--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100
+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100
@@ -27,7 +27,7 @@
])
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
-framework Foundation -o $@ $<
"""

1498
pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json Normal file
View File

File diff suppressed because it is too large Load Diff

54
pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py Executable file
View File

@ -0,0 +1,54 @@
#!/usr/bin/env python3
import sys
import json
if len(sys.argv) != 2:
print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr)
print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)
print("Hail Eris.", file=sys.stderr)
sys.exit(1)
http_archives = []
# just the kw args are the dict { name, sha256, urls … }
def http_archive(**kw):
http_archives.append(kw)
# like http_file
def http_file(**kw):
http_archives.append(kw)
# this is inverted from http_archive/http_file and bundles multiple archives
def distdir_tar(**kw):
for archive_name in kw['archives']:
http_archives.append({
"name": archive_name,
"sha256": kw['sha256'][archive_name],
"urls": kw['urls'][archive_name]
})
# TODO?
def git_repository(**kw):
print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr)
sys.exit(1)
# execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above.
exec(sys.stdin.read())
# transform to a dict with the names as keys
d = { el['name']: el for el in http_archives }
def has_urls(el):
return ('url' in el and el['url']) or ('urls' in el and el['urls'])
def has_sha256(el):
return 'sha256' in el and el['sha256']
bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values()))
if bad_archives:
print('Following bazel dependencies are missing url or sha256', file=sys.stderr)
print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr)
for el in bad_archives:
print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr)
sys.exit(1)
with open(sys.argv[1], "w") as f:
print(json.dumps(d, sort_keys=True, indent=4), file=f)

2
pkgs/development/tools/build-managers/bazel/java-test.nix
View File

@ -38,7 +38,7 @@ let
''));
testBazel = bazelTest {
name = "bazel-test-cpp";
name = "bazel-test-java";
inherit workspaceDir;
bazelPkg = bazel;
buildInputs = [ openjdk8 ];

40
pkgs/development/tools/build-managers/bazel/protobuf-test.nix
View File

@ -17,15 +17,29 @@ let
com_google_protobuf = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf";
rev = "v3.7.0";
sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh";
rev = "v3.13.0";
sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd";
};
bazel_skylib = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-skylib";
rev = "f83cb8dd6f5658bc574ccd873e25197055265d1c";
sha256 = "091fb0ky0956wgv8gghy9ay3yfx6497mb72qvibf0y9dllmxyn9l";
rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae";
sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s";
};
rules_python = fetchFromGitHub {
owner = "bazelbuild";
repo = "rules_python";
rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774";
sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz";
};
rules_proto = fetchFromGitHub {
owner = "bazelbuild";
repo = "rules_proto";
rev = "a0761ed101b939e19d83b2da5f59034bffc19c12";
sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf";
};
net_zlib = fetchurl rec {
@ -40,6 +54,8 @@ let
load("//:proto-support.bzl", "protobuf_deps")
protobuf_deps()
load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains")
rules_proto_toolchains()
'';
protoSupport = writeText "proto-support.bzl" ''
@ -62,13 +78,17 @@ let
name = "bazel_skylib",
path = "${bazel_skylib}",
)
native.bind(
name = "zlib",
actual = "@net_zlib//:zlib",
native.local_repository(
name = "rules_proto",
path = "${rules_proto}",
)
native.local_repository(
name = "rules_python",
path = "${rules_python}",
)
http_archive(
name = "net_zlib",
name = "zlib",
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
sha256 = "${net_zlib.sha256}",
strip_prefix = "zlib-1.2.11",
@ -89,6 +109,8 @@ let
'';
personBUILD = writeText "BUILD" ''
load("@rules_proto//proto:defs.bzl", "proto_library")
proto_library(
name = "person_proto",
srcs = ["person.proto"],

4
pkgs/development/tools/knightos/z80e/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z80e";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "z80e";
rev = version;
sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc";
sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc=";
};
nativeBuildInputs = [ cmake knightos-scas ];

4
pkgs/development/tools/misc/act/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "act";
version = "0.2.19";
version = "0.2.20";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vlE0tN6m/PZtDZiIs/glTWYP+E4qzD0MAeQjX+OAcHY=";
sha256 = "sha256-HgFm58zdaycOH65jfu3QsfFemhXymp3OTekISih+8WA=";
};
vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw=";

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "2021.02.05-15.32.53";
version = "2021.02.07-22.51.26";
src = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
sha256 = "sha256-kKjgAO3DEpZOm91Tzkhj4rmNOaacZi74o/qfp8n11Z4=";
sha256 = "sha256-6EiWyoH7voRjjDNWnWkyBV2eOPuoabRE7Os/JRE/LUk=";
};
dontUnpack = true;

6
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "ashleygwilliams";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-/tZUYJaNvJ7H3xAc9ygcJD6meK1Em87VYqqYqY1l4zE=";
sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY=";
};
cargoSha256 = "sha256-/6nr+UNQPa8+cEnAMgyjuCV1JjfqXcNLfuqi4/kgmk0=";
cargoSha256 = "sha256-W6+RGzCYJF9f44QaFDOI414/vCfKIuIOXoH+GYY0GwY=";
nativeBuildInputs = [ pkg-config ];

12
pkgs/games/mindustry/default.nix
View File

@ -29,27 +29,27 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
version = "123.1";
version = "124.1";
buildVersion = makeBuildVersion version;
Mindustry = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1";
sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546";
};
Arc = fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
rev = "v${version}";
sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5";
sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059";
};
soloud = fetchFromGitHub {
owner = "Anuken";
repo = "soloud";
# this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c";
sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m";
rev = "b33dfc5178fcb2613ee68136f4a4869cadc0b06a";
sha256 = "1vf68i3pnsixch37285ib7afkwmlrc05v783395jsdjzj9i67lj3";
};
patches = [
@ -114,7 +114,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk";
outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la";
};
in

324
pkgs/misc/vim-plugins/generated.nix
View File

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-02-02";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778";
sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd";
rev = "388cf3374312b05122151bc68691bf09a69ff840";
sha256 = "1jzfdbfw333r929l5bl1ca1dv9b6yyhsjhk3gdf7wxklbzcrww3p";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -89,12 +89,12 @@ let
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2021-01-28";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
rev = "16d201f8a789a5591ae980ac707a31241062ed52";
sha256 = "18fbqqjb0cn89wkm4dfhwh3xzpf6gdnav78lrs59kzfggppkpn8l";
rev = "4fbb34ccc09354ec09033719133c32d531111934";
sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
@ -207,6 +207,18 @@ let
meta.homepage = "https://github.com/jiangmiao/auto-pairs/";
};
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2021-02-05";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "691155697a809af8797c1b935aa4e73187516d42";
sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
autoload_cscope-vim = buildVimPluginFrom2Nix {
pname = "autoload_cscope-vim";
version = "2011-01-28";
@ -377,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-02-05";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "c592de172d6e9ed36c8ca38814b3bb2a8ffde901";
sha256 = "1hs38ri6j6bfnl5ll8jcd3wcpv95h1rf19vd42x3h0i4npxba9hz";
rev = "fb65c78edbc6a4bfaa8c7a9df45b2a955497247e";
sha256 = "1g1jhfn2nzx9g03kv5n8kwqsh3icf6s9ldkhsv5w1k1ang56zpn1";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -473,12 +485,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2021-02-02";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "16fcaba5e3ee67b4149bf4ce6bd0c76991e982c2";
sha256 = "0r23i855f01c3isfhv4j5r34xj777ffyqn420m44077dyr7r3m9k";
rev = "8c839426885e290ff5f63d87778f6325339ecf1f";
sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@ -497,12 +509,12 @@ let
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
version = "2021-02-03";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
rev = "14f4162f20e0d1dc7344e0620ffd11f3c811d4b2";
sha256 = "01xqvksvs61vg8sc6wpiilp833g61sza455297vg0im0cz7i8wpc";
rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0";
sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@ -604,6 +616,18 @@ let
meta.homepage = "https://github.com/rhysd/committia.vim/";
};
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
rev = "0b884f2b0bc965826e69d4377cd06a48a36995ec";
sha256 = "0mwqk9ixirjybv9b2f1n08052iv6hcdr5l73f7jij35nc5anclad";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
completion-buffers = buildVimPluginFrom2Nix {
pname = "completion-buffers";
version = "2021-01-17";
@ -666,12 +690,12 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2021-01-28";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "0aa1e8f78e8e0746a6026260f4d9a64a0bdfbf7a";
sha256 = "163hgvc64bjc18kf6biwy5slhkfg8rw7pvrjsq4kfmcszvkbhgap";
rev = "831334312237a305d92e54092bfab447376cc844";
sha256 = "1y0a43j1rhqzfm9qmd7dax6bn1mg9vwvh3rc355k94ix3x82n93j";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@ -846,12 +870,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2021-02-02";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "fe855a14eaf4ede5c040704770202fe954addbda";
sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc";
rev = "4d2353619262fe487a052288859f3eea64cd229c";
sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -894,12 +918,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-02-05";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "c56b0a7c0ff040f1de7e0bb48d76af56b4a4d2c1";
sha256 = "1yg3qawbfpi7jjl8bkl8yif245c03lz3vm52w2z7c970n3y6v2pm";
rev = "fcf4415c701cb9e05d1f2c3dee4afeeba1d625fc";
sha256 = "0kfb41k3gimjnqv9l288clwbqwznrgqqy3xanaw8306sgsjg7rs1";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1040,12 +1064,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
version = "2020-12-26";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "deoplete-plugins";
repo = "deoplete-lsp";
rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e";
sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a";
rev = "e526dbecda137e37c45492ce72fa92ea32314154";
sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n";
};
meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/";
};
@ -1112,12 +1136,12 @@ let
deoplete-vim-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-vim-lsp";
version = "2021-02-04";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "lighttiger2505";
repo = "deoplete-vim-lsp";
rev = "4e369aee9c443f31b3974c945f807ad93d27cb5c";
sha256 = "14vfa6zvxprrrdi82dwnayhr2wxmifd7h5w8cl0hfw5zyrs5qsr0";
rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976";
sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3";
};
meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/";
};
@ -1136,12 +1160,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-01-25";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "2e3f5b5c24152d9aa4a0299ce6d1b7a6b76327eb";
sha256 = "0yf35ak46pnknas6isvi4gpyc9n757a46kjvwwyh32pznfqpl41p";
rev = "27af4ab2de157f80c8a8391aebb60061318814ea";
sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1354,12 +1378,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
version = "2021-01-31";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
rev = "fa8a10607a39f41a16071561901b963836cd8706";
sha256 = "0cg0ri14jmgx063j950m5kfvsy81qwzvxibar8fq9bkpk63xrip3";
rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c";
sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@ -1487,12 +1511,12 @@ let
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
version = "2021-02-04";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
rev = "ee34f7fed7e2c8801a8c1a9101ab9392bc4e70a2";
sha256 = "0lc94z24bpvfkyip76s4yprhfgprqhzviywhp2ds2dlm7xr6bwj5";
rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855";
sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@ -1511,24 +1535,24 @@ let
gentoo-syntax = buildVimPluginFrom2Nix {
pname = "gentoo-syntax";
version = "2020-12-16";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "gentoo";
repo = "gentoo-syntax";
rev = "4cc031a5d3384ee9cc3225ff038a633be6b7125f";
sha256 = "0pdska6qkk734hplhyp2cw89xn2c897vgw72fgn2239pqryz5g4n";
rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe";
sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics";
};
meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
};
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2021-01-31";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "3f4a7cc9f50a179158cd8a9ea10ba56cae73514b";
sha256 = "1afgq5kj98qhgsvpf556zs478s3776i0kjq3zr6zwxr36dp8455n";
rev = "298c69898c11c2da574a6d2c32e195b0adc6f356";
sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@ -1571,12 +1595,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-02-02";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "fe58abc2d82328d489ac1678d2ac99c4ad94321e";
sha256 = "03sm5a9pis0m2qbqzl6x6zf6limr0pbzcxmdf7hk83q8zg2y91wb";
rev = "3ab17a8e829b1c6c0d53f6a22e35c185bf7360de";
sha256 = "0c73382ighhv18nn3zrdq09ayyh8pq0adcy6icgmx71qlszc5572";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2208,12 +2232,12 @@ let
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
version = "2021-01-05";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp-status.nvim";
rev = "5215ea78a5949b42b86bf474d33608de6b7594a3";
sha256 = "05h8n0ggi55g4ri9jsa4210knds0rxp8ym2knlq3njy40q0jjaxd";
rev = "187c492c492f8b57c1a66b82904785141b01d5ac";
sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz";
};
meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
};
@ -2230,26 +2254,38 @@ let
meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
};
lspkind-nvim = buildVimPluginFrom2Nix {
pname = "lspkind-nvim";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "onsails";
repo = "lspkind-nvim";
rev = "953ca895203c095e13f97a8ece790bf546c82d1c";
sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk";
};
meta.homepage = "https://github.com/onsails/lspkind-nvim/";
};
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
version = "2021-02-05";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "f50c266b285aec9a2645f9f48f55db2de0ccef94";
sha256 = "149jwbwhzxvh6mvbkbhkkwh3y5gzfh2r2jc3p00y2arhxsx478fa";
rev = "c2fb66a23659349b9c36d21892e5c8f67ed65d62";
sha256 = "1mrajhf7jnjgp68dqcrghhgf21shylili6sis8svfp7ls7x87wk2";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-02-05";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac";
sha256 = "0lcvxlxlr0inl93k5kvpphmacg6iprx9ym5jivmqnkvqsfzzv860";
rev = "0325203fa9c522fbe4297acc6992778ae3b41391";
sha256 = "0ykrz9yhxxc428d39bg1j9xvlxikzd0xr6zh7hci2apvv96a6mh3";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -2316,12 +2352,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
version = "2021-01-04";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e";
sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6";
rev = "551a13f9677dde911bd4436c038a1fa64e814cc4";
sha256 = "17ni56fs94x60qpd0ikwi2hz9nsh0icwm7438i84kswmysfx3gn8";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@ -2616,24 +2652,24 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2021-01-20";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "c1d63f047c2fc1dba638a80c24d9b9b44ceb9f50";
sha256 = "1q92lxdy8mgiv3ffp2gxsf0acp98hk3yh3lkvsaj6crdwbrq1ss9";
rev = "a75d96054618c47fbafef964d4d705525e8e37b9";
sha256 = "0c7k1fhw1fjgby4h99r22sbzn639v76r12dl66fhdrnkvrk0709n";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-02-05";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "f3740d68852557b64da832969bc2302c10759eb7";
sha256 = "1spgcvj25m5h6r4k6a41m233zl3wavj6yj84jpsjmg7xabw75c14";
rev = "53f22813fb3e60a4175ee44de55732b93c2903de";
sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -2880,12 +2916,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-02-05";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "b5e4239d19f6e5d69df724cb9a924a9b7cb1b739";
sha256 = "1vn637x06ar3rnjgfwlsm7c59gfs4bia177x4gzj9kj4kl0aadcp";
rev = "a85c6461ddf73fbe307a73b06855e336e298b152";
sha256 = "1kqw6ynhl36mwkghgs3yjw0q4yp578hb03hb1nwiyxdjh72v6a2v";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -2904,12 +2940,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-02-02";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "c0245b577f09173d18a8931c36e7299f10eaf232";
sha256 = "0gqa9kmb35vpididwv1ylk1ja8pcy4vxn30zfw1myc0jsxwknhlx";
rev = "10a740b2364efc9acff78f4e7466902f153e584b";
sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -2988,24 +3024,24 @@ let
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
version = "2021-02-02";
version = "2021-02-05";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc";
sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h";
rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1";
sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-02-04";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "e0ee3364c02c5eb739ce7af5a13e8cc50aae8d3d";
sha256 = "0kcdy6scrxb01rwajcimay7257n7xiwrl48pm24nlb3k2fzmsr9s";
rev = "041dfd7fb648d24c80cb8829dda2469f66f88490";
sha256 = "105xswyz91sphqr59kzg2df9dhs01d5g2nwmlnnbq0fpbdfjnylb";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3060,12 +3096,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-02-04";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "93854135974cec0bba9a6026b28c1ec84fe70a00";
sha256 = "0681d0d17c7lz2nqlsbn8n8j1gkfbhzahg3f0qw5sg0f5likrx57";
rev = "6533fb9af7f881c18b761ae94b2a502606f27989";
sha256 = "1rj9ndcvm24yirxg59y7sp6gs4dkyk0waa37j378liya5ia1cw48";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3108,12 +3144,12 @@ let
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-02-02";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "d3532beb184b64696095f101678e737277df8d1e";
sha256 = "12wxajgrzs3qjdjig55c56pa7va6sqnklq9hzi26z4k5isghbc3z";
rev = "eb8c49ee380bcdf477734911fe032fc141606a6b";
sha256 = "0ix27jdh6nvc352wwck8gjn4wsrf1y8ra89mrhf10mgm2ijr2xvs";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -3168,12 +3204,12 @@ let
oceanic-next = buildVimPluginFrom2Nix {
pname = "oceanic-next";
version = "2021-01-26";
version = "2021-02-05";
src = fetchFromGitHub {
owner = "mhartington";
repo = "oceanic-next";
rev = "f47fa3d4f63f1ce60bba13af81d97ee98ec31ceb";
sha256 = "064d2ip2fvkkqh0z8x0mykycbcwmdajflr5qz0pl4f5q0rlsnbb8";
rev = "5ef31a34204f84714885ae9036f66a626036c3dc";
sha256 = "1wazbyxaq71mlpyvyxrbrpyb9vgkcsj2y2zf1sba9gfjjszph482";
};
meta.homepage = "https://github.com/mhartington/oceanic-next/";
};
@ -3240,12 +3276,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-02-03";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "c5b7f23e0b406767c1918d6888962fdb97f951e8";
sha256 = "01w01543af4mbaa5hy5gfvbyz14sibf391dal987rn7zzjlsby7f";
rev = "5c43fcc1496112bf6fd569c3b5c7dda7f501b0ac";
sha256 = "0ghnnv2wyg3simvwxghlx3gafgnbm0qr48chfr89c2z4xsvn8rqc";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -3336,12 +3372,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
version = "2021-02-03";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "a022a1b11c3a74a18df383894ddab58169c5ace0";
sha256 = "0k395lm8azlyyrnnkjgyyidhf7s33alm5n2rffcpmygbh5i4665d";
rev = "2ea0101080985ec34019a79e7a4b30f6c45b0f3c";
sha256 = "0ijvib9ngydfifbzywxiac9xxvpjyp3jvym9mw3jf6hp4k4dh9sw";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@ -3360,12 +3396,12 @@ let
popfix = buildVimPluginFrom2Nix {
pname = "popfix";
version = "2021-01-07";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "popfix";
rev = "9ab0aa5f186a2a2429c55f1512e2fd8b536183f0";
sha256 = "0ks9hxc506ybwrvk5qkl1qkj634ms5icy8cg0w3b1q5qzgz5k0wn";
rev = "efcd82cbae750aa743619bfae7453fbec9366b87";
sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RishabhRD/popfix/";
@ -4083,12 +4119,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-02-05";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "5f1d16acf6716261bd52466733e096a49b9eadad";
sha256 = "1ybn9c6lxry5gs7rhnziv5i8gm45w4yrnkbvpzf898h5y6ifs5l5";
rev = "993e383dd5356bf10c5cf2b5d0ac88f9c7746181";
sha256 = "1db21n32y6hib3r0ncci3920wyb631yi57q3s58swlcqpjf20wli";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -4276,12 +4312,12 @@ let
unite-vim = buildVimPluginFrom2Nix {
pname = "unite-vim";
version = "2021-01-08";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "Shougo";
repo = "unite.vim";
rev = "c455008595a15c7ccc2c9f2ea309ba2bf5d3fe63";
sha256 = "054h0yrb2wffmirvqql2v34rfr5q0rx20p2y2wbrpx2w1vcwr2rc";
rev = "b08814362624ded3b462addba4711647879ca308";
sha256 = "0hk5xhn9zfas074hgv0y6lbc1jyj5kqjg4zdix8am3s97aqr96ms";
};
meta.homepage = "https://github.com/Shougo/unite.vim/";
};
@ -4852,12 +4888,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-02-01";
version = "2021-02-09";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8";
sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669";
rev = "1d25223d6d54b266a3bbe95e33bad845845247e2";
sha256 = "13ii654rp7sgpxqd4vyr61v2868g948cllcnrf8cmf7kwhmhik62";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -5488,12 +5524,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-02-05";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "2a47359fe7eca7655747ad871530a66f7fdd22f8";
sha256 = "1769lf2xgy11cmyg8n46xb7d4qn8c9b2ygiibj7skdyx9m88y4fw";
rev = "93083ed4395aaa47e2484947017e7da1ff4fe2fd";
sha256 = "0sb3pz85dy0z3ixv9hqv286dl8hq4ddc4fdgasswz8pq1a3jzrl5";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -5608,12 +5644,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2021-01-26";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "ff9d134f0c69e25d391138036051b2c5e6bac864";
sha256 = "1xpqhhvxf13nk4hd7jn0ydkkdk7r14w72h8hmpxzhhji1d0pcy43";
rev = "d249be7f3c04fe1970f8a50d1c219f1112f18676";
sha256 = "1y40zjnvvn4qkg5wdp906a71fnk5dnnk2p2dl3igd0bcxswvqqwf";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -6150,12 +6186,12 @@ let
vim-LanguageTool = buildVimPluginFrom2Nix {
pname = "vim-LanguageTool";
version = "2021-01-24";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "dpelle";
repo = "vim-LanguageTool";
rev = "f92e2577ab937f437c06d91639100952b540365b";
sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl";
rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a";
sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r";
};
meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
};
@ -6715,12 +6751,12 @@ let
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
version = "2021-01-29";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
rev = "4980c987647523defbc20b3377993d34526f3911";
sha256 = "089gp0abfqipz8rrh5jdcgrzg1a65cxchq1cadkxncmb8vcymh0r";
rev = "fdbac11f36172d6e47e212385d2f4482e472f815";
sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@ -6847,12 +6883,12 @@ let
vim-pencil = buildVimPluginFrom2Nix {
pname = "vim-pencil";
version = "2020-07-29";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "reedes";
repo = "vim-pencil";
rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63";
sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7";
rev = "2135374d48a7cb89efd5e818c12bb0ff450dfbb4";
sha256 = "17wgin33fj40brdb3zhm70qls2j2vssc4yrrv36y1qxwi7gdzn0f";
};
meta.homepage = "https://github.com/reedes/vim-pencil/";
};
@ -6883,12 +6919,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
version = "2020-12-14";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
rev = "8b45742540f92ba902c97ad1d3d8862ba3305438";
sha256 = "0ashl6qixnhgj5pnss9ri8w7fzixcsd0h4cmb2jpfrfma8s7xn3b";
rev = "cffcfe150bda75177920530c5f1911b52f70a065";
sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0";
};
meta.homepage = "https://github.com/junegunn/vim-plug/";
};
@ -7363,12 +7399,12 @@ let
vim-smoothie = buildVimPluginFrom2Nix {
pname = "vim-smoothie";
version = "2021-01-17";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "psliwka";
repo = "vim-smoothie";
rev = "f83a157552a3bf393a7c034df1d21e3555123a4c";
sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2";
rev = "10fd0aa57d176718bc2c570f121ab523c4429a25";
sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc";
};
meta.homepage = "https://github.com/psliwka/vim-smoothie/";
};
@ -7411,12 +7447,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2021-01-30";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0";
sha256 = "0yvk6d147rvp8gwsbls39dp3qblmkk0wz5prrx3k5j3dlh5l7fcp";
rev = "1b687b29ecf97125becae8f3fcce0c77c48951d6";
sha256 = "154a06p1hkg42f1imsw5swbm78xx7v5x7v4yivpva9lg23bccqhh";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@ -8180,12 +8216,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-01-10";
version = "2021-02-06";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "52eff3265181bbbe5338818dc5bc196e234cea45";
sha256 = "1j4f3762zpw4qvqiyrq1ym4lk78w3r93ya70id7g6w4pviaqcv1j";
rev = "7f77842ab89524d2d3b45a4fe7198fb51ac9e0a8";
sha256 = "0njsncynnbyqwcj0lr13ycz7kl9yg0blmb1dizlvki5gwqlj881r";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -8193,12 +8229,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-02-02";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72";
sha256 = "0vqpj2jg0nmjra0icm90p2dwf6jx87qjvch6hmvxj0m3g8kjs1cl";
rev = "5ac1abada4f931f2440476ad5d99a6d7600baca0";
sha256 = "1d9whpvs29mmjq5v3w2qgv370grak993lwka8k54anjxary9q4wz";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -8241,12 +8277,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
version = "2021-02-05";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "d5b19ed3db6fd3e9598b399d8a9977ff926ad24e";
sha256 = "0idd04aj76f3in8h5ljgxqkf9rpv29cbg58j8wbm874hfy72mm2i";
rev = "4387164845165634a06941b17c2b4f398cffd193";
sha256 = "0j7cwfkkvf0knni48p14lg0dg1y1xaw6dyz2f3dmn5kvw5fh80vc";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@ -8374,12 +8410,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2020-12-31";
version = "2021-02-07";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "2434b104065be4590f07ad950d0943b7194f01e6";
sha256 = "0hhwqb5w84bi28h27wmisx4mb91xc6jbdh004d5994bl2098yrf8";
rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a";
sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -8423,12 +8459,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
version = "2021-01-13";
version = "2021-02-08";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
rev = "bc1a7584b435b9921e245c3621ab7524be370b2d";
sha256 = "0fvgky7i6m5n4h4l73xdisxhpcc8cv9pq8jrvz571gmyjsh1rrrv";
rev = "e3646fc3124e33da4909e30caaad1167523e0c53";
sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};

9
pkgs/misc/vim-plugins/overrides.nix
View File

@ -741,6 +741,15 @@ self: super: {
meta.platforms = lib.platforms.all;
});
compe-tabnine = super.compe-tabnine.overrideAttrs (old: {
buildInputs = [ tabnine ];
postFixup = ''
mkdir $target/binaries
ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
'';
});
completion-tabnine = super.completion-tabnine.overrideAttrs (old: {
buildInputs = [ tabnine ];

3
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -429,6 +429,7 @@ octol/vim-cpp-enhanced-highlight
ojroques/vim-oscyank@main
Olical/aniseed
Olical/conjure
onsails/lspkind-nvim
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
@ -481,6 +482,7 @@ rhysd/vim-grammarous
rhysd/vim-operator-surround
RishabhRD/nvim-lsputils
RishabhRD/popfix
rmagatti/auto-session@main
rodjek/vim-puppet
romainl/vim-cool
romainl/vim-qf
@ -618,6 +620,7 @@ Twinside/vim-hoogle
tyru/caw.vim
tyru/open-browser-github.vim
tyru/open-browser.vim
tzachar/compe-tabnine@main
uarun/vim-protobuf
udalov/kotlin-vim
ujihisa/neco-look

4
pkgs/os-specific/linux/firejail/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "firejail";
version = "0.9.64.2";
version = "0.9.64.4";
src = fetchFromGitHub {
owner = "netblue30";
repo = "firejail";
rev = version;
sha256 = "1adizsb7pxr101bvvd359hxympnv36rnikp78npdr5dcvwddv3dv";
sha256 = "sha256-q/XL8cznHlUXdubUEptEAVma1jRUqFb5XcLAV0RVCzs=";
};
buildInputs = [ which ];

4
pkgs/servers/adminer/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, php }:
stdenv.mkDerivation rec {
version = "4.7.8";
version = "4.7.9";
pname = "adminer";
# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
src = fetchurl {
url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z";
sha256 = "sha256-V7cPdCcCjFlA3ykWe+F/fUO7+kZiOpqMgP0hHy6WDJE=";
};
nativeBuildInputs = [

6
pkgs/servers/gemini/agate/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "2.3.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rwoEZnxh0x+xaggJuoeSjE1ctF43ChW5awcDJyoWioA=";
sha256 = "sha256-AojemBU3BUuMqokLH9mhYf+sH5Q+zSYeoGmuI5/6vPw=";
};
cargoSha256 = "sha256-ey/fUHkPoWjWlLjh1WNpwMKOkdQKgFYcLwQdx2RQ3CI=";
cargoSha256 = "sha256-TFSD+G0i5EAu7D7gOtRzwFxO214CBPdh2Y6rRt39FVo=";
meta = with lib; {
homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate";

4
pkgs/servers/misc/navidrome/default.nix
View File

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "navidrome";
version = "0.39.0";
version = "0.40.0";
src = fetchurl {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn";
sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/admin/awscli/default.nix
View File

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.1"; # N.B: if you change this, change botocore to a matching version too
version = "1.19.4"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8T0zFxR7hLdt2ZZvkshckIO2XNGZIbQuwfeGxqQs7rs=";
sha256 = "sha256-fXQ6In3BBMvy1Jz6+OO8CXYVefIVrsVAUQHbNEroSII=";
};
# https://github.com/aws/aws-cli/issues/4837

6
pkgs/tools/misc/goreleaser/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.155.0";
version = "0.155.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wVHBcxbrU6WvBAegQYDRDvLbuoU49/Cm19ujghNyi2A=";
sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY=";
};
vendorSha256 = "sha256-k4TphR8z3DtoqJm6o6QILvQ1rHIldi1BpQJbEyWKv9U=";
vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ=";
buildFlagsArray = [
"-ldflags="

29
pkgs/tools/misc/jstest-gtk/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, gtkmm3, libsigcxx, xorg }:
stdenv.mkDerivation rec {
pname = "jstest-gtk";
version = "2018-07-10";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "62f6e2d7d44620e503149510c428df9e004c9f3b";
sha256 = "0icbbhrj5aqljhiavdy3hic60vp0zzfzyg0d6vpjaqkbzd5pv9d8";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gtkmm3 libsigcxx xorg.libX11 ];
meta = with lib; {
description = "A simple joystick tester based on Gtk+";
longDescription = ''
It provides you with a list of attached joysticks, a way to display which
buttons and axis are pressed, a way to remap axis and buttons and a way
to calibrate your joystick.
'';
homepage = "https://jstest-gtk.gitlab.io/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wucke13 ];
platforms = platforms.linux;
};
}

4
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.33.9";
version = "0.34.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1q3w2wv4lTIYPTO3weuZ0C2KeXcFWVV5KRJw2YRNWSE=";
sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw=";
};
vendorSha256 = null;

8
pkgs/tools/security/bitwarden_rs/vault.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
version = "2.17.1";
version = "2.18.1b";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7";
sha256 = "sha256-MwHTx4ITr2GuBS6qXD4m3aCinpJHQa0Wp0Bbmgg7ATQ=";
};
buildCommand = ''
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "Integrates the web vault into bitwarden_rs";
homepage = "https://github.com/dani-garcia/bw_web_builds";
platforms = platforms.all;
license = licenses.gpl3;
maintainers = with maintainers; [ msteen ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ msteen mic92 ];
};
}

6
pkgs/tools/typesetting/lowdown/default.nix
View File

@ -2,23 +2,25 @@
stdenv.mkDerivation rec {
pname = "lowdown";
version = "0.8.0";
version = "0.8.1";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "17w0hldlg7x0f4946bz1pmgkpp08dha3myz8pk0rx8n2lqlw76f3n9giq69kw82sgzg7qqy31sl9mxvgaxyf6hcdgmxnkr7h8d9xmak";
sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i";
};
nativeBuildInputs = [ which ]
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
configurePhase = ''
runHook preConfigure
./configure PREFIX=''${!outputDev} \
BINDIR=''${!outputBin}/bin \
LIBDIR=''${!outputLib}/lib \
MANDIR=''${!outputMan}/share/man
runHook postConfigure
'';
# Fix lib extension so that fixDarwinDylibNames detects it

1
pkgs/top-level/aliases.nix
View File

@ -150,6 +150,7 @@ mapAliases ({
dydisnix = throw "dydisnix has been removed."; # added 2021-01-27
dysnomia = throw "dysnomia has been removed."; # added 2021-01-27
dwarf_fortress = dwarf-fortress; # added 2016-01-23
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18

23
pkgs/top-level/all-packages.nix
View File

@ -4354,6 +4354,8 @@ in
gtk = gtk3;
};
free42 = callPackage ../applications/misc/free42 { };
galen = callPackage ../development/tools/galen {};
gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
@ -11748,6 +11750,16 @@ in
bazel_self = bazel_3;
};
bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless;
buildJdkName = "java11";
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
bazel_self = bazel_4;
};
bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
buildifier = bazel-buildtools;
buildozer = bazel-buildtools;
@ -21679,14 +21691,7 @@ in
inherit (gnome2) libgnomeui;
};
dwm = callPackage ../applications/window-managers/dwm {
patches = config.dwm.patches or [];
};
dwm-git = callPackage ../applications/window-managers/dwm/git.nix {
patches = config.dwm.patches or [];
conf = config.dwm.conf or null;
};
dwm = callPackage ../applications/window-managers/dwm { };
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
@ -28730,6 +28735,8 @@ in
libjack2 = jack2.override { prefix = "lib"; };
jack2Full = jack2; # TODO: move to aliases.nix
jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
keynav = callPackage ../tools/X11/keynav { };
kmon = callPackage ../tools/system/kmon { };

2
pkgs/top-level/php-packages.nix
View File

@ -134,6 +134,8 @@ lib.makeScope pkgs.newScope (self: with self; {
redis = callPackage ../development/php-packages/redis { };
smbclient = callPackage ../development/php-packages/smbclient { };
sqlsrv = callPackage ../development/php-packages/sqlsrv { };
v8 = buildPecl {