pyrox.dev / nixpkgs
lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

rename iana_etc to iana-etc

fixes #23621

Jörg Thalheim 36fca932 50527dbd

+17 -16
+1 -1
doc/functions.xml
··· 529 529 <note> 530 530 <para> 531 531 If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal> 532 - you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>. 532 + you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>. 533 533 </para> 534 534 </note> 535 535
+2 -2
nixos/modules/config/networking.nix
··· 178 178 179 179 environment.etc = 180 180 { # /etc/services: TCP/UDP port assignments. 181 - "services".source = pkgs.iana_etc + "/etc/services"; 181 + "services".source = pkgs.iana-etc + "/etc/services"; 182 182 183 183 # /etc/protocols: IP protocol numbers. 184 - "protocols".source = pkgs.iana_etc + "/etc/protocols"; 184 + "protocols".source = pkgs.iana-etc + "/etc/protocols"; 185 185 186 186 # /etc/rpc: RPC program numbers. 187 187 "rpc".source = pkgs.glibc.out + "/etc/rpc";
+2 -2
pkgs/development/compilers/go/1.4.nix
··· 1 - { stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross 1 + { stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross 2 2 , pkgconfig 3 3 , pcre 4 4 , Security }: ··· 56 56 # ParseInLocation fails the test 57 57 sed -i '/TestParseInSydney/areturn' src/time/format_test.go 58 58 59 - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 59 + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go 60 60 '' + lib.optionalString stdenv.isLinux '' 61 61 sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go 62 62
+3 -3
pkgs/development/compilers/go/1.6.nix
··· 1 - { stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand 1 + { stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand 2 2 , perl, which, pkgconfig, patch, fetchpatch 3 3 , pcre 4 4 , Security, Foundation, bash }: ··· 75 75 # Remove the timezone naming test 76 76 sed -i '/TestLoadFixed/areturn' src/time/time_test.go 77 77 78 - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 79 - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go 78 + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go 79 + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go 80 80 '' + lib.optionalString stdenv.isLinux '' 81 81 sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go 82 82 '' + lib.optionalString stdenv.isDarwin ''
+3 -3
pkgs/development/compilers/go/1.7.nix
··· 1 - { stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin 1 + { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin 2 2 , perl, which, pkgconfig, patch, fetchpatch 3 3 , pcre, cacert 4 4 , Security, Foundation, bash }: ··· 69 69 # Remove the timezone naming test 70 70 sed -i '/TestLoadFixed/areturn' src/time/time_test.go 71 71 72 - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 73 - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go 72 + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go 73 + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go 74 74 75 75 # Disable cgo lookup tests not works, they depend on resolver 76 76 rm src/net/cgo_unix_test.go
+3 -3
pkgs/development/compilers/go/1.8.nix
··· 1 - { stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin 1 + { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin 2 2 , perl, which, pkgconfig, patch, fetchpatch 3 3 , pcre, cacert 4 4 , Security, Foundation, bash }: ··· 71 71 # Remove the timezone naming test 72 72 sed -i '/TestLoadFixed/areturn' src/time/time_test.go 73 73 74 - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 75 - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go 74 + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go 75 + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go 76 76 77 77 # Disable cgo lookup tests not works, they depend on resolver 78 78 rm src/net/cgo_unix_test.go
+1
pkgs/top-level/aliases.nix
··· 61 61 gupnptools = gupnp-tools; # added 2015-12-19 62 62 gnustep-make = gnustep.make; # added 2016-7-6 63 63 htmlTidy = html-tidy; # added 2014-12-06 64 + iana_etc = iana-etc; # added 2017-03-08 64 65 inherit (haskell.compiler) jhc uhc; # 2015-05-15 65 66 inotifyTools = inotify-tools; 66 67 joseki = apache-jena-fuseki; # added 2016-02-28
+1 -1
pkgs/top-level/all-packages.nix
··· 12564 12564 inherit (callPackages ../data/fonts/gdouros { }) 12565 12565 symbola aegyptus akkadian anatolian maya unidings musica analecta; 12566 12566 12567 - iana_etc = callPackage ../data/misc/iana-etc { }; 12567 + iana-etc = callPackage ../data/misc/iana-etc { }; 12568 12568 12569 12569 poppler_data = callPackage ../data/misc/poppler-data { }; 12570 12570
+1 -1
pkgs/top-level/release-small.nix
··· 68 68 hdparm = linux; 69 69 hello = all; 70 70 host = linux; 71 - iana_etc = linux; 71 + iana-etc = linux; 72 72 icewm = linux; 73 73 idutils = all; 74 74 inetutils = linux;