Merge staging-next into staging
This commit is contained in:
commit
b7e3cd0993
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.1.6.2";
|
||||
version = "3.1.7";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A=";
|
||||
sha256 = "sha256-82ZD32dqRYGbGM/uyaJ5VqVZbhDZthiEcTihkV43JOU=";
|
||||
};
|
||||
|
||||
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
|
||||
|
@ -45,15 +45,11 @@ buildPythonApplication rec {
|
|||
py-cpuinfo
|
||||
] ++ lib.optional stdenv.isLinux hddtemp;
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nicolargo.github.io/glances/";
|
||||
description = "Cross-platform curses-based monitoring tool";
|
||||
changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ jonringer primeos koral ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, pkg-config
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
, openssl
|
||||
, qtbase
|
||||
, zlib
|
||||
|
@ -39,7 +39,7 @@ in mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ autoPatchelfHook pkg-config ];
|
||||
|
||||
buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
|
||||
buildInputs = [ ffmpeg openssl qtbase zlib ];
|
||||
|
||||
qtWrapperArgs =
|
||||
let
|
||||
|
|
50
pkgs/development/libraries/clanlib/default.nix
Normal file
50
pkgs/development/libraries/clanlib/default.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, libGL
|
||||
, libpng
|
||||
, pkg-config
|
||||
, xorg
|
||||
, file
|
||||
, freetype
|
||||
, fontconfig
|
||||
, xlibsWrapper
|
||||
, alsaLib
|
||||
, libXrender
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clanlib";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "ClanLib";
|
||||
owner = "sphair";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [
|
||||
libGL
|
||||
libpng
|
||||
xorg.xorgproto
|
||||
freetype
|
||||
fontconfig
|
||||
xlibsWrapper
|
||||
alsaLib
|
||||
libXrender
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sphair/ClanLib";
|
||||
description = "A cross platform toolkit library with a primary focus on game creation";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nixinator ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-tools";
|
||||
version = "2020.2.3";
|
||||
version = "2020.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dominikh";
|
||||
repo = "go-tools";
|
||||
rev = version;
|
||||
sha256 = "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n";
|
||||
sha256 = "sha256-yFZ01bfejbq8zQ52DbcomBcHnB6H5Ds4MJP93xQ2/jU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak";
|
||||
vendorSha256 = "sha256-Uw36Jn9RGcVIyzDOMIwi6hMQsSDWKG0kYpOOpREANyA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
41
pkgs/development/tools/rust/cargo-msrv/default.nix
Normal file
41
pkgs/development/tools/rust/cargo-msrv/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-msrv";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i";
|
||||
};
|
||||
|
||||
cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
# Integration tests fail
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)";
|
||||
homepage = "https://github.com/foresterre/cargo-msrv";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
}
|
70
pkgs/games/methane/default.nix
Normal file
70
pkgs/games/methane/default.nix
Normal file
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
, fontconfig
|
||||
, freealut
|
||||
, freeglut
|
||||
, gettext
|
||||
, libGL
|
||||
, libGLU
|
||||
, openal
|
||||
, quesoglc
|
||||
, clanlib
|
||||
, libXrender
|
||||
, libmikmod
|
||||
, alsaLib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "methane";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "methane";
|
||||
owner = "rombust";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_mixer
|
||||
fontconfig
|
||||
freealut
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
openal
|
||||
quesoglc
|
||||
clanlib
|
||||
libXrender
|
||||
libmikmod
|
||||
alsaLib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin/ $out/share/methane/ $out/share/docs/
|
||||
cp methane $out/bin
|
||||
cp -r resources/* $out/share/methane/.
|
||||
cp -r docs/* $out/share/docs/.
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rombust/methane";
|
||||
description = "A clone of Taito's Bubble Bobble arcade game released for Amiga in 1993 by Apache Software";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ nixinator ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
|
@ -1,30 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, libopcodes, libbfd, libelf
|
||||
, linuxPackages_latest, zlib
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bpftool";
|
||||
inherit (linuxPackages_latest.kernel) version src;
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
buildInputs = [ libopcodes libbfd libelf zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs scripts/bpf_helpers_doc.py
|
||||
|
||||
cd tools/bpf/bpftool
|
||||
substituteInPlace ./Makefile \
|
||||
--replace '/usr/local' "$out" \
|
||||
--replace '/usr' "$out" \
|
||||
--replace '/sbin' '/bin'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debugging/program analysis tool for the eBPF subsystem";
|
||||
license = [ licenses.gpl2 licenses.bsd2 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
38
pkgs/os-specific/linux/bpftools/default.nix
Normal file
38
pkgs/os-specific/linux/bpftools/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, stdenv
|
||||
, libopcodes, libbfd, libelf, readline
|
||||
, linuxPackages_latest, zlib
|
||||
, python3, bison, flex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bpftools";
|
||||
inherit (linuxPackages_latest.kernel) version src;
|
||||
|
||||
nativeBuildInputs = [ python3 bison flex ];
|
||||
buildInputs = [ libopcodes libbfd libelf zlib readline ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs scripts/bpf_helpers_doc.py
|
||||
|
||||
cd tools/bpf
|
||||
substituteInPlace ./bpftool/Makefile \
|
||||
--replace '/usr/local' "$out" \
|
||||
--replace '/usr' "$out" \
|
||||
--replace '/sbin' '/bin'
|
||||
'';
|
||||
|
||||
buildFlags = [ "bpftool" "bpf_asm" "bpf_dbg" ];
|
||||
|
||||
installPhase = ''
|
||||
make -C bpftool install
|
||||
install -Dm755 -t $out/bin bpf_asm
|
||||
install -Dm755 -t $out/bin bpf_dbg
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debugging/program analysis tools for the eBPF subsystem";
|
||||
license = [ licenses.gpl2 licenses.bsd2 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpcurl";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fullstorydev";
|
||||
repo = "grpcurl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZrL23eqA56BApwUtBwL5nSAd2LZbQxthyiFBnkJ5+Zg=";
|
||||
sha256 = "sha256-BxmoIGhuAt/uhHLNdMiSrNVWAoxAAMKPJ/NsXjf2ynk=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/grpcurl" ];
|
||||
|
||||
vendorSha256 = "sha256-Tx00zRlzxCgyYdcYjzCxnFe8HyiitaKLcXJjYWhYSic=";
|
||||
vendorSha256 = "sha256-EnstvJk2kZ1Ft5xY1dO14wnmT//2K72OnDMZqeaOeQI=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
|
|
|
@ -70,6 +70,7 @@ mapAliases ({
|
|||
bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
|
||||
beegfs = throw "beegfs has been removed."; # added 2019-11-24
|
||||
bluezFull = bluez; # Added 2019-12-03
|
||||
bpftool = bpftools; # Added 2021-05-03
|
||||
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
|
||||
bridge_utils = bridge-utils; # added 2015-02-20
|
||||
bro = zeek; # added 2019-09-29
|
||||
|
|
|
@ -11484,6 +11484,7 @@ in
|
|||
cargo-make = callPackage ../development/tools/rust/cargo-make {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { };
|
||||
cargo-play = callPackage ../development/tools/rust/cargo-play { };
|
||||
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
@ -12566,7 +12567,7 @@ in
|
|||
|
||||
libbpf = callPackage ../os-specific/linux/libbpf { };
|
||||
|
||||
bpftool = callPackage ../os-specific/linux/bpftool { };
|
||||
bpftools = callPackage ../os-specific/linux/bpftools { };
|
||||
|
||||
bpm-tools = callPackage ../tools/audio/bpm-tools { };
|
||||
|
||||
|
@ -14090,6 +14091,8 @@ in
|
|||
|
||||
cl = callPackage ../development/libraries/cl { };
|
||||
|
||||
clanlib = callPackage ../development/libraries/clanlib { };
|
||||
|
||||
classads = callPackage ../development/libraries/classads { };
|
||||
|
||||
clearsilver = callPackage ../development/libraries/clearsilver { };
|
||||
|
@ -28003,6 +28006,8 @@ in
|
|||
|
||||
megaglest = callPackage ../games/megaglest {};
|
||||
|
||||
methane = callPackage ../games/methane { };
|
||||
|
||||
mindustry = callPackage ../games/mindustry { };
|
||||
mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; };
|
||||
|
||||
|
|
Loading…
Reference in a new issue