ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gcc-9

Browse Source
This commit is contained in:
Franz Pletz 2019-11-03 14:44:12 +01:00
commit 6b10b78872
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
162 changed files with 1546 additions and 1691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/config/shells-environment.nix
View File

@ -118,6 +118,14 @@ in
type = with types; attrsOf (nullOr (either str path));
};
environment.homeBinInPath = mkOption {
description = ''
Include ~/bin/ in $PATH.
'';
default = true;
type = types.bool;
};
environment.binsh = mkOption {
default = "${config.system.build.binsh}/bin/sh";
defaultText = "\${config.system.build.binsh}/bin/sh";
@ -186,8 +194,10 @@ in
${cfg.extraInit}
# ~/bin if it exists overrides other bin directories.
export PATH="$HOME/bin:$PATH"
${optionalString cfg.homeBinInPath ''
# ~/bin if it exists overrides other bin directories.
export PATH="$HOME/bin:$PATH"
''}
'';
system.activationScripts.binsh = stringAfter [ "stdio" ]

22
nixos/modules/hardware/video/displaylink.nix
View File

@ -19,6 +19,21 @@ in
config = mkIf enabled {
boot.extraModulePackages = [ evdi ];
boot.kernelModules = [ "evdi" ];
environment.etc."X11/xorg.conf.d/40-displaylink.conf".text = ''
Section "OutputClass"
Identifier "DisplayLink"
MatchDriver "evdi"
Driver "modesetting"
Option "AccelMethod" "none"
EndSection
'';
# make the device available
services.xserver.displayManager.sessionCommands = ''
${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 1 0
'';
# Those are taken from displaylink-installer.sh and from Arch Linux AUR package.
@ -47,18 +62,13 @@ in
description = "DisplayLink Manager Service";
after = [ "display-manager.service" ];
conflicts = [ "getty@tty7.service" ];
path = [ pkgs.kmod ];
serviceConfig = {
ExecStart = "${displaylink}/bin/DisplayLinkManager";
Restart = "always";
RestartSec = 5;
LogsDirectory = "displaylink";
};
preStart = ''
mkdir -p /var/log/displaylink
modprobe evdi
'';
};
};

2
nixos/modules/installer/tools/tools.nix
View File

@ -123,7 +123,7 @@ in
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# flavour = "gnome3";
# pinentryFlavor = "gnome3";
# };
# List services that you want to enable:

2
nixos/modules/services/monitoring/netdata.nix
View File

@ -138,7 +138,7 @@ in {
description = "Real time performance monitoring";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable
path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable
(pkgs.python3.withPackages cfg.python.extraPackages);
serviceConfig = {
Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";

2
nixos/modules/services/x11/hardware/libinput.nix
View File

@ -122,7 +122,7 @@ in {
description =
''
Specify the scrolling method: <literal>twofinger</literal>, <literal>edge</literal>,
or <literal>none</literal>
<literal>button</literal>, or <literal>none</literal>
'';
};

3
nixos/tests/all-tests.nix
View File

@ -39,7 +39,8 @@ in
caddy = handleTest ./caddy.nix {};
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
cassandra = handleTest ./cassandra.nix {};
ceph = handleTestOn ["x86_64-linux"] ./ceph.nix {};
ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
certmgr = handleTest ./certmgr.nix {};
cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};

247
nixos/tests/ceph-multi-node.nix Normal file
View File

@ -0,0 +1,247 @@
import ./make-test.nix ({pkgs, lib, ...}:
let
cfg = {
clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03";
monA = {
name = "a";
ip = "192.168.1.1";
};
osd0 = {
name = "0";
ip = "192.168.1.2";
key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==";
uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9";
};
osd1 = {
name = "1";
ip = "192.168.1.3";
key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==";
uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5";
};
};
generateCephConfig = { daemonConfig }: {
enable = true;
global = {
fsid = cfg.clusterId;
monHost = cfg.monA.ip;
monInitialMembers = cfg.monA.name;
};
} // daemonConfig;
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = {
memorySize = 512;
emptyDiskImages = [ 20480 ];
vlans = [ 1 ];
};
networking = networkConfig;
environment.systemPackages = with pkgs; [
bash
sudo
ceph
xfsprogs
netcat-openbsd
];
boot.kernelModules = [ "xfs" ];
services.ceph = cephConfig;
# So that we don't have to battle systemd when bootstraping
systemd.targets.ceph.wantedBy = lib.mkForce [];
};
networkMonA = {
dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = cfg.monA.ip; prefixLength = 24; }
];
firewall = {
allowedTCPPorts = [ 6789 3300 ];
allowedTCPPortRanges = [ { from = 6800; to = 7300; } ];
};
};
cephConfigMonA = generateCephConfig { daemonConfig = {
mon = {
enable = true;
daemons = [ cfg.monA.name ];
};
mgr = {
enable = true;
daemons = [ cfg.monA.name ];
};
}; };
networkOsd0 = {
dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = cfg.osd0.ip; prefixLength = 24; }
];
firewall = {
allowedTCPPortRanges = [ { from = 6800; to = 7300; } ];
};
};
cephConfigOsd0 = generateCephConfig { daemonConfig = {
osd = {
enable = true;
daemons = [ cfg.osd0.name ];
};
}; };
networkOsd1 = {
dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = cfg.osd1.ip; prefixLength = 24; }
];
firewall = {
allowedTCPPortRanges = [ { from = 6800; to = 7300; } ];
};
};
cephConfigOsd1 = generateCephConfig { daemonConfig = {
osd = {
enable = true;
daemons = [ cfg.osd1.name ];
};
}; };
testscript = { ... }: ''
startAll;
$monA->waitForUnit("network.target");
$osd0->waitForUnit("network.target");
$osd1->waitForUnit("network.target");
# Create the ceph-related directories
$monA->mustSucceed(
"mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}",
"mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}",
"chown ceph:ceph -R /var/lib/ceph/",
"mkdir -p /etc/ceph",
"chown ceph:ceph -R /etc/ceph"
);
$osd0->mustSucceed(
"mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
"chown ceph:ceph -R /var/lib/ceph/",
"mkdir -p /etc/ceph",
"chown ceph:ceph -R /etc/ceph"
);
$osd1->mustSucceed(
"mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
"chown ceph:ceph -R /var/lib/ceph/",
"mkdir -p /etc/ceph",
"chown ceph:ceph -R /etc/ceph"
);
# Bootstrap ceph-mon daemon
$monA->mustSucceed(
"sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
"sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
"sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
"monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
"sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
"sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
"systemctl start ceph-mon-${cfg.monA.name}"
);
$monA->waitForUnit("ceph-mon-${cfg.monA.name}");
$monA->mustSucceed("ceph mon enable-msgr2");
# Can't check ceph status until a mon is up
$monA->succeed("ceph -s | grep 'mon: 1 daemons'");
# Start the ceph-mgr daemon, it has no deps and hardly any setup
$monA->mustSucceed(
"ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
"systemctl start ceph-mgr-${cfg.monA.name}"
);
$monA->waitForUnit("ceph-mgr-a");
$monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
# Send the admin keyring to the OSD machines
$monA->mustSucceed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared");
$osd0->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph");
$osd1->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph");
# Bootstrap both OSDs
$osd0->mustSucceed(
"mkfs.xfs /dev/vdb",
"mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
"echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -",
);
$osd1->mustSucceed(
"mkfs.xfs /dev/vdb",
"mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
"echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -"
);
# Initialize the OSDs with regular filestore
$osd0->mustSucceed(
"ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
"chown -R ceph:ceph /var/lib/ceph/osd",
"systemctl start ceph-osd-${cfg.osd0.name}",
);
$osd1->mustSucceed(
"ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
"chown -R ceph:ceph /var/lib/ceph/osd",
"systemctl start ceph-osd-${cfg.osd1.name}"
);
$monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$monA->mustSucceed(
"ceph osd pool create multi-node-test 100 100",
"ceph osd pool ls | grep 'multi-node-test'",
"ceph osd pool rename multi-node-test multi-node-other-test",
"ceph osd pool ls | grep 'multi-node-other-test'"
);
$monA->waitUntilSucceeds("ceph -s | grep '1 pools, 100 pgs'");
$monA->mustSucceed("ceph osd pool set multi-node-other-test size 2");
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$monA->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
$monA->mustFail(
"ceph osd pool ls | grep 'multi-node-test'",
"ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it"
);
# As we disable the target in the config, we still want to test that it works as intended
$osd0->mustSucceed("systemctl stop ceph-osd-${cfg.osd0.name}");
$osd1->mustSucceed("systemctl stop ceph-osd-${cfg.osd1.name}");
$monA->mustSucceed(
"systemctl stop ceph-mgr-${cfg.monA.name}",
"systemctl stop ceph-mon-${cfg.monA.name}"
);
$monA->succeed("systemctl start ceph.target");
$monA->waitForUnit("ceph-mon-${cfg.monA.name}");
$monA->waitForUnit("ceph-mgr-${cfg.monA.name}");
$osd0->succeed("systemctl start ceph.target");
$osd0->waitForUnit("ceph-osd-${cfg.osd0.name}");
$osd1->succeed("systemctl start ceph.target");
$osd1->waitForUnit("ceph-osd-${cfg.osd1.name}");
$monA->succeed("ceph -s | grep 'mon: 1 daemons'");
$monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
$monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
'';
in {
name = "basic-multi-node-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lejonet ];
};
nodes = {
monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; };
osd0 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd0; networkConfig = networkOsd0; };
osd1 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd1; networkConfig = networkOsd1; };
};
testScript = testscript;
})

