Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-30 12:06:24 +00:00 committed by GitHub
commit c9e9ff786b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 930 additions and 883 deletions

View File

@ -15,6 +15,8 @@ mkDerivation rec {
sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a";
};
outputs = [ "out" "doc" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [

View File

@ -359,10 +359,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"repo": "terraform-provider-google",
"rev": "v3.47.0",
"sha256": "05xb0q56y9088qbyaf3vzjm9im1s2azxffhjffjpzi0i79k0g2p0",
"vendorSha256": "1h83p7ncv7b4ci7qdig7hb81zk9458fq9aqqbkryawf1w7wbaq2a",
"version": "3.47.0"
"rev": "v3.62.0",
"sha256": "0x0qp8nk88667hvlpgxrdjsgirw8iwv85gn3k9xb37a3lw7xs4qz",
"vendorSha256": "0w6aavj1c4blpvsy00vz4dcj8rnxx6a586b16lqp6s1flqmlqrbi",
"version": "3.62.0"
},
"google-beta": {
"owner": "hashicorp",

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.16";
version = "0.28.18";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc=";
sha256 = "sha256-W0HjGILezhuc1lXvGCHw23h8Sx1uw4YLLsOOBZYGvU8=";
};
vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";
vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk=";
doCheck = false;

View File

@ -41,11 +41,11 @@ let
pname = "slack";
x86_64-darwin-version = "4.13.0";
x86_64-darwin-sha256 = "1f155fgbdmqxy7324lxj3ysx1p332rzpwy06iac90rm6irf5v57f";
x86_64-darwin-version = "4.14.0";
x86_64-darwin-sha256 = "0kpjsnriav6rcddjkz0z9arxjd09i6bw2krnmf3dc31my64nmxs6";
x86_64-linux-version = "4.13.0";
x86_64-linux-sha256 = "1hqvynkhbkfwxvfgjqv91x5k7qlzayjr5mmf8rz0ncp4j4d3x9mq";
x86_64-linux-version = "4.14.0";
x86_64-linux-sha256 = "0xy9i8ssjba62ca7lfan58rhwx69wkapfd0jzkaj95qhqnv019fg";
version = {
x86_64-darwin = x86_64-darwin-version;

View File

@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
x86_64-darwin = "3.23.4046";
x86_64-linux = "3.23.2938";
x86_64-darwin = "3.24.4059";
x86_64-linux = "3.24.2939";
}.${system} or throwSystem;
sha256 = {
x86_64-darwin = "19k8102chh4yphk89kiz83yarawnzdnsq0hbsqpjdhbmarqjcd9s";
x86_64-linux = "1cx5azl5dvya1hf0gayafm4rg6ccmmq978xsgm6lf0rlb4kirj65";
x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy";
x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p";
}.${system} or throwSystem;
meta = with lib; {

View File

@ -0,0 +1,54 @@
{ stdenv, buildPackages, cmake, gnumake, makeWrapper, mkDerivation, fetchFromGitHub
, alex, array, base, bytestring, cond, containers, directory, extra
, filepath, haskeline, hpack, hspec, hspec-core, json, lib, mtl
, parsec, process, regex-compat, text, time }:
let
version = "2.1.1";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
pname = "kklib";
inherit version;
src = "${src}/kklib";
nativeBuildInputs = [ cmake ];
};
runtimeDeps = [
buildPackages.stdenv.cc
buildPackages.stdenv.cc.bintools.bintools
gnumake
cmake
];
in
mkDerivation rec {
pname = "koka";
inherit version src;
isLibrary = false;
isExecutable = true;
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
array base bytestring cond containers directory haskeline mtl
parsec process text time kklib
];
executableToolDepends = [ alex makeWrapper ];
postInstall = ''
mkdir -p $out/share/koka/v${version}
cp -a lib $out/share/koka/v${version}
cp -a contrib $out/share/koka/v${version}
cp -a kklib $out/share/koka/v${version}
wrapProgram "$out/bin/koka" \
--set CC "${lib.getBin buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \
--prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}"
'';
doCheck = false;
prePatch = "hpack";
description = "Koka language compiler and interpreter";
homepage = "https://github.com/koka-lang/koka";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ siraben sternenseemann ];
}

View File

