ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-11 18:15:37 +00:00 committed by GitHub
commit ad994db6cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 233 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.12.2";
version = "1.1.12.3";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r";
sha256 = "1x4gqmiwdp5bjq7c5hjch3srsvf73d92lswnp355l7l7cxh2hcsx";
};
dontBuild = true;

4
pkgs/applications/editors/vis/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "vis";
version = "0.6";
version = "0.7";
src = fetchFromGitHub {
rev = "v${version}";
sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh";
sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji";
repo = "vis";
owner = "martanne";
};

4
pkgs/applications/gis/qmapshack/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "qmapshack";
version = "1.15.1";
version = "1.15.2";
src = fetchFromGitHub {
owner = "Maproom";
repo = pname;
rev = "V_${version}";
sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/misc/khal/default.nix
View File

@ -57,7 +57,9 @@ with python3.pkgs; buildPythonApplication rec {
doCheck = !stdenv.isAarch64;
checkPhase = ''
py.test
py.test -k "not test_vertical_month_abbr_fr and not test_vertical_month_unicode_weekdeays_gr \
and not test_event_different_timezones and not test_default_calendar and not test_birthdays \
and not test_birthdays_no_year"
'';
meta = with stdenv.lib; {

4
pkgs/applications/networking/cluster/node-problem-detector/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "0iv3x29l803mch7pmnvxk1lf0mgirdhi2g17q1049d8z7w0m8dwk";
sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv";
};
vendorSha256 = null;

18
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -70,10 +70,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v3.15.0",
"sha256": "0rxpdxg5p478sipbhq2x347gs5wrlwz4ggy9z007cbp34yhb2wka",
"vendorSha256": "0vapfnd4c8jb15pdjnnb97vgsvfakjvl1czccbfy0znhdk2ynz02",
"version": "3.15.0"
"rev": "v3.20.0",
"sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17",
"vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji",
"version": "3.20.0"
},
"azuread": {
"owner": "terraform-providers",
@ -748,11 +748,13 @@
"version": "1.2.1"
},
"postgresql": {
"owner": "terraform-providers",
"owner": "cyrilgdn",
"provider-source-address": "registry.terraform.io/cyrilgdn/postgresql",
"repo": "terraform-provider-postgresql",
"rev": "v1.7.1",
"sha256": "0qlz00svvbwxslp8v7bi7mx5mvnjmh2cvg33a006gh4fy5n75shy",
"version": "1.7.1"
"rev": "v1.8.1",
"sha256": "07qaiy3vmz179am1qrxwvrk7xpraaa8g0hf49bj54pw7nkrmaixq",
"vendorSha256": null,
"version": "1.8.1"
},
"powerdns": {
"owner": "terraform-providers",

29
pkgs/applications/networking/irc/weechat/scripts/colorize_nicks/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, lib, fetchurl, weechat }:
stdenv.mkDerivation {
pname = "weechat-colorize_nicks";
version = "27";
src = fetchurl {
url = "https://github.com/weechat/scripts/raw/bc8a9051800779a036ba11689a277cd5f03657b2/python/colorize_nicks.py";
sha256 = "0hiay88vvy171jiq6ahflm0ipb7sslfxwhmmm8psv6qk19rv2sxs";
};
dontUnpack = true;
installPhase = ''
mkdir -p $out/share
cp $src $out/share/colorize_nicks.py
'';
passthru = {
scripts = [ "colorize_nicks.py" ];
};
meta = with lib; {
inherit (weechat.meta) platforms;
description = "Use the weechat nick colors in the chat area";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qyliss ];
};
}

2
pkgs/applications/networking/irc/weechat/scripts/default.nix
View File

@ -1,6 +1,8 @@
{ callPackage, luaPackages, python3Packages }:
{
colorize_nicks = callPackage ./colorize_nicks { };
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};

1
pkgs/applications/networking/p2p/deluge/1/default.nix
View File

@ -36,6 +36,7 @@ pythonPackages.buildPythonPackage rec {
description = "Torrent client";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ domenkozar ebzzry ];
broken = stdenv.isDarwin;
platforms = platforms.all;
};
}

7
pkgs/applications/networking/p2p/stig/default.nix
View File

