nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 02:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-02 00:06:31 +00:00 committed by GitHub
commit 12538500ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitea.nix
View File

@ -55,7 +55,7 @@ in
description = "Root path for log files."; description = "Root path for log files.";
}; };
level = mkOption { level = mkOption {
default = "Trace"; default = "Info";
type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ]; type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ];
description = "General log level."; description = "General log level.";
}; };

17
pkgs/applications/audio/helm/default.nix
View File

@ -26,10 +26,13 @@
buildInputs = [ buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr xorg.libXinerama xorg.libXrender xorg.libXrandr
freetype alsa-lib curl libjack2 pkg-config libGLU libGL lv2 freetype alsa-lib curl libjack2 libGLU libGL lv2
]; ];
nativeBuildInputs = [ pkg-config ];
CXXFLAGS = "-DHAVE_LROUND"; CXXFLAGS = "-DHAVE_LROUND";
enableParallelBuilding = true;
makeFlags = [ "DESTDIR=$(out)" ];
patches = [ patches = [
# gcc9 compatibility https://github.com/mtytel/helm/pull/233 # gcc9 compatibility https://github.com/mtytel/helm/pull/233
@ -41,15 +44,7 @@
prePatch = '' prePatch = ''
sed -i 's|usr/||g' Makefile sed -i 's|usr/||g' Makefile
''; sed -i "s|/usr/share/|$out/share/|" src/common/load_save.cpp
buildPhase = ''
make lv2
make standalone
'';
installPhase = ''
make DESTDIR="$out" install
''; '';
meta = with lib; { meta = with lib; {
@ -72,7 +67,7 @@
Simple arpeggiator Simple arpeggiator
Effects: Formant filter, stutter, delay Effects: Formant filter, stutter, delay
''; '';
license = lib.licenses.gpl3; license = lib.licenses.gpl3Plus;
maintainers = [ maintainers.magnetophon ]; maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

20
pkgs/applications/audio/pamixer/default.nix
View File

@ -1,20 +1,30 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: { lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio, installShellFiles }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pamixer"; pname = "pamixer";
version = "1.4"; version = "unstable-2021-03-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cdemoulins"; owner = "cdemoulins";
repo = "pamixer"; repo = "pamixer";
rev = version; rev = "4ea2594cb8c605dccd00a381ba19680eba368e94";
sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7"; sha256 = "sha256-kV4wIxm1WZvqqyfmgQ2cSbRJwJR154OW0MMDg2ntf6g=";
}; };
buildInputs = [ boost libpulseaudio ]; buildInputs = [ boost libpulseaudio ];
nativeBuildInputs = [ installShellFiles ];
installPhase = '' installPhase = ''
runHook preInstall
install -Dm755 pamixer -t $out/bin install -Dm755 pamixer -t $out/bin
runHook postInstall
'';
postInstall = ''
installManPage pamixer.1
''; '';
meta = with lib; { meta = with lib; {
@ -29,7 +39,9 @@ stdenv.mkDerivation rec {
- Mute or unmute a device - Mute or unmute a device
''; '';
homepage = "https://github.com/cdemoulins/pamixer"; homepage = "https://github.com/cdemoulins/pamixer";
maintainers = with maintainers; [ thiagokokada ];
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "pamixer";
}; };
} }

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

@ -24,13 +24,13 @@
}: }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "visidata"; pname = "visidata";
version = "2.6"; version = "2.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "saulpw"; owner = "saulpw";
repo = "visidata"; repo = "visidata";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fsk+Cn7CzrOAif5+LUMrs8llSnEfoSLAdg1qOFMJOh8="; sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -92,11 +92,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.30.86"; version = "1.30.87";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "0pg29i01dm5gqfd3aagsc83dbx0n3051wfxi0r1c9l93dwm5bmq9"; sha256 = "0mx1vnrip1y87g6zj9sdcf5siihwn0b6v1q106d9kz89znpzd64s";
}; };
dontConfigure = true; dontConfigure = true;

4
pkgs/applications/virtualization/docker-slim/default.nix
View File

@ -6,7 +6,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "docker-slim"; pname = "docker-slim";
version = "1.36.4"; version = "1.37.0";
goPackagePath = "github.com/docker-slim/docker-slim"; goPackagePath = "github.com/docker-slim/docker-slim";
@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim"; owner = "docker-slim";
repo = "docker-slim"; repo = "docker-slim";
rev = version; rev = version;
sha256 = "0hgiigai5jpczjll4s4r4jzbq272s3p8f0r6mj4r3mjjs89hkqz1"; sha256 = "1gxbgn61qv4zhzxwdd917hywwicr3jand34ghjzha35r44lmyzgz";
}; };
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

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