@ -3,7 +3,7 @@
}:
let
version = "2.0.1";
version = "2.0.3";
# Make sure we override python, so the correct version is chosen
boostPython = boost.override { enablePython = true; inherit python; };
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "v${version}";
sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c";
sha256 = "0c5g2chylhkwwssfab9gw0b7bm3raj08yzgia7j4d044lp8gflnd";
fetchSubmodules = true;
};

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
}:
stdenv.mkDerivation rec {
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs=";
};
patches = [
# https://github.com/nlohmann/json/pull/2690
(fetchpatch {
url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch";
sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M=";
})
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [

View File

@ -49,8 +49,8 @@ let
in
{
spdlog_1 = generic {
version = "1.8.2";
sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8=";
version = "1.8.5";
sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50=";
};
spdlog_0 = generic {

View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
pkg-config
];
buildInputs = [ solo5 ];
propagatedBuildInputs = [ solo5 ];
configurePhase = ''
runHook preConfigure

View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "spacetime_lib";
version = "0.3.0";
useDune2 = true;
src = fetchFromGitHub {
owner = "lpw25";
repo = "spacetime_lib";

View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
, bisect_ppx, ppx_cstruct
, bisect_ppx, ppx_cstruct, pkg-config
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@ -7,22 +7,29 @@
, alcotest, mirage-flow, mirage-vnetif, pcap-format
, mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test
, lru
, withFreestanding ? false
, ocaml-freestanding
}:
buildDunePackage rec {
pname = "tcpip";
version = "6.0.0";
version = "6.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
sha256 = "7b3ed2e1ca835c1cc65ac911bcb0de12ebc2b580dd195006bdea2cb387510474";
};
patches = [
./makefile-no-opam.patch
];
nativeBuildInputs = [
bisect_ppx
ppx_cstruct
pkg-config
];
propagatedBuildInputs = [
@ -48,6 +55,8 @@ buildDunePackage rec {
randomconv
ethernet
lru
] ++ lib.optionals withFreestanding [
ocaml-freestanding
];
doCheck = true;

View File

@ -0,0 +1,12 @@
diff --git a/freestanding/Makefile b/freestanding/Makefile
index f22d220d..3e97b4c5 100644
--- a/freestanding/Makefile
+++ b/freestanding/Makefile
@@ -1,4 +1,6 @@
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+ifneq (, $(shell command -v opam))
+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
+endif
EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)

View File

@ -0,0 +1,53 @@
From 734d31aa2f65b69f5558b9b0dd67af0461ca7f80 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 30 Mar 2021 12:13:37 +0200
Subject: [PATCH] Security: Prevent leading zeroes in ipv4 octets
https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/
Related to CVE-2021-28918
---
Lite.pm | 2 +-
t/base.t | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Lite.pm b/Lite.pm
index fd6df73..d44f881 100644
--- a/Lite.pm
+++ b/Lite.pm
@@ -181,7 +181,7 @@ sub _pack_ipv4 {
my @nums = split /\./, shift(), -1;
return unless @nums == 4;
for (@nums) {
- return unless /^\d{1,3}$/ and $_ <= 255;
+ return unless /^\d{1,3}$/ and !/^0\d{1,2}$/ and $_ <= 255;
}
pack("CC*", 0, @nums);
}
diff --git a/t/base.t b/t/base.t
index cf32c5e..292456d 100644
--- a/t/base.t
+++ b/t/base.t
@@ -8,7 +8,7 @@
use Test;
use strict;
$|++;
-BEGIN { plan tests => 39 };
+BEGIN { plan tests => 42 };
use Net::CIDR::Lite;
ok(1); # If we made it this far, we are ok.
@@ -133,3 +133,14 @@ ok(join(', ', @list_short_range), '10.0.0.1-2, 10.0.0.5');
})->list_short_range;
ok(join(', ', @list_short_range), '10.0.0.250-255, 10.0.1.0-20, 10.0.1.22, 10.0.2.250-255, 10.0.3.0-255, 10.0.4.0-255, 10.0.5.0-8');
+
+# Tests for vulnerability: https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/
+eval { Net::CIDR::Lite->new("010.0.0.0/8") };
+ok($@=~/Can't determine ip format/);
+
+my $err_octal = Net::CIDR::Lite->new;
+eval { $err_octal->add("010.0.0.0/8") };
+ok($@=~/Can't determine ip format/);
+
+eval { $err_octal->add("10.01.0.0/8") };
+ok($@=~/Can't determine ip format/);

View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "483533f7fad8e5de57a5c37bc387f5e7a94b4493";
version = "2021-03-13";
rev = "b430596eb8566a59793ea0b8ddd2c693505e801f";
version = "2021-03-29";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "1z6ass2w1hrp5yxki0d4zrsrrnqbl6k0bvxia090mqrcm9mig2y3";
sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63";
};
dontBuild = true;

View File

@ -1,88 +0,0 @@
diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
index 4e743eb4..97c53ed8 100644
--- a/diesel/src/lib.rs
+++ b/diesel/src/lib.rs
@@ -131,7 +131,6 @@
#![cfg_attr(feature = "unstable", feature(specialization, try_from))]
// Built-in Lints
#![deny(
- warnings,
missing_debug_implementations,
missing_copy_implementations,
missing_docs
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
index 741ca003..cf93bb8f 100644
--- a/diesel_cli/src/main.rs
+++ b/diesel_cli/src/main.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
#![warn(
diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
index 2edee846..c96917c4 100644
--- a/diesel_cli/tests/tests.rs
+++ b/diesel_cli/tests/tests.rs
@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
extern crate chrono;
extern crate diesel;
#[macro_use]
diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
index 2c43b2a3..44dcf3f9 100644
--- a/diesel_derives/src/lib.rs
+++ b/diesel_derives/src/lib.rs
@@ -1,6 +1,6 @@
#![recursion_limit = "1024"]
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::needless_pass_by_value,
diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
index 636fea66..f86f3dcc 100644
--- a/diesel_derives/tests/tests.rs
+++ b/diesel_derives/tests/tests.rs
@@ -1,5 +1,3 @@
-#![deny(warnings)]
-
#[macro_use]
extern crate cfg_if;
#[macro_use]
diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
index 933e21a8..7c4d0222 100644
--- a/diesel_migrations/migrations_internals/src/lib.rs
+++ b/diesel_migrations/migrations_internals/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
+#![deny(missing_debug_implementations, missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::option_map_unwrap_or_else,
diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
index 0a83234e..2f509c04 100644
--- a/diesel_migrations/migrations_macros/src/lib.rs
+++ b/diesel_migrations/migrations_macros/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
+#![deny(missing_debug_implementations, missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::option_map_unwrap_or_else,
diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
index c85414e5..f025f237 100644
--- a/diesel_migrations/src/lib.rs
+++ b/diesel_migrations/src/lib.rs
@@ -1,5 +1,5 @@
// Built-in Lints
-#![deny(warnings, missing_copy_implementations)]
+#![deny(missing_copy_implementations)]
// Clippy lints
#![allow(
clippy::needless_pass_by_value,

File diff suppressed because it is too large Load Diff

View File

@ -16,26 +16,37 @@ in
rustPlatform.buildRustPackage rec {
pname = "diesel-cli";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "diesel-rs";
repo = "diesel";
rev = "v${version}";
sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
# diesel and diesel_cli are independently versioned. diesel_cli
# 1.4.1 first became available in diesel 1.4.5, but we can use
# a newer diesel tag.
rev = "v1.4.6";
sha256 = "0c8a2f250mllzpr20j7j0msbf2csjf9dj8g7j6cl04ifdg7gwb9z";
};
patches = [
# Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
#
# Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
# is in a release.
./allow-warnings.patch
# Fixes:
# Compiling diesel v1.4.6 (/build/source/diesel)
# error: this `#[deprecated]` annotation has no effect
# --> diesel/src/query_builder/insert_statement/mod.rs:205:1
# |
# 205 | / #[deprecated(
# 206 | | since = "1.2.0",
# 207 | | note = "Use `<&'a [U] as Insertable<T>>::Values` instead"
# 208 | | )]
# | |__^ help: remove the unnecessary deprecation attribute
# |
# = note: `#[deny(useless_deprecated)]` on by default
./fix-deprecated.patch
];
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
cargoSha256 = "1vkwp861vm20agj0lkhnnxgg4vwg4d5clvvyzxrmm4y4yw46cdl2";
nativeBuildInputs = [ pkg-config ];

View File

@ -0,0 +1,10 @@
diff --git a/diesel/src/query_builder/insert_statement/mod.rs b/diesel/src/query_builder/insert_statement/mod.rs
index b6bb34df9d..7486eb7a59 100644
--- a/diesel/src/query_builder/insert_statement/mod.rs
+++ b/diesel/src/query_builder/insert_statement/mod.rs
@@ -1,3 +1,5 @@
+#![allow(useless_deprecated)]
+
mod column_list;
mod insert_from_select;

View File

@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jindrapetrik/jpexs-decompiler";
license = licenses.gpl3;
platforms = jdk8.meta.platforms;
maintainers = with maintainers; [ samuelgrf ];
maintainers = [ ];
};
}

View File

@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2021-03-10";
version = "2021-03-29";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e";
sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm";
rev = "9bb04ed97af047968196bad1728f927f7a6d905f";
sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE=";
};
nix = nixFlakes;

