nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 03:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nixpkgs/staging-next' into staging

Browse Source 
Conflicts:
	pkgs/development/python-modules/pint/default.nix
This commit is contained in:
Alyssa Ross
2021-12-17 05:50:06 +00:00
parent 7599020b21 7d786912ce
commit e07182012b
153 changed files with 1449 additions and 14474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/editorconfig.yml vendored
View File

@@ -31,7 +31,8 @@ jobs:
- uses: cachix/install-nix-action@v16
with:
# nixpkgs commit is pinned so that it doesn't break
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
# editorconfig-checker 2.4.0
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
- name: install editorconfig-checker
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
- name: Checking EditorConfig

5
lib/systems/supported.nix
View File

@@ -4,7 +4,9 @@
{ lib }:
rec {
# List of systems that are built by Hydra.
hydra = tier1 ++ tier2 ++ tier3;
hydra = tier1 ++ tier2 ++ tier3 ++ [
"aarch64-darwin"
];
tier1 = [
"x86_64-linux"
@@ -16,7 +18,6 @@ rec {
];
tier3 = [
"aarch64-darwin"
"armv6l-linux"
"armv7l-linux"
"i686-linux"

14
maintainers/team-list.nix
View File

@@ -29,6 +29,20 @@ with lib.maintainers; {
scope = "Maintain ACME-related packages and modules.";
};
bazel = {
members = [
mboes
marsam
uri-canva
cbley
olebedev
groodt
aherrmann
ylecornec
];
scope = "Bazel build tool & related tools https://bazel.build/";
};
beam = {
members = [
ankhers

20
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@@ -19,7 +19,7 @@
</section>
<section xml:id="sec-release-22.05-new-services">
<title>New Services</title>
<itemizedlist spacing="compact">
<itemizedlist>
<listitem>
<para>
<link xlink:href="https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw">aesmd</link>,
@@ -28,6 +28,14 @@
<link linkend="opt-services.aesmd.enable">services.aesmd</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html">filebeat</link>,
a lightweight shipper for forwarding and centralizing log
data. Available as
<link linkend="opt-services.filebeat.enable">services.filebeat</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-incompatibilities">
@@ -134,6 +142,16 @@
using the PyPy interpreter were added.
</para>
</listitem>
<listitem>
<para>
The <literal>influxdb2</literal> package was split into
<literal>influxdb2-server</literal> and
<literal>influxdb2-cli</literal>, matching the split that took
place upstream. A combined <literal>influxdb2</literal>
package is still provided in this release for backwards
compatibilty, but will be removed at a later date.
</para>
</listitem>
</itemizedlist>
</section>
</section>

7
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).
- [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
@@ -56,3 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
through the Unix socket `/run/redis-${serverName}/redis.sock`.
- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
- The `influxdb2` package was split into `influxdb2-server` and
`influxdb2-cli`, matching the split that took place upstream. A
combined `influxdb2` package is still provided in this release for
backwards compatibilty, but will be removed at a later date.

1
nixos/modules/module-list.nix
View File

@@ -448,6 +448,7 @@
./services/hardware/xow.nix
./services/logging/SystemdJournal2Gelf.nix
./services/logging/awstats.nix
./services/logging/filebeat.nix
./services/logging/fluentd.nix
./services/logging/graylog.nix
./services/logging/heartbeat.nix

4
nixos/modules/services/audio/snapserver.nix
View File

@@ -54,12 +54,12 @@ let
# tcp json rpc
++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ]
++ optionals cfg.tcp.enable [
"--tcp.address ${cfg.tcp.listenAddress}"
"--tcp.bind_to_address ${cfg.tcp.listenAddress}"
"--tcp.port ${toString cfg.tcp.port}" ]
# http json rpc
++ [ "--http.enabled ${toString cfg.http.enable}" ]
++ optionals cfg.http.enable [
"--http.address ${cfg.http.listenAddress}"
"--http.bind_to_address ${cfg.http.listenAddress}"
"--http.port ${toString cfg.http.port}"
] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\"");

26
nixos/modules/services/backup/tarsnap.nix
View File

@@ -320,21 +320,22 @@ in
${optionalString cfg.explicitSymlinks "-H"} \
${optionalString cfg.followSymlinks "-L"} \
${concatStringsSep " " cfg.directories}'';
cachedir = escapeShellArg cfg.cachedir;
in if (cfg.cachedir != null) then ''
mkdir -p ${cfg.cachedir}
chmod 0700 ${cfg.cachedir}
mkdir -p ${cachedir}
chmod 0700 ${cachedir}
( flock 9
if [ ! -e ${cfg.cachedir}/firstrun ]; then
if [ ! -e ${cachedir}/firstrun ]; then
( flock 10
flock -u 9
${tarsnap} --fsck
flock 9
) 10>${cfg.cachedir}/firstrun
) 10>${cachedir}/firstrun
fi
) 9>${cfg.cachedir}/lockf
) 9>${cachedir}/lockf
exec flock ${cfg.cachedir}/firstrun ${run}
exec flock ${cachedir}/firstrun ${run}
'' else "exec ${run}";
serviceConfig = {
@@ -356,22 +357,23 @@ in
tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)";
run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
cachedir = escapeShellArg cfg.cachedir;
in if (cfg.cachedir != null) then ''
mkdir -p ${cfg.cachedir}
chmod 0700 ${cfg.cachedir}
mkdir -p ${cachedir}
chmod 0700 ${cachedir}
( flock 9
if [ ! -e ${cfg.cachedir}/firstrun ]; then
if [ ! -e ${cachedir}/firstrun ]; then
( flock 10
flock -u 9
${tarsnap} --fsck
flock 9
) 10>${cfg.cachedir}/firstrun
) 10>${cachedir}/firstrun
fi
) 9>${cfg.cachedir}/lockf
) 9>${cachedir}/lockf
exec flock ${cfg.cachedir}/firstrun ${run}
exec flock ${cachedir}/firstrun ${run}
'' else "exec ${run}";
serviceConfig = {

2
nixos/modules/services/databases/influxdb2.nix
View File

@@ -10,7 +10,7 @@ in
services.influxdb2 = {
enable = mkEnableOption "the influxdb2 server";
package = mkOption {
default = pkgs.influxdb2;
default = pkgs.influxdb2-server;
defaultText = literalExpression "pkgs.influxdb2";
description = "influxdb2 derivation to use.";
type = types.package;

253
nixos/modules/services/logging/filebeat.nix Normal file
View File

@@ -0,0 +1,253 @@
{ config, lib, utils, pkgs, ... }:
let
inherit (lib)
attrValues
literalExpression
mkEnableOption
mkIf
mkOption
types;
cfg = config.services.filebeat;
json = pkgs.formats.json {};
in
{
options = {
services.filebeat = {
enable = mkEnableOption "filebeat";
package = mkOption {
type = types.package;
default = pkgs.filebeat;
defaultText = literalExpression "pkgs.filebeat";
example = literalExpression "pkgs.filebeat7";
description = ''
The filebeat package to use.
'';
};
inputs = mkOption {
description = ''
Inputs specify how Filebeat locates and processes input data.
This is like <literal>services.filebeat.settings.filebeat.inputs</literal>,
but structured as an attribute set. This has the benefit
that multiple NixOS modules can contribute settings to a
single filebeat input.
An input type can be specified multiple times by choosing a
different <literal>&lt;name></literal> for each, but setting
<xref linkend="opt-services.filebeat.inputs._name_.type"/>
to the same value.
See <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/configuration-filebeat-options.html"/>.
'';
default = {};
type = types.attrsOf (types.submodule ({ name, ... }: {
freeformType = json.type;
options = {
type = mkOption {
type = types.str;
default = name;
description = ''
The input type.
Look for the value after <literal>type:</literal> on
the individual input pages linked from
<link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/configuration-filebeat-options.html"/>.
'';
};
};
}));
example = literalExpression ''
{
journald.id = "everything"; # Only for filebeat7
log = {
enabled = true;
paths = [
"/var/log/*.log"
];
};
};
'';
};
modules = mkOption {
description = ''
Filebeat modules provide a quick way to get started
processing common log formats. They contain default
configurations, Elasticsearch ingest pipeline definitions,
and Kibana dashboards to help you implement and deploy a log
monitoring solution.
This is like <literal>services.filebeat.settings.filebeat.modules</literal>,
but structured as an attribute set. This has the benefit
that multiple NixOS modules can contribute settings to a
single filebeat module.
A module can be specified multiple times by choosing a
different <literal>&lt;name></literal> for each, but setting
<xref linkend="opt-services.filebeat.modules._name_.module"/>
to the same value.
See <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-modules.html"/>.
'';
default = {};
type = types.attrsOf (types.submodule ({ name, ... }: {
freeformType = json.type;
options = {
module = mkOption {
type = types.str;
default = name;
description = ''
The name of the module.
Look for the value after <literal>module:</literal> on
the individual input pages linked from
<link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-modules.html"/>.
'';
};
};
}));
example = literalExpression ''
{
nginx = {
access = {
enabled = true;
var.paths = [ "/path/to/log/nginx/access.log*" ];
};
error = {
enabled = true;
var.paths = [ "/path/to/log/nginx/error.log*" ];
};
};
};
'';
};
settings = mkOption {
type = types.submodule {
freeformType = json.type;
options = {
output.elasticsearch.hosts = mkOption {
type = with types; listOf str;
default = [ "127.0.0.1:9200" ];
example = [ "myEShost:9200" ];
description = ''
The list of Elasticsearch nodes to connect to.
The events are distributed to these nodes in round
robin order. If one node becomes unreachable, the
event is automatically sent to another node. Each
Elasticsearch node can be defined as a URL or
IP:PORT. For example:
<literal>http://192.15.3.2</literal>,
<literal>https://es.found.io:9230</literal> or
<literal>192.24.3.2:9300</literal>. If no port is
specified, <literal>9200</literal> is used.
'';
};
filebeat = {
inputs = mkOption {
type = types.listOf json.type;
default = [];
internal = true;
description = ''
Inputs specify how Filebeat locates and processes
input data. Use <xref
linkend="opt-services.filebeat.inputs"/> instead.
See <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/configuration-filebeat-options.html"/>.
'';
};
modules = mkOption {
type = types.listOf json.type;
default = [];
internal = true;
description = ''
Filebeat modules provide a quick way to get started
processing common log formats. They contain default
configurations, Elasticsearch ingest pipeline
definitions, and Kibana dashboards to help you
implement and deploy a log monitoring solution.
Use <xref linkend="opt-services.filebeat.modules"/> instead.
See <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-modules.html"/>.
'';
};
};
};
};
default = {};
example = literalExpression ''
{
settings = {
output.elasticsearch = {
hosts = [ "myEShost:9200" ];
username = "filebeat_internal";
password = { _secret = "/var/keys/elasticsearch_password"; };
};
logging.level = "info";
};
};
'';
description = ''
Configuration for filebeat. See
<link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-reference-yml.html"/>
for supported values.
Options containing secret data should be set to an attribute
set containing the attribute <literal>_secret</literal> - a
string pointing to a file containing the value the option
should be set to. See the example to get a better picture of
this: in the resulting
<filename>filebeat.yml</filename> file, the
<literal>output.elasticsearch.password</literal>
key will be set to the contents of the
<filename>/var/keys/elasticsearch_password</filename> file.
'';
};
};
};
config = mkIf cfg.enable {
services.filebeat.settings.filebeat.inputs = attrValues cfg.inputs;
services.filebeat.settings.filebeat.modules = attrValues cfg.modules;
systemd.services.filebeat = {
description = "Filebeat log shipper";
wantedBy = [ "multi-user.target" ];
wants = [ "elasticsearch.service" ];
after = [ "elasticsearch.service" ];
serviceConfig = {
ExecStartPre = pkgs.writeShellScript "filebeat-exec-pre" ''
set -euo pipefail
umask u=rwx,g=,o=
${utils.genJqSecretsReplacementSnippet
cfg.settings
"/var/lib/filebeat/filebeat.yml"
}
'';
ExecStart = ''
${cfg.package}/bin/filebeat -e \
-c "/var/lib/filebeat/filebeat.yml" \
--path.data "/var/lib/filebeat"
'';
Restart = "always";
StateDirectory = "filebeat";
};
};
};
}

3
nixos/modules/services/logging/journalbeat.nix
View File

@@ -28,7 +28,6 @@ in
type = types.package;
default = pkgs.journalbeat;
defaultText = literalExpression "pkgs.journalbeat";
example = literalExpression "pkgs.journalbeat7";
description = ''
The journalbeat package to use
'';
@@ -89,6 +88,8 @@ in
systemd.services.journalbeat = {
description = "Journalbeat log shipper";
wantedBy = [ "multi-user.target" ];
wants = [ "elasticsearch.service" ];
after = [ "elasticsearch.service" ];
preStart = ''
mkdir -p ${cfg.stateDir}/data
mkdir -p ${cfg.stateDir}/logs

2
nixos/modules/services/wayland/cage.nix
View File

@@ -74,6 +74,8 @@ in {
TTYVTDisallocate = "yes";
# Fail to start if not controlling the virtual terminal.
StandardInput = "tty-fail";
StandardOutput = "journal";
StandardError = "journal";
# Set up a full (custom) user session for the user, required by Cage.
PAMName = "cage";
};

90
nixos/tests/elk.nix
View File

@@ -40,9 +40,8 @@ let
services = {
journalbeat = let lt6 = builtins.compareVersions
elk.journalbeat.version "6" < 0; in {
enable = true;
journalbeat = {
enable = elk ? journalbeat;
package = elk.journalbeat;
extraConfig = pkgs.lib.mkOptionDefault (''
logging:
@@ -51,14 +50,29 @@ let
metrics.enabled: false
output.elasticsearch:
hosts: [ "127.0.0.1:9200" ]
${pkgs.lib.optionalString lt6 "template.enabled: false"}
'' + pkgs.lib.optionalString (!lt6) ''
journalbeat.inputs:
- paths: []
seek: cursor
'');
};
filebeat = {
enable = elk ? filebeat;
package = elk.filebeat;
inputs.journald.id = "everything";
inputs.log = {
enabled = true;
paths = [
"/var/lib/filebeat/test"
];
};
settings = {
logging.level = "info";
};
};
metricbeat = {
enable = true;
package = elk.metricbeat;
@@ -142,27 +156,43 @@ let
};
passthru.elkPackages = elk;
testScript = ''
testScript =
let
valueObject = lib.optionalString (lib.versionAtLeast elk.elasticsearch.version "7") ".value";
in ''
import json
def total_hits(message):
def expect_hits(message):
dictionary = {"query": {"match": {"message": message}}}
return (
"curl --silent --show-error '${esUrl}/_search' "
"curl --silent --show-error --fail-with-body '${esUrl}/_search' "
+ "-H 'Content-Type: application/json' "
+ "-d '{}' ".format(json.dumps(dictionary))
+ "| jq .hits.total"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
def expect_no_hits(message):
dictionary = {"query": {"match": {"message": message}}}
return (
"curl --silent --show-error --fail-with-body '${esUrl}/_search' "
+ "-H 'Content-Type: application/json' "
+ "-d '{}' ".format(json.dumps(dictionary))
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} == 0 end'"
)
def has_metricbeat():
dictionary = {"query": {"match": {"event.dataset": {"query": "system.cpu"}}}}
return (
"curl --silent --show-error '${esUrl}/_search' "
"curl --silent --show-error --fail-with-body '${esUrl}/_search' "
+ "-H 'Content-Type: application/json' "
+ "-d '{}' ".format(json.dumps(dictionary))
+ "| jq '.hits.total > 0'"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
@@ -178,7 +208,8 @@ let
# TODO: extend this test with multiple elasticsearch nodes
# and see if the status turns "green".
one.wait_until_succeeds(
"curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"
"curl --silent --show-error --fail-with-body '${esUrl}/_cluster/health'"
+ " | jq -es 'if . == [] then null else .[] | .status != \"red\" end'"
)
with subtest("Perform some simple logstash tests"):
@@ -189,33 +220,50 @@ let
with subtest("Kibana is healthy"):
one.wait_for_unit("kibana.service")
one.wait_until_succeeds(
"curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"
"curl --silent --show-error --fail-with-body 'http://localhost:5601/api/status'"
+ " | jq -es 'if . == [] then null else .[] | .status.overall.state == \"green\" end'"
)
with subtest("Metricbeat is running"):
one.wait_for_unit("metricbeat.service")
with subtest("Metricbeat metrics arrive in elasticsearch"):
one.wait_until_succeeds(has_metricbeat() + " | tee /dev/console | grep 'true'")
one.wait_until_succeeds(has_metricbeat())
with subtest("Logstash messages arive in elasticsearch"):
one.wait_until_succeeds(total_hits("flowers") + " | grep -v 0")
one.wait_until_succeeds(total_hits("dragons") + " | grep 0")
one.wait_until_succeeds(expect_hits("flowers"))
one.wait_until_succeeds(expect_no_hits("dragons"))
'' + lib.optionalString (elk ? journalbeat) ''
with subtest(
"A message logged to the journal is ingested by elasticsearch via journalbeat"
):
one.wait_for_unit("journalbeat.service")
one.execute("echo 'Supercalifragilisticexpialidocious' | systemd-cat")
one.wait_until_succeeds(
total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0"
expect_hits("Supercalifragilisticexpialidocious")
)
'' + lib.optionalString (elk ? filebeat) ''
with subtest(
"A message logged to the journal is ingested by elasticsearch via filebeat"
):
one.wait_for_unit("filebeat.service")
one.execute("echo 'Superdupercalifragilisticexpialidocious' | systemd-cat")
one.wait_until_succeeds(
expect_hits("Superdupercalifragilisticexpialidocious")
)
one.execute(
"echo 'SuperdupercalifragilisticexpialidociousIndeed' >> /var/lib/filebeat/test"
)
one.wait_until_succeeds(
expect_hits("SuperdupercalifragilisticexpialidociousIndeed")
)
'' + ''
with subtest("Elasticsearch-curator works"):
one.systemctl("stop logstash")
one.systemctl("start elasticsearch-curator")
one.wait_until_succeeds(
'! curl --silent --show-error "${esUrl}/_cat/indices" | grep logstash | grep ^'
'! curl --silent --show-error --fail-with-body "${esUrl}/_cat/indices" | grep logstash | grep ^'
)
'';
}) { inherit pkgs system; };
@@ -235,7 +283,7 @@ in {
# elasticsearch = pkgs.elasticsearch7-oss;
# logstash = pkgs.logstash7-oss;
# kibana = pkgs.kibana7-oss;
# journalbeat = pkgs.journalbeat7;
# filebeat = pkgs.filebeat7;
# metricbeat = pkgs.metricbeat7;
# };
unfree = lib.dontRecurseIntoAttrs {
@@ -250,7 +298,7 @@ in {
elasticsearch = pkgs.elasticsearch7;
logstash = pkgs.logstash7;
kibana = pkgs.kibana7;
journalbeat = pkgs.journalbeat7;
filebeat = pkgs.filebeat7;
metricbeat = pkgs.metricbeat7;
};
};

2
nixos/tests/kubernetes/default.nix
View File

@@ -1,5 +1,5 @@
{ system ? builtins.currentSystem
, pkgs ? import <nixpkgs> { inherit system; }
, pkgs ? import ../../.. { inherit system; }
}:
let
dns = import ./dns.nix { inherit system pkgs; };

2
nixos/tests/kubernetes/dns.nix
View File

@@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let
domain = "my.zyx";

2
nixos/tests/kubernetes/e2e.nix
View File

@@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let
domain = "my.zyx";

2
nixos/tests/kubernetes/rbac.nix
View File

@@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let

27
nixos/tests/parsedmarc/default.nix
View File

@@ -4,6 +4,7 @@
{ pkgs, ... }@args:
let
inherit (import ../../lib/testing-python.nix args) makeTest;
inherit (pkgs) lib;
dmarcTestReport = builtins.fetchurl {
name = "dmarc-test-report";
@@ -54,7 +55,7 @@ in
localMail = makeTest
{
name = "parsedmarc-local-mail";
meta = with pkgs.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ talyz ];
};
@@ -83,7 +84,7 @@ in
};
};
services.elasticsearch.package = pkgs.elasticsearch7-oss;
services.elasticsearch.package = pkgs.elasticsearch-oss;
environment.systemPackages = [
(sendEmail "dmarc@localhost")
@@ -94,6 +95,7 @@ in
testScript = { nodes }:
let
esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
in ''
parsedmarc.start()
parsedmarc.wait_for_unit("postfix.service")
@@ -104,11 +106,15 @@ in
)
parsedmarc.fail(
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'"
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
parsedmarc.succeed("send-email")
parsedmarc.wait_until_succeeds(
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'"
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
'';
};
@@ -121,7 +127,7 @@ in
in
makeTest {
name = "parsedmarc-external-mail";
meta = with pkgs.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ talyz ];
};
@@ -153,7 +159,7 @@ in
};
};
services.elasticsearch.package = pkgs.elasticsearch7-oss;
services.elasticsearch.package = pkgs.elasticsearch-oss;
environment.systemPackages = [
pkgs.jq
@@ -201,6 +207,7 @@ in
testScript = { nodes }:
let
esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;
valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
in ''
mail.start()
mail.wait_for_unit("postfix.service")
@@ -213,11 +220,15 @@ in
)
parsedmarc.fail(
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'"
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
mail.succeed("send-email")
parsedmarc.wait_until_succeeds(
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'"
"curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940"
+ " | tee /dev/console"
+ " | jq -es 'if . == [] then null else .[] | .hits.total${valueObject} > 0 end'"
)
'';
};

8
nixos/tests/snapcast.nix
View File

@@ -40,6 +40,7 @@ in {
};
};
};
environment.systemPackages = [ pkgs.snapcast ];
};
client = {
environment.systemPackages = [ pkgs.snapcast ];
@@ -71,6 +72,13 @@ in {
"curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
)
with subtest("test a ipv6 connection"):
server.execute("systemd-run --unit=snapcast-local-client snapclient -h ::1 -p ${toString port}")
server.wait_until_succeeds(
"journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
)
server.wait_until_succeeds("journalctl -o cat -u snapcast-local-client | grep -q 'buffer: ${toString bufferSize}'")
with subtest("test a connection"):
client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")
server.wait_until_succeeds(

4
pkgs/applications/audio/fomp/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, lv2, pkg-config, python2, wafHook }:
{ lib, stdenv, fetchurl, lv2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "fomp";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [ lv2 python2 ];
buildInputs = [ lv2 python3 ];
meta = with lib; {
homepage = "http://drobilla.net/software/fomp/";

14
pkgs/applications/audio/non/default.nix
View File

@@ -1,20 +1,20 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, python2, cairo, libjpeg, ntk, libjack2
{ lib, stdenv, fetchFromGitHub, pkg-config, python3, cairo, libjpeg, ntk, libjack2
, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook
}:
stdenv.mkDerivation {
pname = "non";
version = "2018-02-15";
version = "unstable-2021-01-28";
src = fetchFromGitHub {
owner = "original-male";
owner = "linuxaudio";
repo = "non";
rev = "5ae43bb27c42387052a73e5ffc5d33efb9d946a9";
sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
rev = "cdad26211b301d2fad55a26812169ab905b85bbb";
sha256 = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4=";
};
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
ladspaH liblo libsigcxx lrdf
buildInputs = [ python3 cairo libjpeg ntk libjack2 libsndfile
ladspaH liblo libsigcxx lrdf
];
meta = {

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.35.2";
version = "2.36.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-VJr1H6YcPtCzm6FeFA+rNANvYUQ3wZQalI9RdSv68cI=";
hash = "sha256-cZwKL5G7CmQBw2x0wPYHZCiAABxPatvfIcOAf0d2+Dg=";
};
appimageContents = appimageTools.extractType2 {

51
pkgs/applications/editors/code-browser/default.nix
View File

@@ -1,46 +1,57 @@
{ lib, stdenv
, fetchurl
, copper
, ruby
, python3
, qtbase
, gtk3
, pkg-config
, withQt ? false
, withGtk ? false, wrapQtAppsHook ? null
, withQt ? false, qtbase ? null, wrapQtAppsHook ? null
, withGtk2 ? false, gtk2
, withGtk3 ? false, gtk3
, mkDerivation ? stdenv.mkDerivation
}:
stdenv.mkDerivation rec {
let onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs);
in assert onlyOneEnabled [ withQt withGtk2 withGtk3 ];
mkDerivation rec {
pname = "code-browser";
version = "7.1.20";
version = "8.0";
src = fetchurl {
url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz";
sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY=";
};
postPatch = ''
substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
patchShebangs .
'';
''
+ lib.optionalString withQt ''
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt"
''
+ lib.optionalString withGtk2 ''
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2"
''
+ lib.optionalString withGtk3 ''
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk"
''
;
nativeBuildInputs = [ copper
python3
ruby
qtbase
gtk3
pkg-config
]
++ lib.optionals withQt [ wrapQtAppsHook ];
++ lib.optionals withGtk2 [ gtk2 ]
++ lib.optionals withGtk3 [ gtk3 ]
++ lib.optionals withQt [ qtbase wrapQtAppsHook ];
buildInputs = lib.optionals withQt [ qtbase ]
++ lib.optionals withGtk [ gtk3 ];
++ lib.optionals withGtk2 [ gtk2 ]
++ lib.optionals withGtk3 [ gtk3 ];
makeFlags = [
"prefix=$(out)"
"COPPER=${copper}/bin/copper-elf64"
"with-local-libs"
"QINC=${qtbase.dev}/include"
]
++ lib.optionals withQt [ "UI=qt" ]
++ lib.optionals withGtk [ "UI=gtk" ];
dontWrapQtApps = true;
++ lib.optionals withQt [ "QINC=${qtbase.dev}/include"
"UI=qt"
]
++ lib.optionals withGtk2 [ "UI=gtk2" ]
++ lib.optionals withGtk3 [ "UI=gtk" ];
meta = with lib; {
description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";

3
pkgs/applications/editors/jetbrains/common.nix
View File

@@ -3,7 +3,7 @@
, vmopts ? null
}:
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args:
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args:
with lib;
@@ -81,6 +81,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
stdenv.cc.cc.lib libsecret e2fsprogs
libnotify
] ++ extraLdPath)}" \
${lib.concatStringsSep " " extraWrapperArgs} \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \

5
pkgs/applications/editors/jetbrains/default.nix
View File

@@ -1,6 +1,7 @@
{ lib, stdenv, callPackage, fetchurl
, jdk, cmake, zlib, python3
, dotnet-sdk_5
, maven
, autoPatchelfHook
, libdbusmenu
, vmopts ? null
@@ -98,6 +99,10 @@ let
inherit name version src wmClass jdk;
product = "IDEA";
extraLdPath = [ zlib ];
extraWrapperArgs = [
''--set M2_HOME "${maven}/maven"''
''--set M2 "${maven}/maven/bin"''
];
meta = with lib; {
homepage = "https://www.jetbrains.com/idea/";
inherit description license;

17
pkgs/applications/editors/standardnotes/default.nix
View File

@@ -2,19 +2,20 @@
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
let
version = "3.8.18";
version = "3.9.5";
pname = "standardnotes";
name = "${pname}-${version}";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
plat = {
i386-linux = "i386";
i686-linux = "i386";
x86_64-linux = "x86_64";
}.${stdenv.hostPlatform.system};
}.${stdenv.hostPlatform.system} or throwSystem;
sha256 = {
i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7";
x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r";
}.${stdenv.hostPlatform.system};
i686-linux = "sha256-7Mo8ELFV6roZ3IYWBtB2rRDAzJrq4ht9f1v6uohsauw=";
x86_64-linux = "sha256-9VPYII9E8E3yL7UuU0+GmaK3qxWX4bwfACDl7F7sngo=";
}.${stdenv.hostPlatform.system} or throwSystem;
src = fetchurl {
url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-linux-${plat}.AppImage";
@@ -60,7 +61,7 @@ in appimageTools.wrapType2 rec {
'';
homepage = "https://standardnotes.org";
license = licenses.agpl3;
maintainers = with maintainers; [ mgregoire ];
platforms = [ "i386-linux" "x86_64-linux" ];
maintainers = with maintainers; [ mgregoire chuangzhu ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

3
pkgs/applications/graphics/darktable/default.nix
View File

@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.isDarwin gtk-mac-integration
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
# VC5Decompressor.cpp:718:55: error: 'value' is unavailable: introduced in macOS 10.13
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
cmakeFlags = [
"-DBUILD_USERMANUAL=False"
] ++ lib.optionals stdenv.isDarwin [

31
pkgs/applications/graphics/icon-library/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ lib, stdenv, fetchurl, wrapGAppsHook
, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc
, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy
}:
stdenv.mkDerivation rec {
pname = "icon-library";
version = "0.0.8";
src = fetchurl {
url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz";
sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96";
};
nativeBuildInputs = [
cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook
];
buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ];
postPatch = ''
patchShebangs build-aux/meson_post_install.py
'';
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/design/icon-library";
description = "Symbolic icons for your apps";
maintainers = with maintainers; [ qyliss ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}

4
pkgs/applications/graphics/megapixels/default.nix
View File

@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "megapixels";
rev = version;
sha256 = "sha256-ebeKbAo03+jeMveySSIz36gbwslWVMRLj+/adW8rlEQ=";
hash = "sha256-UHJ3Fayf+lS3nRuuhHHLN6mbHfHIPssWkghPMPF5ECg=";
};
nativeBuildInputs = [

31
pkgs/applications/graphics/symbolic-preview/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ lib, stdenv, fetchurl, wrapGAppsHook
, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc
, gdk-pixbuf, glib, gtk3, libhandy, libxml2
}:
stdenv.mkDerivation rec {
pname = "symbolic-preview";
version = "0.0.2";
src = fetchurl {
url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/91fd27bb70553c8d6c3ad2a35446ff6e/symbolic-preview-${version}.tar.xz";
sha256 = "1v8l10ppwbjkrq7nvb0wqc3pid6pd8dqpki3jhmjjkmbd7rpdpkq";
};
nativeBuildInputs = [
cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook
];
buildInputs = [ gdk-pixbuf glib gtk3 libhandy libxml2 ];
postPatch = ''
patchShebangs build-aux/meson_post_install.py
'';
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/design/symbolic-preview";
description = "Symbolics made easy";
maintainers = with maintainers; [ qyliss ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}

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

@@ -53,11 +53,11 @@ with py.pkgs;
buildPythonApplication rec {
pname = "archivy";
version = "1.4.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0=";
sha256 = "sha256-nwpH3V6hkPC8G3df+0hTZqvIbvT1Z796uOI/iKnXS1w=";
};
# Relax some dependencies

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

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "skate";
version = "0.1.0";
version = "0.1.2";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "skate";
rev = "v${version}";
sha256 = "01brxckjz8vlgaq9917l45xf48078d4465qn9l0lyll6hic6p06c";
sha256 = "sha256-Z+7unYmwPLOhJAMAhMwjapAmslTNxmP01myjgEOBfu8=";
};
vendorSha256 = "0mvx4rzs0mvb1dyxj105mh2awfy0bmp716x7hpfdwhwz3p11fc7k";
vendorSha256 = "sha256-CdYyiUiy2q2boEHjdXkgRzVI+6fEb+fBrlInl6IrFjk=";
doCheck = false;

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
version = "4.9.0";
version = "4.10.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-l9kWYswQ27erxmZIb+otPzeKFZNwP+d8QIqGuvMMM/k=";
sha256 = "sha256-BK6Soh2hJYMunw/bXZFh+05c+iYig2L7lLFEqs6lyxk=";
};
buildInputs = [ libX11 ];

1
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@@ -17,6 +17,7 @@ mkChromiumDerivation (base: rec {
installPhase = ''
mkdir -p "$libExecPath"
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/libvulkan.so.1" "$libExecPath/"
cp -v "$buildPath/vk_swiftshader_icd.json" "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"

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

@@ -18,9 +18,9 @@
}
},
"beta": {
"version": "97.0.4692.45",
"sha256": "1x55hys3340inrwwp4lzw5vq3vrg56288m746d4p2ligvsy19byp",
"sha256bin64": "1jyhq27fb4pzbxlg0ssfz66hza9g8cbsqyx70ydkjqs9sf4yqqcw",
"version": "97.0.4692.56",
"sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf",
"sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g",
"deps": {
"gn": {
"version": "2021-11-03",
@@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "96.0.4664.93",
"sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw",
"sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb",
"version": "96.0.4664.110",
"sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
"sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
"deps": {
"gn": {
"version": "2021-09-24",
@@ -55,8 +55,8 @@
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
},
"ungoogled-patches": {
"rev": "96.0.4664.93-1",
"sha256": "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r"
"rev": "96.0.4664.110-1",
"sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
}
}
}

8
pkgs/applications/networking/cluster/argocd/default.nix
View File

@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "argocd";
version = "2.1.7";
commit = "a408e299ffa743213df3aa9135bf7945644ec936";
version = "2.2.0";
commit = "6da92a8e8103ce4145bb0fe2b7e952be79c9ff0a";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-c6WUqD7x8/P+W64fWs4cw1RiUFepevIJCPpWSzNfIMc=";
sha256 = "sha256-6D7aSisFxiGhBvnp4FDN1MHbO1yL4a1SWq1ri8nO7Cw=";
};
vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc=";
vendorSha256 = "sha256-GeU8uQM+oMottzYsE6oQyKZL3aWB5vQgTDLQiuQdapw=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];

6
pkgs/applications/networking/cluster/kn/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
version = "0.27.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "v${version}";
sha256 = "sha256-nuSx+JKXBgkVwuy6RMZc8pxDv5WjXN3+5pIudazTttc=";
rev = "knative-v${version}";
sha256 = "sha256-lRQ4IXV+q1idoTyhppJGlzjuUuRykP8DtQ3t/CsxhNw=";
};
vendorSha256 = null;

6
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -380,10 +380,10 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.18.2",
"sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7",
"rev": "v4.19.0",
"sha256": "17xpkcrklzbim91rxw4g4n8izk9qiw9q0vfivr467i32dv5mzc2d",
"vendorSha256": null,
"version": "4.18.2"
"version": "4.19.0"
},
"gitlab": {
"owner": "gitlabhq",

4
pkgs/applications/networking/cluster/terraform/default.nix
View File

@@ -197,8 +197,8 @@ rec {
};
terraform_1 = mkTerraform {
version = "1.1.0";
sha256 = "sha256-nnYMoQitqFbOjI8twDh9hWDb1qxMNNVy6wldxkyDKY0=";
version = "1.1.1";
sha256 = "sha256-JHwHxFpAUVnm9QlfSYrBELrgct0RkjS7OQb6gKEAsCA=";
vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.25.1"; # Please backport all updates to the stable channel.
version = "5.26.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l";
sha256 = "1l61m976x2pha3bvlcjppkgwn6b8ws1nqfa9zk7xwq4c5qz9mpj2";
};
nativeBuildInputs = [

4
pkgs/applications/networking/ipfs/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs";
version = "0.10.0";
version = "0.11.0";
rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
sha256 = "sha256-okfIxNoFoJZx1WCWe/6NcYhwU+ZzOyn01g8BGtXO3UQ=";
sha256 = "lTPGnFqDgyMWmSCPmLHguGNnJQMWi9LPrOZfDgeS9Y4=";
};
# tarball contains multiple files/directories

6
pkgs/applications/radio/gqrx/default.nix
View File

@@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport);
gnuradio3_8Minimal.pkgs.mkDerivation rec {
pname = "gqrx";
version = "2.14.6";
version = "2.15";
src = fetchFromGitHub {
owner = "csete";
owner = "gqrx-sdr";
repo = "gqrx";
rev = "v${version}";
sha256 = "sha256-DMmQXcGPudAVOwuc+LVrcIzfwMMQVBZPbM6Bt1w56D8=";
sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak=";
};
nativeBuildInputs = [

3
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View File

@@ -41,6 +41,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = lib.optional enableMpi mpi;
propagatedUserEnvPkgs = lib.optional enableMpi mpi;
# error: 'value' is unavailable: introduced in macOS 10.13
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
cmakeFlags = [
"-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
"-DGMX_OPENMP:BOOL=TRUE"

29
pkgs/applications/science/programming/scyther/cli.nix
View File

@@ -1,29 +0,0 @@
{ stdenv, glibc, flex, bison, cmake
, version, src, meta }:
stdenv.mkDerivation {
pname = "scyther-cli";
inherit version;
inherit src meta;
nativeBuildInputs = [ cmake flex bison ];
buildInputs = [ glibc.static ];
patchPhase = ''
# Since we're not in a git dir, the normal command this project uses to create this file wouldn't work
printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h
'';
configurePhase = ''
(cd src && cmakeConfigurePhase)
'';
dontUseCmakeBuildDir = true;
cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ];
installPhase = ''
mkdir -p "$out/bin"
mv src/scyther-linux "$out/bin/scyther-cli"
ln -s "$out/bin/scyther-cli" "$out/bin/scyther-linux"
'';
}

80
pkgs/applications/science/programming/scyther/default.nix
View File

@@ -1,80 +0,0 @@
{ stdenv, lib, buildEnv, pkgsi686Linux, fetchFromGitHub, python27Packages, graphviz
, includeGUI ? true
, includeProtocols ? true
}:
let
version = "1.1.3";
src = fetchFromGitHub {
rev = "v${version}";
sha256 = "0rb4ha5bnjxnwj4f3hciq7kyj96fhw14hqbwl5kr9cdw8q62mx0h";
owner = "cascremers";
repo = "scyther";
};
meta = with lib; {
description = "A tool for the automatic verification of security protocols";
homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/";
license = licenses.gpl2;
maintainers = with maintainers; [ infinisil ];
platforms = platforms.linux;
};
cli = pkgsi686Linux.callPackage ./cli.nix {
inherit version src meta;
};
gui = stdenv.mkDerivation {
pname = "scyther-gui";
inherit version;
inherit src meta;
buildInputs = [
python27Packages.wrapPython
];
patchPhase = ''
file=gui/Scyther/Scyther.py
# By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is
substituteInPlace $file --replace "return getMyDir()" "return \"${cli}/bin\""
# Removes the Shebang from the file, as this would be wrapped wrongly
sed -i -e "1d" $file
'';
dontBuild = true;
propagatedBuildInputs = [
python27Packages.wxPython
graphviz
];
installPhase = ''
mkdir -p "$out"/gui "$out"/bin
cp -r gui/* "$out"/gui
ln -s "$out"/gui/scyther-gui.py "$out/bin/scyther-gui"
'';
postFixup = ''
wrapPythonProgramsIn "$out/gui" "$out $pythonPath"
'';
doInstallCheck = true;
installCheckPhase = ''
"$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl"
'';
};
in
buildEnv {
name = "scyther-${version}";
inherit meta;
paths = [ cli ] ++ lib.optional includeGUI gui;
pathsToLink = [ "/bin" ];
postBuild = ''
rm "$out/bin/scyther-linux"
'' + lib.optionalString includeProtocols ''
mkdir -p "$out/protocols"
cp -rv ${src}/protocols/* "$out/protocols"
'';
}

6
pkgs/applications/version-management/git-and-tools/delta/default.nix
View File

@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-GboG7Ia27CTisY0YCFiAhzoCMxMAXlCeAPll19+JoxM=";
sha256 = "sha256-qpoXUzXRcsUi1WHZAYGgnEaNxBYEQAdkXAz7YPiPae8=";
};
cargoSha256 = "sha256-JEIMZFDEWaKXfe4OzaAxMop0XYQAcz8L7hcTBD8DJio=";
cargoSha256 = "sha256-eds2W47+lOwO/HHKR+IjXOJOD8p1OYkk5qilDYTOUyk=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/version-management/git-and-tools/glitter/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
version = "1.5.10";
version = "1.5.11";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4d1zMCQ4rYU5kL7Qhwibt6+IfKHUjYndHHeX7JT9zwU=";
sha256 = "sha256-WAQ4DwPKkATLa52GE5LZRVY0YH4nRStjPuQg7kdXRjw=";
};
cargoSha256 = "sha256-eaSQGbsvAas7CLMtgSNWCqdrYU5Kc/0GY10rkNK05Uo=";
cargoSha256 = "sha256-UK3gUAs+FalqboK7MuhE9kOc/Smu/EAN0BYbgg4PWns=";
# tests require it to be in a git repository
preCheck = ''

6
pkgs/applications/virtualization/lima/default.nix
View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.7.4";
version = "0.8.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pn8GtFAZMQyFjOpn6blNBoDgQL7X1gaYjGsQHwvMzaQ=";
sha256 = "sha256-bO7o3z9E7mGiUtlqI+mhhh+D6CG9j3BZ7IB8o/LDUPM=";
};
vendorSha256 = "sha256-egZFJSGnFYfOcBMNNEsPV6ngf3ddoYCSntnuloYfpxo=";
vendorSha256 = "sha256-MDmRkGa1m3YuUbffCwoChG0Fg74jyuQQ6ljfDlLatjI=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/data/documentation/s6-man-pages/default.nix
View File

@@ -2,8 +2,8 @@
buildManPages {
pname = "s6-man-pages";
version = "2.11.0.0.2";
sha256 = "1ddab4l4wwrg2jdcrdqp1rx8dzbzbdsvx4mzayraxva4q97d1g9r";
version = "2.11.0.0.5";
sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6";
description = "Port of the documentation for the s6 supervision suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
}

6
pkgs/data/misc/v2ray-geoip/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202112090029";
version = "202112160030";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "97f4acb31d926ae31bb3cdc5c8948d8dcdddca79";
sha256 = "sha256-kYMp/D7xVpBTu35YXq45bR2XebpVOW57UAc7H/6px/U=";
rev = "4d86284b91a444c2ca989207f8f08a1c8798c95c";
sha256 = "sha256-pv+oZVMROr7gyGcv60jIP8INt4vBAnUJT0FJNNn+Czc=";
};
installPhase = ''

5
pkgs/development/compilers/copper/default.nix
View File

@@ -4,16 +4,15 @@
}:
stdenv.mkDerivation rec {
pname = "copper";
version = "4.4";
version = "4.6";
src = fetchurl {
url = "https://tibleiz.net/download/copper-${version}-src.tar.gz";
sha256 = "1nf0bw143rjhd019yms3k6k531rahl8anidwh6bif0gm7cngfwfw";
sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg=";
};
buildInputs = [
libffi
];
postPatch = ''
substituteInPlace Makefile --replace "-s scripts/" "scripts/"
patchShebangs .
'';
buildPhase = ''

2
pkgs/development/compilers/idris2/default.nix
View File

@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
--suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
--suffix IDRIS2_DATA ':' "$out/${name}/support" \
--suffix IDRIS2_PATH ':' "${additionalIdris2Paths}" \
--suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
--suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} ':' "$out/${name}/lib"
'';
meta = {

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

@@ -5,6 +5,8 @@ with lib; mkCoqDerivation {
pname = "category-theory";
owner = "jwiegley";
release."20211213".rev = "449e30e929d56f6f90c22af2c91ffcc4d79837be";
release."20211213".sha256 = "sha256:0vgfmph5l1zn6j4b851rcm43s8y9r83swsz07rpzhmfg34pk0nl0";
release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af";
release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f";
release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119";
@@ -14,7 +16,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "20210730"; }
{ case = range "8.10" "8.14"; out = "20211213"; }
{ case = range "8.8" "8.9"; out = "20190414"; }
{ case = range "8.6" "8.7"; out = "20180709"; }
] null;

24
pkgs/development/embedded/platformio/core.nix
View File

@@ -9,6 +9,16 @@
let
python = python3.override {
packageOverrides = self: super: {
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
version = "0.8.0";
src = fetchFromGitHub {
owner = "Tinche";
repo = "aiofiles";
rev = "v${version}";
sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap";
};
});
asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec {
version = "3.4.1";
src = fetchFromGitHub {
@@ -41,22 +51,12 @@ let
});
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "encode";
repo = "uvicorn";
rev = version;
sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
};
});
zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec {
version = "0.36.13";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c=";
sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s";
};
});
};

4
pkgs/development/embedded/platformio/default.nix
View File

@@ -4,14 +4,14 @@
let
callPackage = newScope self;
version = "5.2.3";
version = "5.2.4";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
sha256 = "0wbmwawn25srkyrd6hwrgli1himzsj08vbm76fgnpqdc84n78ckl";
sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9";
};
self = {

2
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
View File

@@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
- version = "3.14"
- version = "3.15"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version

1
pkgs/development/interpreters/php/generic.nix
View File

@@ -212,6 +212,7 @@ let
;
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
SKIP_PERF_SENSITIVE = 1;
configureFlags =
# Disable all extensions

6
pkgs/development/libraries/fcft/default.nix
View File

@@ -20,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "fcft";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
sha256 = "0agqldh68hn898d3f6k99kjbz8had5j5k0jyvi71d4k9vhx8cy7c";
sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2";
};
depsBuildBuild = [ pkg-config ];
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
doCheck = true;
outputs = [ "out" "doc" "man" ];
passthru.tests = {
noShaping = fcft.override { withShapingTypes = []; };
onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; };

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

@@ -53,7 +53,7 @@ in {
};
libtoxcore_0_2 = generic {
version = "0.2.12";
sha256 = "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp";
version = "0.2.13";
sha256 = "0a1cp00bnxl3q4l74yqp4aa6fg9slz4rg4lfzkl3khvmm6nzckds";
};
}

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spglib";
version = "1.16.2";
version = "1.16.3";
src = fetchFromGitHub {
owner = "atztogo";
repo = "spglib";
rev = "v${version}";
sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/tdlib/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tdlib";
version = "1.7.9";
version = "1.7.10";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
# https://github.com/tdlib/td/issues/1718
rev = "7d41d9eaa58a6e0927806283252dc9e74eda5512";
sha256 = "09b7srbfqi4gmg5pdi398pr0pxihw4d3cw85ycky54g862idzqs8";
# https://github.com/tdlib/td/issues/1790
rev = "a53cb30e99f937cfd64e0266fa558785a184a553";
sha256 = "FX+66JRsigauLq2JLx0InWiedGeQJ9+ox+D/Bqik9ik=";
};
buildInputs = [ gperf openssl readline zlib ];

3
pkgs/development/libraries/zxing-cpp/default.nix
View File

@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
pkg-config
];
# error: 'path' is unavailable: introduced in macOS 10.15
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
];

4
pkgs/development/ocaml-modules/mdx/default.nix
View File

@@ -5,12 +5,12 @@
buildDunePackage rec {
pname = "mdx";
version = "1.11.0";
version = "1.11.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx";
sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0";
};
nativeBuildInputs = [ cppo ];

6
pkgs/development/ocaml-modules/yaml/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, ocaml
, dune-configurator
, bos, ctypes, fmt, logs, rresult
, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
@@ -17,7 +17,9 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ bos ctypes rresult ];
checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];
# crowbar is not available for OCaml < 4.08
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
meta = {
description = "Parse and generate YAML 1.1 files";

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

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "aiohue";
version = "3.0.3";
version = "3.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ajDwA8zFBQdFeI3oUBBWQZA13PNust21BWxrsB7PcTQ=";
sha256 = "sha256-qOtfr6rrV+E/vdY3AprJ5G7p+VzYDVk1aq9/F0O0mLE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-nest-sdm/default.nix
View File

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "0.4.6";
version = "0.4.8";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
sha256 = "sha256-oMYCBmqDTPcGHwP3LFYX3CdbHw2hg41EQQv8iiv+ljE=";
sha256 = "sha256-HHjCML/55jthqZ5WjNNsldr+8nul8bd8N9aNAoe/iBw=";
};
propagatedBuildInputs = [

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

@@ -57,6 +57,18 @@ buildPythonPackage rec {
--replace 'pytest_ordering' 'pytest_order'
substituteInPlace test/functional/test_miscellaneous.py \
--replace '@pytest.mark.last' '@pytest.mark.order("last")'
# Until a proper fix is created, just skip these tests
# and ignore any breakage that may result from the API change in IPFS
# See https://github.com/ipfs-shipyard/py-ipfs-http-client/issues/308
substituteInPlace test/functional/test_pubsub.py \
--replace '# the message that will be published' 'pytest.skip("This test fails because of an incompatibility with the experimental PubSub feature in IPFS>=0.11.0")' \
--replace '# subscribe to the topic testing' 'pytest.skip("This test fails because of an incompatibility with the experimental PubSub feature in IPFS>=0.11.0")'
substituteInPlace test/functional/test_other.py \
--replace 'import ipfshttpclient' 'import ipfshttpclient; import pytest' \
--replace 'assert ipfs_is_available' 'pytest.skip("Unknown test failure with IPFS >=0.11.0"); assert ipfs_is_available'
substituteInPlace test/run-tests.py \
--replace '--cov-fail-under=90' '--cov-fail-under=75'
'';
checkPhase = ''

6
pkgs/development/python-modules/matplotlib/default.nix
View File

@@ -87,11 +87,7 @@ buildPythonPackage rec {
};
};
setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config);
preBuild = ''
cp "$setup_cfg" ./setup.cfg
'';
MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config);
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
# corresponding interpreter object for its library paths. This fails if

7
pkgs/development/python-modules/pdftotext/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, poppler }:
{ lib, buildPythonPackage, fetchPypi, poppler }:
buildPythonPackage rec {
pname = "pdftotext";
@@ -9,11 +9,6 @@ buildPythonPackage rec {
sha256 = "2a9aa89bc62022408781b39d188fabf5a3ad1103b6630f32c4e27e395f7966ee";
};
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py \
--replace '= brew_poppler_include()' '= "${lib.getDev poppler}/include", "${lib.getLib poppler}/lib"'
'';
buildInputs = [ poppler ];
meta = with lib; {

6
pkgs/development/python-modules/pint/default.nix
View File

@@ -7,6 +7,7 @@
, packaging
# Check Inputs
, pytestCheckHook
, pytest-subtests
, numpy
, matplotlib
, uncertainties
@@ -19,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Pint";
sha256 = "8c4bce884c269051feb7abc69dbfd18403c0c764abc83da132e8a7222f8ba801";
sha256 = "sha256-jEvOiEwmkFH+t6vGnb/RhAPAx2SryD2hMuinIi+LqAE=";
};
disabled = pythonOlder "3.6";
@@ -32,6 +33,7 @@ buildPythonPackage rec {
# Test suite explicitly requires pytest
checkInputs = [
pytestCheckHook
pytest-subtests
numpy
matplotlib
uncertainties
@@ -42,7 +44,7 @@ buildPythonPackage rec {
description = "Physical quantities module";
license = licenses.bsd3;
homepage = "https://github.com/hgrecco/pint/";
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc doronbehar ];
};
}

30
pkgs/development/python-modules/protobuf/default.nix
View File

@@ -18,8 +18,6 @@ buildPythonPackage {
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];
propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];
@@ -41,32 +39,20 @@ buildPythonPackage {
cd python
'';
preConfigure = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
'';
setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")
"--cpp_implementation";
preBuild = ''
# Workaround for https://github.com/google/protobuf/issues/2895
${python.pythonForBuild.interpreter} setup.py build
'' + lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation
'';
installFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")
"--install-option='--cpp_implementation'";
# the _message.so isn't installed, so we'll do that manually.
# if someone can figure out a less hacky way to get the _message.so to
# install, please do replace this.
postInstall = lib.optionalString (lib.versionAtLeast protobuf.version "2.6.0") ''
cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
'';
pythonImportsCheck = [
"google.protobuf"
] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [
"google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked
];
meta = with lib; {
description = "Protocol Buffers are Google's data interchange format";
homepage = "https://developers.google.com/protocol-buffers/";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp ];
};
passthru.protobuf = protobuf;

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

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pykeyatome";
version = "1.1.2";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jugla";
repo = "pyKeyAtome";
rev = "V${version}";
sha256 = "sha256-5aKZaS+BFKR1ldAY3BlS/oqYGz1C+ZRkNL9ez/etWh4=";
sha256 = "173bf4nrj4jqp2119gfmbra7rhbr30bkjkd44rw9450nmpfmh7pk";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/pyscf/default.nix
View File

@@ -66,6 +66,7 @@ buildPythonPackage rec {
nosetests pyscf/ -v \
--exclude-dir=examples --exclude-dir=pyscf/pbc/grad \
--exclude-dir=pyscf/x2c \
--exclude-dir=pyscf/adc \
--exclude-dir=pyscf/pbc/tdscf \
-e test_bz \
-e h2o_vdz \
@@ -103,7 +104,7 @@ buildPythonPackage rec {
description = "Python-based simulations of chemistry framework";
homepage = "https://github.com/pyscf/pyscf";
license = licenses.asl20;
platforms = platforms.unix;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = [ maintainers.sheepforce ];
};
}

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

@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pysmappee";
version = "0.2.27";
version = "0.2.29";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "smappee";
repo = pname;
rev = version;
sha256 = "sha256-CzdkeC53ye+IMeGUiD1mK84h2ruC1/ZpjlDjuWMVoyQ=";
sha256 = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
};
propagatedBuildInputs = [

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

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pytest-httpserver";
version = "1.0.2";
version = "1.0.3";
src = fetchPypi {
pname = "pytest_httpserver";
inherit version;
sha256 = "sha256-JwH9HZgU1YVR+dEETbM1xrqYcxaTZsWDSVI6WM907UA=";
sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d";
};
propagatedBuildInputs = [ werkzeug ];

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

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "robotframework";
version = "4.1.2";
version = "4.1.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby";
sha256 = "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p";
};
checkInputs = [ jsonschema ];

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

@@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, cmake
@@ -23,6 +24,9 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ninja scikit-build ];
dontUseCmakeConfigure = true;
# error: 'value' is unavailable: introduced in macOS 10.13
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
pythonImportsCheck = [ "tweedledum" ];
checkInputs = [ pytestCheckHook ];

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.660";
version = "2.0.664";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-ebVOEtJTlYaj9sYJsJ8BBxx+2PSyzbwivQIph3slaho=";
sha256 = "sha256-t7u47gkUtn9EwBWtz97GkiM8tyGCFk4S5UTQ+OosI2o=";
};
nativeBuildInputs = with py.pkgs; [

7
pkgs/development/tools/build-managers/bazel/README.md Normal file
View File

@@ -0,0 +1,7 @@
# The Bazel build tool
https://bazel.build/
The bazel tool requires regular maintenance, especially under darwin, so we created a maintainers team.
Please ping @NixOS/bazel in your github PR/issue to increase your chance of a quick turnaround, thanks!

2
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
View File

@@ -22,7 +22,7 @@ buildGoModule rec {
homepage = "https://github.com/buchgr/bazel-remote";
description = "A remote HTTP/1.1 cache for Bazel";
license = licenses.asl20;
maintainers = [ maintainers.uri-canva ];
maintainers = lib.teams.bazel.members;
platforms = platforms.darwin ++ platforms.linux;
};
}

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

@@ -149,7 +149,7 @@ stdenv'.mkDerivation rec {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.mboes ];
maintainers = lib.teams.bazel.members;
inherit platforms;
};

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

@@ -150,7 +150,7 @@ stdenv'.mkDerivation rec {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.mboes ];
maintainers = lib.teams.bazel.members;
inherit platforms;
};

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

@@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.mboes ];
maintainers = lib.teams.bazel.members;
inherit platforms;
};

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

@@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
license = licenses.asl20;
maintainers = [ maintainers.mboes ];
maintainers = lib.teams.bazel.members;
inherit platforms;
};

4
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
View File

@@ -27,6 +27,8 @@ buildGoModule rec {
description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps";
homepage = "https://github.com/bazelbuild/buildtools";
license = licenses.asl20;
maintainers = with maintainers; [ elasticdog uri-canva marsam ];
maintainers = with maintainers;
[ elasticdog uri-canva marsam ]
++ lib.teams.bazel.members;
};
}

4
pkgs/development/tools/build-managers/gradle/default.nix
View File

@@ -96,9 +96,9 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_7 = gen {
version = "7.3.1";
version = "7.3.2";
nativeVersion = "0.22-milestone-21";
sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws";
sha256 = "14jk1mhk59flzml55alwi9r5picmf8657q1nhd5mygrnmj79zf13";
defaultJava = jdk17;
};

12
pkgs/development/tools/compass/Gemfile.lock
View File

@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
chunky_png (1.3.11)
chunky_png (1.4.0)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
@@ -14,10 +14,10 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
ffi (1.10.0)
multi_json (1.13.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (1.15.4)
multi_json (1.15.0)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
sass (3.4.25)
@@ -28,4 +28,4 @@ DEPENDENCIES
compass!
BUNDLED WITH
2.1.4
2.2.24

20
pkgs/development/tools/compass/gemset.nix
View File

@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "124najs9prqzrzk49h53kap992rmqxj0wni61z2hhsn7mwmgdp9d";
sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9";
type = "gem";
};
version = "1.3.11";
version = "1.4.0";
};
compass = {
dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"];
@@ -47,30 +47,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
type = "gem";
};
version = "1.10.0";
version = "1.15.4";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.13.1";
version = "1.15.0";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
type = "gem";
};
version = "0.10.3";
version = "0.11.0";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -78,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
type = "gem";
};
version = "0.10.0";
version = "0.10.1";
};
sass = {
groups = ["default"];

6
pkgs/development/tools/krankerl/default.nix
View File

@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "krankerl";
version = "0.13.2";
version = "0.13.3";
src = fetchFromGitHub {
owner = "ChristophWurst";
repo = "krankerl";
rev = "v${version}";
sha256 = "sha256-Kol39AtM5m6FC+s5SDbQhWuASkGbeXPlmSGb7axEuK8=";
sha256 = "sha256-/zRO+CVYQgx9/j14zgNm/ABzLprt0OYne+O6hOEjSEw=";
};
cargoSha256 = "sha256-bPcKe3vE3VIjLJ4iYdF3Gt0sID09gRpxG5TpTGWhnPs=";
cargoSha256 = "sha256-LWQRFgDxl2yxP+v1TUENaTGrA/udh84AJvWIkfTJezM=";
nativeBuildInputs = [
pkg-config

8
pkgs/development/tools/misc/kibana/6.x.nix
View File

@@ -18,12 +18,12 @@ let
shas =
if enableUnfree
then {
x86_64-linux = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3";
x86_64-darwin = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106";
x86_64-linux = "1a501lavxhckb3l93sbrbqyshicwkk6p89frry4x8p037xcfpy0x";
x86_64-darwin = "0zm45af30shhcg3mdhcma6rms1hyrx62rm5jzwnz9kxv4d30skbw";
}
else {
x86_64-linux = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf";
x86_64-darwin = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv";
x86_64-linux = "0wfdipf21apyily7mvlqgyc7m5jpr96zgrryzwa854z3xb2vw8zg";
x86_64-darwin = "1nklfx4yz6hsxlljvnvwjy7pncv9mzngl84710xad5jlyras3sdj";
};
in stdenv.mkDerivation rec {

10
pkgs/development/tools/misc/kibana/7.x.nix
View File

@@ -4,23 +4,23 @@
, stdenv
, makeWrapper
, fetchurl
, nodejs-14_x
, nodejs-16_x
, coreutils
, which
}:
with lib;
let
nodejs = nodejs-14_x;
nodejs = nodejs-16_x;
inherit (builtins) elemAt;
info = splitString "-" stdenv.hostPlatform.system;
arch = elemAt info 0;
plat = elemAt info 1;
shas =
{
x86_64-linux = "19p9s4sir982bb1zcldrbphhwfs9i11p0q28vgc421iqg10kjlf1";
x86_64-darwin = "0qq557ngwwakifidyrccga4cadj9k9pzhjwy4msmbcgf5pb86qyc";
aarch64-linux = "183cp1h8d3n7xfcpcys4hf36palczxa409afyp62kzyzckngy0j8";
x86_64-linux = "0jivwsrq31n0qfznrsjfsn65sg3wpbd990afn2wzjnj4drq7plz6";
x86_64-darwin = "02483aqzrccq1x6rwznmcazijdd46yxj9vnbihnvp2xyp3w9as45";
aarch64-linux = "0iw155gkkl1hshc80lfj95rssg039ig21wz1l3srmmf2x4f934s9";
};
in stdenv.mkDerivation rec {

4
pkgs/development/tools/mold/default.nix
View File

@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "0.9.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
sha256 = "0mj258fy8l4i23jd6ail0xrrq3das7lmrf1brrr1591ahx4vjj14";
sha256 = "sha256-89Dh4qly70Jzyo/KPlRte58hbN5HNnzZpi32tFd8fXU=";
};
buildInputs = [ zlib openssl ];

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

@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "69921685a7688361626600543a2beaf82b67a64d",
"date": "2021-11-03T12:36:17+00:00",
"path": "/nix/store/f4rd6avwf2flqr9yv0dvy9288qrgn2bs-tree-sitter-c-sharp",
"sha256": "18yzr0yvkbp5wf2slcfn04fc23jn0ray72ica0jyv92jkp5pxc03",
"rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982",
"date": "2021-12-09T21:13:54+00:00",
"path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp",
"sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
"rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3",
"date": "2021-10-04T13:10:27-04:00",
"path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go",
"sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl",
"rev": "1203c11e422c73350e672445c5c32b8c0f79266d",
"date": "2021-12-03T14:22:11-08:00",
"path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go",
"sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
"rev": "83ee5993560bf15854c69b77d92e34456f8fb655",
"date": "2021-07-21T20:36:40-05:00",
"path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix",
"sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr",
"rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
"date": "2021-11-29T00:27:21-06:00",
"path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
"sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
"rev": "995d7e0be4dc2a9655d2285405c0ef3fededf63c",
"date": "2021-11-05T21:28:42+01:00",
"path": "/nix/store/1l5dq21x6sln1gvixf20gx3pkadjad4d-tree-sitter-norg",
"sha256": "181y8p91hl5j7mrff0pmnx91d9vr24nvklgx12qvc0297vdp8c5v",
"rev": "665736e400cfd52ae92ead244ca9f5d44db98151",
"date": "2021-12-14T15:04:57+01:00",
"path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg",
"sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

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

@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "435fa00006c0d1515c37fbb4dd6a9de284af75ab",
"date": "2021-10-17T09:05:36+02:00",
"path": "/nix/store/0vgi25jrbc6fks97sxkya80dvwa0gzbk-tree-sitter-php",
"sha256": "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad",
"rev": "57f855461aeeca73bd4218754fb26b5ac143f98f",
"date": "2021-11-19T17:22:11+01:00",
"path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php",
"sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

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

@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
"rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
"date": "2021-03-03T16:54:30-08:00",
"path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
"sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
"rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea",
"date": "2021-12-03T16:33:06+01:00",
"path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby",
"sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
"rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a",
"date": "2021-08-17T11:21:11-07:00",
"path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust",
"sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1",
"rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7",
"date": "2021-12-12T10:08:54-08:00",
"path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust",
"sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
View File

@@ -1,9 +1,9 @@
{
"url": "https://github.com/maxxnino/tree-sitter-zig",
"rev": "63e8a11f1858c7351a299223b231c8134ed61612",
"date": "2021-10-13T22:25:30+09:00",
"path": "/nix/store/2dy3wrmjss5mnmdv6xf50cjj3k9bfpp0-tree-sitter-zig",
"sha256": "1izvw3dv5ydklqlh8n4fslyzqdal9n8kark0g4xslcrnji3q71wg",
"rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e",
"date": "2021-11-25T20:46:40+09:00",
"path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig",
"sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

Some files were not shown because too many files have changed in this diff Show More