Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2020-12-08 18:15:42 +00:00 committed by GitHub
commit 5ed8ad03ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 611 additions and 322 deletions

View file

@ -7509,6 +7509,12 @@
githubId = 13752145;
name = "Richard Lupton";
};
rmcgibbo = {
email = "rmcgibbo@gmail.com";
github = "rmcgibbo";
githubId = 641278;
name = "Robert T. McGibbon";
};
rnhmjoj = {
email = "rnhmjoj@inventati.org";
github = "rnhmjoj";

View file

@ -195,7 +195,7 @@ in
RuntimeDirectory = "unbound";
ConfigurationDirectory = "unbound";
StateDirectory = "unbound";
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" "AF_UNIX" ];
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallFilter = [

View file

@ -21,6 +21,7 @@ mkDerivation rec {
];
cmakeFlags = [
"-DMUSESCORE_BUILD_CONFIG=release"
"-DUSE_SYSTEM_FREETYPE=ON"
];

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mympd";
version = "6.8.1";
version = "6.8.3";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${version}";
sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8=";
sha256 = "1a3jrqslxk2a9h5gj6kch108lg9z0i5zwr0j9yd5viyfhr3ka4cq";
};
nativeBuildInputs = [

View file

@ -3,7 +3,7 @@
}:
let
version = "12.1";
version = "12.2";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103";
sha512 = "b25cda9830e8fe1d05687b08cc5fa9bcac7e8e6d12776998a4da7e483b3be0d04493345e56be7e6198fa8f86428d57d4459bfa7372c2e3f918f4a1101d0a31a7";
};
buildCommand = ''
@ -27,6 +27,8 @@ stdenv.mkDerivation {
unzip $src
patchShebangs .
rm netbeans/bin/*.exe
# Copy to installation directory and create a wrapper capable of starting
# it.
mkdir -pv $out/bin

View file

@ -9,13 +9,13 @@ let
pythonPackages = python3Packages;
in mkDerivation rec {
pname = "freecad-unstable";
version = "2020-10-17";
version = "2020-12-08";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b";
sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq";
rev = "daea30341ea2d5eaf2bfb65614128a5fa2abc8b7";
sha256 = "1fza64lygqq35v7kzgqmiq5dvl5rpgkhlzv06f9dszdz44hznina";
};
nativeBuildInputs = [

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
patches = [ ./install.patch ];
patches = [ ./install.patch ./uri.patch ];
meta = with stdenv.lib; {
description = "XML documents and web site compiler";

View file

@ -0,0 +1,13 @@
diff --git a/src/stog_url.ml b/src/stog_url.ml
index 5d30a43f..c67bfc36 100644
--- a/src/stog_url.ml
+++ b/src/stog_url.ml
@@ -40,7 +40,7 @@ let of_string s =
with _ ->
failwith (Printf.sprintf "Malformed URL %S" s)
;;
-let to_string = Uri.to_string ;;
+let to_string u = Uri.to_string u;;
let path url =
let l =

View file

@ -13,7 +13,7 @@
},
"chromedriver": {
"version": "87.0.4280.88",
"sha256_linux": "141mr2jiy3nslwd3s43m4i6plkv9wv5fgi78cn7mz0ac9x6fpcgx",
"sha256_linux": "11plh2hs2zpa14ymlbnj92pa58krl28yw4c0s55wk8qsxvzvl02m",
"sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
}
},

View file

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
let
k3sVersion = "1.19.3-k3s3";
k3sVersion = "1.19.4-k3s1";
in
buildGoModule rec {
pname = "kube3d";
version = "3.3.0";
version = "3.4.0";
excludedPackages = "tools";
@ -13,7 +13,7 @@ buildGoModule rec {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
sha256 = "1fisbzv786n841pagy7zbanll7k1g5ib805j9azs2s30cfhvi08b";
};
vendorSha256 = null;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "3.4.2";
version = "3.5.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "0bvvh68k2xjmmwafwdsijf3yb4ff9wbsl2ibad627l1y4js5615z";
sha256 = "0bnsd1kx0ji2s3w1v7sskc3x82avaqjn2arnax55bmh1yjma6z8p";
};
vendorSha256 = "05nwfxqgkpbv5i0365wpsnnaq528a7srycd1dsdlssz1cy7i0d31";
vendorSha256 = "0ppcrp6jp23ycn70mcgi5bsa0hr20hk7044ldw304krawy2vjgz8";
subPackages = [ "." ];

View file

@ -31,6 +31,7 @@
, mbedtls
, mediastreamer
, mediastreamer-openh264
, minizip2
, mkDerivation
, openldap
, ortp
@ -47,81 +48,30 @@
, stdenv
, udev
, zlib
# For Minizip 2.2.7:
, fetchFromGitHub
, libbsd
}:
let
# Linphone Desktop requires Minizip 2.2.7. Nixpkgs contains a very old version
# from the time when it was part of zlib. The most recent release of Minizip
# is currently 2.9.2 but Linphone Desktop didn't work with that. So, even if
# we added most recent Minizip version to nixpkgs, probably Minizip 2.2.7 is
# only needed here and we shouldn't add this semi-old version to
# all-packages.nix. Therefore, just define it here locally.
minizip2 = stdenv.mkDerivation rec {
pname = "minizip";
version = "2.2.7";
disabled = stdenv.isAarch32;
src = fetchFromGitHub {
owner = "nmoinvaz";
repo = pname;
rev = version;
sha256 = "1a88v1gjlflsd17mlrgxh420rpa38q0d17yh9q8j1zzqfrd1azch";
};
nativeBuildInputs = [ cmake pkgconfig ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
];
buildInputs = [
zlib
libbsd # required in 2.2.7 but not in 2.9.2?
];
meta = with stdenv.lib; {
description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
homepage = "https://github.com/nmoinvaz/minizip";
license = licenses.zlib;
platforms = platforms.unix;
};
};
in
mkDerivation rec {
pname = "linphone-desktop";
# Latest release is 4.1.1 old and doesn't build with the latest releases of
# some of the dependencies so let's use the latest commit.
version = "unstable-2020-03-06";
version = "4.2.4";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
owner = "public";
group = "BC";
repo = pname;
rev = "971997e162558d37051f89c9c34bbc240135f704";
sha256 = "02ji4r8bpcm2kyisn9d3054m026l33g2574i1ag1cmb2dz2p8i1c";
rev = version;
sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz";
};
# Without this patch, the build fails with:
#
# No rule to make target
# 'minizip_OUTPUT/nix/store/...linphone-desktop.../lib/libminizip.so',
#
# So, the makefile tries to use a full absolute path to the library but does
# it incorrectly. As we have installed Minizip properly, it's sufficient to
# just use "minizip" and the library is found automatically. If this patched
# target_link_libraries line was removed entirely, the build would fail at the
# very end when linking minizip.
patches = [
./fix_minizip_linking.patch
./do-not-build-linphone-sdk.patch
./remove-bc_compute_full_version-usage.patch
];
# See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21
postPatch = ''
substituteInPlace src/app/AppController.cpp \
echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake
substituteInPlace linphone-app/src/app/AppController.cpp \
--replace "LINPHONE_QT_GIT_VERSION" "\"${version}\""
'';
@ -214,18 +164,18 @@ mkDerivation rec {
# those just need to be copied manually below.
installPhase = ''
mkdir -p $out/bin
cp linphone $out/bin/
cp linphone-app/linphone $out/bin/
wrapProgram $out/bin/linphone \
--set MEDIASTREAMER_PLUGINS_DIR \
${mediastreamer-openh264}/lib/mediastreamer/plugins
mkdir -p $out/share/applications
sed -i "s@/build/.*/OUTPUT/bin@$out/bin@" linphone.desktop
cp linphone.desktop $out/share/applications/
cp -r ../assets/icons $out/share/
cp linphone-app/linphone.desktop $out/share/applications/
cp -r ../linphone-app/assets/icons $out/share/
mkdir -p $out/share/belr/grammars
ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
mkdir -p $out/share/linphone
ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
mkdir $out/lib # prevent warning
'';
meta = with lib; {

View file

@ -0,0 +1,118 @@
From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Thu, 26 Nov 2020 15:56:30 -0300
Subject: [PATCH 1/2] do not build linphone-sdk
Signed-off-by: David P <megver83@parabola.nu>
---
CMakeLists.txt | 61 +------------------
.../cmake_builder/additional_steps.cmake | 9 ---
2 files changed, 3 insertions(+), 67 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7eb05f2..5921ee5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}")
-include(ExternalProject)
set(PROJECT_BUILD_COMMAND "")
if(CMAKE_BUILD_PARALLEL_LEVEL)
list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}")
@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE)
set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
endif()
-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
- STAMP_DIR "${SDK_BUILD_DIR}/stamp"
- BINARY_DIR "${SDK_BUILD_DIR}"
- STEP_TARGETS build
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
- LIST_SEPARATOR | # Use the alternate list separator
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
- #BUILD_ALWAYS NO #${DO_BUILD}
-)
-ExternalProject_Add_Step(sdk force_build
- COMMENT "Forcing build for 'desktop'"
- DEPENDEES configure
- DEPENDERS build
- ALWAYS 1
-)
include(FindPkgConfig)
-set(APP_DEPENDS sdk)
-
-
find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
if ( NOT Qt5_FOUND )
@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET)
find_package(ortp CONFIG QUIET)
-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS)
- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install")
- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
- DEPENDS ${APP_DEPENDS}
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project"
- LIST_SEPARATOR | # Use the alternate list separator
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
- # ${APP_OPTIONS}
- BUILD_ALWAYS ON
- )
- install(CODE "message(STATUS Running install)")
- set(AUTO_REGENERATION auto_regeneration)
- add_custom_target(${AUTO_REGENERATION} ALL
- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS linphone-qt)
-else()
- message("Adding Linphone Desktop in an IDE-friendly state")
- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
- add_dependencies(app-library ${APP_DEPENDS})
-endif()
-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
- LIST_SEPARATOR | # Use the alternate list separator
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
- EXCLUDE_FROM_ALL ON
- BUILD_ALWAYS ON
-)
+message("Adding Linphone Desktop in an IDE-friendly state")
+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake
index 7f7fd573..a69a04e8 100644
--- a/linphone-app/cmake_builder/additional_steps.cmake
+++ b/linphone-app/cmake_builder/additional_steps.cmake
@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING)
linphone_builder_apply_flags()
linphone_builder_set_ep_directories(linphone_package)
linphone_builder_expand_external_project_vars()
- ExternalProject_Add(TARGET_linphone_package
- DEPENDS TARGET_linphone_builder
- TMP_DIR ${ep_tmp}
- BINARY_DIR ${ep_build}
- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package"
- DOWNLOAD_COMMAND ""
- CMAKE_GENERATOR ${CMAKE_GENERATOR}
- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY}
- )
endif ()
endif ()
--
2.29.2

