movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-11-04 12:01:39 +00:00 • committed by GitHub
commit cca97be2f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 357 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
View file

@ -13,10 +13,10 @@ let
# Use upstream config files passed through spa-json-dump as the base # Use upstream config files passed through spa-json-dump as the base
# Patched here as necessary for them to work with this module # Patched here as necessary for them to work with this module
defaults = { defaults = {
alsa-monitor = (builtins.fromJSON (builtins.readFile ./media-session/alsa-monitor.conf.json)); alsa-monitor = lib.importJSON ./media-session/alsa-monitor.conf.json;
bluez-monitor = (builtins.fromJSON (builtins.readFile ./media-session/bluez-monitor.conf.json)); bluez-monitor = lib.importJSON ./media-session/bluez-monitor.conf.json;
media-session = (builtins.fromJSON (builtins.readFile ./media-session/media-session.conf.json)); media-session = lib.importJSON ./media-session/media-session.conf.json;
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./media-session/v4l2-monitor.conf.json)); v4l2-monitor = lib.importJSON ./media-session/v4l2-monitor.conf.json;
}; };
configs = { configs = {

10
nixos/modules/services/desktops/pipewire/pipewire.nix
View file

@ -22,11 +22,11 @@ let
# Use upstream config files passed through spa-json-dump as the base # Use upstream config files passed through spa-json-dump as the base
# Patched here as necessary for them to work with this module # Patched here as necessary for them to work with this module
defaults = { defaults = {
client = builtins.fromJSON (builtins.readFile ./daemon/client.conf.json); client = lib.importJSON ./daemon/client.conf.json;
client-rt = builtins.fromJSON (builtins.readFile ./daemon/client-rt.conf.json); client-rt = lib.importJSON ./daemon/client-rt.conf.json;
jack = builtins.fromJSON (builtins.readFile ./daemon/jack.conf.json); jack = lib.importJSON ./daemon/jack.conf.json;
pipewire = builtins.fromJSON (builtins.readFile ./daemon/pipewire.conf.json); pipewire = lib.importJSON ./daemon/pipewire.conf.json;
pipewire-pulse = builtins.fromJSON (builtins.readFile ./daemon/pipewire-pulse.conf.json); pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json;
}; };
configs = { configs = {

2
nixos/modules/services/video/epgstation/default.nix
View file

@ -33,7 +33,7 @@ let
fi fi
''; '';
streamingConfig = builtins.fromJSON (builtins.readFile ./streaming.json); streamingConfig = lib.importJSON ./streaming.json;
logConfig = { logConfig = {
appenders.stdout.type = "stdout"; appenders.stdout.type = "stdout";
categories = { categories = {

4
nixos/modules/services/web-servers/trafficserver/default.nix
View file

@ -61,7 +61,7 @@ in
ipAllow = mkOption { ipAllow = mkOption {
type = types.nullOr yaml.type; type = types.nullOr yaml.type;
default = builtins.fromJSON (builtins.readFile ./ip_allow.json); default = lib.importJSON ./ip_allow.json;
defaultText = literalDocBook "upstream defaults"; defaultText = literalDocBook "upstream defaults";
example = literalExpression '' example = literalExpression ''
{ {
@ -84,7 +84,7 @@ in
logging = mkOption { logging = mkOption {
type = types.nullOr yaml.type; type = types.nullOr yaml.type;
default = builtins.fromJSON (builtins.readFile ./logging.json); default = lib.importJSON ./logging.json;
defaultText = literalDocBook "upstream defaults"; defaultText = literalDocBook "upstream defaults";
example = { }; example = { };
description = '' description = ''

4
nixos/tests/os-prober.nix
View file

@ -58,9 +58,9 @@ let
[ ./hardware-configuration.nix [ ./hardware-configuration.nix
<nixpkgs/nixos/modules/testing/test-instrumentation.nix> <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
]; ];
} // (builtins.fromJSON (builtins.readFile ${ } // pkgs.lib.importJSON ${
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig) pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
}))) })
''; '';
in { in {
name = "os-prober"; name = "os-prober";

6
pkgs/applications/audio/plexamp/default.nix
View file

@ -2,12 +2,12 @@
let let
pname = "plexamp"; pname = "plexamp";
version = "3.7.1"; version = "3.8.0";
src = fetchurl { src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage"; name="${pname}-${version}.AppImage";
sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw=="; sha512 = "wdOJYmUHPSuijQjmkwq1jLX3qgLzmFxDihlETELlzk13RcpCcczL++V5dqdiQY6UmZVP3KL4VPjXubSq4CmXlQ==";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; { meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/"; homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/32"; changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/33";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ]; maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

6
pkgs/applications/blockchains/clightning/default.nix
View file

@ -16,15 +16,15 @@
, zlib , zlib
}: }:
let let
py3 = python3.withPackages (p: [ p.Mako ]); py3 = python3.withPackages (p: [ p.Mako p.mrkd ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clightning"; pname = "clightning";
version = "0.10.1"; version = "0.10.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "9271e9e89d60332b66afedbf8d6eab2a4a488782ab400ee1f60667d73c5a9a96"; sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809";
}; };
nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];

2
pkgs/applications/editors/cudatext/default.nix
View file

@ -34,7 +34,7 @@ let
inherit (spec) owner rev sha256; inherit (spec) owner rev sha256;
} }
) )
(builtins.fromJSON (builtins.readFile ./deps.json)); (lib.importJSON ./deps.json);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";

2
pkgs/applications/editors/kakoune/plugins/aliases.nix
View file

@ -33,7 +33,7 @@ let
deprecations = lib.mapAttrs (old: info: deprecations = lib.mapAttrs (old: info:
throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}."
) (builtins.fromJSON (builtins.readFile ./deprecated.json)); ) (lib.importJSON ./deprecated.json);
in in
mapAliases ({ mapAliases ({

2
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file

@ -16,7 +16,7 @@
}: }:
let let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); pinData = lib.importJSON ./pin.json;
executableName = "element-desktop"; executableName = "element-desktop";
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in in

2
pkgs/applications/networking/instant-messengers/element/element-web.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: { lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
let let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); pinData = lib.importJSON ./pin.json;
noPhoningHome = { noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org disable_guests = true; # disable automatic guest account registration at matrix.org
piwik = false; # disable analytics piwik = false; # disable analytics

2
pkgs/applications/networking/instant-messengers/element/keytar/default.nix
View file

@ -2,7 +2,7 @@
, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }:
let let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); pinData = lib.importJSON ./pin.json;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "keytar"; pname = "keytar";

