From aafffb261429688e93a88269bdb03c0cbf884085 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Fri, 14 Jun 2019 16:31:39 +0200 Subject: trimal: init at 1.4.1 --- .../science/biology/trimal/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100755 pkgs/applications/science/biology/trimal/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix new file mode 100755 index 00000000000..d4e8fee7bc3 --- /dev/null +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "trimal"; + version = "1.4.1"; + + src = fetchFromGitHub { + repo = pname; + owner = "scapella"; + rev = "v${version}"; + sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0"; + }; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a trimal readal statal $out/bin + ''; + + meta = with stdenv.lib; { + description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment"; + license = licenses.gpl3; + platforms = platforms.linux; + homepage = http://trimal.cgenomics.org; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a9a1c54b3a..f3bcadfe1e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21971,6 +21971,8 @@ in seaview = callPackage ../applications/science/biology/seaview { }; + trimal = callPackage ../applications/science/biology/trimal { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; -- cgit 1.4.1 From 3c85b7155a47a588d6cb2f388d241a1a25682411 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 3 Aug 2019 09:38:27 -0700 Subject: rust-cbindgen: 0.8.7 -> 0.9.0 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index ca4b6825a38..945b78caccc 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; + sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; }; - cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; + cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit 1.4.1 From 19d91206e7fb22b93d866f6b7d3c99120299a3df Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 6 Aug 2019 15:42:10 -0700 Subject: vulkan-*: 1.1.106 -> 1.1.114.0 --- .../libraries/vulkan-headers/default.nix | 4 +- .../libraries/vulkan-loader/default.nix | 8 ++-- .../vulkan-loader/system-search-path.patch | 45 ---------------------- .../tools/vulkan-validation-layers/default.nix | 9 +++-- pkgs/tools/graphics/vulkan-tools/default.nix | 4 +- pkgs/top-level/all-packages.nix | 12 +++--- 6 files changed, 18 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/libraries/vulkan-loader/system-search-path.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f7c1bf9a65b..9e3886c264e 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.106"; + version = "1.1.114.0"; buildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd"; + sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index a44e91e1bf5..dd09d5d3c7c 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -2,7 +2,7 @@ , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let - version = "1.1.106"; + version = "1.1.114.0"; in assert version == vulkan-headers.version; @@ -14,17 +14,15 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; + sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; - patches = [ ./system-search-path.patch ]; - cmakeFlags = [ - "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" + "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch deleted file mode 100644 index 26f83e6d534..00000000000 --- a/pkgs/development/libraries/vulkan-loader/system-search-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ac5ce835..cbdb0ff56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,12 @@ if(UNIX) - STRING - "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." - ) -+ set( -+ SYSTEM_SEARCH_PATH "" -+ CACHE -+ STRING -+ "Search path to always use, after all other search paths." -+ ) - endif() - - if(UNIX AND NOT APPLE) # i.e.: Linux -@@ -184,6 +190,7 @@ if(UNIX) - add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") - add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") - add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") -+ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}") - - # Make sure /etc is searched by the loader - if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) -diff --git a/loader/loader.c b/loader/loader.c -index 0d3b5a947..abe357004 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size); - search_path_size += DetermineDataFilePathSize(home_root, rel_size); - } -+ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size); - #endif - } - } -@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr); - CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr); - } -+ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr); - } - - // Remove the last path separator diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 3c189d09f1c..36d018682df 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }: + stdenv.mkDerivation rec { - name = "vulkan-validation-layers-${version}"; - version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! + pname = "vulkan-validation-layers"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp"; + sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 320b4eed14c..c02054cfbd6 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; - version = "1.1.106.0"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8"; + sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b089be81b..073e8fcb5c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13828,24 +13828,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; - sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; + rev = "aa9e8f538041db3055ea443080e0ccc315fa114f"; + sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; - sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; + rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc"; + sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "e06c7e9a515b716c731bda13f507546f107775d1"; - sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq"; + rev = "333d1c95792692205472c457d7bec915a94c8000"; + sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6"; }; }); }; -- cgit 1.4.1 From cf73f645501ef5be263955d940b4effb0b870d5a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 6 Aug 2019 15:45:23 -0700 Subject: glslang: 7.11.3113 -> 7.11.3214 --- pkgs/development/compilers/glslang/default.nix | 26 ++++++++++++++++++++------ pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b..161e57b5479 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: +{ stdenv, fetchFromGitHub +, bison +, cmake +, jq +, python3 +, spirv-headers +, spirv-tools +}: + stdenv.mkDerivation rec { - name = "glslang-${version}"; - version = "7.11.3113"; + pname = "glslang"; + version = "7.11.3214"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "${version}"; - sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"; + rev = version; + sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins"; + }; + + # These get set at all-packages, keep onto them for child drvs + passthru = { + inherit spirv-tools spirv-headers; }; - nativeBuildInputs = [ cmake python bison jq ]; + nativeBuildInputs = [ cmake python3 bison jq ]; enableParallelBuilding = true; postPatch = '' @@ -18,6 +31,7 @@ stdenv.mkDerivation rec { ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers ''; + # Ensure spirv-headers and spirv-tools match exactly to what is expected preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073e8fcb5c6..99e09962d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7727,16 +7727,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c"; - sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym"; + rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; + sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; }; }); - spirv-headers = spirv-tools.overrideAttrs (_: { + spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + repo = "SPIRV-Headers"; + rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; + sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; }; }); }; -- cgit 1.4.1 From ecd78af013c039c85dffef3a5451878dc684e3ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 6 Aug 2019 15:48:24 -0700 Subject: spirv-headers: 2019.1 -> 1.4.1 --- pkgs/development/libraries/spirv-headers/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 40d272fd07d..9b2c0032d4e 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { - name = "spirv-headers-${version}"; - version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit + pname = "spirv-headers"; + version = "1.4.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = version; + sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 96a64ff735c61be49f42aa6ae5e44998658a7d65 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 6 Aug 2019 15:48:54 -0700 Subject: spirv-tools: 2019.1 -> 2019.3 --- pkgs/development/tools/spirv-tools/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index c9df2703daa..85b82318439 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }: +{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.1"; + version = "2019.3"; in -assert version == spirv-headers.version; stdenv.mkDerivation rec { name = "spirv-tools-${version}"; inherit version; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"; + sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8"; }; enableParallelBuilding = true; - buildInputs = [ cmake python ]; + buildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; -- cgit 1.4.1 From 1ba444e4007c3a14927919051d9bb9692bd23639 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 8 Aug 2019 08:45:52 -0400 Subject: flent: run through nixfmt --- pkgs/applications/networking/flent/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index bc0a519a0ee..00522d84569 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,6 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 -, sphinx -}: +, sphinx }: buildPythonApplication rec { pname = "flent"; @@ -16,15 +15,11 @@ buildPythonApplication rec { checkInputs = [ procps ]; - propagatedBuildInputs = [ - matplotlib - procps - pyqt5 - ]; + propagatedBuildInputs = [ matplotlib procps pyqt5 ]; meta = with stdenv.lib; { description = "The FLExible Network Tester"; - homepage = https://flent.org; + homepage = "https://flent.org"; license = licenses.gpl3; maintainers = [ maintainers.mmlb ]; -- cgit 1.4.1 From a88232c31ae733a5bc148175ea20549cc81e23b2 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 8 Aug 2019 08:51:44 -0400 Subject: flent: use fetchPypi --- pkgs/applications/networking/flent/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 00522d84569..ed7e8ae9d6a 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,14 +1,12 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 +{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5 , sphinx }: buildPythonApplication rec { pname = "flent"; version = "1.2.2"; - src = fetchFromGitHub { - owner = "tohojo"; - repo = "flent"; - rev = "v${version}"; - sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; + src = fetchPypi { + inherit pname version; + sha256 = "0ziblk36rzr99pbi7xzzkci3sr41m0jf72v38ynp63df6szbbfjb"; }; buildInputs = [ sphinx ]; -- cgit 1.4.1 From a48c4843cd228f041dc75a120cbfa216e9a2f66a Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 8 Aug 2019 08:57:04 -0400 Subject: flent: use wrapQtAppsHook --- pkgs/applications/networking/flent/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index ed7e8ae9d6a..9b170735dcf 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5 +{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, qt5 , sphinx }: buildPythonApplication rec { @@ -10,11 +10,18 @@ buildPythonApplication rec { }; buildInputs = [ sphinx ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; checkInputs = [ procps ]; propagatedBuildInputs = [ matplotlib procps pyqt5 ]; + postInstall = '' + for program in $out/bin/*; do + wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH + done + ''; + meta = with stdenv.lib; { description = "The FLExible Network Tester"; homepage = "https://flent.org"; -- cgit 1.4.1 From 170caa4506fe40ebbbc47be62934161d2d6c0bb7 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 8 Aug 2019 09:03:41 -0400 Subject: flent: 1.2.2 -> 1.3.0 --- pkgs/applications/networking/flent/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 9b170735dcf..bbd9a7601ac 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,20 +1,29 @@ -{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, qt5 -, sphinx }: +{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +, pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { pname = "flent"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0ziblk36rzr99pbi7xzzkci3sr41m0jf72v38ynp63df6szbbfjb"; + sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7"; }; buildInputs = [ sphinx ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ matplotlib procps pyqt5 ]; + checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; - checkInputs = [ procps ]; + checkPhase = '' + cat >test-runner < Date: Tue, 27 Aug 2019 11:27:03 -0700 Subject: cocoapods-beta: 1.8.0.beta.1 -> 1.8.0.beta.2 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 13 +++++++------ pkgs/development/mobile/cocoapods/gemset-beta.nix | 18 +++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2ddffbf16b7..c75dc334ebc 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) @@ -12,16 +12,16 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.0.beta.1) + cocoapods (1.8.0.beta.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.0.beta.1) + cocoapods-core (= 1.8.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -31,9 +31,10 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.0.beta.1) + cocoapods-core (1.8.0.beta.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) + concurrent-ruby (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -42,7 +43,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index baa4748fb94..e2d4127ae44 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; claide = { groups = ["default"]; @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; + sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; + sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; cocoapods-try = { groups = ["default"]; -- cgit 1.4.1 From 93a27dbe9f4c3689e4b62089be1a7d5e7eb6a8aa Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 30 Aug 2019 13:50:50 +0200 Subject: usbtop: init at 1.0 --- pkgs/os-specific/linux/usbtop/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/usbtop/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/os-specific/linux/usbtop/default.nix new file mode 100644 index 00000000000..0ff8fcf0ddf --- /dev/null +++ b/pkgs/os-specific/linux/usbtop/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub +, cmake +, libpcap, boost }: + +stdenv.mkDerivation rec { + pname = "usbtop"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "aguinet"; + repo = pname; + rev = "release-${version}"; + sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpcap boost ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/aguinet/usbtop"; + description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; + maintainers = with maintainers; [ etu ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c3af89bc8d..14318795a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16494,6 +16494,8 @@ in withGui = false; }; + usbtop = callPackage ../os-specific/linux/usbtop { }; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; -- cgit 1.4.1 From 3cd8f4300c1b3e5402c7431fbed504ff0f9d6d1c Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Mon, 22 Jul 2019 23:39:35 +0200 Subject: perlPackages.ConfigSimple: init at 4.59 --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6180f6372e2..442df5ec715 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2879,6 +2879,18 @@ let }; }; + ConfigSimple = buildPerlPackage { + pname = "Config-Simple"; + version = "4.59"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz; + sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b"; + }; + meta = { + description = "Simple configuration file class"; + }; + }; + ConfigStd = buildPerlModule { pname = "Config-Std"; version = "0.903"; -- cgit 1.4.1 From 1eb8f58130ff2524b7a7caa245db81ae309e53f7 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Mon, 5 Aug 2019 18:22:31 +0200 Subject: x2goserver: init at 4.1.0.3 --- .../networking/remote/x2goserver/default.nix | 93 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 95 insertions(+) create mode 100644 pkgs/applications/networking/remote/x2goserver/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix new file mode 100644 index 00000000000..f69d2326217 --- /dev/null +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs +, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg +, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash +}: + +let + pname = "x2goserver"; + version = "4.1.0.3"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz"; + sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"; + }; + + x2go-perl = perlPackages.buildPerlPackage rec { + pname = "X2Go"; + inherit version src; + makeFlags = [ "-f" "Makefile.perl" ]; + patchPhase = '' + substituteInPlace X2Go/Config.pm --replace '/etc/x2go' '/var/lib/x2go/conf' + substituteInPlace X2Go/Server/DB.pm \ + --replace '$x2go_lib_path/libx2go-server-db-sqlite3-wrapper' \ + '/run/wrappers/bin/x2gosqliteWrapper' + substituteInPlace X2Go/Server/DB/SQLite3.pm --replace "user='x2gouser'" "user='x2go'" + ''; + }; + + perlEnv = perl.withPackages (p: with p; [ + x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch + ]); + + binaryDeps = [ + perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep + findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs + xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil + xorg.xkbcomp xorg.setxkbmap + ]; +in +stdenv.mkDerivation rec { + inherit pname version src; + + buildInputs = [ perlEnv bash ]; + + nativeBuildInputs = [ makeWrapper ]; + + prePatch = '' + patchShebangs . + sed -i '/Makefile.PL\|Makefile.perl/d' Makefile + for i in */Makefile; do + substituteInPlace "$i" --replace "-o root -g root " "" + done + substituteInPlace libx2go-server-db-perl/Makefile --replace "chmod 2755" "chmod 755" + for i in x2goserver/sbin/x2godbadmin x2goserver/bin/x2go* + do + substituteInPlace $i --replace '/etc/x2go' '/var/lib/x2go/conf' + done + substituteInPlace x2goserver/sbin/x2gocleansessions \ + --replace '/var/run/x2goserver.pid' '/var/run/x2go/x2goserver.pid' + substituteInPlace x2goserver/sbin/x2godbadmin --replace 'user="x2gouser"' 'user="x2go"' + substituteInPlace x2goserver-xsession/etc/Xsession \ + --replace "SSH_AGENT /bin/bash -c" "SSH_AGENT ${bash}/bin/bash -c" \ + --replace "[ -f /etc/redhat-release ]" "[ -d /etc/nix ] || [ -f /etc/redhat-release ]" + ''; + + makeFlags = [ "PREFIX=/" "NXLIBDIR=${nx-libs}/lib/nx" ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/etc/x2go/x2goserver.conf{,.example} + mv $out/etc/x2go/x2goagent.options{,.example} + ln -sf ${nx-libs}/bin/nxagent $out/bin/x2goagent + for i in $out/sbin/x2go* $(find $out/bin -type f) \ + $(ls $out/lib/x2go/x2go* | grep -v x2gocheckport) + do + wrapProgram $i --prefix PATH : ${lib.makeBinPath binaryDeps}:$out + done + # We're patching @INC of the setgid wrapper, because we can't mix + # the perl wrapper (for PERL5LIB) with security.wrappers (for setgid) + sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \ + $out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote desktop application, server component"; + homepage = "http://x2go.org/"; + platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.averelld ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eeb1084144..3f944f38c66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21331,6 +21331,8 @@ in x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; + x2goserver = callPackage ../applications/networking/remote/x2goserver { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; -- cgit 1.4.1 From 72f711eadaf18315adc1188a9c1b2198713b8ae4 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Sat, 31 Aug 2019 07:36:28 +0200 Subject: maturin: 0.7.0 -> 0.7.1 Change: - maturin build --interpreter/maturin publish --interpreter builds only a source distribution. --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 4b07129ae0e..7bd49132d0e 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39"; + sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2"; }; - cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj"; + cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335"; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 1c9253ce2b512bbe625a6fafbae58228498f42fb Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Sat, 31 Aug 2019 10:09:32 +0200 Subject: gotestsum: Init at 0.3.5 --- pkgs/development/tools/gotestsum/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/gotestsum/default.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix new file mode 100644 index 00000000000..36e41bddf25 --- /dev/null +++ b/pkgs/development/tools/gotestsum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gotestsum"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "gotestyourself"; + repo = "gotestsum"; + rev = "v${version}"; + sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv"; + }; + + modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn"; + + meta = with stdenv.lib; { + homepage = "https://github.com/gotestyourself/gotestsum"; + description = "A human friendly `go test` runner"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ endocrimes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f996f185d2..39caf0596fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16198,6 +16198,8 @@ in gotests = callPackage ../development/tools/gotests { }; + gotestsum = callPackage ../development/tools/gotestsum { }; + impl = callPackage ../development/tools/impl { }; quicktemplate = callPackage ../development/tools/quicktemplate { }; -- cgit 1.4.1 From 560ce2a4a7e212eb884a16f27380295849d4005d Mon Sep 17 00:00:00 2001 From: averelld Date: Sat, 31 Aug 2019 11:40:35 +0200 Subject: anki: 2.1.11 -> 2.1.14 (#67738) * anki: 2.1.11 -> 2.1.14 * anki: 2.1.14 -> 2.1.15 --- pkgs/games/anki/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index b0efc54db36..cd7f941ccd1 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -18,6 +18,7 @@ , pytest , glibcLocales , nose +, jsonschema , send2trash , CoreAudio # This little flag adds a huge number of dependencies, but we assume that @@ -31,10 +32,10 @@ let # when updating, also update rev-manual to a recent version of # https://github.com/dae/ankidocs # The manual is distributed independently of the software. - version = "2.1.11"; - sha256-pkg = "0rcjam7f017yg0fx5apdc309lsx59lfw33nikczz7hrw6gby6z3q"; - rev-manual = "f933104fecd8a83c33494bdb2b59817a3318202f"; - sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h"; + version = "2.1.15"; + sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; + rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139"; + sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml"; manual = stdenv.mkDerivation { name = "anki-manual-${version}"; @@ -84,7 +85,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator - markdown + markdown jsonschema ] ++ lib.optional plotsSupport matplotlib ++ lib.optional stdenv.isDarwin [ CoreAudio ] -- cgit 1.4.1 From e3aaada61de9d9d4940e8a2416f041e842c8893d Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 31 Aug 2019 03:00:20 -0700 Subject: lightspark: init at 0.8.1 (#67425) --- pkgs/misc/lightspark/default.nix | 37 +++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/misc/lightspark/default.nix (limited to 'pkgs') diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix new file mode 100644 index 00000000000..bb3ade6b616 --- /dev/null +++ b/pkgs/misc/lightspark/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm +, llvm_39, glibmm +}: + +stdenv.mkDerivation rec { + pname = "lightspark"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "lightspark"; + repo = "lightspark"; + rev = "${version}"; + sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s"; + }; + + patchPhase = '' + sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + gnome2.pango lzma nasm llvm_39 glibmm + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source Flash Player implementation"; + homepage = "https://lightspark.github.io/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jchw ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3756ecb0a65..0441485de6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12568,6 +12568,8 @@ in lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightspark = callPackage ../misc/lightspark { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; linenoise = callPackage ../development/libraries/linenoise { }; -- cgit 1.4.1 From 44ce76322d41ac7151fc9c84fb06912f69855bd5 Mon Sep 17 00:00:00 2001 From: averelld Date: Sat, 31 Aug 2019 12:01:34 +0200 Subject: mattermost-desktop: 4.2.0 -> 4.2.3 (#67717) --- .../networking/instant-messengers/mattermost-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 1fb74314811..4b8e270c489 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -38,18 +38,18 @@ let in stdenv.mkDerivation rec { name = "mattermost-desktop-${version}"; - version = "4.2.0"; + version = "4.2.3"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; - sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; + sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; - sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; + sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; -- cgit 1.4.1 From b4e1c45e4cfaf581f0c2b58bd82fc88837c0f487 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 31 Aug 2019 12:16:02 +0200 Subject: vimPlugins: update (#67823) --- pkgs/misc/vim-plugins/generated.nix | 404 ++++++++++++++++++------------------ 1 file changed, 202 insertions(+), 202 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4dcfbeecb76..cf1ea84a9c5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-12"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4"; - sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq"; + rev = "73812c3e41c1c7fcf1705811f35ac4c9ccec003e"; + sha256 = "166hgzyx1j1n717icj0mq2n8jkg4kpi1iy5gk3q0l28nd88w5hlb"; }; }; @@ -138,12 +138,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-07-28"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "6b89c217ffa50f92a7afdcb01d2af071ff9b80a0"; - sha256 = "03d12fi90kbhf74p1yh721nfa26r2ns7ad5k6a7n6fwl3anrq4g4"; + rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18"; + sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z"; }; }; @@ -281,12 +281,12 @@ let coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2019-06-17"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "557bc1b88a84d9191337169484603a56fdb30adb"; - sha256 = "1fla5i3fimm5h31qrivralbmhb88n1pkwzdfj74i6rd20fmv4xcx"; + rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9"; + sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn"; }; }; @@ -303,23 +303,23 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-08-11"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5"; - sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y"; + rev = "d778033c08580768d2a48b78f4c1b7ab63af12bd"; + sha256 = "1bxx8y5yp9v95clp8dic8q8zr85dl7i2qq4iibmazg9hzcigc3s6"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-08-06"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7"; - sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls"; + rev = "27ef3358055b68c5b592c920c9d0e8aa1522c71e"; + sha256 = "1v1lwkxzwi1l20561m1nxbmgmjgzn83lvx0mb2c4z3p7brbjmv0y"; }; }; @@ -435,12 +435,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-07-27"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "a1ed2aff825b9c48d4be98207470db0a19b2e2c6"; - sha256 = "0n8famcsy05vzaf48fczbfz68868wjkaq8bl4k6206glppmxybw3"; + rev = "65ff16f71ead209e83d34c639594a66df2e19c49"; + sha256 = "11bmf8rzdkgrmanyfmjckm2s3nby143lnra80q9bj2fs3dh9l5hd"; }; }; @@ -479,12 +479,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-07-26"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "bcfc9ecbf5e31e89a321a2f6e6bf6c3042aef166"; - sha256 = "1nkkl7j3328gjmmdrbpqvypsd52vqggaa9cxw98r2qn754nx2gwi"; + rev = "ffd2b091e5bb5995aac95d1ebe98f87f3df763b1"; + sha256 = "1n23nvfh99jvnmf901g5zck8hyx3qq5cr4vz119a7ra5dj4bka95"; }; }; @@ -501,23 +501,23 @@ let coc-stylelint = buildVimPluginFrom2Nix { pname = "coc-stylelint"; - version = "2019-06-19"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-stylelint"; - rev = "627d6aa41f4d64fba5bee5830a9fc0b9799ab5d5"; - sha256 = "1jgd2w9kxgrf3sg55jfg8i2afwvsyvjs656fhb48ynhw0dxf0nvp"; + rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; + sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; }; }; coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-08-11"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66"; - sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhavm696azibfv"; + rev = "d6617d0ae2b2ba0f415961fed1ffc3827d06db54"; + sha256 = "1drxhjr6yv4qja0z9pypq14lj18rkw0hpwcg0ji2fgiqrf2l9ywj"; }; }; @@ -545,23 +545,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-08-01"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "8daf0e45d513ab3b9eb91e126e50c48b901d8cf9"; - sha256 = "1zf75zahvcq5kcrpn5m69i0sj3dv4g2m8x3jffjqnx3cnirm42r4"; + rev = "c80ae7b19b038f380639e1c5b5e3c3a0b9252f6c"; + sha256 = "06pd5k72sa3d6psdkcdar70b456p2dqzbbk2x166gkxavjqjkyid"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-07-09"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "ebd982bde36db01d85e02ca48898be303d878d38"; - sha256 = "0dxwvx9mwhlxpa1wn1cy3psb2s2rafibmvin4rnzxb467bkwbgiz"; + rev = "444c297e2a418d816b6094446b57f2333ef9047a"; + sha256 = "01d51z6iyl2p5lhkr86a3gri0d8g7ydb8qvlp0xqrr2fy97xdx9v"; }; }; @@ -656,12 +656,12 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2019-02-25"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "c3f806b4d06230607bc0a3bf619bf9c3ec1c9d95"; - sha256 = "17acbqlws0i82japyd2a94wf1arn6y8mb6sfbm6xzicvicffyqmd"; + rev = "9d495ce4ddfdae8f0b268fcec3a7a5e0062456e8"; + sha256 = "0g5ixgg8p2vrpjhyy52xln7a5f8rcbglgyir620ynzhz1phdilg4"; }; }; @@ -799,12 +799,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-17"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0"; - sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n"; + rev = "161d4a7cd490dad3a708e8461e11f3bf2af2c0ea"; + sha256 = "026lkyd768v4a0pyfzrlsqyln4bvmhp99p4vjhmmi079vjs7z7b1"; }; }; @@ -912,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-14"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "bb2b16309b94695a3344c713282368b3329a2412"; - sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9"; + rev = "93722cc5d0a1877fdad0845330b3a41c5e392a34"; + sha256 = "0ay5j8drbd0m8hn9zpxsd56z2y07imm8lmkvfamja353mwb8nlh9"; }; }; @@ -990,12 +990,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-07-24"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "461700696ea317722c4a8d92a31a7267cdcc0bfb"; - sha256 = "1jfz9n875lqnhxi09rddw1wpacjda1l36xyc3a4yyaxbfb62sqxf"; + rev = "10b3746ecb52064d44bbcb1fdf6b21cca551f30c"; + sha256 = "1crm0qj8wwizgvzn4jlwbpnjbddp08fs9i46nr56q38hc6mgir4x"; fetchSubmodules = true; }; }; @@ -1024,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-14"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "d642592f062c5e4d195e627ac4104d4e0355a125"; - sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac"; + rev = "f5ec61dade10692257e5f45609bb42f8fbf07c23"; + sha256 = "08j1rhah96k7w4x569w84qxgn4ishia0xxy102z8v5zgxjpcyhld"; }; }; @@ -1135,12 +1135,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-08-07"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "f7aee1f324d2a731a13b4495260a1aeaf0c0b52a"; - sha256 = "1s0byckwkxwhrzrhdhjvfzzyg3pvbkbc3pikp395pzcf8kmpmvcv"; + rev = "12cbd4cf3109459a1577be30da82cffe22bdf4b6"; + sha256 = "0wzcpk9wsdhmz888g2x9b1ljf437agq536bd2d801dzv3ynqf4jl"; }; }; @@ -1179,12 +1179,12 @@ let gitv = buildVimPluginFrom2Nix { pname = "gitv"; - version = "2019-03-02"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "gregsexton"; repo = "gitv"; - rev = "89af431fb0fabe55bd3287d268f6b12ee336f666"; - sha256 = "0d60xf7kdl3ipjgw2cliky783jj5jsrz8bgd7gv5z08r853y76pv"; + rev = "a73599c34202709eaa7da78f4fe32b97c6ef83f8"; + sha256 = "0hhamv2q3z8cy4n9yzxq0jvs2x8qx4wx6c2qpsk82jsnghmzipd6"; }; }; @@ -1256,12 +1256,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-07-20"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "c94e82ab8c62c2b6f09c00752199692e4af1c836"; - sha256 = "00vpwcq0ap4ss60v57gbhbdp4vx632qlfxdbc7jh0iawdpm1bdsq"; + rev = "ddc3e4ea485771e4f0b939fd8259f3152eb1bd29"; + sha256 = "0128yxhafndllc383ncw4ka0r7q8mwvb3nx70f4plb6m3f07x8rm"; }; }; @@ -1333,12 +1333,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2019-03-22"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "e552c65165b42df79d462d9222ae022116bdb26a"; - sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5"; + rev = "9c5d1e70f5335cc995e61ceba870818a946f26c3"; + sha256 = "0ppd8x9rh2mqd743zsvxakzha878lg7c7a3as5nlfjpb89g5dmn6"; }; }; @@ -1366,12 +1366,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-08-11"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827"; - sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86"; + rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe"; + sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y"; fetchSubmodules = true; }; }; @@ -1488,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-14"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "09c61dc3f650eccd2c165c36db8330496321aa50"; - sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb"; + rev = "8b3aa1632c08784928458b2b85faf5c89feefccf"; + sha256 = "0bxvxkk0zps2qxnzp8dip7ngpv9b1a74y2wjzjqqvxzljk81a714"; }; }; @@ -1686,12 +1686,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-08-01"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "528b5e47ec9c29fbbd470f2af71b8ad994a96bdb"; - sha256 = "09cq8a4ryhxvnpjvpbm0dq22ccqfmym59avxr4c0ablx1sqy9lhy"; + rev = "eb94d083bc0c9a4e4bec8a205fc65f6a464bd0f7"; + sha256 = "1va2dvqjjlcyl2in9wjh6c8gmnxlnl13j7gmf2g37j6jm28l16r9"; }; }; @@ -1708,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-08-15"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "cad94240c8284ab3502c62acc18e420ca22107de"; - sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq"; + rev = "723336c47844d7f58b7c37a6c3e62ddabcdf392b"; + sha256 = "0psiadnx4qzqzn6p2yc7az5l624xb5mczn3y39irbdrl6l2rcd81"; }; }; @@ -1763,12 +1763,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-06-22"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "f974a6e3c70f0591b76c196d6e6b2c20649e94c4"; - sha256 = "0wr4s52jfdhxm5zf6i46skrs8hjlf5w3c0wcrxjnszykza9d6whl"; + rev = "c96ff95c9a41d716bbdca41b4cc2dc62e4b188a1"; + sha256 = "0jbrgsdljh9n1cr3dpgq83gpd3hx7ss4hbc0i0hls15laczlzipc"; }; }; @@ -1796,23 +1796,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-08-07"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "a05185584d7cae7791fb40b7656cf642fdbe4938"; - sha256 = "1yri2gw2i4nkssm6fd1l8b9hkinb6h70wsavkb712ivdzqpcls6y"; + rev = "2504a3d84e97be144019ef184f0c2aed42f3152d"; + sha256 = "0djfm8k4yqaycydg4hpvnapyh2d5k0r3alhlk09rj1arsw2kzh38"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-08-09"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "184fbb6ffea6dc69726b229a08153c9d08522386"; - sha256 = "1h4wqmiplk3ay56db20dxxw90i9rij2kp2zjfhbfz525pxjg82gn"; + rev = "3d508aedce35e1d952d3ce92378ad27ea5960fa6"; + sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk"; }; }; @@ -1895,12 +1895,12 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-08-05"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "4f2f53872672f44049cef04a1f8f3cc4f921eae8"; - sha256 = "1yci56rdxqk5zfzqlkmhsw5s7c9xladhl3d4ks1j2b4dcb8gdsf5"; + rev = "d27d00b3c529adc13c9882e7a3cb5c63df038dcc"; + sha256 = "1z6i891h574yg3s1y96vwik1pxhy707rn5rsqqb7yxnfw6xy57cq"; }; }; @@ -2080,6 +2080,17 @@ let }; }; + readline-vim = buildVimPluginFrom2Nix { + pname = "readline-vim"; + version = "2019-08-24"; + src = fetchFromGitHub { + owner = "ryvnf"; + repo = "readline.vim"; + rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce"; + sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7"; + }; + }; + Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; version = "2019-06-04"; @@ -2113,17 +2124,6 @@ let }; }; - readline-vim = buildVimPluginFrom2Nix { - pname = "readline-vim"; - version = "2019-06-10"; - src = fetchFromGitHub { - owner = "ryvnf"; - repo = "readline.vim"; - rev = "a7c754acaf0aec922d4a6bde908a636578ef82cc"; - sha256 = "16fawg7fnlipn1f41cn1qc83dhr63qhr1bwn3qmr8sy7rbk5lihr"; - }; - }; - riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; version = "2019-02-18"; @@ -2159,12 +2159,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-15"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff"; - sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x"; + rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f"; + sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy"; }; }; @@ -2555,12 +2555,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-03-29"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f"; - sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx"; + rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; + sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; }; }; @@ -2577,12 +2577,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-07-26"; + version = "2019-08-25"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "b397068789f1844ef28e207a4efc03f157874f80"; - sha256 = "15dmlzyhmg0rw8wkkln7xr2qmlz4gilqpi22wkzziwvsjc4hs2az"; + rev = "217b4cfcfbe8633693c9751cf3eeafe8c48e2846"; + sha256 = "11g2ybrxndssf6g1dxhx68gycfnkv2wmara6h7kwgy0sjn4r413x"; }; }; @@ -2819,12 +2819,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-08-11"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a40184536b3b93b6272585da9c36dca802d47a01"; - sha256 = "0ygv6mc8fby6chzms7ah6sbq7yf7jhcnavbw52dra2sdfm2h2kch"; + rev = "6409c7b317a283333a720f48cca5f259c1ea29ef"; + sha256 = "1wr7202idpyydnjbkc7sk8wr02ipdq40x4rwhi955yx76gwl111a"; }; }; @@ -2874,12 +2874,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-07-08"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "a7009a968869319bf0811110fd2006738ba27370"; - sha256 = "1c0zdsxv3x0bvjbvbr633g16464lhq66yy4jpw6pwsw6h2p78iha"; + rev = "69f7f2d80d3722f62847a58443da1d6cdf81b292"; + sha256 = "0vxblych7afny8i8kyk2f85xc9k2y4sv7i9jf3mkpykimsq2w4hm"; }; }; @@ -2907,12 +2907,12 @@ let vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2019-01-25"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "f5726c4bbe84a762d5ec62d57af439138a36af76"; - sha256 = "0mk15jv0vsqvww0jk3469755lb4hhjmxqkbk7byvxch63ai8jlsy"; + rev = "a05c728a962cdc7285f31ae5814cb64404fa7efc"; + sha256 = "1aymm36hakvvwhp8bnr0ys2xsadw8b3m8681lir3ymj55vc8cl5y"; }; }; @@ -2951,12 +2951,12 @@ let vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; - version = "2019-07-19"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "t9md"; repo = "vim-choosewin"; - rev = "ee5690220fa712a448577522b9508e79a07830c6"; - sha256 = "1w42lm1rg6002030rigs5pvqf98wdpljm1pyzzikl6hgarv3c8q1"; + rev = "6da5c0b96e63f51f0801266b781dee0562e74da9"; + sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5"; }; }; @@ -3072,12 +3072,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-06-12"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "5a31c72cc51cb11118e44fb50ff77fc596348f77"; - sha256 = "17a2i40z5145px4p4swvm003h4mdxd2hp89pyvrqal910d2g3hgb"; + rev = "1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96"; + sha256 = "0h0hdv492kw0gs8kn62gyvs29pjwvvg8gbsisx4wpw6qa6w457hn"; }; }; @@ -3105,12 +3105,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-07-08"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0c9e6faaf246767c850eb92f48c4bdc068cdf235"; - sha256 = "1kmdzf34clhvcjwxr47phvw835nfhm70swar5s6cf2pis1wllmjw"; + rev = "830f0fe48a337ed26384c43929032786f05c8d24"; + sha256 = "06lsb8lwdbb6l0nznmxb9akd4ss9cw76d03z9h4q9yfjydyqf5kn"; }; }; @@ -3127,12 +3127,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-08-05"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "3020cce00581054e9177297ee5461737a35de7de"; - sha256 = "1qvkgjfrwl2qmi2b1cvznvbmsn8rqgm4wcgb79il07ij4lnwf9g9"; + rev = "e8a213d9d0a21f03fc03319fa7560521b6cd6928"; + sha256 = "1vhjlpjjg5bdfcalf10z9gjnrnc98yf5r3ink9dhljj5vnx23zaw"; }; }; @@ -3215,12 +3215,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-08-15"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5"; - sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm"; + rev = "e9d495bb85981467105c375f665b10249b7bcc53"; + sha256 = "1lm2lhj9sqijc5b7yqa0vs56n2jg0q0xlxs4mf1pjwhdi0wmqd5y"; }; }; @@ -3259,12 +3259,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-12"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8712a165da4d1de9fb6ae918322ece843ac742e0"; - sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7"; + rev = "0b46f733955c63a73dc49c316f8bc97a4119fddc"; + sha256 = "1q8mnd6sd0nl8i13jvzkl79sbz0ncvx015bihymglj8wcpzrrwni"; }; }; @@ -3325,12 +3325,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-16"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5"; - sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh"; + rev = "b97a9abe29c39c4e1a45ae199dbb470df362f538"; + sha256 = "0lf5r91ba9xzzy1vs6g81mdgghcyica6xiir1xpg2aqksk0aidri"; }; }; @@ -3369,12 +3369,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-08-16"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89"; - sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw"; + rev = "88d396f1b49747fadbbde5c038a85067d94954e5"; + sha256 = "02blbk7vq5p25713ys30djkivks4ywg69drh9apyb3g5mjwi60m6"; }; }; @@ -3402,12 +3402,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-12"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "007b69c27b63fbcbe2e0766073b09281274b0231"; - sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w"; + rev = "635b9e7f27905070788cef60c0ba520209bf4f09"; + sha256 = "0zmymzafryi7mchv8wz3ynxi8a597c69zvx2s57xyhhczpcah4ms"; }; }; @@ -3424,12 +3424,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-05-31"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "a73a9dc920bd0b3ba8b298c258bd4d4814d9a162"; - sha256 = "15dcrla2z1r5phabfn72b6vbsyji8nsw3g5lif14pkg7ps3py79n"; + rev = "1b9cec58509ba2bc212ad21e4a58eb3acf501b9f"; + sha256 = "1rhp1rb97v9fv7w4qs350k5gqslbmkjn3lrq2a5bgnhar5xybs4k"; }; }; @@ -3666,12 +3666,12 @@ let vim-javascript-syntax = buildVimPluginFrom2Nix { pname = "vim-javascript-syntax"; - version = "2019-07-22"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "jelera"; repo = "vim-javascript-syntax"; - rev = "77f90362a05eeb7733648d522ce9bf54ca3b9299"; - sha256 = "00mv80fsvngdihrjfhfgz91lq5anfizkirgcaz0ld1d9i8arqsmc"; + rev = "e65e4f01ba94761323450208c9bf7141428784db"; + sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; }; }; @@ -3733,12 +3733,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-08-07"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "49a4b2e2a66b43c1335d1df378d5ebb6f381fe05"; - sha256 = "0pfscx95cjkw48ccn53x04wkrbh2kan2p3djyk2f5ml9n1ln8if5"; + rev = "9a0f7e8072f4e7e80c74b1e24fa82e359046b25a"; + sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir"; }; }; @@ -3854,12 +3854,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-13"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a"; - sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25"; + rev = "c2a8fad6bc39a8a90fccee32a34861969f55ad5a"; + sha256 = "16hb0lan77ics7192cpnw2i2aigbab5g63pq0j992vja7pmh6hab"; }; }; @@ -4041,12 +4041,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-07-29"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "b41a18b75dd8dee5217bca9f68d91f8fd2ea6084"; - sha256 = "0hw3znmb8zsacnkavgqcqbv4yb1b8vj9fm5h4z5lslxnnlg09pg9"; + rev = "53f14ea43997e46c2c4686a1d89bcebfec1c8c50"; + sha256 = "1qcng9hszv4fcqhzdq7sfvdhl0x4zv91blk328n2jrqp831c0ds1"; }; }; @@ -4107,12 +4107,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2017-06-14"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + rev = "4e0f08de173fcde5f3cb93da2c8129b1588e469a"; + sha256 = "1vhqcd0gls9bys1anjlfyx4mh3rfkc076g6j9h1r4j09zn0bw1qn"; }; }; @@ -4122,8 +4122,8 @@ let src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "307b0f244d99408decda3a98f58e864d49626818"; - sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw"; + rev = "ebd534c88bfd49f8d3c758d96ad04ce3f77ee6f8"; + sha256 = "1r3ic5mii9q4kqpwyq37cjbrrzj93fhj9b46zqkb5i1nw2vydl6l"; }; }; @@ -4162,12 +4162,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-07-29"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "94001f00825c36fab63b9f3ca47a204111e561a2"; - sha256 = "0pppaavma07c3lxqlbk8cghdsirncxng52mjmv5qk8yar8kxqvbr"; + rev = "b1a826329c0891416f2357bf77a43ac49b441e6d"; + sha256 = "0za2hnsg888nl3ddhawll053j64sgqhiqpxciqi05j50bz34cs8n"; }; }; @@ -4239,12 +4239,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-06-27"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "c509c7eedeea641f5b0bdae708581ff610fbff5b"; - sha256 = "19zhhnlrnkgsxacykck9q19rhk4gj31qjj6i4sl6bzi086kmf0z9"; + rev = "9edacf9d5b4d6e0570af33f88500f51ec4288c2e"; + sha256 = "0m91nvxjkgmbgaib3q27rk2nzkpxx18pa8nrv143r2k8na9bry0p"; }; }; @@ -4316,12 +4316,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-08-07"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "c176d137892f33945d3d4dd766fd21611e9b5ddf"; - sha256 = "11adqaccwph4z5a4kyycd1gbc1l9np4za0d4fbd3cnh1zqf2xzjz"; + rev = "b9febff7aac028a851d2568d3dcef91d9b6971bc"; + sha256 = "00852qj3v3py63k23rrxmx8w5yrin3q21vz9css0xg12l5r1j1wv"; }; }; @@ -4338,12 +4338,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-08-16"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad"; - sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc"; + rev = "2b5070441dea482cc4f88556b19002f2da6f3566"; + sha256 = "185c8x8nly7jxv0vpf0dsbpby2nsfqdxkyzc6mips6in7ymgg3b3"; }; }; @@ -4382,12 +4382,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-05-31"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "5b670df36291ca75f5ded5cd7608948d58ff6325"; - sha256 = "1s400mmp2g9n41svzxizm046901d5hd43hy4yh0ps8b5iq4kspma"; + rev = "27cc3ce0fd19f0414024a81ee1eee6b17f155122"; + sha256 = "162gvzm7f0dsgv52ixd79ggzxddgpmrxqsqa41nv72mw61s0pmax"; }; }; @@ -4459,12 +4459,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-08-15"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33"; - sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr"; + rev = "13b67af7aa6a454adbf1f0925bf41737889ed830"; + sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh"; }; }; @@ -4547,23 +4547,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-08-06"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "8b0a0ee7f2463f6949a5ce778169a782b80cdab4"; - sha256 = "0d66hv8r7hnahs6nh6jj00xbly38xgfz6ilg5zlab2kgswmkzxrf"; + rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233"; + sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-08-16"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b"; - sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9"; + rev = "1b82c6929e9d87ca756569c1640320d027498364"; + sha256 = "0hf76jlv916jpdncfgh2wyczpj4c7rzak3m1j3vnysav000p3vhd"; }; }; @@ -4613,12 +4613,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2019-03-26"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "f95b4a888a91cc9373cf2f801658287ff984592f"; - sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg"; + rev = "85ca1f5f197a30ce52d382bcdcaedeed4e132848"; + sha256 = "17lnvcw7vnwnl54yhw0jpsqnk0pni1wqg4kbm53bv4pvk8ivr95d"; }; }; @@ -4646,12 +4646,12 @@ let vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2019-02-18"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "2295e612d936671048035dbc447f5400cbee60de"; - sha256 = "1iay39zsp00d5mrqzggr40g6253qfk17wvjvmdp3xn50jraj8gwh"; + rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; + sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; }; }; @@ -4712,12 +4712,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-06-20"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "c91e356a33569bc39bb01392362b8747355b356e"; - sha256 = "07xm2289932j7lrxaf1gx3rxbzx4f059mkx78chj915pndx72q33"; + rev = "473427fc6e5aabdf69ad0ca28808de841d70bdb8"; + sha256 = "0cnj7z3r9cws283wrpg1a40ykpk0lwjkb44gp77996cggr9nqbjz"; }; }; @@ -4767,12 +4767,12 @@ let vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2018-03-10"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-wordy"; - rev = "14b9dbf76a82e29273a74768573900361200467f"; - sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; + rev = "87a77cb293ed1193c01e0f93c4dd70cddde76b08"; + sha256 = "19wvm1al41ys429rb2agb7d3xfv1kh2287r8sgiy1f6whjn236z6"; }; }; @@ -4866,12 +4866,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-14"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "866699bdae3696130159e7115954c64de8e7bdcd"; - sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq"; + rev = "23a3b356ba1e90d4a9dbb085712376cab83ab19e"; + sha256 = "1rp3jfsx991k2jl7wr8b32la5b881pn17k6dy27lwpw0sd0x3ha4"; }; }; @@ -5009,12 +5009,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-07-14"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "632bed9406fe891da8ec7b86320ff1c274d8318e"; - sha256 = "19g2ppq0ircmbj6vv5rs00fqa8vq1faw4hv1asq2ym31f3y3ccax"; + rev = "24fa9013a5a5d053262830553e81f84d9bf7552f"; + sha256 = "17mjrlzb60vkgvyiag11xmrf8a5sp94z1rx1mzcc4ys6j1if9136"; fetchSubmodules = true; }; }; -- cgit 1.4.1 From 661b311057ae4713f1f473659361961e86bad155 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Fri, 30 Aug 2019 21:36:57 -0600 Subject: discord-canary: 0.0.93 -> 0.0.95 --- pkgs/applications/networking/instant-messengers/discord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 189092a6d5e..1d9d645b0ed 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.93"; + version = "0.0.95"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz"; - sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.95/discord-canary-0.0.95.tar.gz"; + sha256 = "06qhm73kc88pq0lgbi7qjy4gx9ighkmx128fdm1dpzfv62fjdasw"; }; }; }.${branch} -- cgit 1.4.1 From a8aeb913b075f85c67b552620b06c3bb577fe5ea Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Fri, 30 Aug 2019 23:28:26 -0700 Subject: python: thespian: 3.9.9 -> 3.9.10 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index cd4a30f656a..f4c498bed95 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.9"; + version = "3.9.10"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380"; + sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d"; }; # Do not run the test suite: it takes a long time and uses -- cgit 1.4.1 From 35ac3344e747e61abcf1847add8d76a6a2812e8a Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 31 Aug 2019 15:06:46 +0300 Subject: colmap: init at 3.5 (#67759) * colmap: init at 3.5 --- pkgs/applications/science/misc/colmap/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/science/misc/colmap/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix new file mode 100644 index 00000000000..672569ed100 --- /dev/null +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -0,0 +1,37 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen, + freeimage, glog, libGLU, glew, qtbase, + cudaSupport ? false, cudatoolkit ? null }: + +assert !cudaSupport || cudatoolkit != null; + +let boost_static = boost.override { enableStatic = true; }; +in +mkDerivation rec { + version = "3.5"; + pname = "colmap"; + src = fetchFromGitHub { + owner = "colmap"; + repo = "colmap"; + rev = version; + sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + }; + + buildInputs = [ + boost_static ceres-solver eigen + freeimage glog libGLU glew qtbase + ] ++ lib.optional cudaSupport cudatoolkit; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline"; + longDescription = '' + COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline + with a graphical and command-line interface. + ''; + homepage = https://colmap.github.io/index.html; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ lebastr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d0a21b95e4..ee3a4f7d68e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7377,6 +7377,9 @@ in colm = callPackage ../development/compilers/colm { }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmapWithCuda = colmap.override { cudaSupport = true; }; + chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; chickenPackages = chickenPackages_5; -- cgit 1.4.1 From ccf6d84366cb2ba946c6a0c2914fa9a473bd54e8 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 31 Aug 2019 08:14:46 -0400 Subject: yubioath-desktop: Fix desktop launcher icon (#67793) --- pkgs/applications/misc/yubioath-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 843bc0c1c23..d7a019c1c41 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -44,6 +44,7 @@ mkDerivation rec { cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons substituteInPlace $out/share/applications/yubioath-desktop.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png" ''; meta = with stdenv.lib; { -- cgit 1.4.1 From 107af97c9090cf0d0722889553fcc3ffc45b22ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 31 Aug 2019 14:45:33 +0200 Subject: python-mailman-hyperkitty: initial version 1.1.0 --- .../python-modules/mailman-hyperkitty/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/mailman-hyperkitty/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix new file mode 100644 index 00000000000..fd89260ab94 --- /dev/null +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }: + +buildPythonPackage rec { + pname = "mailman-hyperkitty"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; + }; + + propagatedBuildInputs = [ mailman ]; + checkInputs = [ mock ]; + + checkPhase = '' + python -m nose2 -v + ''; + doCheck = false; + + meta = with stdenv.lib; { + description = "Mailman archiver plugin for HyperKitty"; + homepage = https://gitlab.com/mailman/mailman-hyperkitty; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9099552add2..8eaf7cd0ae8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -717,6 +717,8 @@ in { mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + manhole = callPackage ../development/python-modules/manhole { }; markerlib = callPackage ../development/python-modules/markerlib { }; -- cgit 1.4.1 From a919868ff14a65ad40319b1cfe5100c0cc0f85ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 31 Aug 2019 09:17:48 -0400 Subject: linux: Remove 5.1 The 5.1.x series is not supported anymore --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 9 --------- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.1.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix deleted file mode 100644 index ad3b292656e..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.1.21"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee3a4f7d68e..e23691b9b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15743,14 +15743,6 @@ in ]; }; - linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions - ]; - }; - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15961,7 +15953,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); # When adding to this list: -- cgit 1.4.1 From 1da1a7a4794de78db9461e094de0b5dd312cbe41 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jul 2019 00:23:31 +0000 Subject: pari: 2.11.1 -> 2.11.2 --- pkgs/applications/science/math/pari/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 72827112c50..89ae354e7c7 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , gmp , readline , libX11 @@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; - sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94"; + sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"; }; - patches = [ - # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream) - # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117 - # https://trac.sagemath.org/ticket/27335 - (fetchpatch { - name = "fix-off-by-one-error.patch"; - # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985 - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5"; - sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6"; - }) - ]; - buildInputs = [ gmp readline -- cgit 1.4.1 From c4adeddb5f8e945517068968d06ea838b7c24bd3 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Wed, 7 Aug 2019 21:30:58 +0200 Subject: opencv: dont try cuda on 32 bit config.cudaSupport can be true and cudatoolkit doesn't work with i686, which can happen inside pkgsi686Linux wrapping. --- pkgs/development/libraries/opencv/3.x.nix | 3 ++- pkgs/development/libraries/opencv/4.x.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8..34615f44eb4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3fdc392e92b..44bd9c32aef 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false -- cgit 1.4.1 From cbbe9f0f211a7c96e7daa7a6e9242b46f841fff2 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 31 Aug 2019 15:56:10 +0000 Subject: patchutils: add perl to buildInputs This was silently producing perl scripts with empty shebang lines, breaking a bunch of the binaries. --- pkgs/tools/text/patchutils/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 87d925e333f..9d7ac4b53f0 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, perl , version, sha256, patches ? [] , ... }: @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { inherit sha256; }; + buildInputs = [ perl ]; hardeningDisable = [ "format" ]; doCheck = false; # fails -- cgit 1.4.1