View file

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee77441..18ea5c27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -517,7 +517,7 @@ else()
target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib")
execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib")
elseif(NOT WIN32)
- target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so")
+ target_link_libraries(${TARGET_NAME} "minizip")
endif()
endif()#If (LinphoneCxx_FOUND AND Minizip_FOUND)
endif()#If (LinphoneCxx_FOUND)

View file

@ -0,0 +1,74 @@
From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Fri, 23 Oct 2020 16:44:17 -0300
Subject: [PATCH 2/2] remove bc_compute_full_version usage
---
linphone-app/CMakeLists.txt | 11 +----------
linphone-app/build/CMakeLists.txt | 5 -----
.../cmake_builder/linphone_package/CMakeLists.txt | 10 +---------
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
index 3bc9420a..27b418ee 100644
--- a/linphone-app/CMakeLists.txt
+++ b/linphone-app/CMakeLists.txt
@@ -21,17 +21,8 @@
################################################################################
cmake_minimum_required(VERSION 3.1)
+include(linphoneqt_version.cmake)
find_package(bctoolbox CONFIG)
-set(FULL_VERSION )
-bc_compute_full_version(FULL_VERSION)
-set(version_major )
-set(version_minor )
-set(version_patch )
-set(identifiers )
-set(metadata )
-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata)
-
-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
if(ENABLE_BUILD_VERBOSE)
#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
index 8ef03faa..97d94bd6 100644
--- a/linphone-app/build/CMakeLists.txt
+++ b/linphone-app/build/CMakeLists.txt
@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES
"libmng.spec"
)
-bc_compute_full_version(PROJECT_VERSION_BUILD)
-if(PROJECT_VERSION_BUILD)
- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}")
-endif()
-
message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
index baea03cf..08ffc1b5 100644
--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
# ==============================================================================
# Build package version.
# ==============================================================================
-bc_compute_full_version(APP_PROJECT_VERSION)
-if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION))
- execute_process(
- COMMAND ${GIT_EXECUTABLE} describe --always
- OUTPUT_VARIABLE APP_PROJECT_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
- )
-elseif (NOT(APP_PROJECT_VERSION))
+if (NOT(APP_PROJECT_VERSION))
set(APP_PROJECT_VERSION "0.0.0")
endif ()
string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
--
2.29.2