@ -1,4 +1,4 @@
{ lib
{ stdenv
, fetchFromGitHub
, python3Packages
}:
@ -54,9 +54,12 @@ python3Packages.buildPythonApplication rec {
"--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second"
# TestScrollBarWithScrollable.test_wrapping_bug fails
"--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug"
] ++ stdenv.lib.optionals stdenv.isDarwin [
"--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py"
"--deselect=tests/client_test/aiotransmission_test/rpc_test.py"
];
meta = with lib; {
meta = with stdenv.lib; {
description = "TUI and CLI for the BitTorrent client Transmission";
homepage = "https://github.com/rndusr/stig";
license = licenses.gpl3;

4
pkgs/applications/office/beamerpresenter/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "beamerpresenter";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
sha256 = "12xngnhwa3haf0pdxczgvhq1j20zbsr30y2bfn9qwmlhbwklhkj2";
sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i";
};
nativeBuildInputs = [ qmake installShellFiles ];

4
pkgs/applications/radio/gqrx/default.nix
View File

@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
mkDerivation rec {
pname = "gqrx";
version = "2.14.2";
version = "2.14.3";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
sha256 = "15xlzfgmffq43wn74xjqc5p2m21i3lh28qqskd2jf2hhvanpcwcp";
sha256 = "10pmd2jqmw77gybjfzrch6qi8jil1g6nsjzabbd6gnbsq7320axj";
};
nativeBuildInputs = [ cmake ];

31
pkgs/applications/science/logic/cedille/Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch Normal file
View File

@ -0,0 +1,31 @@
From 563f023aba1034f4f433f412302b825b059ef5a5 Mon Sep 17 00:00:00 2001
From: Mark Barbone <mark.l.barbone@gmail.com>
Date: Sun, 19 Jul 2020 17:24:30 -0400
Subject: [PATCH] Fix to-string.agda to compile with Agda 2.6.1
---
Adapted from https://github.com/cedille/cedille/pull/156.
src/to-string.agda | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/to-string.agda b/src/to-string.agda
index 2505942..051a2da 100644
--- a/src/to-string.agda
+++ b/src/to-string.agda
@@ -100,9 +100,9 @@ no-parens {TK} _ _ _ = tt
no-parens {QUALIF} _ _ _ = tt
no-parens {ARG} _ _ _ = tt
-pattern ced-ops-drop-spine = cedille-options.options.mk-options _ _ _ _ ff _ _ _ ff _
-pattern ced-ops-conv-arr = cedille-options.options.mk-options _ _ _ _ _ _ _ _ ff _
-pattern ced-ops-conv-abs = cedille-options.options.mk-options _ _ _ _ _ _ _ _ tt _
+pattern ced-ops-drop-spine = cedille-options.mk-options _ _ _ _ ff _ _ _ ff _
+pattern ced-ops-conv-arr = cedille-options.mk-options _ _ _ _ _ _ _ _ ff _
+pattern ced-ops-conv-abs = cedille-options.mk-options _ _ _ _ _ _ _ _ tt _
drop-spine : cedille-options.options → {ed : exprd} → ctxt → ⟦ ed ⟧ → ⟦ ed ⟧
drop-spine ops @ ced-ops-drop-spine = h
--
2.27.0

8
pkgs/applications/science/logic/cedille/default.nix
View File

@ -10,17 +10,21 @@
}:
stdenv.mkDerivation rec {
version = "1.1.1";
version = "1.1.2";
pname = "cedille";
src = fetchFromGitHub {
owner = "cedille";
repo = "cedille";
rev = "v${version}";
sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb";
sha256 = "1j745q9sd32fhcb96wjq6xvyqq1k6imppjnya6x0n99fyfnqzvg9";
fetchSubmodules = true;
};
patches = [
./Fix-to-string.agda-to-compile-with-Agda-2.6.1.patch
];
nativeBuildInputs = [ alex happy ];
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];

10
pkgs/build-support/fetchmavenartifact/default.nix
View File

@ -3,10 +3,10 @@
{ fetchurl, stdenv }:
let
defaultRepos = [
"http://repo1.maven.org/maven2"
"http://oss.sonatype.org/content/repositories/releases"
"http://oss.sonatype.org/content/repositories/public"
"http://repo.typesafe.com/typesafe/releases"
"https://repo1.maven.org/maven2"
"https://oss.sonatype.org/content/repositories/releases"
"https://oss.sonatype.org/content/repositories/public"
"https://repo.typesafe.com/typesafe/releases"
];
in
@ -50,7 +50,7 @@ let
(replaceChars ["."] ["/"] groupId)
artifactId
version
"${artifactId}-${version}-${optionalString (!isNull classifier) "-${classifier}"}.jar"
"${artifactId}-${version}${optionalString (!isNull classifier) "-${classifier}"}.jar"
];
urls_ =
if url != "" then [url]