193
nixos/tests/ceph-single-node.nix Normal file
View File

@ -0,0 +1,193 @@
import ./make-test.nix ({pkgs, lib, ...}:
let
cfg = {
clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03";
monA = {
name = "a";
ip = "192.168.1.1";
};
osd0 = {
name = "0";
key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==";
uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9";
};
osd1 = {
name = "1";
key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==";
uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5";
};
};
generateCephConfig = { daemonConfig }: {
enable = true;
global = {
fsid = cfg.clusterId;
monHost = cfg.monA.ip;
monInitialMembers = cfg.monA.name;
};
} // daemonConfig;
generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = {
memorySize = 512;
emptyDiskImages = [ 20480 20480 ];
vlans = [ 1 ];
};
networking = networkConfig;
environment.systemPackages = with pkgs; [
bash
sudo
ceph
xfsprogs
];
boot.kernelModules = [ "xfs" ];
services.ceph = cephConfig;
# So that we don't have to battle systemd when bootstraping
systemd.targets.ceph.wantedBy = lib.mkForce [];
};
networkMonA = {
dhcpcd.enable = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = cfg.monA.ip; prefixLength = 24; }
];
};
cephConfigMonA = generateCephConfig { daemonConfig = {
mon = {
enable = true;
daemons = [ cfg.monA.name ];
};
mgr = {
enable = true;
daemons = [ cfg.monA.name ];
};
osd = {
enable = true;
daemons = [ cfg.osd0.name cfg.osd1.name ];
};
}; };
testscript = { ... }: ''
startAll;
$monA->waitForUnit("network.target");
# Create the ceph-related directories
$monA->mustSucceed(
"mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}",
"mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}",
"mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
"mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
"mkdir -p /etc/ceph",
"chown ceph:ceph -R /etc/ceph",
"chown ceph:ceph -R /var/lib/ceph/",
);
# Bootstrap ceph-mon daemon
$monA->mustSucceed(
"sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
"sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
"sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
"monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
"sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
"sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
"systemctl start ceph-mon-${cfg.monA.name}"
);
$monA->waitForUnit("ceph-mon-${cfg.monA.name}");
$monA->mustSucceed("ceph mon enable-msgr2");
# Can't check ceph status until a mon is up
$monA->succeed("ceph -s | grep 'mon: 1 daemons'");
# Start the ceph-mgr daemon, it has no deps and hardly any setup
$monA->mustSucceed(
"ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
"systemctl start ceph-mgr-${cfg.monA.name}"
);
$monA->waitForUnit("ceph-mgr-a");
$monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
# Bootstrap both OSDs
$monA->mustSucceed(
"mkfs.xfs /dev/vdb",
"mkfs.xfs /dev/vdc",
"mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
"mount /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
"echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -",
"echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -"
);
# Initialize the OSDs with regular filestore
$monA->mustSucceed(
"ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
"ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
"chown -R ceph:ceph /var/lib/ceph/osd",
"systemctl start ceph-osd-${cfg.osd0.name}",
"systemctl start ceph-osd-${cfg.osd1.name}"
);
$monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$monA->mustSucceed(
"ceph osd pool create single-node-test 100 100",
"ceph osd pool ls | grep 'single-node-test'",
"ceph osd pool rename single-node-test single-node-other-test",
"ceph osd pool ls | grep 'single-node-other-test'"
);
$monA->waitUntilSucceeds("ceph -s | grep '1 pools, 100 pgs'");
$monA->mustSucceed(
"ceph osd getcrushmap -o crush",
"crushtool -d crush -o decrushed",
"sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush",
"crushtool -c modcrush -o recrushed",
"ceph osd setcrushmap -i recrushed",
"ceph osd pool set single-node-other-test size 2"
);
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$monA->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
$monA->mustFail(
"ceph osd pool ls | grep 'multi-node-test'",
"ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it"
);
# As we disable the target in the config, we still want to test that it works as intended
$monA->mustSucceed(
"systemctl stop ceph-osd-${cfg.osd0.name}",
"systemctl stop ceph-osd-${cfg.osd1.name}",
"systemctl stop ceph-mgr-${cfg.monA.name}",
"systemctl stop ceph-mon-${cfg.monA.name}"
);
$monA->succeed("systemctl start ceph.target");
$monA->waitForUnit("ceph-mon-${cfg.monA.name}");
$monA->waitForUnit("ceph-mgr-${cfg.monA.name}");
$monA->waitForUnit("ceph-osd-${cfg.osd0.name}");
$monA->waitForUnit("ceph-osd-${cfg.osd1.name}");
$monA->succeed("ceph -s | grep 'mon: 1 daemons'");
$monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
$monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
$monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
'';
in {
name = "basic-single-node-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lejonet johanot ];
};
nodes = {
monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; };
};
testScript = testscript;
})

161
nixos/tests/ceph.nix
View File