View file

@ -0,0 +1,87 @@
{ stdenv
, fetchurl
, glib
, libX11
, gst_all_1
, sqlite
, epoxy
, pango
, cairo
, gdk-pixbuf
, e2fsprogs
, libkrb5
, libva
, openssl
, pcsclite
, gtk3
, libselinux
, libxml2
, python3Packages
, cpio
, autoPatchelfHook
}:
stdenv.mkDerivation rec {
pname = "nice-dcv-client";
version = "2020.2.1737-1";
src =
fetchurl {
url = "https://d1uj6qtbmh3dt5.cloudfront.net/2020.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm";
sha256 = "sha256-SUpfHd/Btc07cfjc3zx5I5BiNatr/c4E2/mfJuU4R1E=";
};
nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ];
unpackPhase = ''
rpm2cpio $src | ${cpio}/bin/cpio -idm
'';
buildInputs = [
libselinux
libkrb5
libxml2
libva
e2fsprogs
libX11
openssl
pcsclite
gtk3
cairo
epoxy
pango
gdk-pixbuf
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
];
installPhase = ''
mkdir -p $out/bin/
mkdir -p $out/lib64/
mv usr/bin/dcvviewer $out/bin/dcvviewer
mv usr/lib64/* $out/lib64/
mkdir -p $out/libexec/dcvviewer
mv usr/libexec/dcvviewer/dcvviewer $out/libexec/dcvviewer/dcvviewer
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
$out/libexec/dcvviewer/dcvviewer
# Fix the wrapper script to have the right basedir.
sed -i "s#basedir=/usr#basedir=$out#" $out/bin/dcvviewer
mv usr/share $out/
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
# broken symlink, seems to give a warning message if i don't delete it
rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so
'';
meta = with stdenv.lib; {
description = "High-performance remote display protocol";
homepage = "https://aws.amazon.com/hpc/dcv/";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ rmcgibbo ];
};
}

View file

@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "12";
patch_version = "0-alpha1";
patch_version = "0-alpha2";
src = fetchTarball {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz";
sha256 = "1p9nnj7l43b697b6bm767znbf1h0s2lyc1qb8izr1vfpsmnm11ws";
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha2.tar.xz";
sha256 = "148vgjcfajjvrvh0q9kb2y7fszqd02cikb5wyznz7kjxka6xxyn9";
};
}

View file

@ -1,117 +1,117 @@
{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests
, writeScript, common-updater-scripts, git, gnused, nix, nixfmt }:
, writeScript, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }:
with lib;
let
repo = "git@github.com:scala/scala.git";
common = { version, sha256, tests, pname }:
stdenv.mkDerivation rec {
inherit version;
name = "scala-${version}";
src = fetchurl {
inherit sha256;
url = "https://www.scala-lang.org/files/archive/scala-${version}.tgz";
};
propagatedBuildInputs = [ jre ];
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
rm bin/*.bat
mv * $out
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/${name}
mv $out/man $out/share/man
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
done
'';
passthru = {
inherit tests;
updateScript = writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
coreutils
git
gnused
nix
nixfmt
]
}
versionSelect='v${versions.major version}.${versions.minor version}.*'
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
if [ "$oldVersion" != "$latestTag" ]; then
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix"
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
meta = {
description = "A general purpose programming language";
longDescription = ''
Scala is a general purpose programming language designed to express
common programming patterns in a concise, elegant, and type-safe way.
It smoothly integrates features of object-oriented and functional
languages, enabling Java and other programmers to be more productive.
Code sizes are typically reduced by a factor of two to three when
compared to an equivalent Java application.
'';
homepage = "https://www.scala-lang.org/";
license = licenses.bsd3;
platforms = platforms.all;
branch = versions.majorMinor version;
maintainers = [ maintainers.nequissimus ];
};
versionMap = {
"2.10" = {
version = "2.10.7";
sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
tests = [ nixosTests.scala.scala_2_10 ];
pname = "scala_2_10";
};
"2.11" = {
version = "2.11.12";
sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
tests = [ nixosTests.scala.scala_2_11 ];
pname = "scala_2_11";
};
"2.12" = {
version = "2.12.12";
sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
tests = [ nixosTests.scala.scala_2_12 ];
pname = "scala_2_12";
};
"2.13" = {
version = "2.13.4";
sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
tests = [ nixosTests.scala.scala_2_13 ];
pname = "scala_2_13";
};
in {
scala_2_10 = common {
version = "2.10.7";
sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
tests = [ nixosTests.scala.scala_2_10 ];
pname = "scala_2_10";
};
scala_2_11 = common {
version = "2.11.12";
sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
tests = [ nixosTests.scala.scala_2_11 ];
pname = "scala_2_11";
in with versionMap.${majorVersion};
stdenv.mkDerivation rec {
inherit version;
name = "scala-${version}";
src = fetchurl {
inherit sha256;
url = "https://www.scala-lang.org/files/archive/scala-${version}.tgz";
};
scala_2_12 = common {
version = "2.12.12";
sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
tests = [ nixosTests.scala.scala_2_12 ];
pname = "scala_2_12";
propagatedBuildInputs = [ jre ];
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
rm bin/*.bat
mv * $out
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/${name}
mv $out/man $out/share/man
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
--prefix PATH ":" ${gnugrep}/bin \
--prefix PATH ":" ${jre}/bin \
--set JAVA_HOME ${jre}
done
'';
passthru = {
inherit tests;
updateScript = writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
coreutils
git
gnused
nix
nixfmt
]
}
versionSelect='v${versions.major version}.${versions.minor version}.*'
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
if [ "$oldVersion" != "$latestTag" ]; then
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix"
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
scala_2_13 = common {
version = "2.13.4";
sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
tests = [ nixosTests.scala.scala_2_13 ];
pname = "scala_2_13";
meta = {
description = "A general purpose programming language";
longDescription = ''
Scala is a general purpose programming language designed to express
common programming patterns in a concise, elegant, and type-safe way.
It smoothly integrates features of object-oriented and functional
languages, enabling Java and other programmers to be more productive.
Code sizes are typically reduced by a factor of two to three when
compared to an equivalent Java application.
'';
homepage = "https://www.scala-lang.org/";
license = licenses.bsd3;
platforms = platforms.all;
branch = versions.majorMinor version;
maintainers = [ maintainers.nequissimus ];
};
}

View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "belcard";
version = "4.4.0";
version = "4.4.13";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";

View file

@ -2,7 +2,6 @@
, bctoolbox
, cmake
, fetchFromGitLab
, jre
, libantlr3c
, mbedtls
, stdenv
@ -11,20 +10,18 @@
stdenv.mkDerivation rec {
pname = "belle-sip";
# Using master branch for linphone-desktop caused a chain reaction that many
# of its dependencies needed to use master branch too.
version = "unstable-2020-02-18";
version = "4.4.13";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
owner = "public";
group = "BC";
repo = pname;
rev = "0dcb13416eae87edf140771b886aedaf6be8cf60";
sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv";
rev = version;
sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0";
};
nativeBuildInputs = [ jre cmake ];
nativeBuildInputs = [ cmake antlr3_4 ];
buildInputs = [ zlib ];
@ -37,10 +34,7 @@ stdenv.mkDerivation rec {
"-Wno-error=cast-function-type"
];
propagatedBuildInputs = [ antlr3_4 libantlr3c mbedtls bctoolbox ];
# Fails to build with lots of parallel jobs
enableParallelBuilding = false;
propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
meta = with stdenv.lib; {
homepage = "https://linphone.org/technical-corner/belle-sip";

View file

@ -1,14 +1,15 @@
{ fetchFromGitHub, stdenv, boost, cmake, libGL, libGLU }:
{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }:
stdenv.mkDerivation rec {
pname = "coin";
version = "4.0.0";
version = "2020-12-07-unstable";
src = fetchFromGitHub {
owner = "coin3d";
repo = "coin";
rev = "Coin-${version}";
sha256 = "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p";
# rev = "Coin-${version}";
rev = "d5539998aff272b349590fe74d068659682ecd0d";
sha256 = "11jaz8p9nn8jpd6dsgwgkldwr7z829gyf64g014qyyh8l6p7jzzd";
};
postPatch = ''
@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ boost libGL libGLU ];
buildInputs = [ boost libX11 libGL libGLU ];
meta = with stdenv.lib; {
homepage = "https://github.com/coin3d/coin";

View file

@ -46,43 +46,18 @@
, xsd
, zlib
}:
let
# Got the following error when building:
#
# Your version of Doxygen (1.8.17) is known to malfunction with some of our
# macro definitions, which causes errors while wrapprers generation. Please
# install an older version of Doxygen (< 1.8.17) or disable documentation
# and wrapper generation.
#
# So, let's then use 1.8.16 version of doxygen in this derivation. Hopefully
# this workaround can be removed with some newer release of liblinphone.
doxygen_1_8_16 = doxygen.overrideAttrs (
oldAttrs: rec {
name = "doxygen-1.8.16";
src = fetchurl {
urls = [
"mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
"http://doxygen.nl/files/${name}.src.tar.gz"
];
sha256 = "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z";
};
buildInputs = oldAttrs.buildInputs ++ [ git ];
}
);
in
stdenv.mkDerivation rec {
pname = "liblinphone";
# Using master branch for linphone-desktop caused a chain reaction that many
# of its dependencies needed to use master branch too.
version = "unstable-2020-03-20";
version = "4.4.15";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
owner = "public";
group = "BC";
repo = pname;
rev = "1d762a3e0e304aa579798aed4400d2cee2c1ffa0";
sha256 = "0ja38payyqbd8z6q5l5w6hi7xarmfj5021gh0qdk0j832br4c6c3";
rev = version;
sha256 = "16a31c0n5lix4r5xk7p447xlxbrhdlmj11kb4y1krb5fx8hf65cl";
};
# Do not build static libraries
@ -103,7 +78,6 @@ stdenv.mkDerivation rec {
cyrus_sasl
ffmpeg_3
gdk-pixbuf
git
glib
gtk2
libX11
@ -133,7 +107,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
bcunit
cmake
doxygen_1_8_16
doxygen
graphviz
intltool
makeWrapper

View file

@ -33,17 +33,15 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
# Using master branch for linphone-desktop caused a chain reaction that many
# of its dependencies needed to use master branch too.
version = "unstable-2020-03-20";
version = "4.4.13";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
owner = "public";
group = "BC";
repo = pname;
rev = "c5eecb72cb44376d142949051dd0cb7c982608fb";
sha256 = "1vp260jxvjlmrmjdl4p23prg4cjln20a7z6zq8dqvfh4iq3ya033";
rev = version;
sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw";
};
patches = [

View file

@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
stdenv.mkDerivation rec {
pname = "minizip";
version = "2.10.4";
src = fetchFromGitHub {
owner = "nmoinvaz";
repo = pname;
rev = version;
sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x";
};
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
"-DMZ_OPENSSL=ON"
];
buildInputs = [ zlib bzip2 xz zstd openssl ];
meta = with stdenv.lib; {
description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
homepage = "https://github.com/nmoinvaz/minizip";
license = licenses.zlib;
maintainers = with maintainers; [ gebner ];
platforms = platforms.unix;
};
}

View file

@ -6,17 +6,15 @@
stdenv.mkDerivation rec {
pname = "ortp";
# Using master branch for linphone-desktop caused a chain reaction that many
# of its dependencies needed to use master branch too.
version = "unstable-2020-03-17";
version = "4.4.9";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
owner = "public";
group = "BC";
repo = pname;
rev = "804dfc4f90d1a4301127c7af10a74fd2935dd5d8";
sha256 = "1yr8j8am68spyy5d9vna8zcq3qn039mi16cv9jf5n4chs9rxf7xx";
rev = version;
sha256 = "0igiw863gnf9f626v0igg1pj3fv4anvlvlk6xx3bk2zdi52a9kcc";
};
# Do not build static libraries

View file

@ -1,12 +1,16 @@
{ fetchurl, stdenv, coin3d, qtbase, cmake, pkgconfig }:
{ fetchFromGitHub, stdenv, coin3d, qtbase, cmake, pkgconfig }:
stdenv.mkDerivation rec {
pname = "soqt";
version = "1.6.0";
version = "2020-12-05-unstable";
src = fetchurl {
url = "https://github.com/coin3d/soqt/releases/download/SoQt-${version}/soqt-${version}-src.tar.gz";
sha256 = "07qfljy286vb7y1p93205zn9sp1lpn0rcrqm5010gj87kzsmllwz";
src = fetchFromGitHub {
owner = "coin3d";
repo = "soqt";
# rev = "SoQt-${version}";
rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d";
sha256 = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs=";
fetchSubmodules = true;
};
buildInputs = [ coin3d qtbase ];

View file

@ -1,17 +1,21 @@
{ lib, buildDunePackage, fetchurl
, astring, cmdliner, fmt, uuidm, re, stdlib-shims
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf
}:
buildDunePackage rec {
pname = "alcotest";
version = "1.0.1";
version = "1.2.3";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
sha256 = "1xlklxb83gamqbg8j5dzm5jk4mvcwkspxajh93p6vpw9ia1li1qc";
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz";
sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08";
};
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims ];
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/mirage/alcotest";

View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "alcotest-lwt";
inherit (alcotest) version src;
inherit (alcotest) version src useDune2;
propagatedBuildInputs = [ alcotest logs ocaml_lwt ];

View file

@ -7,6 +7,8 @@ buildDunePackage rec {
pname = "domain-name";
version = "0.3.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz";
sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad";
@ -14,7 +16,7 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
buildInputs = [ alcotest ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ astring fmt ];

View file

@ -1,16 +1,18 @@
{ lib, buildDunePackage, fetchurl, alcotest }:
{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
buildDunePackage rec {
pname = "duration";
version = "0.1.3";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz";
sha256 = "0m9r0ayhpl98g9vdxrbjdcllns274jilic5v8xj1x7dphw21p95h";
};
doCheck = true;
checkInputs = lib.optional doCheck alcotest;
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/hannesm/duration";

View file

@ -1,9 +1,11 @@
{ lib, buildDunePackage, fetchurl, alcotest }:
{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
buildDunePackage rec {
pname = "gmap";
version = "0.3.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
@ -11,9 +13,9 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
buildInputs = [ alcotest ];
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.05";
meta = {
description = "Heterogenous maps over a GADT";

View file

@ -1,13 +1,13 @@
{ lib, buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
{ buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
buildDunePackage rec {
pname = "graphql";
inherit (graphql_parser) version src;
inherit (graphql_parser) version useDune2 src;
propagatedBuildInputs = [ graphql_parser rresult yojson ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;

View file

@ -1,13 +1,13 @@
{ lib, buildDunePackage, alcotest, graphql, ocaml_lwt }:
{ buildDunePackage, alcotest, graphql, ocaml_lwt }:
buildDunePackage rec {
pname = "graphql-lwt";
inherit (graphql) version src;
inherit (graphql) version useDune2 src;
propagatedBuildInputs = [ graphql ocaml_lwt ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;

View file

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "graphql_parser";
version = "0.13.0";
useDune2 = true;
minimumOCamlVersion = "4.03";
src = fetchurl {
@ -14,7 +16,7 @@ buildDunePackage rec {
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ fmt re ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;

View file

@ -6,6 +6,8 @@ buildDunePackage rec {
pname = "mirage-time";
version = "2.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0";

View file

@ -3,7 +3,7 @@
buildDunePackage {
pname = "mirage-time-unix";
inherit (mirage-time) src version minimumOCamlVersion;
inherit (mirage-time) src useDune2 version minimumOCamlVersion;
propagatedBuildInputs = [ mirage-time ocaml_lwt duration ];

View file

@ -2,7 +2,7 @@
buildDunePackage {
pname = "ocplib-json-typed-bson";
inherit (ocplib-json-typed) version src;
inherit (ocplib-json-typed) version useDune2 src;
propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];

View file

@ -3,6 +3,7 @@
buildDunePackage rec {
pname = "ocplib-json-typed";
version = "0.7.1";
useDune2 = true;
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-json-typed";

View file

@ -6,12 +6,12 @@
buildDunePackage rec {
minimumOCamlVersion = "4.08";
version = "0.12.7";
version = "0.12.8";
pname = "tls";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc";
sha256 = "0sgppvfnamfnsglw1cl801i1xqkxbs33g40kwmmqj2vqjcarm26a";
};
useDune2 = true;

View file

@ -1,19 +1,21 @@
{ lib, fetchurl, buildDunePackage, ounit
, re, stringext
, angstrom, stringext
}:
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "uri";
version = "3.1.0";
version = "4.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4";
sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380";
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ re stringext ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ angstrom stringext ];
doCheck = true;
meta = {

View file

@ -6,8 +6,9 @@ else
buildDunePackage {
pname = "uri-sexp";
inherit (uri) version src doCheck meta;
inherit (uri) version useDune2 src meta;
buildInputs = [ ounit ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
}

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.16.25"; # N.B: if you change this, change botocore too
version = "1.16.31"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "05qxcfis4rnkjxh8wyks3gcpg14cshpd2rrhb1adxd0hpq5aprhk";
sha256 = "0c9q7njargrhxcl99mdc7xbb29imp8kpyg3d0vwq2crlzxln8y49";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.19.25"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.19.31"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "15hd5f2ars1hd3y2gh846fd0ydcgyjmkvncr6rdn4whbb5wkkbyc";
sha256 = "0z8pmkr7j2w90qpd25wv0j1z4kqx90j6ch8c8irlyj84wx61skk2";
};
propagatedBuildInputs = [

View file

@ -1,41 +1,38 @@
{ fetchPypi
{ fetchFromGitHub
, lib
, buildPythonPackage
, pythonOlder
, attrs
, click
, effect
, jinja2
, git
, pytestCheckHook
, pytestcov
, pytest-isort
, pythonOlder
}:
buildPythonPackage rec {
pname = "nix-prefetch-github";
version = "4.0.2";
version = "4.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "ZdaWIkpJk8AvTZmA76VMTXeOUTrWLe+W3vh/e0zwWB4=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "v${version}";
sha256 = "CLcmwobPrL6NiI/nw+/Dwho/r15owV16Jmt5OcfFqvo=";
};
propagatedBuildInputs = [
attrs
click
effect
jinja2
];
checkInputs = [ pytestCheckHook pytestcov pytest-isort git ];
checkPhase = ''
pytest -m 'not network'
'';
checkInputs = [ pytestCheckHook pytestcov git ];
# latest version of isort will cause tests to fail
# ignore tests which are impure
disabledTests = [ "isort" "life" "outputs" "fetch_submodules" ];
disabledTests = [ "network" "requires_nix_build" ];
meta = with lib; {
description = "Prefetch sources from github";

View file

@ -1942,6 +1942,18 @@ let
meta.homepage = "https://github.com/leanprover/lean.vim/";
};
lens-vim = buildVimPluginFrom2Nix {
pname = "lens-vim";
version = "2020-04-24";
src = fetchFromGitHub {
owner = "camspiers";
repo = "lens.vim";
rev = "868b195be3cc3000d1d3f875ee0a52a11972e5b9";
sha256 = "0qpx84k52pz29rx6q0zh3qq4g3a1gyvyfcipx3kaw4lxlld6agd5";
};
meta.homepage = "https://github.com/camspiers/lens.vim/";
};
lessspace-vim = buildVimPluginFrom2Nix {
pname = "lessspace-vim";
version = "2019-09-12";

View file

@ -461,6 +461,18 @@ self: super: {
];
});
lens-vim = super.lens-vim.overrideAttrs(old: {
# remove duplicate g:lens#animate in doc/lens.txt
# https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985
# https://github.com/camspiers/lens.vim/pull/40/files
patches = [
(substituteAll {
src = ./patches/lens-vim/remove_duplicate_g_lens_animate.patch;
inherit languagetool;
})
];
});
vim-hier = super.vim-hier.overrideAttrs(old: {
buildInputs = [ vim ];
});

View file

@ -0,0 +1,12 @@
diff --git a/doc/lens.txt b/doc/lens.txt
index 60943ce..2fe43dc 100644
--- a/doc/lens.txt
+++ b/doc/lens.txt
@@ -76,7 +76,6 @@ g:lens#disabled_filenames
Default value is [].
*g:lens#animate*
- *g:lens#animate*
g:lens#animate
If value is 1 and animate.vim is installed, the window resize
will be animated.

View file

@ -38,6 +38,7 @@ brennanfee/vim-gui-position
bronson/vim-trailing-whitespace
brooth/far.vim
buoto/gotests-vim
camspiers/lens.vim
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml

View file

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation {
pname = "hsphfpd";
version = "2020-11-27";
version = "2020-12-05";
src = fetchFromGitHub {
owner = "pali";
repo = "hsphfpd-prototype";
rev = "58ffbf8f1b457e46801039d572cd344472828714";
sha256 = "1hyg3cz6s58k6a7a3hcbs6wfk14cflnikd9psi7sirq6cn1z0ggb";
rev = "d294d064879591e9570ca3f444fa3eee2f269df8";
sha256 = "0pm5rbsfrm04hnifzdmsyz17rjk8h9h6d19jaikjc5y36z03xf1c";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.18.185"; # N.B: if you change this, change botocore to a matching version too
version = "1.18.191"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "0yf8dmjgiib5s4dimc1896zxrrj0sl5kzrp7x8spm6xkcvwb02l1";
sha256 = "1zsb9w0bpbwq093ydbh4b5r3287b5l9mrdx549vsv0rspmkr0d7c";
};
postPatch = ''

View file

@ -10143,11 +10143,10 @@ in
sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
sbcl = callPackage ../development/compilers/sbcl {};
inherit (callPackage ../development/compilers/scala/2.x.nix { jre = jre8; })
scala_2_10
scala_2_11
scala_2_12
scala_2_13;
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; };
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; };
scala = scala_2_13;
@ -12406,10 +12405,7 @@ in
inherit (llvmPackages_6) llvm clang-unwrapped;
};
belle-sip = callPackage ../development/libraries/belle-sip {
stdenv = gcc8Stdenv;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
belle-sip = callPackage ../development/libraries/belle-sip { };
libbfd = callPackage ../development/libraries/libbfd { };
@ -14950,6 +14946,8 @@ in
minizip = callPackage ../development/libraries/minizip { };
minizip2 = callPackage ../development/libraries/minizip2 { };
mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {
@ -22888,6 +22886,8 @@ in
geoip = geoipWithDatabase;
};
nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };
nixos-shell = callPackage ../tools/virtualization/nixos-shell {};
noaa-apt = callPackage ../applications/radio/noaa-apt { };