2
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: { lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }:
let let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); pinData = lib.importJSON ./pin.json;
in rustPlatform.buildRustPackage rec { in rustPlatform.buildRustPackage rec {
pname = "seshat-node"; pname = "seshat-node";

2
pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
View file

@ -8,7 +8,7 @@
}: }:
let let
pinData = builtins.fromJSON (builtins.readFile ./pin.json); pinData = lib.importJSON ./pin.json;
noPhoningHome = { noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org disable_guests = true; # disable automatic guest account registration at matrix.org
}; };

2
pkgs/applications/version-management/gitlab/default.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
data = (builtins.fromJSON (builtins.readFile ./data.json)); data = lib.importJSON ./data.json;
version = data.version; version = data.version;
src = fetchFromGitLab { src = fetchFromGitLab {

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitLab, git, buildGoModule }: { lib, fetchFromGitLab, git, buildGoModule }:
let let
data = (builtins.fromJSON (builtins.readFile ../data.json)); data = lib.importJSON ../data.json;
in in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";

4
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };

4
pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
View file

@ -1,5 +1,7 @@
{ lib }:
let let
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; };

2
pkgs/development/compilers/ghcjs/8.10/default.nix
View file

@ -3,7 +3,7 @@
, callPackage , callPackage
, fetchgit , fetchgit
, ghcjsSrcJson ? null , ghcjsSrcJson ? null
, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson)) , ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson
, bootPkgs , bootPkgs
, stage0 , stage0
, haskellLib , haskellLib

4
pkgs/development/interpreters/erlang/R24.nix
View file

@ -3,6 +3,6 @@
# How to obtain `sha256`: # How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation { mkDerivation {
version = "24.1.3"; version = "24.1.4";
sha256 = "sha256-l0+eZh4F/erY0ZKikUilRPiwkIhEL1Fb5BauR7gh+Ew="; sha256 = "sha256-QE2VRayIswVrAOv9/bq+ebv3xxIL3fFMnfm5u1Wh8j4=";
} }

90
pkgs/development/libraries/google-cloud-cpp/default.nix
View file

@ -1,76 +1,76 @@
{ lib { lib
, stdenv , stdenv
, clang-tools
, grpc
, curl
, cmake
, pkg-config
, fetchFromGitHub , fetchFromGitHub
, doxygen , abseil-cpp
, protobuf , c-ares
, cmake
, crc32c , crc32c
, fetchurl , curl
, openssl , grpc
, libnsl , gbenchmark
, gtest
, ninja
, nlohmann_json
, pkg-config
, protobuf
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
, apis ? [ "*" ]
}: }:
let let
googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435";
googleapis = fetchFromGitHub { googleapis = fetchFromGitHub {
owner = "googleapis"; owner = "googleapis";
repo = "googleapis"; repo = "googleapis";
rev = "9c9f778aedde02f9826d2ae5d0f9c96409ba0f25"; rev = googleapisRev;
sha256 = "1gd3nwv8qf503wy6km0ad6akdvss9w5b1k3jqizy5gah1fkirkpi"; hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl";
}; };
googleapis-cpp-cmakefiles = stdenv.mkDerivation rec { in
pname = "googleapis-cpp-cmakefiles"; stdenv.mkDerivation rec {
version = "0.1.5";
src = fetchFromGitHub {
owner = "googleapis";
repo = "cpp-cmakefiles";
rev = "v${version}";
sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ grpc openssl protobuf ];
postPatch = ''
sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \
-i CMakeLists.txt
'';
};
_nlohmann_json = fetchurl {
url = "https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp";
sha256 = "0pw3jpi572irbp2dqclmyhgic6k9rxav5mpp9ygbp9xj48gnvnk3";
};
in stdenv.mkDerivation rec {
pname = "google-cloud-cpp"; pname = "google-cloud-cpp";
version = "0.14.0"; version = "1.32.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googleapis"; owner = "googleapis";
repo = "google-cloud-cpp"; repo = "google-cloud-cpp";
rev = "v${version}"; rev = "v${version}";
sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9";
}; };
buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ];
nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
outputs = [ "out" "dev" ];
postPatch = '' postPatch = ''
sed -e 's,https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp,file://${_nlohmann_json},' \ substituteInPlace external/googleapis/CMakeLists.txt \
-i cmake/DownloadNlohmannJson.cmake --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}"
''; '';
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
abseil-cpp
c-ares
crc32c
curl
grpc
gbenchmark
gtest
nlohmann_json
protobuf
];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS:BOOL=ON" "-DBUILD_SHARED_LIBS:BOOL=ON"
"-DBUILD_TESTING:BOOL=ON"
"-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"
] ++ lib.optionals (apis != [ "*" ]) [
"-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"
]; ];
meta = with lib; { meta = with lib; {
license = with licenses; [ asl20 ]; license = with licenses; [ asl20 ];
homepage = "https://github.com/googleapis/google-cloud-cpp"; homepage = "https://github.com/googleapis/google-cloud-cpp";
description = "C++ Idiomatic Clients for Google Cloud Platform services"; description = "C++ Idiomatic Clients for Google Cloud Platform services";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ cpcloud ];
}; };
} }

