nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-08 00:03:09 +00:00 committed by GitHub
commit 0386939da0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 598 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/emulators/citra/default.nix
View File

@ -77,9 +77,11 @@ stdenv.mkDerivation {
chmod -R a+w externals/zstd
'';
# Todo: cubeb audio backend (the default one) doesn't work on the SDL interface.
# This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation).
# Note that the two interfaces have two separate configuration files.
# Fixes https://github.com/NixOS/nixpkgs/issues/171173
postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
wrapProgram "$out/bin/citra" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]}
'';
meta = with lib; {
homepage = "https://citra-emu.org";

5
pkgs/applications/emulators/duckstation/default.nix
View File

@ -90,8 +90,9 @@ mkDerivation rec {
runHook postCheck
'';
# Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
];
meta = with lib; {
@ -102,5 +103,3 @@ mkDerivation rec {
platforms = platforms.linux;
};
}
# TODO: default sound backend (cubeb) does not work, but SDL does. Strangely,
# switching to cubeb while a game is running makes it work.

5
pkgs/applications/emulators/simh/default.nix
View File

@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
dontConfigure = true;
# Workaround to build against upstream gcc-10 and clang-11.
# Can be removed when next release contains
# https://github.com/simh/simh/issues/794
NIX_CFLAGS_COMPILE = [ "-fcommon" ];
makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
preInstall = ''

4
pkgs/applications/misc/calibre/default.nix
View File

@ -28,11 +28,11 @@
mkDerivation rec {
pname = "calibre";
version = "5.37.0";
version = "5.42.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY=";
hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg=";
};
# https://sources.debian.org/patches/calibre/${version}+dfsg-1

6
pkgs/applications/misc/polybar/default.nix
View File

@ -44,13 +44,13 @@
stdenv.mkDerivation rec {
pname = "polybar";
version = "3.6.2";
version = "3.6.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU=";
hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE=";
fetchSubmodules = true;
};
@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting.
'';
license = licenses.mit;
maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ];
maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ];
platforms = platforms.linux;
};
}

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "102.0.5005.27",
"sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m",
"sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx",
"version": "102.0.5005.40",
"sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb",
"sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642",
"deps": {
"gn": {
"version": "2022-04-14",
@ -32,15 +32,15 @@
}
},
"dev": {
"version": "103.0.5028.0",
"sha256": "06i6kgsdril5gfbjl1sh0z5hqvq64bchhb2z8w0h8cw9977bvqk6",
"sha256bin64": "09hxvcv5n1kd4qnwh6pxzmrlnc8xijm7rwb1c8c57v0jjb32x9ry",
"version": "103.0.5042.0",
"sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h",
"sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh",
"deps": {
"gn": {
"version": "2022-04-26",
"version": "2022-05-02",
"url": "https://gn.googlesource.com/gn",
"rev": "ced9fbfe6943854e65ada4ac1849d1fa4cb19348",
"sha256": "14fgjsfqihmma1cr8n30n37vxkf20paa6swq2yxn1agjvfr9cdvl"
"rev": "53ef169800760fdc09f0773bf380fe99eaeab339",
"sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r"
}
}
},

8
pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
View File

@ -10,21 +10,21 @@
stdenv.mkDerivation rec {
pname = "obs-gstreamer";
version = "0.2.1";
version = "0.3.3";
src = fetchFromGitHub {
owner = "fzwoch";
repo = "obs-gstreamer";
rev = "v${version}";
sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid";
hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg=";
};
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ gst_all_1.gstreamermm obs-studio ];
buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ];
meta = with lib; {
description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio";
homepage = "https://github.com/fswoch/obs-gstreamer";
homepage = "https://github.com/fzwoch/obs-gstreamer";
maintainers = with maintainers; [ ahuzik ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];

6
pkgs/desktops/arcan/default.nix
View File

@ -1,6 +1,6 @@
{ callPackage, lib, pkgs }:
{ config, lib, pkgs }:
rec {
lib.makeScope pkgs.newScope (self: with self; {
# Dependencies
espeak = pkgs.espeak-ng;
@ -40,4 +40,4 @@ rec {
name = "all-wrapped";
appls = [ durden pipeworld ];
};
}
})

6
pkgs/desktops/arcan/durden/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "durden";
version = "0.6.1+date=2022-03-11";
version = "0.6.1+date=2022-04-16";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "fec2a1051500df28becce188d932645743091efa";
hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA=";
rev = "b07ba6535addf0d36a64385745cd9595f7d214b1";
hash = "sha256-nDSuJrJvJOVpRax+AwuNAZ3Ioqfoo10EGCab1EiPbIY=";
};
dontConfigure = true;

