From c3df347f7baab0b8e94519950d9dd5085712be28 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 16 Jun 2016 19:33:12 +0200 Subject: [PATCH 001/168] gemconfig: rbnacl needs libsodium --- pkgs/development/ruby-modules/gem-config/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 95b5033cc9d..4d68584f865 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48 +, libmsgpack, qt48, libsodium }: let @@ -114,6 +114,14 @@ in buildInputs = [ openssl ]; }; + rbnacl = spec: { + postInstall = '' + sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \ + RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium.${if stdenv.isDarwin then "dylib" else "so"}' + " + ''; + }; + rmagick = attrs: { buildInputs = [ imagemagick pkgconfig which ]; }; From f6ac9fd246c99107807bac7e8db46cd24bcf3dc9 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 15 Aug 2016 16:46:12 +0200 Subject: [PATCH 002/168] transcribe: init at 8.40 --- .../applications/audio/transcribe/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/audio/transcribe/default.nix diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix new file mode 100644 index 00000000000..55e4b8e00b6 --- /dev/null +++ b/pkgs/applications/audio/transcribe/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf +, glib, gst_ffmpeg, gst_plugins_bad, gst_plugins_base +, gst_plugins_good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11 +, libpng12, pango, zlib }: + +stdenv.mkDerivation rec { + name = "transcribe-${version}"; + version = "8.40"; + + src = if stdenv.system == "i686-linux" then + fetchzip { + url = "https://www.seventhstring.com/xscribe/downlinux32_old/xscsetup.tar.gz"; + sha256 = "1ngidmj9zz8bmv754s5xfsjv7v6xr03vck4kigzq4bpc9b1fdhjq"; + } + else if stdenv.system == "x86_64-linux" then + fetchzip { + url = "https://www.seventhstring.com/xscribe/downlinux64_old/xsc64setup.tar.gz"; + sha256 = "0svzi8svj6zn06gj0hr8mpnhq4416dvb4g5al0gpb1g3paywdaf9"; + } + else throw "Platform not supported"; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ gst_plugins_base gst_plugins_good + gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; + + dontPatchELF = true; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc glib gtk2 atk pango cairo gdk_pixbuf alsaLib + libX11 libSM libpng12 gstreamer gst_plugins_base zlib + ]; + + installPhase = '' + mkdir -p $out/bin $out/libexec $out/share/doc + cp transcribe $out/libexec + cp xschelp.htb readme_gtk.html $out/share/doc + cp -r gtkicons $out/share/icons + + ln -s $out/share/doc/xschelp.htb $out/libexec + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + $out/libexec/transcribe + + wrapProgram $out/libexec/transcribe \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix LD_LIBRARY_PATH : "${libPath}" + + ln -s $out/libexec/transcribe $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Software to help transcribe recorded music"; + longDescription = '' + The Transcribe! application is an assistant for people who want + to work out a piece of music from a recording, in order to write + it out, or play it themselves, or both. It doesn't do the + transcribing for you, but it is essentially a specialised player + program which is optimised for the purpose of transcription. It + has many transcription-specific features not found on + conventional music players. + ''; + homepage = https://www.seventhstring.com/xscribe/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 857681504b4..4e391c184b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14898,6 +14898,8 @@ in transcode = callPackage ../applications/audio/transcode { }; + transcribe = callPackage ../applications/audio/transcribe { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_gtk = transmission.override { enableGTK3 = true; }; From 95aa1eaa98e6bd2083d781295f194dcc91fd79bb Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Mon, 22 Aug 2016 20:09:15 +0200 Subject: [PATCH 003/168] cassandra-driver: 2.6.0c2 -> 3.6.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac7a4cc7bc5..aad57f4a808 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3201,11 +3201,11 @@ in modules // { }; cassandra-driver = buildPythonPackage rec { - name = "cassandra-driver-2.6.0c2"; + name = "cassandra-driver-3.6.0"; src = pkgs.fetchurl { url = "mirror://pypi/c/cassandra-driver/${name}.tar.gz"; - sha256 = "00cc2rkvkxaxn7sf2qzy29s6h394fla73rbdh9krxbswp5nvp27r"; + sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704"; }; propagatedBuildInputs = with self; [ From 54d3556e7aaa36f68cbeb9c9ea40edafda42c823 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 24 Aug 2016 14:45:08 +0200 Subject: [PATCH 004/168] etcd: 2.3.7 -> 3.0.6 --- pkgs/servers/etcd/default.nix | 6 +- pkgs/servers/etcd/deps.json | 351 ++++++++++++++++++++++++++++++++-- 2 files changed, 336 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 2c76dfc8e31..57eb877cd79 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "etcd-${version}"; - version = "2.3.7"; + version = "3.0.6"; rev = "v${version}"; - + goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "07rdnhcpnvnkxj5pqacxz669rzn5vw2i1zmf6dd4nv7wpfscdw9f"; + sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; }; goDeps = ./deps.json; diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json index 310f51963f2..6ba22a78b7c 100644 --- a/pkgs/servers/etcd/deps.json +++ b/pkgs/servers/etcd/deps.json @@ -1,20 +1,335 @@ [ - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } + { + "goPackagePath": "github.com/beorn7/perks", + "fetch": { + "type": "git", + "url": "https://github.com/beorn7/perks", + "rev": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", + "sha256": "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y" } -] + }, + { + "goPackagePath": "github.com/boltdb/bolt", + "fetch": { + "type": "git", + "url": "https://github.com/boltdb/bolt", + "rev": "583e8937c61f1af6513608ccc75c97b6abdf4ff9", + "sha256": "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay" + } + }, + { + "goPackagePath": "github.com/cloudfoundry-incubator/candiedyaml", + "fetch": { + "type": "git", + "url": "https://github.com/cloudfoundry-incubator/candiedyaml", + "rev": "99c3df83b51532e3615f851d8c2dbb638f5313bf", + "sha256": "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs" + } + }, + { + "goPackagePath": "github.com/cockroachdb/cmux", + "fetch": { + "type": "git", + "url": "https://github.com/cockroachdb/cmux", + "rev": "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d", + "sha256": "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh" + } + }, + { + "goPackagePath": "github.com/coreos/etcd", + "fetch": { + "type": "git", + "url": "https://github.com/coreos/etcd.git", + "rev": "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0", + "sha256": "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75" + } + }, + { + "goPackagePath": "github.com/coreos/go-semver", + "fetch": { + "type": "git", + "url": "https://github.com/coreos/go-semver", + "rev": "8ab6407b697782a06568d4b7f1db25550ec2e4c6", + "sha256": "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0" + } + }, + { + "goPackagePath": "github.com/coreos/go-systemd", + "fetch": { + "type": "git", + "url": "https://github.com/coreos/go-systemd", + "rev": "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2", + "sha256": "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk" + } + }, + { + "goPackagePath": "github.com/coreos/pkg", + "fetch": { + "type": "git", + "url": "https://github.com/coreos/pkg", + "rev": "3ac0863d7acf3bc44daf49afef8919af12f704ef", + "sha256": "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l" + } + }, + { + "goPackagePath": "github.com/ghodss/yaml", + "fetch": { + "type": "git", + "url": "https://github.com/ghodss/yaml", + "rev": "aa0c862057666179de291b67d9f093d12b5a8473", + "sha256": "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr" + } + }, + { + "goPackagePath": "github.com/gogo/protobuf", + "fetch": { + "type": "git", + "url": "https://github.com/gogo/protobuf", + "rev": "f20a1444730c7d9949b880a0309e737d007def25", + "sha256": "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c" + } + }, + { + "goPackagePath": "github.com/golang/protobuf", + "fetch": { + "type": "git", + "url": "https://github.com/golang/protobuf", + "rev": "f592bd283e9ef86337a432eb50e592278c3d534d", + "sha256": "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb" + } + }, + { + "goPackagePath": "github.com/google/btree", + "fetch": { + "type": "git", + "url": "https://github.com/google/btree", + "rev": "7d79101e329e5a3adf994758c578dab82b90c017", + "sha256": "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0" + } + }, + { + "goPackagePath": "github.com/grpc-ecosystem/grpc-gateway", + "fetch": { + "type": "git", + "url": "https://github.com/grpc-ecosystem/grpc-gateway", + "rev": "5e0e028ba0a015710eaebf6e47af18812c9f2767", + "sha256": "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk" + } + }, + { + "goPackagePath": "github.com/jonboulle/clockwork", + "fetch": { + "type": "git", + "url": "https://github.com/jonboulle/clockwork", + "rev": "e3653ace2d63753697e0e5b07b9393971c0bba9d", + "sha256": "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc" + } + }, + { + "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", + "fetch": { + "type": "git", + "url": "https://github.com/matttproud/golang_protobuf_extensions", + "rev": "c12348ce28de40eed0136aa2b644d0ee0650e56c", + "sha256": "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya" + } + }, + { + "goPackagePath": "github.com/prometheus/client_golang", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/client_golang", + "rev": "c5b7fccd204277076155f10851dad72b76a49317", + "sha256": "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd" + } + }, + { + "goPackagePath": "github.com/prometheus/client_model", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/client_model", + "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", + "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" + } + }, + { + "goPackagePath": "github.com/prometheus/common", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/common", + "rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8", + "sha256": "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq" + } + }, + { + "goPackagePath": "github.com/prometheus/procfs", + "fetch": { + "type": "git", + "url": "https://github.com/prometheus/procfs", + "rev": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5", + "sha256": "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws" + } + }, + { + "goPackagePath": "github.com/spf13/cobra", + "fetch": { + "type": "git", + "url": "https://github.com/spf13/cobra", + "rev": "7c674d9e72017ed25f6d2b5e497a1368086b6a6f", + "sha256": "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr" + } + }, + { + "goPackagePath": "github.com/spf13/pflag", + "fetch": { + "type": "git", + "url": "https://github.com/spf13/pflag", + "rev": "6454a84b6da0ea8b628d5d8a26759f62c6c161b4", + "sha256": "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna" + } + }, + { + "goPackagePath": "github.com/ugorji/go", + "fetch": { + "type": "git", + "url": "https://github.com/ugorji/go", + "rev": "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2", + "sha256": "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx" + } + }, + { + "goPackagePath": "github.com/xiang90/probing", + "fetch": { + "type": "git", + "url": "https://github.com/xiang90/probing", + "rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2", + "sha256": "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/crypto", + "rev": "88d0005bf4c3ec17306ecaca4281a8d8efd73e91", + "sha256": "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz" + } + }, + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/net", + "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", + "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" + } + }, + { + "goPackagePath": "google.golang.org/grpc", + "fetch": { + "type": "git", + "url": "https://github.com/grpc/grpc-go", + "rev": "0032a855ba5c8a3c8e0d71c2deef354b70af1584", + "sha256": "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67" + } + }, + { + "goPackagePath": "github.com/urfave/cli", + "fetch": { + "type": "git", + "url": "https://github.com/urfave/cli", + "rev": "168c95418e66e019fe17b8f4f5c45aa62ff80e23", + "sha256": "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n" + } + }, + { + "goPackagePath": "github.com/mattn/go-runewidth", + "fetch": { + "type": "git", + "url": "https://github.com/mattn/go-runewidth", + "rev": "d6bea18f789704b5f83375793155289da36a3c7f", + "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" + } + }, + { + "goPackagePath": "github.com/olekukonko/tablewriter", + "fetch": { + "type": "git", + "url": "https://github.com/olekukonko/tablewriter", + "rev": "daf2955e742cf123959884fdff4685aa79b63135", + "sha256": "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203" + } + }, + { + "goPackagePath": "github.com/dustin/go-humanize", + "fetch": { + "type": "git", + "url": "https://github.com/dustin/go-humanize", + "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", + "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" + } + }, + { + "goPackagePath": "github.com/bgentry/speakeasy", + "fetch": { + "type": "git", + "url": "https://github.com/bgentry/speakeasy", + "rev": "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da", + "sha256": "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01" + } + }, + { + "goPackagePath": "github.com/kr/pty", + "fetch": { + "type": "git", + "url": "https://github.com/kr/pty", + "rev": "ce7fa45920dc37a92de8377972e52bc55ffa8d57", + "sha256": "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk" + } + }, + { + "goPackagePath": "github.com/golang/groupcache", + "fetch": { + "type": "git", + "url": "https://github.com/golang/groupcache", + "rev": "a6b377e3400b08991b80d6805d627f347f983866", + "sha256": "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2" + } + }, + { + "goPackagePath": "gopkg.in/cheggaaa/pb.v1", + "fetch": { + "type": "git", + "url": "https://gopkg.in/cheggaaa/pb.v1", + "rev": "9453b2db37f4d8bc63751daca63bbe7049eb5e74", + "sha256": "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb" + } + }, + { + "goPackagePath": "github.com/golang/glog", + "fetch": { + "type": "git", + "url": "https://github.com/golang/glog", + "rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998", + "sha256": "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30" + } + }, + { + "goPackagePath": "github.com/spacejam/loghisto", + "fetch": { + "type": "git", + "url": "https://github.com/spacejam/loghisto", + "rev": "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7", + "sha256": "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1" + } + }, + { + "goPackagePath": "github.com/akrennmair/gopcap", + "fetch": { + "type": "git", + "url": "https://github.com/akrennmair/gopcap", + "rev": "00e11033259acb75598ba416495bb708d864a010", + "sha256": "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a" + } + } +] \ No newline at end of file From 8256c07fc03625ea37ff2ebb29217c50e2ed6163 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 24 Aug 2016 20:11:39 +0200 Subject: [PATCH 005/168] etcd module: add support for ssl, better defaults, fix tests --- nixos/modules/services/misc/etcd.nix | 65 ++++++++- nixos/tests/etcd.nix | 199 +++++++++++++++------------ 2 files changed, 168 insertions(+), 96 deletions(-) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 0d6ed8eb904..8a12e183aa3 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -28,13 +28,13 @@ in { listenClientUrls = mkOption { description = "Etcd list of URLs to listen on for client traffic."; - default = ["http://localhost:4001"]; + default = ["http://localhost:2379"]; type = types.listOf types.str; }; listenPeerUrls = mkOption { description = "Etcd list of URLs to listen on for peer traffic."; - default = ["http://localhost:7001"]; + default = ["http://localhost:2380"]; type = types.listOf types.str; }; @@ -46,7 +46,7 @@ in { initialCluster = mkOption { description = "Etcd initial cluster configuration for bootstrapping."; - default = ["${cfg.name}=http://localhost:7001"]; + default = ["${cfg.name}=http://127.0.0.1:2380"]; type = types.listOf types.str; }; @@ -68,6 +68,54 @@ in { type = types.str; }; + clientCertAuth = mkOption { + description = "Whether to use certs for client authentication"; + default = false; + type = types.bool; + }; + + trustedCaFile = mkOption { + description = "Certificate authority file to use for clients"; + default = null; + type = types.nullOr types.path; + }; + + certFile = mkOption { + description = "Cert file to use for clients"; + default = null; + type = types.nullOr types.path; + }; + + keyFile = mkOption { + description = "Key file to use for clients"; + default = null; + type = types.nullOr types.path; + }; + + peerCertFile = mkOption { + description = "Cert file to use for peer to peer communication"; + default = cfg.certFile; + type = types.nullOr types.path; + }; + + peerKeyFile = mkOption { + description = "Key file to use for peer to peer communication"; + default = cfg.keyFile; + type = types.nullOr types.path; + }; + + peerTrustedCaFile = mkOption { + description = "Certificate authority file to use for peer to peer communication"; + default = cfg.trustedCaFile; + type = types.nullOr types.path; + }; + + peerClientCertAuth = mkOption { + description = "Whether to check all incoming peer requests from the cluster for valid client certificates signed by the supplied CA"; + default = false; + type = types.bool; + }; + extraConf = mkOption { description = '' Etcd extra configuration. See @@ -99,7 +147,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; - environment = { + environment = (filterAttrs (n: v: v != null) { ETCD_NAME = cfg.name; ETCD_DISCOVERY = cfg.discovery; ETCD_DATA_DIR = cfg.dataDir; @@ -107,7 +155,14 @@ in { ETCD_LISTEN_CLIENT_URLS = concatStringsSep "," cfg.listenClientUrls; ETCD_LISTEN_PEER_URLS = concatStringsSep "," cfg.listenPeerUrls; ETCD_INITIAL_ADVERTISE_PEER_URLS = concatStringsSep "," cfg.initialAdvertisePeerUrls; - } // (optionalAttrs (cfg.discovery == ""){ + ETCD_PEER_TRUSTED_CA_FILE = cfg.peerTrustedCaFile; + ETCD_PEER_CERT_FILE = cfg.peerCertFile; + ETCD_PEER_KEY_FILE = cfg.peerKeyFile; + ETCD_CLIENT_CERT_AUTH = toString cfg.peerClientCertAuth; + ETCD_TRUSTED_CA_FILE = cfg.trustedCaFile; + ETCD_CERT_FILE = cfg.certFile; + ETCD_KEY_FILE = cfg.keyFile; + }) // (optionalAttrs (cfg.discovery == ""){ ETCD_INITIAL_CLUSTER = concatStringsSep "," cfg.initialCluster; ETCD_INITIAL_CLUSTER_STATE = cfg.initialClusterState; ETCD_INITIAL_CLUSTER_TOKEN = cfg.initialClusterToken; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index bac4ec6a918..4eca6558dde 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -1,111 +1,128 @@ -# This test runs etcd as single node, multy node and using discovery +# This test runs simple etcd cluster -import ./make-test.nix ({ pkgs, ... } : { +import ./make-test.nix ({ pkgs, ... } : let + certs = pkgs.runCommand "certs" { + buildInputs = [pkgs.openssl]; + } '' + mkdir -p $out + openssl genrsa -out $out/ca-key.pem 2048 + openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca" + + cat << EOF > openssl.cnf + ions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = serverAuth + subjectAltName = @alt_names + [alt_names] + DNS.1 = node1 + DNS.2 = node2 + DNS.3 = node3 + IP.1 = 127.0.0.1 + EOF + + openssl genrsa -out $out/etcd-key.pem 2048 + openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf + openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf + + cat << EOF > client-openssl.cnf + ions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = clientAuth + EOF + + openssl genrsa -out $out/etcd-client-key.pem 2048 + openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf + openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf + ''; + + nodeConfig = { + services = { + etcd = { + enable = true; + keyFile = "${certs}/etcd-key.pem"; + certFile = "${certs}/etcd.pem"; + trustedCaFile = "${certs}/ca.pem"; + peerClientCertAuth = true; + listenClientUrls = ["https://127.0.0.1:2379"]; + listenPeerUrls = ["https://0.0.0.0:2380"]; + }; + }; + + environment.variables = { + ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem"; + ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem"; + ETCDCTL_CA_FILE = "${certs}/ca.pem"; + ETCDCTL_PEERS = "https://127.0.0.1:2379"; + }; + + networking.firewall.allowedTCPPorts = [ 2380 ]; + }; +in { name = "etcd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ offline ]; }; nodes = { - simple = - { config, pkgs, nodes, ... }: - { - services.etcd.enable = true; - services.etcd.listenClientUrls = ["http://0.0.0.0:4001"]; - environment.systemPackages = [ pkgs.curl ]; - networking.firewall.allowedTCPPorts = [ 4001 ]; - }; - - - node1 = - { config, pkgs, nodes, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node1:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - node2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node2:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - discovery1 = - { config, pkgs, nodes, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://discovery1:7001"]; - discovery = "http://simple:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/"; - }; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - discovery2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://discovery2:7001"]; - discovery = "http://simple:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/"; - }; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; + node1 = { config, pkgs, nodes, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; + initialAdvertisePeerUrls = ["https://node1:2380"]; + }; }; + node2 = { config, pkgs, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; + initialAdvertisePeerUrls = ["https://node2:2380"]; + }; + }; + + node3 = { config, pkgs, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; + initialAdvertisePeerUrls = ["https://node3:2380"]; + initialClusterState = "existing"; + }; + }; + }; + testScript = '' - subtest "single node", sub { - $simple->start(); - $simple->waitForUnit("etcd.service"); - $simple->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'"); - $simple->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); - }; - - subtest "multy node", sub { + subtest "should start etcd cluster", sub { $node1->start(); $node2->start(); $node1->waitForUnit("etcd.service"); $node2->waitForUnit("etcd.service"); - $node1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'"); - $node2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); - $node1->shutdown(); - $node2->shutdown(); + $node2->waitUntilSucceeds("etcdctl cluster-health"); + $node1->succeed("etcdctl set /foo/bar 'Hello world'"); + $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); }; - subtest "discovery", sub { - $simple->succeed("curl -X PUT http://localhost:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/_config/size -d value=2"); + subtest "should add another member", sub { + $node1->succeed("etcdctl member add node3 https://node3:2380"); + $node3->start(); + $node3->waitForUnit("etcd.service"); + $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); + $node3->succeed("etcdctl cluster-health"); + }; - $discovery1->start(); - $discovery2->start(); - $discovery1->waitForUnit("etcd.service"); - $discovery2->waitForUnit("etcd.service"); - $discovery1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'"); - $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); + subtest "should survive member crash", sub { + $node3->crash; + $node1->succeed("etcdctl cluster-health"); + $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'"); + $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'"); }; ''; }) From 0630233afa6440473f0c04825f252c508e8c534b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 25 Aug 2016 14:41:47 +0200 Subject: [PATCH 006/168] etcd module: add test for simple one node etcd service --- nixos/modules/services/misc/etcd.nix | 4 +- nixos/tests/etcd-cluster.nix | 128 +++++++++++++++++++++++++++ nixos/tests/etcd.nix | 123 +++---------------------- 3 files changed, 141 insertions(+), 114 deletions(-) create mode 100644 nixos/tests/etcd-cluster.nix diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 8a12e183aa3..d30cc5fd7e8 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -28,13 +28,13 @@ in { listenClientUrls = mkOption { description = "Etcd list of URLs to listen on for client traffic."; - default = ["http://localhost:2379"]; + default = ["http://127.0.0.1:2379"]; type = types.listOf types.str; }; listenPeerUrls = mkOption { description = "Etcd list of URLs to listen on for peer traffic."; - default = ["http://localhost:2380"]; + default = ["http://127.0.0.1:2380"]; type = types.listOf types.str; }; diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix new file mode 100644 index 00000000000..4eca6558dde --- /dev/null +++ b/nixos/tests/etcd-cluster.nix @@ -0,0 +1,128 @@ +# This test runs simple etcd cluster + +import ./make-test.nix ({ pkgs, ... } : let + certs = pkgs.runCommand "certs" { + buildInputs = [pkgs.openssl]; + } '' + mkdir -p $out + openssl genrsa -out $out/ca-key.pem 2048 + openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca" + + cat << EOF > openssl.cnf + ions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = serverAuth + subjectAltName = @alt_names + [alt_names] + DNS.1 = node1 + DNS.2 = node2 + DNS.3 = node3 + IP.1 = 127.0.0.1 + EOF + + openssl genrsa -out $out/etcd-key.pem 2048 + openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf + openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf + + cat << EOF > client-openssl.cnf + ions = v3_req + distinguished_name = req_distinguished_name + [req_distinguished_name] + [ v3_req ] + basicConstraints = CA:FALSE + keyUsage = digitalSignature, keyEncipherment + extendedKeyUsage = clientAuth + EOF + + openssl genrsa -out $out/etcd-client-key.pem 2048 + openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf + openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf + ''; + + nodeConfig = { + services = { + etcd = { + enable = true; + keyFile = "${certs}/etcd-key.pem"; + certFile = "${certs}/etcd.pem"; + trustedCaFile = "${certs}/ca.pem"; + peerClientCertAuth = true; + listenClientUrls = ["https://127.0.0.1:2379"]; + listenPeerUrls = ["https://0.0.0.0:2380"]; + }; + }; + + environment.variables = { + ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem"; + ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem"; + ETCDCTL_CA_FILE = "${certs}/ca.pem"; + ETCDCTL_PEERS = "https://127.0.0.1:2379"; + }; + + networking.firewall.allowedTCPPorts = [ 2380 ]; + }; +in { + name = "etcd"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; + + nodes = { + node1 = { config, pkgs, nodes, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; + initialAdvertisePeerUrls = ["https://node1:2380"]; + }; + }; + + node2 = { config, pkgs, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; + initialAdvertisePeerUrls = ["https://node2:2380"]; + }; + }; + + node3 = { config, pkgs, ... }: { + require = [nodeConfig]; + services.etcd = { + initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; + initialAdvertisePeerUrls = ["https://node3:2380"]; + initialClusterState = "existing"; + }; + }; + }; + + testScript = '' + subtest "should start etcd cluster", sub { + $node1->start(); + $node2->start(); + $node1->waitForUnit("etcd.service"); + $node2->waitForUnit("etcd.service"); + $node2->waitUntilSucceeds("etcdctl cluster-health"); + $node1->succeed("etcdctl set /foo/bar 'Hello world'"); + $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + }; + + subtest "should add another member", sub { + $node1->succeed("etcdctl member add node3 https://node3:2380"); + $node3->start(); + $node3->waitForUnit("etcd.service"); + $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); + $node3->succeed("etcdctl cluster-health"); + }; + + subtest "should survive member crash", sub { + $node3->crash; + $node1->succeed("etcdctl cluster-health"); + $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'"); + $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'"); + }; + ''; +}) diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index 4eca6558dde..f8a6791a834 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -1,71 +1,6 @@ -# This test runs simple etcd cluster +# This test runs simple etcd node -import ./make-test.nix ({ pkgs, ... } : let - certs = pkgs.runCommand "certs" { - buildInputs = [pkgs.openssl]; - } '' - mkdir -p $out - openssl genrsa -out $out/ca-key.pem 2048 - openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca" - - cat << EOF > openssl.cnf - ions = v3_req - distinguished_name = req_distinguished_name - [req_distinguished_name] - [ v3_req ] - basicConstraints = CA:FALSE - keyUsage = digitalSignature, keyEncipherment - extendedKeyUsage = serverAuth - subjectAltName = @alt_names - [alt_names] - DNS.1 = node1 - DNS.2 = node2 - DNS.3 = node3 - IP.1 = 127.0.0.1 - EOF - - openssl genrsa -out $out/etcd-key.pem 2048 - openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf - openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf - - cat << EOF > client-openssl.cnf - ions = v3_req - distinguished_name = req_distinguished_name - [req_distinguished_name] - [ v3_req ] - basicConstraints = CA:FALSE - keyUsage = digitalSignature, keyEncipherment - extendedKeyUsage = clientAuth - EOF - - openssl genrsa -out $out/etcd-client-key.pem 2048 - openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf - openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf - ''; - - nodeConfig = { - services = { - etcd = { - enable = true; - keyFile = "${certs}/etcd-key.pem"; - certFile = "${certs}/etcd.pem"; - trustedCaFile = "${certs}/ca.pem"; - peerClientCertAuth = true; - listenClientUrls = ["https://127.0.0.1:2379"]; - listenPeerUrls = ["https://0.0.0.0:2380"]; - }; - }; - - environment.variables = { - ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem"; - ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem"; - ETCDCTL_CA_FILE = "${certs}/ca.pem"; - ETCDCTL_PEERS = "https://127.0.0.1:2379"; - }; - - networking.firewall.allowedTCPPorts = [ 2380 ]; - }; -in { +import ./make-test.nix ({ pkgs, ... } : { name = "etcd"; meta = with pkgs.stdenv.lib.maintainers; { @@ -73,56 +8,20 @@ in { }; nodes = { - node1 = { config, pkgs, nodes, ... }: { - require = [nodeConfig]; - services.etcd = { - initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; - initialAdvertisePeerUrls = ["https://node1:2380"]; - }; - }; - - node2 = { config, pkgs, ... }: { - require = [nodeConfig]; - services.etcd = { - initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; - initialAdvertisePeerUrls = ["https://node2:2380"]; - }; - }; - - node3 = { config, pkgs, ... }: { - require = [nodeConfig]; - services.etcd = { - initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; - initialAdvertisePeerUrls = ["https://node3:2380"]; - initialClusterState = "existing"; - }; + node = { config, pkgs, nodes, ... }: { + services.etcd.enable = true; }; }; testScript = '' - subtest "should start etcd cluster", sub { - $node1->start(); - $node2->start(); - $node1->waitForUnit("etcd.service"); - $node2->waitForUnit("etcd.service"); - $node2->waitUntilSucceeds("etcdctl cluster-health"); - $node1->succeed("etcdctl set /foo/bar 'Hello world'"); - $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + subtest "should start etcd node", sub { + $node->start(); + $node->waitForUnit("etcd.service"); }; - subtest "should add another member", sub { - $node1->succeed("etcdctl member add node3 https://node3:2380"); - $node3->start(); - $node3->waitForUnit("etcd.service"); - $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); - $node3->succeed("etcdctl cluster-health"); - }; - - subtest "should survive member crash", sub { - $node3->crash; - $node1->succeed("etcdctl cluster-health"); - $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'"); - $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'"); - }; + subtest "should write and read some values to etcd", sub { + $node->succeed("etcdctl set /foo/bar 'Hello world'"); + $node->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + } ''; }) From 200fa329118facdabb7e753f2f87613db8acd649 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 17 Aug 2016 21:38:41 +0200 Subject: [PATCH 007/168] ethabi: init at 0.2.1 --- pkgs/applications/altcoins/default.nix | 2 ++ pkgs/applications/altcoins/ethabi.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 27 insertions(+) create mode 100644 pkgs/applications/altcoins/ethabi.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 8e25f01c1bd..0d2e656bae2 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -27,6 +27,8 @@ rec { namecoin = callPackage ./namecoin.nix { inherit namecoind; }; namecoind = callPackage ./namecoind.nix { }; + ethabi = callPackage ./ethabi.nix { }; + primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix new file mode 100644 index 00000000000..b92a656c083 --- /dev/null +++ b/pkgs/applications/altcoins/ethabi.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "ethabi-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ethcore"; + repo = "ethabi"; + rev = "fbed04984cab0db8767e01054ee16271b8e36281"; + sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd"; + }; + + depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52"; + + meta = { + description = "Ethereum function call encoding (ABI) utility"; + homepage = https://github.com/ethcore/ethabi/; + maintainers = [stdenv.lib.maintainers.dbrock]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0645d749c6..3fa562df706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12377,6 +12377,7 @@ in bitcoin-xt = self.altcoins.bitcoin-xt; go-ethereum = self.altcoins.go-ethereum; + ethabi = self.altcoins.ethabi; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; From e734326c7ce817c0302df75746dadf3684a9c773 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Sun, 28 Aug 2016 23:46:49 +0200 Subject: [PATCH 008/168] airwave: init at 1.3.2 --- pkgs/applications/audio/airwave/default.nix | 88 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/applications/audio/airwave/default.nix diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix new file mode 100644 index 00000000000..74f0ed53705 --- /dev/null +++ b/pkgs/applications/audio/airwave/default.nix @@ -0,0 +1,88 @@ +{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper +, overrideCC, qt5, requireFile, unzip, wineStable +}: + +let + + version = "1.3.2"; + + airwave-src = fetchFromGitHub { + owner = "phantom-code"; + repo = "airwave"; + rev = version; + sha256 = "053kkx5yq1vas0qisidkgq0h6hzfwy3677jprjkcrwc4hp2i2v12"; + }; + + stdenv_multi = overrideCC stdenv gcc_multi; + + vst-sdk = stdenv.mkDerivation rec { + name = "vstsdk366_27_06_2016_build_61"; + src = requireFile { + name = "${name}.zip"; + url = "http://www.steinberg.net/en/company/developers.html"; + sha256 = "05gsr13bpi2hhp34rvhllsvmn44rqvmjdpg9fsgfzgylfkz0kiki"; + }; + nativeBuildInputs = [ unzip ]; + installPhase = "cp -r . $out"; + }; + + wine-wow64 = wineStable.override { + wineBuild = "wineWow"; + }; + + wine-xembed = wine-wow64.overrideDerivation (oldAttrs: { + patchFlags = [ "-p2" ]; + patches = [ "${airwave-src}/fix-xembed-wine-windows.patch" ]; + }); + +in + +stdenv_multi.mkDerivation { + name = "airwave-${version}"; + + src = airwave-src; + + nativeBuildInputs = [ cmake makeWrapper ]; + + buildInputs = [ file libX11 qt5.qtbase wine-xembed ]; + + postPatch = '' + # Binaries not used directly should land in libexec/. + substituteInPlace src/common/storage.cpp --replace '"/bin"' '"/libexec"' + + # For airwave-host-32.exe.so, point wineg++ to 32-bit versions of + # these libraries, as $NIX_LDFLAGS contains only 64-bit ones. + substituteInPlace src/host/CMakeLists.txt --replace '-m32' \ + '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32' + ''; + + # libstdc++.so link gets lost in 64-bit executables during + # shrinking. + dontPatchELF = true; + + cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}"; + + postInstall = '' + mv $out/bin $out/libexec + mkdir $out/bin + mv $out/libexec/airwave-manager $out/bin + wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${wine-xembed}/bin/wine + wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64 + ''; + + meta = with stdenv.lib; { + description = "WINE-based VST bridge for Linux VST hosts"; + longDescription = '' + Airwave is a wine based VST bridge, that allows for the use of + Windows 32- and 64-bit VST 2.4 audio plugins with Linux VST + hosts. Due to the use of shared memory, only one extra copying + is made for each data transfer. Airwave also uses the XEMBED + protocol to correctly embed the plugin editor into the host + window. + ''; + homepage = https://github.com/phantom-code/airwave; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c68b35a56f..c490c4cb3ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12261,6 +12261,8 @@ in ahoviewer = callPackage ../applications/graphics/ahoviewer { }; + airwave = callPackage ../applications/audio/airwave/default.nix { }; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; From 6eaad23263b68c26b393dca77f364ac36f54a55c Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 29 Aug 2016 17:17:16 +0900 Subject: [PATCH 009/168] groonga: 6.0.7 -> 6.0.8 --- pkgs/servers/search/groonga/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e1e6dacfe98..7025ddbc12b 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.0.7"; + version = "6.0.8"; src = fetchurl { - url = "http://packages.groonga.org/source/groonga/groonga-6.0.7.tar.gz"; - sha256 = "19vpjjq3mqaqy9idlmqg2agrz9dc48a9id8j7nx158pkwjvpj7jf"; + url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; + sha256 = "05mp6zkavxj87nbx0jr48rpjjcf7fzdczxa93sxp4zq2dsnn5s5r"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ From 2ed6529444c6048f5a6d70399046842e0112d75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Aug 2016 15:18:25 +0200 Subject: [PATCH 010/168] ferm: add integration test --- nixos/release.nix | 1 + nixos/tests/ferm.nix | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 nixos/tests/ferm.nix diff --git a/nixos/release.nix b/nixos/release.nix index 70a7ba5af89..0425048872b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -234,6 +234,7 @@ in rec { tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; + tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix new file mode 100644 index 00000000000..c0271269ca0 --- /dev/null +++ b/nixos/tests/ferm.nix @@ -0,0 +1,71 @@ + +import ./make-test.nix ({ pkgs, ...} : { + name = "ferm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + nodes = + { client = + { config, pkgs, ... }: + with pkgs.lib; + { + networking = { + interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ]; + interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; + }; + }; + server = + { config, pkgs, ... }: + with pkgs.lib; + { + networking = { + interfaces.eth1.ip6 = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; + interfaces.eth1.ip4 = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; + }; + + services = { + ferm.enable = true; + ferm.config = '' + domain (ip ip6) table filter chain INPUT { + interface lo ACCEPT; + proto tcp dport 8080 REJECT reject-with tcp-reset; + } + ''; + nginx.enable = true; + nginx.httpConfig = '' + server { + listen 80; + listen [::]:80; + listen 8080; + listen [::]:8080; + + location /status { stub_status on; } + } + ''; + }; + }; + }; + + testScript = + '' + startAll; + + $client->waitForUnit("network.target"); + $server->waitForUnit("ferm.service"); + $server->waitForUnit("nginx.service"); + + subtest "port 80 is allowed", sub { + $client->succeed("curl --fail -g http://192.168.1.1:80/status"); + $client->succeed("curl --fail -g http://[fd00::1]:80/status"); + }; + + subtest "port 8080 is not allowed", sub { + $server->succeed("curl --fail -g http://192.168.1.1:8080/status"); + $server->succeed("curl --fail -g http://[fd00::1]:8080/status"); + + $client->fail("curl --fail -g http://192.168.1.1:8080/status"); + $client->fail("curl --fail -g http://[fd00::1]:8080/status"); + }; + ''; +}) From 32ee88e2d1eadfd7d9b5a5fa76517fd9008ed174 Mon Sep 17 00:00:00 2001 From: Balletie Date: Mon, 29 Aug 2016 20:33:10 +0200 Subject: [PATCH 011/168] twmn: fix by running pre- and post-install hooks This package had the same issue as described in issue #15744. The custom installPhase doesn't call pre- and post-install hooks like it should. The solution is also similar (see commit a1facf3). --- pkgs/applications/misc/twmn/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 06ae708db2b..c38b97b0e98 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -16,8 +16,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp bin/* "$out/bin" + + runHook postInstall ''; meta = { From e170f3a4f796ad79f607c024b1ccafa9e486b262 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 29 Aug 2016 22:49:56 +0200 Subject: [PATCH 012/168] idea.phpstorm: 10.0.4 -> 2016.2.1 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 06573f22a1a..ba987b059e9 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -228,12 +228,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "10.0.4"; + version = "2016.2.1"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; + sha256 = "0vgr0ds6z0y8qw2v55nr3pi5zb5x0n6pxm13hcp44iradns5kmbp"; }; wmClass = "jetbrains-phpstorm"; }; From 5af8e4b0017a297d5c34c2f305e7b8023cc7ce90 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 31 Aug 2016 03:02:53 +0900 Subject: [PATCH 013/168] rainbowstream: 1.3.3 -> 1.3.5 --- .../python-modules/rainbowstream/setup.patch | 24 +++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +++++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/rainbowstream/setup.patch diff --git a/pkgs/development/python-modules/rainbowstream/setup.patch b/pkgs/development/python-modules/rainbowstream/setup.patch new file mode 100644 index 00000000000..55afa49a96e --- /dev/null +++ b/pkgs/development/python-modules/rainbowstream/setup.patch @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 07b5913..2b7b15e 100644 +--- a/setup.py ++++ b/setup.py +@@ -24,15 +24,16 @@ install_requires = [ + ] + + # Default user (considers non virtualenv method) +-user = os.environ.get('SUDO_USER', os.environ['USER']) ++user = os.environ.get('SUDO_USER', os.environ.get('USER', None)) + + # Copy default config if not exists + default = os.path.expanduser("~") + os.sep + '.rainbow_config.json' + if not os.path.isfile(default): + cmd = 'cp rainbowstream/colorset/config ' + default + os.system(cmd) +- cmd = 'chown ' + quote(user) + ' ' + default +- os.system(cmd) ++ if user: ++ cmd = 'chown ' + quote(user) + ' ' + default ++ os.system(cmd) + cmd = 'chmod 777 ' + default + os.system(cmd) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1646b65fa96..3acc996b038 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13207,17 +13207,18 @@ in modules // { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.3"; + version = "1.3.5"; src = pkgs.fetchurl { url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; - sha256 = "08598slbn8sm2hjs0q1041fv7m56k2ky4q66rsihacjw0mg7blai"; + sha256 = "0a8bs9g81ns47d4vaj5pfgw9zwbcp0nivlm5rps4dlb6qwvzni1w"; }; doCheck = false; patches = [ ../development/python-modules/rainbowstream/image.patch + ../development/python-modules/rainbowstream/setup.patch ]; postPatch = '' @@ -13241,6 +13242,7 @@ in modules // { buildInputs = with self; [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests2 arrow dateutil modules.readline pysocks + pocket ]; meta = { @@ -13251,6 +13253,27 @@ in modules // { }; }; + pocket = buildPythonPackage rec { + name = "pocket-${version}"; + version = "0.3.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pocket/${name}.tar.gz"; + sha256 = "1fc9vc5nyzf1kzmnrs18dmns7nn8wjfrg7br1w4c5sgs35mg2ywh"; + }; + + buildInputs = with self; [ + requests2 + ]; + + meta = { + description = "Wrapper for the pocket API"; + homepage = "https://github.com/tapanpandita/pocket"; + license = licenses.bsd3; + maintainers = with maintainers; [ ericsagnes ]; + }; + }; + mistune = buildPythonPackage rec { version = "0.7.1"; name = "mistune-${version}"; From 921682a4d5b917118af08ca39be0df8589defc90 Mon Sep 17 00:00:00 2001 From: Mohammed Yaseen Mowzer Date: Wed, 31 Aug 2016 18:31:56 +0200 Subject: [PATCH 014/168] geogebra: 5.0.265.0 -> 5.0.271.0 --- pkgs/applications/science/math/geogebra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index fcbd1356665..0e16e1fb305 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5.0.265.0"; + version = "5.0.271.0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "74e5abfa098ee0fc464cd391cd3ef6db474ff25e8ea4fbcd82c4b4b5d3d5c459"; + sha256 = "5dd5be1cde27c9b567f79c38048045864064b69c0d2b469ae93e1fca5f543475"; }; srcIcon = fetchurl { From 28dc4cd3d7f306574269dea058bdd2651470e6e9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 31 Aug 2016 11:26:23 +0800 Subject: [PATCH 015/168] ledger-web: init at 1.5.2 --- pkgs/applications/office/ledger-web/Gemfile | 3 + .../office/ledger-web/Gemfile.lock | 61 +++++++ .../office/ledger-web/default.nix | 52 ++++++ .../applications/office/ledger-web/gemset.nix | 164 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 281 insertions(+) create mode 100644 pkgs/applications/office/ledger-web/Gemfile create mode 100644 pkgs/applications/office/ledger-web/Gemfile.lock create mode 100644 pkgs/applications/office/ledger-web/default.nix create mode 100644 pkgs/applications/office/ledger-web/gemset.nix diff --git a/pkgs/applications/office/ledger-web/Gemfile b/pkgs/applications/office/ledger-web/Gemfile new file mode 100644 index 00000000000..77e8024da3a --- /dev/null +++ b/pkgs/applications/office/ledger-web/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'ledger_web' diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/applications/office/ledger-web/Gemfile.lock new file mode 100644 index 00000000000..2c94c53ebc9 --- /dev/null +++ b/pkgs/applications/office/ledger-web/Gemfile.lock @@ -0,0 +1,61 @@ +GEM + remote: https://rubygems.org/ + specs: + backports (3.6.8) + database_cleaner (1.5.3) + diff-lcs (1.2.5) + directory_watcher (1.5.1) + ledger_web (1.5.2) + database_cleaner + directory_watcher (~> 1.5.1) + pg + rack (>= 1.3.6) + rspec + sequel + sinatra + sinatra-contrib + sinatra-session + multi_json (1.12.1) + pg (0.18.4) + rack (1.6.4) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.2) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + sequel (4.37.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-contrib (1.4.7) + backports (>= 2.0) + multi_json + rack-protection + rack-test + sinatra (~> 1.4.0) + tilt (>= 1.3, < 3) + sinatra-session (1.0.0) + sinatra (>= 1.0) + tilt (2.0.5) + +PLATFORMS + ruby + +DEPENDENCIES + ledger_web (= 1.5.2) + +BUNDLED WITH + 1.12.5 diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix new file mode 100644 index 00000000000..b7ba10a730f --- /dev/null +++ b/pkgs/applications/office/ledger-web/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv, ruby +, withPostgresql ? true, postgresql +, withSqlite ? false, sqlite +}: + +let + _name = "ledger-web"; + cmd = "ledger_web"; + + env = bundlerEnv { + name = _name; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + meta = with lib; { + homepage = https://github.com/peterkeen/ledger-web; + platforms = platforms.linux; + maintainers = [ peterhoeg ]; + license = licenses.mit; + }; + }; + +in stdenv.mkDerivation rec { + name = "${_name}-${version}"; + version = "1.5.2"; + + buildInputs = [ env ruby makeWrapper ] + ++ lib.optional withPostgresql postgresql + ++ lib.optional withSqlite sqlite; + + src = fetchFromGitHub { + owner = "peterkeen"; + repo = _name; + rev = "v${version}"; + sha256 = "0an4d46h3pp7a8s96jl0dnw1imwdgnb2j474b9wrbidwc6cmfrm7"; + }; + + dontStrip = true; + + installPhase = '' + mkdir -p $out + + cp --no-preserve=mode -r bin lib $out + + chmod 0755 $out/bin/${cmd} + + wrapProgram $out/bin/${cmd} \ + --set BUNDLE_BIN ${env.bundler}/bin/bundle \ + --set GEM_PATH ${env}/${env.ruby.gemPath} + ''; +} diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/applications/office/ledger-web/gemset.nix new file mode 100644 index 00000000000..62e2ad54847 --- /dev/null +++ b/pkgs/applications/office/ledger-web/gemset.nix @@ -0,0 +1,164 @@ +{ + backports = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + type = "gem"; + }; + version = "3.6.8"; + }; + database_cleaner = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + type = "gem"; + }; + version = "1.5.3"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + type = "gem"; + }; + version = "1.2.5"; + }; + directory_watcher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fwc2shba7vks262ind74y3g76qp7znjq5q8b2dvza0yidgywhcq"; + type = "gem"; + }; + version = "1.5.1"; + }; + ledger_web = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i4vagaiyayymlr41rsy4lg2cl1r011ib0ql9dgjadfy6imb4kqh"; + type = "gem"; + }; + version = "1.5.2"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + type = "gem"; + }; + version = "0.18.4"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + type = "gem"; + }; + version = "1.6.4"; + }; + rack-protection = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + type = "gem"; + }; + version = "1.5.3"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + type = "gem"; + }; + version = "0.6.3"; + }; + rspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12yndf7y6g3s1306bv1aycsmd0gjy5m172spdhx54svca2fcpzy1"; + type = "gem"; + }; + version = "3.5.2"; + }; + rspec-expectations = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-mocks = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; + type = "gem"; + }; + version = "3.5.0"; + }; + sequel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11vdpr3r4dwhcan16gs4gjm2k21y9qz7ri5w2zz54pmnxp499cjw"; + type = "gem"; + }; + version = "4.37.0"; + }; + sinatra = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; + type = "gem"; + }; + version = "1.4.7"; + }; + sinatra-contrib = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; + type = "gem"; + }; + version = "1.4.7"; + }; + sinatra-session = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183xl8i4d2hc03afd1i52gwn2xi3vzrv02g22llhfy5wkmm44gmq"; + type = "gem"; + }; + version = "1.0.0"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; + type = "gem"; + }; + version = "2.0.5"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b1234b3b40..55a4c8e33d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13774,6 +13774,7 @@ in boost = boost155; }; ledger = self.ledger3; + ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; From 1823137f43b7e103d33d3eb9bf965ceff71b2851 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Thu, 1 Sep 2016 11:21:17 +0200 Subject: [PATCH 016/168] curlcpp: init at 20160901 --- .../development/libraries/curlcpp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/curlcpp/default.nix diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix new file mode 100644 index 00000000000..546259cd70c --- /dev/null +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, curl }: + +stdenv.mkDerivation { + name = "curlcpp-20160901"; + + src = fetchFromGitHub { + owner = "JosephP91"; + repo = "curlcpp"; + rev = "98286da1d6c9f6158344a8e272eae5030cbf6c0e"; + sha256 = "00nm2b8ik1yvaz5dp1b61jid841jv6zf8k5ma2nxbf1di1apqh0d"; + }; + + buildInputs = [ cmake curl ]; + + meta = with stdenv.lib; { + homepage = "http://josephp91.github.io/curlcpp/"; + description = "Object oriented C++ wrapper for CURL"; + platforms = platforms.unix ; + license = licenses.mit; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa627377b62..035137f415a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7064,6 +7064,8 @@ in cryptopp = callPackage ../development/libraries/crypto++ { }; + curlcpp = callPackage ../development/libraries/curlcpp { }; + cutee = callPackage ../development/libraries/cutee { }; cxxtools = callPackage ../development/libraries/cxxtools { }; From a30d4654f29f326d8b20a98dc50b93b1bf39a321 Mon Sep 17 00:00:00 2001 From: Octavian Cerna Date: Wed, 20 Apr 2016 17:38:57 +0300 Subject: [PATCH 017/168] quagga service: New NixOS module. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/quagga.nix | 187 +++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 nixos/modules/services/networking/quagga.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dfc1d694e97..27fbe55cd42 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -388,6 +388,7 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix + ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/racoon.nix ./services/networking/radicale.nix diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix new file mode 100644 index 00000000000..ac83da92063 --- /dev/null +++ b/nixos/modules/services/networking/quagga.nix @@ -0,0 +1,187 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.quagga; + + services = [ "babel" "bgp" "isis" "ospf6" "ospf" "pim" "rip" "ripng" ]; + allServices = services ++ [ "zebra" ]; + + isEnabled = service: cfg.${service}.enable; + + daemonName = service: if service == "zebra" then service else "${service}d"; + + configFile = service: + let + scfg = cfg.${service}; + in + if scfg.configFile != null then scfg.configFile + else pkgs.writeText "${daemonName service}.conf" + '' + ! Quagga ${daemonName service} configuration + ! + hostname ${config.networking.hostName} + log syslog + service password-encryption + ! + ${scfg.config} + ! + end + ''; + + serviceOptions = service: + { + enable = mkEnableOption "the Quagga ${toUpper service} routing protocol"; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/quagga/${daemonName service}.conf"; + description = '' + Configuration file to use for Quagga ${daemonName service}. + By default the NixOS generated files are used. + ''; + }; + + config = mkOption { + type = types.lines; + default = ""; + example = + let + examples = { + rip = '' + router rip + network 10.0.0.0/8 + ''; + + ospf = '' + router ospf + network 10.0.0.0/8 area 0 + ''; + + bgp = '' + router bgp 65001 + neighbor 10.0.0.1 remote-as 65001 + ''; + }; + in + examples.${service} or ""; + description = '' + ${daemonName service} configuration statements. + ''; + }; + + vtyListenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Address to bind to for the VTY interface. + ''; + }; + + vtyListenPort = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + TCP Port to bind to for the VTY interface. + ''; + }; + }; + +in + +{ + + ###### interface + + options.services.quagga = + { + + zebra = (serviceOptions "zebra") // { + + enable = mkOption { + type = types.bool; + default = any isEnabled services; + example = true; + description = '' + Whether to enable the Zebra routing manager. + + The Zebra routing manager is automatically enabled + if any routing protocols are configured. + ''; + }; + + }; + + } // (genAttrs services serviceOptions); + + ###### implementation + + config = mkIf (any isEnabled allServices) { + + environment.systemPackages = [ + pkgs.quagga # for the vtysh tool + ]; + + users.users.quagga = { + description = "Quagga daemon user"; + isSystemUser = true; + group = "quagga"; + }; + + users.groups = { + quagga = {}; + # Members of the quaggavty group can use vtysh to inspect the Quagga daemons + quaggavty = {}; + }; + + systemd.services = + let + quaggaService = service: + let + scfg = cfg.${service}; + daemon = daemonName service; + in + nameValuePair daemon ({ + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ (configFile service) ]; + + serviceConfig = { + Type = "forking"; + PIDFile = "/run/quagga/${daemon}.pid"; + ExecStart = "@${pkgs.quagga}/libexec/quagga/${daemon} ${daemon} -d -f ${configFile service}" + + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" + + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "on-abort"; + }; + } // ( + if service == "zebra" then + { + description = "Quagga Zebra routing manager"; + unitConfig.Documentation = "man:zebra(8)"; + after = [ "network.target" ]; + preStart = '' + install -m 0755 -o quagga -g quagga -d /run/quagga + + ${pkgs.iproute}/bin/ip route flush proto zebra + ''; + } + else + { + description = "Quagga ${toUpper service} routing daemon"; + unitConfig.Documentation = "man:${daemon}(8) man:zebra(8)"; + bindsTo = [ "zebra.service" ]; + after = [ "network.target" "zebra.service" ]; + } + )); + in + listToAttrs (map quaggaService (filter isEnabled allServices)); + + }; + + meta.maintainers = with lib.maintainers; [ tavyc ]; + +} From eb141309345e0200da8536792cfef41297600819 Mon Sep 17 00:00:00 2001 From: Octavian Cerna Date: Wed, 20 Apr 2016 17:41:05 +0300 Subject: [PATCH 018/168] quagga test: Add test for the quagga service. --- nixos/release.nix | 1 + nixos/tests/quagga.nix | 97 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 nixos/tests/quagga.nix diff --git a/nixos/release.nix b/nixos/release.nix index 70a7ba5af89..4dd1311e2d0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -279,6 +279,7 @@ in rec { tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; + tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.sddm = callTest tests/sddm.nix {}; diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix new file mode 100644 index 00000000000..b9644b4768c --- /dev/null +++ b/nixos/tests/quagga.nix @@ -0,0 +1,97 @@ +# This test runs Quagga and checks if OSPF routing works. +# +# Network topology: +# [ client ]--net1--[ router1 ]--net2--[ router2 ]--net3--[ server ] +# +# All interfaces are in OSPF Area 0. + +import ./make-test.nix ({ pkgs, ... }: + let + + ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ip4).address; + + ospfConf = '' + interface eth2 + ip ospf hello-interval 1 + ip ospf dead-interval 5 + ! + router ospf + network 192.168.0.0/16 area 0 + ''; + + in + { + name = "quagga"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ tavyc ]; + }; + + nodes = { + + client = + { config, pkgs, nodes, ... }: + { + virtualisation.vlans = [ 1 ]; + networking.defaultGateway = ifAddr nodes.router1 "eth1"; + }; + + router1 = + { config, pkgs, nodes, ... }: + { + virtualisation.vlans = [ 1 2 ]; + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT"; + services.quagga.ospf = { + enable = true; + config = ospfConf; + }; + }; + + router2 = + { config, pkgs, nodes, ... }: + { + virtualisation.vlans = [ 3 2 ]; + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT"; + services.quagga.ospf = { + enable = true; + config = ospfConf; + }; + }; + + server = + { config, pkgs, nodes, ... }: + { + virtualisation.vlans = [ 3 ]; + networking.defaultGateway = ifAddr nodes.router2 "eth1"; + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.com"; + }; + }; + + testScript = + { nodes, ... }: + '' + startAll; + + # Wait for the networking to start on all machines + $_->waitForUnit("network.target") foreach values %vms; + + # Wait for OSPF to form adjacencies + for my $gw ($router1, $router2) { + $gw->waitForUnit("ospfd"); + $gw->waitUntilSucceeds("vtysh -c 'show ip ospf neighbor' | grep Full"); + $gw->waitUntilSucceeds("vtysh -c 'show ip route' | grep '^O>'"); + } + + # Test ICMP. + $client->succeed("ping -c 3 server >&2"); + + # Test whether HTTP works. + $server->waitForUnit("httpd"); + $client->succeed("curl --fail http://server/ >&2"); + ''; + }) From 498d803cce9aadca253f8fb8c37604c7f856d6eb Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Fri, 2 Sep 2016 21:22:49 +0200 Subject: [PATCH 019/168] recutils: 1.5 -> 1.7 --- pkgs/tools/misc/recutils/default.nix | 10 ++++++---- pkgs/tools/misc/recutils/glibc.patch | 29 ---------------------------- 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 pkgs/tools/misc/recutils/glibc.patch diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 6dd40e8476f..f1712a43c3b 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,21 +1,23 @@ { fetchurl, stdenv, gettext, emacs, curl, check, bc }: stdenv.mkDerivation rec { - name = "recutils-1.5"; + name = "recutils-1.7"; src = fetchurl { url = "mirror://gnu/recutils/${name}.tar.gz"; - sha256 = "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky"; + sha256 = "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93"; }; - patches = [ ./glibc.patch ]; - doCheck = true; hardeningDisable = [ "format" ]; buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]); + postInstall = '' + ${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el #*/ + ''; + meta = { description = "Tools and libraries to access human-editable, text-based databases"; diff --git a/pkgs/tools/misc/recutils/glibc.patch b/pkgs/tools/misc/recutils/glibc.patch deleted file mode 100644 index 8b4997f099d..00000000000 --- a/pkgs/tools/misc/recutils/glibc.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- recutils-1.5/lib/stdio.in.h -+++ recutils-1.5/lib/stdio.in.h -@@ -699,22 +699,11 @@ - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - From f4d13a44c0578cb0eba84316b5a1240b08c3eec2 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 2 Sep 2016 23:23:35 +0200 Subject: [PATCH 020/168] fzf: 0.13.3 -> 0.13.5 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 6ba2b881784..3eaf5ae5d1b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.13.3"; + version = "0.13.5"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0mfrlb91akzrj0qpjpaa9bkp6m9z95z56glamry73qy21vbnj58m"; + sha256 = "1zfl53nv0b2wsmgbsf850yafqkx9pplpx339iiw4037msdjqhi19"; }; buildInputs = [ ncurses ]; From 5aaa0c8cb8b132167116be292f60a22f2ae8fa68 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 2 Sep 2016 23:38:30 +0200 Subject: [PATCH 021/168] unrar: 5.4.4 -> 5.4.5 --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 1e07b4114a5..0086891da29 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.4.4"; + version = "5.4.5"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "10rdbp19mcblgzhs9xh3lr1d1x0n1clyc46flg21ic3427b6assm"; + sha256 = "0v3rz2245bp2nh4115ysqv34vqlrpln9y11fnlzqj8i46f2caw74"; }; postPatch = '' From 854d16d74eca1a186f422a5eebc7b2befe1f0bc3 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Fri, 2 Sep 2016 17:23:46 -0500 Subject: [PATCH 022/168] nlohmann_json: 2.0.2 -> 2.0.3 `cmake` should be in `nativeBuildInputs` as it is only required at build time. For obvious reasons we can't have the tests running during a cross-compile. I figured I'd update the package version while I was at it, though these changes have also been tested independently of the version update. --- .../development/libraries/nlohmann_json/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 819160a8d7c..dcc0c781ee0 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,20 +2,27 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "10sk8d23vh0c7b3qafjz2n8r5jv8vc275bl069ikhqnx1zxv6hwp"; + sha256 = "192mg2y93g9q0jdn3fdffydpxk19nsrcv92kfip6srkdkwja18ri"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; doCheck = true; checkTarget = "test"; + crossAttrs = { + cmakeFlags = "-DBuildTests=OFF"; + doCheck = false; + } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows"; + }; + meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; homepage = https://github.com/nlohmann/json; From 307a4650c80ba32fc09279818ff6e5c3ac2a0dea Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 3 Sep 2016 00:38:38 +0200 Subject: [PATCH 023/168] hub: 2.2.3 -> 2.2.5 --- .../version-management/git-and-tools/hub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index a1ae5e732d9..ff21271956b 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "2.2.3"; + version = "2.2.5"; src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "1vswkx4lm6x4s04453qkmv970gjn79ma39fmdg8mnzy7lh2swws6"; + sha256 = "13pab3r2ngac2kljy9jb4lz3g3d6smkwydlx23ydjvyjbg2zb75r"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" - cp hub "$out/bin/" + cp bin/hub "$out/bin/" mkdir -p "$out/share/man/man1" cp "man/hub.1" "$out/share/man/man1/" From 1ed1ed210a096f2dea2a61f9e0952d812378548e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 3 Sep 2016 03:23:26 +0300 Subject: [PATCH 024/168] terra: Broken on i686 (and Darwin) Never built successfully: http://hydra.nixos.org/build/39402139 http://hydra.nixos.org/build/39393534 --- pkgs/development/compilers/terra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index f72dd4c9956..98795f96ffa 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A low-level counterpart to Lua"; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; }; From 493ab7b4fa3655b4765803b482e4725f6b1f7e88 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 3 Sep 2016 06:05:56 +0200 Subject: [PATCH 025/168] pass: add patch to fix xclipboard handling This is caused by our coreutils now being built as a single binary. --- pkgs/tools/security/pass/default.nix | 5 +-- .../set-correct-program-name-for-sleep.patch | 33 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 534e06814e2..79f6a6c1c28 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { }; patches = - [ ./program-name.patch ] ++ - stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + [ ./program-name.patch + ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch new file mode 100644 index 00000000000..f00307307eb --- /dev/null +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -0,0 +1,33 @@ +From 6ad29ae97263060c9ec95856e0d8ab18409108c0 Mon Sep 17 00:00:00 2001 +From: Franz Pletz +Date: Sat, 3 Sep 2016 05:45:36 +0200 +Subject: [PATCH] Set correct program name for sleep + +--- + src/password-store.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/password-store.sh b/src/password-store.sh +index 63be840..ca47df3 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -133,11 +133,14 @@ clip() { + # variable. Specifically, it cannot store nulls nor (non-trivally) store + # trailing new lines. + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ # Execute sleep as a child process of bash because it may be ++ # a symlink to a single binary version of coreutils or busybox ++ # which depends on argv0 correctly set to "sleep" ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(xclip -o -selection "$X_SELECTION" | base64)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + +-- +2.9.3 + From ed1fcd1b029c79bcce28cb166ad643b27ceb4c87 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Sep 2016 07:59:23 +0800 Subject: [PATCH 026/168] k3d: 0.8.0.3 -> 0.8.0.5 --- pkgs/applications/graphics/k3d/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index f204114a581..f5987684c00 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { - version = "0.8.0.3"; + version = "0.8.0.5"; name = "k3d-${version}"; - src = fetchurl { - url = "https://github.com/K-3D/k3d/archive/${name}.zip"; - sha256 = "09ywwvlk8hh1357pnal96kc40ma4jq7776hqk0609rgz13s6babp"; + src = fetchFromGitHub { + owner = "K-3D"; + repo = "k3d"; + rev = name; + sha256 = "0q05d51vhnmrq887n15frpwkhx8w7n20h2sc1lpr338jzpryihb3"; }; cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; From 3b45449f694b2f36099c0e755d3c1bbedc155504 Mon Sep 17 00:00:00 2001 From: Jinjing Wang Date: Sat, 3 Sep 2016 15:48:01 +0800 Subject: [PATCH 027/168] shadowsocks-libev: 2.4.8 -> 2.5.0 --- pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 74ae4f808a9..0ac8dca770a 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -15,8 +15,8 @@ let - version = "2.4.8"; - sha256 = "af3fc3be50fb24dfd1aed8ce34d2d13448735f6181269f54f4860438a1838472"; + version = "2.5.0"; + sha256 = "6841e0efa1c01caef5a827f463ee304dc9e48fb4751cc9256316df5ab4490ae0"; in From 882cc8dc9ae165bb9ddc2d0e70ee9ecc7690444d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 1 Sep 2016 20:15:58 +0200 Subject: [PATCH 028/168] postfix: 3.1.1 -> 3.1.2 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 176fd22162b..6303946de3a 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "10lrp8fyn38digih1sy7y4dm74szj1cvbyxmn68095ri8v1s9v9x"; + sha256 = "0sqgsfq3dqilfcr2z9wi7g12mcma690j8qvs8v93gszrdgpb9f8s"; }; buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] From 1f45a852d3f3355ab1a053933acc30a46d833363 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 11:12:33 +0200 Subject: [PATCH 029/168] josm: 9979 -> 10786 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 410f56c2299..3b1b9faa574 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "9979"; + version = "10786"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0zy88f4h71qyj7vlhiwnayaaz50gg6bj5pfypy43ghmjrh01d9vh"; + sha256 = "1dlb33nw8idipshiqy5p9vssdnkra3z2ixfixkj017b8wxdzvjpn"; }; phases = [ "installPhase" ]; From 72f455362c765a2b6de52a3103bec4fbcbc680dc Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 11:29:59 +0200 Subject: [PATCH 030/168] trigger-rally: fix build Previously failed due to not finding `SDL.h`. --- pkgs/games/trigger/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 382edb6908b..9f7a1844f9e 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { sed s,/usr/local,$out, -i bin/*defs cd src + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" export makeFlags="$makeFlags prefix=$out" ''; From ea90815ae8aa3de5c0fca0e35bf398095eef0253 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 10:24:37 +0200 Subject: [PATCH 031/168] pythonPackages.pyparser: fix tests --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cffb0c02f2a..29d332bc1b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4508,8 +4508,9 @@ in modules // { sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73"; }; - # 3.5 is not supported but has been working fine - doCheck = !isPy35; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; meta = { description = "C parser in Python"; From 57d1edbfc1aab2461e86ab61201254bd1b3ac586 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 10:24:47 +0200 Subject: [PATCH 032/168] julia: 0.4.5 -> 0.4.6 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 36b6c21aebb..4dfad0fae86 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -48,12 +48,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.4.5"; + version = "0.4.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4"; + sha256 = "17wsppmsf782icyzri34zha61wfx4brfq4h68qg17w6zimd2plg5"; }; prePatch = '' From 203004d59a090d98252ebd784a964e67c1993146 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 10:25:03 +0200 Subject: [PATCH 033/168] pypy27: 5.3.1 -> 5.4.0 --- .../interpreters/python/pypy/2.7/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 76464d5412e..213f5dabe79 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.3.1"; + majorVersion = "5.4.0"; version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "19cq2ngkh5q5jxwhw81rd6p0qna73z85jfik88w0856k5aj86yha"; + sha256 = "1jm4ak6rbqhdhm8gjbd5hanabskbyzhzvjcl93fj0i017yirw88i"; }; # http://bugs.python.org/issue27369 @@ -32,6 +32,14 @@ let patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' ''; + # Increase recursion limit. This patch is not needed on pypy > 5.4.0 + patches = [ + (fetchurl { + url = "https://bitbucket.org/pypy/pypy/commits/a5db0f4359abb3f64b6d7ed83202e1cb0de37fb2/raw/"; + sha256 = "07nvqjhj0kl67f3kjwhmybaqg6089ps3q8r0si1lgk3gyb56ygn0"; + }) + ]; + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; From d7e49ed4e310b47d0087a0fe6ea15d0b2a480cb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 10:46:17 +0200 Subject: [PATCH 034/168] pythonPackages.pyinotify: no tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29d332bc1b5..5d0d253b3fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19259,6 +19259,9 @@ in modules // { sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; + # No tests distributed + doCheck = false; + meta = { homepage = https://github.com/seb-m/pyinotify/wiki; description = "Monitor filesystems events on Linux platforms with inotify"; From a09601fcb48a99b65eb14c216b5f07ed4373d21b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:04:31 +0200 Subject: [PATCH 035/168] pythonPackages.pysqlite: 2.6.3 -> 2.8.3 --- pkgs/top-level/python-packages.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d0d253b3fe..29da2726e77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20140,15 +20140,17 @@ in modules // { }; }; - pysqlite = buildPythonPackage (rec { - name = "pysqlite-2.6.3"; - disabled = isPy3k; + pysqlite = buildPythonPackage rec { + name = "pysqlite-2.8.3"; src = pkgs.fetchurl { url = "mirror://pypi/p/pysqlite/${name}.tar.gz"; - sha256 = "13djzgnbi71znjjyaw4nybg6smilgszcid646j5qav7mdchkb77y"; + sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"; }; + # Need to use the builtin sqlite3 on Python 3 + disabled = isPy3k; + # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files # it contains is not taken into account. Thus, we must explicitly make # it a propagated input. @@ -20160,14 +20162,9 @@ in modules // { --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" ''; - # error: invalid command 'test' - doCheck = false; - meta = { homepage = http://pysqlite.org/; - description = "Python bindings for the SQLite embedded relational database engine"; - longDescription = '' pysqlite is a DB-API 2.0-compliant database interface for SQLite. @@ -20187,12 +20184,10 @@ in modules // { possible to create user-defined SQL functions and aggregates in Python. ''; - license = licenses.bsd3; - maintainers = [ ]; }; - }); + }; pysvn = mkPythonDerivation rec { From f6a01b93040258d403065da37b26aff62dbadd46 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:16:21 +0200 Subject: [PATCH 036/168] pythonPackages.sphinxcontrib-spelling: missing dependency pbr --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29da2726e77..6fbc5f34611 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23033,7 +23033,7 @@ in modules // { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z"; }; - propagatedBuildInputs = with self; [ sphinx pyenchant]; + propagatedBuildInputs = with self; [ sphinx pyenchant pbr ]; # No tests included doCheck = false; meta = { From 434f8e4e866c638916b31cff4fcf018c307b6405 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:16:49 +0200 Subject: [PATCH 037/168] pythonPackages.sphinx-jinja: missing dependency pbr --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fbc5f34611..0ab374426d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23052,7 +23052,7 @@ in modules // { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "1zsnhc573rvaww9qqyzs4f5h4hhvxklvppv14450vi5dk8rij81z"; }; - buildInputs = with self; [ sphinx-testing pytest]; + buildInputs = with self; [ sphinx-testing pytest pbr]; propagatedBuildInputs = with self; [ sphinx blockdiag ]; checkPhase = '' py.test -k "not test_build_epub" From 42367202c617aa300e6b3d952c7ceb675e84926f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:17:10 +0200 Subject: [PATCH 038/168] pythonPackages.setuptools_scm: 1.10.1 -> 1.11.1 --- pkgs/top-level/python-packages.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ab374426d7..0b776ed5996 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21788,14 +21788,20 @@ in modules // { setuptools_scm = buildPythonPackage rec { name = "setuptools_scm-${version}"; - version = "1.10.1"; + version = "1.11.1"; src = pkgs.fetchurl { - url = "mirror://pypi/s/setuptools_scm/${name}.tar.bz2"; - sha256 = "1cdea91bbe1ec4d52b3e9c451ab32ae6e1f3aa3fd91e90580490a9eb75bea286"; + url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz"; + sha256 = "8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf"; }; - buildInputs = with self; [ pip ]; + buildInputs = with self; [ pip pytest ]; + # Seems to fail due to chroot + doCheck = false; + + checkPhase = '' + py.test + ''; meta = with stdenv.lib; { homepage = https://bitbucket.org/pypa/setuptools_scm/; From af52326dcca57fe8d3fc627c4284a6288241bb63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:17:30 +0200 Subject: [PATCH 039/168] pythonPackages.sqlalchemy: 1.0.14 -> 1.0.15 --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b776ed5996..bb18e5a8c27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23146,23 +23146,23 @@ in modules // { sqlalchemy_1_0 = buildPythonPackage rec { name = "SQLAlchemy-${version}"; - version = "1.0.14"; + version = "1.0.15"; src = pkgs.fetchurl { url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "1cq52yyplvi1wrvrzn779l9sfsjb158a18xaqbn7z779q4wilkfs"; + sha256 = "586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a"; }; - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; + buildInputs = with self; [ pytest mock pytest_xdist ] + ++ stdenv.lib.optional (!isPy3k) pysqlite; propagatedBuildInputs = with self; [ modules.sqlite3 ]; # Test-only dependency pysqlite doesn't build on Python 3. This isn't an # acceptable reason to make all dependents unavailable on Python 3 as well - doCheck = !(isPyPy || isPy3k); + #doCheck = !(isPyPy || isPy3k); checkPhase = '' - ${python.executable} sqla_nose.py + py.test ''; meta = { From 7bf1d11452fa6d6c32bd0de98a51c294312277bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:39:29 +0200 Subject: [PATCH 040/168] pythonPackages.txrequests: disable tests --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb18e5a8c27..b3844ccfb8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26588,6 +26588,8 @@ in modules // { }; propagatedBuildInputs = with self; [ twisted requests2 cryptography ]; + # Require network access + doCheck = false; checkPhase = '' ${python.interpreter} -m unittest discover ''; From e4bc2e60a0a0d5fe6a25b02ec24d54102fcb8fbf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 11:39:57 +0200 Subject: [PATCH 041/168] pythonPackages.service-identity: fix tests --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3844ccfb8e..758f2d2cc4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27533,6 +27533,10 @@ in modules // { buildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; }; signedjson = buildPythonPackage rec { From 297008b9593d0be4c0eedb084b0e99cf850ce3a4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 11:42:08 +0200 Subject: [PATCH 042/168] teeworlds: add freetype to build inputs Fixes undefined references to functions in the freetype library. --- pkgs/games/teeworlds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 5276ec4cc34..ef74903735d 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam }: +{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam, freetype }: stdenv.mkDerivation rec { name = "teeworlds-0.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Note: Teeworlds requires Python 2.x to compile. Python 3.0 will # not work. - buildInputs = [ python alsaLib libX11 mesa SDL lua5 zlib bam ]; + buildInputs = [ python alsaLib libX11 mesa SDL lua5 zlib bam freetype ]; configurePhase = '' bam release From 38bd2c442556c0636dec460a201323af99c375a0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 12:45:06 +0200 Subject: [PATCH 043/168] SDL: fix startup of (some) games using OpenGL Fixes #18247. --- pkgs/development/libraries/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index de699e2c6ac..ca097b8af5d 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa_noglu +, openglSupport ? false, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? true, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa_noglu ++ + optional openglSupport mesa_glu ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; From 686bb1a6e43dafaf1c46a96b746af42b14fc57c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Sep 2016 12:49:59 +0200 Subject: [PATCH 044/168] freeswitch: fix build when sandboxed --- pkgs/servers/sip/freeswitch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 977575491f5..ac8c3a1b1c9 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7"; }; + postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl"; buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg From 2b86ccbf321bc75100c86446aa6706b335445270 Mon Sep 17 00:00:00 2001 From: J Phani Mahesh Date: Sat, 3 Sep 2016 16:20:32 +0530 Subject: [PATCH 045/168] git: 2.9.3 -> 2.10.0 --- .../git-and-tools/git/default.nix | 4 +-- .../git-and-tools/git/git-sh-i18n.patch | 34 ++++++++++++++----- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4eea75ad4ef..9cbc596bbb1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ }: let - version = "2.9.3"; + version = "2.10.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z"; + sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 8e3ee2bce89..97f50064bc3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -1,11 +1,9 @@ -diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh -index e6c3116..4e34a2c 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh -@@ -15,69 +15,11 @@ else +@@ -15,87 +15,11 @@ fi export TEXTDOMAINDIR - + -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -if test -n "@@USE_GETTEXT_SCHEME@@" @@ -44,6 +42,13 @@ index e6c3116..4e34a2c 100644 - git sh-i18n--envsubst "$1" - ) - } +- +- eval_ngettext () { +- ngettext "$1" "$2" "$3" | ( +- export PATH $(git sh-i18n--envsubst --variables "$2"); +- git sh-i18n--envsubst "$2" +- ) +- } - ;; -poison) - # Emit garbage so that tests that incorrectly rely on translatable @@ -55,24 +60,35 @@ index e6c3116..4e34a2c 100644 - eval_gettext () { - printf "%s" "# GETTEXT POISON #" - } +- +- eval_ngettext () { +- printf "%s" "# GETTEXT POISON #" +- } - ;; -*) - gettext () { - printf "%s" "$1" - } -+# GNU gettext -+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu -+export PATH=@gettext@/bin:$PATH - +- - eval_gettext () { - printf "%s" "$1" | ( - export PATH $(git sh-i18n--envsubst --variables "$1"); - git sh-i18n--envsubst "$1" - ) - } ++# GNU gettext ++export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu ++export PATH=@gettext@/bin:$PATH + +- eval_ngettext () { +- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | ( +- export PATH $(git sh-i18n--envsubst --variables "$2"); +- git sh-i18n--envsubst "$2" +- ) +- } - ;; -esac +. @gettext@/bin/gettext.sh - + # Git-specific wrapper functions gettextln () { From 46ef9dfcde6603f50592a538aa9193ecffb4a9e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 13:19:09 +0200 Subject: [PATCH 046/168] mention-bot: notify me of Python changes --- .mention-bot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mention-bot b/.mention-bot index 40e57f99660..13511eeeb4c 100644 --- a/.mention-bot +++ b/.mention-bot @@ -2,5 +2,8 @@ "userBlacklist": [ "civodul", "jhasse" + ], + "alwaysNotifyForPaths": [ + { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] } ] } From a39bc6e44213929f08d6f734862e135a4110ca3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Sep 2016 13:21:42 +0200 Subject: [PATCH 047/168] mention-bot: blacklist all-packages.nix --- .mention-bot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mention-bot b/.mention-bot index 13511eeeb4c..64f0ed854c4 100644 --- a/.mention-bot +++ b/.mention-bot @@ -5,5 +5,6 @@ ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] } - ] + ], + "fileBlacklist": ["pkgs/top-level/all-packages.nix"] } From 154528785ee3d66568d736c5f88428a30fa313fa Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 3 Sep 2016 13:42:16 +0200 Subject: [PATCH 048/168] emby: 3.0.6070 -> 3.0.6400 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 71cc5865fb8..14c4873beb4 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6070"; + version = "3.0.6400"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "1szxqyr1pj90dfz9ga8ddcipzidm3ajinyp1vngzvwqcsdb7dxc5"; + sha256 = "08zwqqilfs3y2kjqfan4ya0s9pns6g1pgh6wciabjzv2v2ra9kq3"; }; propagatedBuildInputs = with pkgs; [ From ff5fd1ec401051eb5c259846e4ecd19a0d29a80d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 26 Aug 2016 22:23:27 -0400 Subject: [PATCH 049/168] etcd-cluster: split up openssl commands --- nixos/tests/etcd-cluster.nix | 77 +++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 4eca6558dde..3971997a9bf 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -1,14 +1,52 @@ # This test runs simple etcd cluster import ./make-test.nix ({ pkgs, ... } : let - certs = pkgs.runCommand "certs" { - buildInputs = [pkgs.openssl]; - } '' - mkdir -p $out - openssl genrsa -out $out/ca-key.pem 2048 - openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca" - cat << EOF > openssl.cnf + runWithOpenSSL = file: cmd: pkgs.runCommand file { + buildInputs = [ pkgs.openssl ]; + } cmd; + + ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048"; + ca_pem = runWithOpenSSL "ca.pem" '' + openssl req \ + -x509 -new -nodes -key ${ca_key} \ + -days 10000 -out $out -subj "/CN=etcd-ca" + ''; + etcd_key = runWithOpenSSL "etcd-key.pem" "openssl genrsa -out $out 2048"; + etcd_csr = runWithOpenSSL "etcd.csr" '' + openssl req \ + -new -key ${etcd_key} \ + -out $out -subj "/CN=etcd" \ + -config ${openssl_cnf} + ''; + etcd_cert = runWithOpenSSL "etcd.pem" '' + openssl x509 \ + -req -in ${etcd_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} \ + -CAcreateserial -out $out \ + -days 365 -extensions v3_req \ + -extfile ${openssl_cnf} + ''; + + etcd_client_key = runWithOpenSSL "etcd-client-key.pem" + "openssl genrsa -out $out 2048"; + + etcd_client_csr = runWithOpenSSL "etcd-client-key.pem" '' + openssl req \ + -new -key ${etcd_client_key} \ + -out $out -subj "/CN=etcd-client" \ + -config ${client_openssl_cnf} + ''; + + etcd_client_cert = runWithOpenSSL "etcd-client.crt" '' + openssl x509 \ + -req -in ${etcd_client_csr} \ + -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \ + -out $out -days 365 -extensions v3_req \ + -extfile ${client_openssl_cnf} + ''; + + openssl_cnf = pkgs.writeText "openssl.cnf" '' ions = v3_req distinguished_name = req_distinguished_name [req_distinguished_name] @@ -22,13 +60,9 @@ import ./make-test.nix ({ pkgs, ... } : let DNS.2 = node2 DNS.3 = node3 IP.1 = 127.0.0.1 - EOF + ''; - openssl genrsa -out $out/etcd-key.pem 2048 - openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf - openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf - - cat << EOF > client-openssl.cnf + client_openssl_cnf = pkgs.writeText "client-openssl.cnf" '' ions = v3_req distinguished_name = req_distinguished_name [req_distinguished_name] @@ -36,20 +70,15 @@ import ./make-test.nix ({ pkgs, ... } : let basicConstraints = CA:FALSE keyUsage = digitalSignature, keyEncipherment extendedKeyUsage = clientAuth - EOF - - openssl genrsa -out $out/etcd-client-key.pem 2048 - openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf - openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf ''; nodeConfig = { services = { etcd = { enable = true; - keyFile = "${certs}/etcd-key.pem"; - certFile = "${certs}/etcd.pem"; - trustedCaFile = "${certs}/ca.pem"; + keyFile = etcd_key; + certFile = etcd_cert; + trustedCaFile = ca_pem; peerClientCertAuth = true; listenClientUrls = ["https://127.0.0.1:2379"]; listenPeerUrls = ["https://0.0.0.0:2380"]; @@ -57,9 +86,9 @@ import ./make-test.nix ({ pkgs, ... } : let }; environment.variables = { - ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem"; - ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem"; - ETCDCTL_CA_FILE = "${certs}/ca.pem"; + ETCDCTL_CERT_FILE = "${etcd_client_cert}"; + ETCDCTL_KEY_FILE = "${etcd_client_key}"; + ETCDCTL_CA_FILE = "${ca_pem}"; ETCDCTL_PEERS = "https://127.0.0.1:2379"; }; From 235440ec34411a62ccb455fc9537f92999dff618 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 3 Sep 2016 14:02:53 +0200 Subject: [PATCH 050/168] etcd: add meta information --- pkgs/servers/etcd/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 57eb877cd79..988f6f6c82c 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,5 +1,7 @@ { stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +with lib; + buildGoPackage rec { name = "etcd-${version}"; version = "3.0.6"; @@ -17,4 +19,12 @@ buildGoPackage rec { goDeps = ./deps.json; buildInputs = [ libpcap ]; + + meta = { + description = "Distributed reliable key-value store for the most critical data of a distributed system"; + license = licenses.asl20; + homepage = https://coreos.com/etcd/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; } From eaf4dcaee1a092072cc7ee36ba1e82dc1e46a9dd Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 3 Sep 2016 14:04:54 +0200 Subject: [PATCH 051/168] etcd: add update notice --- pkgs/servers/etcd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 988f6f6c82c..3d301a6a35b 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.0.6"; + version = "3.0.6"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; From 3698f321ef3d5f2a1ac132969e29095c8800cb5f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 3 Sep 2016 13:30:26 +0200 Subject: [PATCH 052/168] spl: mark it broken on kernels higher then 4.7 until new spl version is release --- pkgs/os-specific/linux/spl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index d5a235084d4..fa4953be7f9 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington ]; - broken = (kernel.features.grsecurity or false); + broken = kernel.features.grsecurity or + # spl marked as broken until following patch is released + # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b + (versionAtLeast kernel.version "4.7"); }; } From 4745341c69772de5ddfee1f68e7421ad9d772b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Sep 2016 14:34:07 +0200 Subject: [PATCH 053/168] spl: fix evaluation after the parent commit This doesn't fully fix the tarball job. --- pkgs/os-specific/linux/spl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index fa4953be7f9..bed1d517e56 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,9 +60,10 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington ]; - broken = kernel.features.grsecurity or + broken = buildKernel + && (kernel.features.grsecurity or # spl marked as broken until following patch is released # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b - (versionAtLeast kernel.version "4.7"); + (versionAtLeast kernel.version "4.7")); }; } From fc0b40328d4b1b284d9e00ba222687626d93cbef Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 3 Sep 2016 15:20:53 +0300 Subject: [PATCH 054/168] SDL: fix OpenGL support --- pkgs/development/libraries/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index ca097b8af5d..fb61233dfcb 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa_glu +, openglSupport ? false, mesa_noglu, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? true, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa_glu ++ + optionals openglSupport [ mesa_noglu mesa_glu ] ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; From ca465eeeb1f724673a2d436a58e73f4283a89404 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 3 Sep 2016 14:42:08 +0200 Subject: [PATCH 055/168] wireguard: disable build against -grsec kernels Looks to be incompatible with the PaX constification plugin: > /tmp/nix-build-wireguard-unstable-2016-08-08.drv-0/WireGuard-experimental-0.0.20160808/src/device.c:329:29: error: constified variable 'link_ops' placed into writable section ".data..read_mostly" static struct rtnl_link_ops link_ops __read_mostly = { https://hydra.nixos.org/build/39671573/log/raw See also https://github.com/NixOS/nixpkgs/issues/18209 --- pkgs/os-specific/linux/wireguard/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 3264194f125..a885d40658b 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -2,6 +2,8 @@ # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; +# module is incompatible with the PaX constification plugin +assert kernel != null -> !(kernel.features.grsecurity or false); let name = "wireguard-unstable-${version}"; From 49c1f415e85e6abf44df5826e887558c53412b2c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 13:42:18 +0000 Subject: [PATCH 056/168] xapian: 1.2.23 -> 1.4.0 --- pkgs/development/libraries/xapian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 7c4b699e615..36b55c59c24 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xapian-${version}"; - version = "1.2.23"; + version = "1.4.0"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp"; + sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"; }; outputs = [ "out" "doc" ]; From 6cd407de28c98a9427617e8b9b0994a8fab5e8d8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 13:42:53 +0000 Subject: [PATCH 057/168] xapian-omega: 1.2.21 -> 1.4.0 --- pkgs/tools/misc/xapian-omega/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix index 19bbdceb09e..c3798878f1b 100644 --- a/pkgs/tools/misc/xapian-omega/default.nix +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = "1.2.21"; + version = "1.4.0"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h"; }; - buildInputs = [ pkgconfig xapian perl pcre zlib ]; + buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c47d59069a..f9d8fc3f1da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9800,7 +9800,9 @@ in php = php56; }; - xapian-omega = callPackage ../tools/misc/xapian-omega {}; + xapian-omega = callPackage ../tools/misc/xapian-omega { + libmagic = file; + }; xavs = callPackage ../development/libraries/xavs { }; From 22c578e79d6f6c8e6144e4ff76bbb32409b34c5a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 14:04:52 +0000 Subject: [PATCH 058/168] osmctools: init at 0.8.5 --- pkgs/applications/misc/osmctools/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/osmctools/default.nix diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix new file mode 100644 index 00000000000..bb4719639ab --- /dev/null +++ b/pkgs/applications/misc/osmctools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, zlib } : + +stdenv.mkDerivation rec { + name = "osmctools-${version}"; + version = "0.8.5"; + + src = fetchurl { + url = http://m.m.i24.cc/osmconvert.c; + sha256 = "9da0940912d1bc62223b962483fd796f92c959c48749806aee5806164e5875d7"; + }; + + buildInputs = [ zlib ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + cc $src -lz -O3 -o osmconvert + ''; + + installPhase = '' + mkdir -p $out/bin + mv osmconvert $out/bin + ''; + + meta = with stdenv.lib; { + description = "Converter between various Open Street Map file formats"; + homepage = http://wiki.openstreetmap.org/wiki/Osmconvert; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c47d59069a..b0a6b72f405 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14259,6 +14259,8 @@ in inherit (pkgs.kde4) kdelibs; }; + osmctools = callPackage ../applications/misc/osmctools { }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; opusfile = callPackage ../applications/audio/opusfile { }; From d0ef7140e919ca7d1d6dc467768bf9d80b3412e8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 3 Sep 2016 21:00:49 +0800 Subject: [PATCH 059/168] dropbox: 8.4.21 -> 9.4.49 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index b98e7eea14b..4e6be596fba 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "8.4.21"; + version = "9.4.49"; sha256 = { - "x86_64-linux" = "1nihmr99mzyjhhdlg39j6g0m6hqgdz80lgrjdw1nnh38vq4fgbnq"; - "i686-linux" = "09jfdc8isjcpvgnvfykawlvdq65ng0dg6b54m4vdswk58ggndvlq"; + "x86_64-linux" = "0gkm4jhcn3pqaizmki98rbqb7mqyf6mjgmpslas1wr94q5msyrpd"; + "i686-linux" = "08h5jxan6l9h4zfmvc5q2652dyplih2avayy8f9h8mppirpg68px"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 501668ee0a63081059526199b39c33850b2a0cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Sep 2016 15:01:51 +0200 Subject: [PATCH 060/168] teeworlds: update, cleanup --- pkgs/games/teeworlds/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index ef74903735d..4485f7f2b9b 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam, freetype }: +{ fetchurl, stdenv, python, alsaLib, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.1"; + name = "teeworlds-0.6.3"; src = fetchurl { - url = "http://www.teeworlds.com/files/${name}-source.tar.gz"; - sha256 = "025rcz59mdqksja4akn888c8avj9j28rk86vw7w1licdp67x8a33"; + url = "https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz"; + sha256 = "0yq7f3yan07sxrhz7mzwqv344nfmdc67p3dg173631w9fb1yf3j9"; }; - # Note: Teeworlds requires Python 2.x to compile. Python 3.0 will - # not work. - buildInputs = [ python alsaLib libX11 mesa SDL lua5 zlib bam freetype ]; + # we always want to use system libs instead of these + postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; - configurePhase = '' - bam release + buildInputs = [ python alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype ]; + + buildPhase = '' + bam -a -v release ''; installPhase = '' @@ -39,9 +40,9 @@ stdenv.mkDerivation rec { do mv -v "$out/bin/$program" "$out/bin/.wrapped-$program" cat > "$out/bin/$program" < Date: Sat, 3 Sep 2016 16:53:10 +0200 Subject: [PATCH 061/168] pyqt*: fixup build to close #18250 I don't know why the builder uses `lndir ${dbus-python} $out`, but this commit should work around the problem caused by dbus-python starting to propagate some inputs. --- pkgs/development/python-modules/pyqt/4.x.nix | 1 + pkgs/development/python-modules/pyqt/5.x.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 2328894d2a3..5ffbd19228c 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -14,6 +14,7 @@ in mkPythonDerivation { configurePhase = '' mkdir -p $out lndir ${dbus-python} $out + rm -rf "$out/nix-support" export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2b54308e3f0..3edf7e6e170 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -32,6 +32,7 @@ in mkPythonDerivation { mkdir -p $out lndir ${dbus-python} $out + rm -rf "$out/nix-support" export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages From f8b447a6e4e592f08bdc6238d63594053dbaf952 Mon Sep 17 00:00:00 2001 From: Joachim F Date: Sat, 3 Sep 2016 17:40:27 +0200 Subject: [PATCH 062/168] dpdk: 16.04 -> 16.07, fix build against linux 4.7 (#18256) Tested build against linux_latest and linux_grsec_nixos. --- pkgs/os-specific/linux/dpdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index e0c164e6232..0f55fa963a4 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18"; stdenv.mkDerivation rec { name = "dpdk-${version}-${kernel.version}"; - version = "16.04"; + version = "16.07"; src = fetchurl { url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz"; - sha256 = "0yrz3nnhv65v2jzz726bjswkn8ffqc1sr699qypc9m78qrdljcfn"; + sha256 = "1sgh55w3xpc0lb70s74cbyryxdjijk1fbv9b25jy8ms3lxaj966c"; }; buildInputs = [ pkgconfig libvirt ]; From 86af88d7c44e86996e1708dfaf8730a406f43853 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 18:11:44 +0200 Subject: [PATCH 063/168] perl docs: update generated expression This provides an up-to-date illustration of how `nix-generate-from-cpan` generates packages. --- doc/languages-frameworks/perl.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index 54b82f4a056..dfb463b9991 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -157,16 +157,16 @@ expression on standard output. For example: $ nix-generate-from-cpan XML::Simple - XMLSimple = buildPerlPackage { - name = "XML-Simple-2.20"; + XMLSimple = buildPerlPackage rec { + name = "XML-Simple-2.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz; - sha256 = "5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a"; + url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; + sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; meta = { - description = "Easily read/write XML (esp config files)"; - license = "perl"; + description = "An API for simple XML files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From f9f680013cb49adc2c791d4f73418f8e454be87d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 3 Sep 2016 16:35:19 +0200 Subject: [PATCH 064/168] haskell: fix ghcWithHoogle to version 4 Version 5 does not yet work with the ghcWithHoogle infrastructure. This fixes Hoogle to version 4 as a temporary measure. --- pkgs/development/haskell-modules/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 4bc9a2af550..baec1bfb818 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -85,7 +85,10 @@ let ghcWithHoogle = selectFrom: let packages = selectFrom self; - hoogle = callPackage ./hoogle.nix { inherit packages; }; + hoogle = callPackage ./hoogle.nix { + inherit packages; + hoogle = self.hoogle_4_2_43; + }; in withPackages (packages ++ [ hoogle ]); ghc = ghc // { From 1542bddcc8ea3fe95754e5f0ea316bd268af971d Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 3 Sep 2016 19:17:44 +0200 Subject: [PATCH 065/168] nixos-install.sh: Create /var (#18266) Got lost in a6670c1a0b8cda8235296900cff950f39f60cf4f --- nixos/modules/installer/tools/nixos-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 589a51fa709..0a452b86018 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -92,6 +92,7 @@ fi mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home mkdir -m 01777 -p $mountPoint/tmp mkdir -m 0755 -p $mountPoint/tmp/root +mkdir -m 0755 -p $mountPoint/var mkdir -m 0700 -p $mountPoint/root mount --rbind /dev $mountPoint/dev mount --rbind /proc $mountPoint/proc From 65786ba3226620acd783e8ba1e464ad00bd4a118 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 3 Sep 2016 20:10:46 +0200 Subject: [PATCH 066/168] odp-dpdk: 10.10.1.0 -> 2016-08-16 Fixes build against dpdk 16.06 Tested build against linux, linux_latest, linux_3_18, linux_4_1, linux_4_6, linux_grsec_nixos, linux_chromiumos_3_18. While this is pre-release, the delta since 10.10.1.0 seems to contain primarily fixes or internal improvements. Also cleanup build inputs while we're at it. --- pkgs/os-specific/linux/odp-dpdk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index faf57450ce1..e8b6cea08eb 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk, bash }: +{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk }: stdenv.mkDerivation rec { name = "odp-dpdk-${version}"; - version = "1.10.1.0"; + version = "2016-08-16"; src = fetchgit { url = "https://git.linaro.org/lng/odp-dpdk.git"; - rev = "0ed1ced007d98980f90604675083bf30c354e867"; - sha256 = "1kf090bizr0p0cxn525qpmypb5j86imvxrfpmwbl7vqqfh74j5ax"; + rev = "7068593f600e2b5a23ee1780d5c722c54e966df1"; + sha256 = "0pz0zkxqaac193x21wmj3x88gfza6bvhmv5yf8fzkpm9zxnl2sy4"; }; - nativeBuildInputs = [ autoreconfHook bash ]; - buildInputs = [ stdenv openssl dpdk libpcap ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl dpdk libpcap ]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; From dcaee875294106398ef15523087e35a9d3753066 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 3 Sep 2016 21:27:21 +0200 Subject: [PATCH 067/168] airwave: disable hydra build Relies on a file that must be downloaded manually. --- pkgs/applications/audio/airwave/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 74f0ed53705..95f86ad60ad 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -84,5 +84,6 @@ stdenv_multi.mkDerivation { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus ]; + hydraPlatforms = []; }; } From ad815f42067d7924717f145ec7e98d0969ec3565 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 3 Sep 2016 21:40:16 +0200 Subject: [PATCH 068/168] xapianBindings: 1.2.23 -> 1.4.0 The xapianBindings version is now directly tied to the input xapian version, to ensure that they're in synch. Also, as of this version, sphinx is required to build documentation for the python bindings. --- .../libraries/xapian/bindings/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index eeb480e6847..4db6e57546a 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -1,15 +1,18 @@ { stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib -, python ? null, php ? null, ruby ? null }: +, python ? null, sphinx ? null, php ? null, ruby ? null }: + +assert (python != null) -> (sphinx != null); let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.23"; + name = "xapian-bindings-${version}"; + version = (builtins.parseDrvName xapian.name).version; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz"; - sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r"; + url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz"; + sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s"; }; buildInputs = [ xapian pkgconfig zlib ]; @@ -19,7 +22,7 @@ composableDerivation.composableDerivation {} rec { wwf { name = "python"; enable = { - buildInputs = [ python ]; + buildInputs = [ python sphinx ]; # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f723fedd2da..284b7e8148f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9800,6 +9800,7 @@ in xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python php = php56; + sphinx = pythonPackages.sphinx; }; xapian-omega = callPackage ../tools/misc/xapian-omega { From 7a5239fddc4dd8461179e9d272efd0aa7e1576fc Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sat, 3 Sep 2016 21:48:02 +0200 Subject: [PATCH 069/168] idea.phpstorm10: init at 10.0.4 (moved from idea.phpstorm) --- pkgs/applications/editors/idea/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index ba987b059e9..732ad1ba88f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -238,6 +238,19 @@ in wmClass = "jetbrains-phpstorm"; }; + phpstorm10 = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "10.0.4"; + description = "Professional IDE for Web and PHP developers"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; + }; + wmClass = "jetbrains-phpstorm"; + }; + + webstorm = buildWebStorm rec { name = "webstorm-${version}"; version = "10.0.5"; From a785cec01bac9753d1a5aa1740878a5124794358 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 3 Sep 2016 14:13:46 -0400 Subject: [PATCH 070/168] dejavu-fonts environment collision After splitting the DejaVuSans.ttf file into a multiple output in the dejavu_fonts Nixpkgs expression it is not possible to install in the user profile due to the collision. The attached patch makes a new package without the collision for user environment installing. From fae78903c6ce56eda70a1a9a6914c41d248b15e8 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 3 Sep 2016 14:09:36 -0400 Subject: [PATCH] dejavu-fonts : Prepare an environment package without collision. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f723fedd2da..0d79c3d59be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11927,8 +11927,13 @@ in crimson = callPackage ../data/fonts/crimson {}; - dejavu_fonts = callPackage ../data/fonts/dejavu-fonts { + dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { inherit (perlPackages) FontTTF; + }); + + dejavu_fontsEnv = buildEnv { + name = "${dejavu_fonts.name}"; + paths = [ dejavu_fonts.out ]; }; dina-font = callPackage ../data/fonts/dina { }; From 766a018453b3ffeeef557ee65b45c1214f09f51f Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sat, 3 Sep 2016 15:52:17 -0500 Subject: [PATCH 071/168] zstd: 0.7.5 -> 1.0.0 Also updated to use the new repository location under facebook organization. --- pkgs/tools/compression/zstd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 7f2d3116603..e981a108914 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "0.7.5"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "07b4gmmkk2b28vmmhcg8h2imzccav1qklgvbdg2k6nl9p88zwzkd"; + sha256 = "0h8r8vlk8v28cxxgdp7h7dcygbpn8g95wffsvhzybxhfvkrlw6f2"; rev = "v${version}"; repo = "zstd"; - owner = "Cyan4973"; + owner = "facebook"; }; # The Makefiles don't properly use file targets, but blindly rebuild @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { compression speed. Speed/ratio trade-off is configurable by small increment, to fit different situations. Note however that decompression speed is preserved and remain roughly the same at all settings, a - property shared by most LZ compression algorithms, such as zlib. + property shared by most LZ compression algorithms, such as zlib. ''; homepage = http://www.zstd.net/; # The licence of the CLI programme is GPLv2+, that of the library BSD-2. From ad601446ca9c011e6a7737420a18c521d76bf004 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sat, 3 Sep 2016 16:02:01 -0500 Subject: [PATCH 072/168] fastjson: 0.99.2 -> 0.99.4 --- pkgs/development/libraries/fastjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 1b591efb578..4c4ddc3ba57 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "v0.99.2"; + version = "v0.99.4"; name = "fastjson-${version}"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; - rev = "eabae907c9d991143e17da278a239819f2e8ae1c"; - sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk"; + rev = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd"; + sha256 = "1pn207p9zns0aqm6z5l5fdgb94wyyhaw83lyvyfdxmai74nbqs65"; }; buildInputs = [ autoconf automake libtool ]; From eb2be6a148d7935ecd15243858e632e723815384 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sat, 3 Sep 2016 16:02:49 -0500 Subject: [PATCH 073/168] librelp: 1.2.8 -> 1.2.12 --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 52439f0fe2c..dce85331c1b 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.8"; + name = "librelp-1.2.12"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1qxj7isa2d10aw6c4a9pd3fx08vv06rrhac312avgcjmdqaa88r6"; + sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; }; buildInputs = [ pkgconfig gnutls zlib ]; From a8129aeaf72bcd2b28e5c0cd3f10a198b1137059 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sat, 3 Sep 2016 16:03:28 -0500 Subject: [PATCH 074/168] rsyslog: 8.17.0 -> 8.21.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index f3e6b15ed2c..f0495578f46 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.17.0"; + name = "rsyslog-8.21.0"; src = fetchurl { url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc"; + sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; }; #patches = [ ./fix-gnutls-detection.patch ]; From a4fbd144654df240dc6716b5d95264e12ff28af2 Mon Sep 17 00:00:00 2001 From: Miguel Madrid Date: Sun, 4 Sep 2016 00:23:01 +0200 Subject: [PATCH 075/168] netifaces: 0.13.4 -> 0.13.5 (#18267) --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7768df442ee..53ff452df7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14373,12 +14373,12 @@ in modules // { }; netifaces = buildPythonPackage rec { - version = "0.10.4"; + version = "0.10.5"; name = "netifaces-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/netifaces/${name}.tar.gz"; - sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln"; + sha256 = "12v2bm77dgaqjm9vmb8in0zpip2hn98mf5sycfvgq5iivm9avn2r"; }; meta = { From 8a96c52f637f7a85a3222c036b87ea0d81d47a14 Mon Sep 17 00:00:00 2001 From: Miguel Madrid Date: Sun, 4 Sep 2016 00:23:21 +0200 Subject: [PATCH 076/168] i3pystatus: 3.34 -> 3.35 (#18268) --- pkgs/applications/window-managers/i3/pystatus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 8754a14d4a4..68e77a54b5a 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; - version = "3.34"; + version = "3.35"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; src = fetchurl { url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "1bpkkf9q4zqq7fh65zynbv26nq24rfznmw71jjvda7g8kjrwjdk5"; + sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ From 04a760e31a9da791c1be1b0481a48220ccfd39cf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Sep 2016 00:37:53 +0200 Subject: [PATCH 077/168] fira-code: 1.200 -> 1.201 --- pkgs/data/fonts/fira-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 0cd18bb8820..86dd001374f 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "1.200"; + version = "1.201"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "1zja7fsfh3xx2qv9wv46997d02l5nm483b5s39jpmxfracj8qam7"; + sha256 = "11hwpdqj41wvzc8l8zgfb132cxn8kxpxbgiqc2kinc25x2l1ikji"; }; sourceRoot = "otf"; From 639f98ff3c001f171bc255c5a33b3c9c311ea999 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 4 Sep 2016 00:53:58 +0200 Subject: [PATCH 078/168] megatools: 1.9.94 -> 1.9.97 (#18254) --- pkgs/tools/networking/megatools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 7c2a437ab65..b06308acfc4 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "megatools-${version}"; - version = "1.9.94"; + version = "1.9.97"; src = fetchurl { url = "http://megatools.megous.com/builds/${name}.tar.gz"; - sha256 = "1kms0k652sszcbzmx5nmz07gc8zbqqiskh8hvmvf6xaga7y3lgrx"; + sha256 = "1wssf8f2ndh43sdzcfc644azqa7bjppl3b9s26mz1pjswmpca5ik"; }; buildInputs = [ pkgconfig glib fuse curl makeWrapper From 56b549d4c7e71a1847721f7ba85be9c05163a9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Sat, 3 Sep 2016 20:42:42 +0200 Subject: [PATCH 079/168] terraform: 0.7.1 -> 0.7.2 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d66209a6d20..72b38a00e0e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.1"; + version = "0.7.2"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1nvz4nqkn8pl25zyw7x5079dbzmwdxsar9gbcjk1srfpa746j1y4"; + sha256 = "002jg4iwg4g4hkg4hm3szlkyagqzipln3l44b8azh1a7vh1m8cp2"; }; postInstall = '' From c299dfb0fd3c97ce0964d71fb159f13e99fedc0e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 02:00:13 +0200 Subject: [PATCH 080/168] itk: 4.0.0 -> 4.10.0, fixes build See #18209. --- pkgs/development/libraries/itk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index eda9434ab65..ae1f9996b78 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, libX11, libuuid, xz}: stdenv.mkDerivation rec { - name = "itk-4.0.0"; + name = "itk-4.10.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz; - sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9"; + url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz; + sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a"; }; cmakeFlags = [ From 8d977ead386cf29b8b395caca536bfaec9c36efe Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 3 Sep 2016 16:42:09 -0400 Subject: [PATCH 081/168] setuid-wrappers : Prepare permissions for running wrappers The new setuid-wrappers in /run cannot be executed by users due to: 1) the temporary directory does not allow access 2) the /run is mounted nosuid --- nixos/modules/security/setuid-wrappers.nix | 1 + nixos/modules/tasks/filesystems.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index e1dca477d70..dcccd834286 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -117,6 +117,7 @@ in mkdir -p /run/setuid-wrapper-dirs wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX) + chmod a+rx $wrapperDir ${concatMapStrings makeSetuidWrapper setuidPrograms} diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9ab1baeacb9..a66ece1020f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -287,7 +287,7 @@ in boot.specialFileSystems = { "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; }; "/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; }; - "/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; }; + "/run" = { fsType = "tmpfs"; options = [ "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; }; "/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; }; "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; }; "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; }; From f144887ba027d74308374afb00e4476fee5aa6f6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Sep 2016 18:41:13 +0200 Subject: [PATCH 082/168] teeworlds: use wrapProgram Replace custom wrapper by wrapProgram tool. --- pkgs/games/teeworlds/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 4485f7f2b9b..ea337c208df 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, python, alsaLib, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype }: +{ fetchurl, stdenv, makeWrapper, python, alsaLib +, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype +}: stdenv.mkDerivation rec { name = "teeworlds-0.6.3"; @@ -11,7 +13,9 @@ stdenv.mkDerivation rec { # we always want to use system libs instead of these postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; - buildInputs = [ python alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype ]; + buildInputs = [ + python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype + ]; buildPhase = '' bam -a -v release @@ -38,12 +42,8 @@ stdenv.mkDerivation rec { # that they can access the graphics and sounds. for program in $executables do - mv -v "$out/bin/$program" "$out/bin/.wrapped-$program" - cat > "$out/bin/$program" < Date: Sun, 4 Sep 2016 09:39:17 +0200 Subject: [PATCH 083/168] pygtk: fix broken symlink ${pygobject.name} now contains a python2- prefix resulting in a broken symlink. this breaks pygtk and every depending application --- pkgs/development/python-modules/pygobject/default.nix | 5 +++-- pkgs/development/python-modules/pygtk/default.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 0bbe4ffb3c2..6723ba6b6a5 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }: mkPythonDerivation rec { - name = "pygobject-2.28.6"; - + name = "pygobject-${version}"; + version = "2.28.6"; + src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 60aa65323d7..5354d9750f4 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { postInstall = '' rm $out/bin/pygtk-codegen-2.0 ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \ + ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \ $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } From 8dc936c49f54919d51887c2404dbc2d936d47390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Sep 2016 10:04:28 +0200 Subject: [PATCH 084/168] gpodder: 3.9.0 -> 3.9.1 --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 8e9476cd3d8..f22aaa84b89 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -6,11 +6,11 @@ pythonPackages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l"; + sha256 = "036p9vnkr3if0k548xhhjmcwdaimy3yd24s3xd8vzlp0wdzkzrhn"; }; postPatch = with stdenv.lib; '' From 168d6fdf219d3f41d55cf33c984d9b4b212a3d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Sep 2016 10:53:20 +0200 Subject: [PATCH 085/168] lyx: clean the expression a bit Thanks to Sergiu Ivanov --- pkgs/applications/misc/lyx/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index db0980fa965..58d95d3b3fa 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { # python is run during runtime to do various tasks postFixup = '' - sed '1s:/usr/bin/python:${python}/bin/python:' - wrapProgram "$out/bin/lyx" \ --prefix PATH : '${python}/bin' ''; From e8dea0db30a0fede92ac22733deb33325ee53075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Sep 2016 11:05:57 +0200 Subject: [PATCH 086/168] dejavu_fontsEnv: explain the situation in a comment --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f94cd7257bb..8640701ab5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11931,6 +11931,7 @@ in inherit (perlPackages) FontTTF; }); + # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 dejavu_fontsEnv = buildEnv { name = "${dejavu_fonts.name}"; paths = [ dejavu_fonts.out ]; From b52d9374751052e577697bc93a2e28504a7bcd5a Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Thu, 18 Aug 2016 11:02:37 +0000 Subject: [PATCH 087/168] tcpkali: init at 0.9 --- lib/maintainers.nix | 1 + .../networking/tcpkali/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/tcpkali/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c29c9b4cf2..9f93fe32194 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -130,6 +130,7 @@ ericsagnes = "Eric Sagnes "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; + ethercrow = "Dmitry Ivanov "; exi = "Reno Reckling "; exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix new file mode 100644 index 00000000000..d28c162874e --- /dev/null +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -0,0 +1,21 @@ +{stdenv, autoreconfHook, fetchFromGitHub, bison}: + +let version = "0.9"; in + +stdenv.mkDerivation rec { + name = "tcpkali-${version}"; + src = fetchFromGitHub { + owner = "machinezone"; + repo = "tcpkali"; + rev = "v${version}"; + sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82"; + }; + buildInputs = [autoreconfHook bison]; + meta = { + description = "High performance TCP and WebSocket load generator and sink"; + license = stdenv.lib.licenses.bsd2; + inherit (src.meta) homepage; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ethercrow ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8640701ab5d..5cd04b5820d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3697,6 +3697,8 @@ in tcpflow = callPackage ../tools/networking/tcpflow { }; + tcpkali = callPackage ../applications/networking/tcpkali { }; + teamviewer = callPackage ../applications/networking/remote/teamviewer { stdenv = stdenv_32bit; }; From 1f7dfda8b86ab86be0df0b78ffb9d00cb2546f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 4 Sep 2016 11:29:49 +0200 Subject: [PATCH 088/168] ghcjs: fix eval /cc @svanderburg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ad771764743d9645084ac21730bb5a6cc11ce672) Signed-off-by: Domen Kožar --- pkgs/development/compilers/ghcjs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index b9356f0aa4b..565215f474e 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -19,6 +19,7 @@ , haddock-api , ghcjs-prim , regex-posix +, callPackage , bootPkgs, gmp , jailbreak-cabal @@ -128,7 +129,7 @@ in mkDerivation (rec { --with-gmp-libraries ${gmp.out}/lib ''; passthru = let - ghcjsNodePkgs = pkgs.nodePackages.override { + ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { generated = ./node-packages-generated.nix; self = ghcjsNodePkgs; }; From 0edc7eee2288214d4aa363f746b0ef6eaabf839d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Sep 2016 12:24:51 +0200 Subject: [PATCH 089/168] zotero: use firefox-esr-unwrapped instead of firefox-unwrapped --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8640701ab5d..b168557ba06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15581,7 +15581,7 @@ in }; zotero = callPackage ../applications/office/zotero { - firefox = firefox-unwrapped; + firefox = firefox-esr-unwrapped; }; zscroll = callPackage ../applications/misc/zscroll {}; From 4dfafbc0c3d1d7b418c8b3a097c7d2cded3e241e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Sep 2016 12:47:46 +0200 Subject: [PATCH 090/168] i2pd: 2.8.0 -> 2.9.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 2269e1a09c7..f12b2900e67 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "10rimw6ldnaijbjz1vmkrbrr5swbbqjydjrxd4y5xj2r8whq2mph"; + sha256 = "1xwcq7lklma0daamp9z76l9mgr3glpvicjgsr645rjhdv8a0mqwp"; }; buildInputs = [ boost zlib openssl ]; From c2851bc8418dbc4af9b4974b808e2846aae77cf4 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 12:55:50 +0200 Subject: [PATCH 091/168] idea.webstorm: 10.0.5 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 732ad1ba88f..69e74153dde 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -250,15 +250,14 @@ in wmClass = "jetbrains-phpstorm"; }; - webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "10.0.5"; + version = "2016.2.2"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; + sha256 = "0n2fvhjasklshyfcbwwn6wahzld8x65bid08245awdqv33p87bq6"; }; wmClass = "jetbrains-webstorm"; }; From fdbb72eb0af36b480aa4768742eb5123850c2ce0 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 12:56:58 +0200 Subject: [PATCH 092/168] idea.webstorm10: init at 10.0.5 (moved from idea.phpstorm) --- pkgs/applications/editors/idea/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 69e74153dde..ae58248640f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -262,4 +262,15 @@ in wmClass = "jetbrains-webstorm"; }; + webstorm10 = buildWebStorm rec { + name = "webstorm-${version}"; + version = "10.0.5"; + description = "Professional IDE for Web and JavaScript development"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; + sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; + }; + wmClass = "jetbrains-webstorm"; + }; } From 195759e2ecda99de61d4ccb9aa2782649d798b45 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 12:58:38 +0200 Subject: [PATCH 093/168] idea.webstorm11: init at 11.0.4 --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index ae58248640f..45a9c85c6b0 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -273,4 +273,16 @@ in }; wmClass = "jetbrains-webstorm"; }; + + webstorm11 = buildWebStorm rec { + name = "webstorm-${version}"; + version = "11.0.4"; + description = "Professional IDE for Web and JavaScript development"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; + sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24"; + }; + wmClass = "jetbrains-webstorm"; + }; } From 18ed1bebae8d64edc6480409bf65e4941729b5d6 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:02:03 +0200 Subject: [PATCH 094/168] idea.pycharm-professional: 2016.1.3 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 45a9c85c6b0..675dddaa29f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -216,12 +216,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.1.3"; + version = "2016.2.2"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1rn0i5qbvfjbl4v571ngmyslispibcq5ab0fb7xjl38vr1y417f2"; + sha256 = "08x2x6lhr9100lmw1dq8rkz4mlyj4avcj2hpbd5qqybx9j4g6g44"; }; wmClass = "jetbrains-pycharm"; }; From cd9a44200d4a254ca0d8ae91948f5ce7a695c675 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:04:05 +0200 Subject: [PATCH 095/168] idea.pycharm-community: 2016.1.3 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 675dddaa29f..40ea9b0478e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -204,12 +204,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.1.3"; + version = "2016.2.2"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1ks7crrfnhzkdxban2hh2pnr986vqwmac5zybmb1ighcyamhdi4q"; + sha256 = "1v6vy4xh0n8wdjc25clxg57z7ria11x1zdba4j1hjs2z6l80kxbb"; }; wmClass = "jetbrains-pycharm-ce"; }; From a83498317ce9961ec75341811f3b5800d0b3fe27 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:19:38 +0200 Subject: [PATCH 096/168] idea.ruby-mine: 7.1.5 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 40ea9b0478e..ce584e30747 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -192,12 +192,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.1.5"; + version = "2016.2.2"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; + sha256 = "1ck4axjbrvq2n1j2rvf9a2f7dqvalg2b8sqy9n9qkzdn04szaqsl"; }; wmClass = "jetbrains-rubymine"; }; From 4d528db13ac92dff5abb406213a2364c8527f5f0 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:20:20 +0200 Subject: [PATCH 097/168] idea.ruby-mine7: init at 7.1.5 (moved from idea.ruby-mine) --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index ce584e30747..2cb2d74e1ac 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -202,6 +202,18 @@ in wmClass = "jetbrains-rubymine"; }; + ruby-mine7 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "7.1.5"; + description = "The Most Intelligent Ruby and Rails IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; + }; + wmClass = "jetbrains-rubymine"; + }; + pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; version = "2016.2.2"; From 01b4cf5de511e288dfa66c19a5bb7598b43c4f9a Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:21:55 +0200 Subject: [PATCH 098/168] idea.ruby-mine8: init at 8.0.4 --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 2cb2d74e1ac..5f7dd731709 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -214,6 +214,18 @@ in wmClass = "jetbrains-rubymine"; }; + ruby-mine8 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "8.0.4"; + description = "The Most Intelligent Ruby and Rails IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + }; + wmClass = "jetbrains-rubymine"; + }; + pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; version = "2016.2.2"; From c1fcb007c481d79e9aa1dfa65d083b7027da0b25 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:25:25 +0200 Subject: [PATCH 099/168] idea.idea-ultimate: 2016.2.2 -> 2016.2.3 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5f7dd731709..2feab66638f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -180,12 +180,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.2.2"; + version = "2016.2.3"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1z5kr47n3hhx0ck163193lwlh76sykgchnq9hw1ihi25n6655j1z"; + sha256 = "1y8y3kav4icpsb85p5csag6f16jqg4gnvagsl5k1c793ccbl63yk"; }; wmClass = "jetbrains-idea"; }; From f7234f99615a4f67a6f03a4931a352a4182f0d45 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:26:18 +0200 Subject: [PATCH 100/168] idea.idea-community: 2016.2 -> 2016.2.3 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 2feab66638f..c6bb4a826e7 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -144,12 +144,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.2"; + version = "2016.2.3"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "164x4l0q31zpc1jh3js1xx9y6afrzsshmnkx1mwhmq8qmvzc4w32"; + sha256 = "014fddfxzc8nwhp1nz8mb9p7zwk73azvlgmzy2jd9ypfwi3dwgrs"; }; wmClass = "jetbrains-idea-ce"; }; From 70b6be3e3602808ccbd50025dfe1b3df5546a446 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 4 Sep 2016 12:26:43 +0100 Subject: [PATCH 101/168] nose-parameterized: re-enable for python2 by disabling tests. --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cffb0c02f2a..cf8e18564e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5242,7 +5242,8 @@ in modules // { sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685"; }; - disabled = !isPy3k; + # Tests require some python3-isms but code works without. + doCheck = isPy3k; LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose pkgs.glibcLocales ]; From 46343d6dad0138ecfc831e0a03ab1af294dd268e Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:29:15 +0200 Subject: [PATCH 102/168] idea.clion: 1.2.5 -> 2016.2.1 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index c6bb4a826e7..e28046eeba4 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -120,12 +120,12 @@ in { clion = buildClion rec { name = "clion-${version}"; - version = "1.2.5"; + version = "2016.2.1"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; + url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; + sha256 = "01a8qylfw8bsyywlxgysghjd7d2rlp9x3myd6nqhn7c1803pcks4"; }; wmClass = "jetbrains-clion"; }; From 330d791d1f5e83868cc3755ea36a54b33aa8ed74 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 13:29:47 +0200 Subject: [PATCH 103/168] idea.clion1: init at 1.2.5 (moved from idea.clion) --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e28046eeba4..99c656d75cb 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -130,6 +130,18 @@ in wmClass = "jetbrains-clion"; }; + clion1 = buildClion rec { + name = "clion-${version}"; + version = "1.2.5"; + description = "C/C++ IDE. New. Intelligent. Cross-platform"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; + sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; + }; + wmClass = "jetbrains-clion"; + }; + idea14-community = buildIdea rec { name = "idea-community-${version}"; version = "14.1.7"; From dd3b6ef357b18a5fd1793c803f4d54ec080f70a0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Sep 2016 14:43:23 +0300 Subject: [PATCH 104/168] megaglest: Fix build I'm guessing SDL propagated all this previously. --- pkgs/games/megaglest/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index a514cec7edc..b2a1fd499df 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua +{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu -, mesa_drivers }: +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +}: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; + stdenv.cc.cc glew mesa_glu wxGTK ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; }; - buildInputs = [ cmake git curl SDL xercesc openal lua libjpeg wxGTK - cppunit ftgl glew libogg libvorbis makeWrapper mesa_glu mesa_drivers ]; + buildInputs = [ cmake pkgconfig git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON From d21966a6fcf4465a3f80c8ff2a4b0f73f43c993d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 4 Sep 2016 13:44:15 +0200 Subject: [PATCH 105/168] pirate-get: 2.0.8 -> 2.0.9 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 677b757f1d9..a91bf20513c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7747,17 +7747,17 @@ in modules // { pirate-get = buildPythonPackage rec { name = "pirate-get-${version}"; - version = "0.2.8"; + version = "0.2.9"; disabled = !isPy3k; doCheck = false; src = pkgs.fetchurl { url = "mirror://pypi/p/pirate-get/${name}.tar.gz"; - sha256 = "033dwv0w9fx3dwrna3fzvmynsfhb2qjhx6f2i9sfv82ijvkm8ynz"; + sha256 = "1djmfghnwsn3z525h6d98r0lllayvzsg71z0gskk25zr24kjs24a"; }; - propagatedBuildInputs = with self; [ colorama veryprettytable pyquery ]; + propagatedBuildInputs = with self; [ colorama veryprettytable beautifulsoup4 ]; meta = { description = "A command line interface for The Pirate Bay"; From c4b0d80cba6375069db956f34022e3fa9ac1c564 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 4 Sep 2016 12:20:03 +0200 Subject: [PATCH 106/168] ispc: 20151128 -> 1.9.1, fix build --- pkgs/development/compilers/ispc/default.nix | 21 ++++++++++---------- pkgs/development/compilers/ispc/gcc5.patch | 22 --------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/compilers/ispc/gcc5.patch diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 08f0d7e06b1..c71f39749c3 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages}: +{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages, clangWrapSelf}: -# TODO: patch LLVM so Knights Landing works better (patch included in ispc github) +# TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? stdenv.mkDerivation rec { - version = "20151128"; - rev = "d3020580ff18836de2d4cae18901980b551d9d01"; + version = "1.9.1"; + rev = "v${version}"; name = "ispc-${version}"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "15qi22qvmlx3jrhrf3rwl0y77v66prpan6qb66a55dw3pw2d4jvn"; + sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; }; - enableParallelBuilding = false; + enableParallelBuilding = true; doCheck = true; @@ -26,12 +26,9 @@ stdenv.mkDerivation rec { bison flex llvm - clang + llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; - # https://github.com/ispc/ispc/pull/1190 - patches = [ ./gcc5.patch ]; - postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; installPhase = '' @@ -41,10 +38,12 @@ stdenv.mkDerivation rec { checkPhase = '' export ISPC_HOME=$PWD - python run_tests.py + PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py --non-interactive ''; makeFlags = [ + "CXX=${llvmPackages.clang}/bin/clang++" + "CLANG=${llvmPackages.clang}/bin/clang" "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" ]; diff --git a/pkgs/development/compilers/ispc/gcc5.patch b/pkgs/development/compilers/ispc/gcc5.patch deleted file mode 100644 index 4f2b7b682fe..00000000000 --- a/pkgs/development/compilers/ispc/gcc5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cbackend.cpp b/cbackend.cpp -index 3552205..9c05824 100644 ---- a/cbackend.cpp -+++ b/cbackend.cpp -@@ -1641,7 +1641,7 @@ void CWriter::printConstant(llvm::Constant *CPV, bool Static) { - V = Tmp.convertToDouble(); - } - -- if (isnan(V)) { -+ if (std::isnan(V)) { - // The value is NaN - - // FIXME the actual NaN bits should be emitted. -@@ -1665,7 +1665,7 @@ void CWriter::printConstant(llvm::Constant *CPV, bool Static) { - else - Out << "LLVM_NAN" << (Val == QuietNaN ? "" : "S") << "(\"" - << Buffer << "\") /*nan*/ "; -- } else if (isinf(V)) { -+ } else if (std::isinf(V)) { - // The value is Inf - if (V < 0) Out << '-'; - Out << "LLVM_INF" << diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 083d9b42acd..039de85708b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7760,7 +7760,7 @@ in isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_37; + llvmPackages = llvmPackages_39; }; itk = callPackage ../development/libraries/itk { }; From 94dd66882f7564922ea406838add0a4f6a14033c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Sep 2016 14:34:06 +0200 Subject: [PATCH 107/168] ferm: fix race condition in integration test (#18288) curl sent the request faster then nginx bound the port in some cases --- nixos/tests/ferm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index c0271269ca0..8f2a8c01eeb 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -54,6 +54,7 @@ import ./make-test.nix ({ pkgs, ...} : { $client->waitForUnit("network.target"); $server->waitForUnit("ferm.service"); $server->waitForUnit("nginx.service"); + $server->waitUntilSucceeds("ss -ntl | grep -q 80"); subtest "port 80 is allowed", sub { $client->succeed("curl --fail -g http://192.168.1.1:80/status"); From 9f2c48a7a7bb35d437ab3bbb3f23b552530af234 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 4 Sep 2016 15:48:45 +0300 Subject: [PATCH 108/168] qutebrowser: add cssutils dependency --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 490823860b1..3a62270afcf 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, glib_networking +, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav , qtwebkit-plugins }: @@ -46,7 +46,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039de85708b..516802b183b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14530,7 +14530,7 @@ in }; qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; From c40578ccbba98ce771de3dd2916515b772136852 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sun, 4 Sep 2016 15:52:34 +0300 Subject: [PATCH 109/168] plan9port 2015-11-10 -> 2016-04-18 (#18228) --- pkgs/tools/system/plan9port/default.nix | 38 ++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index f7668e1374a..798d6820cf4 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - name = "plan9port-2015-11-10"; + name = "plan9port-2016-04-18"; src = fetchgit { # Latest, same as on github, google code is old url = "https://plan9port.googlesource.com/plan9"; - rev = "0d2dfbc"; - sha256 = "1h16wvps4rfkjim2ihkmniw8wzl7yill5910larci1c70x6zcicf"; + rev = "35d43924484b88b9816e40d2f6bff4547f3eec47"; + sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc"; }; patches = [ @@ -29,23 +29,29 @@ stdenv.mkDerivation rec { find . -type f \ -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + #add missing ctrl+c\z\x\v keybind for non-Darwin + substituteInPlace src/cmd/acme/text.c \ + --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \ + --replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \ + --replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \ + --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; builder = ./builder.sh; NIX_LDFLAGS="-lgcc_s"; - buildInputs = stdenv.lib.optionals - (!stdenv.isDarwin) - [ which - perl - libX11 - fontconfig - xproto - libXt - xextproto - libXext - freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. - ]; + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ + which + perl + libX11 + fontconfig + xproto + libXt + xextproto + libXext + freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. + ]; enableParallelBuilding = true; @@ -53,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ]; + maintainers = with maintainers; [ ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; From f4443bb9ef7b92608b96e4221a18bcf679496ea9 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 4 Sep 2016 15:56:07 +0200 Subject: [PATCH 110/168] ispc: detect test failures, restrict platforms --- pkgs/development/compilers/ispc/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index c71f39749c3..f4539bb9299 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, which, m4, python, bison, flex, llvmPackages, clangWrapSelf}: +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf}: # TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; + # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real + # errors + #configurePhase = '' + # makeFlagsArray=( SHELL="${bash}/bin/bash -o pipefail" ) + #''; + installPhase = '' mkdir -p $out/bin cp ispc $out/bin @@ -38,7 +44,8 @@ stdenv.mkDerivation rec { checkPhase = '' export ISPC_HOME=$PWD - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py --non-interactive + PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py --non-interactive --verbose --file=test_output.log + fgrep -q "No new fails" test_output.log || exit 1 ''; makeFlags = [ @@ -51,7 +58,7 @@ stdenv.mkDerivation rec { homepage = https://ispc.github.io/ ; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = ["x86_64-linux"]; # TODO: buildable on more platforms? maintainers = [ maintainers.aristid ]; }; } From 8b38b6aae2f292339e1be04239361fba71c00774 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 4 Sep 2016 16:42:26 +0300 Subject: [PATCH 111/168] runVM: check exit code before postVM eval --- pkgs/build-support/vm/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5b407f530dc..81a9f89dd10 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -261,9 +261,12 @@ rec { exit 1 fi - eval "$postVM" + exitCode="$(cat xchg/in-vm-exit)" + if [ "$exitCode" != "0" ]; then + exit "$exitCode" + fi - exit $(cat xchg/in-vm-exit) + eval "$postVM" ''; From 698cadd714ed19ec463e3845be2aa87718521eaf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 4 Sep 2016 16:42:43 +0300 Subject: [PATCH 112/168] runVM: mount devpts --- pkgs/build-support/vm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 81a9f89dd10..07ea6f6e76b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -123,8 +123,9 @@ rec { mkdir -p /fs/dev mount -o bind /dev /fs/dev - mkdir -p /fs/dev /fs/dev/shm + mkdir -p /fs/dev/shm /fs/dev/pts mount -t tmpfs -o "mode=1777" none /fs/dev/shm + mount -t devpts none /fs/dev/pts echo "mounting Nix store..." mkdir -p /fs/nix/store From 73a4a917ec5865bba2c1ba082f82f41bdbf305d9 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 29 Aug 2016 12:39:09 +0200 Subject: [PATCH 113/168] wayland-protocols: 1.4 -> 1.7 --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 57d3664447a..dda1bd36976 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.4"; + version = "1.7"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0wpm7mz7ww6nn3vrgz7a9iyk7mk6za73wnq0n54lzl8yq8irljh1"; + sha256 = "07qw166s6bm81zfnhf4lmww6wj0il960fm3vp7n1z3rign9jlpv3"; }; nativeBuildInputs = [ pkgconfig ]; From 0d751662526cc990260aa20bf23a78f55b100efa Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 29 Aug 2016 14:29:06 +0200 Subject: [PATCH 114/168] wlc: 1.3 -> 1.5 use system-wide chck and wayland-protocols enable tests --- pkgs/development/libraries/wlc/default.nix | 48 +++++----------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 71cd246e742..144e9c09180 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -5,51 +5,25 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "v0.0.3"; + version = "0.0.5"; - chck_repo = "https://github.com/Cloudef/chck"; - chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc"; - - wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols"; - wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8"; - wl_protos_rev_short = "0b05b70"; - - srcs = [ - (fetchFromGitHub { - owner = "Cloudef"; - repo = "wlc"; - rev = version; - sha256 = "0l29axg4y7qjd5hf3kgf38hkjykb4mcsjkba0zdm583kkjzdzkb2"; - }) - (fetchurl { - url = "${chck_repo}/archive/${chck_rev}.tar.gz"; - sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e"; - }) - (fetchgit { - url = "${wl_protos_repo}"; - rev = "${wl_protos_rev}"; - sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224"; - }) - ]; - - sourceRoot = "wlc-${version}-src"; - - postUnpack = '' - rm -rf wlc-*/lib/chck ${sourceRoot}/protos/wayland-protocols - ln -s ../../chck-${chck_rev} ${sourceRoot}/lib/chck - ln -s ../../wayland-protocols-${wl_protos_rev_short} ${sourceRoot}/protos/wayland-protocols - ''; + src = fetchgit { + url = "https://github.com/Cloudef/wlc"; + rev = "refs/tags/v${version}"; + sha256 = "0pg95n488fjlkc8n8x1h2dh4mxb7qln6mrq906lwwqv94aks9b43"; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev - libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm - systemd dbus_libs + libX11 libXdamage systemd dbus_libs ]; - makeFlags = "PREFIX=$(out) -lchck"; - installPhase = "PREFIX=$out make install"; + + doCheck = true; + checkTarget = "test"; meta = { description = "A library for making a simple Wayland compositor"; From 3ca74495d211408286564b140badd3631089d4ab Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 4 Sep 2016 14:11:15 +0000 Subject: [PATCH 115/168] xapianBindings: fix calls to sphinx-bulid in python bindings Makefile --- .../development/libraries/xapian/bindings/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index 4db6e57546a..7187f9b575f 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -23,6 +23,17 @@ composableDerivation.composableDerivation {} rec { name = "python"; enable = { buildInputs = [ python sphinx ]; + + # Our `sphinx-build` binary is a shell wrapper around + # `sphinx-build` python code. Makefile tries to execute it + # using python2 and fails. Fixing that here. + patchPhase = '' + for a in python/Makefile* ; do + substituteInPlace $a \ + --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)' + done + ''; + # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages From 8f6664b74434f449e831496acd167ac33f233191 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 4 Sep 2016 14:18:00 +0000 Subject: [PATCH 116/168] xapian-omega: pin to xapian library version --- pkgs/tools/misc/xapian-omega/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix index c3798878f1b..7c64c2e90d4 100644 --- a/pkgs/tools/misc/xapian-omega/default.nix +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = "1.4.0"; + version = (builtins.parseDrvName xapian.name).version; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; From 8acd3960cf2b4b263079bf7c180fd93c3d8489f9 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 4 Sep 2016 14:15:26 +0000 Subject: [PATCH 117/168] xapian-omega: move into xapian directory --- .../libraries/xapian/tools/omega}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/misc/xapian-omega => development/libraries/xapian/tools/omega}/default.nix (100%) diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix similarity index 100% rename from pkgs/tools/misc/xapian-omega/default.nix rename to pkgs/development/libraries/xapian/tools/omega/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 284b7e8148f..724fe166263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9803,7 +9803,7 @@ in sphinx = pythonPackages.sphinx; }; - xapian-omega = callPackage ../tools/misc/xapian-omega { + xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; }; From ee1b7f98799134f12981af3aacc3abbe2429d5bd Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 29 Aug 2016 15:06:31 +0200 Subject: [PATCH 118/168] orbment: git-2016-01-31 -> git-2016-08-13 --- .../window-managers/orbment/default.nix | 56 +++++-------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index e7cbd004087..8071bc4bb42 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -1,55 +1,29 @@ -{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng, libdrm, libX11 +{ lib, stdenv, fetchgit, cmake, pkgconfig +, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng +, libdrm, libX11 }: stdenv.mkDerivation rec { name = "orbment-${version}"; - version = "git-2016-01-31"; - repo = "https://github.com/Cloudef/orbment"; - rev = "7f649fb76649f826dd29578a5ec41bb561b116eb"; + version = "git-2016-08-13"; - chck_repo = "https://github.com/Cloudef/chck"; - chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc"; - inihck_repo = "https://github.com/Cloudef/inihck"; - inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c"; - - srcs = [ - (fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "5a426da0d5f4487911cfe9226865ed0cd1a7cdf253eec19d5eadc4b0d14a2ea0"; - }) - (fetchurl { - url = "${chck_repo}/archive/${chck_rev}.tar.gz"; - sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e"; - }) - (fetchurl { - url = "${inihck_repo}/archive/${inihck_rev}.tar.gz"; - sha256 = "d21f2ac25eafed285614f5f0ef7a1014d629ba382f4e64bc89fe2c3e98c2777f"; - }) - ]; - - sourceRoot = "orbment-${rev}"; - postUnpack = '' - rm -rf orbment-${rev}/lib/chck orbment-${rev}/lib/inihck - ln -s ../../chck-${chck_rev} orbment-${rev}/lib/chck - ln -s ../../inihck-${inihck_rev} orbment-${rev}/lib/inihck - ''; + src = fetchgit { + url = "https://github.com/Cloudef/orbment"; + rev = "01dcfff9719e20261a6d8c761c0cc2f8fa0d0de5"; + sha256 = "04mv9nh847vijr01zrs47fzmnwfhdx09vi3ddv843mx10yx7lqdb"; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ makeWrapper wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; - makeFlags = "PREFIX=$(out)"; - installPhase = "PREFIX=$out make install"; - - LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libdrm dbus_libs ]; - preFixup = '' - wrapProgram $out/bin/orbment \ - --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; - ''; + buildInputs = [ + wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 + libdrm + ]; meta = { description = "Modular Wayland compositor"; - homepage = repo; + homepage = src.url; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; From 5d7adc7b093a00b3dc0ef97fa657160815161b9f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 4 Sep 2016 17:27:21 +0300 Subject: [PATCH 119/168] crawlTiles: fix build --- pkgs/games/crawl/crawl_purify.patch | 23 ++++++++++++++--------- pkgs/games/crawl/default.nix | 4 ++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 0e2d335adac..bfd79844bcb 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,8 +1,7 @@ -diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile -index b7e2fbf..5ff23db 100644 ---- a/crawl-ref/source/Makefile -+++ b/crawl-ref/source/Makefile -@@ -273,7 +273,7 @@ endif +diff -ru3 crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile crawl-ref-0.18.1-src/crawl-ref/source/Makefile +--- crawl-ref-0.18.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.18.1-src/crawl-ref/source/Makefile 2016-09-04 17:25:54.310929928 +0300 +@@ -285,7 +285,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a ifndef CROSSHOST @@ -11,21 +10,27 @@ index b7e2fbf..5ff23db 100644 else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for -@@ -943,7 +943,7 @@ else +@@ -957,9 +957,9 @@ SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ {\ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ - for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ + for dir in ${dejavu_fonts}/share/fonts;\ do [ -d $$dir ] && echo $$dir; done;\ - } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) +- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) ++ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) ifneq (,$(SYS_PROPORTIONAL_FONT)) -@@ -968,7 +968,7 @@ else + ifeq (,$(COPY_FONTS)) + DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" +@@ -982,9 +982,9 @@ SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ {\ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ - for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ + for dir in ${dejavu_fonts}/share/fonts;\ do [ -d $$dir ] && echo $$dir; done;\ - } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) +- } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) ++ } | xargs -I% find -L % -type f -iname $$name -print | head -n1; } 2>/dev/null) ifneq (,$(SYS_MONOSPACED_FONT)) + ifeq (,$(COPY_FONTS)) + DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 186768617f7..2a1e9232c23 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype +, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush , tileMode ? false }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./crawl_purify.patch ]; - nativeBuildInputs = [ pkgconfig which perl ]; + nativeBuildInputs = [ pkgconfig which perl pngcrush ]; # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] From 095c7aefe1c5d7fea8467f19473a1895cb2df17f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 4 Sep 2016 16:30:07 +0200 Subject: [PATCH 120/168] nixos/manual: mentioning other zsh options at program.zsh.enable fixes #13224 --- nixos/modules/programs/zsh/zsh.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 1b8b7a79593..91cd8441692 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -25,7 +25,10 @@ in enable = mkOption { default = false; description = '' - Whether to configure zsh as an interactive shell. + Whether to configure zsh as an interactive shell. To enable zsh for + a particular user, use the + option for that user. To enable zsh system-wide use the + option. ''; type = types.bool; }; From 4d308dcd5172395a3671ab7c2ed7ee7d23a0864e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 3 Sep 2016 14:01:30 +0000 Subject: [PATCH 121/168] mdf2iso: init at 0.3.1 --- pkgs/tools/cd-dvd/mdf2iso/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/cd-dvd/mdf2iso/default.nix diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix new file mode 100644 index 00000000000..c87d5783ff6 --- /dev/null +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchgit}: + +stdenv.mkDerivation rec { + name = "mdf2iso-${version}"; + version = "0.3.1"; + + src = fetchgit { + url = https://anonscm.debian.org/cgit/collab-maint/mdf2iso.git; + rev = "5a8acaf3645bff863f9f16ea1d3632c312f01523"; + sha256 = "0f2jx8dg1sxc8y0sisqhqsqg7pj1j84fp08nahp0lfcq522pqbhl"; + }; + + meta = with stdenv.lib; { + description = "Small utility that converts MDF images to ISO format"; + homepage = src.url; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.oxij ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c47d59069a..9e04389e6a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1020,6 +1020,8 @@ in cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; + mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; + libceph = self.ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = self.ceph; From 2f33b0611955eb6384332c52460a375765c1a1a4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 4 Sep 2016 17:03:34 +0200 Subject: [PATCH 122/168] ispc: extend test suite --- pkgs/development/compilers/ispc/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index f4539bb9299..08958a42b44 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf}: +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, +testedTargets ? ["sse4" "host"] +}: # TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? @@ -6,6 +8,8 @@ stdenv.mkDerivation rec { version = "1.9.1"; rev = "v${version}"; + inherit testedTargets; + name = "ispc-${version}"; src = fetchFromGitHub { @@ -44,8 +48,14 @@ stdenv.mkDerivation rec { checkPhase = '' export ISPC_HOME=$PWD - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py --non-interactive --verbose --file=test_output.log - fgrep -q "No new fails" test_output.log || exit 1 + for target in $testedTargets + do + echo "Testing target $target" + echo "================================" + echo + PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log + fgrep -q "No new fails" test_output.log || exit 1 + done ''; makeFlags = [ From 30da3de95d045c14a9b320e2696d108ca432eaaa Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 4 Sep 2016 17:12:45 +0200 Subject: [PATCH 123/168] pythonPackages.pillow: add lcms2 support --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a3c0a3a2ea..7e7eb9375ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17786,9 +17786,11 @@ in modules // { -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude' pkgs.libwebp}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude pkgs.lcms2}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ; s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' pkgs.tcl}|g ;' + export LDFLAGS="-L${pkgs.libwebp}/lib" + export CFLAGS="-I${pkgs.libwebp}/include" '' # Remove impurities + stdenv.lib.optionalString stdenv.isDarwin '' From c536a3fa2fd42f46c0cb15e17a74f060a4a8f63c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Sep 2016 18:32:08 +0300 Subject: [PATCH 124/168] linuxPackages_testing: Don't recurseIntoAttrs The -rc kernels are quite likely to break out-of-tree modules and thus cause unnecessary Hydra failures. (Note that linux_testing already has `hydraPlatforms = [];` but that does not prevent the package from being built since it has reverse dependencies. Arguably that could be considered undesirable and thus fixing that could be considered the proper fix, but this should do for now.) --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80ebc852a5f..dfd94e1fb29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11408,7 +11408,10 @@ in linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! - linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); + + # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. + linuxPackages_testing = self.linuxPackagesFor self.linux_testing linuxPackages_testing; + linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; allowImportFromDerivation=true;}) From 393e646e4fab06b58542ace3ca2a90eab22c809d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 4 Sep 2016 17:56:00 +0200 Subject: [PATCH 125/168] setuid-wrappers: correctly umount the tmpfs --- nixos/modules/security/setuid-wrappers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index dcccd834286..fe220c94313 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -132,7 +132,7 @@ in # Compatibility with old state, just remove the folder and symlink rm -f ${wrapperDir}/* # if it happens to be a tmpfs - umount ${wrapperDir} || true + ${pkgs.utillinux}/bin/umount ${wrapperDir} || true rm -d ${wrapperDir} ln -d --symbolic $wrapperDir ${wrapperDir} else From 7bc6fa344a2fe616135696b2f26a328e6235366b Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:23:51 +0200 Subject: [PATCH 126/168] php70Packages.v8js: init at 1.3.2 --- pkgs/top-level/php-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e8af3c2dbf9..ed75997e7ef 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -207,6 +207,16 @@ let }; }; + v8js = assert isPhp7; buildPecl rec { + version = "1.3.2"; + name = "v8js-${version}"; + + sha256 = "1x7gxi70zgj3vaxs89nfbnwlqcxrps1inlyfzz66pbzdbfwvc8z8"; + + buildInputs = [ pkgs.v8 ]; + configureFlags = [ "--with-v8js=${pkgs.v8}" ]; + }; + composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; version = "1.2.0"; From df3103729e7a34585e236896f683b4efcc077554 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:24:11 +0200 Subject: [PATCH 127/168] phpPackages.spidermonkey: init a 1.0.0 --- pkgs/top-level/php-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ed75997e7ef..e0c5fc68af7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -81,6 +81,19 @@ let buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; }; + # No support for PHP 7 yet (and probably never will be) + spidermonkey = assert !isPhp7; buildPecl rec { + name = "spidermonkey-1.0.0"; + + sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg"; + + configureFlags = [ + "--with-spidermonkey=${pkgs.spidermonkey_185}" + ]; + + buildInputs = [ pkgs.spidermonkey_185 ]; + }; + xdebug = if isPhp7 then xdebug24 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { From c76c0bedc10a5443bce53915cb77b1c3dd89b2b0 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:42:39 +0200 Subject: [PATCH 128/168] php70Packages.v8: init at 0.1.0 --- pkgs/top-level/php-packages.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e0c5fc68af7..9bebfa3d915 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -220,6 +220,37 @@ let }; }; + v8 = assert isPhp7; buildPecl rec { + version = "0.1.0"; + name = "v8-${version}"; + + src = pkgs.fetchurl { + url = "https://github.com/pinepain/php-v8/archive/v${version}.tar.gz"; + sha256 = "18smnxd34b486f5n8j0wk9z7r5x1w84v89mgf76z0bn7gxdxl0xj"; + }; + + buildInputs = [ pkgs.v8 ]; + configureFlags = [ "--with-v8=${pkgs.v8}" ]; + + patches = [ + (builtins.toFile "link-libv8_libbase.patch" '' + Index: php-v8/config.m4 + =================================================================== + --- php-v8.orig/config.m4 + +++ php-v8/config.m4 + @@ -69,7 +69,7 @@ if test "$PHP_V8" != "no"; then + #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" + ;; + * ) + - static_link_extra="libv8_libplatform.a" + + static_link_extra="libv8_libplatform.a libv8_libbase.a" + #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" + ;; + esac + '' + )]; + }; + v8js = assert isPhp7; buildPecl rec { version = "1.3.2"; name = "v8js-${version}"; From b577f2997e9990f3d5447c351d192404a163263c Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Sun, 4 Sep 2016 16:02:57 -0400 Subject: [PATCH 129/168] sway: 0.8 -> 0.9 --- pkgs/applications/window-managers/sway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 62b0b9c11ea..df4a33fbd46 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.8"; + version = "0.9"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,7 +13,7 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "10i62cn1z7fwg0jwkskmzcaha39lprkl4zvkp59jr5wvpjligdq3"; + sha256 = "0qqqg23rknxnjcgvkfrx3pijqc3dvi74qmmavq07vy2qfs1xlwg0"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; From 269f739dedf525e4ef0f1ae326df1b0ed5ba4f1d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Sep 2016 19:22:00 +0200 Subject: [PATCH 130/168] grsecurity module: set nixpkgs.config.grsecurity = true --- nixos/modules/security/grsecurity.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index ea1064c2d42..7ba25f866f2 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -72,6 +72,8 @@ in (isNO "GRKERNSEC_NO_RBAC") ]; + nixpkgs.config.grsecurity = true; + # Install PaX related utillities into the system profile. environment.systemPackages = with pkgs; [ gradm paxctl pax-utils ]; From 373afbd516de07d8e30e6e25be45700986f9ab1f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 4 Sep 2016 19:19:42 +0200 Subject: [PATCH 131/168] salut_a_toi: Fix typo in build phase (cherry picked from commit c47eb4a43a9ab338c26b6b05d59ad0cb90507ed1) --- .../networking/instant-messengers/salut-a-toi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index d442addaeaa..78814fcb4b2 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ''; buildPhase = '' - ${python.interpreter}setup.py build + ${python.interpreter} setup.py build ''; installPhase = '' From 045bcfef4b976b364d9306db6679d4b62acef928 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 03:29:24 +0300 Subject: [PATCH 132/168] maintainers: add aske --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c29c9b4cf2..9f0ba2767d3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -40,6 +40,7 @@ arobyn = "Alexei Robyn "; artuuge = "Artur E. Ruuge "; ashalkhakov = "Artyom Shalkhakov "; + aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; From 5b61020e056462ebe34d6580e43ea83a14894061 Mon Sep 17 00:00:00 2001 From: aske Date: Sun, 4 Sep 2016 23:44:45 +0300 Subject: [PATCH 133/168] speechd: 0.8.3 -> 0.8.5 --- pkgs/development/libraries/speechd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 1a943be0fc2..ee45c0d1c65 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "speech-dispatcher-${version}"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; - sha256 = "0kqy7z4l59n2anc7xn588w4rkacig1hajx8c53qrh90ypar978ln"; + sha256 = "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb"; }; buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ] From d6936f47db661e77404577ae19adee69abd56109 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:32:31 +0300 Subject: [PATCH 134/168] pcaudiolib: init at 2016-07-19 --- .../libraries/pcaudiolib/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/pcaudiolib/default.nix diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix new file mode 100644 index 00000000000..ccb7d4179df --- /dev/null +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, + alsaLib, portaudio, + pulseaudioSupport ? true, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "pcaudiolib-${version}"; + version = "2016-07-19"; + + src = fetchFromGitHub { + owner = "rhdunn"; + repo = "pcaudiolib"; + rev = "4f836ea909bdaa8a6e0e89c587efc745b546b459"; + sha256 = "0z99nh4ibb9md2cd21762n1dmv6jk988785s1cxd8lsy4hp4pwfa"; + }; + + nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; + + buildInputs = [ portaudio alsaLib ] ++ lib.optional pulseaudioSupport libpulseaudio; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Provides a C API to different audio devices"; + homepage = "https://github.com/rhdunn/pcaudiolib"; + license = licenses.gpl3; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0102a4d97ec..a2efa372ede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9015,6 +9015,10 @@ in pangoxsl = callPackage ../development/libraries/pangoxsl { }; + pcaudiolib = callPackage ../development/libraries/pcaudiolib { + pulseaudioSupport = config.pulseaudio or true; + }; + pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = callPackage ../development/libraries/pcl { From 48884e06ccd6867406d27a912960a3642b9c7415 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:37:52 +0300 Subject: [PATCH 135/168] sonic: init at 2016-03-01 --- pkgs/development/libraries/sonic/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/sonic/default.nix diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix new file mode 100644 index 00000000000..f5927cb73e6 --- /dev/null +++ b/pkgs/development/libraries/sonic/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "sonic-${version}"; + version = "2016-03-01"; + + src = fetchFromGitHub { + owner = "waywardgeek"; + repo = "sonic"; + rev = "71bdf26c55716a45af50c667c0335a9519e952dd"; + sha256 = "1kcl8fdf92kafmfhvyjal5gvkn99brkjyzbi9gw3rd5b30m3xz2b"; + }; + + postPatch = '' + sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile + ''; + + meta = with stdenv.lib; { + description = "Simple library to speed up or slow down speech"; + homepage = "https://github.com/waywardgeek/sonic"; + license = licenses.asl20; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2efa372ede..b40a0432b26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9418,6 +9418,8 @@ in sofia_sip = callPackage ../development/libraries/sofia-sip { }; + sonic = callPackage ../development/libraries/sonic { }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; From a6ce0f80fb0b1525ed0a55e2feb02a00ae023ff1 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:44:30 +0300 Subject: [PATCH 136/168] espeak-ng: init at 2016-08-28 --- pkgs/applications/audio/espeak-ng/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/espeak-ng/default.nix diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix new file mode 100644 index 00000000000..cb2e15bc5b2 --- /dev/null +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig +, ronn +, pcaudiolibSupport ? true, pcaudiolib +, sonicSupport ? true, sonic }: + +stdenv.mkDerivation rec { + name = "espeak-ng-${version}"; + version = "2016-08-28"; + + src = fetchFromGitHub { + owner = "espeak-ng"; + repo = "espeak-ng"; + rev = "b784e77c5708b61feed780d8f1113c4c8eb92200"; + sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk"; + }; + + nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; + + buildInputs = lib.optional pcaudiolibSupport pcaudiolib + ++ lib.optional sonicSupport sonic; + + preConfigure = "./autogen.sh"; + + postInstall = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng + ''; + + meta = with stdenv.lib; { + description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; + homepage = "https://github.com/espeak-ng/espeak-ng"; + license = licenses.gpl3; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b40a0432b26..b5863ae40d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12963,6 +12963,8 @@ in espeak = callPackage ../applications/audio/espeak { }; + espeak-ng = callPackage ../applications/audio/espeak-ng { }; + espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; esniper = callPackage ../applications/networking/esniper { }; From f0cf058c130cdd0716e56107ff40b3873ad7715f Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:47:26 +0300 Subject: [PATCH 137/168] espeak-ng: use instead of espeak --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5863ae40d6..0bd530b6067 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12961,9 +12961,10 @@ in pythonPackages = python3Packages; }; - espeak = callPackage ../applications/audio/espeak { }; + espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; + espeak = self.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; From 2e88851c618696712016793177ccd26211851f98 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 5 Sep 2016 01:14:36 -0400 Subject: [PATCH 138/168] dpkg: Fix the build on Darwin There are still some bugs and quirks, but this gets dpkg building at least, and some parts of it are useful. --- pkgs/tools/package-management/dpkg/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index a7bda2578ae..ce720898255 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--disable-dselect" "--with-admindir=/var/lib/dpkg" "PERL_LIBDIR=$(out)/${perl.libPrefix}" + (stdenv.lib.optionalString stdenv.isDarwin "--disable-linker-optimisations") + (stdenv.lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon") ]; preConfigure = '' @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mornfall nckx ]; }; } From ee501fd49aabc179e1ccbe08f625f49ab2066173 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 5 Sep 2016 02:13:47 -0700 Subject: [PATCH 139/168] networkmanager: add information from wiki to docs (#18245) * networkmanager: add information from wiki to docs Specifically: * mention nmcli, nmtui * mention gtk and kde applets fixes #13273 --- .../manual/configuration/network-manager.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index b7e47b8729f..dafbcfcb1e5 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -16,12 +16,22 @@ networking.networkmanager.enable = true; some desktop managers (e.g., GNOME) enable NetworkManager automatically for you. -All users that should have permission to change network settings -must belong to the networkmanager group. +All users that should have permission to change network settings must +belong to the networkmanager group: + + +users.extraUsers.youruser.extraGroups = [ "networkmanager" ]; + + + +NetworkManager is controlled using either nmcli or +nmtui (curses-based terminal user interface). See their +manual pages for details on their usage. Some desktop environments (GNOME, KDE) +have their own configuration tools for NetworkManager. networking.networkmanager and -networking.wireless can not be enabled at the same time: -you can still connect to the wireless networks using +networking.wireless (WPA Supplicant) cannot be enabled at the same +time: you can still connect to the wireless networks using NetworkManager. From 33229f0d876bfce08ae5b0a34dd014b7e406077e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 5 Sep 2016 12:48:21 +0200 Subject: [PATCH 140/168] libreoffice: set big-parallel hydra feature to build it quicker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example http://hydra.nixos.org/build/39781012 took 6h (cherry picked from commit a29f6a5e8e1c2d6ec4adc78143c5479121d550bc) Signed-off-by: Domen Kožar --- pkgs/applications/office/libreoffice/default.nix | 1 + pkgs/applications/office/libreoffice/still.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 40983c918ac..caf500d2b97 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -268,5 +268,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; hydraPlatforms = []; + requiredSystemFeatures = [ "big-parallel" ]; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index d873ca0a02f..681870ac4ca 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -271,5 +271,6 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; + requiredSystemFeatures = [ "big-parallel" ]; }; } From db481dca316fded5d538e325023146815e3932cb Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Mon, 5 Sep 2016 13:27:00 +0200 Subject: [PATCH 141/168] doc/language-frameworks/haskell.md: typo in code example. (#18313) --- doc/languages-frameworks/haskell.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 18b2fd65f44..904e3a5069e 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -383,7 +383,7 @@ You can select a particular GHC version to compile with by setting the Stack choose what GHC version it wants based on the snapshot specified in `stack.yaml` (only works with Stack >= 1.1.3): - {nixpkgs ? import { }, ghc ? nixpkgs.ghc} + {nixpkgs ? import { }, ghc ? nixpkgs.ghc}: with nixpkgs; From 2583c70e9158c982e141e8b3a92861091b80dd14 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 12:00:03 +0200 Subject: [PATCH 142/168] libedit: 20150325-3.1 -> 20160903-3.1 Also, use a separate "dev" output. This is mostly to remove ncurses.dev from openssh's runtime closure. --- pkgs/development/libraries/libedit/default.nix | 12 +++++++----- .../libraries/libedit/freebsd-wchar.patch | 13 ------------- pkgs/development/libraries/libedit/freebsd.patch | 13 ------------- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/libedit/freebsd-wchar.patch delete mode 100644 pkgs/development/libraries/libedit/freebsd.patch diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 7868c2cfd14..c61876713c1 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20150325-3.1"; + name = "libedit-20160903-3.1"; src = fetchurl { - url = "http://www.thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "1if8zi9h52m80ck796an28rrqfljk2n8cn25m3fl0prwz155x2n8"; + url = "http://thrysoee.dk/editline/${name}.tar.gz"; + sha256 = "0rvmm8z6hal5bbp5pljp7yvkpqi4pkas1amizhvg35v0skkx5jqc"; }; + outputs = [ "out" "dev" ]; + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; - patches = [ ./01-cygwin.patch ./freebsd-wchar.patch ]; + patches = [ ./01-cygwin.patch ]; propagatedBuildInputs = [ ncurses ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.thrysoee.dk/editline/"; + homepage = http://www.thrysoee.dk/editline/; description = "A port of the NetBSD Editline library (libedit)"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch deleted file mode 100644 index 6bf7fb0ef69..00000000000 --- a/pkgs/development/libraries/libedit/freebsd-wchar.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chartype.h b/src/chartype.h -index 0beee17..4ac86f3 100644 ---- a/src/chartype.h -+++ b/src/chartype.h -@@ -44,7 +44,7 @@ - * supports non-BMP code points without requiring UTF-16, but nothing - * seems to actually advertise this properly, despite Unicode 3.1 having - * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/pkgs/development/libraries/libedit/freebsd.patch b/pkgs/development/libraries/libedit/freebsd.patch deleted file mode 100644 index e230a76d709..00000000000 --- a/pkgs/development/libraries/libedit/freebsd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chartype.h b/src/chartype.h -index c35825c..be5aac0 100644 ---- a/src/chartype.h -+++ b/src/chartype.h -@@ -44,7 +44,7 @@ - * supports non-BMP code points without requiring UTF-16, but nothing - * seems to actually advertise this properly, despite Unicode 3.1 having - * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) -+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other From 8295089e6a08798f9cd733ee76e82d939d09faab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 12:13:31 +0200 Subject: [PATCH 143/168] utillinuxMinimal: Make more minimal This removes locales, bash completion and crap like that. This cuts 6.5 MiB from the NixOS system closure (which unfortunately contains two copies of util-linux, because of the need to break a dependency cycle with systemd). --- pkgs/os-specific/linux/util-linux/default.nix | 16 +++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 4d4a22fc720..003dd792966 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd }: +{ lib, stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: stdenv.mkDerivation rec { name = "util-linux-${version}"; - version = stdenv.lib.concatStringsSep "." ([ majorVersion ] - ++ stdenv.lib.optional (patchVersion != "") patchVersion); + version = lib.concatStringsSep "." ([ majorVersion ] + ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.28"; patchVersion = "1"; @@ -56,17 +56,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib pam ] - ++ stdenv.lib.optional (ncurses != null) ncurses - ++ stdenv.lib.optional (systemd != null) [ systemd pkgconfig ] - ++ stdenv.lib.optional (perl != null) perl; + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (systemd != null) [ systemd pkgconfig ] + ++ lib.optional (perl != null) perl; postInstall = '' rm "$bin/bin/su" # su should be supplied by the su package (shadow) + '' + lib.optionalString minimal '' + rm -rf $out/share/{locale,doc,bash-completion} ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://www.kernel.org/pub/linux/utils/util-linux/; description = "A set of system utilities for Linux"; license = licenses.gpl2; # also contains parts under more permissive licenses diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfe61157351..3aaf9e62f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11809,6 +11809,7 @@ in utillinuxCurses = utillinux; utillinuxMinimal = appendToName "minimal" (utillinux.override { + minimal = true; ncurses = null; perl = null; systemd = null; From 0aa75206705afc71b991cceeede644c87088d583 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 12:19:01 +0200 Subject: [PATCH 144/168] Revert "nixos: remove rsync from base install and add explicit path in nixos-install" This reverts commit 582313bafef4c81cb6df2dcf2ece4757eb5c8082. Removing rsync is actually pointless because nixos-install depends on it. So if it's part of the system closure, we may as well provide it to users. Probably with the next Nix release we can drop the use of rsync and use "nix copy" instead. --- nixos/modules/config/system-path.nix | 1 + nixos/modules/installer/tools/nixos-install.sh | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 169c86a2eae..3587f8c643b 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -34,6 +34,7 @@ let config.programs.ssh.package pkgs.perl pkgs.procps + pkgs.rsync pkgs.strace pkgs.su pkgs.time diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0a452b86018..f1d2e69b28c 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -169,7 +169,7 @@ if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> / for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do echo " $i" chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit - @rsync@/bin/rsync -a $i $mountPoint/nix/store/ + rsync -a $i $mountPoint/nix/store/ done # Register the paths in the Nix closure as valid. This is necessary diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index fc39a653abd..d7302269890 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -21,7 +21,7 @@ let name = "nixos-install"; src = ./nixos-install.sh; - inherit (pkgs) perl pathsFromGraph rsync; + inherit (pkgs) perl pathsFromGraph; nix = config.nix.package.out; cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; From d94c072f8ed20045015fd80cc10ad8ac64a35dc7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 13:11:16 +0200 Subject: [PATCH 145/168] DBD::SQLite: 1.48 -> 1.50 --- .../perl-modules/DBD-SQLite/default.nix | 6 +++--- pkgs/top-level/perl-packages.nix | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 897e82c68e1..bf3089ebfb9 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.48"; + name = "DBD-SQLite-1.50"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "19hf0fc4dlnpmxsxx3jjbh2z6d2jafgdlqhwz4irkp2cbl7j75xk"; + sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s"; }; propagatedBuildInputs = [ DBI ]; @@ -37,7 +37,7 @@ buildPerlPackage rec { # Disabled because the tests can randomly fail due to timeouts # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). - doCheck = false; + #doCheck = false; meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 695f91a0230..5934e0dd681 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3544,19 +3544,7 @@ let self = _self // overrides; _self = with self; { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; - # inherit (pkgs) sqlite; - - # Workaround to address DBIxClass test failure. - # https://rt.cpan.org/Public/Bug/Display.html?id=117271#txn-1662798 - # https://github.com/NixOS/nixpkgs/pull/18083#issuecomment-243408430 - sqlite = pkgs.sqlite.overrideDerivation (_: { - name = "sqlite-3.13.0"; - - src = fetchurl { - url = "http://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz"; - sha256 = "0sq88jbwsk48i41f7m7rkw9xvijq011nsbs7pl49s31inck70yg2"; - }; - }); + inherit (pkgs) sqlite; }; DBDmysql = import ../development/perl-modules/DBD-mysql { From ba70ce28ae4032a4674634c2a00615f7a0908357 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 13:38:16 +0200 Subject: [PATCH 146/168] no-x-libs.nix: Ensure that dbus doesn't use X11 It appears that packageOverrides no longer overrides aliases, so aliases like dbus_tools = self.dbus.out; dbus_daemon = self.dbus.daemon; now use the old, non-overriden version of dbus. That seems like a pretty serious regression in general, but for this particular problem, I've fixed it by replacing dbus_daemon by dbus.daemon and dbus_tools by dbus. --- nixos/modules/services/system/dbus.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 8bcd6f01656..6c4833afbe8 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -84,7 +84,7 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus_tools ]; + environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; environment.etc = singleton { source = configDir; @@ -104,7 +104,7 @@ in security.setuidOwners = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon.out}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aaf9e62f66..6399ef8703b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7139,7 +7139,7 @@ in dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - # Should we deprecate these? Currently there are many references. + # FIXME: deprecate these. dbus_tools = self.dbus.out; dbus_libs = self.dbus; dbus_daemon = self.dbus.daemon; From 8c27103d32cbfff71d8b9b8fb16af6fa23e52fa5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 13:45:28 +0200 Subject: [PATCH 147/168] libmicrohttpd: Move out info docs Putting the micro back in libmicrohttpd. --- pkgs/development/libraries/libmicrohttpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 3b4e5858746..b53c8da3f54 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni"; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" "info" ]; buildInputs = [ libgcrypt curl gnutls pkgconfig ]; preCheck = '' From a359d330dc10701f9f6aa318d17c9dffcaa25ca7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Sep 2016 20:44:34 +0800 Subject: [PATCH 148/168] vagrant: 1.8.4 -> 1.8.5 (#18283) Includes https://github.com/mitchellh/vagrant/pull/7611 to fix issue with permissions on ~/.ssh/authorized_keys. --- pkgs/development/tools/vagrant/default.nix | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 242782161d7..3f3fd88580f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv +{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv , libxml2, libxslt, makeWrapper }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.8.4"; + version = "1.8.5"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -12,22 +12,32 @@ let sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; }; -in -stdenv.mkDerivation rec { + sha256 = { + "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; + "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; + +in stdenv.mkDerivation rec { name = "vagrant-${version}"; inherit version; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb"; - sha256 = "fd38d8e00e494a617201facb42fc2cac627e5021db15e91c2a041eac6a2d8208"; - } - else - fetchurl { - url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb"; - sha256 = "555351717cacaa8660821df8988cc40a39923b06b698fca6bb90621008aab06f"; - }; + src = fetchurl { + url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"; + inherit sha256; + }; + + # Remove the patchFlags/patches when 1.8.6 is released + patchFlags = [ + "-p1" + "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" + ]; + patches = (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; + name = "fix_incorrect_ssh_keys_permissions.patch"; + sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; + }); meta = with stdenv.lib; { description = "A tool for building complete development environments"; From 5e5df88457d6a44da9e2856b82a51573aaa0d1da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 13:59:07 +0200 Subject: [PATCH 149/168] modules/profiles/minimal.nix: Disable "man" --- nixos/modules/profiles/minimal.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index c353da227ae..5a7428e6474 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -11,4 +11,6 @@ with lib; # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ]; services.nixosManual.enable = mkDefault false; + + programs.man.enable = mkDefault false; } From ab49ebe6fa2f502844cc6f655f02b00c052c6dd0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 14:16:33 +0200 Subject: [PATCH 150/168] Make it possible to disable "info" --- nixos/modules/config/system-path.nix | 3 --- nixos/modules/module-list.nix | 3 ++- nixos/modules/profiles/minimal.nix | 1 + nixos/modules/programs/info.nix | 30 ++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/programs/info.nix diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3587f8c643b..775d0c39c4f 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -38,7 +38,6 @@ let pkgs.strace pkgs.su pkgs.time - pkgs.texinfoInteractive pkgs.utillinux pkgs.which # 88K size ]; @@ -105,7 +104,6 @@ in "/etc/xdg" "/etc/gtk-2.0" "/etc/gtk-3.0" - "/info" "/lib" # FIXME: remove and update debug-info.nix "/sbin" "/share/applications" @@ -113,7 +111,6 @@ in "/share/doc" "/share/emacs" "/share/icons" - "/share/info" "/share/menus" "/share/mime" "/share/nano" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 27fbe55cd42..c6eec6adb3b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -66,8 +66,9 @@ ./programs/command-not-found/command-not-found.nix ./programs/dconf.nix ./programs/environment.nix - ./programs/freetds.nix ./programs/fish.nix + ./programs/freetds.nix + ./programs/info.nix ./programs/kbdlight.nix ./programs/light.nix ./programs/man.nix diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 5a7428e6474..b047b706365 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -13,4 +13,5 @@ with lib; services.nixosManual.enable = mkDefault false; programs.man.enable = mkDefault false; + programs.info.enable = mkDefault false; } diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix new file mode 100644 index 00000000000..be6439dca5a --- /dev/null +++ b/nixos/modules/programs/info.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + + programs.info.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable info pages and the info command. + ''; + }; + + }; + + + config = mkIf config.programs.info.enable { + + environment.systemPackages = [ pkgs.texinfoInteractive ]; + + environment.pathsToLink = [ "/info" "/share/info" ]; + + environment.extraOutputsToInstall = [ "info" ]; + + }; + +} From ff7368e944a904c0389f58f770576a230ab73c08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 14:37:43 +0200 Subject: [PATCH 151/168] audit: Move z/OS plugin to a separate output This prevents the NixOS base system from pulling in openldap, cyris-sasl, and libkrb5. --- pkgs/os-specific/linux/audit/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index afe73ef1b5a..4decc8c7a32 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31"; }; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" "plugins" ]; buildInputs = [ openldap ] ++ stdenv.lib.optional enablePython python; @@ -21,6 +21,16 @@ stdenv.mkDerivation rec { ${if enablePython then "--with-python" else "--without-python"} ''; + enableParallelBuilding = true; + + postInstall = + '' + # Move the z/OS plugin to a separate output to prevent an + # openldap runtime dependency in audit.bin. + mkdir -p $plugins/bin + mv $bin/sbin/audispd-zos-remote $plugins/bin/ + ''; + meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; From e8315cb1caac6343322b5bab822f3cd227ae287b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 14:46:41 +0200 Subject: [PATCH 152/168] shadow: Separate man output This removes ~2 MiB from the minimal config. --- pkgs/os-specific/linux/shadow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 8c0dc57b61b..e56f285d526 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./keep-path.patch dots_in_usernames ]; - outputs = [ "out" "su" ]; + outputs = [ "out" "su" "man" ]; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) From 8604117b48f297a8891eeabb16dc5e3a6e4ae915 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 31 May 2016 15:29:53 +0200 Subject: [PATCH 153/168] dbus: remove unused imports --- pkgs/development/libraries/dbus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4e6fa238bfb..218e7651eca 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python +{ stdenv, lib, fetchurl, pkgconfig, expat, systemd , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: assert x11Support -> libX11 != null From 992c514a20cf2da897db68169d7dcab721e8c7b7 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 31 May 2016 15:30:31 +0200 Subject: [PATCH 154/168] (network,remote-fs)-pre: remove duplicate wantedBy and before this is part of (network,remote-fs).target, repectively --- nixos/modules/system/boot/systemd.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index df72be1b4be..72452c45e64 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -727,16 +727,6 @@ in systemd.targets.network-online.after = [ "ip-up.target" ]; - systemd.targets.network-pre = { - wantedBy = [ "network.target" ]; - before = [ "network.target" ]; - }; - - systemd.targets.remote-fs-pre = { - wantedBy = [ "remote-fs.target" ]; - before = [ "remote-fs.target" ]; - }; - systemd.units = mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services From 2fd6b36c51babbf72cd459cef3a5b76914065eec Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 31 May 2016 16:46:35 +0200 Subject: [PATCH 155/168] networkd.module: remove before network-online this is already upstream default --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ab748550026..b79683660c5 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -677,7 +677,7 @@ in }; systemd.services.systemd-networkd-wait-online = { - before = [ "network-online.target" "ip-up.target" ]; + before = [ "ip-up.target" ]; wantedBy = [ "network-online.target" "ip-up.target" ]; }; From 322c8231931a3158b4abc836090bdfa1ce92f5f2 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 9 Jun 2016 15:41:56 +0200 Subject: [PATCH 156/168] agetty: remove override for container-getty@.service since it's upstream Added in systemd/systemd@68ac53e --- nixos/modules/services/ttys/agetty.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index ea7196fc873..051d54e932f 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -80,8 +80,7 @@ in }; systemd.services."container-getty@" = - { unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits. - serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; restartIfChanged = false; }; From 53f3c2a2783b8c910b98b1a6a25e75d7a1f04ec8 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 9 Jun 2016 15:45:55 +0200 Subject: [PATCH 157/168] systemd: add some missing upstream units --- nixos/modules/system/boot/systemd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 72452c45e64..3fa257f9668 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -14,6 +14,7 @@ let upstreamSystemUnits = [ # Targets. "basic.target" + "busnames.target" "sysinit.target" "sockets.target" "graphical.target" @@ -140,6 +141,7 @@ let "user.slice" "machine.slice" "systemd-machined.service" + "systemd-nspawn@.service" # Temporary file creation / cleanup. "systemd-tmpfiles-clean.service" From f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 15:38:42 +0200 Subject: [PATCH 158/168] Let services.openssh.forwardX11 imply programs.ssh.setXAuthLocation --- nixos/modules/programs/ssh.nix | 4 +++- nixos/modules/services/networking/ssh/sshd.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cc835081c9f..b6fd9868f98 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -56,7 +56,6 @@ in setXAuthLocation = mkOption { type = types.bool; - default = config.services.xserver.enable; description = '' Whether to set the path to xauth for X11-forwarded connections. This causes a dependency on X11 packages. @@ -165,6 +164,9 @@ in config = { + programs.ssh.setXAuthLocation = + mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11); + assertions = [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; message = "cannot enable X11 forwarding without setting XAuth location"; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f900ef494ab..ef186a20f93 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -227,6 +227,8 @@ in config = mkIf cfg.enable { + programs.ssh.setXAuthLocation = mkForce cfg.forwardX11; + users.extraUsers.sshd = { isSystemUser = true; description = "SSH privilege separation user"; From 5b5c2fb9c08e3e9ee4ed27fce7863055d3c896d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 15:48:48 +0200 Subject: [PATCH 159/168] Make the default fonts conditional on services.xserver.enable We were pulling in 44 MiB of fonts in the default configuration, which is a bit excessive for headless configurations like EC2 instances. Note that dejavu_minimal ensures that remote X11-forwarded applications still have a basic font regardless. --- nixos/modules/config/fonts/fonts.nix | 12 +++++++++++- nixos/modules/services/x11/xserver.nix | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index f913b8c33e5..af3d93fc1bc 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -11,17 +11,27 @@ with lib; # TODO: find another name for it. fonts = mkOption { type = types.listOf types.path; + default = []; example = literalExample "[ pkgs.dejavu_fonts ]"; description = "List of primary font paths."; }; + enableDefaultFonts = mkOption { + type = types.bool; + default = false; + description = '' + Enable a basic set of fonts providing several font styles + and families and reasonable coverage of Unicode. + ''; + }; + }; }; config = { - fonts.fonts = + fonts.fonts = mkIf config.fonts.enableDefaultFonts [ pkgs.xorg.fontbhlucidatypewriter100dpi pkgs.xorg.fontbhlucidatypewriter75dpi diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index b03f70385b1..6c6a1e79ed0 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -654,6 +654,8 @@ in ${xrandrMonitorSections} ''; + fonts.enableDefaultFonts = mkDefault true; + }; } From 1a5bb68696c2bfb3a2661d9f2096030b0da0bccc Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 5 Sep 2016 16:17:30 +0100 Subject: [PATCH 160/168] gtk-sharp-*: remove references to gnomepanel gnomepanel was part of Gnome 2 and is currently broken. There seemed to be no runtime dependency to gnomepanel and building also seems to work fine without it. --- pkgs/development/libraries/gtk-sharp/2.0.nix | 2 -- pkgs/development/libraries/gtk-sharp/3.0.nix | 2 -- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 20c79d7202e..a8667770271 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -10,7 +10,6 @@ , libgnomeui ? null , libgnomeprint ? null , libgnomeprintui ? null -, gnomepanel ? null , libxml2 , monoDLLFixer }: @@ -36,7 +35,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig mono glib pango gtk GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 - gnomepanel ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 9fb99c3f27e..459f37afc7f 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -10,7 +10,6 @@ , libgnomeui ? null , libgnomeprint ? null , libgnomeprintui ? null -, gnomepanel ? null , libxml2 , monoDLLFixer }: @@ -35,7 +34,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 - gnomepanel ]; dontStrip = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6399ef8703b..c33dc33e6db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7636,13 +7636,13 @@ in gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf gnomepanel; + libgnomeprintui GConf; }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf gnomepanel; + libgnomeprintui GConf; }; gtk-sharp = self.gtk-sharp-2_0; From d1154edf441411bae1363ddb1eb5c7ddd379642d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Sep 2016 11:43:10 -0400 Subject: [PATCH 161/168] proofgeneral_HEAD: bump --- pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index d119117caeb..a6ccd4f631d 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://github.com/ProofGeneral/PG.git"; - rev = "16991280fb09743ae7320aef77f6a166afb907d7"; - sha256 = "1yakjxfz6a09m7lrxff04sj1717gpmhq2bsibd5f9lkp6z0w2i0q"; + rev = "64ca55b1593fff8cfffab89c51d7e92c1a68dc27"; + sha256 = "1gz13fagxf0w2zgp7qd0w328qiv97295jwq7ra8vj61pdfi8xklj"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; From 8f023eb129f16a35970e8536df99188c43ca6d6d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Sep 2016 18:56:04 +0300 Subject: [PATCH 162/168] gnome2.gnome_panel: Fix build --- pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index a126cd53432..1732b81f070 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -22,5 +22,5 @@ stdenv.mkDerivation { configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; - NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2"; + NIX_CFLAGS_COMPILE="-I${GConf.dev}/include/gconf/2"; } From 05c132486d8cfae600bbfe8c9ac5d799b298afed Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Sep 2016 12:01:26 -0400 Subject: [PATCH 163/168] Initial version of nixBufferBuilders.withPackages. This builds elisp to setup an emacs buffer with the packages given available. See shlevy/nix-buffer for more information. Currently only modifies $PATH. --- pkgs/build-support/emacs/buffer.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/build-support/emacs/buffer.nix diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix new file mode 100644 index 00000000000..2f7f536d5e7 --- /dev/null +++ b/pkgs/build-support/emacs/buffer.nix @@ -0,0 +1,20 @@ +# Functions to build elisp files to locally configure emcas buffers. +# See https://github.com/shlevy/nix-buffer + +{ runCommand }: + +{ + withPackages = pkgs: runCommand "dir-locals.el" { inherit pkgs; } '' + echo "(make-local-variable 'process-environment)" >> $out + echo "(setenv \"PATH\" (concat" >> $out + for pkg in $pkgs; do + echo " \"$pkg/bin:$pkg/sbin\"" >> $out + done + echo " (getenv \"PATH\")))" >> $out + echo -n "(setq-local exec-path (append '(" >> $out + for pkg in $pkgs; do + echo -en "\n \"$pkg/bin\" \"$pkg/sbin\"" >> $out + done + echo -e ")\\n exec-path))" >> $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33dc33e6db..9023d33704c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,6 +285,8 @@ in inherit kernel rootModules allowMissing; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) runCommand; }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; srcOnly = args: callPackage ../build-support/src-only args; From d2275f4b0404ebaa501a1f84d533a37a8a1d9d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 5 Sep 2016 17:43:38 +0200 Subject: [PATCH 164/168] webkitgtk24: build in parallel until #18312 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2ef4e9e9d5c754fe091ec5087b885f2be98fb3a7) Signed-off-by: Domen Kožar --- pkgs/development/libraries/webkitgtk/2.4.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 39c0eed0a54..1db47827abe 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; [ "--disable-geolocation" "--disable-jit" + # needed for parallel building + "--enable-dependency-tracking" (optionalString enableIntrospection "--enable-introspection") ] ++ optional withGtk2 [ "--with-gtk=2.0" @@ -86,7 +88,6 @@ stdenv.mkDerivation rec { (if withGtk2 then gtk2 else gtk3) ]; - # Still fails with transient errors in version 2.4.9. - enableParallelBuilding = false; + enableParallelBuilding = true; } From 8c504fbce186e2afe501b95b5188adf65d916380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 5 Sep 2016 17:44:03 +0200 Subject: [PATCH 165/168] gnome3.evolution: set big-parallel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5248178c20c472a98169916651545d9c77005f27) Signed-off-by: Domen Kožar --- pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix index 100dfbf3ace..161b45d6f6b 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix @@ -45,5 +45,6 @@ in stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.lgpl2Plus; platforms = platforms.linux; + requiredSystemFeatures = [ "big-parallel" ]; }; } From 9e363a752fbd5ca4447cd1f82526e2a166eedfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 5 Sep 2016 18:05:11 +0200 Subject: [PATCH 166/168] openmodelica: enable parallel building MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 261d51971a352cbcdc8d70dc74f8971ac202a43d) Signed-off-by: Domen Kožar --- pkgs/applications/science/misc/openmodelica/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 8b413f20b1e..fd39f61c863 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + patchPhase = '' cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh From 520cb14f16a13b4e70ead6618fa4e081a5a8059f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 18:17:22 +0200 Subject: [PATCH 167/168] Fix infinite recursion introduced by f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b --- nixos/modules/services/networking/ssh/sshd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index ef186a20f93..1d15a141972 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -85,7 +85,7 @@ in forwardX11 = mkOption { type = types.bool; - default = cfgc.setXAuthLocation; + default = false; description = '' Whether to allow X11 connections to be forwarded. ''; From 2919375c91387d8acc8084e66e48e882ffc0b930 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 5 Sep 2016 17:25:53 +0100 Subject: [PATCH 168/168] minc_tools: don't run tests which have been failing since first pkged --- pkgs/applications/science/biology/minc-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 41813dcda14..aae0cf40cee 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; checkPhase = "ctest"; - doCheck = true; + doCheck = false; meta = with stdenv.lib; { homepage = https://github.com/BIC-MNI/minc-tools;