2
pkgs/development/libraries/languagemachines/frog.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frog.json); release = lib.importJSON ./release-info/LanguageMachines-frog.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/frogdata.nix
View file

@ -3,7 +3,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frogdata.json); release = lib.importJSON ./release-info/LanguageMachines-frogdata.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/libfolia.nix
View file

@ -4,7 +4,7 @@
, languageMachines }: , languageMachines }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-libfolia.json); release = lib.importJSON ./release-info/LanguageMachines-libfolia.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/mbt.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-mbt.json); release = lib.importJSON ./release-info/LanguageMachines-mbt.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/ticcutils.nix
View file

@ -3,7 +3,7 @@
, libxml2, zlib, bzip2, libtar }: , libxml2, zlib, bzip2, libtar }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ticcutils.json); release = lib.importJSON ./release-info/LanguageMachines-ticcutils.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/timbl.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timbl.json); release = lib.importJSON ./release-info/LanguageMachines-timbl.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/timblserver.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timblserver.json); release = lib.importJSON ./release-info/LanguageMachines-timblserver.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/ucto.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ucto.json); release = lib.importJSON ./release-info/LanguageMachines-ucto.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/development/libraries/languagemachines/uctodata.nix
View file

@ -3,7 +3,7 @@
}: }:
let let
release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); release = lib.importJSON ./release-info/LanguageMachines-uctodata.json;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/development/libraries/opencv/3.x.nix
View file

@ -213,11 +213,11 @@ stdenv.mkDerivation {
# tesseract & leptonica. # tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb ++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optional enableCuda cudatoolkit;
nativeBuildInputs = [ cmake pkg-config unzip ]; nativeBuildInputs = [ cmake pkg-config unzip ];

4
pkgs/development/libraries/opencv/4.x.nix
View file

@ -269,11 +269,11 @@ stdenv.mkDerivation {
# tesseract & leptonica. # tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb ++ lib.optional enableTbb tbb
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ];
nativeBuildInputs = [ cmake pkg-config unzip ]; nativeBuildInputs = [ cmake pkg-config unzip ];

4
pkgs/development/libraries/science/math/or-tools/default.nix
View file

@ -16,14 +16,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "or-tools"; pname = "or-tools";
version = "9.0"; version = "9.1";
disabled = python.pythonOlder "3.6"; # not supported upstream disabled = python.pythonOlder "3.6"; # not supported upstream
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = "v${version}"; rev = "v${version}";
sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3"; sha256 = "sha256-dEYMPWpa3J9EqtCq3kubdUYJivNRTOKUpNDx3UC1IcQ=";
}; };
# The original build system uses cmake which does things like pull # The original build system uses cmake which does things like pull

4
pkgs/development/mobile/androidenv/compose-android-packages.nix
View file

@ -64,9 +64,9 @@ let
addons = repoXmls.addons or []; addons = repoXmls.addons or [];
}; };
in in
builtins.fromJSON (builtins.readFile "${mkRepoJson repoXmlSpec}") lib.importJSON "${mkRepoJson repoXmlSpec}"
else else
builtins.fromJSON (builtins.readFile repoJson); lib.importJSON repoJson;
# Converts all 'archives' keys in a repo spec to fetchurl calls. # Converts all 'archives' keys in a repo spec to fetchurl calls.
fetchArchives = attrSet: fetchArchives = attrSet:

28
pkgs/development/python-modules/mrkd/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, jinja2
, mistune
, pygments
, setuptools
}:
buildPythonPackage rec {
pname = "mrkd";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf";
};
propagatedBuildInputs = [ jinja2 mistune pygments setuptools ];
pythonImportsCheck = [ "mrkd" ];
meta = with lib; {
description = "Write man pages using Markdown, and convert them to Roff or HTML";
homepage = "https://github.com/refi64/mrkd";
license = licenses.bsd2;
};
}

4
pkgs/development/python-modules/pytautulli/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytautulli"; pname = "pytautulli";
version = "21.10.0"; version = "21.10.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ludeeus"; owner = "ludeeus";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1gi1jalwzf1aykvdmdbvr7hvfch9wbbjra87f1vzdmkb5iiirw01"; sha256 = "sha256-ckDqKPseOrGyWGvcPyj99cvQS+w4AHUkO4FHOIo9MDM=";
}; };
postPatch = '' postPatch = ''