4
pkgs/data/themes/matcha/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
version = "2020-11-23";
version = "2020-12-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "115nmzwpsaq8aa0p7ghfcw79n7h9ifvh0drv3dd4lj2dk33vkpv1";
sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1";
};
buildInputs = [ gdk-pixbuf librsvg ];

6
pkgs/development/interpreters/clojurescript/lumo/deps.nix generated
View File

@ -4,9 +4,9 @@
let repos = [
"https://repo.clojars.org/"
"https://repo1.maven.org/"
"http://oss.sonatype.org/content/repositories/releases/"
"http://oss.sonatype.org/content/repositories/public/"
"http://repo.typesafe.com/typesafe/releases/"
"https://oss.sonatype.org/content/repositories/releases/"
"https://oss.sonatype.org/content/repositories/public/"
"https://repo.typesafe.com/typesafe/releases/"
];
in rec {

15
pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, ncurses
{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
}:
let
version = "1.2.6";
formattedVersion = lib.replaceChars ["."] ["_"] version;
formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
# for the bindings, if overridden
@ -22,8 +22,12 @@ in stdenv.mkDerivation {
};
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
nativeBuildInputs = [ automake autoconf libtool pkg-config ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
preConfigure = "./autotool.sh";
postInstall = ''
@ -45,6 +49,7 @@ in stdenv.mkDerivation {
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}

10
pkgs/development/libraries/smesh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade }:
stdenv.mkDerivation rec {
pname = "smesh";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0";
};
patches = [
(fetchpatch {
name = "fix-build-with-clang.patch";
url = "https://github.com/tpaviot/smesh/commit/e32c430f526f1637ec5973c9723acbc5be571ae3.patch";
sha256 = "0s4j5rb70g3jvvkgfbrxv7q52wk6yjyjiaya61gy2j64khplcjlb";
})
];
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ opencascade ];

3
pkgs/development/python-modules/black/default.nix
View File

@ -5,6 +5,7 @@
, appdirs
, attrs
, click
, dataclasses
, mypy-extensions
, pathspec
, regex
@ -59,7 +60,7 @@ buildPythonPackage rec {
toml
typed-ast
typing-extensions
];
] ++ lib.optional (pythonOlder "3.7") dataclasses;
meta = with lib; {
description = "The uncompromising Python code formatter";

1
pkgs/development/python-modules/hass-nabucasa/default.nix
View File

@ -15,6 +15,7 @@ buildPythonPackage rec {
postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
sed -i 's/"attrs.*"/"attrs"/' setup.py
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';

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

@ -112,7 +112,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
version = "1.7.0";
version = "1.7.1";
disabled = !isPy3k;
@ -127,7 +127,7 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";
sha256 = "sha256-udpbSL8xnzf20A1pYYNlYjdp8ME8AVaAkMMiw53K6CU=";
};
patches = lib.optionals stdenv.isDarwin [

36
pkgs/development/python-modules/traitlets/4.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, pytest
, mock
, ipython_genutils
, decorator
, enum34
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "traitlets";
version = "4.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7";
};
checkInputs = [ glibcLocales pytest mock ];
propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
'';
meta = {
description = "Traitlets Python config system";
homepage = "http://ipython.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ ];
};
}