@ -5,13 +5,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "tfsec"; pname = "tfsec";
version = "0.58.11"; version = "0.58.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-IapWH7bkjrFmdkGHUHROECmfF3su4HtJJ8Ii5a4GSRg="; sha256 = "sha256-+djNbTr4TBo3KJ2skQysfrhVp9Q+HuaeB1UCzASB1+w=";
}; };
goPackagePath = "github.com/aquasecurity/tfsec"; goPackagePath = "github.com/aquasecurity/tfsec";

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

@ -5,17 +5,23 @@
buildGoModule rec { buildGoModule rec {
pname = "htmltest"; pname = "htmltest";
version = "0.14.0"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wjdp"; owner = "wjdp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0z2j54ywim1nl10vidcnbwhywyzanj4qd93ai533808wrm3ghwb6"; sha256 = "sha256-lj+bR27huswHemF8M+G69PblqnQQUWsg4jtLfz89yVY=";
}; };
vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm"; vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm";
ldflags = [
"-w"
"-s"
"-X main.version=${version}"
];
# tests require network access # tests require network access
doCheck = false; doCheck = false;

16
pkgs/development/tools/packer/default.nix
View File

@ -1,25 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, fetchpatch }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec { buildGoModule rec {
pname = "packer"; pname = "packer";
version = "1.7.5"; version = "1.7.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "packer"; repo = "packer";
rev = "v${version}"; rev = "v${version}";
sha256 = "15kw4zy0p7hr6jm0202s0fk5ja3ff0pdir37qdifngm1x7id1vxc"; sha256 = "sha256-nZeOtV6sbgzUhDOlWJ5eLzOh0gsaukXFrPg3y8x9ce4=";
}; };
vendorSha256 = "1785yv48sn504zcig9szjw9s4dxb55dg9idh10i2gzfgbda2c3nf"; vendorSha256 = "sha256-zg4mVFvP/SciCLDF9FopqzeiE5dfpxfZJ6BYjcj2BZ0=";
patches = [
# https://github.com/hashicorp/packer/pull/11282
(fetchpatch {
url = "https://github.com/hashicorp/packer/commit/dbf13803217e18c6cb567ffefc9476c4e0149e02.patch";
sha256 = "1n038x6qnr75c5ci2jp8jcwp6yvlchcf2nydksb2s75ffvidjrsa";
})
];
subPackages = [ "." ]; subPackages = [ "." ];

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

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let let
version = "5.14.8"; version = "5.14.9";
release = "1"; release = "1";
suffix = "xanmod${release}-cacule"; suffix = "xanmod${release}-cacule";
in in
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod"; owner = "xanmod";
repo = "linux"; repo = "linux";
rev = modDirVersion; rev = modDirVersion;
sha256 = "sha256-ikASMx5Lbp2BUfjMppnT8Y0UZdKMWqTze78XYoUTeiU="; sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE=";
}; };
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {

12
pkgs/servers/sql/postgresql/ext/age.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "age"; pname = "age";
version = "0.2.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitnine-oss"; owner = "apache";
repo = "AgensGraph-Extension"; repo = "incubator-age";
rev = "v${version}"; rev = "v${version}";
sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17"; sha256 = "1cl6p9qz2yhgm603ljlyjdn0msk3hzga1frjqsmqmpp3nw4dbkka";
}; };
buildInputs = [ postgresql ]; buildInputs = [ postgresql ];
@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A graph database extension for PostgreSQL"; description = "A graph database extension for PostgreSQL";
homepage = "https://github.com/bitnine-oss/AgensGraph-Extension"; homepage = "https://age.apache.org/";
changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}"; changelog = "https://github.com/apache/incubator-age/releases/tag/v${version}";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = postgresql.meta.platforms; platforms = postgresql.meta.platforms;
license = licenses.asl20; license = licenses.asl20;

