alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #24053 from Mic92/iana-etc

Browse source 
iana-etc: 2.30 -> 20170317
This commit is contained in:
Jörg Thalheim 2017-03-28 22:36:49 +02:00 committed by GitHub
parent c9ecc70880 36fca93290
commit f19547b7fe
10 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/functions.xml
View file

@ -529,7 +529,7 @@
<note>
<para>
If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal>
you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>.
you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
</para>
</note>

4
nixos/modules/config/networking.nix
View file

@ -178,10 +178,10 @@ in
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana_etc + "/etc/services";
"services".source = pkgs.iana-etc + "/etc/services";
# /etc/protocols: IP protocol numbers.
"protocols".source = pkgs.iana_etc + "/etc/protocols";
"protocols".source = pkgs.iana-etc + "/etc/protocols";
# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc.out + "/etc/rpc";

14
pkgs/data/misc/iana-etc/default.nix
View file

@ -1,17 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iana-etc-2.30";
name = "iana-etc-${version}";
version = "20170328";
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 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk";
};
preInstall = "installFlags=\"PREFIX=$out\"";
installPhase = ''
mkdir -p $out/etc
cp services protocols $out/etc/
'';
meta = {
homepage = http://sethwklein.net/iana-etc;
homepage = https://github.com/Mic92/iana-etc;
description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
platforms = stdenv.lib.platforms.unix;
};

4
pkgs/development/compilers/go/1.4.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
, pkgconfig
, pcre
, Security }:
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go

6
pkgs/development/compilers/go/1.6.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand
{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand
, perl, which, pkgconfig, patch, fetchpatch
, pcre
, Security, Foundation, bash }:
@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + lib.optionalString stdenv.isDarwin ''

6
pkgs/development/compilers/go/1.7.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, pcre, cacert
, Security, Foundation, bash }:
@ -69,8 +69,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go

6
pkgs/development/compilers/go/1.8.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, pcre, cacert
, Security, Foundation, bash }:
@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go

1
pkgs/top-level/aliases.nix
View file

@ -61,6 +61,7 @@ doNotDisplayTwice rec {
gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
inherit (haskell.compiler) jhc uhc; # 2015-05-15
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28

2
pkgs/top-level/all-packages.nix
View file

@ -12564,7 +12564,7 @@ with pkgs;
inherit (callPackages ../data/fonts/gdouros { })
symbola aegyptus akkadian anatolian maya unidings musica analecta;
iana_etc = callPackage ../data/misc/iana-etc { };
iana-etc = callPackage ../data/misc/iana-etc { };
poppler_data = callPackage ../data/misc/poppler-data { };

2
pkgs/top-level/release-small.nix
View file

@ -68,7 +68,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
hdparm = linux;
hello = all;
host = linux;
iana_etc = linux;
iana-etc = linux;
icewm = linux;
idutils = all;
inetutils = linux;