5
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -437,7 +437,10 @@ in
"--with-xslt-include=${libxslt.dev}/include" "--with-xslt-include=${libxslt.dev}/include"
"--with-exslt-lib=${libxslt.out}/lib" "--with-exslt-lib=${libxslt.out}/lib"
"--with-exslt-include=${libxslt.dev}/include" "--with-exslt-include=${libxslt.dev}/include"
] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; ] ++ lib.optionals stdenv.isDarwin [
"--with-iconv-dir=${libiconv}"
"--with-opt-include=${libiconv}/include"
];
}; };
openssl = attrs: { openssl = attrs: {

2
pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix
View file

@ -37,7 +37,7 @@ let
srcDeps = lib.attrsets.attrValues srcDepsSet; srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet = srcDepsSet =
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = lib.importJSON ./src-deps.json;
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;

2
pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
View file

@ -37,7 +37,7 @@ let
srcDeps = lib.attrsets.attrValues srcDepsSet; srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet = srcDepsSet =
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = lib.importJSON ./src-deps.json;
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;

2
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
View file

@ -37,7 +37,7 @@ let
srcDeps = lib.attrsets.attrValues srcDepsSet; srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet = srcDepsSet =
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = lib.importJSON ./src-deps.json;
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;

2
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View file

@ -40,7 +40,7 @@ let
srcDeps = lib.attrsets.attrValues srcDepsSet; srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet = srcDepsSet =
let let
srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); srcs = lib.importJSON ./src-deps.json;
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
urls = d.urls; urls = d.urls;
sha256 = d.sha256; sha256 = d.sha256;

4
pkgs/development/tools/open-policy-agent/default.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "open-policy-agent"; pname = "open-policy-agent";
version = "0.33.1"; version = "0.34.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "opa"; repo = "opa";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-n0VuzYlgn9IGiaxzDeuVjMqFbDwTe3UjExk7BT2DNZc="; sha256 = "sha256-T8eFCFzDU0GTd7n141XKT34lRXoU2LOrl0Rlh1WLsmo=";
}; };
vendorSha256 = null; vendorSha256 = null;

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

@ -51,7 +51,7 @@ let
mkdir $out mkdir $out
'' + (lib.concatStrings (lib.mapAttrsToList '' + (lib.concatStrings (lib.mapAttrsToList
(name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n")
(import ./grammars)))); (import ./grammars { inherit lib; }))));
builtGrammars = builtGrammars =
let let

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

@ -1,49 +1,51 @@
{ lib }:
{ {
tree-sitter-agda = (builtins.fromJSON (builtins.readFile ./tree-sitter-agda.json)); tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json;
tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); tree-sitter-c = lib.importJSON ./tree-sitter-c.json;
tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json)); tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;
tree-sitter-clojure = (builtins.fromJSON (builtins.readFile ./tree-sitter-clojure.json)); tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;
tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); tree-sitter-comment = lib.importJSON ./tree-sitter-comment.json;
tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); tree-sitter-cpp = lib.importJSON ./tree-sitter-cpp.json;
tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); tree-sitter-css = lib.importJSON ./tree-sitter-css.json;
tree-sitter-dart = (builtins.fromJSON (builtins.readFile ./tree-sitter-dart.json)); tree-sitter-dart = lib.importJSON ./tree-sitter-dart.json;
tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json)); tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json;
tree-sitter-elisp = (builtins.fromJSON (builtins.readFile ./tree-sitter-elisp.json)); tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json;
tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); tree-sitter-embedded-template = lib.importJSON ./tree-sitter-embedded-template.json;
tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json;
tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json;
tree-sitter-fluent = (builtins.fromJSON (builtins.readFile ./tree-sitter-fluent.json)); tree-sitter-fluent = lib.importJSON ./tree-sitter-fluent.json;
tree-sitter-go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); tree-sitter-go = lib.importJSON ./tree-sitter-go.json;
tree-sitter-haskell = (builtins.fromJSON (builtins.readFile ./tree-sitter-haskell.json)); tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json;
tree-sitter-html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json)); tree-sitter-html = lib.importJSON ./tree-sitter-html.json;
tree-sitter-java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json)); tree-sitter-java = lib.importJSON ./tree-sitter-java.json;
tree-sitter-javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json;
tree-sitter-jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json;
tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); tree-sitter-json = lib.importJSON ./tree-sitter-json.json;
tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json;
tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json)); tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json;
tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json;
tree-sitter-make = (builtins.fromJSON (builtins.readFile ./tree-sitter-make.json)); tree-sitter-make = lib.importJSON ./tree-sitter-make.json;
tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json)); tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json;
tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
tree-sitter-norg = (builtins.fromJSON (builtins.readFile ./tree-sitter-norg.json)); tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json)); tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); tree-sitter-php = lib.importJSON ./tree-sitter-php.json;
tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); tree-sitter-python = lib.importJSON ./tree-sitter-python.json;
tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json)); tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json;
tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json)); tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json;
tree-sitter-rst = (builtins.fromJSON (builtins.readFile ./tree-sitter-rst.json)); tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json;
tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json;
tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json;
tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json)); tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json;
tree-sitter-svelte = (builtins.fromJSON (builtins.readFile ./tree-sitter-svelte.json)); tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
tree-sitter-swift = (builtins.fromJSON (builtins.readFile ./tree-sitter-swift.json)); tree-sitter-swift = lib.importJSON ./tree-sitter-swift.json;
tree-sitter-toml = (builtins.fromJSON (builtins.readFile ./tree-sitter-toml.json)); tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json)); tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json;
tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json)); tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json;
tree-sitter-vim = (builtins.fromJSON (builtins.readFile ./tree-sitter-vim.json)); tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json;
tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json)); tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json;
tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json)); tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json;
} }