6
pkgs/desktops/arcan/pipeworld/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "pipeworld";
version = "0.pre+date=2021-12-03";
version = "0.pre+date=2022-04-03";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "c653414670cafb0c73a57492aa3d9510460b16a9";
hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk=";
rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef";
hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E=";
};
dontConfigure = true;

4
pkgs/development/beam-modules/erlang-ls/default.nix
View File

@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
version = "0.31.0";
version = "0.32.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
sha256 = "sha256-tpJUCHrSFNEzNrln7nKwav0GSBW+4fwjSB3WI1MKW9A=";
sha256 = "sha256-aYMfsaqdsxlWatvXBWIxKJ7baruH1kqp2nrXL+/IrUQ=";
rev = version;
};
releaseType = "escript";

757
pkgs/development/compilers/elm/packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/coq-modules/category-theory/default.nix
View File

@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.14"; out = "20211213"; }
{ case = range "8.10" "8.15"; out = "20211213"; }
{ case = range "8.8" "8.9"; out = "20190414"; }
{ case = range "8.6" "8.7"; out = "20180709"; }
] null;

2
pkgs/development/coq-modules/goedel/default.nix
View File

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.11" "8.14"; out = "8.13.0"; }
{ case = range "8.11" "8.15"; out = "8.13.0"; }
] null;
propagatedBuildInputs = [ hydra-battles pocklington ];

2
pkgs/development/coq-modules/graph-theory/default.nix
View File

@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.13" "8.14"; out = "0.9"; }
{ case = range "8.13" "8.15"; out = "0.9"; }
] null;
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];

4
pkgs/development/coq-modules/itauto/default.nix
View File

@ -6,9 +6,13 @@ mkCoqDerivation rec {
owner = "fbesson";
domain = "gitlab.inria.fr";
release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya";
release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9";
release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isEq "8.15"; out = "8.15.0"; }
{ case = isEq "8.14"; out = "8.14.0"; }
{ case = isEq "8.13"; out = "8.13+no"; }
] null;

2
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
View File

@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions;
switch [ coq.version mathcomp-ssreflect.version ] [{
cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0";
cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0";
}] null;
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";

2
pkgs/development/coq-modules/semantics/default.nix
View File

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.14"; out = "8.14.0"; }
{ case = range "8.10" "8.15"; out = "8.14.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

4
pkgs/development/coq-modules/smpl/default.nix
View File

@ -8,10 +8,14 @@ mkCoqDerivation {
release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs=";
release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg=";
release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg=";
release."8.14".sha256 = "sha256:0wmrc741j67ch4rkygjkrz5i9afi01diyyj69i24cmasvx4wad38";
release."8.15".sha256 = "sha256:0m9xlkdhilvqb0v4q9c4hzfwffbccd6029ks39xg7qbiq6zklpvp";
releaseRev = v: "v${v}";
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = isEq "8.15"; out = "8.15"; }
{ case = isEq "8.14"; out = "8.14"; }
{ case = "8.13.2"; out = "8.13"; }
{ case = "8.12.2"; out = "8.12"; }
{ case = "8.10.2"; out = "8.10.2"; }

4
pkgs/development/coq-modules/smtcoq/default.nix
View File

@ -9,8 +9,8 @@ mkCoqDerivation {
release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ=";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.13") ]; out = "itp22"; }
defaultVersion = with versions; switch coq.version [
{ case = isEq "8.13"; out = "itp22"; }
] null;
propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];

