Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-08-07 00:05:48 +00:00 committed by GitHub
commit f9252e8c68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 133 additions and 44 deletions

View file

@ -390,6 +390,12 @@
githubId = 1318982;
name = "Anders Claesson";
};
akho = {
name = "Alexander Khodyrev";
email = "a@akho.name";
github = "akho";
githubId = 104951;
};
akru = {
email = "mail@akru.me";
github = "akru";

View file

@ -14,7 +14,7 @@ let
''
#! ${pkgs.runtimeShell} -e
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
exec ${askPassword}
exec ${askPassword} "$@"
'';
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);

View file

@ -10,8 +10,5 @@ in {
config = mkIf cfg.enable {
security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil";
systemd.packages = [ pkgs.udevil ];
systemd.services."devmon@".wantedBy = [ "multi-user.target" ];
};
}

View file

@ -2,7 +2,7 @@
, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
@ -49,6 +49,8 @@ let
gssSupport = browser.gssSupport or false;
alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false;
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
smartcardSupport = cfg.smartcardSupport or false;
nativeMessagingHosts =
([ ]
@ -70,6 +72,7 @@ let
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ])
++ lib.optional (config.pulseaudio or true) libpulseaudio
++ lib.optional alsaSupport alsa-lib
++ lib.optional smartcardSupport opensc
++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk3 ];
@ -120,6 +123,10 @@ let
ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
) [] extensions;
};
} // lib.optionalAttrs smartcardSupport {
SecurityDevices = {
"OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so";
};
}
// extraPolicies;
};

View file

@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "insync";
version = "3.2.4.40856";
version = "3.3.5.40925";
src = fetchurl {
url = "http://s.insynchq.com/builds/${pname}_${version}-focal_amd64.deb";
sha256 = "1bvqbbrfn5784nmb2qaflm1rzczqhvghhb6y5zaxrapyhygxbcis";
sha256 = "sha256-lYlG/8d7teX98F5eDxm4EdBfFs7Sz3Td4kKLC6KZqnQ=";
};
postPatch = ''

View file

@ -0,0 +1,47 @@
{ llvmPackages
, lib
, fetchFromGitHub
, cmake
, python3
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "c3c";
version = "unstable-2021-07-30";
src = fetchFromGitHub {
owner = "c3lang";
repo = pname;
rev = "2246b641b16e581aec9059c8358858e10a548d94";
sha256 = "VdMKdQsedDQCnsmTxO4HnBj5GH/EThspnotvrAscSqE=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
llvmPackages.llvm
llvmPackages.lld
];
checkInputs = [ python3 ];
doCheck = true;
checkPhase = ''
( cd ../resources/testproject; ../../build/c3c build )
( cd ../test; python src/tester.py ../build/c3c test_suite )
'';
installPhase = ''
install -Dm755 c3c $out/bin/c3c
cp -r lib $out
'';
meta = with lib; {
description = "Compiler for the C3 language";
homepage = "https://github.com/c3lang/c3c";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ luc65r ];
platforms = platforms.all;
};
}

View file