2
pkgs/development/tools/parsing/tree-sitter/update.nix
View file

@ -261,7 +261,7 @@ let
${foreachSh allGrammars ${foreachSh allGrammars
({name, ...}: '' ({name, ...}: ''
# indentation hack # indentation hack
printf " %s = (builtins.fromJSON (builtins.readFile ./%s.json));\n" "${name}" "${name}"'')} printf " %s = lib.importJSON ./%s.json;\n" "${name}" "${name}"'')}
echo "}" ) \ echo "}" ) \
> "$outputDir/default.nix" > "$outputDir/default.nix"
''; '';

2
pkgs/development/web/netlify-cli/default.nix
View file

@ -6,7 +6,7 @@ in
preRebuild = '' preRebuild = ''
export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"
''; '';
src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json)); src = fetchFromGitHub (lib.importJSON ./netlify-cli.json);
bypassCache = true; bypassCache = true;
reconstructLock = true; reconstructLock = true;
passthru.tests.test = callPackage ./test.nix { }; passthru.tests.test = callPackage ./test.nix { };

2
pkgs/development/web/netlify-cli/generate.sh
View file

@ -2,7 +2,7 @@
set -eu -o pipefail set -eu -o pipefail
cd "$( dirname "${BASH_SOURCE[0]}" )" cd "$( dirname "${BASH_SOURCE[0]}" )"
rm -f ./node-env.nix rm -f ./node-env.nix
src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json))')" src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (lib.importJSON ./netlify-cli.json)')"
echo $src echo $src
node2nix \ node2nix \
--input $src/package.json \ --input $src/package.json \

2
pkgs/games/dwarf-fortress/default.nix
View file

@ -95,7 +95,7 @@ let
(lib.attrNames self.df-hashes)); (lib.attrNames self.df-hashes));
self = rec { self = rec {
df-hashes = builtins.fromJSON (builtins.readFile ./game.json); df-hashes = lib.importJSON ./game.json;
# Aliases for the latest Dwarf Fortress and the selected Therapist install # Aliases for the latest Dwarf Fortress and the selected Therapist install
dwarf-fortress = getAttr (versionToName latestVersion) df-games; dwarf-fortress = getAttr (versionToName latestVersion) df-games;

2
pkgs/misc/vim-plugins/aliases.nix
View file

@ -32,7 +32,7 @@ let
deprecations = lib.mapAttrs (old: info: deprecations = lib.mapAttrs (old: info:
throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}."
) (builtins.fromJSON (builtins.readFile ./deprecated.json)); ) (lib.importJSON ./deprecated.json);
in in
mapAliases (with prev; { mapAliases (with prev; {

2
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
View file

@ -13,7 +13,7 @@
let let
# Get as close as possible as the `package.json` required version. # Get as close as possible as the `package.json` required version.
# This is what drives omnisharp. # This is what drives omnisharp.
rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsSrcsFromJson = lib.importJSON ./rt-deps-bin-srcs.json;
rtDepsBinSrcs = builtins.mapAttrs (k: v: rtDepsBinSrcs = builtins.mapAttrs (k: v:
let let

2
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -53,7 +53,7 @@
extra = src.extra; extra = src.extra;
inherit version sha256; inherit version sha256;
}; };
patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json); patches = lib.importJSON ./hardened/patches.json;
in lib.mapAttrs mkPatch patches; in lib.mapAttrs mkPatch patches;
# https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6

2
pkgs/servers/asterisk/default.nix
View file

@ -97,7 +97,7 @@ let
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202; "addons/mp3" = mp3-202;
}; };
}) (builtins.fromJSON (builtins.readFile ./versions.json)); }) (lib.importJSON ./versions.json);
in { in {
# Supported releases (as of 2020-10-26). # Supported releases (as of 2020-10-26).

4
pkgs/servers/computing/slurm/default.nix
View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "slurm"; pname = "slurm";
version = "21.08.2.1"; version = "21.08.3.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases. # because the latter does not keep older releases.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm"; repo = "slurm";
# The release tags use - instead of . # The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1nx5j82hvcifq6j59b8pm5dxmxhb2820kicfkl0gbyw63yx1izjn"; sha256 = "0riynmdmq44hqjdfd8acvc14miy5yqbwvsmbm1xcgsjdxjan8l2z";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/servers/web-apps/hedgedoc/default.nix
View file

@ -13,7 +13,7 @@
}: }:
let let
pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); pinData = lib.importJSON ./pin.json;
# we need a different version than the one already available in nixpkgs # we need a different version than the one already available in nixpkgs
esbuild-hedgedoc = buildGoModule rec { esbuild-hedgedoc = buildGoModule rec {

6
pkgs/tools/misc/pistol/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pistol"; pname = "pistol";
version = "0.2.1"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "doronbehar"; owner = "doronbehar";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NUHk48P3kUx+e9BR9k9K/VaHnbZ6Do6RRf1S0974sO8="; sha256 = "sha256-rpHtU8CnRh4C75tjdyJWCzbyaHvzyBpGSbJpXW8J9VM=";
}; };
vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM="; vendorSha256 = "sha256-ivFH7KtWf4nHCdAJrb6HgKP6aIIjgBKG5XwbeJHBDvU=";
doCheck = false; doCheck = false;

