BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-03-12 12:25:52 +00:00 committed by GitHub
commit c2eb9a753a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 129 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/1password-gui/default.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
version = "0.9.26";
version = "8.0.27";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8=";
hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
};
nativeBuildInputs = [ makeWrapper ];

11
pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
View file

@ -2,19 +2,20 @@
, fetchurl
, appimageTools
, makeWrapper
, electron_10
, electron_12
, xorg
}:
let
electron = electron_10;
electron = electron_12;
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.4.2";
version = "2.7.0";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p";
sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n";
name = "${pname}-${version}.AppImage";
};
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst ]}"
'';
meta = with lib; {

2
pkgs/development/compilers/opa/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
};
patches = [ ./ocaml-4.03.patch ];
patches = [ ./ocaml-4.03.patch ./ocaml-4.04.patch ];
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.

75
pkgs/development/compilers/opa/ocaml-4.04.patch Normal file
View file

@ -0,0 +1,75 @@
diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
index b9f75bd1..171af065 100644
--- a/compiler/libbsl/bslLib.ml
+++ b/compiler/libbsl/bslLib.ml
@@ -726,7 +726,7 @@ struct
let root elt = !(elt.root)
let elt_name elt = elt.name
let elts e = e
- let children = List.map (fun e -> e.name, e)
+ let children m = List.map (fun e -> e.name, e) m
let is_root e = Path.is_root e.pwd
let parent e =
diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
index f4354a3f..81253d32 100644
--- a/compiler/passes/surfaceAstDependencies.ml
+++ b/compiler/passes/surfaceAstDependencies.ml
@@ -66,7 +66,6 @@ open SurfaceAst
(* shorthands *)
module SAH = SurfaceAstHelper
-module C = SurfaceAstCons.ExprIdentCons
module D = SurfaceAstDecons
module S = SurfaceAst
diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
index 10edf5cb..00de59fa 100644
--- a/compiler/passes/surfaceAstPasses.ml
+++ b/compiler/passes/surfaceAstPasses.ml
@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
(* alias *)
module C = SurfaceAstCons.ExprIdentCons
-module CS = SurfaceAstCons.StringCons
diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
index 2eebd96b..04ce77c8 100644
--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
+++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
@@ -17,7 +17,6 @@
*)
module Format = Base.Format
module List = Base.List
-module String = Base.String
module Q = QmlAst
module Package = ObjectFiles.Package
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
index da2d9736..82d72963 100644
--- a/ocamllib/libbase/baseObj.mli
+++ b/ocamllib/libbase/baseObj.mli
@@ -21,7 +21,7 @@ type t = Obj.t
external repr : 'a -> t = "%identity"
external obj : t -> 'a = "%identity"
external magic : 'a -> 'b = "%identity"
-external is_block : t -> bool = "caml_obj_is_block"
+val [@inline always] is_block : t -> bool
external is_int : t -> bool = "%obj_is_int"
external tag : t -> int = "caml_obj_tag"
external set_tag : t -> int -> unit = "caml_obj_set_tag"
diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
index 640ce2fa..6931c608 100644
--- a/ocamllib/libbase/baseString.ml
+++ b/ocamllib/libbase/baseString.ml
@@ -20,7 +20,7 @@
(* depends *)
module Char = BaseChar
-include Bytes
+include String
let compare_int (a:int) b = Pervasives.compare a b

21
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View file

@ -1,17 +1,24 @@
{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed,
lib, version ? null }:
hierarchy-builder, lib, version ? null }:
with lib; mkCoqDerivation {
with lib;
let mca = mkCoqDerivation {
namePrefix = [ "coq" "mathcomp" ];
pname = "analysis";
owner = "math-comp";
release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8";
release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; }
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }
] null;
@ -25,4 +32,12 @@ with lib; mkCoqDerivation {
maintainers = [ maintainers.cohencyril ];
license = licenses.cecill-c;
};
}
}; in
mca.overrideAttrs (o:
let ext = { propagatedBuildInputs = o.propagatedBuildInputs
++ [ hierarchy-builder ]; };
in with versions; switch o.version [
{case = "dev"; out = ext;}
{case = isGe "0.3.4"; out = ext;}
] {}
)

