Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5dfbfc06d381
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ebd36403ebf
Choose a head ref
  • 4 commits
  • 39 files changed
  • 2 contributors

Commits on Oct 7, 2019

  1. Rename z77z into maggesi

    Make the "handle" of the maintainer match the name of the github account.
    Also update the email address.
    maggesi committed Oct 7, 2019
    Copy the full SHA
    ff1ed72 View commit details

Commits on Oct 13, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    24d0bd3 View commit details
  2. Fix reference to maintainer

    maggesi authored Oct 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b23ce21 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70641 from maggesi/rename-z77z-into-maggesi

    Rename z77z into maggesi
    matthewbauer authored Nov 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5ebd364 View commit details
Showing with 40 additions and 40 deletions.
  1. +2 −2 maintainers/maintainer-list.nix
  2. +1 −1 pkgs/applications/science/logic/hol_light/default.nix
  3. +1 −1 pkgs/applications/version-management/fossil/default.nix
  4. +1 −1 pkgs/development/compilers/polyml/5.6.nix
  5. +1 −1 pkgs/development/compilers/polyml/5.7.nix
  6. +1 −1 pkgs/development/compilers/polyml/default.nix
  7. +1 −1 pkgs/development/interpreters/io/default.nix
  8. +1 −1 pkgs/development/libraries/yajl/default.nix
  9. +1 −1 pkgs/development/ocaml-modules/batteries/default.nix
  10. +1 −1 pkgs/development/ocaml-modules/camlzip/default.nix
  11. +1 −1 pkgs/development/ocaml-modules/camomile/0.8.2.nix
  12. +1 −1 pkgs/development/ocaml-modules/camomile/0.8.5.nix
  13. +1 −1 pkgs/development/ocaml-modules/cryptgps/default.nix
  14. +1 −1 pkgs/development/ocaml-modules/cryptokit/default.nix
  15. +1 −1 pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
  16. +1 −1 pkgs/development/ocaml-modules/lablgtk/default.nix
  17. +1 −1 pkgs/development/ocaml-modules/lwt/legacy.nix
  18. +1 −1 pkgs/development/ocaml-modules/menhir/generic.nix
  19. +1 −1 pkgs/development/ocaml-modules/ocamlnat/default.nix
  20. +1 −1 pkgs/development/ocaml-modules/ocamlnet/default.nix
  21. +1 −1 pkgs/development/ocaml-modules/odn/default.nix
  22. +1 −1 pkgs/development/ocaml-modules/ounit/default.nix
  23. +1 −1 pkgs/development/ocaml-modules/pcre/default.nix
  24. +1 −1 pkgs/development/ocaml-modules/react/default.nix
  25. +1 −1 pkgs/development/ocaml-modules/sqlite3/default.nix
  26. +1 −1 pkgs/development/ocaml-modules/ssl/default.nix
  27. +1 −1 pkgs/development/ocaml-modules/type_conv/108.08.00.nix
  28. +1 −1 pkgs/development/ocaml-modules/type_conv/109.60.01.nix
  29. +1 −1 pkgs/development/ocaml-modules/type_conv/112.01.01.nix
  30. +1 −1 pkgs/development/tools/ocaml/camlp5/default.nix
  31. +1 −1 pkgs/development/tools/ocaml/findlib/default.nix
  32. +1 −1 pkgs/development/tools/ocaml/oasis/default.nix
  33. +1 −1 pkgs/development/tools/ocaml/ocamlify/default.nix
  34. +1 −1 pkgs/development/tools/ocaml/ocamlmod/default.nix
  35. +1 −1 pkgs/servers/openafs/1.6/default.nix
  36. +1 −1 pkgs/servers/openafs/1.6/module.nix
  37. +1 −1 pkgs/servers/openafs/1.8/default.nix
  38. +1 −1 pkgs/servers/openafs/1.8/module.nix
  39. +1 −1 pkgs/tools/misc/fdupes/default.nix