2
pkgs/tools/networking/ngrok-2/default.nix
View file

@ -2,7 +2,7 @@
with lib; with lib;
let versions = builtins.fromJSON (builtins.readFile ./versions.json); let versions = lib.importJSON ./versions.json;
arch = if stdenv.isi686 then "386" arch = if stdenv.isi686 then "386"
else if stdenv.isx86_64 then "amd64" else if stdenv.isx86_64 then "amd64"
else if stdenv.isAarch32 then "arm" else if stdenv.isAarch32 then "arm"

112
pkgs/tools/security/bitwarden/default.nix
View file

@ -4,6 +4,7 @@
, fetchurl , fetchurl
, lib , lib
, libsecret , libsecret
, libxshmfence
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
, stdenv , stdenv
@ -11,18 +12,55 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
let stdenv.mkDerivation rec {
inherit (stdenv.hostPlatform) system;
pname = "bitwarden"; pname = "bitwarden";
version = "1.29.1";
version = { src = fetchurl {
x86_64-linux = "1.28.1"; url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb";
}.${system} or ""; sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8";
};
sha256 = { desktopItem = makeDesktopItem {
x86_64-linux = "sha256-vyEbISZDTN+CHqSEtElzfg4M4i+2RjUux5vzwJw8/dc="; name = "bitwarden";
}.${system} or ""; exec = "bitwarden %U";
icon = "bitwarden";
comment = "A secure and free password manager for all of your devices";
desktopName = "Bitwarden";
categories = "Utility";
};
dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
dontWrapGApps = true;
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
buildInputs = [ libsecret libxshmfence ] ++ atomEnv.packages;
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
# Desktop file
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
runtimeDependencies = [
(lib.getLib udev)
];
postFixup = ''
makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \
"''${gappsWrapperArgs[@]}"
'';
meta = with lib; { meta = with lib; {
description = "A secure and free password manager for all of your devices"; description = "A secure and free password manager for all of your devices";
@ -31,58 +69,4 @@ let
maintainers = with maintainers; [ kiwi ]; maintainers = with maintainers; [ kiwi ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
}
linux = stdenv.mkDerivation rec {
inherit pname version meta;
src = fetchurl {
url = "https://github.com/bitwarden/desktop/releases/download/"
+ "v${version}/Bitwarden-${version}-amd64.deb";
inherit sha256;
};
desktopItem = makeDesktopItem {
name = "bitwarden";
exec = "bitwarden %U";
icon = "bitwarden";
comment = "A secure and free password manager for all of your devices";
desktopName = "Bitwarden";
categories = "Utility";
};
dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
dontWrapGApps = true;
buildInputs = [ libsecret ] ++ atomEnv.packages;
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
# Desktop file
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
runtimeDependencies = [
(lib.getLib udev)
];
postFixup = ''
makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \
"''${gappsWrapperArgs[@]}"
'';
};
in if stdenv.isDarwin
then throw "Bitwarden has not been packaged for macOS yet"
else linux

2
pkgs/tools/security/enpass/default.nix
View file

@ -6,7 +6,7 @@
}: }:
let let
all_data = builtins.fromJSON (builtins.readFile ./data.json); all_data = lib.importJSON ./data.json;
system_map = { system_map = {
# i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386 # i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386
x86_64-linux = "amd64"; x86_64-linux = "amd64";

2
pkgs/tools/security/onlykey/default.nix
View file

@ -12,7 +12,7 @@ let
# parse the version from package.json # parse the version from package.json
version = version =
let let
packageJson = builtins.fromJSON (builtins.readFile ./package.json); packageJson = lib.importJSON ./package.json;
splits = builtins.split "^.*#v(.*)$" (builtins.getAttr "onlykey" (builtins.head packageJson)); splits = builtins.split "^.*#v(.*)$" (builtins.getAttr "onlykey" (builtins.head packageJson));
matches = builtins.elemAt splits 1; matches = builtins.elemAt splits 1;
elem = builtins.head matches; elem = builtins.head matches;

6
pkgs/tools/security/swtpm/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swtpm"; pname = "swtpm";
version = "0.6.0"; version = "0.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stefanberger"; owner = "stefanberger";
repo = "swtpm"; repo = "swtpm";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; sha256 = "sha256-iy8xjKnPLq1ntZa9x+KtLDznzu6m+1db3NPeGQESUVo=";
}; };
patches = [ patches = [
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
]; ];
prePatch = '' prePatch = ''
# Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails # Makefile tries to create the directory /var/lib/swtpm-localca, which fails
substituteInPlace samples/Makefile.am \ substituteInPlace samples/Makefile.am \
--replace 'install-data-local:' 'do-not-execute:' --replace 'install-data-local:' 'do-not-execute:'

2
pkgs/tools/text/chroma/default.nix
View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
let let
srcInfo = builtins.fromJSON (builtins.readFile ./src.json); srcInfo = lib.importJSON ./src.json;
in in
buildGoModule rec { buildGoModule rec {

40
pkgs/tools/typesetting/asciidoctor/Gemfile.lock
View file

@ -2,17 +2,17 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Ascii85 (1.1.0) Ascii85 (1.1.0)
addressable (2.7.0) addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2) afm (0.2.2)
asciidoctor (2.0.15) asciidoctor (2.0.16)
asciidoctor-diagram (2.1.2) asciidoctor-diagram (2.2.1)
asciidoctor (>= 1.5.7, < 3.x) asciidoctor (>= 1.5.7, < 3.x)
asciidoctor-diagram-ditaamini (~> 1.0.0) asciidoctor-diagram-ditaamini (~> 1.0)
asciidoctor-diagram-plantuml (~> 1.2021) asciidoctor-diagram-plantuml (~> 1.2021)
rexml rexml
asciidoctor-diagram-ditaamini (1.0.0) asciidoctor-diagram-ditaamini (1.0.1)
asciidoctor-diagram-plantuml (1.2021.7) asciidoctor-diagram-plantuml (1.2021.8)
asciidoctor-epub3 (1.5.1) asciidoctor-epub3 (1.5.1)
asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor (>= 1.5.6, < 3.0.0)
gepub (~> 1.0.0) gepub (~> 1.0.0)
@ -21,7 +21,7 @@ GEM
asciidoctor (~> 2.0) asciidoctor (~> 2.0)
asciimath (~> 2.0) asciimath (~> 2.0)
mathematical (~> 1.6.0) mathematical (~> 1.6.0)
asciidoctor-pdf (1.6.0) asciidoctor-pdf (1.6.1)
asciidoctor (~> 2.0) asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1) concurrent-ruby (~> 1.1)
prawn (~> 2.4.0) prawn (~> 2.4.0)
@ -35,25 +35,25 @@ GEM
asciidoctor (>= 2.0.0, < 3.0.0) asciidoctor (>= 2.0.0, < 3.0.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
thread_safe (~> 0.3.5) thread_safe (~> 0.3.5)
asciimath (2.0.2) asciimath (2.0.3)
coderay (1.1.3) coderay (1.1.3)
concurrent-ruby (1.1.9) concurrent-ruby (1.1.9)
css_parser (1.9.0) css_parser (1.10.0)
addressable addressable
gepub (1.0.13) gepub (1.0.15)
nokogiri (>= 1.8.2, < 1.12) nokogiri (>= 1.8.2, < 2.0)
rubyzip (> 1.1.1, < 2.4) rubyzip (> 1.1.1, < 2.4)
hashery (2.1.2) hashery (2.1.2)
i18n (1.8.10) i18n (1.8.11)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
mathematical (1.6.14) mathematical (1.6.14)
ruby-enum (~> 0.4) ruby-enum (~> 0.4)
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225) mime-types-data (3.2021.0901)
mini_portile2 (2.5.3) mini_portile2 (2.6.1)
nokogiri (1.11.7) nokogiri (1.12.5)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.6.1)
racc (~> 1.4) racc (~> 1.4)
pdf-core (0.9.0) pdf-core (0.9.0)
pdf-reader (2.5.0) pdf-reader (2.5.0)
@ -79,13 +79,13 @@ GEM
prawn (~> 2.2) prawn (~> 2.2)
public_suffix (4.0.6) public_suffix (4.0.6)
pygments.rb (2.2.0) pygments.rb (2.2.0)
racc (1.5.2) racc (1.6.0)
rexml (3.2.5) rexml (3.2.5)
rouge (3.26.0) rouge (3.26.1)
ruby-enum (0.9.0) ruby-enum (0.9.0)
i18n i18n
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
rubyzip (2.3.0) rubyzip (2.3.2)
safe_yaml (1.0.5) safe_yaml (1.0.5)
thread_safe (0.3.6) thread_safe (0.3.6)
treetop (1.6.11) treetop (1.6.11)
@ -107,4 +107,4 @@ DEPENDENCIES
rouge rouge
BUNDLED WITH BUNDLED WITH
2.1.4 2.2.24

