Unverified Commit 56b23384 authored by piegames's avatar piegames Committed by GitHub
Browse files

Merge pull request #277735: Remove caadar from maintainers

parents 005862f6 7f9b9936

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -2867,12 +2867,6 @@ 
    githubId = 382011;

    name = "c4605";

  };

  caadar = {

    email = "v88m@posteo.net";

    github = "caadar";

    githubId = 15320726;

    name = "Car Cdr";

  };

  caarlos0 = {

    name = "Carlos A Becker";

    email = "carlos@becker.software";

pkgs/tools/system/disk-filltest/default.nix→pkgs/by-name/di/disk-filltest/package.nix

+43 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub }:

{ lib

, stdenv

, fetchFromGitHub

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "disk-filltest";

  version = "0.8.2";



  src = fetchFromGitHub {

    owner = "bingmann";

    repo = "disk-filltest";

    rev = "v${version}";

    sha256 = "0qmcf5k5j7946wsbxrw4rqfj48mwl3r6kb4l3gppl97k7iyni6kj";

    rev = "v${finalAttrs.version}";

    hash = "sha256-cppofTzzJHrvG5SsafKgvCIiHc6E5740NyQdWWZxrGI=";

  };



  preBuild = ''

    substituteInPlace Makefile --replace 'prefix = /usr/local' 'prefix = $(out)'

  '';

  outputs = [ "out" "doc" "man" ];



  makeFlags = [

    "CC=${stdenv.cc.targetPrefix}cc"

    "prefix=${placeholder "out"}"

    "man1dir=${placeholder "man"}/share/man/man1"

  ];



  postInstall = ''

    install -D -m0644 -t $out/share/doc COPYING README

    mkdir -p $out/share/man; mv $out/man1 $out/share/man

    install -D -m0644 -t $doc/share/doc/disk-filltest README

  '';



  meta = with lib; {

  meta = {

    homepage = "https://panthema.net/2013/disk-filltest";

    description = "Simple program to detect bad disks by filling them with random data";

    longDescription = ''

      disk-filltest is a tool to check storage disks for coming

      failures by write files with pseudo-random data to the current

      directory until the disk is full, read the files again

      and verify the sequence written. It also can measure

      read/write speed while filling the disk.

      disk-filltest is a tool to check storage disks for coming failures by

      write files with pseudo-random data to the current directory until the

      disk is full, read the files again and verify the sequence written. It

      also can measure read/write speed while filling the disk.

    '';

    homepage = "https://panthema.net/2013/disk-filltest";

    license = licenses.gpl3;

    maintainers = with maintainers; [ caadar ];

    platforms = platforms.all;

    license = lib.licenses.gpl3Plus;

    mainProgram = "disk-filltest";

    maintainers = with lib.maintainers; [ AndersonTorres ];

    platforms = lib.platforms.all;

  };



}
 
})

pkgs/tools/misc/gtklp/default.nix→pkgs/by-name/gt/gtklp/package.nix

+71 −0
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl

, autoreconfHook, libtool, pkg-config

, gtk2, glib, cups, gettext, openssl

{ lib

, stdenv

, autoreconfHook

, cups

, fetchurl

, gettext

, glib

, gtk2

, libtool

, openssl

, pkg-config

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gtklp";

  version = "1.3.4";



  src = fetchurl {

    url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz";

    sha256 = "1arvnnvar22ipgnzqqq8xh0kkwyf71q2sfsf0crajpsr8a8601xy";

    url = "mirror://sourceforge/gtklp/gtklp-${finalAttrs.version}.src.tar.gz";

    hash = "sha256-vgdgkEJZX6kyA047LXA4zvM5AewIY/ztu1GIrLa1O6s=";

  };



  nativeBuildInputs = [

    pkg-config

    autoreconfHook

    pkg-config

    cups

  ];



  buildInputs = [
@@ -26,9 +35,13 @@ stdenv.mkDerivation rec { 
    openssl

  ];



  outputs = [ "out" "doc" "man" ];



  strictDeps = true;



  patches = [

    ./patches/mdv-fix-str-fmt.patch

    ./patches/autoconf.patch

    ./000-autoconf.patch

    ./001-format-parameter.patch

  ];



  # Workaround build failure on -fno-common toolchains:
@@ -36,22 +49,23 @@ stdenv.mkDerivation rec { 
  #     file.o:libgtklp/libgtklp.h:83: first defined here

  env.NIX_CFLAGS_COMPILE = "-fcommon";



  preConfigure = ''

    substituteInPlace include/defaults.h --replace "netscape" "firefox"

    substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \

  postPatch = ''

    substituteInPlace include/defaults.h \

      --replace "netscape" "firefox" \

      --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \

                "http://localhost:631/help/"

  '';



  preInstall = ''

    install -D -m0644 -t $out/share/doc AUTHORS BUGS ChangeLog README USAGE

    install -D -m0644 -t $doc/share/doc AUTHORS BUGS ChangeLog README USAGE

  '';



  meta = with lib; {

    description = "A graphical frontend for CUPS";

  meta = {

    homepage = "https://gtklp.sirtobi.com";

    license = licenses.gpl2Only;

    maintainers = with maintainers; [ caadar ];

    platforms = platforms.unix;

    description = "A GTK-based graphical frontend for CUPS";

    license = with lib.licenses; [ gpl2Only ];

    mainProgram = "gtklp";

    maintainers = with lib.maintainers; [ AndersonTorres ];

    platforms = lib.platforms.unix;

  };



}
 
})