From 4066f82a4de90e25b41451486bdcbf2c45805a48 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 6 Jul 2022 01:13:40 -0300 Subject: [PATCH 1/3] all-packages.nix: cosmetic formatting of some comments --- pkgs/top-level/all-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f631ef09a800..49ca9628f7a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -71,10 +71,10 @@ with pkgs; # # TODO It would be much better to pass the `stdenvNoCC` and *unwrapped* # cc, bintools, compiler-rt equivalent, etc. and create all final stdenvs - # as part of the stage. Then we would never be tempted to override a - # later thing to to create an earlier thing (leading to infinite - # recursion) and we also would still respect the stage arguments choices - # for these things. + # as part of the stage. Then we would never be tempted to override a later + # thing to to create an earlier thing (leading to infinite recursion) and + # we also would still respect the stage arguments choices for these + # things. overrideCC stdenv buildPackages.llvmPackages.clangNoCompilerRt else mkStdenvNoLibs stdenv; @@ -88,7 +88,8 @@ with pkgs; ### Helper functions. inherit lib config overlays; - # do not import 'appendToName' to get consistent package-names with the same set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519 + # do not import 'appendToName' to get consistent package-names with the same + # set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519 inherit (lib) lowPrio hiPrio makeOverridable; inherit (lib) recurseIntoAttrs; @@ -295,7 +296,8 @@ with pkgs; elfcat = callPackage ../tools/misc/elfcat { }; - # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: + # Zip file format only allows times after year 1980, which makes e.g. Python + # wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; From c2c8e8fdd2e30937fc746c54a7b76c6ee87417b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 6 Jul 2022 00:57:55 -0300 Subject: [PATCH 2/3] xosview: init at 1.23 --- pkgs/tools/X11/xosview/default.nix | 39 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/X11/xosview/default.nix diff --git a/pkgs/tools/X11/xosview/default.nix b/pkgs/tools/X11/xosview/default.nix new file mode 100644 index 000000000000..ca8eac38aa21 --- /dev/null +++ b/pkgs/tools/X11/xosview/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, libXpm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xosview"; + version = "1.23"; + + src = fetchFromGitHub { + owner = "hills"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-CoBVFTCpvZkIe/g+17JNV1y0G9K+t+p3EE9C5kuBe2k="; + }; + + dontConfigure = true; + + buildInputs = [ + libX11 + libXpm + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "PLATFORM=linux" + ]; + + meta = with lib; { + homepage = "http://www.pogo.org.uk/~mark/xosview/"; + description = "A classic system monitoring tool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +}) +# TODO: generalize to other platforms diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49ca9628f7a2..203bb5cb351d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35452,6 +35452,8 @@ with pkgs; xosd = callPackage ../misc/xosd { }; + xosview = callPackage ../tools/X11/xosview { }; + xosview2 = callPackage ../tools/X11/xosview2 { }; xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { }; From f4b885df97aafe36fd08637cb2d770463f1997aa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 6 Jul 2022 01:27:11 -0300 Subject: [PATCH 3/3] xosview2: remove spurious doCheck = false --- pkgs/tools/X11/xosview2/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix index 771cc772d719..653698c052b4 100644 --- a/pkgs/tools/X11/xosview2/default.nix +++ b/pkgs/tools/X11/xosview2/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, libX11 }: +{ lib +, stdenv +, fetchurl +, libX11 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xosview2"; version = "2.3.2"; src = fetchurl { - url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz"; - sha256 = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA="; + url = "mirror://sourceforge/xosview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA="; }; - # The software failed to buid with this enabled; it seemed tests were not implemented - doCheck = false; - buildInputs = [ libX11 ]; meta = with lib; { - description = "Lightweight program that gathers information from your operating system and displays it in graphical form"; + homepage = "http://xosview.sourceforge.net/index.html"; + description = "Lightweight graphical operating system monitor"; longDescription = '' xosview is a lightweight program that gathers information from your operating system and displays it in graphical form. It attempts to show @@ -33,9 +35,8 @@ stdenv.mkDerivation rec { connect to it on a network, then you can popup an xosview instance and monitor what is going on. ''; - homepage = "http://xosview.sourceforge.net/index.html"; license = with licenses; [ gpl2 bsdOriginal ]; - maintainers = [ maintainers.SeanZicari ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; -} +})