@ -1,161 +0,0 @@
import ./make-test.nix ({pkgs, lib, ...}: {
name = "All-in-one-basic-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ johanot lejonet ];
};
nodes = {
aio = { pkgs, ... }: {
virtualisation = {
memorySize = 1536;
emptyDiskImages = [ 20480 20480 ];
vlans = [ 1 ];
};
networking = {
useDHCP = false;
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = "192.168.1.1"; prefixLength = 24; }
];
};
environment.systemPackages = with pkgs; [
bash
sudo
ceph
xfsprogs
];
boot.kernelModules = [ "xfs" ];
services.ceph.enable = true;
services.ceph.global = {
fsid = "066ae264-2a5d-4729-8001-6ad265f50b03";
monInitialMembers = "aio";
monHost = "192.168.1.1";
};
services.ceph.mon = {
enable = true;
daemons = [ "aio" ];
};
services.ceph.mgr = {
enable = true;
daemons = [ "aio" ];
};
services.ceph.osd = {
enable = true;
daemons = [ "0" "1" ];
};
# So that we don't have to battle systemd when bootstraping
systemd.targets.ceph.wantedBy = lib.mkForce [];
};
};
testScript = { ... }: ''
startAll;
$aio->waitForUnit("network.target");
# Create the ceph-related directories
$aio->mustSucceed(
"mkdir -p /var/lib/ceph/mgr/ceph-aio",
"mkdir -p /var/lib/ceph/mon/ceph-aio",
"mkdir -p /var/lib/ceph/osd/ceph-{0,1}",
"chown ceph:ceph -R /var/lib/ceph/",
"mkdir -p /etc/ceph",
"chown ceph:ceph -R /etc/ceph"
);
# Bootstrap ceph-mon daemon
$aio->mustSucceed(
"sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
"sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
"sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
"monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
"sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
"sudo -u ceph touch /var/lib/ceph/mon/ceph-aio/done",
"systemctl start ceph-mon-aio"
);
$aio->waitForUnit("ceph-mon-aio");
$aio->mustSucceed("ceph mon enable-msgr2");
# Can't check ceph status until a mon is up
$aio->succeed("ceph -s | grep 'mon: 1 daemons'");
# Start the ceph-mgr daemon, it has no deps and hardly any setup
$aio->mustSucceed(
"ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring",
"systemctl start ceph-mgr-aio"
);
$aio->waitForUnit("ceph-mgr-aio");
$aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
$aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
# Bootstrap both OSDs
$aio->mustSucceed(
"mkfs.xfs /dev/vdb",
"mkfs.xfs /dev/vdc",
"mount /dev/vdb /var/lib/ceph/osd/ceph-0",
"mount /dev/vdc /var/lib/ceph/osd/ceph-1",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==",
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==",
"echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -",
"echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -"
);
# Initialize the OSDs with regular filestore
$aio->mustSucceed(
"ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9",
"ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5",
"chown -R ceph:ceph /var/lib/ceph/osd",
"systemctl start ceph-osd-0",
"systemctl start ceph-osd-1"
);
$aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$aio->mustSucceed(
"ceph osd pool create aio-test 100 100",
"ceph osd pool ls | grep 'aio-test'",
"ceph osd pool rename aio-test aio-other-test",
"ceph osd pool ls | grep 'aio-other-test'",
"ceph -s | grep '1 pools, 100 pgs'",
"ceph osd getcrushmap -o crush",
"crushtool -d crush -o decrushed",
"sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush",
"crushtool -c modcrush -o recrushed",
"ceph osd setcrushmap -i recrushed",
"ceph osd pool set aio-other-test size 2"
);
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
$aio->mustFail(
"ceph osd pool ls | grep 'aio-test'",
"ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it"
);
# As we disable the target in the config, we still want to test that it works as intended
$aio->mustSucceed(
"systemctl stop ceph-osd-0",
"systemctl stop ceph-osd-1",
"systemctl stop ceph-mgr-aio",
"systemctl stop ceph-mon-aio"
);
$aio->succeed("systemctl start ceph.target");
$aio->waitForUnit("ceph-mon-aio");
$aio->waitForUnit("ceph-mgr-aio");
$aio->waitForUnit("ceph-osd-0");
$aio->waitForUnit("ceph-osd-1");
$aio->succeed("ceph -s | grep 'mon: 1 daemons'");
$aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
$aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
$aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
'';
})

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

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "0.9.18";
version = "0.9.18.1";
pname = "drumgizmo";
src = fetchurl {
url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1vig9pm0dakpk8wa62m9ajj3bz536h0170r8vb98hxbm4wyys8yj";
sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7";
};
configureFlags = [ "--enable-lv2" ];

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

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
version = "0.9.10";
version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
sha256 = "07gpq31a9iwk79yzndqzmw7snap7s4ifnsc4mfwkdga2zx13z0rx";
sha256 = "02yfwyirjqxa075yqdnci9b9k57kdmkjvn9gnpdbnjp887pds76g";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "samplv1";
version = "0.9.10";
version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
sha256 = "04p5jkighmc8rf7fzzy8ch6knqbxv03vhjzdfh9dva2mlzw9rvjj";
sha256 = "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -13,9 +13,9 @@ let
sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l";
};
betaVersion = {
version = "3.6.0.13"; # "Android Studio 3.6 Beta 1"
build = "192.5916306";
sha256Hash = "0kvz3mgpfb3wqr1pw9847d5syswlzls3b4nilzgk6w127k2zmkfy";
version = "3.6.0.14"; # "Android Studio 3.6 Beta 2"
build = "192.5947919";
sha256Hash = "09l7mdjkzwnkkcgxp0x66bzm125ignrfssy7n141wvs2rd66i2fs";
};
latestVersion = { # canary & dev
version = "4.0.0.1"; # "Android Studio 4.0 Canary 1"

4
pkgs/applications/editors/quilter/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
version = "2.0.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4";
sha256 = "0qd8qssqzds06l08f4yf39i3bjl1ljyr85wgc3yn6mn698ynx30g";
};
nativeBuildInputs = [

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

@ -60,11 +60,11 @@ let
in mkDerivation rec {
pname = "drawpile";
version = "2.1.11";
version = "2.1.12";
src = fetchurl {
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
sha256 = "00r5vzracvjk369rri2jxzgfaa1ll4qj5gdmzgflvidz8420bcvm";
sha256 = "0jvy21xmlidyfkk1p47rgyf4c1ksizcpm8s17n8mwdbnjrf6m55n";
};
nativeBuildInputs = [

7
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
, gsl, gtkspell2, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, cmake
, librsvg, wrapGAppsHook
}:
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
librsvg # for loading icons
python2Env perlPackages.perl
];
] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2;
enableParallelBuilding = true;
@ -62,9 +62,6 @@ stdenv.mkDerivation rec {
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
'';
# 0.92.3 complains about an invalid conversion from const char * to char *
NIX_CFLAGS_COMPILE = " -fpermissive ";
meta = with stdenv.lib; {
license = "GPL";
homepage = https://www.inkscape.org;

2
pkgs/applications/misc/cura/lulzbot/curaengine.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "curaengine-lulzBot";
version = "3.6.18";
version = "3.6.21";
src = fetchgit {
url = https://code.alephobjects.com/source/curaengine-lulzbot.git;

36
pkgs/applications/misc/cura/lulzbot/default.nix
View File

@ -1,45 +1,44 @@
{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
{ lib, mkDerivation, wrapQtAppsHook, callPackage, fetchgit, cmake, jq, python3, qtbase, qtquickcontrols2 }:
let
# admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
curaBinaryDataVersion = "3.6.18"; # Marlin v2.0.0.144. Keep this accurate wrt. the below.
curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others.
curaBinaryData = fetchgit {
url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git;
rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0";
sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb";
rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e";
sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4";
};
libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
};
libsavitarLulzbot = callPackage ./libsavitar.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
};
inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
curaengine = callPackage ./curaengine.nix {
inherit libarcusLulzbot;
};
uraniumLulzbot = callPackage ./uranium.nix {
inherit callPackage libarcusLulzbot;
inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
};
in
python3Packages.buildPythonApplication rec {
name = "cura-lulzbot-${version}";
version = "3.6.18";
mkDerivation rec {
pname = "cura-lulzbot";
version = "3.6.21";
src = fetchgit {
url = https://code.alephobjects.com/source/cura-lulzbot.git;
rev = "71f1ac5a2b9f535175a3858a565930348358a9ca";
sha256 = "0by06fpxvdgy858lwhsccbmvkdq67j2s1cz8v6jnrnjrsxk7vzka";
rev = "7faeb18604c83004846a02c60cb240708db0034f";
sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq";
};
format = "other"; # using cmake to build
buildInputs = [ qtbase qtquickcontrols2 ];
# numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
nativeBuildInputs = [ cmake python3Packages.wrapPython ];
propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [
"-DURANIUM_DIR=${uraniumLulzbot.src}"
@ -68,6 +67,11 @@ python3Packages.buildPythonApplication rec {
EOF
'';
postFixup = ''
wrapPythonPrograms
wrapQtApp "$out/bin/cura-lulzbot"
'';
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = https://code.alephobjects.com/diffusion/CURA/;

6
pkgs/applications/misc/cura/lulzbot/libarcus.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage {
pname = "libarcus";
version = "3.6.18";
version = "3.6.21";
format = "other";
src = fetchgit {
url = https://code.alephobjects.com/source/arcus.git;
rev = "c795c0644591703ce04e1fd799fc97b1539031aa";
sha256 = "1yap9wbqxbjx3kqyqcsldny4mlcm33ywiwpdjlfgs0wjahfg4ip0";
rev = "aeda02d7727f45b657afb72cef203283fbf09325";
sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99";
};
disabled = pythonOlder "3.4.0";

6
pkgs/applications/misc/cura/lulzbot/libsavitar.nix
View File

@ -3,13 +3,13 @@
buildPythonPackage {
pname = "libsavitar-lulzbot";
name = "libsavitar-lulzbot";
version = "3.6.18";
version = "3.6.21";
format = "other";
src = fetchgit {
url = https://code.alephobjects.com/source/savitar.git;
rev = "988a26d35b2a1d042f8c38938ccda77ab146af7d";
sha256 = "146agw3a92azkgs5ahmn2rrck4an78m2r3pcss6ihmb60lx165k7";
rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234";
sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j";
};
postPatch = ''

16
pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
View File

@ -1,16 +0,0 @@
diff --git a/UM/Qt/Bindings/i18nCatalogProxy.py b/UM/Qt/Bindings/i18nCatalogProxy.py
index 7e2bb16c..cec70dd6 100644
--- a/UM/Qt/Bindings/i18nCatalogProxy.py
+++ b/UM/Qt/Bindings/i18nCatalogProxy.py
@@ -86,9 +86,9 @@ class i18nCatalogProxy(QObject): # [CodeStyle: Ultimaker code style requires cla
# \todo Move this to a more generic place so more things can use it.
def _wrapFunction(self, engine, this_object, function):
# JavaScript code that wraps the Python method call in a closure
- wrap_js = """function(this_object) {{
+ wrap_js = """(function(this_object) {{
return function({args}) {{ return this_object.{function}({args}) }}
- }}"""
+ }})"""
# Get the function name and argument list.
function_name = function.__name__

9
pkgs/applications/misc/cura/lulzbot/uranium.nix
View File

@ -2,15 +2,15 @@
, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
buildPythonPackage {
version = "3.6.18";
version = "3.6.21";
pname = "uranium";
name = "uraniumLulzbot";
format = "other";
src = fetchgit {
url = https://code.alephobjects.com/diffusion/U/uranium.git;
rev = "33df88a7414375ac924ac761113baa48d2ced2b4";
sha256 = "109cbv7y105crbrzfp70lmcr9n20ap5c97i5qd46fmxbx86yj7f8";
rev = "54d911edd2551c5875c554928896122835a0dd6c";
sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i";
};
disabled = pythonOlder "3.5.0";
@ -19,9 +19,6 @@ buildPythonPackage {
propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ];
nativeBuildInputs = [ cmake doxygen ];
# Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee
patches = [ ./uranium-qt512-support.patch ];
postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i \

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

@ -3,11 +3,11 @@ librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWra
stdenv.mkDerivation rec {
pname = "eaglemode";
version = "0.94.1";
version = "0.94.2";
src = fetchurl {
url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89";
sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jgmenu";
version = "3.4";
version = "3.5";
src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
sha256 = "1cikndf71wi17qld3rwp38gk0q7zic707zzz0mr7cgn86dc4if3d";
sha256 = "0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy";
};
nativeBuildInputs = [

9
pkgs/applications/misc/octoprint/default.nix
View File

@ -56,17 +56,18 @@ let
"websocket-client"
"wrapt"
"sentry-sdk"
"werkzeug" # 0.16 just deprecates some stuff
];
in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint";
version = "1.3.11";
version = "1.3.12";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
sha256 = "1102ki1819wsmkfg4riz4i0hjlr3w6nsvk8wrzqq0lc0s5ycf4jx";
sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd";
};
propagatedBuildInputs = with py.pkgs; [
@ -75,7 +76,7 @@ in py.pkgs.buildPythonApplication rec {
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
scandir chainmap future futures wrapt monotonic emoji
frozendict cachelib sentry-sdk typing
frozendict cachelib sentry-sdk typing filetype
] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
checkInputs = with py.pkgs; [ nose mock ddt ];
@ -96,6 +97,6 @@ in py.pkgs.buildPythonApplication rec {
homepage = https://octoprint.org/;
description = "The snappy web interface for your 3D printer";
license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ];
maintainers = with maintainers; [ abbradar gebner ];
};
}

14
pkgs/applications/misc/octoprint/plugins.nix
View File

@ -47,13 +47,13 @@ let
mqtt = buildPlugin rec {
pname = "MQTT";
version = "0.8.0";
version = "0.8.6";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint-MQTT";
rev = version;
sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7";
sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd";
};
propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
@ -87,13 +87,13 @@ let
stlviewer = buildPlugin rec {
pname = "STLViewer";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "jneilliii";
repo = "OctoPrint-STLViewer";
rev = "v${version}";
sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
rev = version;
sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b";
};
meta = with stdenv.lib; {
@ -168,13 +168,13 @@ let
printtimegenius = buildPlugin rec {
pname = "PrintTimeGenius";
version = "1.3.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "eyal0";
repo = "OctoPrint-${pname}";
rev = version;
sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28";
sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f";
};
preConfigure = ''

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

@ -26,13 +26,13 @@ in
python3.pkgs.buildPythonApplication rec {
pname = "pytrainer";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "pytrainer";
repo = "pytrainer";
rev = "v${version}";
sha256 = "1w5z1xwb2g6j2izm89b7lv9n92r1zhsr8bglxcn7jc5gwbvwysvd";
sha256 = "0m2sy3f5pyc4wv1ns31r7vlafqkzp0a2jasaskwrkl6273agbbk9";
};
patches = [

5
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -20,14 +20,14 @@
}:
mkDerivation rec {
version = "0.10.1";
version = "0.10.2";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "107w6dlr1m5g60j342p2b6ipfn1r8kyad8av58nh8ibzycghbfv2";
sha256 = "09iq1rr70wwy5xk0jmfnwzvnigq409hvs2viy1j0khn9jhvnk6z0";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
@ -45,6 +45,7 @@ mkDerivation rec {
] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"]
++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"]
++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"]
++ lib.optionals (!webviewSupport) ["-DWEBVIEW_PROVIDER:STRING=none"]
;
meta = with lib; {

27
pkgs/applications/misc/veracrypt/default.nix
View File

@ -1,21 +1,36 @@
{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "veracrypt";
version = "1.23";
minorVersion = "-Hotfix-2";
version = "1.24-Hotfix1";
src = fetchurl {
url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip";
sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259";
url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c";
};
patches = [
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch";
sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y";
stripLen = 1;
})
# https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86
(fetchpatch {
url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch";
sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3";
stripLen = 1;
})
];
sourceRoot = "src";
nativeBuildInputs = [ makeself pkgconfig yasm ];
buildInputs = [ fuse lvm2 unzip wxGTK ];
buildInputs = [ fuse lvm2 wxGTK ];
enableParallelBuilding = true;

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -136,9 +136,9 @@ let
./patches/nix_plugin_paths_68.patch
./patches/remove-webp-include-69.patch
./patches/no-build-timestamps.patch
] ++ optionals (channel == "stable" || channel == "beta") [
] ++ optionals (channel == "stable") [
./patches/widevine.patch
] ++ optionals (channel == "dev") [
] ++ optionals (channel == "beta" || channel == "dev") [
./patches/widevine-79.patch
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported in order to be compiled with GCC.

776
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.7.0";
version = "28.7.2";
src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq";
sha256 = "08w90269mwcqsdhx4vvp18c5iccvzqhaaw6aw7w0nppf2f2k8lri";
};
desktopItem = makeDesktopItem {

4
pkgs/applications/networking/feedreaders/rss2email/default.nix
View File

@ -4,13 +4,13 @@ with pythonPackages;
buildPythonApplication rec {
pname = "rss2email";
version = "3.10";
version = "3.11";
propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
src = fetchurl {
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1";
sha256 = "1vk5slp2mhmc1qj30igqkyq3z5h2bl1ayhafqrjapa6cg6rbvhrn";
};
outputs = [ "out" "man" "doc" ];

8
pkgs/applications/networking/gns3/default.nix
View File

@ -1,16 +1,16 @@
{ callPackage }:
let
stableVersion = "2.2.0";
previewVersion = "2.2.0";
stableVersion = "2.2.1";
previewVersion = "2.2.1";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78";
serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk";
guiSrcHash = "16v2sdz37vm8x8w07qxaq2mbx169f9hqqpxnf1lq19v9dfhb19kh";
serverSrcHash = "0liv9fwi2746542qpnvwzf5wcrsxfv6x5jypwd5db1qkfd50s8xa";
in {
guiStable = mkGui {
stable = true;

19
pkgs/applications/networking/gns3/gui.nix
View File

@ -1,11 +1,20 @@
{ stable, branch, version, sha256Hash }:
{ stdenv, python3Packages, fetchFromGitHub }:
{ stdenv, python3, fetchFromGitHub }:
let
pythonPackages = python3Packages;
in pythonPackages.buildPythonPackage rec {
python = python3.override {
packageOverrides = self: super: {
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
};
in python.pkgs.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "gns3-gui";
@ -16,7 +25,7 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash;
};
propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python.pkgs; [
raven psutil jsonschema # tox for check
# Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools

13
pkgs/applications/networking/gns3/server.nix
View File

@ -3,8 +3,17 @@
{ stdenv, python3, fetchFromGitHub }:
let
python = python3;
python = python3.override {
packageOverrides = self: super: {
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
};
in python.pkgs.buildPythonPackage {
pname = "gns3-server";
inherit version;

6
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -15,13 +15,13 @@
}:
stdenv.mkDerivation {
name = "dino-unstable-2019-09-12";
name = "dino-unstable-2019-10-28";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "c8f2b80978706c4c53deb7ddfb8188c751bcb291";
sha256 = "17lc6xiarb174g1hgjfh1yjrr0l2nzc3kba8xp5niwakbx7qicqr";
rev = "388cc56674487e7b9e339637369fc55f0e271daf";
sha256 = "1v8rnjbzi8qhwb1fv787byxk8ygfs16z2j64h0s6sd3asr4n0kz1";
fetchSubmodules = true;
};

6
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -40,11 +40,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2019.7";
version = "2019.8";
src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
sha256 = "1hjndcdkin98l6jv39r98zfw33qg0gnvlv8q80qsj5x36a19d4v9";
sha256 = "0cjc8j8pqgdhnax4mvwmvnxfcygjsp805hxalfaj8wa5adph96hz";
};
nativeBuildInputs = [
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
sed -i 's|\/opt\/Mullvad.*VPN|'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
ln -s $out/share/mullvad/mullvad-vpn $out/bin/mullvad-vpn
ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
runHook postInstall

8
pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "6.8.3";
version = "6.7.4";
pname = "frostwire";
src = fetchurl {
@ -18,13 +18,11 @@ stdenv.mkDerivation rec {
mv $(ls */*.jar) $out/share/java
makeWrapper $out/share/java/frostwire $out/bin/frostwire \
--prefix PATH : ${jre}/bin/ \
--set JAVA_HOME ${jre.home} \
--add-flags '-classpath $CLASSPATH:$out/share/java/*'
--prefix PATH : ${jre}/bin/
'';
meta = with stdenv.lib; {
homepage = "https://www.frostwire.com/";
homepage = https://www.frostwire.com/;
description = "BitTorrent Client and Cloud File Downloader";
license = licenses.gpl2;
maintainers = with maintainers; [ gavin ];

4
pkgs/applications/science/biology/star/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
version = "2.7.2b";
version = "2.7.3a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
sha256 = "1fb63n3jm1l8k60wdjbq9asv4l1kf7algxxs1aqzvvidx3a8fvzq";
sha256 = "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq";
};
sourceRoot = "source/source";

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl";
sha256 = "0vknp52zyp2c4pxr12pryflyin1hl2dwhkrn5y0r4qh4ndf3ms1m";
};
patchPhase = ''

4
pkgs/applications/science/medicine/dcmtk/default.nix
View File

@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "dcmtk";
version = "3.6.4";
version = "3.6.5";
src = fetchFromGitHub {
owner = "DCMTK";
repo = pname;
rev = "DCMTK-${version}";
sha256 = "0fbx35zax8n4gayaac5bankqwzg2y2adggykbbf8lpd773jfxsp6";
sha256 = "0i38k1s0wdpbxxpiwsx490mszhxi45wp0z67iksvh60wfkaw54na";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -2,7 +2,7 @@
let
name = "stgit-${version}";
version = "0.20";
version = "0.21";
in
stdenv.mkDerivation {
inherit name;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "ctmarinas";
repo = "stgit";
rev = "v${version}";
sha256 = "0zfrs9f6a84z5gr3k6y81h8jyar7h3q3z9p13cbrq9slljg5r6iw";
sha256 = "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7";
};
buildInputs = [ python2 git ];

6
pkgs/data/icons/iconpack-obsidian/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "iconpack-obsidian";
version = "4.3";
version = "4.9";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "iconpack-obsidian";
repo = pname;
rev = "v${version}";
sha256 = "0np2s4mbaykwwv516959r5d9gfdmqb5hadsx18x2if4751a9qz49";
sha256 = "1w0lnr08gd0cnzv3n5094jqb7dpbpwwizfhvifdir0xsls1sf129";
};
nativeBuildInputs = [ gtk3 ];

8
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,20 +2,18 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20191009";
version = "20191101";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "1ljbaq0c6rhvfwj5q2kvd6rxbjykb0sbgcpjrxrzpdy08zr1kdvd";
sha256 = "17as9i5b9wqzvj08hwxqk9dlv6hrvkylns85s8gzhv6b5x2q5ma3";
};
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;

6
pkgs/misc/themes/jade1/default.nix → pkgs/data/themes/jade1/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "theme-jade1";
version = "3.3";
version = "1.5";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-jade-1";
rev = "v${version}";
sha256 = "06w06dvzs1llmzpyz3c5yycsw3gslsgikalfcq5l92d72z4kzfw7";
sha256 = "1m3150iyk8421mkwj4x2pv29wjzqdcnvvnp3bsg11k5kszsm27a8";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
homepage = https://github.com/madmaxms/theme-jade-1;
license = with licenses; [ gpl3 ];
platforms = platforms.linux;

4
pkgs/data/themes/matcha/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
version = "2019-10-03";
version = "2019-11-02";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "1fxlpq3hgp6brgjkhv0g8k4gsdg6jw2z467awqgfr8a1p3ksmxpw";
sha256 = "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr";
};
buildInputs = [ gdk-pixbuf librsvg ];

4
pkgs/data/themes/plata/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "plata-theme";
version = "0.8.9";
version = "0.9.0";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
sha256 = "0a2wczxxfd2nfr7biawbs3rwy2sivcl2sv43y2638gmfp0w6zh9r";
sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg";
};
preferLocalBuild = true;

4
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnome-getting-started-docs";
version = "3.34.0";
version = "3.34.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nq3dvvjr6vzl87p0y2ggv8bxap3hdbwhbn9ycan4y5d4g5f437p";
sha256 = "00in6yc02pdalyx8g0fncmch0l7nr819587ngjm83ara9qa8z6fa";
};
passthru = {

4
pkgs/desktops/gnome-3/games/swell-foop/default.nix
View File

@ -3,13 +3,13 @@
let
pname = "swell-foop";
version = "3.34.0";
version = "3.34.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1vbclb1jcn2s9rb7whk02v6hfr6fnwx2ppa55bsa7595f3ki79v5";
sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1";
};
passthru = {

2
pkgs/desktops/lxqt/liblxqt/default.nix
View File

@ -35,7 +35,7 @@ mkDerivation rec {
description = "Core utility library for all LXQt components";
homepage = https://github.com/lxqt/liblxqt;
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

6
pkgs/desktops/lxqt/libqtxdg/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libqtxdg";
version = "3.3.1";
version = "3.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0y3s0hva64m64j9lqgnja1li8zhlywqzv8xwjg8pyd2nr9h918db";
sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5";
};
nativeBuildInputs = [ cmake lxqt-build-tools ];
@ -27,7 +27,7 @@ mkDerivation rec {
description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxqt/libqtxdg;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-about/default.nix
View File

@ -29,7 +29,7 @@ mkDerivation rec {
description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxqt/lxqt-about;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-admin/default.nix
View File

@ -35,7 +35,7 @@ mkDerivation rec {
description = "LXQt system administration tool";
homepage = https://github.com/lxqt/lxqt-admin;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-config/default.nix
View File

@ -45,7 +45,7 @@ mkDerivation rec {
description = "Tools to configure LXQt and the underlying operating system";
homepage = https://github.com/lxqt/lxqt-config;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};

2
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
View File

@ -30,7 +30,7 @@ mkDerivation rec {
description = "LXQt service for global keyboard shortcuts registration";
homepage = https://github.com/lxqt/lxqt-globalkeys;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
View File

@ -30,7 +30,7 @@ mkDerivation rec {
description = "The LXQt notification daemon";
homepage = https://github.com/lxqt/lxqt-notificationd;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
View File

@ -30,7 +30,7 @@ mkDerivation rec {
description = "GUI to query passwords on behalf of SSH agents";
homepage = https://github.com/lxqt/lxqt-openssh-askpass;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-panel/default.nix
View File

@ -53,7 +53,7 @@ mkDerivation rec {
description = "The LXQt desktop panel";
homepage = https://github.com/lxqt/lxqt-panel;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-policykit/default.nix
View File

@ -37,7 +37,7 @@ mkDerivation rec {
description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxqt/lxqt-policykit;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
View File

@ -32,7 +32,7 @@ mkDerivation rec {
description = "Power management module for LXQt";
homepage = https://github.com/lxqt/lxqt-powermanagement;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
View File

@ -39,7 +39,7 @@ mkDerivation rec {
description = "LXQt Qt platform integration plugin";
homepage = https://github.com/lxqt/lxqt-qtplugin;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-runner/default.nix
View File

@ -36,7 +36,7 @@ mkDerivation rec {
description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxqt/lxqt-runner;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-session/default.nix
View File

@ -34,7 +34,7 @@ mkDerivation rec {
description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxqt/lxqt-session;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-sudo/default.nix
View File

@ -31,7 +31,7 @@ mkDerivation rec {
description = "GUI frontend for sudo/su";
homepage = https://github.com/lxqt/lxqt-sudo;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/lxqt-themes/default.nix
View File

@ -20,7 +20,7 @@ mkDerivation rec {
description = "Themes, graphics and icons for LXQt";
homepage = https://github.com/lxqt/lxqt-themes;
license = licenses.lgpl21;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

2
pkgs/desktops/lxqt/screengrab/default.nix
View File

@ -32,7 +32,7 @@ mkDerivation rec {
description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxqt/screengrab;
license = licenses.gpl2;
platforms = with platforms; unix;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

61
pkgs/development/compilers/nim/default.nix
View File

@ -1,19 +1,17 @@
# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim, openssl, pcre, readline,
boehmgc, sfml, tzdata, coreutils, sqlite }:
{ stdenv, lib, fetchurl, makeWrapper, openssl, pcre, readline,
boehmgc, sfml, sqlite }:
stdenv.mkDerivation rec {
pname = "nim";
version = "1.0.0";
version = "1.0.2";
src = fetchurl {
url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
sha256 = "1pg0lxahis8zfk6rdzdj281bahl8wglpjgngkc4vg1pc9p61fj03";
sha256 = "1rjinrs119c8i6wzz5fzjfml7n7kbd5hb9642g4rr8qxkq4sx83k";
};
doCheck = !stdenv.isDarwin;
enableParallelBuilding = true;
NIX_LDFLAGS = [
@ -24,14 +22,9 @@ stdenv.mkDerivation rec {
"-lsqlite3"
];
# 1. nodejs is only needed for tests
# 2. we could create a separate derivation for the "written in c" version of nim
# used for bootstrapping, but koch insists on moving the nim compiler around
# as part of building it, so it cannot be read-only
checkInputs = [
nodejs-slim tzdata coreutils
];
# we could create a separate derivation for the "written in c" version of nim
# used for bootstrapping, but koch insists on moving the nim compiler around
# as part of building it, so it cannot be read-only
nativeBuildInputs = [
makeWrapper
@ -56,46 +49,6 @@ stdenv.mkDerivation rec {
runHook postBuild
'';
prePatch =
let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' '';
disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
disableCompile = ''sed -i -e 's/^/#/' '';
in ''
substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
# runs out of memory on a machine with 8GB RAM
${disableTest} ./tests/system/t7894.nim
# requires network access (not available in the build container)
${disableTest} ./tests/stdlib/thttpclient.nim
'' + lib.optionalString stdenv.isAarch64 ''
# supposedly broken on aarch64
${disableStdLibTest} ./lib/pure/stats.nim
# reported upstream: https://github.com/nim-lang/Nim/issues/11463
${disableCompile} ./lib/nimhcr.nim
${disableTest} ./tests/dll/nimhcr_unit.nim
${disableTest} ./tests/dll/nimhcr_integration.nim
# reported upstream: https://github.com/nim-lang/Nim/issues/12262
${disableTest} ./tests/range/tcompiletime_range_checks.nim
# requires "immintrin.h" which is available only on x86
${disableTest} ./tests/misc/tsizeof3.nim
'';
checkPhase = ''
runHook preCheck
# Fortify hardening breaks tests
# https://github.com/nim-lang/Nim/issues/11435#issuecomment-534545696
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} \
./koch tests --nim:bin/nim all
runHook postCheck
'';
installPhase = ''
runHook preInstall

6
pkgs/development/compilers/openjdk/darwin/8.nix
View File

@ -7,11 +7,11 @@ let
};
jdk = stdenv.mkDerivation {
name = "zulu1.8.0_121-8.20.0.5";
name = "zulu1.8.0_222-8.40.0.25-ca-fx";
src = fetchurl {
url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip";
sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b";
url = "http://cdn.azul.com/zulu/bin/zulu8.40.0.25-ca-fx-jdk8.0.222-macosx_x64.zip";
sha256 = "1mal8bdc94q7ahx7p3xggy3qpxr6h83g2y01wzgvnqjd8n5i3qr1";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};

4
pkgs/development/interpreters/love/11.1.nix
View File

@ -5,7 +5,7 @@
let
pname = "love";
version = "11.2";
version = "11.3";
in
stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
owner = "rude";
repo = "love";
rev = version;
sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf";
sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/interpreters/python/default.nix
View File

@ -65,10 +65,10 @@ in {
sourceVersion = {
major = "3";
minor = "5";
patch = "8";
patch = "9";
suffix = "";
};
sha256 = "0hgzn8l4ps93f3h4b47vczsbhy2kihvzdisjjx6mrn85rndk3c8v";
sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2";
inherit (darwin) CF configd;
inherit passthruFun;
};

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
version = "1.7.11";
version = "1.7.12";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz";
sha256 = "0a9icrv6pwh2b73lywq1aj7i19pmzpg59iy3ngal8vq4zdciylqc";
};
outputs = [ "bin" "dev" "out" "lib" ];

4
pkgs/development/libraries/avro-c/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
let
version = "1.9.0";
version = "1.9.1";
in stdenv.mkDerivation {
pname = "avro-c";
inherit version;
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
sha256 = "1ch8z9jpkjxjx2zh28z0946gz3vwj1jnkrzg4vwvfa287128cml0";
sha256 = "0hj6w1w5mqkhnhkvjc0zz5njnnrbcjv5ml4f8gq80wff2cgbrxvx";
};
postPatch = ''

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
version = "2.10.0";
version = "2.10.2";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
sha256="1mc6zix3hk3ggpihmdd4y0xvq3qvdw9c1arwnmi4nf3g4693k97r";
sha256="01ldfv4337s3vdhsx415d49jchpvqy61c77dhnri30ip5af0ipjs";
};
nativeBuildInputs = [ cmake ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cimg";
version = "2.7.4";
version = "2.7.5";
src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
sha256 = "1csqac8z2q8dp95sdjn4am8icnxclz28yx3ih5izxxp4s5dpjbjb";
sha256 = "1xhs0j7mfiln9apfcc9cd3cmjj1prm211vih2zn2qi87ialv36cg";
};
nativeBuildInputs = [ unzip ];

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2019.10.14.00";
version = "2019.10.21.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "0d32cwwza3hqsr0z4kcrk1cj26ipbwkqm6nz5335rw4k9y5kyz16";
sha256 = "1jy0yxqzcxxs6sq8161zbdzj4ngwjs0h2aca6n9qkaj1v5jd27c7";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/libraries/glib/default.nix
View File

@ -188,6 +188,8 @@ stdenv.mkDerivation rec {
inherit doCheck;
separateDebugInfo = stdenv.isLinux;
passthru = rec {
gioModuleDir = "lib/gio/modules";
makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas";

11
pkgs/development/libraries/gtk/3.x.nix
View File

@ -3,6 +3,9 @@
, fetchpatch
, pkgconfig
, gettext
, docbook_xsl
, docbook_xml_dtd_43
, gtk-doc
, meson
, ninja
, python3
@ -33,6 +36,7 @@
, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux
, withGtkDoc ? stdenv.isLinux
, cups ? null
, AppKit
, Cocoa
@ -46,7 +50,7 @@ stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.12";
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
setupHooks = [
@ -78,6 +82,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux;
mesonFlags = [
"-Dgtk_doc=${boolToString withGtkDoc}"
"-Dtests=false"
];
@ -114,6 +119,10 @@ stdenv.mkDerivation rec {
python3
sassc
setupHooks
] ++ optionals withGtkDoc [
docbook_xml_dtd_43
docbook_xsl
gtk-doc
];
buildInputs = [

4
pkgs/development/libraries/intel-media-sdk/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
version = "19.2.1";
version = "19.3.0";
src = fetchurl {
url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
sha256 = "0w3r6lr2q3kch0vz9sxld1nz6iff129xr8wzg0p2j7mng41imh83";
sha256 = "0pgg16a4gsh8yjyz64r28bmkg9xxcy8m0dkvrdz03svkll9v7v3n";
};
# patchelf is needed for binaries in $out/share/samples

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libburn";
version = "1.5.0";
version = "1.5.2";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
sha256 = "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv";
};
meta = with stdenv.lib; {

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libchamplain";
version = "0.12.19";
version = "0.12.20";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "191aid1qsfkab5whbzj2r3g63dpdgrwp5141mfywvqyvdhr2x11n";
sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
};
outputs = [ "out" "dev" "devdoc" ];

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libgdiplus";
version = "6.0.2";
version = "6.0.4";
src = fetchFromGitHub {
owner = "mono";
repo = "libgdiplus";
rev = version;
sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn";
};
NIX_LDFLAGS = "-lgif";
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = stdenv.lib.optionalString stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}";
buildInputs =
[ glib cairo fontconfig libtiff giflib
libjpeg libpng libXrender libexif

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libisofs";
version = "1.5.0";
version = "1.5.2";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
sha256 = "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg";
};
buildInputs = [ attr zlib ];

11
pkgs/development/libraries/libksi/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
stdenv.mkDerivation {
name = "libksi-2015-07-03";
stdenv.mkDerivation rec {
pname = "libksi";
version = "3.20.3025";
src = fetchFromGitHub {
owner = "Guardtime";
repo = "libksi";
rev = "b82dd65bd693722db92397cbe0920170e0d2ae1c";
sha256 = "1sqd31l55kx6knl0sg26ail1k5rgmamq8760p6aj7bpb4jwb8r1n";
repo = pname;
rev = "v${version}";
sha256 = "0cagysr8j92r6g7f0mwrlkpn9xz9ncz2v3jymh47j3ljxmfbagpz";
};
nativeBuildInputs = [ autoreconfHook ];

40
pkgs/development/libraries/libmanette/default.nix
View File

@ -1,22 +1,40 @@
{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection
, glib, libgudev, libevdev, gnome3 }:
{ stdenv
, fetchurl
, ninja
, meson
, pkgconfig
, vala
, gobject-introspection
, glib
, libgudev
, libevdev
, gnome3
}:
let
version = "0.2.2";
stdenv.mkDerivation rec {
pname = "libmanette";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
version = "0.2.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb";
sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ];
buildInputs = [ glib libgudev libevdev ];
nativeBuildInputs = [
meson
ninja
pkgconfig
vala
gobject-introspection
];
buildInputs = [
glib
libgudev
libevdev
];
doCheck = true;
@ -28,7 +46,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A simple GObject game controller library";
homepage = https://wiki.gnome.org/Apps/Builder;
homepage = "https://gitlab.gnome.org/aplazas/libmanette";
license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers;
platforms = platforms.unix;

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "046fi8cqfqh0ila3kc4sg75yvg24wmghlja2fmhkj96fjjfkzsss";
sha256 = "0jfi9h8wsj7h5z3dxdijq6ddxiygik9j86pjxl3hza4v2ilsbwy3";
};
outputs = [ "out" "dev" "doc" ];

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "libwhereami";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
sha256 = "0yq6m4kh06idp3l8cp7kswn5k8vcaip1zqhypbhszybqa0afb5az";
sha256 = "16xjb6zp60ma76aa3kq3q8i8zn0n61gf39fny12cny8nggwjpbww";
rev = version;
repo = "libwhereami";
owner = "puppetlabs";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libxls";
version = "1.5.1";
version = "1.5.2";
src = fetchurl {
url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz";
sha256 = "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v";
sha256 = "1akadsyl10rp101ccjmrxr7933c3v641k377bn74jv6cdkcm4zld";
};
nativeBuildInputs = [ unzip ];

20
pkgs/development/libraries/opencv/4.x.nix
View File

@ -36,20 +36,20 @@
}:
let
version = "4.1.0";
version = "4.1.2";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "0m1f51m11iz4vxfrmnhawksd669ld247rlfdq5fhkvfk3r7aidw6";
sha256 = "0c98ziwvfrzdzwn52a36d37n5rac8zmxq2jn479bzfaii1bib8xx";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "1phmmba96m5znjf3wxwhxavgzgp3bs5qqsjk9ay1i63rdacz4vlf";
sha256 = "10ryyxhggin5dk5glf4ycyrfryqf50f4bs10biv6nxlrrinm2di4";
};
# Contrib must be built in order to enable Tesseract support:
@ -130,10 +130,10 @@ let
ade = rec {
src = fetchurl {
url = "https://github.com/opencv/ade/archive/${name}";
sha256 = "1r85vdkvcka7bcxk69pd0ai4hld4iakpj4xl0xbinx3p9pv5a4l8";
sha256 = "04n9na2bph706bdxnnqfcbga4cyj8kd9s9ni7qyvnpj5v98jwvlm";
};
name = "v0.1.1d.zip";
md5 = "37479d90e3a5d47f132f512b22cbe206";
name = "v0.1.1f.zip";
md5 = "b624b995ec9c439cbc2e9e6ee940d3a2";
dst = ".cache/ade";
};
@ -161,14 +161,6 @@ stdenv.mkDerivation {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
'';
patches = [
(fetchpatch {
url = "https://github.com/opencv/opencv/commit/5691d998ead1d9b0542bcfced36c2dceb3a59023.patch";
name = "CVE-2019-14493.patch";
sha256 = "14qva9f5z10apz5q0skdyiclr9sgkhab4fzksy1w3b6j6hg4wm7m";
})
];
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "openfst";
version = "1.7.2";
version = "1.7.4";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1";
sha256 = "0drhq5348vbaccpa0z3jvd5hyv5bm2i9xrak1wb4yvl2mx77dbmh";
};
meta = {
description = "Library for working with finite-state transducers";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.0.1";
version = "6.0.2";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "1gg1qcyn1b52sy4akrpxjy8rnprp6dgzw2ywr18jp6m1fsy74rk2";
sha256 = "1hsi6c1466m5lgh8ayhf3hj4ddy6ambraagzgvvy7g370z4mx2yw";
};
buildInputs = [ qtbase cpp-utilities ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "serialdv";
version ="1.1.2";
version ="1.1.4";
src = fetchFromGitHub {
owner = "f4exb";
repo = "serialdv";
rev = "v${version}";
sha256 = "0d2lnvfzf31i3f2klm46s87gby3yz3hc46cap0yqifzml0ff1qbm";
sha256 = "0d88h2wjhf79nisiv96bq522hkbknzm88wsv0q9k33mzmrwnrx93";
};
nativeBuildInputs = [ cmake ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simpleitk";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "SimpleITK";
repo = "SimpleITK";
rev = "v${version}";
sha256 = "1cgq9cxxplv6bkm2zfvcc0lgyh5zw1hbry30k1429n9737wnadaw";
sha256 = "0nmsq0qx4jmrrhrc6bfm11wwvyszvfgl45xizw69yra3cv9pgmm6";
};
nativeBuildInputs = [ cmake git swig ];

4
pkgs/development/libraries/template-glib/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
let
version = "3.32.0";
version = "3.34.0";
pname = "template-glib";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr";
sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1";
};
buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trompeloeil";
version = "34";
version = "35";
src = fetchFromGitHub {
owner = "rollbear";
repo = "trompeloeil";
rev = "v${version}";
sha256 = "0mj3zni18kfm04jrqjaa1p6ii5q0dz6qdm3hi57z9lzygaxbdc97";
sha256 = "07jxvssasgmi2dk4wl6qzspx88g9cnz597flsapdzp0qd5j7xixd";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/libraries/v8/3.14.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Google's open source JavaScript engine";
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
license = licenses.bsd3;
};
}

81
pkgs/development/libraries/v8/3.16.14.nix
View File

@ -1,81 +0,0 @@
{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux, cctools }:
assert readline != null;
let
arch = if stdenv.isAarch32
then (if stdenv.is64bit then "arm64" else "arm")
else (if stdenv.is64bit then "x64" else "ia32");
armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard";
in
stdenv.mkDerivation rec {
pname = "v8";
version = "3.16.14.11";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${pname}-${version}.tar.bz2";
sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
};
postPatch = ''
sed -i 's/-Werror//' build/standalone.gypi build/common.gypi
'';
configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
export GYP_DEFINES="mac_deployment_target=$MACOSX_DEPLOYMENT_TARGET"
'' + ''
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
${gyp}/bin/gyp \
-f make \
--generator-output="out" \
-Dflock_index=0 \
-Dv8_enable_i18n_support=1 \
-Duse_system_icu=1 \
-Dconsole=readline \
-Dcomponent=shared_library \
-Dv8_target_arch=${arch} \
${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \
--depth=. -Ibuild/standalone.gypi \
build/all.gyp
'' + stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's@/usr/bin/env python@${python}/bin/python@g' out/gyp-mac-tool
'';
nativeBuildInputs = [ which ];
buildInputs = [ readline python icu ]
++ lib.optional stdenv.isLinux utillinux
++ lib.optional stdenv.isDarwin cctools;
NIX_CFLAGS_COMPILE = "-Wno-error -w";
buildFlags = [
"-C out"
"builddir=$(CURDIR)/Release"
"BUILDTYPE=Release"
];
enableParallelBuilding = true;
installPhase = ''
install -vD out/Release/d8 "$out/bin/d8"
${if stdenv.isDarwin then ''
install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib"
'' else ''
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
''}
cp -vr include "$out/"
'';
postFixup = if stdenv.isDarwin then ''
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib $out/lib/libv8.dylib
'' else null;
meta = with stdenv.lib; {
description = "V8 is Google's open source JavaScript engine";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.bsd3;
};
}

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

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R47.2";
version = "R48";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i";
sha256 = "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih";
};
nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ];

4
pkgs/development/python-modules/azure-mgmt-storage/default.nix
View File

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "5.0.0";
version = "6.0.0";
pname = "azure-mgmt-storage";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dd27ffc8c763932100dff1cda3d5a72dc2348686093732747f68396b1dd3fabf";
sha256 = "0pgmxr8shz6rmgbacfy1xb99y9ja38ck1lap0n58m6jjy1mgxk2w";
};
postInstall = if isPy3k then "" else ''

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

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "boolean.py";
version = "3.6";
version = "3.7";
src = fetchFromGitHub {
owner = "bastikr";
repo = "boolean.py";
rev = "v${version}";
sha256 = "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs";
sha256 = "1q9ji2jq07qr6vgp9yv6y8lx6h0zyi07fqjga3yi3vpfk46h2jn1";
};
meta = with lib; {

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