64
pkgs/tools/typesetting/asciidoctor/gemset.nix
View file

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "2.8.0";
}; };
afm = { afm = {
groups = ["default"]; groups = ["default"];
@ -35,10 +35,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2";
type = "gem"; type = "gem";
}; };
version = "2.0.15"; version = "2.0.16";
}; };
asciidoctor-diagram = { asciidoctor-diagram = {
dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"];
@ -46,30 +46,30 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09ci775f7y7d6spn0fl5wfmfyxianjp4z0p3fwcrzajy63f381v9"; sha256 = "1z1ilpczjaydhcwpz3yygn03yrx2ljjj55xczwkrlb8rzgh03br3";
type = "gem"; type = "gem";
}; };
version = "2.1.2"; version = "2.2.1";
}; };
asciidoctor-diagram-ditaamini = { asciidoctor-diagram-ditaamini = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1frnjz0j00v5hqp5macgnn6jq77jcpjy2l6hqmn5jn5ds7bmi2rl"; sha256 = "1nva5n6nyns0xp77d1dxng1rjhc8ma6gyd8hczjq3h9qqxcw2q4h";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
asciidoctor-diagram-plantuml = { asciidoctor-diagram-plantuml = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kcxwbaancxfq08fr7syg8mxsi97jiczxyp4an2x0ymq3mkss0k8"; sha256 = "0n018kmqzapf5y1bacb5yyvb9jfwxdkfqnviwxivwz9322b9w6j7";
type = "gem"; type = "gem";
}; };
version = "1.2021.7"; version = "1.2021.8";
}; };
asciidoctor-epub3 = { asciidoctor-epub3 = {
dependencies = ["asciidoctor" "gepub" "mime-types"]; dependencies = ["asciidoctor" "gepub" "mime-types"];
@ -99,10 +99,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sxfz3qp2j76jlab7fb1d1ylbf0h2nnbkhg019qqch5wkd4k1iw9"; sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk";
type = "gem"; type = "gem";
}; };
version = "1.6.0"; version = "1.6.1";
}; };
asciidoctor-revealjs = { asciidoctor-revealjs = {
dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"];
@ -120,10 +120,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yq9av7rh493xqmx4cq3fjl0c6d8njxp53qw4hg2d3xkyn2lyfc5"; sha256 = "0h4fz93pf96y5syxwpv0vibjf7lidv2718ikpvyd2vy8c1am8zyn";
type = "gem"; type = "gem";
}; };
version = "2.0.2"; version = "2.0.3";
}; };
coderay = { coderay = {
groups = ["default"]; groups = ["default"];
@ -151,10 +151,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5";
type = "gem"; type = "gem";
}; };
version = "1.9.0"; version = "1.10.0";
}; };
gepub = { gepub = {
dependencies = ["nokogiri" "rubyzip"]; dependencies = ["nokogiri" "rubyzip"];
@ -162,10 +162,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01q33rkvqrhxqm8zgkhgcqhrqdfzgxswxfgiagdjxw67qdn1pids"; sha256 = "08fny807zd4700f263ckc76bladjipsniyk3clv8a7x76x3fqshx";
type = "gem"; type = "gem";
}; };
version = "1.0.13"; version = "1.0.15";
}; };
hashery = { hashery = {
groups = ["default"]; groups = ["default"];
@ -183,10 +183,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
type = "gem"; type = "gem";
}; };
version = "1.8.10"; version = "1.8.11";
}; };
mathematical = { mathematical = {
dependencies = ["ruby-enum"]; dependencies = ["ruby-enum"];
@ -215,20 +215,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
type = "gem"; type = "gem";
}; };
version = "3.2021.0225"; version = "3.2021.0901";
}; };
mini_portile2 = { mini_portile2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
type = "gem"; type = "gem";
}; };
version = "2.5.3"; version = "2.6.1";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2" "racc"]; dependencies = ["mini_portile2" "racc"];
@ -236,10 +236,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
type = "gem"; type = "gem";
}; };
version = "1.11.7"; version = "1.12.5";
}; };
pdf-core = { pdf-core = {
groups = ["default"]; groups = ["default"];
@ -352,10 +352,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem"; type = "gem";
}; };
version = "1.5.2"; version = "1.6.0";
}; };
rexml = { rexml = {
groups = ["default"]; groups = ["default"];
@ -372,10 +372,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
type = "gem"; type = "gem";
}; };
version = "3.26.0"; version = "3.26.1";
}; };
ruby-enum = { ruby-enum = {
dependencies = ["i18n"]; dependencies = ["i18n"];
@ -403,10 +403,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem"; type = "gem";
}; };
version = "2.3.0"; version = "2.3.2";
}; };
safe_yaml = { safe_yaml = {
groups = ["default"]; groups = ["default"];

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

@ -3321,6 +3321,8 @@ with pkgs;
mq-cli = callPackage ../tools/system/mq-cli { }; mq-cli = callPackage ../tools/system/mq-cli { };
mrkd = with python3Packages; toPythonApplication mrkd;
n2n = callPackage ../tools/networking/n2n { }; n2n = callPackage ../tools/networking/n2n { };
nextdns = callPackage ../applications/networking/nextdns { }; nextdns = callPackage ../applications/networking/nextdns { };
@ -11159,8 +11161,8 @@ with pkgs;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; };
adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {}
@ -11177,8 +11179,8 @@ with pkgs;
then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {};
adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix { inherit lib; };
adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {}
@ -11195,8 +11197,8 @@ with pkgs;
then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {};
adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix; adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix { inherit lib; };
adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {}
@ -11213,8 +11215,8 @@ with pkgs;
then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {};
adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix { inherit lib; };
adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {}
@ -11231,8 +11233,8 @@ with pkgs;
then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {};
adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix { inherit lib; };
adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {}
@ -11249,8 +11251,8 @@ with pkgs;
then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix { inherit lib; };
adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {}

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

@ -4878,6 +4878,8 @@ in {
mpyq = callPackage ../development/python-modules/mpyq { }; mpyq = callPackage ../development/python-modules/mpyq { };
mrkd = callPackage ../development/python-modules/mrkd { };
ms-cv = callPackage ../development/python-modules/ms-cv { }; ms-cv = callPackage ../development/python-modules/ms-cv { };
msal = callPackage ../development/python-modules/msal { }; msal = callPackage ../development/python-modules/msal { };