From cd188311dc75bc765709c486883d02518a6610d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 04:25:30 +0000 Subject: [PATCH 1/8] grpcurl: 1.8.0 -> 1.8.1 --- pkgs/tools/networking/grpcurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 3f9d31b508b..ec181c17e9e 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -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}" ]; From cb5657097b58eeaafee11f84d87059358ca90ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 2 May 2021 10:21:44 +0200 Subject: [PATCH 2/8] makemkv: switch from ffmpeg_3 to ffmpeg Tested by ripping a title from an Blu-Ray. See #120705. --- pkgs/applications/video/makemkv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 817daf31d0a..da18a8d7abe 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -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 From 501956b985e6be807fa2208dd587022c22973784 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 2 May 2021 19:06:59 +0200 Subject: [PATCH 3/8] glances: 3.1.6.2 -> 3.1.7 --- pkgs/applications/system/glances/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index e41d9bee5b4..c142ba12bc2 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -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 ]; }; } From c4bd0719e31e4e8d07aeecf4fcc578bd666fcb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 3 May 2021 00:55:49 +0200 Subject: [PATCH 4/8] bpftools: build bpf_asm, bpf_dbg I needed some other bpf-related tools located in the kernel source tree, so I hijacked the bpftool package, renamed it to bpftools and added those programs. --- pkgs/os-specific/linux/bpftool/default.nix | 30 ---------------- pkgs/os-specific/linux/bpftools/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 40 insertions(+), 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/bpftool/default.nix create mode 100644 pkgs/os-specific/linux/bpftools/default.nix diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix deleted file mode 100644 index d8c64738d82..00000000000 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix new file mode 100644 index 00000000000..3e20efa9f01 --- /dev/null +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eadd95870ca..efe14dd45c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51658440cad..927fd1a41fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12536,7 +12536,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 { }; From 11bb46fdc63db2f00c7f458f871d2015e1f4fe6e Mon Sep 17 00:00:00 2001 From: nixinator <33lockdown33@protonmail.com> Date: Tue, 13 Apr 2021 20:18:49 +0100 Subject: [PATCH 5/8] clanlib: init at 4.1.0 Co-authored-by: Sandro --- .../development/libraries/clanlib/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/clanlib/default.nix diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix new file mode 100644 index 00000000000..15fd9cd7286 --- /dev/null +++ b/pkgs/development/libraries/clanlib/default.nix @@ -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" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 029495618b0..f47d8755bc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14081,6 +14081,8 @@ in cl = callPackage ../development/libraries/cl { }; + clanlib = callPackage ../development/libraries/clanlib { }; + classads = callPackage ../development/libraries/classads { }; clearsilver = callPackage ../development/libraries/clearsilver { }; From d5a0b50f2653f9792f62138edbff70c789f233ab Mon Sep 17 00:00:00 2001 From: nixinator <33lockdown33@protonmail.com> Date: Tue, 13 Apr 2021 20:21:37 +0100 Subject: [PATCH 6/8] methane: init at 2.0.1 --- pkgs/games/methane/default.nix | 70 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/games/methane/default.nix diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix new file mode 100644 index 00000000000..17c9dc42567 --- /dev/null +++ b/pkgs/games/methane/default.nix @@ -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" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f47d8755bc9..367989baea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27995,6 +27995,8 @@ in megaglest = callPackage ../games/megaglest {}; + methane = callPackage ../games/methane { }; + mindustry = callPackage ../games/mindustry { }; mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; From 25fd0dde19a60d90a7c6edf30f77746daeea717a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 May 2021 03:34:08 +0000 Subject: [PATCH 7/8] go-tools: 2020.2.3 -> 2020.2.4 --- pkgs/development/tools/go-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 2bf5093e5e3..00cd19863d6 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -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; From 37bdc088ef06194353c0ebe7643267e3881afeb8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 27 Apr 2021 20:42:47 -0300 Subject: [PATCH 8/8] cargo-msrv: init at 0.4.0 Signed-off-by: Otavio Salvador --- .../tools/rust/cargo-msrv/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-msrv/default.nix diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix new file mode 100644 index 00000000000..32ce1464f82 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 367989baea3..4dec9003472 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11475,6 +11475,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;