swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-01 18:01:04 +00:00 committed by GitHub
parent 26416f52eb 9e2a8a2f4a
commit 9d5de3eca1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 150 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/builders/packages/steam.section.md
View file

@ -56,16 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a
## steam-run {#sec-steam-run}
The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add
```nix
pkgs.steam.override ({
nativeOnly = true;
newStdcpp = true;
}).run
```
to your configuration, rebuild, and run the game with
The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with
```
steam-run ./foo

4
pkgs/applications/science/chemistry/jmol/default.nix
View file

@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.31.41";
version = "14.31.42";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY=";
sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw=";
};
patchPhase = ''

2
pkgs/applications/science/logic/hol/default.nix
View file

@ -81,7 +81,7 @@ stdenv.mkDerivation {
'';
homepage = "http://hol.sourceforge.net/";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
platforms = platforms.unix;
maintainers = with maintainers; [ mudri ];
};
}

4
pkgs/applications/video/vlc/default.nix
View file

@ -24,11 +24,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc";
version = "3.0.12";
version = "3.0.16";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";
sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g";
sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY=";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of

18
pkgs/data/fonts/gentium/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "5.000";
version = "6.000";
in fetchzip rec {
name = "gentium-${version}";
@ -10,12 +10,20 @@ in fetchzip rec {
postFetch = ''
mkdir -p $out/share/{doc,fonts}
unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name}
unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation
unzip -j $downloadedFile \*.ttf \
-d $out/share/fonts/truetype
unzip -j $downloadedFile \
\*/FONTLOG.txt \
\*/README.txt \
-d $out/share/doc/${name}
unzip -j $downloadedFile \
\*/documentation/\*.html \
\*/documentation/\*.txt \
-x \*/documentation/source/\* \
-d $out/share/doc/${name}/documentation
'';
sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp";
sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI=";
meta = with lib; {
homepage = "https://software.sil.org/gentium/";

4
pkgs/development/interpreters/php/7.4.nix
View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "7.4.20";
sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha";
version = "7.4.21";
sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n";
});
in

4
pkgs/development/interpreters/php/8.0.nix
View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.7";
sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";
version = "8.0.8";
sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l";
});
in

2
pkgs/development/interpreters/php/generic.nix
View file

@ -195,8 +195,6 @@ let
# PCRE
++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]
++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]
++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]
++ [ "PCRE_LIBDIR=${pcre2}" ]

4
pkgs/development/libraries/intel-media-driver/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.2.2";
version = "21.2.3";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48";
sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c";
};
cmakeFlags = [

14
pkgs/development/ocaml-modules/camlpdf/default.nix
View file

@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "2.3.1";
version = "2.4";
name = "ocaml${ocaml.version}-camlpdf-${version}";
src = fetchFromGitHub {
owner = "johnwhitington";
repo = "camlpdf";
rev = "v${version}";
sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4";
sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m";
};
buildInputs = [ which ocaml findlib ];
# Version number in META file is wrong
patchPhase = ''
patch -p 0 META <<EOF
3c3
< version="1.7.1"
---
> version="${version}"
EOF
'';
preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
'';

17
pkgs/development/ocaml-modules/cpdf/default.nix
View file

@ -1,6 +1,10 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:
let version = "2.3.1"; in
if !lib.versionAtLeast ocaml.version "4.10"
then throw "cpdf is not available for OCaml ${ocaml.version}"
else
let version = "2.4"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-cpdf-${version}";
@ -9,19 +13,14 @@ stdenv.mkDerivation {
owner = "johnwhitington";
repo = "cpdf-source";
rev = "v${version}";
sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z";
sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l";
};
prePatch = ''
substituteInPlace META --replace 'version="1.7"' 'version="${version}"'
'';
buildInputs = [ ocaml findlib ncurses ];
propagatedBuildInputs = [ camlpdf ];
createFindlibDestdir = true;
postInstall = ''
preInstall = ''
mkdir -p $OCAMLFIND_DESTDIR
mkdir -p $out/bin
cp cpdf $out/bin
mkdir -p $out/share/

21
pkgs/development/python-modules/qcelemental/default.nix
View file

@ -1,34 +1,19 @@
{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy
{ buildPythonPackage, lib, fetchPypi, numpy
, pydantic, pint, networkx, pytestrunner, pytestcov, pytest
} :
buildPythonPackage rec {
pname = "qcelemental";
version = "0.20.0";
version = "0.21.0";
checkInputs = [ pytestrunner pytestcov pytest ];
propagatedBuildInputs = [ numpy pydantic pint networkx ];
src = fetchPypi {
inherit pname version;
sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni";
sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238";
};
# FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour.
# See https://github.com/MolSSI/QCElemental/pull/265
patches = [
(fetchpatch {
name = "SearchPath1.patch";
url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff";
sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l";
})
(fetchpatch {
name = "SearchPath2.patch";
url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff";
sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk";
})
];
doCheck = true;
meta = with lib; {

6
pkgs/development/tools/parsing/tree-sitter/default.nix
View file

@ -28,9 +28,9 @@ let
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) run the ./result script that is output by that (it updates ./grammars)
version = "0.19.5";
sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn";
cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz";
version = "0.20.0";
sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng";
cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r";
src = fetchFromGitHub {
owner = "tree-sitter";

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "aa429589525bb849189a0c5ddb52267ce578f988",
"date": "2021-06-07T18:47:38+02:00",
"path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp",
"sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s",
"rev": "3953034ee61e8639100b063092d4280e047ca9e9",
"date": "2021-06-21T12:18:46+02:00",
"path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp",
"sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "237f4eb4417c28f643a29d795ed227246afb66f9",
"date": "2021-06-05T13:41:42+02:00",
"path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell",
"sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd",
"rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6",
"date": "2021-06-18T23:36:08+02:00",
"path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell",
"sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5",
"date": "2021-06-09T14:12:41-07:00",
"path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript",
"sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx",
"rev": "6de6d604c243b68f90dce14130d536c694d90dcc",
"date": "2021-06-29T15:54:12-07:00",
"path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript",
"sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04",
"date": "2021-06-01T20:33:20+02:00",
"path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php",
"sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086",
"rev": "5e89808d490d893799ebcf229130afe4cf2b0324",
"date": "2021-06-22T09:23:44+02:00",
"path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php",
"sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
"rev": "391269d74d20154bbd0ac9be20b35eced6920290",
"date": "2021-05-04T14:02:32-07:00",
"path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby",
"sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv",
"rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
"date": "2021-03-03T16:54:30-08:00",
"path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
"sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
"rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29",
"date": "2021-04-01T10:11:15-07:00",
"path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala",
"sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7",
"rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4",
"date": "2021-06-23T15:37:27-07:00",
"path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala",
"sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
"rev": "10c113001acf9852817150acb3031a5e68d2b4cf",
"date": "2021-05-02T10:05:14+05:30",
"path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte",
"sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281",
"rev": "c696a13a587b0595baf7998f1fb9e95c42750263",
"date": "2021-03-20T16:45:11+05:30",
"path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",
"sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

28
pkgs/tools/misc/yajsv/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ buildGoModule, fetchFromGitHub, lib }:
let version = "1.4.0";
in buildGoModule {
pname = "yajsv";
version = version;
src = fetchFromGitHub {
owner = "neilpa";
repo = "yajsv";
rev = "v${version}";
sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7";
};
vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/yajsv -v > /dev/null
'';
meta = {
description = "Yet Another JSON Schema Validator";
homepage = "https://github.com/neilpa/yajsv";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ rycee ];
};
}

32
pkgs/tools/package-management/fpm/Gemfile.lock
View file

@ -1,40 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
arr-pm (0.0.10)
arr-pm (0.0.11)
cabin (> 0)
backports (3.14.0)
backports (3.21.0)
cabin (0.9.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
clamp (1.0.1)
dotenv (2.7.2)
ffi (1.10.0)
fpm (1.11.0)
arr-pm (~> 0.0.10)
dotenv (2.7.6)
fpm (1.13.0)
arr-pm (~> 0.0.11)
backports (>= 2.6.2)
cabin (>= 0.6.0)
childprocess (= 0.9.0)
clamp (~> 1.0.0)
ffi
json (>= 1.7.7, < 2.0)
git (>= 1.3.0, < 2.0)
json (>= 1.7.7, < 3.0)
pleaserun (~> 0.0.29)
ruby-xz (~> 0.2.3)
rexml
stud
git (1.8.1)
rchardet (~> 1.8)
insist (1.0.0)
io-like (0.3.0)
json (1.8.6)
json (2.5.1)
mustache (0.99.8)
pleaserun (0.0.30)
pleaserun (0.0.32)
cabin (> 0)
clamp
dotenv
insist
mustache (= 0.99.8)
stud
ruby-xz (0.2.3)
ffi (~> 1.9)
io-like (~> 0.3)
rchardet (1.8.0)
rexml (3.2.5)
stud (0.0.23)
PLATFORMS

85
pkgs/tools/package-management/fpm/gemset.nix
View file

@ -5,20 +5,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
sha256 = "17qssricshzs2ml1jvn4bs2h85gxvrqm074pl5nl8vr74620iazi";
type = "gem";
};
version = "0.0.10";
version = "0.0.11";
};
backports = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
sha256 = "0xqvwj3mm28g1z4npya51zjcvxaniyyzn3fwgcdwmm8xrdbl8fgr";
type = "gem";
};
version = "3.14.0";
version = "3.21.0";
};
cabin = {
groups = ["default"];
@ -30,17 +30,6 @@
};
version = "0.9.0";
};
childprocess = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
type = "gem";
};
version = "0.9.0";
};
clamp = {
groups = ["default"];
platforms = [];
@ -56,31 +45,32 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag";
sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
type = "gem";
};
version = "2.7.2";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
type = "gem";
};
version = "1.10.0";
version = "2.7.6";
};
fpm = {
dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];
dependencies = ["arr-pm" "backports" "cabin" "clamp" "git" "json" "pleaserun" "rexml" "stud"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm";
sha256 = "03ss7yh628f0m6by23q3sniq660gm07mkz6wqjpvr118gc0h53sa";
type = "gem";
};
version = "1.11.0";
version = "1.13.0";
};
git = {
dependencies = ["rchardet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl";
type = "gem";
};
version = "1.8.1";
};
insist = {
groups = ["default"];
@ -92,25 +82,15 @@
};
version = "1.0.0";
};
io-like = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k";
type = "gem";
};
version = "0.3.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "1.8.6";
version = "2.5.1";
};
mustache = {
groups = ["default"];
@ -128,21 +108,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";
sha256 = "1aykf0l8327bqkkf5xd9jcglsib973zpy37cfnlf4j0vp0cdpn2d";
type = "gem";
};
version = "0.0.30";
version = "0.0.32";
};
ruby-xz = {
dependencies = ["ffi" "io-like"];
rchardet = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";
sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
type = "gem";
};
version = "0.2.3";
version = "1.8.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
stud = {
groups = ["default"];

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

@ -10164,6 +10164,8 @@ in
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
yajsv = callPackage ../tools/misc/yajsv { };
yapf = with python3Packages; toPythonApplication yapf;
yarn = callPackage ../development/tools/yarn { };

14
pkgs/top-level/php-packages.nix
View file

@ -257,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "dom";
buildInputs = [ libxml2 ];
patches = [
# https://github.com/php/php-src/pull/7030
(fetchpatch {
url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch";
sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k";
excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ];
})
];
# For some reason `patch` fails to remove these files correctly.
# Since `postPatch` is already used in `mkExtension`, we have to make it here.
preCheck = ''
rm tests/bug43364.phpt
rm tests/bug80268.phpt
'';
configureFlags = [ "--enable-dom" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];