33
pkgs/development/ocaml-modules/zarith/default.nix
View file

@ -1,31 +1,26 @@
{ lib, stdenv, fetchurl
, ocaml, findlib, pkg-config, perl
{ lib, stdenv, fetchFromGitHub
, ocaml, findlib, pkg-config
, gmp
}:
let source =
if lib.versionAtLeast ocaml.version "4.02"
then {
version = "1.11";
url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr";
} else {
version = "1.3";
url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz";
sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
};
in
if !lib.versionAtLeast ocaml.version "4.04"
then throw "zarith is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-zarith-${version}";
inherit (source) version;
src = fetchurl { inherit (source) url sha256; };
pname = "ocaml${ocaml.version}-zarith";
version = "1.12";
src = fetchFromGitHub {
owner = "ocaml";
repo = "Zarith";
rev = "release-${version}";
sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib perl ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ gmp ];
patchPhase = "patchShebangs ./z_pp.pl";
dontAddPrefix = true;
configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];

4
pkgs/development/php-packages/phpstan/default.nix
View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
version = "0.12.79";
version = "0.12.81";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-H6JmjdJtcCrNvad0ZbJ73OdRXimeTIJMVPuk8K6X6v8=";
sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE=";
};
phases = [ "installPhase" ];

10
pkgs/development/python-modules/agate-sql/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, fetchPypi
, agate
, sqlalchemy
, crate
@ -15,11 +15,9 @@ buildPythonPackage rec {
disabled = isPy27;
src = fetchFromGitHub {
owner = "wireservice";
repo = "agate-sql";
rev = version;
sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s";
src = fetchPypi {
inherit pname version;
sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde";
};
propagatedBuildInputs = [ agate sqlalchemy ];

21
pkgs/misc/lilypond/unstable.nix
View file

@ -1,21 +0,0 @@
{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
let
version = "2.19.83";
in
lilypond.overrideAttrs (oldAttrs: {
inherit version;
src = fetchgit {
url = "https://git.savannah.gnu.org/r/lilypond.git";
rev = "release/${version}-1";
sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0";
};
meta = oldAttrs.meta // {
broken = stdenv.isDarwin;
};
})

4
pkgs/servers/web-apps/moodle/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
let
version = "3.10.1";
version = "3.10.2";
stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
in stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8=";
sha256 = "sha256-s20GtwqV1BAVr2q+DxG6hqKnDqM0dVm6TbokmPC8Hrs=";
};
phpConfig = writeText "config.php" ''

6
pkgs/shells/nushell/default.nix
View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.27.1";
version = "0.28.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-Ms3ofPU7pd1qOxTJ7jImT2DawTcFLeI7Fi+xihsWhKY=";
sha256 = "sha256-8mS4Yvzyka85ZkV2LT68h4EGmumQtYpOxCIDRqa3fk0=";
};
cargoSha256 = "sha256-cJ+P/AaptZGOyjIu+66M1/rMYpVPFZGQDPeakUws3CQ=";
cargoSha256 = "sha256-jbziXOrmHkZPp3YkPJypNj7l62Q6nKyamBBYjlfYiVE=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

1
pkgs/top-level/aliases.nix
View file

@ -357,6 +357,7 @@ mapAliases ({
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
lilypond-unstable = lilypond; # added 2021-03-11
links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1;
linuxPackages_rpi0 = linuxPackages_rpi1;

4
pkgs/top-level/all-packages.nix
View file

@ -10832,7 +10832,7 @@ in
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
opa = callPackage ../development/compilers/opa {
ocamlPackages = ocaml-ng.ocamlPackages_4_03;
ocamlPackages = ocaml-ng.ocamlPackages_4_04;
};
opaline = callPackage ../development/tools/ocaml/opaline { };
@ -29149,8 +29149,6 @@ in
lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };