Unverified Commit 6594f368 authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

various: adopt (#479113)

parents 3fbab70c c6188474

pkgs/by-name/br/brotli/package.nix

+8 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  python3Packages,

  staticOnly ? stdenv.hostPlatform.isStatic,

  testers,

  nix-update-script,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -41,10 +42,13 @@ stdenv.mkDerivation (finalAttrs: { 
    cp ../docs/*.3 $out/share/man/man3/

  '';



  passthru.tests = {

  passthru = {

    tests = {

      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

      python = python3Packages.brotli;

    };

    updateScript = nix-update-script { };

  };



  meta = {

    homepage = "https://github.com/google/brotli";
@@ -63,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { 
      https://datatracker.ietf.org/doc/html/rfc7932

    '';

    license = lib.licenses.mit;

    maintainers = [ ];

    maintainers = with lib.maintainers; [ mdaniels5757 ];

    pkgConfigModules = [

      "libbrotlidec"

      "libbrotlienc"

pkgs/by-name/ed/ed/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { 
    '';

    license = lib.licenses.gpl3Plus;

    mainProgram = "ed";

    maintainers = [ ];

    maintainers = with lib.maintainers; [ mdaniels5757 ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/is/isocodes/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://salsa.debian.org/iso-codes-team/iso-codes";

    description = "Various ISO codes packaged as XML files";

    license = lib.licenses.lgpl21;

    maintainers = with lib.maintainers; [ mdaniels5757 ];

    platforms = lib.platforms.all;

    pkgConfigModules = [ "iso-codes" ];

  };

pkgs/by-name/ma/man-pages/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "Linux development manual pages";

    homepage = "https://www.kernel.org/doc/man-pages/";

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ mdaniels5757 ];

    platforms = lib.platforms.unix;

    priority = 30; # if a package comes with its own man page, prefer it

  };

pkgs/by-name/sh/shadow/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ let 


in



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "shadow";

  version = "4.18.0";



  src = fetchFromGitHub {

    owner = "shadow-maint";

    repo = "shadow";

    rev = version;

    tag = finalAttrs.version;

    hash = "sha256-M7We3JboNpr9H0ELbKcFtMvfmmVYaX9dYcsQ3sVX0lM=";

  };
@@ -133,6 +133,7 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/shadow-maint/shadow";

    description = "Suite containing authentication-related tools such as passwd and su";

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ mdaniels5757 ];

    platforms = lib.platforms.linux;

  };
@@ -141,4 +142,4 @@ stdenv.mkDerivation rec { 
    # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests

    tests = { inherit (nixosTests) shadow; };

  };

}
 
})