public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-19 10:39:54 -07:00
parent 7000ae2b9a b73f621c25
commit c1f8a15dac
126 changed files with 2445 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+19 -7
View File
@@ -3907,7 +3907,8 @@ in
deno = callPackage ../development/web/deno {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation;
inherit (darwin.apple_sdk.frameworks)
Security CoreServices Metal Foundation QuartzCore;
};
detox = callPackage ../tools/misc/detox { };
@@ -13434,7 +13435,10 @@ in
lttv = callPackage ../development/tools/misc/lttv { };
luaformatter = callPackage ../development/tools/luaformatter { };
luaformatter = callPackage ../development/tools/luaformatter
(lib.optionalAttrs stdenv.isDarwin {
stdenv = overrideCC stdenv llvmPackages_latest.clang;
});
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
@@ -13671,6 +13675,8 @@ in
remake = callPackage ../development/tools/build-managers/remake { };
replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { };
replacement = callPackage ../development/tools/misc/replacement { };
retdec = callPackage ../development/tools/analysis/retdec {
@@ -13876,7 +13882,7 @@ in
texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
texlab = callPackage ../development/tools/misc/texlab {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
tflint = callPackage ../development/tools/analysis/tflint { };
@@ -20458,7 +20464,7 @@ in
bbswitch = callPackage ../os-specific/linux/bbswitch {};
ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18
chipsec = callPackage ../tools/security/chipsec {
inherit kernel;
@@ -26794,7 +26800,9 @@ in
lavalauncher = callPackage ../applications/misc/lavalauncher { };
t-rec = callPackage ../misc/t-rec { };
t-rec = callPackage ../misc/t-rec {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
ulauncher = callPackage ../applications/misc/ulauncher { };
@@ -26847,7 +26855,7 @@ in
utox = callPackage ../applications/networking/instant-messengers/utox { };
valentina = libsForQt514.callPackage ../applications/misc/valentina { };
valentina = libsForQt512.callPackage ../applications/misc/valentina { };
vbindiff = callPackage ../applications/editors/vbindiff { };
@@ -30538,6 +30546,8 @@ in
(import ../../nixos/lib/make-options-doc/default.nix)
({ inherit pkgs lib; } // attrs);
nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
nixdoc = callPackage ../tools/nix/nixdoc {};
@@ -30899,7 +30909,9 @@ in
hasktags = haskellPackages.hasktags;
};
spacenavd = callPackage ../misc/drivers/spacenavd { };
spacenavd = callPackage ../misc/drivers/spacenavd {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { };
pkgs/top-level/haskell-packages.nix
+1 -1
View File
@@ -86,7 +86,7 @@ in {
llvmPackages = pkgs.llvmPackages_10;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc8104; # no binary yet
bootPkgs = packages.ghc901; # no binary yet
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
pkgs/top-level/python-packages.nix
+8 -2
View File
@@ -6694,8 +6694,8 @@ in {
pythonnet = callPackage
../development/python-modules/pythonnet {
# `mono >= 4.6` required to prevent crashes encountered with earlier versions.
mono = pkgs.mono4;
# Using `mono > 5`, tests are failing..
mono = pkgs.mono5;
};
python-nmap = callPackage ../development/python-modules/python-nmap { };
@@ -7770,6 +7770,8 @@ in {
spinners = callPackage ../development/python-modules/spinners { };
sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
@@ -7792,6 +7794,8 @@ in {
sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { };
sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };
@@ -7804,6 +7808,8 @@ in {
sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { };
sphinxcontrib-seqdiag = callPackage ../development/python-modules/sphinxcontrib-seqdiag { };
sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz {
pkgs/top-level/release-haskell.nix
+11 -3
View File
@@ -1,4 +1,8 @@
/*
This is the Hydra jobset for the `haskell-updates` branch in Nixpkgs.
You can see the status of this jobset at
https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
To debug this expression you can use `hydra-eval-jobs` from
`pkgs.hydra-unstable` which prints the jobset description
to `stdout`:
@@ -144,7 +148,6 @@ let
koka
krank
lambdabot
ldgallery
madlang
matterhorn
mueval
@@ -205,7 +208,9 @@ let
cabal-install = all;
Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
funcmp = all;
haskell-language-server = all;
# Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297
haskell-language-server = with compilerNames; [ ghc884 ghc8104 ];
hoogle = all;
hsdns = all;
jailbreak-cabal = all;
@@ -226,7 +231,10 @@ let
constituents = accumulateDerivations [
# haskell specific tests
jobs.tests.haskell
jobs.tests.writers # writeHaskell{,Bin}
# writeHaskell and writeHaskellBin
# TODO: writeHaskell currently fails on darwin
jobs.tests.writers.x86_64-linux
jobs.tests.writers.aarch64-linux
# important top-level packages
jobs.cabal-install
jobs.cabal2nix