mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
16f8848c34
28 changed files with 53 additions and 44 deletions
|
|
@ -11,20 +11,22 @@
|
|||
, libmicrohttpd
|
||||
, ncurses
|
||||
, pulseaudio
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, taglib
|
||||
, systemdSupport ? stdenv.isLinux, systemd
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "musikcube";
|
||||
version = "0.96.7";
|
||||
version = "0.96.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clangen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35";
|
||||
sha256 = "sha256-Aa52pRGq99Pt++aEVZdmVNhhQuBajgfZp39L1AfKvho=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A powerful editor targeted towards programmers and webdevelopers";
|
||||
homepage = "http://bluefish.openoffice.nl/";
|
||||
homepage = "https://bluefish.openoffice.nl/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
|
||||
homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
|
||||
description = "Prolog mode for Emacs";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amfora";
|
||||
version = "1.9.0";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "makeworld-the-better-one";
|
||||
repo = "amfora";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vj5aFSpyC7X9e9A9r4FAI6a0U8dx8uj7bpAFrQjLSzo=";
|
||||
sha256 = "sha256-93xNzYPoy8VsbY2JyvDXt4J/gIbI2wzrCD83JUaP150=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0=";
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ let
|
|||
|
||||
meta = {
|
||||
description = "Apache Spark is a fast and general engine for large-scale data processing";
|
||||
homepage = "https://spark.apache.org";
|
||||
homepage = "https://spark.apache.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A domain-independent planning system";
|
||||
homepage = "http://www.fast-downward.org/";
|
||||
homepage = "https://www.fast-downward.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; (linux ++ darwin);
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "Curve fitting and peak fitting software";
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "http://fityk.nieto.pl/";
|
||||
homepage = "https://fityk.nieto.pl/";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Multi-Stage Programming extension for OCaml";
|
||||
homepage = "http://okmij.org/ftp/ML/MetaOCaml.html";
|
||||
homepage = "https://okmij.org/ftp/ML/MetaOCaml.html";
|
||||
license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ];
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://activemq.apache.org/";
|
||||
homepage = "https://activemq.apache.org/";
|
||||
description = "Messaging and Integration Patterns server written in Java";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://apr.apache.org/";
|
||||
homepage = "https://apr.apache.org/";
|
||||
description = "The Apache Portable Runtime library";
|
||||
platforms = platforms.all;
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codec2";
|
||||
version = "1.0.1";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "codec2";
|
||||
rev = "v${version}";
|
||||
sha256 = "05xjsb67dzwncl2rnhg6fqih8krf38b7vmvzlsb7y9g6d1b085wg";
|
||||
hash = "sha256-2/Ef5cEe7Kr3a/D8u4BgvTQM6M6vglXsF+ccstFHDUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://commons.apache.org/proper/commons-math/";
|
||||
homepage = "https://commons.apache.org/proper/commons-math/";
|
||||
description = "A library of lightweight, self-contained mathematics and statistics components";
|
||||
maintainers = with lib.maintainers; [ copumpkin ];
|
||||
license = lib.licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -4,18 +4,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "0.20.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "145wm8c5v56djmvgjhksmywx6ak81vhxyg6yy3jj7wlvcan4p238";
|
||||
sha256 = "0yvxj7r9z890nfq5cadw7ys144c2mnvaplvx4v4ndv7238b741l8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake qttools wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtx11extras kwindowsystem libX11 libXext
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,23 +2,25 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RA+WmlSrNwkysuvAXjCoKZ528nt0tTZ5OHkqCETMskE=";
|
||||
sha256 = "sha256-QzNMUeA9oOZaNZDGf9TXloZ5r2prDHTRX1wso3fSetc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg=";
|
||||
|
||||
# triggers a different set of tests that seems to be interactive and fail (no url target defined)
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
"-X main.GitVersion=${version}"
|
||||
];
|
||||
|
||||
# TestCreateHammerMultipartPayload error occurred - Get "https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg"
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/ddosify -version | grep ${version} > /dev/null
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ let
|
|||
maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "node";
|
||||
knownVulnerabilities = optional (versionOlder version "12") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";
|
||||
};
|
||||
|
||||
passthru.python = python; # to ensure nodeEnv uses the same version
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
currently available for Windows and Linux.
|
||||
'';
|
||||
|
||||
homepage = "http://www.asc-hq.org/";
|
||||
homepage = "https://www.asc-hq.org/";
|
||||
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
|||
TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C,
|
||||
TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC.
|
||||
'';
|
||||
homepage = "http://business.toshiba.com/support/downloads/index.html";
|
||||
homepage = "https://business.toshiba.com/support/downloads/index.html";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.jpotier ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://storm.apache.org";
|
||||
homepage = "https://storm.apache.org/";
|
||||
description = "Distributed realtime computation system";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ edwtjo vizanto ];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
|
||||
homepage = "http://couchdb.apache.org";
|
||||
homepage = "https://couchdb.apache.org";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ lostnet ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://pigeonhole.dovecot.org/";
|
||||
homepage = "https://pigeonhole.dovecot.org/";
|
||||
description = "A sieve plugin for the Dovecot IMAP server";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ globin ajs124 ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,16 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mbtileserver";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "consbio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0wSc2DIfK6o3kSiH2sSQcYRR5dHnQbnJC6SX6DwVk1c=";
|
||||
sha256 = "sha256-C6Gz+RBUrjnfJWo4Ou+s/JYJ8iVP9FMYJ/cxJjcVsXk=";
|
||||
};
|
||||
|
||||
# https://github.com/consbio/mbtileserver/issues/130
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace handlers/tile_test.go \
|
||||
--replace "Test_CalcScaleResolution" "Skip_CalcScaleResolution"
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-36tUTZud0hxH9oZlnKxeK/xzoEzfw3xFMnd/r0srw6U=";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ let
|
|||
|
||||
meta = with lib; {
|
||||
description = "Smart and user-friendly command line shell";
|
||||
homepage = "http://fishshell.com/";
|
||||
homepage = "https://fishshell.com/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cole-h ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "The plugin manager for zsh";
|
||||
homepage = "http://antigen.sharats.me";
|
||||
homepage = "https://antigen.sharats.me/";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://blockhash.io/";
|
||||
homepage = "https://github.com/commonsmachinery/blockhash";
|
||||
description = ''
|
||||
This is a perceptual image hash calculation tool based on algorithm
|
||||
descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Static photo gallery generator";
|
||||
homepage = "http://www.thregr.org/~wavexx/software/fgallery/";
|
||||
homepage = "https://www.thregr.org/~wavexx/software/fgallery/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
homepage = "http://www.eggheads.org";
|
||||
homepage = "https://www.eggheads.org";
|
||||
description = "An Internet Relay Chat (IRC) bot";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.2.4";
|
||||
version = "8.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-74qNVW4NUGK16rZ3S7vxJ9Akci6ARcf4So1MydZVY3s=";
|
||||
sha256 = "sha256-lHKdIQyGbQt6PmMaTRIUx1q/81Q4KOfQ8zLnpt9aGbk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cIwte59AdVOWMBUWE4gKZSHhU37HgEW4k0v+jUUyj1Q=";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
generic = { pname, packageToBuild, description }:
|
||||
|
|
@ -15,10 +15,19 @@ let
|
|||
|
||||
vendorSha256 = "sha256-XCCO4Vamzj5pJFmu1A8mpTLlVAtocrn20myYJVWtBrY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ packageToBuild ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/${packageToBuild}/app.GitVersion=v${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd ${pname} \
|
||||
--bash <($out/bin/${pname} completion bash) \
|
||||
--fish <($out/bin/${pname} completion fish) \
|
||||
--zsh <($out/bin/${pname} completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit description;
|
||||
homepage = "https://github.com/sigstore/rekor";
|
||||
|
|
|
|||
Loading…
Reference in a new issue