@ -81,37 +81,33 @@ stdenv.mkDerivation (args // {
};
meta = with lib; {
homepage = "http://caml.inria.fr/ocaml";
homepage = "https://ocaml.org/";
branch = versionNoPatch;
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
description = "OCaml is an industrial-strength programming language supporting functional, imperative and object-oriented styles";
longDescription =
''
OCaml is the most popular variant of the Caml language. From a
language standpoint, it extends the core Caml language with a
fully-fledged object-oriented layer, as well as a powerful module
system, all connected by a sound, polymorphic type system featuring
type inference.
longDescription = ''
OCaml is a general purpose programming language with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria by a group of leading researchers, it has an advanced type system that helps catch your mistakes without getting in your way. It's used in environments where a single mistake can cost millions and speed matters, is supported by an active community, and has a rich set of libraries and development tools. It's widely used in teaching for its power and simplicity.
The OCaml system is an industrial-strength implementation of this
language, featuring a high-performance native-code compiler (ocamlopt)
for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
and an interactive read-eval-print loop (ocaml) for quick development
and portability. The OCaml distribution includes a comprehensive
standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
and a documentation generator (ocamldoc).
'';
Strengths:
* A powerful type system, equipped with parametric polymorphism and type inference. For instance, the type of a collection can be parameterized by the type of its elements. This allows defining some operations over a collection independently of the type of its elements: sorting an array is one example. Furthermore, type inference allows defining such operations without having to explicitly provide the type of their parameters and result.
* User-definable algebraic data types and pattern-matching. New algebraic data types can be defined as combinations of records and sums. Functions that operate over such data structures can then be defined by pattern matching, a generalized form of the well-known switch statement, which offers a clean and elegant way of simultaneously examining and naming data.
* Automatic memory management, thanks to a fast, unobtrusive, incremental garbage collector.
* Separate compilation of standalone applications. Portable bytecode compilers allow creating stand-alone applications out of Caml Light or OCaml programs. A foreign function interface allows OCaml code to interoperate with C code when necessary. Interactive use of OCaml is also supported via a read-evaluate-print loop.
In addition, OCaml features:
* A sophisticated module system, which allows organizing modules hierarchically and parameterizing a module over a number of other modules.
* An expressive object-oriented layer, featuring multiple inheritance, parametric and virtual classes.
* Efficient native code compilers. In addition to its bytecode compiler, OCaml offers a compiler that produces efficient machine code for many architectures.
Learn more at: https://ocaml.org/learn/description.html
'';
platforms = with platforms; linux ++ darwin;
broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06";
};
})

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "21.01";
version = "21.02";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-D7nlwQnz2JPRB3JrrkyUcaaf4Ro/+Ap8sqq5Oz8naHw=";
sha256 = "sha256-4w0Zd3vmrw4KM9O/axy1BJpoHeQeZy0P6Ptolxrabjc=";
};
nativeBuildInputs = [cmake];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "hivex";
version = "1.3.20";
version = "1.3.21";
src = fetchurl {
url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
sha256 = "sha256-9SPDe7BkpLq321IkkCw07uT5+rLZuBz2FbMsC4UJ0y0=";
sha256 = "sha256-ms4+9KL/LKUKmb4Gi2D7H9vJ6rivU+NF6XznW6S2O1Y=";
};
patches = [ ./hivex-syms.patch ];

View file

@ -309,7 +309,7 @@ let
Rglpk = [ pkgs.glpk ];
RGtk2 = [ pkgs.gtk2.dev ];
rhdf5 = [ pkgs.zlib ];
Rhdf5lib = [ pkgs.zlib ];
Rhdf5lib = [ pkgs.zlib.dev ];
Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ];
Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ];
rjags = [ pkgs.jags ];

View file

@ -2,11 +2,11 @@ diff --git a/configure b/configure
index e2d292e..b13c0db 100755
--- a/configure
+++ b/configure
@@ -2880,6 +2880,7 @@ $MAKE
@@ -3874,6 +3874,7 @@
echo "building the hdf5 library...";
cd ../;
## we add the '-w' flag to suppress all the warnings hdf5 prints
+sed -i 's#/bin/mv#mv#' configure
./configure --with-pic --enable-shared=no --enable-cxx \
--with-szlib \
CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \
./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \
--with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \
${WITH_S3_VFD} \

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "psftools";
version = "1.0.14";
version = "1.1.0";
src = fetchurl {
url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz";
sha256 = "17nia5n5rabbh42gz51c8y53rjwddria4j3wvzk8dd0llj7k1y6w";
sha256 = "sha256-P9eIHtEXC55C2rXweJ9Vw93tIspjjQ6MCQ44FJDEook=";
};
outputs = ["out" "man" "dev" "lib"];

View file

@ -0,0 +1,30 @@
{ lib
, stdenv
, xorg
, pkg-config
, fetchFromGitHub
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "xplugd";
version = "1.4";
src = fetchFromGitHub {
owner = "troglobit";
repo = "xplugd";
rev = "v${version}";
sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql";
};
buildInputs = with xorg; [ libX11 libXi libXrandr libXext ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
meta = with lib; {
homepage = "https://github.com/troglobit/xplugd";
description = "A UNIX daemon that executes a script on X input and RandR changes";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ akho ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
version = "5.3.2";
version = "5.4.0";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk=";
sha256 = "sha256-/FhOZ6WCaQQOzsLH3iZTnwzmwUcdsskgASJFZupSIY0=";
};
dontConfigure = true;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hdfview";
version = "3.1.2";
version = "3.1.3";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c";
sha256 = "sha256-VmgHSVMFoy09plU5pSnyaPz8N15toy7QfCtXI7mqDGY=";
};
nativeBuildInputs = [

View file

@ -14476,6 +14476,10 @@ in
c2ffi = callPackage ../development/tools/misc/c2ffi { };
c3c = callPackage ../development/compilers/c3c {
llvmPackages = llvmPackages_11;
};
swfmill = callPackage ../tools/video/swfmill { };
swftools = callPackage ../tools/video/swftools {
@ -28502,6 +28506,8 @@ in
xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
xplugd = callPackage ../tools/X11/xplugd { };
xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {};
xkb-switch = callPackage ../tools/X11/xkb-switch { };