6
pkgs/servers/sql/postgresql/ext/pg_bigm.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pg_bigm"; pname = "pg_bigm";
version = "1.2"; version = "1.2-20200228";
src = fetchurl { src = fetchurl {
url = "mirror://osdn/pgbigm/66565/${pname}-${version}-20161011.tar.gz"; url = "mirror://osdn/pgbigm/72448/${pname}-${version}.tar.gz";
sha256 = "1jp30za4bhwlas0yrhyjs9m03b1sj63km61xnvcbnh0sizyvhwis"; sha256 = "1hxn90prldwriqmqlf33ypgbxw5v54gkzx1305yzghryzfg7rhbl";
}; };
buildInputs = [ postgresql ]; buildInputs = [ postgresql ];

4
pkgs/servers/sql/postgresql/ext/pgrouting.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pgrouting"; pname = "pgrouting";
version = "3.1.3"; version = "3.2.1";
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ postgresql boost ]; buildInputs = [ postgresql boost ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "pgRouting"; owner = "pgRouting";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ahDQ+nSTeIsdjID/ZwiGZCVBzOf0/oQs3SYsFYEEoxY="; sha256 = "1zn3yyp4zz14yn2mmqwn7c4m65zfb2nj9zg4qj97ppsahs5xc6vw";
}; };
installPhase = '' installPhase = ''

8
pkgs/servers/sql/postgresql/ext/plr.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "plr"; pname = "plr";
version = "8.4.1"; version = "8.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "postgres-plr"; owner = "postgres-plr";
repo = "plr"; repo = "plr";
rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "1wy4blg8jl30kzhrkvbncl4gmy6k71zipnq89ykwi1vmx89v3ab7"; sha256 = "15dygf8klx2a4kzpmc1qnch629gcaa43ba1p3cqk9r1db4ima24k";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
install -D plr.so -t $out/lib/ install -D plr.so -t $out/lib/
install -D {plr--unpackaged--8.4.1.sql,plr--8.4.1.sql,plr.control} -t $out/share/postgresql/extension install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension
''; '';
meta = with lib; { meta = with lib; {
description = "PL/R - R Procedural Language for PostgreSQL"; description = "PL/R - R Procedural Language for PostgreSQL";
homepage = "https://github.com/postgres-plr/plr"; homepage = "https://github.com/postgres-plr/plr";
maintainers = with maintainers; [ qoelet ]; maintainers = with maintainers; [ qoelet ];
platforms = [ "x86_64-linux" ]; platforms = postgresql.meta.platforms;
license = licenses.gpl2Only; license = licenses.gpl2Only;
}; };
} }

8
pkgs/tools/misc/kalker/default.nix
View File

@ -6,19 +6,17 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kalker"; pname = "kalker";
version = "1.0.0"; version = "1.0.1-2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PaddiM8"; owner = "PaddiM8";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg="; sha256 = "sha256-fXTsCHqm+wO/ygyg0y+44G9pgaaEEH9fgePCDH86/vU=";
}; };
cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58="; cargoSha256 = "sha256-Ul21otEYCJuX5GnfV9OTpk/+3y32biASYZQpOecr8aU=";
# https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/20
nativeBuildInputs = [ gcc ];
buildInputs = [ gmp mpfr libmpc ]; buildInputs = [ gmp mpfr libmpc ];
outputs = [ "out" "lib" ]; outputs = [ "out" "lib" ];

6
pkgs/tools/security/vault/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "vault"; pname = "vault";
version = "1.8.2"; version = "1.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SFzThZX9oYBM7OGjlvWq1by1mUOA4qc89TMEvCZU9I0="; sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI=";
}; };
vendorSha256 = "sha256-Fhj1qWv4NN5oHxS5xZt2BnLBPTTcxKq47Q1kd+60xY4="; vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY=";
subPackages = [ "." ]; subPackages = [ "." ];

10
pkgs/tools/security/vault/vault-bin.nix
View File

@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }:
let let
version = "1.8.2"; version = "1.8.3";
sources = let sources = let
base = "https://releases.hashicorp.com/vault/${version}"; base = "https://releases.hashicorp.com/vault/${version}";
in { in {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip"; url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "sha256-10ck1swivx4cfFGQCbAXaAms9vHCDuVhB94Mq1TNhGM="; sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8=";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip"; url = "${base}/vault_${version}_linux_386.zip";
sha256 = "0v8l056xs88mjpcfpi9k8chv0zk7lf80gkj580z3d37h2yr2b1gg"; sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip"; url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "1xabbndnx85zbhbwid30q0jii41hmwwlqrxz4a0rllqshvmq4fg3"; sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip"; url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "00p2540bdhw46licab401vbwdyvp1hkngssx6nh99igj14sl60qa"; sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7";
}; };
}; };