4 changes: 2 additions & 2 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -7340,8 +7340,8 @@
githubId = 5253988;
name = "yvt";
};
z77z = {
email = "maggesi@math.unifi.it";
maggesi = {
email = "marco.maggesi@gmail.com";
github = "maggesi";
githubId = 1809783;
name = "Marco Maggesi";
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/hol_light/default.nix
Original file line number Diff line number Diff line change
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice z77z vbgl ];
maintainers = with maintainers; [ thoughtpolice maggesi vbgl ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/fossil/default.nix
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2;
platforms = with stdenv.lib.platforms; all;
maintainers = [ #Add your name here!
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.viric
];
};
2 changes: 1 addition & 1 deletion pkgs/development/compilers/polyml/5.6.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.lgpl21;
platforms = with stdenv.lib.platforms; linux;
maintainers = [ #Add your name here!
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/compilers/polyml/5.7.nix
Original file line number Diff line number Diff line change
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://www.polyml.org/;
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
maintainers = with maintainers; [ z77z yurrriq ];
maintainers = with maintainers; [ maggesi yurrriq ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/compilers/polyml/default.nix
Original file line number Diff line number Diff line change
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://www.polyml.org/;
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
maintainers = with maintainers; [ z77z yurrriq ];
maintainers = with maintainers; [ maggesi yurrriq ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/io/default.nix
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ stdenv.mkDerivation {

maintainers = with maintainers; [
raskin
z77z
maggesi
vrthra
];
platforms = [ "x86_64-linux" ];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/yajl/default.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://lloyd.github.com/yajl/;
license = stdenv.lib.licenses.isc;
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ z77z ];
maintainers = with stdenv.lib.maintainers; [ maggesi ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/batteries/default.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.lgpl21Plus;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/camlzip/default.nix
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
license = "LGPL+linking exceptions";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/camomile/0.8.2.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
branch = "0.8.2";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/camomile/0.8.5.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/cryptgps/default.nix
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/cryptokit/default.nix
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
description = "A library of cryptographic primitives for OCaml";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
branch = "2.14";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.roconnor
];
homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/lablgtk/default.nix
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
z77z roconnor vbgl
maggesi roconnor vbgl
];
homepage = http://lablgtk.forge.ocamlcore.org/;
description = "An OCaml interface to GTK";
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/lwt/legacy.nix
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ buildOcaml {
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
z77z vbgl gal_bolle
maggesi vbgl gal_bolle
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/menhir/generic.nix
Original file line number Diff line number Diff line change
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
lgpl2 /* library */
];
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ z77z ];
maintainers = with maintainers; [ maggesi ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ocamlnat/default.nix
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ocamlnet/default.nix
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/odn/default.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
vbgl z77z
vbgl maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ounit/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/pcre/default.nix
Original file line number Diff line number Diff line change
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ z77z vbmithr ];
maintainers = with maintainers; [ maggesi vbmithr ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/react/default.nix
Original file line number Diff line number Diff line change
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
description = "Applicative events and signals for OCaml";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ z77z vbmithr gal_bolle];
maintainers = with maintainers; [ maggesi vbmithr gal_bolle];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/sqlite3/default.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
z77z vbgl
maggesi vbgl
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ssl/default.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ buildDunePackage rec {
description = "OCaml bindings for libssl ";
license = "LGPL+link exception";
maintainers = [
lib.maintainers.z77z
lib.maintainers.maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/type_conv/108.08.00.nix
Original file line number Diff line number Diff line change
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
license = licenses.asl20;
branch = "108";
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ z77z ];
maintainers = with maintainers; [ maggesi ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/type_conv/109.60.01.nix
Original file line number Diff line number Diff line change
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
description = "Support library for OCaml preprocessor type conversions";
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ z77z ];
maintainers = with stdenv.lib.maintainers; [ maggesi ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/type_conv/112.01.01.nix
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ buildOcaml rec {
homepage = https://github.com/janestreet/type_conv/;
description = "Support library for preprocessor type conversions";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ];
maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/ocaml/camlp5/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
z77z vbgl
maggesi vbgl
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/ocaml/findlib/default.nix
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.vbmithr
];
};
2 changes: 1 addition & 1 deletion pkgs/development/tools/ocaml/oasis/default.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
license = licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
vbgl z77z
vbgl maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/ocaml/ocamlify/default.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
platforms = ocaml.meta.platforms or [];
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [
z77z
maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/ocaml/ocamlmod/default.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
description = "Generate OCaml modules from source files";
platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [
z77z
maggesi
];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/openafs/1.6/default.nix
Original file line number Diff line number Diff line change
@@ -84,6 +84,6 @@ stdenv.mkDerivation {
homepage = https://www.openafs.org;
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.z77z maintainers.spacefrogg ];
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/openafs/1.6/module.nix
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
homepage = https://www.openafs.org;
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.z77z maintainers.spacefrogg ];
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
broken = versionOlder kernel.version "3.18" || builtins.compareVersions kernel.version "5.0" >= 0
|| stdenv.targetPlatform.isAarch64;
};
2 changes: 1 addition & 1 deletion pkgs/servers/openafs/1.8/default.nix
Original file line number Diff line number Diff line change
@@ -96,6 +96,6 @@ stdenv.mkDerivation {
homepage = https://www.openafs.org;
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.z77z maintainers.spacefrogg ];
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/openafs/1.8/module.nix
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
homepage = https://www.openafs.org;
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.z77z maintainers.spacefrogg ];
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
broken = versionOlder kernel.version "3.18";
};

2 changes: 1 addition & 1 deletion pkgs/tools/misc/fdupes/default.nix
Original file line number Diff line number Diff line change
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/adrianlopezroche/fdupes;
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.z77z ];
maintainers = [ maintainers.maggesi ];
};
}