4
pkgs/development/libraries/libpg_query/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpg_query";
version = "13-2.1.0";
version = "13-2.1.1";
src = fetchFromGitHub {
owner = "pganalyze";
repo = "libpg_query";
rev = version;
sha256 = "sha256-DpvPmBvpx5pWDlx6T3Kp82ALi6FjOO549Exd8tWXDIk=";
sha256 = "sha256-195WNTTdXHHPbQg2Ipwa3v/qPEeAtehvZa2OC1egoFo=";
};
nativeBuildInputs = [ which ];

17
pkgs/development/python-modules/karton-autoit-ripper/default.nix
View File

@ -4,12 +4,16 @@
, fetchFromGitHub
, karton-core
, malduck
, pythonOlder
, regex
}:
buildPythonPackage rec {
pname = "karton-autoit-ripper";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CERT-Polska";
@ -27,14 +31,17 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "autoit-ripper==1.0.0" "autoit-ripper" \
--replace "malduck==3.1.0" "malduck>=3.1.0" \
--replace "regex==2020.2.20" "regex>=2020.2.20"
--replace "autoit-ripper==" "autoit-ripper>=" \
--replace "malduck==" "malduck>=" \
--replace "regex==" "regex>="
'';
# Project has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "karton.autoit_ripper" ];
pythonImportsCheck = [
"karton.autoit_ripper"
];
meta = with lib; {
description = "AutoIt script ripper for Karton framework";

12
pkgs/development/python-modules/malduck/default.nix
View File

@ -14,14 +14,16 @@
buildPythonPackage rec {
pname = "malduck";
version = "4.1.0";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "04d8bhzax9ynbl83hif9i8gcs29zrvcay2r6n7mcxiixlxcqciak";
rev = "refs/tags/v${version}";
hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM=";
};
propagatedBuildInputs = [
@ -43,7 +45,9 @@ buildPythonPackage rec {
# Project has no tests. They will come with the next release
doCheck = false;
pythonImportsCheck = [ "malduck" ];
pythonImportsCheck = [
"malduck"
];
meta = with lib; {
description = "Helper for malware analysis";

40
pkgs/development/python-modules/nutils/default.nix
View File

@ -1,32 +1,50 @@
{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, treelog
, stringly
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "nutils";
version = "7.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "evalf";
repo = "nutils";
rev = "refs/tags/v${version}";
hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8=";
};
pythonImportChecks = [ "nutils" ];
propagatedBuildInputs = [
numpy
treelog
stringly
];
checkInputs = [ coverage ];
checkInputs = [
pytestCheckHook
];
checkPhase = ''
${python.interpreter} -m unittest
'';
pythonImportsCheck = [
"nutils"
];
disabledTestPaths = [
# AttributeError: type object 'setup' has no attribute '__code__'
"tests/test_cli.py"
];
meta = with lib; {
description = "Numerical Utilities for Finite Element Analysis";
homepage = "https://www.nutils.org/";
license = licenses.mit;
maintainers = [ maintainers.Scriptkiddi ];
maintainers = with maintainers; [ Scriptkiddi ];
};
}

4
pkgs/development/python-modules/phonenumbers/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.12.47";
version = "8.12.48";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Vv1gXS9UYOHfIRcIW2U7s4MiKV7GWOasqvycl2hn1SI=";
sha256 = "sha256-rwaB+/6foHITdq2bcp53Ll0gvyz1DZ3Yyi8L3Xjp8M4=";
};
checkInputs = [

4
pkgs/development/python-modules/pydeps/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydeps";
version = "1.10.17";
version = "1.10.18";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn";
repo = pname;
rev = "v${version}";
hash = "sha256-V0LgHFvGvJqDHmyXJNb0sJjRuqGGDZpV467XDmdFg5k=";
hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY=";
};
buildInputs = [

20
pkgs/development/python-modules/spglib/default.nix
View File

@ -1,23 +1,31 @@
{ lib, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }:
{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }:
buildPythonPackage rec {
pname = "spglib";
version = "1.16.3";
version = "1.16.5";
src = fetchPypi {
inherit pname version;
sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038";
sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M=";
};
propagatedBuildInputs = [ numpy ];
checkInputs = [ nose pyyaml ];
checkInputs = [ pytest pyyaml ];
# pytestCheckHook doesn't work
# ImportError: cannot import name '_spglib' from partially initialized module 'spglib'
checkPhase = ''
pytest
'';
pythonImportsCheck = [ "spglib" ];
meta = with lib; {
description = "Python bindings for C library for finding and handling crystal symmetries";
homepage = "https://atztogo.github.io/spglib";
homepage = "https://spglib.github.io/spglib/";
changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog";
license = licenses.bsd3;
maintainers = with maintainers; [ psyanticy ];
};
}

4
pkgs/development/python-modules/types-toml/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-toml";
version = "0.10.6";
version = "0.10.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-aus+17+oaTgVUcd07WqRQuPu2YqD76UQipYy6v1W3NM=";
sha256 = "sha256-pWf+JhSxd9U3rZmmYa3Jv8jFWkb5XmY3Ck7S3RcTNfk=";
};
# Module doesn't have tests

7
pkgs/development/tools/amazon-qldb-shell/default.nix
View File

@ -1,10 +1,12 @@
{ lib
{ stdenv
, lib
, clang
, cmake
, fetchFromGitHub
, llvmPackages
, rustPlatform
, testers
, Security
}:
let
@ -21,7 +23,8 @@ let
};
nativeBuildInputs = [ clang cmake ];
buildInputs = [ llvmPackages.libclang ];
buildInputs = [ llvmPackages.libclang ]
++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U=";

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.16";
version = "1.0.19";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c=";
sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw=";
};
cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks=";
cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

6
pkgs/development/web/deno/default.nix
View File

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.21.1";
version = "1.21.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4=";
sha256 = "sha256-oRlrommD84x4M+Z/F70TjFwWSlvTb26v36zxgaMBifw=";
};
cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE=";
cargoSha256 = "sha256-kVNT9B9B3Li9B8aRFkUx5WkGZH7eqSMQO0GRPTC5tgU=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

6
pkgs/tools/misc/neofetch/default.nix
View File

@ -4,13 +4,13 @@
stdenvNoCC.mkDerivation rec {
pname = "neofetch";
version = "unstable-2020-11-26";
version = "unstable-2020-12-10";
src = fetchFromGitHub {
owner = "dylanaraps";
repo = "neofetch";
rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f";
sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE=";
rev = "ccd5d9f52609bbdcd5d8fa78c4fdb0f12954125f";
sha256 = "sha256-9MoX6ykqvd2iB0VrZCfhSyhtztMpBTukeKejfAWYW1w=";
};
patches = [

101
pkgs/top-level/all-packages.nix
View File

@ -1660,7 +1660,9 @@ with pkgs;
amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { };
amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {
inherit (darwin.apple_sdk.frameworks) Security;
};
amber = callPackage ../tools/text/amber {
inherit (darwin.apple_sdk.frameworks) Security;
@ -5655,8 +5657,10 @@ with pkgs;
};
exempi = callPackage ../development/libraries/exempi {
stdenv = if stdenv.isi686 then gcc6Stdenv else gcc9Stdenv;
boost = boost15x;
stdenv = if stdenv.isDarwin then stdenv
else if stdenv.isi686 then gcc6Stdenv
else gcc9Stdenv;
boost = if stdenv.isDarwin then boost else boost15x;
};
execline = skawarePackages.execline;
@ -6418,8 +6422,6 @@ with pkgs;
gnirehtet = callPackage ../tools/networking/gnirehtet { };
gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
gnome-builder = callPackage ../applications/editors/gnome-builder { };
gnome-desktop = callPackage ../development/libraries/gnome-desktop { };
@ -9145,8 +9147,6 @@ with pkgs;
pamtester = callPackage ../tools/security/pamtester { };
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
paperless-ngx = callPackage ../applications/office/paperless-ngx { };
paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
@ -11704,8 +11704,6 @@ with pkgs;
chase = callPackage ../tools/system/chase { };
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
wimlib = callPackage ../tools/archivers/wimlib { };
wipe = callPackage ../tools/security/wipe { };
@ -12377,7 +12375,7 @@ with pkgs;
comby = callPackage ../development/tools/comby { };
compcert = coqPackages.compcert.override { version = "3.9"; };
inherit (coqPackages) compcert;
computecpp-unwrapped = callPackage ../development/compilers/computecpp {};
computecpp = wrapCCWith rec {
@ -14213,25 +14211,6 @@ with pkgs;
nodejs = nodejs_latest;
};
lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
gtk2 = gtk2-x11;
};
lxtask = callPackage ../desktops/lxde/core/lxtask { };
lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
lxsession = callPackage ../desktops/lxde/core/lxsession { };
kona = callPackage ../development/interpreters/kona {};
lolcode = callPackage ../development/interpreters/lolcode { };
@ -15547,8 +15526,6 @@ with pkgs;
gnumake = callPackage ../development/tools/build-managers/gnumake { };
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});
gob2 = callPackage ../development/tools/misc/gob2 { };
gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { };
@ -29745,8 +29722,6 @@ with pkgs;
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
surf-display = callPackage ../desktops/surf-display { };
surge = callPackage ../applications/audio/surge {
inherit (gnome) zenity;
git = gitMinimal;
@ -32480,12 +32455,19 @@ with pkgs;
wyvern = callPackage ../games/wyvern { };
hsetroot = callPackage ../tools/X11/hsetroot { };
imwheel = callPackage ../tools/X11/imwheel { };
kakasi = callPackage ../tools/text/kakasi { };
### DESKTOP ENVIRONMENTS
arcan = recurseIntoAttrs (callPackage ../desktops/arcan { });
cdesktopenv = callPackage ../desktops/cdesktopenv { };
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
inherit (cinnamon) mint-x-icons mint-y-icons;
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
@ -32510,14 +32492,35 @@ with pkgs;
gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
hsetroot = callPackage ../tools/X11/hsetroot { };
chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { };
imwheel = callPackage ../tools/X11/imwheel { };
gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
kakasi = callPackage ../tools/text/kakasi { };
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
### DESKTOPS/LXDE
lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
gtk2 = gtk2-x11;
};
lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
lxsession = callPackage ../desktops/lxde/core/lxsession { };
lxtask = callPackage ../desktops/lxde/core/lxtask { };
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs;
inherit (lib) makeScope;
@ -32528,6 +32531,18 @@ with pkgs;
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
};
surf-display = callPackage ../desktops/surf-display { };
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {};
@ -32546,16 +32561,6 @@ with pkgs;
gnome-themes-extra = gnome.gnome-themes-extra;
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
};
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
callPackage = newScope arcan;
});
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
### SCIENCE/CHEMISTY
@ -35104,8 +35109,6 @@ with pkgs;
chrome-export = callPackage ../tools/misc/chrome-export {};
chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {};
chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {};
NSPlist = callPackage ../development/libraries/NSPlist {};

2
pkgs/top-level/coq-packages.nix
View File

@ -160,7 +160,7 @@ in rec {
coqPackages_8_13 = mkCoqPackages coq_8_13;
coqPackages_8_14 = mkCoqPackages coq_8_14;
coqPackages_8_15 = mkCoqPackages coq_8_15;
coqPackages = recurseIntoAttrs coqPackages_8_13;
coqPackages = recurseIntoAttrs coqPackages_8_15;
coq = coqPackages.coq;
}