View File

@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.14";
version = "0.32.15";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g=";
sha256 = "sha256-BvZe2+PwradByyDeqhs3u42tbLrR5UMyUhJVSlX/U+w=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74=";
cargoSha256 = "sha256-eA1cyffQAmSN3jQo5k8H6eYrS23qUxsiAqWzwrYmh3o=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

View File

@ -101,7 +101,7 @@ stdenv.mkDerivation {
PC, with many additional features and benefits.
'';
homepage = "https://pcsx2.net";
maintainers = with maintainers; [ hrdinka samuelgrf govanify ];
maintainers = with maintainers; [ hrdinka govanify ];
# PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently.

View File

@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tomaspinho/rtl8821ce";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ hhm samuelgrf ];
maintainers = with maintainers; [ hhm ];
};
}

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2gtiULRnur8OPjX1/Xp1LTiL8owXt/sQgSGjoS7F9NU=";
sha256 = "sha256-ODD5XwLYVUJOHQCETVUqMUojL4Y8eWJ/xhmfzV9Cp3k=";
};
cargoSha256 = "sha256-MrUmqawXl3kQKFgJ9bWRHIgvit/fQCLMqoL6kXEF9+k=";
cargoSha256 = "sha256-PJOlXFx+MYfq7daaOEZ5wPuWD7gAr8gc/5AJG2SYTq4=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