5
pkgs/development/python-modules/traitlets/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, isPy27
, fetchPypi
, glibcLocales
, pytest
@ -15,7 +14,7 @@
buildPythonPackage rec {
pname = "traitlets";
version = "5.0.5";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@ -23,7 +22,7 @@ buildPythonPackage rec {
};
checkInputs = [ glibcLocales pytest mock ];
propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
propagatedBuildInputs = [ ipython_genutils decorator six ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test

4
pkgs/development/tools/delve/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
version = "1.5.0";
version = "1.5.1";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
sha256 = "0m7fryclrj0qzqzcjn0xc9vl43srijyfahfkqdbm59xgpws67anp";
sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";
};
meta = with stdenv.lib; {

14
pkgs/development/tools/github-commenter/default.nix
View File

@ -1,25 +1,25 @@
{ lib, fetchFromGitHub, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoPackage rec {
buildGoModule rec {
pname = "github-commenter";
version = "0.5.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = version;
sha256 = "0y7yw7x8gqfbkqdfrwd9lffx3rrp62nz1aa86liy2dja97dacpij";
sha256 = "HgiCgyig+49g275G6zZ0kGTxt1TSfFK8kt+SOf4ei74=";
};
goPackagePath = "github.com/cloudposse/${pname}";
vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0=";
goDeps = ./deps.nix;
goPackagePath = "github.com/cloudposse/${pname}";
meta = with lib; {
description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
license = licenses.asl20;
homepage = "https://github.com/cloudposse/github-commenter";
maintainers = [ maintainers.mmahut ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

102
pkgs/development/tools/github-commenter/deps.nix generated
View File

@ -1,102 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/Masterminds/goutils";
fetch = {
type = "git";
url = "https://github.com/Masterminds/goutils";
rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0";
sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
};
}
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
type = "git";
url = "https://github.com/Masterminds/semver";
rev = "0fd41f6ff0825cf7efae00e706120bdd48914d93";
sha256 = "0jf1c03c9cibfci7qaxbk8h758gmc9i0115jdw57v5c45hklw9ah";
};
}
{
goPackagePath = "github.com/Masterminds/sprig";
fetch = {
type = "git";
url = "https://github.com/Masterminds/sprig";
rev = "7525b3376b8792ab24d07381324e4e2463e3356b";
sha256 = "05ia4r8b86s7pk8r3jmjq5x7pgsmp6wvcm42z8vl6vdhdr28bfrg";
};
}
{
goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
rev = "24f172eae1a0c53c780f259d8492979900e9af2e";
sha256 = "1bxklfrl1wx2691qindiikkbyixd9p8pfqjn0xqi4riy5hcgz96s";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80";
sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h";
};
}
{
goPackagePath = "github.com/huandu/xstrings";
fetch = {
type = "git";
url = "https://github.com/huandu/xstrings";
rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d";
sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
type = "git";
url = "https://github.com/imdario/mergo";
rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d";
sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "ca1201d0de80cfde86cb01aea620983605dfe99b";
sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
};
}
]

4
pkgs/development/tools/vultr-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
sha256 = "05qxbqq9mlq2jmyj5m9vmgw6s6a3wj06hmxj74g9lgqg8xyfglnh";
sha256 = "14cl0rgkk2kw0qyanlm57nbcrnsnnx02ikd6b1mrsviamb6r1lz6";
};
vendorSha256 = null;

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.210";
version = "4.14.212";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "067xqi6sgf50p7s3n6y77cgf5bj5062s3bz3kqpp6f9wnk85267r";
sha256 = "0y8ck8pfxm8862wi4cz8qp9x9b18yl448i8m7bpbphs290nc66qf";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.161";
version = "4.19.163";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0h9wskmz9wridwnicnjlcmj1112qnlvqk01bhjkxv6b8jsajjh87";
sha256 = "1z65iwwyx2b01fncygckmhpxirzs52qfqmv3agirn4laxgjw9viy";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.247";
version = "4.4.248";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1jh7vmyx55krk6y2r9v48liifs5wwkgns3gp8rs5sm4klfm36r2a";
sha256 = "1z1xbkm0z0v6k3scszii5hi24pn391332g0li93p3n1rnv74jap5";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.247";
version = "4.9.248";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mngdbsq8pdzd0x9hif4715cc7wzc3ahgp1yrknnqk598q0fnfpp";
sha256 = "1kzczy0lz3lnjkhvx90dgjmzn3d3y55qxlihiclkr4y9c602d1s6";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.81";
version = "5.4.83";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "09w4bpr3v9rzcvxics5wddabplwbpk1mynl45lh9csbjfpjbsw4l";
sha256 = "1ik14pfgynkn1sjhgyhgmxjvviq0mgvk0ygj76w8mplkpc5rgv5y";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.9.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.9.12";
version = "5.9.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1gfrn3sz3h4cbsf3r8f9jxja400qsmbrk8sclk4cjx1l5qcmczyr";
sha256 = "0jbb3rzbkh0l75zq9bnc60w55ryvrvcg7vw85fsbcwfzvi0zpz1r";
};
} // (args.argsOverride or {}))

4
pkgs/servers/home-assistant/default.nix
View File

@ -87,8 +87,10 @@ in with py.pkgs; buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \
--replace "attrs==19.3.0" "attrs>=19.3.0" \
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
--replace "cryptography==3.2" "cryptography" \
--replace "pip>=8.0.3,<20.3" "pip" \
--replace "requests==2.25.0" "requests>=2.24.0" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
@ -172,6 +174,8 @@ in with py.pkgs; buildPythonApplication rec {
"test_device_tracker_not_home"
# Racy https://github.com/home-assistant/core/issues/41425
"test_cached_event_message"
# ValueError: count must be a positive integer (got 0)
"test_media_view"
];
preCheck = ''

21
pkgs/servers/nextcloud/default.nix
View File

