ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 21:42:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-29 06:01:13 +00:00 committed by GitHub
commit 36f70c9637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 189 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, go-bindata
, installShellFiles
, pkg-config
, which
@ -12,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.21.0";
version = "1.22.0";
vendorSha256 = "sha256-3G9QO5OMnMkMCsGIze/E9bvx6fvlXtOqiv8lGTkLN3s=";
vendorSha256 = "sha256-zAXEwGJ3dnqN/+3k189zqppdiNHPyJ+mdZvDNEWQLsA=";
doCheck = false;
@ -22,10 +21,10 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-PbCwGPJZvnJCIVK7FYa1gI4aO4sIeh8iQtYOHAQBaZE=";
sha256 = "sha256-wL/HsdV6MZcsR3Y8pGZ5WYUMJ7j+VyJGpLeLIXm5MJM=";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
nativeBuildInputs = [ installShellFiles pkg-config which ];
buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null;

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

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "sakura";
version = "3.8.2";
version = "3.8.3";
src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk=";
sha256 = "sha256-UEDc3TjoqjLNZtWGlIZB3VTVQC+31AP0ASQH0fu+U+Q=";
};
nativeBuildInputs = [

137
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -1,69 +1,138 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake
, ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2
{ lib
, stdenv
, mkDerivation
, fetchFromGitLab
, pkg-config
, autoreconfHook
, qmake
, rake
, boost
, cmark
, docbook_xsl
, expat
, file
, flac
, fmt
, gettext
, gmp
, gtest
, libdvdread
, libebml
, libiconv
, libmatroska
, libogg
, libvorbis
, libxslt
, nlohmann_json
, pugixml
, qtbase
, qtmultimedia
, xdg-utils
, zlib
, withGUI ? true
, qtbase ? null
, qtmultimedia ? null
, wrapQtAppsHook ? null
, wrapQtAppsHook
}:
assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null;
let
inherit (lib) enableFeature optional optionals optionalString;
with lib;
phase = name: args:
''
runHook pre${name}
stdenv.mkDerivation rec {
rake ${args}
runHook post${name}
'';
in
mkDerivation rec {
pname = "mkvtoolnix";
version = "56.0.0";
version = "59.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj";
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ=";
};
nativeBuildInputs = [
pkg-config autoconf automake gettext
drake ruby docbook_xsl libxslt
];
autoreconfHook
docbook_xsl
gettext
gtest
libxslt
pkg-config
rake
]
++ optional withGUI wrapQtAppsHook;
# 1. qtbase and qtmultimedia are needed without the GUI
# 2. we have utf8cpp in nixpkgs but it doesn't find it
buildInputs = [
expat file xdg-utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark pcre2
] ++ optional stdenv.isDarwin libiconv
++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];
boost
expat
file
flac
fmt
gmp
libdvdread
libebml
libmatroska
libogg
libvorbis
nlohmann_json
pugixml
qtbase
qtmultimedia
xdg-utils
zlib
]
++ optional withGUI cmark
++ optional stdenv.isDarwin libiconv;
preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "drake -j $NIX_BUILD_CORES";
installPhase = "drake install -j $NIX_BUILD_CORES";
# autoupdate is not needed but it silences a ton of pointless warnings
postPatch = ''
patchShebangs . > /dev/null
autoupdate configure.ac ac/*.m4
'';
configureFlags = [
"--enable-magic"
"--disable-debug"
"--disable-precompiled-headers"
"--disable-profiling"
"--disable-static-qt"
"--enable-optimization"
"--with-boost-libdir=${boost.out}/lib"
"--disable-debug"
"--disable-profiling"
"--disable-precompiled-headers"
"--disable-static-qt"
"--with-gettext"
"--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl"
(enableFeature withGUI "qt")
"--with-gettext"
(enableFeature withGUI "gui")
];
buildPhase = phase "Build" "";
installPhase = phase "Install" "install";
doCheck = true;
checkPhase = phase "Check" "tests:run_unit";
CXXFLAGS = optional stdenv.cc.isClang "-std=c++17";
LDFLAGS = optional stdenv.cc.isClang "-lc++fs";
dontWrapQtApps = true;
postFixup = optionalString withGUI ''
wrapQtApp $out/bin/mkvtoolnix-gui
'';
meta = with lib; {
description = "Cross-platform tools for Matroska";
homepage = "http://www.bunkus.org/videotools/mkvtoolnix/";
license = licenses.gpl2Only;
homepage = "https://mkvtoolnix.download/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux
platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin;
};
}

10
pkgs/development/compilers/nextpnr/default.nix
View File

@ -14,21 +14,21 @@ let
in
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "2021.01.02";
version = "2021.07.28";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "9b9628047c01a970cfe20f83f2b7129ed109440d";
sha256 = "0pcv96d0n40h2ipywi909hpzlys5b6r4pamc320qk1xxhppmgkmm";
rev = "39a7381928359934788aefd670c835dedbbf2cd7";
sha256 = "1rs95vp5m3fdvhmjilj2r2g54xlabd3vy8wii1ammajqkyamy8x3";
name = "nextpnr";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr-tests";
rev = "8f93e7e0f897b1b5da469919c9a43ba28b623b2a";
sha256 = "0zpd0w49k9l7rs3wmi2v8z5s4l4lad5rprs5l83w13667himpzyc";
rev = "ccc61e5ec7cc04410462ec3196ad467354787afb";
sha256 = "09a0bhrphr3rsppryrfak4rhziyj8k3s17kgb0vgm0abjiz0jgam";
name = "nextpnr-tests";
})
];

25
pkgs/development/ocaml-modules/odoc-parser/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, fetchurl, buildDunePackage, astring, result }:
buildDunePackage rec {
pname = "odoc-parser";
version = "0.9.0";
minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/ocaml-doc/odoc-parser/releases/download/0.9.0/odoc-parser-0.9.0.tbz";
sha256 = "0ydxy2sj2w9i4vvyjnxplgmp5gbkp5ilnv36pvk4vgrrmldss3fz";
};
useDune2 = true;
buildInputs = [ astring result ];
meta = {
description = "Parser for Ocaml documentation comments";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.marsam ];
homepage = "https://github.com/ocaml-doc/odoc-parser";
changelog = "https://github.com/ocaml-doc/odoc-parser/raw/${version}/CHANGES.md";
};
}

12
pkgs/development/python-modules/aiosmb/default.nix
View File

@ -2,7 +2,7 @@
, asysocks
, buildPythonPackage
, colorama
, fetchPypi
, fetchFromGitHub
, minikerberos
, prompt-toolkit
, pycryptodomex
@ -15,12 +15,14 @@
buildPythonPackage rec {
pname = "aiosmb";
version = "0.2.49";
version = "0.2.50";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XCaAaY7a6Gdddm9B0ET+rVzFra5W0GTI/HUMuvpyhzM=";
src = fetchFromGitHub {
owner = "skelsec";
repo = pname;
rev = version;
sha256 = "016pylxqmzm1hn1mvx6jhxvgckdqpf993sd1bki07pblmm4ikl6q";
};
propagatedBuildInputs = [

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

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.12";
version = "1.1.13";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4=";
sha256 = "0938540n60xv7kxam3azszn3nj0mnhhgh5p4hgbfxj43bkwpqz4n";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/tfsec/default.nix
View File

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.51.4";
version = "0.52.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "0l9b6hdcfcyn03y5wsfganb3h2vsnlrs9y3vahnnlx4rvv51ldwf";
sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay";
};
goPackagePath = "github.com/aquasecurity/tfsec";

9
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -1,13 +1,14 @@
{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix
, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }:
{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused
, makeWrapper, nix, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl
}:
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.289.2";
version = "2.289.3";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf";
sha256 = "11wb4kqy1hja2fgnqsr6p0khdyvinclprxz9z5m58czrsllzsvcr";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/ocaml/ocamlformat/default.nix
View File

@ -56,5 +56,9 @@ rec {
version = "0.18.0";
};
ocamlformat = ocamlformat_0_18_0;
ocamlformat_0_19_0 = mkOCamlformat {
version = "0.19.0";
};
ocamlformat = ocamlformat_0_19_0;
}

20
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View File

@ -22,6 +22,7 @@ let src =
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
"0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
"0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
"0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
}."${version}";
};
ocamlPackages =
@ -46,7 +47,24 @@ buildDunePackage {
useDune2 = true;
buildInputs =
if lib.versionAtLeast version "0.18.0"
if lib.versionAtLeast version "0.19.0"
then [
base
cmdliner
fpath
re
stdio
uuseg
uutf
fix
menhir
menhirLib
menhirSdk
ocp-indent
dune-build-info
odoc-parser
]
else if lib.versionAtLeast version "0.18.0"
then [
base
cmdliner

10
pkgs/development/tools/trellis/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "trellis";
version = "2021.01.02";
version = "2021.07.06";
# git describe --tags
realVersion = with lib; with builtins;
@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e";
sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf";
rev = "dff1cbcb1bd30de7e96f8a059f2e19be1bb2e44d";
sha256 = "1gbrka9gqn124shx448aivbgywyp30zyjwfazr7v49lhrl7d46lb";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c";
sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g";
rev = "0ee729d20eaf9f1e0f1d657bc6452e3ffe6a0d63";
sha256 = "0069c98bb4wilxz21snwc39yy0rm7ffma179djyz57d99p0vcfkq";
name = "trellis-database";
})
];

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

@ -11947,7 +11947,8 @@ in
ocamlformat # latest version
ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0;
ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0
ocamlformat_0_19_0;
orc = callPackage ../development/compilers/orc { };
@ -17553,7 +17554,7 @@ in
mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {
mkvtoolnix-cli = mkvtoolnix.override {
withGUI = false;
};

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

@ -934,6 +934,8 @@ let
odoc = callPackage ../development/ocaml-modules/odoc { };
odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { };
omd = callPackage ../development/ocaml-modules/omd { };
opam-core = callPackage ../development/ocaml-modules/opam-core {