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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-29 18:01:11 +00:00
committed by GitHub
parent 391c51a79d 3936313b1f
commit 96f61ee5f2
102 changed files with 1299 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -7477,6 +7477,12 @@
email = "natedevv@gmail.com";
name = "Nathan Moore";
};
nathanruiz = {
email = "nathanruiz@protonmail.com";
github = "nathanruiz";
githubId = 18604892;
name = "Nathan Ruiz";
};
nathan-gs = {
email = "nathan@nathan.gs";
github = "nathan-gs";
nixos/modules/services/cluster/kubernetes/addons/dns.nix
+40 -14
View File
@@ -60,6 +60,45 @@ in {
sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw";
};
};
corefile = mkOption {
description = ''
Custom coredns corefile configuration.
See: <link xlink:href="https://coredns.io/manual/toc/#configuration"/>.
'';
type = types.str;
default = ''
.:${toString ports.dns} {
errors
health :${toString ports.health}
kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
}
prometheus :${toString ports.metrics}
forward . /etc/resolv.conf
cache 30
loop
reload
loadbalance
}'';
defaultText = ''
.:${toString ports.dns} {
errors
health :${toString ports.health}
kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
}
prometheus :${toString ports.metrics}
forward . /etc/resolv.conf
cache 30
loop
reload
loadbalance
}'';
};
};
config = mkIf cfg.enable {
@@ -151,20 +190,7 @@ in {
namespace = "kube-system";
};
data = {
Corefile = ".:${toString ports.dns} {
errors
health :${toString ports.health}
kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
}
prometheus :${toString ports.metrics}
forward . /etc/resolv.conf
cache 30
loop
reload
loadbalance
}";
Corefile = cfg.corefile;
};
};
nixos/modules/services/networking/firewall.nix
+4
View File
@@ -339,6 +339,8 @@ in
description =
''
Whether to log rejected or dropped incoming connections.
Note: The logs are found in the kernel logs, i.e. dmesg
or journalctl -k.
'';
};
@@ -350,6 +352,8 @@ in
Whether to log all rejected or dropped incoming packets.
This tends to give a lot of log messages, so it's mostly
useful for debugging.
Note: The logs are found in the kernel logs, i.e. dmesg
or journalctl -k.
'';
};
nixos/modules/services/networking/syncthing.nix
+293 -278
View File
@@ -5,15 +5,16 @@ with lib;
let
cfg = config.services.syncthing;
defaultUser = "syncthing";
defaultGroup = defaultUser;
devices = mapAttrsToList (name: device: {
deviceID = device.id;
inherit (device) name addresses introducer;
}) cfg.declarative.devices;
}) cfg.devices;
folders = mapAttrsToList ( _: folder: {
inherit (folder) path id label type;
devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices;
devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
rescanIntervalS = folder.rescanInterval;
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
@@ -23,7 +24,7 @@ let
}) (filterAttrs (
_: folder:
folder.enable
) cfg.declarative.folders);
) cfg.folders);
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
@@ -50,9 +51,9 @@ let
# generate the new config by merging with the NixOS config options
new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
"devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + .devices"}),
"folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + .folders"})
} * ${builtins.toJSON cfg.declarative.extraOptions}')
"devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
"folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
} * ${builtins.toJSON cfg.extraOptions}')
# send the new config
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
@@ -68,172 +69,177 @@ in {
options = {
services.syncthing = {
enable = mkEnableOption ''
Syncthing - the self-hosted open-source alternative
to Dropbox and Bittorrent Sync. Initial interface will be
available on http://127.0.0.1:8384/.
'';
enable = mkEnableOption
"Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";
declarative = {
cert = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Path to users cert.pem file, will be copied into Syncthing's
<literal>configDir</literal>
'';
};
cert = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Path to the <literal>cert.pem</literal> file, which will be copied into Syncthing's
<link linkend="opt-services.syncthing.configDir">configDir</link>.
'';
};
key = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Path to users key.pem file, will be copied into Syncthing's
<literal>configDir</literal>
'';
};
key = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Path to the <literal>key.pem</literal> file, which will be copied into Syncthing's
<link linkend="opt-services.syncthing.configDir">configDir</link>.
'';
};
overrideDevices = mkOption {
type = types.bool;
default = true;
description = ''
Whether to delete the devices which are not configured via the
<literal>declarative.devices</literal> option.
If set to false, devices added via the webinterface will
persist but will have to be deleted manually.
'';
};
overrideDevices = mkOption {
type = types.bool;
default = true;
description = ''
Whether to delete the devices which are not configured via the
<link linkend="opt-services.syncthing.devices">devices</link> option.
If set to <literal>false</literal>, devices added via the web
interface will persist and will have to be deleted manually.
'';
};
devices = mkOption {
default = {};
description = ''
Peers/devices which Syncthing should communicate with.
'';
example = {
bigbox = {
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
addresses = [ "tcp://192.168.0.10:51820" ];
};
devices = mkOption {
default = {};
description = ''
Peers/devices which Syncthing should communicate with.
Note that you can still add devices manually, but those changes
will be reverted on restart if <link linkend="opt-services.syncthing.overrideDevices">overrideDevices</link>
is enabled.
'';
example = {
bigbox = {
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
addresses = [ "tcp://192.168.0.10:51820" ];
};
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
name = mkOption {
type = types.str;
default = name;
description = ''
Name of the device
'';
};
addresses = mkOption {
type = types.listOf types.str;
default = [];
description = ''
The addresses used to connect to the device.
If this is let empty, dynamic configuration is attempted
'';
};
id = mkOption {
type = types.str;
description = ''
The id of the other peer, this is mandatory. It's documented at
https://docs.syncthing.net/dev/device-ids.html
'';
};
introducer = mkOption {
type = types.bool;
default = false;
description = ''
If the device should act as an introducer and be allowed
to add folders on this computer.
'';
};
};
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
name = mkOption {
type = types.str;
default = name;
description = ''
The name of the device.
'';
};
}));
};
overrideFolders = mkOption {
type = types.bool;
default = true;
description = ''
Whether to delete the folders which are not configured via the
<literal>declarative.folders</literal> option.
If set to false, folders added via the webinterface will persist
but will have to be deleted manually.
'';
};
addresses = mkOption {
type = types.listOf types.str;
default = [];
description = ''
The addresses used to connect to the device.
If this is left empty, dynamic configuration is attempted.
'';
};
folders = mkOption {
default = {};
description = ''
Folders which should be shared by Syncthing.
'';
example = literalExample ''
{
"/home/user/sync" = {
id = "syncme";
devices = [ "bigbox" ];
};
}
'';
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
id = mkOption {
type = types.str;
description = ''
The device ID. See <link xlink:href="https://docs.syncthing.net/dev/device-ids.html"/>.
'';
};
enable = mkOption {
type = types.bool;
default = true;
description = ''
share this folder.
This option is useful when you want to define all folders
in one place, but not every machine should share all folders.
'';
};
introducer = mkOption {
type = types.bool;
default = false;
description = ''
Whether the device should act as an introducer and be allowed
to add folders on this computer.
See <link xlink:href="https://docs.syncthing.net/users/introducer.html"/>.
'';
};
path = mkOption {
type = types.str;
default = name;
description = ''
The path to the folder which should be shared.
'';
};
};
}));
};
id = mkOption {
type = types.str;
default = name;
description = ''
The id of the folder. Must be the same on all devices.
'';
};
overrideFolders = mkOption {
type = types.bool;
default = true;
description = ''
Whether to delete the folders which are not configured via the
<link linkend="opt-services.syncthing.folders">folders</link> option.
If set to <literal>false</literal>, folders added via the web
interface will persist and will have to be deleted manually.
'';
};
label = mkOption {
type = types.str;
default = name;
description = ''
The label of the folder.
'';
};
folders = mkOption {
default = {};
description = ''
Folders which should be shared by Syncthing.
devices = mkOption {
type = types.listOf types.str;
default = [];
description = ''
The devices this folder should be shared with. Must be defined
in the <literal>declarative.devices</literal> attribute.
'';
};
Note that you can still add devices manually, but those changes
will be reverted on restart if <link linkend="opt-services.syncthing.overrideDevices">overrideDevices</link>
is enabled.
'';
example = literalExample ''
{
"/home/user/sync" = {
id = "syncme";
devices = [ "bigbox" ];
};
}
'';
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
versioning = mkOption {
default = null;
description = ''
How to keep changed/deleted files with Syncthing.
There are 4 different types of versioning with different parameters.
See https://docs.syncthing.net/users/versioning.html
'';
example = [
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to share this folder.
This option is useful when you want to define all folders
in one place, but not every machine should share all folders.
'';
};
path = mkOption {
type = types.str;
default = name;
description = ''
The path to the folder which should be shared.
'';
};
id = mkOption {
type = types.str;
default = name;
description = ''
The ID of the folder. Must be the same on all devices.
'';
};
label = mkOption {
type = types.str;
default = name;
description = ''
The label of the folder.
'';
};
devices = mkOption {
type = types.listOf types.str;
default = [];
description = ''
The devices this folder should be shared with. Each device must
be defined in the <link linkend="opt-services.syncthing.devices">devices</link> option.
'';
};
versioning = mkOption {
default = null;
description = ''
How to keep changed/deleted files with Syncthing.
There are 4 different types of versioning with different parameters.
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
'';
example = literalExample ''
[
{
versioning = {
type = "simple";
@@ -259,98 +265,99 @@ in {
{
versioning = {
type = "external";
params.versionsPath = pkgs.writers.writeBash "backup" ''
params.versionsPath = pkgs.writers.writeBash "backup" '''
folderpath="$1"
filepath="$2"
rm -rf "$folderpath/$filepath"
'';
''';
};
}
];
type = with types; nullOr (submodule {
options = {
type = mkOption {
type = enum [ "external" "simple" "staggered" "trashcan" ];
description = ''
Type of versioning.
See https://docs.syncthing.net/users/versioning.html
'';
};
params = mkOption {
type = attrsOf (either str path);
description = ''
Parameters for versioning. Structure depends on versioning.type.
See https://docs.syncthing.net/users/versioning.html
'';
};
]
'';
type = with types; nullOr (submodule {
options = {
type = mkOption {
type = enum [ "external" "simple" "staggered" "trashcan" ];
description = ''
The type of versioning.
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
'';
};
});
};
rescanInterval = mkOption {
type = types.int;
default = 3600;
description = ''
How often the folders should be rescaned for changes.
'';
};
type = mkOption {
type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
default = "sendreceive";
description = ''
Whether to send only changes from this folder, only receive them
or propagate both.
'';
};
watch = mkOption {
type = types.bool;
default = true;
description = ''
Whether the folder should be watched for changes by inotify.
'';
};
watchDelay = mkOption {
type = types.int;
default = 10;
description = ''
The delay after an inotify event is triggered.
'';
};
ignorePerms = mkOption {
type = types.bool;
default = true;
description = ''
Whether to propagate permission changes.
'';
};
ignoreDelete = mkOption {
type = types.bool;
default = false;
description = ''
Whether to delete files in destination. See <link
xlink:href="https://docs.syncthing.net/advanced/folder-ignoredelete.html">
upstream's docs</link>.
'';
};
params = mkOption {
type = attrsOf (either str path);
description = ''
The parameters for versioning. Structure depends on
<link linkend="opt-services.syncthing.folders._name_.versioning.type">versioning.type</link>.
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
'';
};
};
});
};
}));
};
extraOptions = mkOption {
type = types.addCheck (pkgs.formats.json {}).type isAttrs;
default = {};
description = ''
Extra configuration options for Syncthing.
'';
example = {
options.localAnnounceEnabled = false;
gui.theme = "black";
rescanInterval = mkOption {
type = types.int;
default = 3600;
description = ''
How often the folder should be rescanned for changes.
'';
};
type = mkOption {
type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
default = "sendreceive";
description = ''
Whether to only send changes for this folder, only receive them
or both.
'';
};
watch = mkOption {
type = types.bool;
default = true;
description = ''
Whether the folder should be watched for changes by inotify.
'';
};
watchDelay = mkOption {
type = types.int;
default = 10;
description = ''
The delay after an inotify event is triggered.
'';
};
ignorePerms = mkOption {
type = types.bool;
default = true;
description = ''
Whether to ignore permission changes.
'';
};
ignoreDelete = mkOption {
type = types.bool;
default = false;
description = ''
Whether to skip deleting files that are deleted by peers.
See <link xlink:href="https://docs.syncthing.net/advanced/folder-ignoredelete.html"/>.
'';
};
};
}));
};
extraOptions = mkOption {
type = types.addCheck (pkgs.formats.json {}).type isAttrs;
default = {};
description = ''
Extra configuration options for Syncthing.
See <link xlink:href="https://docs.syncthing.net/users/config.html"/>.
'';
example = {
options.localAnnounceEnabled = false;
gui.theme = "black";
};
};
@@ -358,31 +365,35 @@ in {
type = types.str;
default = "127.0.0.1:8384";
description = ''
Address to serve the GUI.
The address to serve the web interface at.
'';
};
systemService = mkOption {
type = types.bool;
default = true;
description = "Auto launch Syncthing as a system service.";
description = ''
Whether to auto-launch Syncthing as a system service.
'';
};
user = mkOption {
type = types.str;
default = defaultUser;
example = "yourUser";
description = ''
Syncthing will be run under this user (user will be created if it doesn't exist.
This can be your user name).
The user to run Syncthing as.
By default, a user named <literal>${defaultUser}</literal> will be created.
'';
};
group = mkOption {
type = types.str;
default = defaultUser;
default = defaultGroup;
example = "yourGroup";
description = ''
Syncthing will be run under this group (group will not be created if it doesn't exist.
This can be your user name).
The group to run Syncthing under.
By default, a group named <literal>${defaultGroup}</literal> will be created.
'';
};
@@ -391,63 +402,67 @@ in {
default = null;
example = "socks5://address.com:1234";
description = ''
Overwrites all_proxy environment variable for the Syncthing process to
the given value. This is normaly used to let relay client connect
through SOCKS5 proxy server.
Overwrites the all_proxy environment variable for the Syncthing process to
the given value. This is normally used to let Syncthing connect
through a SOCKS5 proxy server.
See <link xlink:href="https://docs.syncthing.net/users/proxying.html"/>.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/syncthing";
example = "/home/yourUser";
description = ''
Path where synced directories will exist.
The path where synchronised directories will exist.
'';
};
configDir = mkOption {
configDir = let
cond = versionAtLeast config.system.stateVersion "19.03";
in mkOption {
type = types.path;
description = ''
Path where the settings and keys will exist.
The path where the settings and keys will exist.
'';
default =
let
nixos = config.system.stateVersion;
cond = versionAtLeast nixos "19.03";
in cfg.dataDir + (optionalString cond "/.config/syncthing");
default = cfg.dataDir + (optionalString cond "/.config/syncthing");
defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}";
};
openDefaultPorts = mkOption {
type = types.bool;
default = false;
example = literalExample "true";
example = true;
description = ''
Open the default ports in the firewall:
- TCP 22000 for transfers
- UDP 21027 for discovery
If multiple users are running Syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.
Alternatively, if are running only a single instance on this machine using the default ports, enable this.
Whether to open the default ports in the firewall: TCP 22000 for transfers
and UDP 21027 for discovery.
If multiple users are running Syncthing on this machine, you will need
to manually open a set of ports for each instance and leave this disabled.
Alternatively, if you are running only a single instance on this machine
using the default ports, enable this.
'';
};
package = mkOption {
type = types.package;
default = pkgs.syncthing;
defaultText = "pkgs.syncthing";
example = literalExample "pkgs.syncthing";
defaultText = literalExample "pkgs.syncthing";
description = ''
Syncthing package to use.
The Syncthing package to use.
'';
};
};
};
imports = [
(mkRemovedOptionModule ["services" "syncthing" "useInotify"] ''
(mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] ''
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
It can be enabled on a per-folder basis through the webinterface.
It can be enabled on a per-folder basis through the web interface.
'')
];
] ++ map (o:
mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ]
) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"];
###### implementation
@@ -470,8 +485,8 @@ in {
};
};
users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
${defaultUser}.gid =
users.groups = mkIf (cfg.systemService && cfg.group == defaultGroup) {
${defaultGroup}.gid =
config.ids.gids.syncthing;
};
@@ -491,14 +506,14 @@ in {
RestartForceExitStatus="3 4";
User = cfg.user;
Group = cfg.group;
ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null)
ExecStartPre = mkIf (cfg.cert != null || cfg.key != null)
"+${pkgs.writers.writeBash "syncthing-copy-keys" ''
install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir}
${optionalString (cfg.declarative.cert != null) ''
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem
${optionalString (cfg.cert != null) ''
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem
''}
${optionalString (cfg.declarative.key != null) ''
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem
${optionalString (cfg.key != null) ''
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
''}
''}"
;
@@ -529,7 +544,7 @@ in {
};
};
syncthing-init = mkIf (
cfg.declarative.devices != {} || cfg.declarative.folders != {} || cfg.declarative.extraOptions != {}
cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
) {
description = "Syncthing configuration updater";
after = [ "syncthing.service" ];
nixos/tests/syncthing-init.nix
+7 -9
View File
@@ -9,16 +9,14 @@ in {
machine = {
services.syncthing = {
enable = true;
declarative = {
devices.testDevice = {
id = testId;
};
folders.testFolder = {
path = "/tmp/test";
devices = [ "testDevice" ];
};
extraOptions.gui.user = "guiUser";
devices.testDevice = {
id = testId;
};
folders.testFolder = {
path = "/tmp/test";
devices = [ "testDevice" ];
};
extraOptions.gui.user = "guiUser";
};
};
pkgs/applications/networking/ipfs-cluster/default.nix
+4 -8
View File
@@ -2,19 +2,15 @@
buildGoModule rec {
pname = "ipfs-cluster";
version = "0.13.1";
version = "0.14.0";
vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh";
patches = [
./test.patch
];
vendorSha256 = "sha256-I8UJxqzbcOE6pHsKkktrEXVHurxwe0D20GZZmASdWH4=";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
rev = "v${version}";
sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8";
sha256 = "sha256-lB0sYsbZfUJgQVNEFLoXNFszWYxlXNEQbRQWA7fRT2A=";
};
meta = with lib; {
@@ -22,6 +18,6 @@ buildGoModule rec {
homepage = "https://cluster.ipfs.io/";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ jglukasik ];
maintainers = with maintainers; [ Luflosi jglukasik ];
};
}
pkgs/applications/networking/ipfs-cluster/test.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/peer_manager_test.go b/peer_manager_test.go
index 521e754..cf0d777 100644
--- a/peer_manager_test.go
+++ b/peer_manager_test.go
@@ -76,6 +76,7 @@ func clusterAddr(c *Cluster) ma.Multiaddr {
}
func TestClustersPeerAdd(t *testing.T) {
+ t.Skip("test is disabld by nixos")
ctx := context.Background()
clusters, mocks, boot := peerManagerClusters(t)
defer shutdownClusters(t, clusters, mocks)
pkgs/applications/networking/irc/convos/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "6.24";
version = "6.26";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx";
sha256 = "1wh3ryhd4b7nanh0yp2nycmhky5afw8lpfx34858p6wfimsv9794";
};
nativeBuildInputs = [ makeWrapper ]
pkgs/applications/networking/sync/unison/default.nix
+39 -27
View File
@@ -1,12 +1,22 @@
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem
, enableX11 ? true}:
let inherit (ocamlPackages) ocaml lablgtk; in
stdenv.mkDerivation (rec {
{ lib
, stdenv
, fetchFromGitHub
, ocamlPackages
, fontschumachermisc
, xset
, makeWrapper
, ncurses
, gnugrep
, fetchpatch
, copyDesktopItems
, makeDesktopItem
, enableX11 ? true
}:
stdenv.mkDerivation rec {
pname = "unison";
version = "2.51.3";
src = fetchFromGitHub {
owner = "bcpierce00";
repo = "unison";
@@ -14,8 +24,9 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
};
nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);
buildInputs = [ ocaml ncurses ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optional enableX11 copyDesktopItems;
buildInputs = [ ocamlPackages.ocaml ncurses ];
patches = [
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
@@ -27,20 +38,22 @@ stdenv.mkDerivation (rec {
})
];
preBuild = (lib.strings.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
'') + ''
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
preBuild = lib.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
'' + ''
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
'';
makeFlags = [
"INSTALLDIR=$(out)/bin/"
"UISTYLE=${if enableX11 then "gtk2" else "text"}"
] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false";
preInstall = "mkdir -p $out/bin";
preInstall = ''
mkdir -p $out/bin
'';
postInstall = lib.strings.optionalString enableX11 ''
postInstall = lib.optionalString enableX11 ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
@@ -49,9 +62,9 @@ stdenv.mkDerivation (rec {
install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
'';
dontStrip = !ocaml.nativeCompilers;
dontStrip = !ocamlPackages.ocaml.nativeCompilers;
desktopItems = lib.lists.optional enableX11 (makeDesktopItem {
desktopItems = lib.optional enableX11 (makeDesktopItem {
name = pname;
desktopName = "Unison";
comment = "Bidirectional file synchronizer";
@@ -59,19 +72,18 @@ stdenv.mkDerivation (rec {
exec = "unison";
icon = "unison";
categories = "Utility;FileTools;GTK;";
extraDesktopEntries={
StartupWMClass="Unison";
StartupNotify="true";
X-MultipleArgs="false";
extraDesktopEntries = {
StartupWMClass = "Unison";
StartupNotify = "true";
X-MultipleArgs = "false";
};
});
meta = {
meta = with lib; {
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
description = "Bidirectional file synchronizer";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; unix;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric ];
platforms = platforms.unix;
};
})
}
pkgs/applications/science/biology/mosdepth/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@ let
in stdenv.mkDerivation rec {
pname = "mosdepth";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "brentp";
repo = "mosdepth";
rev = "v${version}";
sha256 = "1kcrvamrafz1m0s7mlbhaay8jyg97l1w37p6syl36r2m1plmwxjd";
sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ=";
};
nativeBuildInputs = [ nim ];
pkgs/data/fonts/scheherazade/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ lib, fetchzip, version ? "3.100" }:
{ lib, fetchzip, version ? "3.200" }:
let
new = lib.versionAtLeast version "3.000";
sha256 = {
"2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
"3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7";
"3.200" = "0qvmpsn6ja3g2hlvq0vb9pjsyk6ibna7s3w3n6q7lnhk0rhjg8bv";
}."${version}";
in fetchzip rec {
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/51c018b566e360a908addb7fcabf98fc0fbaafbe.tar.gz",
"sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85",
"msg": "Update from Hackage at 2021-07-21T05:42:12Z"
"commit": "e40930a03e038e12969b8eac001e86d7aa7355b4",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz",
"sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc",
"msg": "Update from Hackage at 2021-07-26T15:54:23Z"
}
pkgs/development/haskell-modules/cabal2nix-unstable.nix
+3 -3
View File
@@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-07-08";
version = "unstable-2021-07-21";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz";
sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk";
url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz";
sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn";
};
isLibrary = true;
isExecutable = true;
pkgs/development/haskell-modules/configuration-common.nix
+3 -6
View File
@@ -1711,14 +1711,13 @@ self: super: {
excludes = ["test/buildtest"];
});
# workaround for https://github.com/peti/distribution-nixpkgs/issues/9
pam = super.pam.override { inherit (pkgs) pam; };
# Too strict version bounds on base:
# https://github.com/obsidiansystems/database-id/issues/1
database-id-class = doJailbreak super.database-id-class;
cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {
cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override {
distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
}) {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
};
@@ -1869,8 +1868,6 @@ EOT
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
# Too strict bounds on QuickCheck
# https://github.com/muesli4/table-layout/issues/16
table-layout = doJailbreak super.table-layout;
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
-4
View File
@@ -84,8 +84,4 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
}));
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = self.hackage-db_2_1_0;
}
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
-4
View File
@@ -106,8 +106,4 @@ self: super: {
# https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
-3
View File
@@ -136,7 +136,4 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
vector = dontCheck super.vector;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+5 -1
View File
@@ -1219,6 +1219,7 @@ broken-packages:
- EnumMap
- enummapmap
- enum-utf8
- env-extra
- env-parser
- envstatus
- epanet-haskell
@@ -1607,6 +1608,7 @@ broken-packages:
- ghc-syb-utils
- ghc-tags
- ghc-tags-core
- ghc-tcplugin-api
- ghc-time-alloc-prof
- ghc-usage
- gh-labeler
@@ -2307,6 +2309,7 @@ broken-packages:
- hs-tags
- hstats
- hstatsd
- hs-term-emulator
- hstest
- hstidy
- hs-twitter
@@ -4531,7 +4534,7 @@ broken-packages:
- streaming-utils
- streaming-with
- streamly-examples
- streamly-fsnotify
- streamly-process
- stream-monad
- streamproc
- StrictBench
@@ -4652,6 +4655,7 @@ broken-packages:
- tapioca
- TaskMonad
- tasty-auto
- tasty-checklist
- tasty-fail-fast
- tasty-grading-system
- tasty-hedgehog-coverage
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+7 -3
View File
@@ -85,8 +85,13 @@ default-package-overrides:
- dual-tree < 0.2.3.0
- diagrams-core < 1.5.0
- diagrams-lib < 1.4.4
# streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot
- streamly-bytestring == 0.1.2
# streamly-* packages which are not in stackage and to be constrained
# as long as we have streamly < 0.8.0
- streamly-archive < 0.1.0
- streamly-bytestring < 0.1.3
- streamly-lmdb < 0.3.0
- streamly-process
- distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@@ -113,7 +118,6 @@ extra-packages:
- sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
package-maintainers:
abbradar:
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+26 -24
View File
@@ -1,4 +1,4 @@
# Stackage LTS 18.2
# Stackage LTS 18.4
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -895,7 +895,7 @@ default-package-overrides:
- ghc-lib-parser-ex ==8.10.0.21
- ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.8
- ghc-prof ==1.4.1.9
- ghc-source-gen ==0.4.1.0
- ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.2
@@ -963,7 +963,7 @@ default-package-overrides:
- gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1
- H ==0.9.0.1
- hackage-db ==2.1.1
- hackage-db ==2.1.2
- hackage-security ==0.6.0.1
- haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3
@@ -1244,7 +1244,7 @@ default-package-overrides:
- inline-c-cpp ==0.4.0.3
- inline-r ==0.10.4
- inliterate ==0.1.0
- input-parsers ==0.2.2
- input-parsers ==0.2.3
- insert-ordered-containers ==0.2.5
- inspection-testing ==0.4.5.0
- instance-control ==0.1.2.0
@@ -1308,7 +1308,7 @@ default-package-overrides:
- json-rpc-generic ==0.2.1.5
- JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.5.1
- JuicyPixels-extra ==0.5.2
- JuicyPixels-scale-dct ==0.1.2
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
@@ -1330,7 +1330,7 @@ default-package-overrides:
- kmeans ==0.1.3
- koji ==0.0.2
- koofr-client ==1.0.0.3
- krank ==0.2.2
- krank ==0.2.3
- kubernetes-webhook-haskell ==0.2.0.3
- l10n ==0.1.0.1
- labels ==0.3.3
@@ -1389,7 +1389,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2
- libyaml ==0.1.2
- LibZip ==1.0.1
- lifted-async ==0.10.2
- lifted-async ==0.10.2.1
- lifted-base ==0.2.3.12
- lift-generics ==0.2
- lift-type ==0.1.0.1
@@ -1437,6 +1437,7 @@ default-package-overrides:
- lukko ==0.1.1.3
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.1
- machines ==0.7.2
- machines-binary ==7.0.0.0
@@ -1555,7 +1556,7 @@ default-package-overrides:
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1
- mongoDB ==2.7.1.1
- monoid-subclasses ==1.1
- monoid-subclasses ==1.1.1
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0
@@ -1647,7 +1648,7 @@ default-package-overrides:
- nqe ==0.6.3
- nri-env-parser ==0.1.0.7
- nri-observability ==0.1.1.1
- nri-prelude ==0.6.0.2
- nri-prelude ==0.6.0.3
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@@ -1867,7 +1868,7 @@ default-package-overrides:
- prospect ==0.1.0.0
- proto3-wire ==1.2.2
- protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0
- protobuf-simple ==0.1.1.1
- protocol-buffers ==2.4.17
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
@@ -1923,7 +1924,7 @@ default-package-overrides:
- Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- rank2classes ==1.4.1
- rank2classes ==1.4.2
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.15
@@ -1969,13 +1970,13 @@ default-package-overrides:
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.0
- regex-posix ==0.96.0.1
- regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- relational-query ==0.12.2.3
- relational-query ==0.12.3.0
- relational-query-HDBC ==0.7.2.0
- relational-record ==0.2.2.0
- relational-schemas ==0.1.8.0
@@ -2015,6 +2016,7 @@ default-package-overrides:
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
- rpm-nvr ==0.1.0
- rp-tree ==0.6
- RSA ==2.4.1
- runmemo ==1.0.0.1
@@ -2039,7 +2041,7 @@ default-package-overrides:
- sandwich ==0.1.0.8
- sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4
- sandwich-webdriver ==0.1.0.5
- sandwich-webdriver ==0.1.0.6
- say ==0.1.0.1
- sbp ==2.6.3
- sbv ==8.15
@@ -2122,7 +2124,7 @@ default-package-overrides:
- SHA ==1.6.4.4
- shake ==0.19.5
- shake-language-c ==0.12.0
- shake-plus ==0.3.3.1
- shake-plus ==0.3.4.0
- shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25
- shared-memory ==0.2.0.0
@@ -2214,14 +2216,14 @@ default-package-overrides:
- squeather ==0.8.0.0
- srcloc ==0.6
- stache ==2.3.0
- stack ==2.7.1
- stack ==2.7.3
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
- StateVar ==1.2.1
- static-text ==0.2.0.6
- static-text ==0.2.0.7
- statistics ==0.15.2.0
- status-notifier-item ==0.3.0.5
- status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.3
- step-function ==0.2
- stm-chans ==3.0.0.4
@@ -2408,7 +2410,7 @@ default-package-overrides:
- th-test-utils ==1.1.0
- th-utilities ==0.2.4.3
- thyme ==0.3.5.5
- tidal ==1.7.7
- tidal ==1.7.8
- tile ==0.3.0.0
- time-compat ==1.9.5
- timeit ==2.0
@@ -2519,7 +2521,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.18
- unliftio ==0.2.19
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@@ -2625,7 +2627,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.3.3.0
- witch ==0.3.4.0
- witherable ==0.4.1
- within ==0.2.0.1
- with-location ==0.1.0
@@ -2686,13 +2688,13 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1
- yesod-core ==1.6.20.2
- yesod-core ==1.6.21.0
- yesod-fb ==0.6.1
- yesod-form ==1.7.0
- yesod-gitrev ==0.2.1
- yesod-gitrev ==0.2.2
- yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.8
- yesod-page-cursor ==2.0.0.9
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+3
View File
@@ -1837,6 +1837,7 @@ dont-distribute-packages:
- keid-geometry
- keid-render-basic
- keid-resource-gltf
- keid-sound-openal
- keid-ui-dearimgui
- kevin
- keysafe
@@ -2346,6 +2347,7 @@ dont-distribute-packages:
- polysemy-log-co
- polysemy-log-di
- polysemy-methodology
- polysemy-methodology-co-log
- polysemy-methodology-composite
- polysemy-mocks
- polysemy-optics
@@ -2355,6 +2357,7 @@ dont-distribute-packages:
- polysemy-readline
- polysemy-req
- polysemy-resume
- polysemy-several
- polysemy-socket
- polysemy-test
- polysemy-time
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+590 -714
View File
File diff suppressed because it is too large Load Diff
pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
};
patches = lib.lists.optional withTracing ./tracing.patch;
patches = lib.optional withTracing ./tracing.patch;
nativeBuildInputs = [ cmake ];
buildInputs = [ opencl-headers ];
pkgs/development/libraries/libayatana-appindicator/default.nix
+4 -4
View File
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
propagatedBuildInputs =
lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
preAutoreconf = ''
gtkdocize
pkgs/development/libraries/libayatana-indicator/default.nix
+2 -2
View File
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ ayatana-ido ]
++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
++ lib.optionals (gtkVersion == "2") [ gtk2 ]
++ lib.optionals (gtkVersion == "3") [ gtk3 ];
configureFlags = [ "--with-gtk=${gtkVersion}" ];
pkgs/development/libraries/libcouchbase/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcouchbase";
version = "3.1.4";
version = "3.2.0";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
sha256 = "sha256-6IBTUodKpE/RkqQb0IwSEgXfnIhfYyNNrZt5hxJ6DV8=";
sha256 = "sha256-8//FEWXXcp/COHj10l4jysaLobzZIl65RCYz/HgL+kc=";
};
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
pkgs/development/libraries/libffcall/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libffcall";
version = "2.1";
version = "2.2";
src = fetchurl {
url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz";
sha256 = "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0";
sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c=";
};
enableParallelBuilding = false;
pkgs/development/python-modules/bootstrapped-pip/2.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name
pkgs/development/python-modules/bootstrapped-pip/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'' + ''
# Give folders a known name
pkgs/development/python-modules/environmental-override/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "environmental-override";
version = "0.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "1vhd37i6f8xh6kd61yxc2ynzgcln7v2p7fyzjmhbkdnws6gwfs6s";
};
# No tests have been written for this library.
doCheck = false;
pythonImportsCheck = [ "environmental_override" ];
meta = {
description = "Easily configure apps using simple environmental overrides";
homepage = "https://github.com/coddingtonbear/environmental-override";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nathanruiz ];
};
}
pkgs/development/python-modules/pyiqvia/default.nix
+10 -5
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyiqvia";
version = "1.0.0";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,12 +21,16 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-6BbJgRpn2hivm4N3Zpll9NACMSNlIhxj8CF2iVduIro=";
sha256 = "18qzxxn9xw9rwv3qz8k3zxh9xxy8c7rs8xlsrdrcq9wb0dhd7p0r";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [ aiohttp ];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
@@ -36,7 +40,8 @@ buildPythonPackage rec {
];
# Ignore the examples as they are prefixed with test_
pytestFlagsArray = [ "--ignore examples/" ];
disabledTestPaths = [ "examples/" ];
pythonImportsCheck = [ "pyiqvia" ];
meta = with lib; {
pkgs/development/python-modules/setuptools/44.0.nix
+1 -1
View File
@@ -61,7 +61,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';
pkgs/development/python-modules/setuptools/default.nix
+1 -1
View File
@@ -62,7 +62,7 @@ in buildPythonPackage rec {
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';
pkgs/development/python-modules/sphinxext-opengraph/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, sphinx
}:
buildPythonPackage rec {
pname = "sphinxext-opengraph";
version = "0.4.2";
src = fetchFromGitHub {
owner = "wpilibsuite";
repo = "sphinxext-opengraph";
rev = "v${version}";
sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY=";
};
propagatedBuildInputs = [
sphinx
];
doCheck = false; # no tests
pythonImportsCheck = [ "sphinxext.opengraph" ];
meta = with lib; {
description = "Sphinx extension to generate unique OpenGraph metadata";
homepage = "https://github.com/wpilibsuite/sphinxext-opengraph";
license = licenses.mit;
maintainers = with maintainers; [ Luflosi ];
};
}
pkgs/development/python-modules/trezor/default.nix
+2 -7
View File
@@ -24,20 +24,15 @@
buildPythonPackage rec {
pname = "trezor";
version = "0.12.2";
version = "0.12.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv";
sha256 = "02c39c333435b8f6dc62cc79bb5bf35fc7f0eb144a1a748be3b7c065ee3e85ae";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'click>=7,<8' 'click>=7,<9'
'';
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [
pkgs/development/tools/analysis/flow/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ])
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
pkgs/development/tools/vagrant/default.nix
+2 -2
View File
@@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
version = "2.2.17";
version = "2.2.18";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "sha256-T48ui7jgq9ni3pC09Jd2WzkT9PBaJ+SUDfcXA5QMjM8=";
sha256 = "sha256-NQiwkGuDLXMXyNNiIHmOwnS3IefvY9DPmRxo8Z2drpA=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
pkgs/development/tools/vagrant/gemset.nix
+7 -7
View File
@@ -64,10 +64,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl";
sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a";
type = "gem";
};
version = "0.84.0";
version = "0.85.0";
};
ffi = {
groups = ["default"];
@@ -138,10 +138,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj";
sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh";
type = "gem";
};
version = "3.5.1";
version = "3.6.0";
};
little-plugger = {
groups = ["default"];
@@ -310,15 +310,15 @@
version = "2.3.2";
};
vagrant_cloud = {
dependencies = ["excon" "log4r"];
dependencies = ["excon" "log4r" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rwfw014fbvaxshf8abi87srfaiirb7cr93s61qm177jm8q86h57";
sha256 = "0np0d8rjca130si5iaxasbqmfbbx4l3kd9mxdsa3p5mqiia7za3b";
type = "gem";
};
version = "3.0.4";
version = "3.0.5";
};
wdm = {
groups = ["default"];
pkgs/servers/adguardhome/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "adguardhome";
pname = "adguardhome";
version = "0.106.3";
src = fetchurl {
pkgs/servers/apcupsd/default.nix
+2 -2
View File
@@ -6,10 +6,10 @@ assert enableCgiScripts -> gd != null;
stdenv.mkDerivation rec {
pname = "apcupsd";
name = "${pname}-3.14.14";
version = "3.14.14";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
};
pkgs/servers/computing/slurm-spank-x11/default.nix
+2 -5
View File
@@ -1,10 +1,7 @@
{ lib, stdenv, fetchFromGitHub, slurm } :
let
stdenv.mkDerivation rec {
pname = "slurm-spank-x11";
version = "0.2.5";
in
stdenv.mkDerivation {
name = "slurm-spank-x11-${version}";
version = version;
src = fetchFromGitHub {
owner = "hautreux";
pkgs/servers/domoticz/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ let
};
in
stdenv.mkDerivation rec {
name = "domoticz";
pname = "domoticz";
inherit version;
src = domoticz-src;
pkgs/servers/fingerd/bsd-fingerd/default.nix
+4 -3
View File
@@ -2,11 +2,12 @@
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
stdenv.mkDerivation {
name = "bsd-fingerd-0.17";
stdenv.mkDerivation rec {
pname = "bsd-fingerd";
version = "0.17";
src = fetchurl {
url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
};
pkgs/servers/ftp/bftpd/default.nix
+2 -5
View File
@@ -1,14 +1,11 @@
{ lib, stdenv, fetchurl }:
let
stdenv.mkDerivation rec {
pname = "bftpd";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "5.9";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY=";
};
pkgs/servers/ftp/pure-ftpd/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "pure-ftpd-1.0.49";
pname = "pure-ftpd";
version = "1.0.49";
src = fetchurl {
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz";
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
};
pkgs/servers/ftp/vsftpd/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libcap, openssl, pam }:
stdenv.mkDerivation rec {
name = "vsftpd-3.0.3";
pname = "vsftpd";
version = "3.0.3";
src = fetchurl {
url = "https://security.appspot.com/downloads/${name}.tar.gz";
url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz";
sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx";
};
pkgs/servers/gotify/ui.nix
+1 -1
View File
@@ -3,7 +3,7 @@
}:
yarn2nix-moretea.mkYarnPackage rec {
name = "gotify-ui";
pname = "gotify-ui";
packageJSON = ./package.json;
yarnNix = ./yarndeps.nix;
pkgs/servers/gpm/default.nix
+3 -2
View File
@@ -5,10 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "gpm-1.20.7";
pname = "gpm";
version = "1.20.7";
src = fetchurl {
url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2";
sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
};
pkgs/servers/hashi-ui/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "hashi-ui";
pname = "hashi-ui";
version = "1.3.8";
src = fetchurl {
pkgs/servers/hasura/cli.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ buildGoModule, hasura-graphql-engine }:
buildGoModule rec {
name = "hasura-${version}";
pname = "hasura";
version = hasura-graphql-engine.version;
src = hasura-graphql-engine.src;
pkgs/servers/holochain-go/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "holochain-go${version}";
pname = "holochain-go";
version = "0.1.0-alpha";
rev = "a17510b910a7a377441c152b8dccdbae1999f63f";
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+6 -8
View File
@@ -1,17 +1,15 @@
{ lib, stdenv, fetchurl, apacheHttpd }:
let
version = "2.4.7.1";
apache-24-patch = fetchurl {
name = "compile-against-apache24.diff";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
};
name = "compile-against-apache24.diff";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "mod_fastcgi";
inherit version;
version = "2.4.7.1";
src = fetchurl {
url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
pkgs/servers/http/jboss/jdbc/mysql/default.nix
+2 -1
View File
@@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
name = "jboss-mysql-jdbc";
pname = "jboss-mysql-jdbc";
builder = ./builder.sh;
inherit mysql_jdbc;
version = mysql_jdbc.version;
meta = {
platforms = lib.platforms.unix;
pkgs/servers/http/micro-httpd/default.nix
+2 -1
View File
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "micro-httpd-20140814";
pname = "micro-httpd";
version = "20140814";
src = fetchurl {
url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";
pkgs/servers/http/redstore/default.nix
+3 -2
View File
@@ -2,10 +2,11 @@
, librdf_rasqal }:
stdenv.mkDerivation rec {
name = "redstore-0.5.4";
pname = "redstore";
version = "0.5.4";
src = fetchurl {
url = "https://www.aelius.com/njh/redstore/${name}.tar.gz";
url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz";
sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq";
};
pkgs/servers/http/tomcat/jdbc/mysql/default.nix
+2 -1
View File
@@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation {
name = "tomcat-mysql-jdbc";
pname = "tomcat-mysql-jdbc";
builder = ./builder.sh;
buildInputs = [ mysql_jdbc ];
inherit mysql_jdbc;
version = mysql_jdbc.version;
meta = {
platforms = lib.platforms.unix;
pkgs/servers/icecast/default.nix
+3 -2
View File
@@ -3,10 +3,11 @@
, libvorbis, libtheora, speex, libkate, libopus }:
stdenv.mkDerivation rec {
name = "icecast-2.4.4";
pname = "icecast";
version = "2.4.4";
src = fetchurl {
url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz";
sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9";
};
pkgs/servers/icingaweb2/theme-april/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-april";
pname = "icingaweb2-theme-april";
version = "1.0.4";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
};
pkgs/servers/icingaweb2/theme-lsd/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-lsd";
pname = "icingaweb2-theme-lsd";
version = "1.0.3";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
};
pkgs/servers/icingaweb2/theme-particles/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-particles";
pname = "icingaweb2-theme-particles";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
};
pkgs/servers/icingaweb2/theme-snow/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-snow";
pname = "icingaweb2-theme-snow";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
};
pkgs/servers/icingaweb2/theme-spring/default.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-spring";
pname = "icingaweb2-theme-spring";
version = "1.0.0";
src = fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
};
pkgs/servers/icingaweb2/theme-unicorn/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
name = "icingaweb2-theme-unicorn";
pname = "icingaweb2-theme-unicorn";
version = "1.0.2";
srcs = [
(fetchFromGitHub {
owner = "Mikesch-mp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
})
pkgs/servers/irc/charybdis/default.nix
+3 -2
View File
@@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
stdenv.mkDerivation rec {
name = "charybdis-4.1.2";
pname = "charybdis";
version = "4.1.2";
src = fetchFromGitHub {
owner = "charybdis-ircd";
repo = "charybdis";
rev = name;
rev = "${pname}-${version}";
sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3";
};
pkgs/servers/irc/ircd-hybrid/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation rec {
name = "ircd-hybrid-8.2.36";
pname = "ircd-hybrid";
version = "8.2.36";
src = fetchurl {
url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz";
sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv";
};
pkgs/servers/monitoring/grafana-image-renderer/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@
# * Update `version`+`hash` and rebuild.
mkYarnPackage rec {
name = "grafana-image-renderer";
pname = "grafana-image-renderer";
version = "3.0.0";
src = fetchFromGitHub {
pkgs/servers/monitoring/heapster/default.nix
+2 -1
View File
@@ -2,7 +2,8 @@
buildGoPackage rec {
rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
name = "heapster-${lib.strings.substring 0 7 rev}";
pname = "heapster";
version = lib.strings.substring 0 7 rev;
goPackagePath = "k8s.io/heapster";
subPackages = [ "./" ];
pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
+9 -12
View File
@@ -14,17 +14,15 @@ buildGoModule rec {
vendorSha256 = null;
buildFlagsArray = let
goPackagePath = "github.com/prometheus/influxdb_exporter";
in ''
-ldflags=
-s -w
-X github.com/prometheus/common/version.Version=${version}
-X github.com/prometheus/common/version.Revision=${rev}
-X github.com/prometheus/common/version.Branch=unknown
-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
-X github.com/prometheus/common/version.BuildDate=unknown
'';
ldflags = [
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=${rev}"
"-X github.com/prometheus/common/version.Branch=unknown"
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
"-X github.com/prometheus/common/version.BuildDate=unknown"
];
passthru.tests = { inherit (nixosTests.prometheus-exporters) influxdb; };
@@ -33,6 +31,5 @@ buildGoModule rec {
homepage = "https://github.com/prometheus/influxdb_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
platforms = platforms.unix;
};
}
pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
+4 -7
View File
@@ -1,16 +1,13 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let
stdenv.mkDerivation rec {
pname = "jmx-prometheus-httpserver";
version = "0.15.0";
jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
in stdenv.mkDerivation {
inherit version jarName;
name = "jmx-prometheus-httpserver-${version}";
jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
src = fetchurl {
url = mavenUrl;
url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz";
};
pkgs/servers/monitoring/prometheus/node-exporter.nix
+9 -12
View File
@@ -19,17 +19,15 @@ buildGoModule rec {
excludedPackages = [ "docs/node-mixin" ];
buildFlagsArray = let
goPackagePath = "github.com/prometheus/node_exporter";
in ''
-ldflags=
-s -w
-X github.com/prometheus/common/version.Version=${version}
-X github.com/prometheus/common/version.Revision=${rev}
-X github.com/prometheus/common/version.Branch=unknown
-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs
-X github.com/prometheus/common/version.BuildDate=unknown
'';
ldflags = [
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=${rev}"
"-X github.com/prometheus/common/version.Branch=unknown"
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
"-X github.com/prometheus/common/version.BuildDate=unknown"
];
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
@@ -38,6 +36,5 @@ buildGoModule rec {
homepage = "https://github.com/prometheus/node_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ benley fpletz globin Frostman ];
platforms = platforms.unix;
};
}
pkgs/servers/monitoring/prometheus/tor-exporter.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, nixosTests }:
python3Packages.buildPythonApplication rec {
name = "tor-exporter-${version}";
pname = "tor-exporter";
version = "0.4";
# Just a single .py file to use as the application's main entry point.
pkgs/servers/nas/default.nix
+1 -3
View File
@@ -1,11 +1,9 @@
{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep
, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }:
let
stdenv.mkDerivation rec {
pname = "nas";
version = "1.9.4";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz";
pkgs/servers/neard/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }:
stdenv.mkDerivation rec {
name = "neard-0.16";
pname = "neard";
version = "0.16";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz";
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz";
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
};
pkgs/servers/news/leafnode/default.nix
+2 -1
View File
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, pcre }:
stdenv.mkDerivation {
name = "leafnode-2.0.0.alpha20121101a.12";
pname = "leafnode";
version = "2.0.0.alpha20121101a.12";
src = fetchurl {
url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2";
pkgs/servers/nextcloud/news-updater.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchurl, python3Packages, php }:
python3Packages.buildPythonApplication rec {
name = "nextcloud-news-updater-${version}";
pname = "nextcloud-news-updater";
version = "10.0.1";
src = fetchurl {
pkgs/servers/rippled/data-api.nix
+1 -1
View File
@@ -5,7 +5,7 @@ with lib;
let
np = nodePackages.override { generated = ./package.nix; self = np; };
in nodePackages.buildNodePackage rec {
name = "ripple-data-api-${version}";
pname = "ripple-data-api";
version = lib.strings.substring 0 7 rev;
rev = "c56b860105f36c1c44ae011189d495272648c589";
pkgs/servers/search/elasticsearch/6.x.nix
+2 -2
View File
@@ -13,10 +13,10 @@ with lib;
stdenv.mkDerivation (rec {
version = elk6Version;
name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
sha256 =
if enableUnfree
then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"
pkgs/servers/search/elasticsearch/7.x.nix
+2 -2
View File
@@ -27,10 +27,10 @@ let
in
stdenv.mkDerivation (rec {
version = elk7Version;
name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz";
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
pkgs/servers/shishi/default.nix
+3 -2
View File
@@ -22,10 +22,11 @@ let
in
with lib;
stdenv.mkDerivation rec {
name = "shishi-1.0.2";
pname = "shishi";
version = "1.0.2";
src = fetchurl {
url = "mirror://gnu/shishi/${name}.tar.gz";
url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
};
pkgs/servers/silc-server/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "silc-server-1.1.18";
pname = "silc-server";
version = "1.1.18";
src = fetchurl {
url = "http://silcnet.org/download/server/sources/${name}.tar.bz2";
url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2";
sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s";
};
pkgs/servers/sip/sipwitch/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec {
name = "sipwitch-1.9.15";
pname = "sipwitch";
version = "1.9.15";
src = fetchurl {
url = "mirror://gnu/sipwitch/${name}.tar.gz";
url = "mirror://gnu/sipwitch/sipwitch-${version}.tar.gz";
sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482";
};
pkgs/servers/sql/mysql/jdbc/default.nix
+3 -2
View File
@@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation rec {
name = "mysql-connector-java-5.1.46";
pname = "mysql-connector-java";
version = "5.1.46";
builder = ./builder.sh;
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip";
url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip";
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
};
pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+2 -1
View File
@@ -2,7 +2,8 @@
stdenv.mkDerivation {
name = "pg_similarity-1.0";
pname = "pg_similarity";
version = "1.0";
src = fetchFromGitHub {
owner = "eulerto";
repo = "pg_similarity";
pkgs/servers/sql/virtuoso/6.x.nix
+4 -3
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec {
name = "virtuoso-opensource-6.1.6";
pname = "virtuoso-opensource";
version = "6.1.6";
src = fetchurl {
url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
};
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
postInstall = ''
echo Moving documentation
mkdir -pv $out/share/doc
mv -v $out/share/virtuoso/doc $out/share/doc/${name}
mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
pkgs/servers/sql/virtuoso/7.x.nix
+4 -3
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec {
name = "virtuoso-opensource-7.2.4.2";
pname = "virtuoso-opensource";
version = "7.2.4.2";
src = fetchurl {
url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
};
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall=''
echo Moving documentation
mkdir -pv $out/share/doc
mv -v $out/share/virtuoso/doc $out/share/doc/${name}
mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
'';
pkgs/servers/varnish/digest.nix
+1 -1
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.2";
name = "${varnish.name}-digest-${version}";
pname = "${varnish.name}-digest";
src = fetchFromGitHub {
owner = "varnish";
pkgs/servers/varnish/dynamic.nix
+1 -1
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4";
name = "${varnish.name}-dynamic-${version}";
pname = "${varnish.name}-dynamic";
src = fetchFromGitHub {
owner = "nigoroll";
pkgs/servers/varnish/modules.nix
+1 -1
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.15.0";
name = "${varnish.name}-modules-${version}";
pname = "${varnish.name}-modules";
src = fetchFromGitHub {
owner = "varnish";
pkgs/servers/web-apps/bookstack/default.nix
+2 -2
View File
@@ -14,12 +14,12 @@ let
});
in package.override rec {
name = "bookstack";
pname = "bookstack";
version = "21.05.3";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = name;
repo = pname;
rev = "v${version}";
sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8";
};
pkgs/servers/web-apps/hedgedoc/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ let
in
mkYarnPackage rec {
name = "hedgedoc";
pname = "hedgedoc";
version = "1.8.2";
src = fetchFromGitHub {
pkgs/servers/web-apps/plausible/default.nix
-1
View File
@@ -13,7 +13,6 @@
let
pname = "plausible";
version = "1.3.0";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "plausible";
pkgs/servers/x11/xquartz/default.nix
+2 -1
View File
@@ -95,7 +95,8 @@ let
];
};
in stdenv.mkDerivation {
name = "xquartz-${lib.getVersion xorg.xorgserver}";
pname = "xquartz";
version = lib.getVersion xorg.xorgserver;
nativeBuildInputs = [ ruby makeWrapper ];
pkgs/servers/xinetd/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv, libtirpc }:
stdenv.mkDerivation rec {
name = "xinetd-2.3.15";
pname = "xinetd";
version = "2.3.15";
src = fetchurl {
url = "http://www.xinetd.org/${name}.tar.gz";
url = "http://www.xinetd.org/xinetd-${version}.tar.gz";
sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
};
pkgs/tools/backup/tsm-client/default.nix
+1 -1
View File
@@ -152,7 +152,7 @@ buildEnv {
ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir
ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys
ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys
${lib.strings.optionalString (jdk8==null) "rm $out/bin/dsmj"}
${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"}
for bin in $out/bin/*
do
target=$(readlink "$bin")
pkgs/tools/networking/nttcp/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, ... }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "nttcp";
version = "1.47";
src = fetchurl {
url = "http://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";
url = "https://deb.debian.org/debian/pool/non-free/n/nttcp/nttcp_${version}.orig.tar.gz";
sha256 = "1bl17dsd53lbpjdqfmpgpd7dms6d2w3scpg7ki7qgfjhs8sarq50";
};
pkgs/tools/networking/strongswan/default.nix
+8 -6
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch
, pkg-config, autoreconfHook
{ lib, stdenv, fetchpatch, fetchFromGitHub
, pkg-config, autoreconfHook, perl, gperf, bison, flex
, gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib
, openresolv
, systemd, pam
@@ -19,14 +19,16 @@ stdenv.mkDerivation rec {
pname = "strongswan";
version = "5.8.1"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
src = fetchurl {
url = "https://download.strongswan.org/${pname}-${version}.tar.bz2";
sha256 = "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr";
src = fetchFromGitHub {
owner = "strongswan";
repo = "strongswan";
rev = version;
sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd";
};
dontPatchELF = true;
nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ];
buildInputs =
[ curl gmp python3 ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ]
pkgs/tools/package-management/nixpkgs-review/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
"--prefix" "PATH" ":" "${lib.makeBinPath [ nixUnstable git ]}"
];
doCheck = false;
@@ -26,6 +26,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
homepage = "https://github.com/Mic92/nixpkgs-review";
license = licenses.mit;
maintainers = [ maintainers.mic92 ];
maintainers = with maintainers; [ mic92 SuperSandro2000 ];
};
}
pkgs/tools/security/step-ca/default.nix
+5 -3
View File
@@ -11,16 +11,18 @@
buildGoModule rec {
pname = "step-ca";
version = "0.15.15";
version = "0.16.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY==";
sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk=";
};
vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs=";
vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU=";
buildFlagsArray = [ "-ldflags=-buildid=" ];
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
pkgs/tools/security/vault/vault-bin.nix
+2 -2
View File
@@ -42,8 +42,8 @@ in stdenv.mkDerivation {
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \
--prefix PATH ${lib.makeBinPath [ gawk glibc ]}
'' + ''
--prefix PATH : ${lib.makeBinPath [ gawk glibc ]}
runHook postInstall
'';
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -13645,7 +13645,7 @@ in
ffuf = callPackage ../tools/security/ffuf { };
flow = callPackage ../development/tools/analysis/flow {
ocamlPackages = ocaml-ng.ocamlPackages_4_09;
ocamlPackages = ocaml-ng.ocamlPackages_4_10;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};

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