@ -1,7 +1,10 @@
{ stdenv, fetchurl, nixosTests }:
let
generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec {
generic = {
version, sha256,
eol ? false, extraVulnerabilities ? []
}: stdenv.mkDerivation rec {
pname = "nextcloud";
inherit version;
@ -23,7 +26,8 @@ let
maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ];
license = licenses.agpl3Plus;
platforms = with platforms; unix;
knownVulnerabilities = optional insecure "Nextcloud version ${version} is EOL";
knownVulnerabilities = extraVulnerabilities
++ (optional eol "Nextcloud version ${version} is EOL");
};
};
in {
@ -42,16 +46,19 @@ in {
nextcloud18 = generic {
version = "18.0.10";
sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6";
insecure = true;
eol = true;
};
nextcloud19 = generic {
version = "19.0.4";
sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6";
version = "19.0.6";
sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg=";
extraVulnerabilities = [
"Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed!"
];
};
nextcloud20 = generic {
version = "20.0.1";
sha256 = "1z1fzz1i41k4dhdhi005l3gzkvnmmgqqz3rdr374cvk73q7bbiln";
version = "20.0.3";
sha256 = "sha256-4PZFBNM49k08Z3NX8AEs+LDtDcQuwI+Vi23E/3Dt8XU=";
};
}

7
pkgs/tools/misc/mcfly/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
sha256 = "1biahx4bji8kasqcxnixnpmfx3qwwibw1vdd172px3i75pbyybqn";
sha256 = "0a2jff72l5my00pg9lhjdmnwkqfv4hmnl0a9cfbnzsqh39lbklqy";
};
postInstall = ''
@ -20,11 +20,12 @@ rustPlatform.buildRustPackage rec {
install -Dm644 -t $out/share/mcfly mcfly.fish
'';
cargoSha256 = "139pdhrqgl0ai94w2c948aal1j73qw4jxxdd4gxn4apglbnma1xz";
cargoSha256 = "1c8qjkpc8wi095zzmgd05721kdf1knh9la91l081mvwa3inwk6ax";
meta = with stdenv.lib; {
homepage = "https://github.com/cantino/mcfly";
description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now";
changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt";
license = licenses.mit;
maintainers = [ maintainers.melkor333 ];
};

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

@ -1,16 +1,16 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tagref";
version = "1.3.3";
version = "1.4.1";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3R6vhevSld9IjJMsGl5Rwv0ADMjm94NeZxvl8eYHR2Y=";
sha256 = "0y1c0v2zjpav1n72pgf3kpqdz6ixp2mjhcvvza4gzfp865c236nc";
};
cargoSha256 = "sha256-pLugAT8QlgxawkR2y+LIacRh4nB59qpKLJjxc81CNDY=";
cargoSha256 = "06ljy213x9lhvqjysz9cjhrrg0ns07qkz27pxd8rih0mk6cck45g";
meta = with lib; {
description = "Tagref helps you refer to other locations in your codebase.";

2
pkgs/tools/networking/linkchecker/default.nix
View File

@ -38,7 +38,7 @@ buildPythonApplication rec {
checkPhase = ''
${lib.optionalString stdenv.isDarwin ''
# network tests fails on darwin
rm tests/test_network.py
rm tests/test_network.py tests/checker/test_http*.py tests/checker/test_content_allows_robots.py tests/checker/test_noproxy.py
''}
pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \
-k 'not TestLoginUrl and not test_timeit2'

6
pkgs/tools/system/bottom/default.nix
View File

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk=";
sha256 = "1rpwgwgl05n0s89mhyvabzvsa33ibkd1msyrwfll4wbcbsn0ish7";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0=";
cargoSha256 = "0ykl66gs7k49vfjpw5i8xsbc1blmqm79vrsci2irsl5w642lbig5";
doCheck = false;

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

@ -14647,7 +14647,9 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
@ -16183,7 +16185,9 @@ in
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
talloc = callPackage ../development/libraries/talloc { };
talloc = callPackage ../development/libraries/talloc {
wafHook = wafHook.override { python = python3; };
};
tclap = callPackage ../development/libraries/tclap {};

5
pkgs/top-level/python-packages.nix
View File

@ -7437,7 +7437,10 @@ in {
trackpy = callPackage ../development/python-modules/trackpy { };
traitlets = callPackage ../development/python-modules/traitlets { };
traitlets = if pythonOlder "3.7" then
callPackage ../development/python-modules/traitlets/4.nix { }
else
callPackage ../development/python-modules/traitlets { };
traits = callPackage ../development/python-modules/traits { };