From a09c39f80cb05021dee36a55964a67e2cc142db0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 05:34:40 +0000 Subject: [PATCH 01/14] ocamlPackages.js_of_ocaml-lwt: init at 3.1.0 --- pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix new file mode 100644 index 00000000000..31a5c3ea17b --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx +, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, ocaml_lwt +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-lwt-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + + buildPhase = "jbuilder build -p js_of_ocaml-lwt"; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e7dba3e8855..f101a883df3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -326,6 +326,8 @@ let js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {}; + js_of_ocaml-lwt = callPackage ../development/tools/ocaml/js_of_ocaml/lwt.nix {}; + js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {}; js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; From 615fefb3a5559f2acbd6b2e6dd356cd569d70d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 9 Apr 2018 14:19:42 +0200 Subject: [PATCH 02/14] nixos/prosody: add dataDir option --- nixos/modules/services/networking/prosody.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index d57ebb61f63..f409962816d 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -295,6 +295,12 @@ in ''; }; + dataDir = mkOption { + type = types.string; + description = "Directory where Prosody stores its data"; + default = "/var/lib/prosody"; + }; + allowRegistration = mkOption { type = types.bool; default = false; @@ -421,11 +427,11 @@ in environment.etc."prosody/prosody.cfg.lua".text = '' - pidfile = "/var/lib/prosody/prosody.pid" + pidfile = "${cfg.dataDir}/prosody.pid" log = "*syslog" - data_path = "/var/lib/prosody" + data_path = "${cfg.dataDir}" plugin_paths = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) } } @@ -474,7 +480,7 @@ in description = "Prosody user"; createHome = true; group = "prosody"; - home = "/var/lib/prosody"; + home = "${cfg.dataDir}"; }; users.extraGroups.prosody = { @@ -490,7 +496,7 @@ in serviceConfig = { User = "prosody"; Type = "forking"; - PIDFile = "/var/lib/prosody/prosody.pid"; + PIDFile = "${cfg.dataDir}/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; }; }; From 654ce4ba29620c0bddfbd8b42f4451ba5c26bac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Apr 2018 16:10:47 +0100 Subject: [PATCH 03/14] musl: enable musl-gcc, ld.musl-clang, musl-clang These are convenient for projects with mixed musl/glibc build targets. For pure musl builds in nixpkgs, we probably want a musl stdenv. --- pkgs/os-specific/linux/musl/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 005a12f5b94..4d1c2cad2e3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -50,8 +50,7 @@ stdenv.mkDerivation rec { "--enable-static" "--enable-debug" "CFLAGS=-fstack-protector-strong" - # Fix cycle between outputs - "--disable-wrapper" + "--enable-wrapper=all" ]; outputs = [ "out" "dev" ]; @@ -59,18 +58,25 @@ stdenv.mkDerivation rec { dontDisableStatic = true; separateDebugInfo = true; - postInstall = - '' + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - '' + '' + # Strip debug out of the static library $STRIP -S $out/lib/libc.a - '' + '' mkdir -p $out/bin + # Create 'ldd' symlink, builtin ln -s $out/lib/libc.so $out/bin/ldd + + # (impure) cc wrapper around musl for interactive usuage + for i in musl-gcc musl-clang ld.musl-clang; do + moveToOutput bin/$i $dev + done + moveToOutput lib/musl-gcc.specs $dev + substituteInPlace $dev/bin/musl-gcc \ + --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From d6e837107132d46acdcf258829a690b091c5116a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Tue, 10 Apr 2018 10:39:53 +0200 Subject: [PATCH 04/14] terraform_0_11: 0.11.5 -> 0.11.6 --- 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 2bf1d210f83..5879c0e8397 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.5"; - sha256 = "130ibb1pd60r2cycwpzs8qfwrz6knyc1a1849csxpipg5rs5q3jy"; + version = "0.11.6"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From cda51a8a054637142caa954d639fa46ca8c1b3b2 Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Tue, 10 Apr 2018 11:16:56 +0100 Subject: [PATCH 05/14] gopass: Install shell completion scripts Shell completion needs to be generated by the `gopass` binary, and moved into place for each of the supported shells. --- pkgs/tools/security/gopass/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index db58c6011f0..743f9136ae5 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -20,6 +20,16 @@ buildGoPackage rec { gnupg ]); + postInstall = '' + mkdir -p \ + $bin/share/bash-completion/completions \ + $bin/share/zsh/site-functions \ + $bin/share/fish/vendor_completions.d + $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass + $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass + $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish + ''; + postFixup = '' wrapProgram $bin/bin/gopass \ --prefix PATH : "${wrapperPath}" From dd267542857097dd06b137565a1a58df968fa0c0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 10 Apr 2018 16:11:12 +0800 Subject: [PATCH 06/14] nodejs-9_x: 9.10.1 -> 9.11.1 --- pkgs/development/web/nodejs/v9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 85d6dd7493e..f6f8aa8d1ab 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.10.1"; - sha256 = "1widvxbc8sp8p8vp7q38b3zy0w1nx4iaqmp81s6bvaqs08h7wfy9"; + version = "9.11.1"; + sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } From 1c5f62a1a37ed3c2d9a68f098d16f29bcab5d1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Apr 2018 11:08:20 +0200 Subject: [PATCH 07/14] restic-rest-server: init at 0.9.7 --- pkgs/tools/backup/restic/rest-server.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/backup/restic/rest-server.nix diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix new file mode 100644 index 00000000000..d9f889897aa --- /dev/null +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "restic-rest-server-${version}"; + version = "0.9.7"; + + goPackagePath = "github.com/restic/rest-server"; + + src = fetchFromGitHub { + owner = "restic"; + repo = "rest-server"; + rev = "v${version}"; + sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj"; + }; + + buildPhase = '' + cd go/src/${goPackagePath} + go run build.go + ''; + + installPhase = '' + install -Dt $bin/bin rest-server + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A high performance HTTP server that implements restic's REST backend API"; + platforms = platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53e0eea7c5b..d76325e2d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12769,6 +12769,8 @@ with pkgs; restic = callPackage ../tools/backup/restic { }; + restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; + restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { From 90b64badaf9ba0058d931d3022507898f8f4085e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Apr 2018 13:22:07 +0200 Subject: [PATCH 08/14] python3.pkgs.netdisco: 1.3.1 -> 1.4.0 --- pkgs/development/python-modules/netdisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index b9b50d98ebf..412d42bafdd 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.3.1"; + version = "1.4.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "082ihazpcmf7qh4671kgdr5kzglyj10gp9hyy52snh0c1rz468fd"; + sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; From 8787c131ed21e9132cd2deba7c63d865feecf415 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Apr 2018 14:28:41 +0200 Subject: [PATCH 09/14] vmTools: Add crc32c_generic to the initrd This is necessary due to a e2fsprogs update (e6114781b0fad5345a2430fac3587d618273bda2) that causes mke2fs to enable a feature (metadata_csum) that depends on crc32c. https://hydra.nixos.org/build/72636785 --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 49588a58993..8e8b88a9bd2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? pkgs.stdenv.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" }: From 0e2b222c246b1b93619d8ff1ca8c0bbb082facad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Apr 2018 14:37:35 +0100 Subject: [PATCH 10/14] linuxPackages.perf: use prefix instead of DESTDIR Otherwise the build system computes incorrect references and looks for perf-core in /libexec. DESTDIR for normal buildsystems is never the right choice for nixpkgs. --- pkgs/os-specific/linux/kernel/perf.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 06552eb3579..b386bebddf3 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src makeFlags; + inherit (kernel) src; preConfigure = '' cd tools/perf @@ -24,17 +24,21 @@ stdenv.mkDerivation { substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug done - [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion - export makeFlags="DESTDIR=$out WERROR=0 $makeFlags" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DTIPDIR=\"$out/share/doc/perf-tip\"" + if [ -f bash_completion ]; then + sed -i 's,^have perf,_have perf,' bash_completion + fi ''; + makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags; + # perf refers both to newt and slang - nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; - buildInputs = - [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl - ] ++ stdenv.lib.optional withGtk gtk2; + nativeBuildInputs = [ + asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt + flex bison libiberty libaudit makeWrapper pkgconfig python perl + ]; + buildInputs = [ + elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl + ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. @@ -43,6 +47,7 @@ stdenv.mkDerivation { "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" + "-DTIPDIR=\"$(out)/share/doc/perf-tip\"" ] # gcc before 6 doesn't know these options ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ @@ -50,7 +55,7 @@ stdenv.mkDerivation { ]; separateDebugInfo = true; - installFlags = "install install-man ASCIIDOC8=1"; + installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; preFixup = '' wrapProgram $out/bin/perf \ From d92d1db717d442e70a7f6691667da3d26c74780d Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 10 Apr 2018 17:09:51 +0200 Subject: [PATCH 11/14] gitAndTools.hubUnstable: init at 2.3.0-pre10 --- .../git-and-tools/default.nix | 4 +++ .../git-and-tools/hub/unstable.nix | 36 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/hub/unstable.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 864a69323f8..cd969ff81d0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -106,6 +106,10 @@ rec { inherit (darwin) Security; }; + hubUnstable = callPackage ./hub/unstable.nix { + inherit (darwin) Security; + }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix new file mode 100644 index 00000000000..7e83c2cfb67 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: + +stdenv.mkDerivation rec { + name = "hub-${version}"; + version = "2.3.0-pre10"; + + src = fetchgit { + url = https://github.com/github/hub.git; + rev = "refs/tags/v${version}"; + sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd"; + }; + + buildInputs = [ go ronn groff utillinux ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + buildPhase = '' + mkdir bin + ln -s ${ronn}/bin/ronn bin/ronn + + patchShebangs . + make all man-pages + ''; + + installPhase = '' + prefix=$out sh -x < script/install.sh + ''; + + meta = with stdenv.lib; { + description = "Command-line wrapper for git that makes you better at GitHub"; + + license = licenses.mit; + homepage = https://hub.github.com/; + maintainers = with maintainers; [ the-kenny ]; + platforms = with platforms; unix; + }; +} From 87fd6c1f26e55f68f933fde8fce23a1f4af86984 Mon Sep 17 00:00:00 2001 From: Kaz Wesley Date: Tue, 10 Apr 2018 16:24:46 +0000 Subject: [PATCH 12/14] iaca: init at 3.0, 2.1 (#38659) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/development/tools/iaca/2.1.nix | 34 +++++++++++++++++++++++++++++ pkgs/development/tools/iaca/3.0.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 68 insertions(+) create mode 100644 pkgs/development/tools/iaca/2.1.nix create mode 100644 pkgs/development/tools/iaca/3.0.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca2ecd8708c..3953856b2f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1897,6 +1897,11 @@ email = "info+nix@chmist.com"; name = "karolchmist"; }; + kazcw = { + email = "kaz@lambdaverse.org"; + github = "kazcw"; + name = "Kaz Wesley"; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix new file mode 100644 index 00000000000..c434fd5a7de --- /dev/null +++ b/pkgs/development/tools/iaca/2.1.nix @@ -0,0 +1,34 @@ +{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: +assert stdenv.system == "x86_64-linux"; +with stdenv.lib; + +# v2.1: last version with NHM/WSM arch support +stdenv.mkDerivation { + name = "iaca-2.1"; + src = requireFile { + name = "iaca-version-2.1-lin64.zip"; + sha256 = "11s1134ijf66wrc77ksky9mnb0lq6ml6fzmr86a6p6r5xclzay2m"; + url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; + }; + unpackCmd = ''${unzip}/bin/unzip "$src" -x __MACOSX/ __MACOSX/iaca-lin64/ __MACOSX/iaca-lin64/._.DS_Store''; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin $out/lib + cp bin/iaca $out/bin/ + cp lib/* $out/lib + ''; + preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + patchelf \ + --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + --set-rpath $out/lib:"${libPath}" \ + $out/bin/iaca + ''; + postFixup = ''wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib''; + meta = { + description = "Intel Architecture Code Analyzer"; + homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kazcw ]; + }; +} diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix new file mode 100644 index 00000000000..025dfc56721 --- /dev/null +++ b/pkgs/development/tools/iaca/3.0.nix @@ -0,0 +1,25 @@ +{ stdenv, requireFile, patchelf, unzip }: +assert stdenv.system == "x86_64-linux"; +with stdenv.lib; + +stdenv.mkDerivation { + name = "iaca-3.0"; + src = requireFile { + name = "iaca-version-v3.0-lin64.zip"; + sha256 = "0qd81bxg269cwwvfmdp266kvhcl3sdvhrkfqdrbmanawk0w7lvp1"; + url = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer-download"; + }; + unpackCmd = ''${unzip}/bin/unzip "$src"''; + installPhase = '' + mkdir -p $out/bin + cp iaca $out/bin + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca + ''; + meta = { + description = "Intel Architecture Code Analyzer"; + homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ kazcw ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d76325e2d86..914f0e54c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7905,6 +7905,10 @@ with pkgs; hyenae = callPackage ../tools/networking/hyenae { }; + iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { }; + iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; + iaca = iaca_3_0; + icestorm = callPackage ../development/tools/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; From a14ae55c0429f1529ae960675b8df59b4653338b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Apr 2018 18:36:12 +0200 Subject: [PATCH 13/14] elan: init at 0.1.0 --- .../science/logic/elan/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/logic/elan/default.nix diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix new file mode 100644 index 00000000000..d9d90b3574c --- /dev/null +++ b/pkgs/applications/science/logic/elan/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "elan-${version}"; + version = "0.1.0"; + + cargoSha256 = "04cxwklfgz4q28grva52ws3lslaiq67fwqf6pglbzdrfbgdjjwb6"; + + src = fetchFromGitHub { + owner = "kha"; + repo = "elan"; + rev = "v${version}"; + sha256 = "065l9a1g974n8i44mz37sx88fl65h5hml611m4p81cy6av2x85sm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ curl zlib openssl ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + postInstall = '' + pushd $out/bin + mv elan-init elan + for link in lean leanpkg; do + ln -s elan $link + done + popd + + # tries to create .elan + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/elan completions bash > "$out/share/bash-completion/completions/elan" + $out/bin/elan completions fish > "$out/share/fish/vendor_completions.d/elan.fish" + $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" + ''; + + meta = with stdenv.lib; { + description = "Small tool to manage your installations of the Lean theorem prover"; + homepage = "https://github.com/Kha/elan"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 914f0e54c02..9bc5658f7f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20030,6 +20030,7 @@ with pkgs; lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; + elan = callPackage ../applications/science/logic/elan {}; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocamlPackages_4_01_0.ocaml;}; From f28bf68bc4f93193d296718a37f94189f91ab14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Apr 2018 17:16:12 +0100 Subject: [PATCH 14/14] linuxPackages.perf: remove unused TIPDIR macro --- pkgs/os-specific/linux/kernel/perf.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b386bebddf3..a6f399c0fba 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" - "-DTIPDIR=\"$(out)/share/doc/perf-tip\"" ] # gcc before 6 doesn't know these options ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [