diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d3a35283b78..57fd22646f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3071,6 +3071,12 @@
githubId = 1276854;
name = "Florian Peter";
};
+ fbrs = {
+ email = "yuuki@protonmail.com";
+ github = "cideM";
+ githubId = 4246921;
+ name = "Florian Beeres";
+ };
fdns = {
email = "fdns02@gmail.com";
github = "fdns";
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 7ccb5b3664e..19cfb57920d 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -16,9 +16,10 @@
The first line ({ config, pkgs, ... }:) denotes that this
is actually a function that takes at least the two arguments
config and pkgs. (These are explained
- later.) The function returns a set of option definitions
- ({ ... }). These definitions
- have the form name =
+ later, in chapter ) The function returns
+ a set of option definitions ({
+ ... }). These definitions have the form
+ name =
value, where
name is the name of an option and
value is its value. For example,
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index d244356dbed..fad4637f51f 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -74,7 +74,10 @@ linkend="sec-configuration-syntax"/>, we saw the following structure
This line makes the current Nix expression a function. The variable
- pkgs contains Nixpkgs, while config
+ pkgs contains Nixpkgs (by default, it takes the
+ nixpkgs entry of NIX_PATH, see the Nix
+ manual for further details), while config
contains the full system configuration. This line can be omitted if there
is no reference to pkgs and config
inside the module.
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index c8515c4b898..036bf668bc1 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -65,10 +65,18 @@ let
dashboardFile = pkgs.writeText "dashboard.yaml" (builtins.toJSON dashboardConfiguration);
+ notifierConfiguration = {
+ apiVersion = 1;
+ notifiers = cfg.provision.notifiers;
+ };
+
+ notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration);
+
provisionConfDir = pkgs.runCommand "grafana-provisioning" { } ''
mkdir -p $out/{datasources,dashboards}
ln -sf ${datasourceFile} $out/datasources/datasource.yaml
ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml
+ ln -sf ${notifierFile} $out/notifiers/notifier.yaml
'';
# Get a submodule without any embedded metadata:
@@ -79,80 +87,80 @@ let
options = {
name = mkOption {
type = types.str;
- description = "Name of the datasource. Required";
+ description = "Name of the datasource. Required.";
};
type = mkOption {
type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"];
- description = "Datasource type. Required";
+ description = "Datasource type. Required.";
};
access = mkOption {
type = types.enum ["proxy" "direct"];
default = "proxy";
- description = "Access mode. proxy or direct (Server or Browser in the UI). Required";
+ description = "Access mode. proxy or direct (Server or Browser in the UI). Required.";
};
orgId = mkOption {
type = types.int;
default = 1;
- description = "Org id. will default to orgId 1 if not specified";
+ description = "Org id. will default to orgId 1 if not specified.";
};
url = mkOption {
type = types.str;
- description = "Url of the datasource";
+ description = "Url of the datasource.";
};
password = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database password, if used";
+ description = "Database password, if used.";
};
user = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database user, if used";
+ description = "Database user, if used.";
};
database = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database name, if used";
+ description = "Database name, if used.";
};
basicAuth = mkOption {
type = types.nullOr types.bool;
default = null;
- description = "Enable/disable basic auth";
+ description = "Enable/disable basic auth.";
};
basicAuthUser = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Basic auth username";
+ description = "Basic auth username.";
};
basicAuthPassword = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Basic auth password";
+ description = "Basic auth password.";
};
withCredentials = mkOption {
type = types.bool;
default = false;
- description = "Enable/disable with credentials headers";
+ description = "Enable/disable with credentials headers.";
};
isDefault = mkOption {
type = types.bool;
default = false;
- description = "Mark as default datasource. Max one per org";
+ description = "Mark as default datasource. Max one per org.";
};
jsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
- description = "Datasource specific configuration";
+ description = "Datasource specific configuration.";
};
secureJsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
- description = "Datasource specific secure configuration";
+ description = "Datasource specific secure configuration.";
};
version = mkOption {
type = types.int;
default = 1;
- description = "Version";
+ description = "Version.";
};
editable = mkOption {
type = types.bool;
@@ -168,41 +176,99 @@ let
name = mkOption {
type = types.str;
default = "default";
- description = "Provider name";
+ description = "Provider name.";
};
orgId = mkOption {
type = types.int;
default = 1;
- description = "Organization ID";
+ description = "Organization ID.";
};
folder = mkOption {
type = types.str;
default = "";
- description = "Add dashboards to the specified folder";
+ description = "Add dashboards to the specified folder.";
};
type = mkOption {
type = types.str;
default = "file";
- description = "Dashboard provider type";
+ description = "Dashboard provider type.";
};
disableDeletion = mkOption {
type = types.bool;
default = false;
- description = "Disable deletion when JSON file is removed";
+ description = "Disable deletion when JSON file is removed.";
};
updateIntervalSeconds = mkOption {
type = types.int;
default = 10;
- description = "How often Grafana will scan for changed dashboards";
+ description = "How often Grafana will scan for changed dashboards.";
};
options = {
path = mkOption {
type = types.path;
- description = "Path grafana will watch for dashboards";
+ description = "Path grafana will watch for dashboards.";
};
};
};
};
+
+ grafanaTypes.notifierConfig = types.submodule {
+ options = {
+ name = mkOption {
+ type = types.str;
+ default = "default";
+ description = "Notifier name.";
+ };
+ type = mkOption {
+ type = types.enum ["dingding" "discord" "email" "googlechat" "hipchat" "kafka" "line" "teams" "opsgenie" "pagerduty" "prometheus-alertmanager" "pushover" "sensu" "sensugo" "slack" "telegram" "threema" "victorops" "webhook"];
+ description = "Notifier type.";
+ };
+ uid = mkOption {
+ type = types.str;
+ description = "Unique notifier identifier.";
+ };
+ org_id = mkOption {
+ type = types.int;
+ default = 1;
+ description = "Organization ID.";
+ };
+ org_name = mkOption {
+ type = types.str;
+ default = "Main Org.";
+ description = "Organization name.";
+ };
+ is_default = mkOption {
+ type = types.bool;
+ description = "Is the default notifier.";
+ default = false;
+ };
+ send_reminder = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Should the notifier be sent reminder notifications while alerts continue to fire.";
+ };
+ frequency = mkOption {
+ type = types.str;
+ default = "5m";
+ description = "How frequently should the notifier be sent reminders.";
+ };
+ disable_resolve_message = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Turn off the message that sends when an alert returns to OK.";
+ };
+ settings = mkOption {
+ type = types.nullOr types.attrs;
+ default = null;
+ description = "Settings for the notifier type.";
+ };
+ secure_settings = mkOption {
+ type = types.nullOr types.attrs;
+ default = null;
+ description = "Secure settings for the notifier type.";
+ };
+ };
+ };
in {
options.services.grafana = {
enable = mkEnableOption "grafana";
@@ -337,17 +403,23 @@ in {
provision = {
enable = mkEnableOption "provision";
datasources = mkOption {
- description = "Grafana datasources configuration";
+ description = "Grafana datasources configuration.";
default = [];
type = types.listOf grafanaTypes.datasourceConfig;
apply = x: map _filter x;
};
dashboards = mkOption {
- description = "Grafana dashboard configuration";
+ description = "Grafana dashboard configuration.";
default = [];
type = types.listOf grafanaTypes.dashboardConfig;
apply = x: map _filter x;
};
+ notifiers = mkOption {
+ description = "Grafana notifier configuration.";
+ default = [];
+ type = types.listOf grafanaTypes.notifierConfig;
+ apply = x: map _filter x;
+ };
};
security = {
@@ -391,12 +463,12 @@ in {
smtp = {
enable = mkEnableOption "smtp";
host = mkOption {
- description = "Host to connect to";
+ description = "Host to connect to.";
default = "localhost:25";
type = types.str;
};
user = mkOption {
- description = "User used for authentication";
+ description = "User used for authentication.";
default = "";
type = types.str;
};
@@ -417,7 +489,7 @@ in {
type = types.nullOr types.path;
};
fromAddress = mkOption {
- description = "Email address used for sending";
+ description = "Email address used for sending.";
default = "admin@grafana.localhost";
type = types.str;
};
@@ -425,7 +497,7 @@ in {
users = {
allowSignUp = mkOption {
- description = "Disable user signup / registration";
+ description = "Disable user signup / registration.";
default = false;
type = types.bool;
};
@@ -451,17 +523,17 @@ in {
auth.anonymous = {
enable = mkOption {
- description = "Whether to allow anonymous access";
+ description = "Whether to allow anonymous access.";
default = false;
type = types.bool;
};
org_name = mkOption {
- description = "Which organization to allow anonymous access to";
+ description = "Which organization to allow anonymous access to.";
default = "Main Org.";
type = types.str;
};
org_role = mkOption {
- description = "Which role anonymous users have in the organization";
+ description = "Which role anonymous users have in the organization.";
default = "Viewer";
type = types.str;
};
@@ -470,7 +542,7 @@ in {
analytics.reporting = {
enable = mkOption {
- description = "Whether to allow anonymous usage reporting to stats.grafana.net";
+ description = "Whether to allow anonymous usage reporting to stats.grafana.net.";
default = true;
type = types.bool;
};
@@ -496,6 +568,9 @@ in {
(optional (
any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) cfg.provision.datasources
) "Datasource passwords will be stored as plaintext in the Nix store!")
+ (optional (
+ any (x: x.secure_settings != null) cfg.provision.notifiers
+ ) "Notifier secure settings will be stored as plaintext in the Nix store!")
];
environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 4131ff8be5d..d7208354d4a 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -8,9 +8,9 @@ let
# Convert systemd-style address specification to kresd config line(s).
# On Nix level we don't attempt to precisely validate the address specifications.
mkListen = kind: addr: let
- al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr;
- al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr;
- al_portOnly = builtins.match "()([0-9]\+)" addr;
+ al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr;
+ al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr;
+ al_portOnly = builtins.match "()([0-9]+)" addr;
al = findFirst (a: a != null)
(throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ];
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index 9567223ebc7..1ce584c6a46 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -329,7 +329,7 @@ in
extraConfig = "internal;";
};
- locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = {
extraConfig = "expires 365d;";
};
@@ -349,7 +349,7 @@ in
'';
};
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
extraConfig = ''
try_files $uri $uri/ /doku.php;
include ${pkgs.nginx}/conf/fastcgi_params;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index fa8614e8ec1..f3175793ebe 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -804,7 +804,7 @@ in
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
- MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) pkgs.nginx.modules);
+ MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix
index f84394ccea4..02ea5179474 100644
--- a/nixos/tests/php/fpm.nix
+++ b/nixos/tests/php/fpm.nix
@@ -10,7 +10,7 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: {
testdir = pkgs.writeTextDir "web/index.php" " obsidian.asar
- '';
-
installPhase = ''
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
- --add-flags $out/share/electron/obsidian.asar
+ --add-flags $out/share/obsidian/app.asar
- install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar
+ install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
+ install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
install -m 444 -D "${desktopItem}/share/applications/"* \
-t $out/share/applications/
diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix
new file mode 100644
index 00000000000..6df8dc781e7
--- /dev/null
+++ b/pkgs/applications/misc/senv/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "senv";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "SpectralOps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf";
+ };
+
+ vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Friends don't let friends leak secrets on their terminal window";
+ homepage = "https://github.com/SpectralOps/senv";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
new file mode 100755
index 00000000000..bbadb3153ee
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3Packages.feedparser python3Packages.requests
+
+# This script prints the Git commit message for stable channel updates.
+
+import re
+import textwrap
+
+import feedparser
+import requests
+
+feed = feedparser.parse('https://chromereleases.googleblog.com/feeds/posts/default')
+html_tags = re.compile(r'<[^>]+>')
+
+for entry in feed.entries:
+ if entry.title != 'Stable Channel Update for Desktop':
+ continue
+ url = requests.get(entry.link).url.split('?')[0]
+ content = entry.content[0].value
+ if re.search(r'Linux', content) is None:
+ continue
+ #print(url) # For debugging purposes
+ version = re.search(r'\d+(\.\d+){3}', content).group(0)
+ fixes = re.search(r'This update includes .+ security fixes\.', content).group(0)
+ fixes = html_tags.sub('', fixes)
+ zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content)
+ if zero_days:
+ fixes += " " + zero_days.group(0)
+ cve_list = re.findall(r'CVE-[^: ]+', content)
+ cve_string = ' '.join(cve_list)
+ print('chromium: TODO -> ' + version + '\n')
+ print(url + '\n')
+ print('\n'.join(textwrap.wrap(fixes, width=72)) + '\n')
+ print("CVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72)))
+ break # We only care about the most recent stable channel update
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 89647f47757..7573e08313b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,20 +1,20 @@
{
"stable": {
- "version": "88.0.4324.182",
- "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
- "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
+ "version": "89.0.4389.72",
+ "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
+ "sha256bin64": "1h2dxgr660xy1rv52ck8ps6av0l5jdhj2k29lvs190ccpxaycglb",
"deps": {
"gn": {
- "version": "2020-11-05",
+ "version": "2021-01-07",
"url": "https://gn.googlesource.com/gn",
- "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
- "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
+ "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
+ "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
}
},
"chromedriver": {
- "version": "88.0.4324.96",
- "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41",
- "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp"
+ "version": "89.0.4389.23",
+ "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r",
+ "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3"
}
},
"beta": {
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 81ca2283d20..66ff583e8c9 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.17.1";
+ version = "1.18.0";
- vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh";
+ vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3";
+ sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index a5b6e7d2f5e..804659e084a 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,24 +1,26 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+{ lib, buildGoModule, fetchFromGitHub }:
+buildGoModule rec {
pname = "terraform-docs";
- version = "0.9.1";
-
- goPackagePath = "github.com/segmentio/${pname}";
+ version = "0.11.2";
src = fetchFromGitHub {
- owner = "segmentio";
- repo = pname;
- rev = "v${version}";
- sha256 = "00sfzdqhf8g85m03r6mbzfas5vvc67iq7syb8ljcgxg8l1knxnjx";
+ owner = "terraform-docs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k=";
};
+ vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0=";
+
+ subPackages = [ "." ];
+
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.version=${version}")
'';
meta = with lib; {
description = "A utility to generate documentation from Terraform modules in various output formats";
- homepage = "https://github.com/segmentio/terraform-docs/";
+ homepage = "https://github.com/terraform-docs/terraform-docs/";
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
};
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index dae9ad3bc33..51f62529e9c 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -17,11 +17,6 @@ buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
- installPhase = ''
- mkdir -p $out/bin
- cp -p $releaseDir/cfdyndns $out/bin/
- '';
-
meta = with lib; {
description = "CloudFlare Dynamic DNS Client";
homepage = "https://github.com/colemickens/cfdyndns";
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix
index 7a8c3d395f6..5ed87334c47 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/pkgs/applications/networking/ike/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.shrew.net/software";
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
platforms = platforms.unix;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
license = licenses.sleepycat;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 668e614c474..e5a2c201d87 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Lightweight Tox client";
homepage = "https://github.com/uTox/uTox";
license = licenses.gpl3;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 1d1dc030c31..cab43750a56 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -44,7 +44,7 @@ python2Packages.buildPythonApplication rec {
homepage = "https://www.mailpile.is/";
license = [ licenses.asl20 licenses.agpl3 ];
platforms = platforms.linux;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
knownVulnerabilities = [
"Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104"
];
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 85a5217ff69..a39b4aab837 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
homepage = "http://retroshare.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684)
};
}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index a8ca37df36a..e54a3cbad4c 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,15 +1,14 @@
-{
- mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
- boost, qtwebkit, qtx11extras, shared-mime-info,
- breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
- kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
- kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
- knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
- kwindowsystem, kxmlgui, sonnet, threadweaver,
- kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
- eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
- librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
- poppler, pstoedit, qca-qt5, vc
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools
+, boost, qtwebkit, qtx11extras, shared-mime-info
+, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
+, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross
+, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons
+, kwindowsystem, kxmlgui, sonnet, threadweaver
+, kcontacts, akonadi, akonadi-calendar, akonadi-contacts
+, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen
+, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon
+, poppler, pstoedit, qca-qt5, vc
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
}:
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
new file mode 100644
index 00000000000..64f5093c4b9
--- /dev/null
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -0,0 +1,74 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkg-config
+, doxygen
+, wrapQtAppsHook
+, pcre
+, poco
+, qtbase
+, qtsvg
+, libsForQt5
+, nlohmann_json
+, soapysdr-with-plugins
+, portaudio
+, alsaLib
+, muparserx
+, python3
+}:
+
+mkDerivation rec {
+ pname = "pothos";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "pothosware";
+ repo = "PothosCore";
+ rev = "pothos-${version}";
+ sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg";
+ fetchSubmodules = true;
+ };
+
+ patches = [
+ # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
+ ./spuce.patch
+ ];
+
+ nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
+
+ buildInputs = [
+ pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json
+ soapysdr-with-plugins portaudio alsaLib muparserx python3
+ ];
+
+ postInstall = ''
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml
+ rm -r $out/share/Pothos/Desktop
+ '';
+
+ dontWrapQtApps = true;
+ preFixup = ''
+ # PothosUtil does not need to be wrapped
+ wrapQtApp $out/bin/PothosFlow
+ wrapQtApp $out/bin/spuce_fir_plot
+ wrapQtApp $out/bin/spuce_iir_plot
+ wrapQtApp $out/bin/spuce_other_plot
+ wrapQtApp $out/bin/spuce_window_plot
+ '';
+
+ meta = with lib; {
+ description = "The Pothos data-flow framework";
+ homepage = "https://github.com/pothosware/PothosCore/wiki";
+ license = licenses.boost;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ eduardosm ];
+ };
+}
diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/applications/radio/pothos/spuce.patch
new file mode 100644
index 00000000000..ed0377540a8
--- /dev/null
+++ b/pkgs/applications/radio/pothos/spuce.patch
@@ -0,0 +1,101 @@
+diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt
+index fa2e580..e32113c 100644
+--- a/spuce/qt_fir/CMakeLists.txt
++++ b/spuce/qt_fir/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce fir_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES
+ make_filter.cpp
+@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11)
+
+-TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_fir_plot Gui)
+-QT5_USE_Modules(spuce_fir_plot Core)
+-QT5_USE_Modules(spuce_fir_plot Widgets)
+-QT5_USE_Modules(spuce_fir_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_fir_plot DESTINATION bin)
+
+diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt
+index 4717226..debb5f9 100644
+--- a/spuce/qt_iir/CMakeLists.txt
++++ b/spuce/qt_iir/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce iir_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES
+ make_filter.cpp
+@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_iir_plot Gui)
+-QT5_USE_Modules(spuce_iir_plot Core)
+-QT5_USE_Modules(spuce_iir_plot Widgets)
+-QT5_USE_Modules(spuce_iir_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_iir_plot DESTINATION bin)
+diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt
+index 29c270d..e1ed778 100644
+--- a/spuce/qt_other/CMakeLists.txt
++++ b/spuce/qt_other/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce window_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES make_filter.cpp)
+ ADD_LIBRARY(spuce_other STATIC ${SOURCES})
+@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC})
+ set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_other_plot Gui)
+-QT5_USE_Modules(spuce_other_plot Core)
+-QT5_USE_Modules(spuce_other_plot Widgets)
+-QT5_USE_Modules(spuce_other_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_other_plot DESTINATION bin)
+diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt
+index e95c85b..4a77ab8 100644
+--- a/spuce/qt_window/CMakeLists.txt
++++ b/spuce/qt_window/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce window_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES make_filter.cpp)
+
+@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_window_plot Gui)
+-QT5_USE_Modules(spuce_window_plot Core)
+-QT5_USE_Modules(spuce_window_plot Widgets)
+-QT5_USE_Modules(spuce_window_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_window_plot DESTINATION bin)
diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix
index 092d4a0e09e..7dd495f977a 100644
--- a/pkgs/applications/terminal-emulators/hyper/default.nix
+++ b/pkgs/applications/terminal-emulators/hyper/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
let
libPath = lib.makeLibraryPath [
- stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
+ stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
+ at-spi2-atk
];
in
stdenv.mkDerivation rec {
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
mv opt "$out/"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/"
'';
dontPatchELF = true;
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index f0d4ef664c0..72f6d67c2f1 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://android.googlesource.com/tools/repo";
license = licenses.asl20;
- maintainers = [ maintainers.primeos ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index eaad772f734..776a794d649 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
- version = "1.0.0-alpha.38";
+ version = "1.0.0-alpha.46";
src = fetchCrate {
inherit version pname;
- sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b";
+ sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5";
};
- cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3";
+ cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 2de5899aa3e..f461838fdf1 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -231,7 +231,6 @@ in stdenv.mkDerivation {
cmakeFlags = [
"-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}"
- "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}"
"-Dlibdvdcss_URL=${libdvdcss.src}"
"-Dlibdvdnav_URL=${libdvdnav.src}"
"-Dlibdvdread_URL=${libdvdread.src}"
@@ -251,9 +250,11 @@ in stdenv.mkDerivation {
# I'm guessing there is a thing waiting to time out
doCheck = false;
- # Need these tools on the build system when cross compiling,
- # hacky, but have found no other way.
- preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ preConfigure = ''
+ cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ # Need these tools on the build system when cross compiling,
+ # hacky, but have found no other way.
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
@@ -293,6 +294,6 @@ in stdenv.mkDerivation {
homepage = "https://kodi.tv/";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ];
+ maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];
};
}
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index 2d865f41818..13b27c7d6cc 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -22,5 +22,6 @@ mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
platforms = with platforms; linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 59e07530fbc..15ca7c9667f 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -12,6 +12,7 @@
, nixosTests
, criu
, system
+, fetchpatch
}:
let
@@ -37,16 +38,24 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
- version = "0.17";
+ version = "0.18";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4=";
+ sha256 = "sha256-VjMpfj2qUQdhqdnLpZsYigfo2sM7gNl0GrE4nitp13g=";
fetchSubmodules = true;
};
+ patches = [
+ # For 0.18 some tests switched to static builds, this was reverted after 0.18 was released
+ (fetchpatch {
+ url = "https://github.com/containers/crun/commit/d26579bfe56aa36dd522745d47a661ce8c70d4e7.patch";
+ sha256 = "1xmc0wj0j2xcg0915vxn0pplc4s94rpmw0s5g8cyf8dshfl283f9";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
buildInputs = [ libcap libseccomp systemd yajl ]
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b4b16e21689..4124b8e111f 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
++ optionals libiscsiSupport [ libiscsi ]
++ optionals smbdSupport [ samba ];
- enableParallelBuilding = true;
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
outputs = [ "out" "ga" ];
diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix
index 3a5f26bfcc8..9568a0bb695 100644
--- a/pkgs/applications/virtualization/qtemu/default.nix
+++ b/pkgs/applications/virtualization/qtemu/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }:
+{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }:
mkDerivation rec {
pname = "qtemu";
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 3be72bd22c3..988298ac72b 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
- ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""}
- ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""}
+ ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""}
+ ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""}
# Clear markers
find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \;
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index d93e5885401..530cfca7424 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -4,7 +4,6 @@
, fetchFromGitHub
, fetchurl
, fetchzip
-, optipng
, cairo
, python3
, pkg-config
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index f5bd6335dfb..c43ff3a313f 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder
, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
-, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml
+, defcon, fontmath, fontparts, fontpens, fonttools, lxml
, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
, pillow, six, bash, setuptools_scm }:
diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix
index 7205a979e27..a8923879c06 100644
--- a/pkgs/development/compilers/4th/default.nix
+++ b/pkgs/development/compilers/4th/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"-C sources"
- "CC=${stdenv.cc}/bin/cc"
+ "CC=${stdenv.cc.targetPrefix}cc"
];
preInstall = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "A portable Forth compiler";
homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
license = licenses.lgpl3;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 030da03add8..f537eb14d34 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/cseed/arachne-pnr";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ shell thoughtpolice ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix
index 25cbbd4d01a..0f4909f5e15 100644
--- a/pkgs/development/compilers/crystal2nix/default.nix
+++ b/pkgs/development/compilers/crystal2nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }:
+{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }:
crystal.buildCrystalPackage rec {
pname = "crystal2nix";
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index 59f33db68cb..87bf767f5bd 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
'';
maintainers = [ lib.maintainers.peti ];
- platforms = lib.platforms.gnu ++ lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix
index ab34f833d75..5de16633ed7 100644
--- a/pkgs/development/compilers/miranda/default.nix
+++ b/pkgs/development/compilers/miranda/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/";
license = licenses.bsd2;
maintainers = with maintainers; [ siraben ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix
index 2e178f775b6..aef02bca970 100644
--- a/pkgs/development/compilers/muon/default.nix
+++ b/pkgs/development/compilers/muon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
mkdir -p $out/bin $out/share/mu
cp -r lib $out/share/mu
- gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c
+ ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c
'';
installPhase = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/nickmqb/muon";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix
index afda8592818..3e5aefc11f1 100644
--- a/pkgs/development/compilers/ocaml/4.11.nix
+++ b/pkgs/development/compilers/ocaml/4.11.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "11";
- patch_version = "1";
- sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
+ patch_version = "2";
+ sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z";
}
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index f9059ae2fc4..655b29f6535 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
-, ffmpeg_3, python, ruby }:
+, ffmpeg, python3, ruby }:
let
major = "15";
@@ -21,8 +21,8 @@ let
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
- nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+ nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix
index c2415899f6b..0feaabc92e6 100644
--- a/pkgs/development/compilers/rasm/default.nix
+++ b/pkgs/development/compilers/rasm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
# according to official documentation
- cc rasm_v*.c -O2 -lm -lrt -o rasm
+ ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm
'';
installPhase = ''
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
# use -n option to display all licenses
license = licenses.mit; # expat version
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index 775a78a9734..fbcbf4485a4 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs";
};
+ postPatch = ''
+ substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++'
+ '';
+
installPhase = ''
mkdir -p $out/bin
mv serpent $out/bin
@@ -33,6 +37,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
license = with licenses; [ wtfpl ];
maintainers = with maintainers; [ chris-martin ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
deleted file mode 100644
index d4e68b5cb76..00000000000
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, lua5 }:
-
-stdenv.mkDerivation {
- version = "1.6.2";
- pname = "lua-filesystem";
- isLibrary = true;
- src = fetchurl {
- url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
- sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
- };
-
- buildInputs = [ lua5 ];
-
- preBuild = ''
- makeFlagsArray=(
- PREFIX=$out
- LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}"
- LUA_INC="-I${lua5}/include");
- '';
-
- meta = {
- homepage = "https://github.com/keplerproject/luafilesystem";
- hydraPlatforms = lib.platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
deleted file mode 100644
index d16f068883a..00000000000
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, lua5 }:
-
-stdenv.mkDerivation rec {
- pname = "lua-sockets";
- version = "2.0.2";
- src = fetchurl {
- url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
- sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
- };
-
- luaver = lua5.luaversion;
- patchPhase = ''
- sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
- -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
- -i config
- '';
-
- buildInputs = [ lua5 ];
-
- meta = {
- homepage = "http://w3.impa.br/~diego/software/luasocket/";
- hydraPlatforms = lib.platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix
index 29781446c8f..670dee26b2b 100644
--- a/pkgs/development/libraries/audio/libinstpatch/default.nix
+++ b/pkgs/development/libraries/audio/libinstpatch/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libinstpatch";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "swami";
repo = pname;
rev = "v${version}";
- sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb";
+ sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 9c636e0205d..821a9ea9226 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
- sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx";
+ sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index fdc06df948d..944b5276c5a 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "actor-framework";
- version = "0.17.6";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
- sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz";
+ sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx";
};
nativeBuildInputs = [ cmake ];
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
cmakeFlags = [
- "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+ "-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
];
doCheck = true;
checkTarget = "test";
preCheck = ''
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
- export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
+ export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
+ export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
'';
meta = with lib; {
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index 7a5c3984929..ed6aae0f308 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
};
- majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" );
+ majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" );
src = fetchurl {
url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2";
sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j";
diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
index abbffcf0f94..40459dbca22 100644
--- a/pkgs/development/libraries/libnixxml/default.nix
+++ b/pkgs/development/libraries/libnixxml/default.nix
@@ -1,25 +1,31 @@
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
stdenv.mkDerivation {
- name = "libnixxml";
+ pname = "libnixxml";
+ version = "unstable-2020-06-25";
+
src = fetchFromGitHub {
owner = "svanderburg";
repo = "libnixxml";
rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a";
sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
};
- configureFlags = [ "--with-gd" "--with-glib" ];
- CFLAGS = "-Wall";
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ];
- doCheck = false;
- postPatch = ''
+
+ preConfigure = ''
./bootstrap
'';
+ configureFlags = [ "--with-gd" "--with-glib" ];
+ CFLAGS = "-Wall";
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
+
+ doCheck = false;
+
meta = with lib; {
description = "XML-based Nix-friendly data integration library";
- homepage = https://github.com/svanderburg/libnixxml;
+ homepage = "https://github.com/svanderburg/libnixxml";
license = licenses.mit;
maintainers = with maintainers; [ tomberek ];
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
deleted file mode 100644
index 572b5710fa9..00000000000
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{lib, stdenv, fetchurl, protobuf}:
-
-stdenv.mkDerivation {
- name = "libosmpbf-1.5.0";
-
- src = fetchurl {
- url = "https://github.com/scrosby/OSM-binary/archive/v1.5.0.tar.gz";
- sha256 = "sha256-Kr8xJnKXk3MsM4B2OZnMNl5Rv/2jaaAIITh5o82QR2w=";
- };
-
- buildInputs = [ protobuf ];
-
- sourceRoot = "OSM-binary-1.5.0/src";
-
- installFlags = [ "PREFIX=$(out)" ];
-
- meta = {
- homepage = "https://github.com/scrosby/OSM-binary";
- description = "C library to read and write OpenStreetMap PBF files";
- license = lib.licenses.lgpl3;
- platforms = lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix
new file mode 100644
index 00000000000..86ef2af96e7
--- /dev/null
+++ b/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, lib
+, mkDerivation
+, fetchurl
+, cmake
+, pkg-config
+, polkit
+, glib
+, pcre
+, libselinux
+, libsepol
+, util-linux
+}:
+
+mkDerivation rec {
+ pname = "polkit-qt-1";
+ version = "0.113.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c=";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ glib
+ pcre
+ polkit
+ ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ];
+
+ meta = with lib; {
+ description = "A Qt wrapper around PolKit";
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
deleted file mode 100644
index 0da6e15eb27..00000000000
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
-
-with lib;
-
-stdenv.mkDerivation {
- name = "polkit-qt-1-qt4-0.112.0";
-
- src = fetchurl {
- url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
- sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
- };
-
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = [ cmake pkg-config automoc4 ];
-
- propagatedBuildInputs = [ polkit glib qt4 ];
-
- postFixup =
- ''
- for i in $dev/lib/cmake/*/*.cmake; do
- echo "fixing $i"
- substituteInPlace $i \
- --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib
- done
- '';
-
- meta = with lib; {
- description = "A Qt wrapper around PolKit";
- maintainers = [ maintainers.ttuegel ];
- platforms = platforms.linux;
- license = licenses.lgpl21;
- };
-}
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix
deleted file mode 100644
index c4918d9d8e9..00000000000
--- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
-
-with lib;
-
-stdenv.mkDerivation {
- name = "polkit-qt-1-qt5-0.112.0";
-
- outputs = [ "out" "dev" ];
-
- src = fetchurl {
- url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
- sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
- };
-
- nativeBuildInputs = [ cmake pkg-config ];
-
- propagatedBuildInputs = [ polkit glib qtbase ];
-
- dontWrapQtApps = true;
-
- postFixup = ''
- # Fix library location in CMake module
- sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \
- -e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\"),"
- '';
-
- meta = {
- description = "A Qt wrapper around PolKit";
- maintainers = with lib.maintainers; [ ttuegel ];
- platforms = with lib.platforms; linux;
- };
-}
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 254ce08dc60..703a7f2e344 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ ];
meta = with lib; {
homepage = "https://github.com/liuq/QuadProgpp";
@@ -22,6 +21,6 @@ stdenv.mkDerivation rec {
Goldfarb-Idnani active-set dual method.
'';
maintainers = with maintainers; [ ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 092ab62ed7c..5b603e6a0c7 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -2,10 +2,11 @@
, pkg-config, libiconv }:
stdenv.mkDerivation rec {
- name = "serf-1.3.9";
+ pname = "serf";
+ version = "1.3.9";
src = fetchurl {
- url = "https://www.apache.org/dist/serf/${name}.tar.bz2";
+ url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2";
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
};
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 7b6c98bebe8..0fe1ce442fd 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -49,8 +49,8 @@ let
in
{
spdlog_1 = generic {
- version = "1.8.1";
- sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k=";
+ version = "1.8.2";
+ sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8=";
};
spdlog_0 = generic {
diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix
index dd8a0f57164..e2501c60f5a 100644
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "digestif";
- version = "0.9.0";
+ version = "1.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
- sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4";
+ sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99";
};
propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];
diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
new file mode 100644
index 00000000000..eae11953113
--- /dev/null
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -0,0 +1,33 @@
+{ lib, fetchFromGitHub, buildDunePackage }:
+
+buildDunePackage rec {
+ pname = "directories";
+ version = "0.2";
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.07";
+
+ src = fetchFromGitHub {
+ owner = "ocamlpro";
+ repo = pname;
+ rev = version;
+ sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff";
+ };
+
+ meta = {
+ homepage = "https://github.com/ocamlpro/directories";
+ description = "An OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows";
+ longDescription = ''
+ directories is an OCaml library that provides configuration, cache and
+ data paths (and more!) following the suitable conventions on Linux, macOS
+ and Windows. It is inspired by similar libraries for other languages such
+ as directories-jvm.
+
+ The following conventions are used: XDG Base Directory Specification and
+ xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
+ macOS.
+ '';
+ license = lib.licenses.isc;
+ maintainers = with lib.maintainers; [ bcc32 ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index ad6f1f9f813..97443bf5706 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchzip, buildDunePackage }:
+{ lib, fetchzip, buildDunePackage, ocaml }:
buildDunePackage rec {
pname = "integers";
version = "0.4.0";
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix
index 9b648d59537..7b84996a1c9 100644
--- a/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/pkgs/development/python-modules/aiomultiprocess/default.nix
@@ -1,20 +1,26 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, flit-core
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "aiomultiprocess";
- version = "0.8.0";
+ version = "0.9.0";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "omnilib";
repo = pname;
rev = "v${version}";
- sha256 = "0vkj1vgvlv828pi3sn0hjzdy9f0j63gljs2ylibbsaixa7mbkpvy";
+ sha256 = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw=";
};
+ nativeBuildInputs = [ flit-core ];
+
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ];
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index bdba8949887..5cbbee77ae8 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
- version = "15.0.0";
+ version = "16.0.0";
pname = "azure-mgmt-resource";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14";
+ sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index a6de8321dc0..607057b73f2 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -1,13 +1,12 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
-, argcomplete, colorlog, pyvmomi, requests, verboselogs
+, colorlog, pyvmomi, requests, verboselogs
, psutil, pyopenssl, setuptools
-, mock, pytest, pytest-mock, pytestCheckHook, qemu
+, mock, pytest-mock, pytestCheckHook, qemu
}:
buildPythonPackage rec {
pname = "cot";
version = "2.2.1";
-
disabled = !isPy3k;
src = fetchPypi {
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 6419aa2c6d5..54cde59a4bd 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -21,10 +21,12 @@ buildPythonPackage rec {
PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
'';
+ pythonImportsCheck = [ "django_mailman3" ];
+
meta = with lib; {
description = "Django library for Mailman UIs";
homepage = "https://gitlab.com/mailman/django-mailman3";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ globin peti ];
};
}
diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix
index ada005d14f8..180e20c9f56 100644
--- a/pkgs/development/python-modules/gradient_statsd/default.nix
+++ b/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage
-, boto3, requests, datadog, configparser, python
+, requests, datadog, configparser, python
}:
buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix
index 9e994860709..37e3490a54c 100644
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/pkgs/development/python-modules/pysvn/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
format = "other";
src = fetchurl {
- url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
+ url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
};
@@ -79,5 +79,7 @@ buildPythonPackage rec {
description = "Python bindings for Subversion";
homepage = "http://pysvn.tigris.org/";
license = licenses.asl20;
+ # g++: command not found
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index 57a84e69d20..0d22a0c56c9 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -1,40 +1,45 @@
{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, mock
-, cmarkgfm
, bleach
+, buildPythonPackage
+, cmarkgfm
, docutils
+, fetchPypi
, future
+, mock
, pygments
-, six
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "readme_renderer";
- version = "28.0";
+ version = "29.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a";
+ sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s=";
};
- checkInputs = [ pytest mock ];
-
propagatedBuildInputs = [
- bleach cmarkgfm docutils future pygments six
+ bleach
+ cmarkgfm
+ docutils
+ future
+ pygments
];
- checkPhase = ''
- # disable one failing test case
- # fixtures test is failing for incorrect class name
- py.test -k "not test_invalid_link and not fixtures"
- '';
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
- meta = {
- description = "readme_renderer is a library for rendering readme descriptions for Warehouse";
+ pythonImportsCheck = [ "readme_renderer" ];
+
+ meta = with lib; {
+ description = "Python library for rendering readme descriptions";
homepage = "https://github.com/pypa/readme_renderer";
- license = lib.licenses.asl20;
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix
new file mode 100644
index 00000000000..7bb390e79a2
--- /dev/null
+++ b/pkgs/development/python-modules/rfcat/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, ipython
+, numpy
+, pyserial
+, pyusb
+, hostPlatform
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "rfcat";
+ version = "1.9.5";
+
+ src = fetchFromGitHub {
+ owner = "atlas0fd00m";
+ repo = "rfcat";
+ rev = "v${version}";
+ sha256 = "1mmr7g7ma70sk6vl851430nqnd7zxsk7yb0xngwrdx9z7fbz2ck0";
+ };
+
+ propagatedBuildInputs = [
+ future
+ ipython
+ numpy
+ pyserial
+ pyusb
+ ];
+
+ postInstall = lib.optionalString hostPlatform.isLinux ''
+ mkdir -p $out/etc/udev/rules.d
+ cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "rflib" ];
+
+ meta = with lib; {
+ description = "Swiss Army knife of sub-GHz ISM band radio";
+ homepage = "https://github.com/atlas0fd00m/rfcat";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ trepetti ];
+ changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}";
+ };
+}
diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 0c80423e36a..a626bdd6ec0 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, six
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -14,7 +14,14 @@ buildPythonPackage rec {
sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha";
};
- buildInputs = [ six pytest ];
+ propagatedBuildInputs = [ six ];
+
+ checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "w3lib" ];
+
+ disabledTests = [
+ "test_add_or_replace_parameter"
+ ];
meta = with lib; {
description = "A library of web-related functions";
@@ -22,5 +29,4 @@ buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ drewkett ];
};
-
}
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index c9518d685b5..7ea10ac90ab 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0=";
};
- patchPhase = ''
+ postPatch = ''
echo -java-home ${jre.home} >>conf/sbtopts
'';
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.isLinux [ zlib ];
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/share/sbt $out/bin
cp -ra . $out/share/sbt
ln -sT ../share/sbt/bin/sbt $out/bin/sbt
ln -sT ../share/sbt/bin/sbtn-x86_64-${
if (stdenv.isDarwin) then "apple-darwin" else "pc-linux"
} $out/bin/sbtn
- '';
- doInstallCheck = true;
- installCheckPhase = ''
- ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version} (this may take some time)'
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
new file mode 100644
index 00000000000..db876ea09f2
--- /dev/null
+++ b/pkgs/development/tools/go-mockery/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "go-mockery";
+ version = "2.5.1";
+
+ src = fetchFromGitHub {
+ owner = "vektra";
+ repo = "mockery";
+ rev = "v${version}";
+ sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos=";
+ };
+
+ vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
+
+ meta = with lib; {
+ homepage = "https://github.com/vektra/mockery";
+ description = "A mock code autogenerator for Golang";
+ maintainers = with maintainers; [ fbrs ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix
index 35d7cf50a7e..0f0230049cf 100644
--- a/pkgs/development/tools/gops/default.nix
+++ b/pkgs/development/tools/gops/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gops";
- version = "0.3.15";
+ version = "0.3.16";
src = fetchFromGitHub {
owner = "google";
repo = "gops";
rev = "v${version}";
- sha256 = "091idnsgbwabmm5s9zhm474fbxvjvpkvwg68snbypfll7wdr3phy";
+ sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix
new file mode 100644
index 00000000000..991f1a37717
--- /dev/null
+++ b/pkgs/development/tools/luaformatter/default.nix
@@ -0,0 +1,30 @@
+{ cmake, fetchFromGitHub, lib, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "luaformatter";
+ version = "1.3.4";
+
+ src = fetchFromGitHub {
+ owner = "koihik";
+ repo = "luaformatter";
+ rev = version;
+ sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp lua-format $out/bin
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Code formatter for lua";
+ homepage = "https://github.com/koihik/luaformatter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
index a35cc57b825..8b603fbc5ce 100644
--- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
preConfigure = "echo ${version} > .tarball-version";
+ postInstall = ''
+ # rules printed by the following invocation are static,
+ # they come from hardcoded configs in libuuu/config.cpp:48
+ $out/bin/uuu -udev > udev-rules 2>stderr.txt
+ rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')"
+ install -D udev-rules "$out/lib/udev/rules.d/$rules_file"
+ '';
+
meta = with lib; {
description = "Freescale/NXP I.MX chip image deploy tools";
longDescription = ''
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 09650e8a386..7cb366c5502 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3";
+ sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio=";
};
- cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9";
+ cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM=";
meta = with lib; {
description =
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 701b973ad4f..34662498f23 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive
-, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch
+, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux
}:
let
diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix
index fcfc89667af..b3e89617ef3 100644
--- a/pkgs/games/vms-empire/default.nix
+++ b/pkgs/games/vms-empire/default.nix
@@ -1,26 +1,50 @@
-{ lib, stdenv, fetchurl, ncurses, xmlto }:
+{ lib
+, stdenv
+, fetchurl
+, ncurses
+, xmlto
+, docbook_xml_dtd_44
+, docbook_xsl
+, installShellFiles
+}:
stdenv.mkDerivation rec {
pname = "vms-empire";
- version = "1.15";
+ version = "1.16";
src = fetchurl{
- url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz";
- sha256 = "1vcpglkimcljb8s1dp6lzr5a0vbfxmh6xf37cmb8rf9wc3pghgn3";
+ url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz";
+ hash = "sha256-XETIbt/qVU+TpamPc2WQynqqUuZqkTUnItBprjg+gPk=";
};
- buildInputs =
- [ ncurses xmlto ];
+ nativeBuildInputs = [ installShellFiles ];
+ buildInputs = [
+ ncurses
+ xmlto
+ docbook_xml_dtd_44
+ docbook_xsl
+ ];
- patchPhase = ''
- sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile
+ postBuild = ''
+ xmlto man vms-empire.xml
+ xmlto html-nochunks vms-empire.xml
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D vms-empire -t ${placeholder "out"}/bin/
+ install -D vms-empire.html -t ${placeholder "out"}/share/doc/${pname}/
+ install -D vms-empire.desktop -t ${placeholder "out"}/share/applications/
+ install -D vms-empire.png -t ${placeholder "out"}/share/icons/hicolor/48x48/apps/
+ install -D vms-empire.xml -t ${placeholder "out"}/share/appdata/
+ installManPage empire.6
+ runHook postInstall
'';
hardeningDisable = [ "format" ];
- makeFlags = [ "DESTDIR=$(out)" ];
-
meta = with lib; {
+ homepage = "http://catb.org/~esr/vms-empire/";
description = "The ancestor of all expand/explore/exploit/exterminate games";
longDescription = ''
Empire is a simulation of a full-scale war between two emperors, the
@@ -30,11 +54,8 @@ stdenv.mkDerivation rec {
expand/explore/exploit/exterminate games, including Civilization and
Master of Orion.
'';
- homepage = "http://catb.org/~esr/vms-empire/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
-
-
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index ab183936895..e71da643bb4 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -70,6 +70,6 @@ in stdenv.mkDerivation rec {
homepage = "http://dpdk.org/";
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar magenbluten orivej ];
+ maintainers = with maintainers; [ magenbluten orivej ];
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
similarity index 75%
rename from pkgs/os-specific/linux/kernel/linux-rt-5.6.nix
rename to pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
index 7c77454040d..e56d2319a96 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
@@ -6,22 +6,26 @@
, ... } @ args:
let
- version = "5.6.19-rt12"; # updated by ./update-rt.sh
+ version = "5.11.2-rt9"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
inherit version;
+ # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.
+ modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version
+ else lib.replaceStrings ["-"] [".0-"] version;
+
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2";
+ sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws";
+ sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix
index cab5fe15e66..21d5a871f4e 100644
--- a/pkgs/os-specific/linux/numad/default.nix
+++ b/pkgs/os-specific/linux/numad/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://fedoraproject.org/wiki/Features/numad";
license = licenses.lgpl21;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 5e0125da00a..73b2f589511 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "A kernel module to create V4L2 loopback devices";
homepage = "https://github.com/umlaeute/v4l2loopback";
license = licenses.gpl2;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index aaa2a2f2b5c..3726facd583 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keycloak";
- version = "12.0.3";
+ version = "12.0.4";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
- sha256 = "sha256-YUeSX02iLhrGzItnbUbK8ib7IfWG3+2k154cTPAt8Wc=";
+ sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix
index 9330de3a8f3..fc9f6217d93 100644
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "postorius";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa";
+ sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU=";
};
propagatedBuildInputs = [ django-mailman3 readme_renderer ];
@@ -17,10 +17,10 @@ buildPythonPackage rec {
# Tries to connect to database.
doCheck = false;
- meta = {
- homepage = "https://www.gnu.org/software/mailman/";
+ meta = with lib; {
+ homepage = "https://docs.mailman3.org/projects/postorius";
description = "Web-based user interface for managing GNU Mailman";
- license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [ globin peti ];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ globin peti ];
};
}
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 99f83e1bfbd..370006a591e 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -26,6 +26,10 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) loki; };
+ buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in ''
+ -ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown
+ '';
+
doCheck = true;
meta = with lib; {
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 5168f2e7e9d..64ee8752f1f 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://munin-monitoring.org/";
license = licenses.gpl2;
- maintainers = [ maintainers.domenkozar maintainers.bjornfor ];
+ maintainers = [ maintainers.bjornfor ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index b3ad305687a..3558fd5935e 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (rec {
};
} // optionalAttrs enableUnfree {
dontPatchELF = true;
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ];
postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index ffe8a75412b..f808b6985b4 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (rec {
};
} // optionalAttrs enableUnfree {
dontPatchELF = true;
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ];
postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index 2b22c38143c..479a7616ae1 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Open source enterprise search platform from the Apache Lucene project";
license = licenses.asl20;
platforms = platforms.all;
- maintainers = with maintainers; [ domenkozar aanderse ];
+ maintainers = with maintainers; [ aanderse ];
};
}
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 3f5cadfccb1..f9502152277 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, zsh }:
-# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
+# To make use of this derivation, use the `programs.zsh.autosuggestions.enable` option
stdenv.mkDerivation rec {
pname = "zsh-autosuggestions";
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index 118457d4080..06656a9e033 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -1,11 +1,11 @@
-{ lib, fetchFromGitHub, python }:
+{ lib, fetchFromGitHub, python3 }:
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "gixy";
version = "0.1.20";
# package is only compatible with python 2.7 and 3.5+
- disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
+ disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27);
# fetching from GitHub because the PyPi source is missing the tests
src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec {
sed -ie '/argparse/d' setup.py
'';
- propagatedBuildInputs = with python.pkgs; [
+ propagatedBuildInputs = with python3.pkgs; [
cached-property
ConfigArgParse
pyparsing
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 5f22ffa9602..56d3268ae2d 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -297,7 +297,7 @@ in pythonPackages.buildPythonApplication rec {
description = "Music tagger and library organizer";
homepage = "http://beets.io";
license = licenses.mit;
- maintainers = with maintainers; [ aszlig domenkozar doronbehar lovesegfault pjones ];
+ maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index f35c7a44b58..c2ed7882331 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
description = "Enterprise ready, Network Backup Tool";
homepage = "http://bacula.org/";
license = with licenses; [ agpl3Only bsd2 ];
- maintainers = with maintainers; [ domenkozar lovek323 eleanor ];
+ maintainers = with maintainers; [ lovek323 eleanor ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index 766ac1f82ea..a9e0cd12d9d 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
@@ -45,5 +46,7 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ rushmorem shamilton ];
+ # 'fprintf' was not declared in this scope
+ broken = true;
};
}
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 7e55bcf6e0e..cddb1722584 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,18 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, zlib, xz
+{ lib
+, stdenv
+, fetchFromGitHub
+, zlib
+, xz
, lz4
+, lzo
, zstd
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "squashfs";
version = "4.4";
src = fetchFromGitHub {
owner = "plougher";
repo = "squashfs-tools";
+ rev = version;
sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw";
- # Tag "4.4" points to this commit.
- rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67";
};
patches = [
@@ -25,19 +29,26 @@ stdenv.mkDerivation {
./0001-Mksquashfs-add-no-hardlinks-option.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
- buildInputs = [ zlib xz zstd lz4 ];
+ buildInputs = [ zlib xz zstd lz4 lzo ];
- preBuild = "cd squashfs-tools";
+ preBuild = ''
+ cd squashfs-tools
+ '' ;
- installFlags = [ "INSTALL_DIR=\${out}/bin" ];
+ installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ];
- makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ];
+ makeFlags = [
+ "XZ_SUPPORT=1"
+ "ZSTD_SUPPORT=1"
+ "LZ4_SUPPORT=1"
+ "LZO_SUPPORT=1"
+ ];
- meta = {
- homepage = "http://squashfs.sourceforge.net/";
+ meta = with lib; {
+ homepage = "https://github.com/plougher/squashfs-tools";
description = "Tool for creating and unpacking squashfs filesystems";
- platforms = lib.platforms.unix;
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ ruuda ];
+ platforms = platforms.unix;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ruuda ];
};
}
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index 39cfcefaee8..0b9c6f7c3bb 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
homepage = "https://gitlab.com/somasis/scripts/";
maintainers = [ maintainers.ar1a ];
license = licenses.unlicense;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index e79774da917..90abc765920 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata
+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata
, ckbcomp, xkeyboard_config, mkDerivation
}:
@@ -21,8 +21,6 @@ mkDerivation rec {
qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
];
- enableParallelBuilding = false;
-
cmakeFlags = [
"-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so"
"-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index b10259f24fc..32ef248ca85 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper
, gawk, gnused, util-linux, file
-, wget, python3, qemu-utils, euca2ools
+, wget, python3, qemu-utils
, e2fsprogs, cdrkit
, gptfdisk }:
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index c05d50cdbc1..39e6e6f211a 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -7,7 +7,7 @@ let
description = "Various coreboot-related tools";
homepage = "https://www.coreboot.org";
license = licenses.gpl2;
- maintainers = [ maintainers.petabyteboy ];
+ maintainers = with maintainers; [ petabyteboy felixsinger ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 9b57a295de0..759e8608090 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
homepage = "http://www.lichteblau.com/ldapvi/";
license = licenses.gpl2;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix
index 833f8313f61..3fe8e3f3870 100644
--- a/pkgs/tools/misc/nix-direnv/default.nix
+++ b/pkgs/tools/misc/nix-direnv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnugrep, nix }:
+{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }:
stdenv.mkDerivation rec {
pname = "nix-direnv";
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
# Substitute instead of wrapping because the resulting file is
# getting sourced, not executed:
postPatch = ''
- substituteInPlace direnvrc \
- --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nix}/bin/}" \
- --replace "grep" "${gnugrep}/bin/grep"
+ sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
+ substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
'';
installPhase = ''
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 4879bd9b042..96a4b8e7fee 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2021.03.02";
+ version = "2021.03.03";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0g3fmbxbixi92vbjjy5dabz538yvfzdp649kafs09n55iw29s3f8";
+ sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index eda64978c63..33a90636659 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Wireless encryption cracking tools";
homepage = "http://www.aircrack-ng.org/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 4e20cbe7441..44481802cc0 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec {
meta = {
description = "A program for retrieving mail";
- maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ];
+ maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
homepage = "http://pyropus.ca/software/getmail/";
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index 9ee01439653..d65f4fae30e 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
'';
platforms = [ "x86_64-linux" ];
license = licenses.asl20;
- maintainers = [ maintainers.lukego maintainers.domenkozar ];
+ maintainers = [ maintainers.lukego ];
};
}
diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix
index f3b080938eb..2a9935793cf 100644
--- a/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -1,15 +1,16 @@
{ mkDerivation, ansi-terminal, async, attoparsec, base, containers
, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib
, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub
+, expect, runtimeShell
}:
-mkDerivation {
+mkDerivation rec {
pname = "nix-output-monitor";
version = "1.0.1.1";
src = fetchFromGitHub {
owner = "maralorn";
repo = "nix-output-monitor";
sha256 = "1wi1gsl5q1sy7k6k5wxhwpwzki7rghhbsyzm84hnw6h93w6401ax";
- rev = "v1.0.1.1";
+ rev = "v${version}";
};
isLibrary = true;
isExecutable = true;
@@ -25,6 +26,13 @@ mkDerivation {
ansi-terminal async attoparsec base containers directory HUnit mtl
nix-derivation process relude stm text time unix
];
+ postInstall = ''
+ cat > $out/bin/nom-build << EOF
+ #!${runtimeShell}
+ ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom
+ EOF
+ chmod a+x $out/bin/nom-build
+ '';
homepage = "https://github.com/maralorn/nix-output-monitor";
description = "Parses output of nix-build to show additional information";
license = lib.licenses.agpl3Plus;
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 0dcbeb8abfe..16ecc7f11de 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -63,7 +63,7 @@ in python2Packages.buildPythonApplication {
meta = {
homepage = "https://github.com/NixOS/nixops";
description = "NixOS cloud provisioning and deployment tool";
- maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ];
+ maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ];
platforms = lib.platforms.unix;
license = lib.licenses.lgpl3;
};
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index b6ffe9abc02..c36a488647a 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication {
propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ];
meta = with lib; {
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix
index c1849bdca39..d18d5c1ef8b 100644
--- a/pkgs/tools/security/kwalletcli/default.nix
+++ b/pkgs/tools/security/kwalletcli/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "kwalletcli";
- version = "3.02";
+ version = "3.03";
src = fetchFromGitHub {
owner = "MirBSD";
repo = pname;
rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "1gq45afb5nmmjfqxglv7wvcxcjd9822pc7nysq0350jmmmqwb474";
+ sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck=";
};
postPatch = ''
diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix
index 750a0954d3f..05c0b69c922 100644
--- a/pkgs/tools/system/snooze/default.nix
+++ b/pkgs/tools/system/snooze/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
description = "Tool for waiting until a particular time and then running a command";
maintainers = with maintainers; [ kaction ];
license = licenses.cc0;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix
index 9bde7f388dc..99cfec97a70 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/pkgs/tools/text/mpage/default.nix
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi";
};
- patchPhase = ''
+ postPatch = ''
sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g"
+ substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
meta = {
@@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
license = "liberal"; # a non-copyleft license, see `Copyright' file
homepage = "http://www.mesa.nl/pub/mpage/";
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index db27c1bfd0c..317d29003cd 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libintl }:
stdenv.mkDerivation rec {
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47";
};
+
+ buildInputs = [ libintl ];
+
meta = with lib; {
description = ''
A little program that can be used to compare putatively similar files
@@ -18,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.nongnu.org/numdiff/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [];
- platforms = platforms.gnu ++ platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 63d0c05e543..185b2a41c46 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.poedit.net/";
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
index 19c95dcec63..e2bda04d13f 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
similar ASCII characters, e.g. by stripping diacritics.
'';
maintainers = with lib.maintainers; [ goibhniu ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
index 57ffe95988d..3357404a7d3 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -1,22 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }:
+{ lib, stdenv, fetchurl, autoconf, automake, libiconv }:
stdenv.mkDerivation rec {
pname = "unrtf";
- version = "0.21.9";
+ version = "0.21.10";
src = fetchurl {
- url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz";
- sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
+ url = "https://ftp.gnu.org/gnu/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1bil6z4niydz9gqm2j861dkxmqnpc8m7hvidsjbzz7x63whj17xl";
};
- patches = [
- (fetchpatch {
- name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch";
- url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20";
- sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b";
- })
- ];
-
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libiconv ];
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix
index d36522edb87..7c4ecc49df5 100644
--- a/pkgs/tools/text/yaml-merge/default.nix
+++ b/pkgs/tools/text/yaml-merge/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
description = "Merge YAML data files";
homepage = "https://github.com/abbradar/yaml-merge";
license = licenses.bsd2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 796ea36eacf..1c9e8149232 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec {
description = "A command line interface for Elastic Beanstalk";
maintainers = with maintainers; [ eqyiel ];
license = licenses.asl20;
+ broken = true;
};
}
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 24ecb7f99c3..dfd3321b6b6 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -8,7 +8,6 @@
, requests
, jsonschema
, jsonpatch
-, pytest
, httpretty
, dmidecode
, pytestCheckHook
@@ -17,11 +16,9 @@
, openssh
}:
-let version = "20.3";
-
-in buildPythonApplication {
+buildPythonApplication rec {
pname = "cloud-init";
- inherit version;
+ version = "20.3";
namePrefix = "";
src = fetchFromGitHub {
@@ -81,10 +78,10 @@ in buildPythonApplication {
export TMPDIR=/tmp
'';
- meta = {
+ meta = with lib; {
homepage = "https://cloudinit.readthedocs.org";
description = "Provides configuration and customization of cloud instance";
- maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ];
- platforms = lib.platforms.all;
+ maintainers = with maintainers; [ madjar phile314 ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7f6990c4ffb..7963127787c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -340,6 +340,7 @@ mapAliases ({
liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
liblastfm = libsForQt5.liblastfm; # added 2020-06-14
liblrdf = lrdf; # added 2018-04-25
+ libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
libqrencode = qrencode; # added 2019-01-01
librdf = lrdf; # added 2020-03-22
librecad2 = librecad; # backwards compatibility alias, added 2015-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36e77b1bc5f..ad8bc549b90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12608,6 +12608,8 @@ in
lttv = callPackage ../development/tools/misc/lttv { };
+ luaformatter = callPackage ../development/tools/luaformatter { };
+
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
maven = maven3;
@@ -15492,8 +15494,6 @@ in
libosmocore = callPackage ../applications/misc/libosmocore { };
- libosmpbf = callPackage ../development/libraries/libosmpbf {};
-
libotr = callPackage ../development/libraries/libotr { };
libow = callPackage ../development/libraries/libow { };
@@ -16374,8 +16374,6 @@ in
polkit = callPackage ../development/libraries/polkit { };
- polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
-
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; };
@@ -19286,13 +19284,6 @@ in
];
};
- linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix {
- kernelPatches = [
- kernelPatches.bridge_stp_helper
- kernelPatches.request_key_helper
- ];
- };
-
linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -19315,6 +19306,14 @@ in
];
};
+ linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ kernelPatches.export-rt-sched-migrate
+ ];
+ };
+
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -19570,10 +19569,10 @@ in
# Realtime kernel packages.
linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4;
- linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6;
linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10;
+ linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11;
linuxPackages-rt = linuxPackages-rt_5_4;
- linuxPackages-rt_latest = linuxPackages-rt_5_10;
+ linuxPackages-rt_latest = linuxPackages-rt_5_11;
linux-rt = linuxPackages-rt.kernel;
linux-rt_latest = linuxPackages-rt_latest.kernel;
@@ -19894,6 +19893,8 @@ in
go-migrate = callPackage ../development/tools/go-migrate { };
+ go-mockery = callPackage ../development/tools/go-mockery { };
+
gomacro = callPackage ../development/tools/gomacro { };
gomodifytags = callPackage ../development/tools/gomodifytags { };
@@ -21305,6 +21306,7 @@ in
apostrophe = callPackage ../applications/editors/apostrophe {
pythonPackages = python3Packages;
+ texlive = texlive.combined.scheme-medium;
};
aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { };
@@ -24578,6 +24580,8 @@ in
ponymix = callPackage ../applications/audio/ponymix { };
+ pothos = libsForQt5.callPackage ../applications/radio/pothos { };
+
potrace = callPackage ../applications/graphics/potrace {};
posterazor = callPackage ../applications/misc/posterazor { };
@@ -29467,6 +29471,8 @@ in
sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {});
+ senv = callPackage ../applications/misc/senv { };
+
brlaser = callPackage ../misc/cups/drivers/brlaser { };
fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0b2c548c1e0..51dd6c257b2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -242,6 +242,8 @@ let
digestif = callPackage ../development/ocaml-modules/digestif { };
+ directories = callPackage ../development/ocaml-modules/directories { };
+
dispatch = callPackage ../development/ocaml-modules/dispatch { };
dns = callPackage ../development/ocaml-modules/dns { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a40c4dbefe..8b9aeb03aaf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6927,6 +6927,8 @@ in {
rfc7464 = callPackage ../development/python-modules/rfc7464 { };
+ rfcat = callPackage ../development/python-modules/rfcat { };
+
rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { });
rich = callPackage ../development/python-modules/rich { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 223132217a5..336f58adf11 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -127,7 +127,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { };
- polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
+ polkit-qt = callPackage ../development/libraries/polkit-qt-1 { };
poppler = callPackage ../development/libraries/poppler {
lcms = pkgs.lcms2;