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: c18c4546d1e5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 25a8ba5bafe7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 21, 2017

  1. iana-etc: 2.30 -> 20170328 

    (cherry picked from commit 50527db)
    @Mic92 @fpletz
    Mic92 authored and fpletz committed Jun 21, 2017
    Copy the full SHA
    2306897 View commit details

  2. iana-etc: 20170328 -> 20170417 

    (cherry picked from commit 024cbbd)
    @Mic92 @fpletz
    Mic92 authored and fpletz committed Jun 21, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8ac2b3 View commit details

  3. iana-etc: 20170417 -> 20170512 

    (cherry picked from commit f016fa3)
    @Mic92 @fpletz
    Mic92 authored and fpletz committed Jun 21, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    25a8ba5 View commit details
Showing with 12 additions and 7 deletions.
  1. +12 −7 pkgs/data/misc/iana-etc/default.nix
19 changes: 12 additions & 7 deletions pkgs/data/misc/iana-etc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
{stdenv, fetchurl}:

stdenv.mkDerivation rec {
name = "iana-etc-2.30";
name = "iana-etc-${version}";
version = "20170512";

src = fetchurl {
url = "http://sethwklein.net/${name}.tar.bz2";
sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr";
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
sha256 = "0zx2ag894qldvrv8f4hs84644kdcp8a83gjg33xsw8rrn38gll2a";
};

preInstall = "installFlags=\"PREFIX=$out\"";
installPhase = ''
mkdir -p $out/etc
cp services protocols $out/etc/
'';

meta = {
homepage = http://sethwklein.net/iana-etc;
meta = with stdenv.lib; {
homepage = https://github.com/Mic92/iana-etc;
description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
platforms = stdenv.lib.platforms.unix;
platforms = platforms.unix;
license = licenses.mit;
};
}