From 298798bcd65a25567b6ef8b5571278411518f029 Mon Sep 17 00:00:00 2001 From: Ahmed Kamal Date: Wed, 27 Dec 2017 13:48:11 +0200 Subject: electrum-ltc: 2.6.4.2 -> 2.9.3.1 --- pkgs/applications/misc/electrum-ltc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index 58844500195e..a4d900f40729 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -5,16 +5,15 @@ python2Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "2.6.4.2"; + version = "2.9.3.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4"; + sha256 = "d931a5376b7f38fba7221b01b1010f172c4d662668adae5c38885a646d5ee530"; }; propagatedBuildInputs = with python2Packages; [ pyqt4 - slowaes ecdsa pbkdf2 requests @@ -23,6 +22,8 @@ python2Packages.buildPythonApplication rec { protobuf dnspython jsonrpclib + pyaes + pysocks ]; preBuild = '' -- cgit 1.4.1 From 039cb6291de0358fe89fb455c219a0ab891060be Mon Sep 17 00:00:00 2001 From: Bastian Köcher Date: Fri, 1 Dec 2017 13:21:54 +0100 Subject: renderdoc: Fixes build with missing SWIG_PACKAGE --- .../graphics/renderdoc/custom_swig.patch | 32 ++++++++++++++++++++++ pkgs/applications/graphics/renderdoc/default.nix | 30 ++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/renderdoc/custom_swig.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch new file mode 100644 index 000000000000..e6ed05ea97a5 --- /dev/null +++ b/pkgs/applications/graphics/renderdoc/custom_swig.patch @@ -0,0 +1,32 @@ +diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +index 2df9ffa5..66bafaba 100644 +--- a/qrenderdoc/CMakeLists.txt ++++ b/qrenderdoc/CMakeLists.txt +@@ -65,16 +65,6 @@ include(ExternalProject) + # Need bison for swig + find_package(BISON) + +-# Compile our custom SWIG that will do scoped/strong enum classes +-ExternalProject_Add(custom_swig +- # using an URL to a zip directly so we don't clone the history etc +- URL ${RENDERDOC_SWIG_PACKAGE} +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 +- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null +- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 +- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) +- + # Lastly find PySide 2, optionally, for Qt5 Python bindings + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) + get_filename_component(swig_file ${in} NAME_WE) + + add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py +- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} ++ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} +- DEPENDS custom_swig + DEPENDS ${RDOC_REPLAY_FILES} + DEPENDS ${QRD_INTERFACE_FILES}) + diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 2a5bbb9401a4..2bd3ab89161f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,8 +1,26 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, autoconf, automake, pcre, vulkan-loader, xorg +, pcre, vulkan-loader, xorg, autoreconfHook }: +let + custom_swig = stdenv.mkDerivation { + name = "renderdoc-custom-swig"; + src = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-1"; + sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; + }; + + nativeBuildInputs = [ autoreconfHook pcre ]; + + autoreconfPhase = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + }; +in stdenv.mkDerivation rec { name = "renderdoc-${version}"; version = "0.91"; @@ -17,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison autoconf automake pcre ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" @@ -28,6 +47,7 @@ stdenv.mkDerivation rec { # TODO: use this instead of preConfigure once placeholders land #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" ]; + preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" ''; @@ -41,8 +61,14 @@ stdenv.mkDerivation rec { ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; + + # Set path to custom swig binary + NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; + enableParallelBuilding = true; + patches = [ ./custom_swig.patch ]; + meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; -- cgit 1.4.1 From b3facac2cd6785a61f2eb30f5f7334ee30ee50e9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 29 Dec 2017 00:40:44 +0100 Subject: mercurial: don't propagate frameworks --- pkgs/applications/version-management/mercurial/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 774aa1082bc8..1de1fda2a5e5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -18,12 +18,12 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ]; + buildInputs = [ makeWrapper docutils unzip ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ]; + propagatedBuildInputs = [ hg-git dulwich ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' -- cgit 1.4.1 From c8c5b022ecdee0b58d29a4ac601830a252ee482c Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 29 Dec 2017 20:54:44 +0200 Subject: feh: 2.22.2 -> 2.23 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b447fa7810f4..478e9d2b4530 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.22.2"; + version = "2.23"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05"; + sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; }; outputs = [ "out" "man" "doc" ]; -- cgit 1.4.1 From 901fa266fb8b19193adf822c0e098df7597889bc Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Fri, 29 Dec 2017 19:57:30 +0000 Subject: hugo: 0.29 -> 0.30.2 Also requires updating the github.com/alecthomas/chroma dependency. --- pkgs/applications/misc/hugo/default.nix | 4 ++-- pkgs/applications/misc/hugo/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0dfc725b9ea6..183a609a31ab 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.29"; + version = "0.30.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33"; + sha256 = "12dii2d0pirkj264857d5y83bdllk1knk5sjf31v0m9c25fapci0"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 35faf6b57047..e78d59fff381 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -31,8 +31,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "b0295f66bdb7c61d54906003d7649185794e21b4"; - sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis"; + rev = "c9f612c1940a4951cd2b55811744632a7b3b3bb2"; + sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h"; }; } { -- cgit 1.4.1 From 77cc63950a034de3b58bd718f30ebf122e5f137f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 29 Dec 2017 20:57:12 +0000 Subject: wxmaxima: build with cmake Fixes reported version number: see https://github.com/NixOS/nixpkgs/pull/31657#issuecomment-354414642 "make check" did not run any tests with autotools, and is not defined with cmake. ("make test" is not defined too.) --- pkgs/applications/science/math/wxmaxima/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 6c866a8d2164..c7f74071c24f 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, wrapGAppsHook, autoreconfHook, gettext +, wrapGAppsHook, cmake, gettext , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { @@ -15,14 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; - nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ]; + nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; - doCheck = true; - enableParallelBuilding = true; meta = with stdenv.lib; { -- cgit 1.4.1 From 1e77d0b975ad714dc3c619bdddd949f94ec2fc79 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 28 Dec 2017 09:11:36 +0100 Subject: kernel 4.14 require libelf to compile modules. [...] make modules -C /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/build EXTRA_CFLAGS=-Werror-implicit-function-declaration M=/tmp/nix-build-spl-kernel-2017-11-16-4.14.9.drv-0/source/build /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/source/Makefile:939: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop. This patch introduces kernel.moduleBuildDependencies to avoid the logic "stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "4.14") libelf" in multiple places. [dezgeg did some minor tweaks on top] --- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- pkgs/os-specific/linux/kernel/manual-config.nix | 5 ++++- pkgs/os-specific/linux/spl/default.nix | 2 +- pkgs/os-specific/linux/sysdig/default.nix | 2 +- pkgs/os-specific/linux/tp_smapi/default.nix | 2 ++ pkgs/os-specific/linux/virtualbox/default.nix | 2 ++ pkgs/os-specific/linux/zfs/default.nix | 3 ++- 7 files changed, 13 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 409187a99fbd..8f789cdf1707 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - buildInputs = [ patchelf cdrkit makeWrapper dbus ]; + buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies; installPhase = '' mkdir -p $out diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 355fbde62680..e1936495921d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -49,6 +49,9 @@ let inherit (stdenv.lib) hasAttr getAttr optional optionalString optionalAttrs maintainers platforms; + # Dependencies that are required to build kernel modules + moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf; + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e mkdir -p $4 @@ -85,7 +88,7 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile; + inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; }; inherit src; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 387dc2b7c675..f3bd283327c8 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -25,7 +25,7 @@ let patches = [ ./const.patch ./install_prefix.patch ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 18d473e21941..71d7e9e1b785 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc - ]; + ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 4fc14a04eeab..c3adcc6cdba9 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { name = "tp-smapi-${version}"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 5bec71a10907..72d7690d2f8a 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { "fortify" "pic" "stackprotector" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ ./fix_kerndir.patch ./fix_kbuild.patch diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5ede0a91b291..9b6c9b890cc7 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,7 +38,8 @@ let patches = extraPatches; - nativeBuildInputs = [ autoreconfHook nukeReferences ]; + nativeBuildInputs = [ autoreconfHook nukeReferences ] + ++ optional (kernel != null) kernel.moduleBuildDependencies; buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] -- cgit 1.4.1 From 537f213ef7f74a321a78233452cb2ab656a4c80a Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Fri, 29 Dec 2017 23:41:11 +0000 Subject: hugo: update dependencies Generated a new deps.nix by installing hugo into a clean GOPATH with `go get` and running `go2nix save`. --- pkgs/applications/misc/hugo/deps.nix | 174 ++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 82 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index e78d59fff381..6c870833d1af 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,3 +1,4 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/BurntSushi/toml"; @@ -13,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "b938d81255b5473c57635324295cb0fe398c7a58"; - sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8"; + rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969"; + sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f"; }; } { @@ -22,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5"; - sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } { @@ -49,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "098da33fde5f9220736531b3cb26a2dec86a8367"; - sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k"; + rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f"; + sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } { @@ -58,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; - sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; + rev = "8d868be6e9bf9d5350910bab97a050e49887600f"; + sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9"; }; } { @@ -81,30 +82,30 @@ }; } { - goPackagePath = "github.com/dlclark/regexp2"; + goPackagePath = "github.com/disintegration/imaging"; fetch = { type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957"; - sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + url = "https://github.com/disintegration/imaging"; + rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; + sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; }; } { - goPackagePath = "github.com/eknkc/amber"; + goPackagePath = "github.com/dlclark/regexp2"; fetch = { type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; - sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; + url = "https://github.com/dlclark/regexp2"; + rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; + sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; }; } { - goPackagePath = "github.com/fortytw2/leaktest"; + goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; - sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; + url = "https://github.com/eknkc/amber"; + rev = "cdade1c073850f4ffc70a829e31235ea6892853b"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } { @@ -121,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; - sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; + rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838"; + sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb"; }; } { @@ -148,17 +149,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; - sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; }; } { @@ -166,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "c24611cae00c16858e611ef77226dd2f7502759f"; - sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; }; } { @@ -184,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; - sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; + rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"; + sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } { @@ -193,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; - sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"; + sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy"; }; } { @@ -202,8 +194,17 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; - sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; + rev = "a12c3aec81a6a938bf584a4bac567afed9256586"; + sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; }; } { @@ -211,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "057eb9e3ae87944c038036d046101dec0c56e21f"; + sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } { @@ -220,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; + sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; }; } { @@ -229,8 +230,17 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; - sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; + rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa"; + sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "65fec0d89a572b4367094e2058d3ebe667de3b60"; + sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp"; }; } { @@ -238,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "69d355db5304c0f7f809a2edc054553e7142f016"; - sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; + rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224"; + sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v"; }; } { @@ -247,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; + rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2"; + sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27"; }; } { @@ -256,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } { @@ -265,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + rev = "57afd63c68602b63ed976de00dd066ccb3c319db"; + sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk"; }; } { @@ -283,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "34594c771f2c18301dc152640ad40ece28795373"; - sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; + rev = "ccaecb155a2177302cb56cae929251a256d0f646"; + sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443"; }; } { @@ -301,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; - sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; + rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b"; + sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g"; }; } { @@ -319,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea"; + sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5"; }; } { @@ -328,17 +338,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; - sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "05e8a0eda380579888eb53c394909df027f06991"; - sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; + rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"; + sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc"; }; } { @@ -355,8 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; - sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; + sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; }; } { @@ -364,8 +365,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; - sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; + rev = "d866cfc389cec985d6fda2859936a575a55a3ab6"; + sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; }; } { @@ -373,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; - sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; + rev = "83801418e1b59fb1880e363299581ee543af32ca"; + sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji"; }; } { @@ -382,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; - sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; + sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; }; } { @@ -391,8 +401,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; + rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"; + sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; }; } ] -- cgit 1.4.1 From f0f290e6cb6f58d4fdfefb740505e0b928b443cc Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 29 Dec 2017 18:28:25 -0500 Subject: melpaPackages: match version of magit-popup to magit Related to https://github.com/magit/magit/issues/3286 --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 90b885d683de..61257c5b5735 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -137,6 +137,12 @@ self: # upstream issue: missing file header maxframe = markBroken super.maxframe; + # version of magit-popup needs to match magit + # https://github.com/magit/magit/issues/3286 + magit = super.magit.override { + inherit (self.melpaPackages) magit-popup; + }; + # missing OCaml merlin = markBroken super.merlin; -- cgit 1.4.1 From 80b1d7ea434436fc00bf12e4b20f0b79cd1b6829 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 29 Dec 2017 18:42:19 -0600 Subject: leocad: 17.02 -> 17.07 --- pkgs/applications/graphics/leocad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5f27cb446994..6387a3e3c1b3 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "17.02"; + version = "17.07"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; + sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd"; }; nativeBuildInputs = [ qmake4Hook ]; -- cgit 1.4.1 From 022ead1f542f18bd856f9d5cbe85d39e229e10b4 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 30 Dec 2017 01:02:04 +0000 Subject: leocad: only builds on Linux (hardcoded into qmake project) --- pkgs/applications/graphics/leocad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 6387a3e3c1b3..4b5c4517deab 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "CAD program for creating virtual LEGO models"; homepage = http://www.leocad.org/; license = licenses.gpl2; - inherit (qt4.meta) platforms; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 9adb3f8e11f51d59673b6022384c0564d8b9f713 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 30 Dec 2017 00:17:17 -0500 Subject: motion: 4.0.1 -> 4.1.1 --- pkgs/applications/video/motion/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index d52154887071..67c91168fa2d 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "motion-${version}"; - version = "4.0.1"; + version = "4.1.1"; + src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; description = "Monitors the video signal from cameras"; -- cgit 1.4.1