View File

@ -10,14 +10,14 @@
with lib;
stdenv.mkDerivation rec {
version = "2.3.2";
version = "2.3.3";
pname = "tengine";
src = fetchFromGitHub {
owner = "alibaba";
repo = pname;
rev = version;
sha256 = "04xfnbc0qlk8vi6bb8sl38nxnx9naxh550xsgrb4hql6jdi0wv7l";
sha256 = "0p43qsldwhx4zfwp585x8kps0akrf7b0gxdgf0sh0yqcp7l28gmx";
};
buildInputs =

View File

@ -2,7 +2,7 @@
let
pname = "miniflux";
version = "2.0.28";
version = "2.0.29";
in buildGoModule {
inherit pname version;
@ -11,10 +11,10 @@ in buildGoModule {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-XvQhLqGP1TliSrIm55dP04yGoOMnHmcI2gH00SYVLVY=";
sha256 = "sha256-8FfI9TPtIoQ/D5AdKRy7fq/eGZ6ha8z0tqBnWcziMTA=";
};
vendorSha256 = "sha256-NKpMLjro06gWN2Xu5M+xM4hVNvlOZ12F3Jv+bL5E0I8=";
vendorSha256 = "sha256-y7w+SHy0yPws365PKJeRStZS3Y5vjyPWHK3w84VvJsI=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
version = "2021-03-17T02-33-02Z";
version = "2021-03-26T00-00-41Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-nCCU9hSt8VaLpZmqZFl3GczqDJXEQJ4rFn/9B0gV/5g=";
sha256 = "sha256-WH7gAO8ghwMhLU/ioHrZUgIk1h6yeUzM+xg1GnkFDHM=";
};
vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0=";
vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk=";
doCheck = false;

View File

@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt,
mcpp, epoxy, openssl, pkg-config, llvm, libxslt,
ApplicationServices, Carbon, Cocoa, Xplugin
}:
@ -433,7 +433,7 @@ self: super:
});
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker
buildInputs = attrs.buildInputs ++ [ mesa llvm ]; # for libxatracker
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};

