alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-10-11 06:01:04 +00:00 committed by GitHub
parent 390a784086 d5bbb6cd0e
commit ecb2b759d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 103 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
View file

@ -2,25 +2,23 @@
buildGoModule rec {
pname = "cloudfoundry-cli";
version = "7.3.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU=";
sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm";
};
# vendor directory stale
deleteVendor = true;
vendorSha256 = null;
vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc";
subPackages = [ "." ];
# upstream have helpfully moved the bash completion script to a separate
# repo which receives no releases or even tags
bashCompletionScript = fetchurl {
url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7";
sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy";
url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/5f4f0d5d01e89c6333673f0fa96056749e71b3cd/ci/installers/completion/cf8";
sha256 = "06w26kpnjd3f2wdjhb4pp0kaq2gb9kf87v7pjd9n2g7s7qhdqyhy";
};
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View file

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.23.0.39";
version = "2.24.0.89";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI=";
sha256 = "sha256-rneX8ys/oKfVLavAZk5RJouOZkVsp+9BIAReSeYiKJc=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];

12
pkgs/applications/video/kodi/unwrapped.nix
View file

@ -38,25 +38,25 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
assert gbmSupport || waylandSupport || x11Support;
let
kodiReleaseDate = "20210508";
kodiVersion = "19.1";
kodiReleaseDate = "20211006";
kodiVersion = "19.2";
rel = "Matrix";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h";
sha256 = "0qc3rf6fv6k35iq5p0j86kpyghzl9djqxl6526fxknvrlw0xnh9j";
};
ffmpeg = stdenv.mkDerivation rec {
pname = "kodi-ffmpeg";
version = "4.3.1";
version = "4.3.2";
src = fetchFromGitHub {
owner = "xbmc";
repo = "FFmpeg";
rev = "${version}-${rel}-Beta1";
sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";
rev = "${version}-${rel}-${kodiVersion}";
sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f";
};
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .

4
pkgs/development/python-modules/bids-validator/default.nix
View file

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.8.3";
version = "1.8.4";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "a2940b447fdbea084311de55d415a1538299ad40ee1cc6ae711319c0734dc401";
sha256 = "63e7a02c9ddb5505a345e178f4e436b82c35ec0a177d7047b67ea10ea3029a68";
};
# needs packages which are not available in nixpkgs

4
pkgs/development/python-modules/jaraco_itertools/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "jaraco.itertools";
version = "6.0.1";
version = "6.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "6939e47806a39330a9f9772bf9ea910da39abc159ff2579d454a763358553439";
sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608";
};
pythonNamespaces = [ "jaraco" ];

4
pkgs/development/python-modules/pyfuse3/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyfuse3";
version = "3.2.0";
version = "3.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f";
sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/tools/pypi-mirror/default.nix
View file

@ -4,13 +4,13 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "pypi-mirror";
version = "4.0.6";
version = "4.0.7";
src = fetchFromGitHub {
owner = "montag451";
repo = pname;
rev = "v${version}";
sha256 = "0slh8ahywcgbggfcmzyqpb8bmq9dkk6vvjfkbi0ashnm8c6x19vd";
sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz";
};
pythonImportsCheck = [ "pypi_mirror" ];

4
pkgs/os-specific/linux/sysvinit/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, withoutInitTools ? false }:
let version = "2.99"; in
let version = "3.00"; in
stdenv.mkDerivation {
name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
src = fetchurl {
url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";
sha256 = "sha256-sFw2d7tpiv5kyZeWiwDEmyqb0yDOljUjIw7n6kEZd1c=";
sha256 = "sha256-7WvCCttnNTiYQefT64ZQ+nUMdq8gv07XOxMwpNTBQBc=";
};
prePatch = ''

45
pkgs/tools/misc/dialogbox/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, mkDerivation
, fetchFromGitHub
, qmake
, qtbase
}:
mkDerivation rec {
pname = "dialogbox";
version = "1.0+unstable=2020-11-16";
src = fetchFromGitHub {
owner = "martynets";
repo = pname;
rev = "6989740746f376becc989ab2698e77d14186a0f9";
hash = "sha256-paTas3KbV4yZ0ePnrOH1S3bLLHDddFml1h6b6azK4RQ=";
};
nativeBuildInputs = [
qmake
];
buildInputs = [
qtbase
];
installPhase = ''
runHook preInstall
install -d $out/{bin,share/doc/dialogbox}
install dist/dialogbox $out/bin
install README.md $out/share/doc/dialogbox/
cp -r demos $out/share/doc/dialogbox/demos
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/martynets/dialogbox/";
description = "Qt-based scriptable engine providing GUI dialog boxes";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

29
pkgs/tools/security/cdk-go/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "cdk-go";
version = "1.0.4";
src = fetchFromGitHub {
owner = "cdk-team";
repo = "CDK";
rev = "v${version}";
sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml";
};
vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l";
# At least one test is outdated
doCheck = false;
meta = with lib; {
description = "Container penetration toolkit";
homepage = "https://github.com/cdk-team/CDK";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
mainProgram = "cdk";
};
}

1
pkgs/tools/text/gnused/422.nix
View file

@ -29,5 +29,6 @@ stdenv.mkDerivation {
platforms = lib.platforms.all;
maintainers = [ ];
mainProgram = "sed";
};
}

1
pkgs/tools/text/gnused/default.nix
View file

@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ mic92 ];
mainProgram = "sed";
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -2599,6 +2599,8 @@ with pkgs;
dialog = callPackage ../tools/misc/dialog { };
dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { };
dibbler = callPackage ../tools/networking/dibbler { };
diesel-cli = callPackage ../development/tools/diesel-cli {
@ -15495,6 +15497,8 @@ with pkgs;
cdk = callPackage ../development/libraries/cdk {};
cdk-go = callPackage ../tools/security/cdk-go {};
cdo = callPackage ../development/libraries/cdo { };
cimg = callPackage ../development/libraries/cimg { };