View File

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2021-03-15";
version = "2021-03-28";
pname = "oh-my-zsh";
rev = "95a06f3927a286db257dc99791b02caba757fe33";
rev = "69507c9518f7c7889d8f47ec8e67bfda02405817";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "1w0g68rvw17jg085qj1g264dsii25gph6vpp6gpn8wby0972h7n0";
sha256 = "0p5jjynwnf6yh2n0z46avavy7kb7dlqd145hd1qakig7csaclphd";
};
installPhase = ''

View File

@ -66,6 +66,8 @@ python3.pkgs.buildPythonApplication rec {
inherit (nixosTests) borgbackup;
};
outputs = [ "out" "doc" ];
meta = with lib; {
description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tfk8s";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = "v${version}";
sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4=";
sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4";
};
vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";

View File

@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
];
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/share/bash-completion/completions
cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cosign";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "0rgq29vi0h378j0bqs53gjgp246rqxfpk6rwskzrmawgry0zr8pk";
sha256 = "1zwb2q62ngb2zh1hasvq7r7pmrjlpgfhs5raibbhkxbk5kayvmii";
};
vendorSha256 = "0pcp3wdvwq06ajdfbgadyq0ipfj65n276hj88p5v6wqfn821ahd6";
vendorSha256 = "0nwbjaps4z5fhiknbj9pybxb6kgwb1vf2qhy0mzpycprf04q6g0v";
subPackages = [ "cmd/cosign" ];

View File

@ -16,9 +16,10 @@ buildGoModule rec {
vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU=";
preBuild = ''
mv v2/* .
'';
modRoot = "./v2";
subPackages = [
"cmd/nuclei/"
];
# Test files are not part of the release tarball
doCheck = false;

View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "zdns";
version = "20210327-${lib.strings.substring 0 7 rev}";
rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2";
src = fetchFromGitHub {
owner = "zmap";
repo = pname;
inherit rev;
sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck";
};
vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78";
subPackages = [ "zdns" ];
meta = with lib; {
description = "CLI DNS lookup tool";
homepage = "https://github.com/zmap/zdns";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "frangipanni";
version = "0.4.0";
src = fetchFromGitHub {
owner = "birchb1024";
repo = "frangipanni";
rev = "v${version}";
sha256 = "sha256-NgRDXrAsfnj1cqO+2AN8nSuxS9KGNIl+pJkCADmDOqY=";
};
vendorSha256 = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8=";
meta = with lib; {
description = "Convert lines of text into a tree structure";
homepage = "https://github.com/birchb1024/frangipanni";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}

View File

@ -2399,6 +2399,8 @@ in
firestarter = callPackage ../applications/misc/firestarter { };
frangipanni = callPackage ../tools/text/frangipanni { };
fselect = callPackage ../tools/misc/fselect { };
fsmon = callPackage ../tools/misc/fsmon { };
@ -10735,6 +10737,8 @@ in
knightos-z80e = callPackage ../development/tools/knightos/z80e { };
koka = haskellPackages.callPackage ../development/compilers/koka { };
kotlin = callPackage ../development/compilers/kotlin { };
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
@ -26746,6 +26750,8 @@ in
zathura = callPackage ../applications/misc/zathura { };
zdns = callPackage ../tools/security/zdns { };
zerobin = callPackage ../applications/networking/zerobin { };
zeroc-ice = callPackage ../development/libraries/zeroc-ice {

View File

@ -15119,6 +15119,11 @@ let
url = "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz";
sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093";
};
patches = [
# Fix for security issue: prevent leading zeroes in ipv4 octets
# https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/
../development/perl-modules/Net-CIDR-Lite-prevent-leading-zeroes-ipv4.patch
];
meta = {
description = "Perl extension for merging IPv4 or IPv6 CIDR addresses";
};
@ -15424,10 +15429,10 @@ let
NetNetmask = buildPerlPackage {
pname = "Net-Netmask";
version = "1.9104";
version = "2.0001";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz";
sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y";
url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0001.tar.gz";
sha256 = "0waiix46wv93a5zzjjv7ypdnfdf7lizwrhx12128rcvzcvw6wd8p";
};
buildInputs = [ Test2Suite TestUseAllModules ];
meta = {