colin/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:
Frederik Rietdijk 2020-01-17 17:08:16 +01:00
commit bcd8c6b8dc
167 changed files with 3702 additions and 1266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/sources.nix
View File

@ -113,6 +113,10 @@ rec {
with builtins;
let fileName = toString path + "/" + file;
packedRefsName = toString path + "/packed-refs";
absolutePath = base: path:
if lib.hasPrefix "/" path
then path
else toString (/. + "${base}/${path}");
in if pathIsRegularFile path
# Resolve git worktrees. See gitrepository-layout(5)
then
@ -120,13 +124,11 @@ rec {
in if m == null
then throw ("File contains no gitdir reference: " + path)
else
let gitDir = lib.head m;
let gitDir = absolutePath (dirOf path) (lib.head m);
commonDir' = if pathIsRegularFile "${gitDir}/commondir"
then lib.fileContents "${gitDir}/commondir"
else gitDir;
commonDir = if lib.hasPrefix "/" commonDir'
then commonDir'
else toString (/. + "${gitDir}/${commonDir'}");
commonDir = absolutePath gitDir commonDir';
refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
in readCommitFromFile refFile commonDir

2
lib/types.nix
View File

@ -406,7 +406,7 @@ rec {
In file ${def.file}
a list is being assigned to the option config.${option}.
This will soon be an error as type loaOf is deprecated.
See https://git.io/fj2zm for more information.
See https://github.com/NixOS/nixpkgs/pull/63103 for more information.
Do
${option} =
{ ${set}${more}}

16
maintainers/maintainer-list.nix
View File

@ -3510,6 +3510,16 @@
githubId = 4611077;
name = "Raymond Gauthier";
};
jtcoolen = {
email = "jtcoolen@pm.me";
name = "Julien Coolen";
github = "jtcoolen";
githubId = 54635632;
keys = [{
longkeyid = "rsa4096/0x19642151C218F6F5";
fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5";
}];
};
jtobin = {
email = "jared@jtobin.io";
github = "jtobin";
@ -3844,6 +3854,12 @@
githubId = 449813;
name = "Roman Kuznetsov";
};
kwohlfahrt = {
email = "kai.wohlfahrt@gmail.com";
github = "kwohlfahrt";
githubId = 2422454;
name = "Kai Wohlfahrt";
};
kylesferrazza = {
name = "Kyle Sferrazza";
email = "kyle.sferrazza@gmail.com";

18
nixos/lib/test-driver/test-driver.py
View File

@ -84,7 +84,7 @@ CHAR_TO_KEY = {
# Forward references
nr_tests: int
nr_succeeded: int
failed_tests: list
log: "Logger"
machines: "List[Machine]"
@ -842,23 +842,31 @@ def run_tests() -> None:
machine.execute("sync")
if nr_tests != 0:
nr_succeeded = nr_tests - len(failed_tests)
eprint("{} out of {} tests succeeded".format(nr_succeeded, nr_tests))
if nr_tests > nr_succeeded:
if len(failed_tests) > 0:
eprint(
"The following tests have failed:\n - {}".format(
"\n - ".join(failed_tests)
)
)
sys.exit(1)
@contextmanager
def subtest(name: str) -> Iterator[None]:
global nr_tests
global nr_succeeded
global failed_tests
with log.nested(name):
nr_tests += 1
try:
yield
nr_succeeded += 1
return True
except Exception as e:
failed_tests.append(
'Test "{}" failed with error: "{}"'.format(name, str(e))
)
log.log("error: {}".format(str(e)))
return False
@ -880,7 +888,7 @@ if __name__ == "__main__":
exec("\n".join(machine_eval))
nr_tests = 0
nr_succeeded = 0
failed_tests = []
@atexit.register
def clean_up() -> None:

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

@ -127,6 +127,7 @@
./programs/java.nix
./programs/kbdlight.nix
./programs/less.nix
./programs/liboping.nix
./programs/light.nix
./programs/mosh.nix
./programs/mininet.nix
@ -577,6 +578,7 @@
./services/networking/connman.nix
./services/networking/consul.nix
./services/networking/coredns.nix
./services/networking/corerad.nix
./services/networking/coturn.nix
./services/networking/dante.nix
./services/networking/ddclient.nix

22
nixos/modules/programs/liboping.nix Normal file
View File

@ -0,0 +1,22 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.liboping;
in {
options.programs.liboping = {
enable = mkEnableOption "liboping";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ liboping ];
security.wrappers = mkMerge (map (
exec: {
"${exec}" = {
source = "${pkgs.liboping}/bin/${exec}";
capabilities = "cap_net_raw+p";
};
}
) [ "oping" "noping" ]);
};
}

7
nixos/modules/services/continuous-integration/buildkite-agent.nix
View File

@ -210,6 +210,9 @@ in
## don't end up in the Nix store.
preStart = let
sshDir = "${cfg.dataDir}/.ssh";
metaData = if cfg.meta-data == ""
then ""
else "meta-data=${cfg.meta-data}";
in
''
mkdir -m 0700 -p "${sshDir}"
@ -220,7 +223,7 @@ in
cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF
token="$(cat ${toString cfg.tokenPath})"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
${metaData}
build-path="${cfg.dataDir}/builds"
hooks-path="${cfg.hooksPath}"
${cfg.extraConfig}
@ -228,7 +231,7 @@ in
'';
serviceConfig =
{ ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
{ ExecStart = "${cfg.buildkite-agent}/bin/buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg";
User = "buildkite-agent";
RestartSec = 5;
Restart = "on-failure";

4
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -167,7 +167,7 @@ in
buildMachinesFiles = mkOption {
type = types.listOf types.path;
default = [ "/etc/nix/machines" ];
default = optional (config.nix.buildMachines != []) "/etc/nix/machines";
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines.";
};
@ -333,7 +333,7 @@ in
IN_SYSTEMD = "1"; # to get log severity levels
};
serviceConfig =
{ ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${boolToString cfg.useSubstitutes}";
{ ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v";
ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock";
User = "hydra-queue-runner";
Restart = "always";

46
nixos/modules/services/networking/corerad.nix Normal file
View File

@ -0,0 +1,46 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.corerad;
in {
meta = {
maintainers = with maintainers; [ mdlayher ];
};
options.services.corerad = {
enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon";
configFile = mkOption {
type = types.path;
example = literalExample "\"\${pkgs.corerad}/etc/corerad/corerad.toml\"";
description = "Path to CoreRAD TOML configuration file.";
};
package = mkOption {
default = pkgs.corerad;
defaultText = literalExample "pkgs.corerad";
type = types.package;
description = "CoreRAD package to use.";
};
};
config = mkIf cfg.enable {
systemd.services.corerad = {
description = "CoreRAD IPv6 NDP RA daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
LimitNPROC = 512;
LimitNOFILE = 1048576;
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
NoNewPrivileges = true;
DynamicUser = true;
ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}";
Restart = "on-failure";
};
};
};
}

3
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -629,6 +629,9 @@ in
environment.systemPackages = [httpd];
# required for "apachectl configtest"
environment.etc."httpd/httpd.conf".source = httpdConf;
services.httpd.phpOptions =
''
; Needed for PHP's mail() function.

53
nixos/modules/services/web-servers/nginx/gitweb.nix
View File

@ -3,8 +3,9 @@
with lib;
let
cfg = config.services.gitweb;
package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme {
cfg = config.services.nginx.gitweb;
gitwebConfig = config.services.gitweb;
package = pkgs.gitweb.override (optionalAttrs gitwebConfig.gitwebTheme {
gitwebTheme = true;
});
@ -17,13 +18,45 @@ in
default = false;
type = types.bool;
description = ''
If true, enable gitweb in nginx. Access it at http://yourserver/gitweb
If true, enable gitweb in nginx.
'';
};
location = mkOption {
default = "/gitweb";
type = types.str;
description = ''
Location to serve gitweb on.
'';
};
user = mkOption {
default = "nginx";
type = types.str;
description = ''
Existing user that the CGI process will belong to. (Default almost surely will do.)
'';
};
group = mkOption {
default = "nginx";
type = types.str;
description = ''
Group that the CGI process will belong to. (Set to <literal>config.services.gitolite.group</literal> if you are using gitolite.)
'';
};
virtualHost = mkOption {
default = "_";
type = types.str;
description = ''
VirtualHost to serve gitweb on. Default is catch-all.
'';
};
};
config = mkIf config.services.nginx.gitweb.enable {
config = mkIf cfg.enable {
systemd.services.gitweb = {
description = "GitWeb service";
@ -32,22 +65,22 @@ in
FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock";
};
serviceConfig = {
User = "nginx";
Group = "nginx";
User = cfg.user;
Group = cfg.group;
RuntimeDirectory = [ "gitweb" ];
};
wantedBy = [ "multi-user.target" ];
};
services.nginx = {
virtualHosts.default = {
locations."/gitweb/static/" = {
virtualHosts.${cfg.virtualHost} = {
locations."${cfg.location}/static/" = {
alias = "${package}/static/";
};
locations."/gitweb/" = {
locations."${cfg.location}/" = {
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile};
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
fastcgi_pass unix:/run/gitweb/gitweb.sock;
'';
};

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

@ -61,6 +61,7 @@ in
containers-portforward = handleTest ./containers-portforward.nix {};
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
containers-tmpfs = handleTest ./containers-tmpfs.nix {};
corerad = handleTest ./corerad.nix {};
couchdb = handleTest ./couchdb.nix {};
deluge = handleTest ./deluge.nix {};
dhparams = handleTest ./dhparams.nix {};

71
nixos/tests/corerad.nix Normal file
View File

@ -0,0 +1,71 @@
import ./make-test-python.nix (
{
nodes = {
router = {config, pkgs, ...}: {
config = {
# This machines simulates a router with IPv6 forwarding and a static IPv6 address.
boot.kernel.sysctl = {
"net.ipv6.conf.all.forwarding" = true;
};
networking.interfaces.eth1 = {
ipv6.addresses = [ { address = "fd00:dead:beef:dead::1"; prefixLength = 64; } ];
};
services.corerad = {
enable = true;
# Serve router advertisements to the client machine with prefix information matching
# any IPv6 /64 prefixes configured on this interface.
configFile = pkgs.writeText "corerad.toml" ''
[[interfaces]]
name = "eth1"
send_advertisements = true
[[interfaces.plugins]]
name = "prefix"
prefix = "::/64"
'';
};
};
};
client = {config, pkgs, ...}: {
# Use IPv6 SLAAC from router advertisements, and install rdisc6 so we can
# trigger one immediately.
config = {
boot.kernel.sysctl = {
"net.ipv6.conf.all.autoconf" = true;
};
environment.systemPackages = with pkgs; [
ndisc6
];
};
};
};
testScript = ''
start_all()
with subtest("Wait for CoreRAD and network ready"):
# Ensure networking is online and CoreRAD is ready.
router.wait_for_unit("network-online.target")
client.wait_for_unit("network-online.target")
router.wait_for_unit("corerad.service")
# Ensure the client can reach the router.
client.wait_until_succeeds("ping -c 1 fd00:dead:beef:dead::1")
with subtest("Verify SLAAC on client"):
# Trigger a router solicitation and verify a SLAAC address is assigned from
# the prefix configured on the router.
client.wait_until_succeeds("rdisc6 -1 -r 10 eth1")
client.wait_until_succeeds(
"ip -6 addr show dev eth1 | grep -q 'fd00:dead:beef:dead:'"
)
addrs = client.succeed("ip -6 addr show dev eth1")
assert (
"fd00:dead:beef:dead:" in addrs
), "SLAAC prefix was not found in client addresses after router advertisement"
assert (
"/64 scope global temporary" in addrs
), "SLAAC temporary address was not configured on client after router advertisement"
'';
})

8
nixos/tests/elk.nix
View File

@ -10,8 +10,7 @@ let
esUrl = "http://localhost:9200";
mkElkTest = name : elk :
let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0;
in import ./make-test-python.nix ({
import ./make-test-python.nix ({
inherit name;
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco offline basvandijk ];
@ -91,8 +90,7 @@ let
};
elasticsearch-curator = {
# The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0.
enable = !elasticsearchGe7;
enable = true;
actionYAML = ''
---
actions:
@ -173,7 +171,7 @@ let
one.wait_until_succeeds(
total_hits("Supercalifragilisticexpialidocious") + " | grep -v 0"
)
'' + pkgs.lib.optionalString (!elasticsearchGe7) ''
with subtest("Elasticsearch-curator works"):
one.systemctl("stop logstash")
one.systemctl("start elasticsearch-curator")

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
version = "1.2.2";
version = "1.2.4";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "${version}";
sha256 = "0q92ygz17iiriwzqylmaxd5ml2bhqy3n6c3f7g71n4hn9z3bl3s1";
sha256 = "0gyczxhd1jch7lwz3y1nrbpc0dycw9cc5i144rpif6b9gd2y1h1j";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "ecasound";
version = "2.9.2";
version = "2.9.3";
src = fetchurl {
url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz";
sha256 = "15rcs28fq2wfvfs66p5na7adq88b55qszbhshpizgdbyqzgr2jf1";
sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6";
};
buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];

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

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "giada";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "monocasual";
repo = pname;
rev = "v${version}";
sha256 = "1lbxqa4kwzjdd79whrjgh8li453z4ckkjx4s4qzmrv7aqa2xmfsf";
sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1";
};
configureFlags = [ "--target=linux" ];

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

@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "kakoune-unwrapped";
version = "2019.12.10";
version = "2020.01.16";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
rev = "v${version}";
sha256 = "0cb3ndlczxvxnzb91s4idxx0cy30mnrc4znsbjpnch68fvpm0x2f";
sha256 = "16v6z1nzj54j19fraxhb18jdby4zfs1br91gxpg9s2s4nsk0km0b";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];

119
pkgs/applications/editors/quartus-prime/default.nix Normal file
View File

@ -0,0 +1,119 @@
{ buildFHSUserEnv, makeDesktopItem, stdenv, lib, requireFile, unstick, cycloneVSupport ? true }:
let
quartus = stdenv.mkDerivation rec {
version = "19.1.0.670";
pname = "quartus-prime-lite";
src = let
require = {name, sha256}: requireFile {
inherit name sha256;
url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
};
in map require ([{
name = "QuartusLiteSetup-${version}-linux.run";
sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f";
} {
name = "ModelSimSetup-${version}-linux.run";
sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r";
}] ++ lib.optional cycloneVSupport {
name = "cyclonev-${version}.qdz";
sha256 = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab";
});
nativeBuildInputs = [ unstick ];
buildCommand = let
installers = lib.sublist 0 2 src;
components = lib.sublist 2 ((lib.length src) - 2) src;
copyInstaller = installer: ''
# `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf
cp ${installer} $TEMP/${installer.name}
chmod u+w,+x $TEMP/${installer.name}
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name}
'';
copyComponent = component: "cp ${component} $TEMP/${component.name}";
# leaves enabled: quartus, modelsim_ase, devinfo
disabledComponents = [
"quartus_help"
"quartus_update"
"modelsim_ae"
# Devices
"arria_lite"
"cyclone"
"cyclone10lp"
"max"
"max10"
] ++ lib.optional (!cycloneVSupport) "cyclonev";
in ''
${lib.concatMapStringsSep "\n" copyInstaller installers}
${lib.concatMapStringsSep "\n" copyComponent components}
unstick $TEMP/${(builtins.head installers).name} \
--disable-components ${lib.concatStringsSep "," disabledComponents} \
--mode unattended --installdir $out --accept_eula 1
# This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software
patch --force --strip 0 --directory $out < ${./vsim.patch}
rm -r $out/uninstall $out/logs
'';
meta = {
homepage = "https://fpgasoftware.intel.com";
description = "FPGA design and simulation software";
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ kwohlfahrt ];
};
};
desktopItem = makeDesktopItem {
name = quartus.name;
exec = "quartus";
icon = "quartus";
desktopName = "Quartus";
genericName = "Quartus FPGA IDE";
categories = "Development;";
};
# I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
in buildFHSUserEnv {
name = "quartus-prime-lite";
targetPkgs = pkgs: with pkgs; [
# quartus requirements
glib
xorg.libICE
xorg.libSM
zlib
# qsys requirements
xorg.libXtst
xorg.libXi
];
multiPkgs = pkgs: with pkgs; let
# This seems ugly - can we override `libpng = libpng12` for all `pkgs`?
freetype = pkgs.freetype.override { libpng = libpng12; };
fontconfig = pkgs.fontconfig.override { inherit freetype; };
libXft = pkgs.xorg.libXft.override { inherit freetype fontconfig; };
in [
# modelsim requirements
libxml2
ncurses5
unixODBC
libXft
# common requirements
freetype
fontconfig
xorg.libX11
xorg.libXext
xorg.libXrender
];
extraInstallCommands = ''
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
runScript = "${quartus}/quartus/bin/quartus";
}

11
pkgs/applications/editors/quartus-prime/vsim.patch Normal file
View File

@ -0,0 +1,11 @@
--- modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100
+++ modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100
@@ -207,7 +207,7 @@
2.[5-9]*) vco="linux" ;;
2.[1-9][0-9]*) vco="linux" ;;
3.[0-9]*) vco="linux" ;;
- *) vco="linux_rh60" ;;
+ *) vco="linux" ;;
esac
if [ ! -x "$dir/$vco/vsim" ]; then
if [ -x "$dir/linuxle/vsim" ]; then

12
pkgs/applications/editors/texstudio/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
version = "2.12.16";
version = "2.12.20";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq";
sha256 = "0hywx2knqdrslzmm4if476ryf4ma0aw5j8kdp6lyrz2jx7az2gqa";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
@ -20,10 +20,10 @@ mkDerivation rec {
meta = with lib; {
description = "TeX and LaTeX editor";
longDescription=''
Fork of TeXMaker, this editor is a full fledged IDE for
LaTeX editing with completion, structure viewer, preview,
spell checking and support of any compilation chain.
'';
Fork of TeXMaker, this editor is a full fledged IDE for
LaTeX editing with completion, structure viewer, preview,
spell checking and support of any compilation chain.
'';
homepage = http://texstudio.sourceforge.net;
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }:
{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}:
python3Packages.buildPythonApplication rec {
pname = "krop";
@ -19,6 +19,11 @@ python3Packages.buildPythonApplication rec {
ghostscript
];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];
# Disable checks because of interference with older Qt versions // xcb
doCheck = false;

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

@ -13,14 +13,14 @@ let
pythonPackages = python3Packages;
in
mkDerivation rec {
version = "1.5";
version = "1.6";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "0a05f6qfq90wrf4fixchp9knx4nhqhwjxl02n03a7k56xzxxnlci";
sha256 = "0b2f9m5azzvcjbmxkwcl1d7jvvp720b81zwn19rrskznfcc2r1i8";
};
buildInputs = [

4
pkgs/applications/graphics/tesseract/tesseract4.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "tesseract";
version = "4.1.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "tesseract-ocr";
repo = "tesseract";
rev = version;
sha256 = "06i7abxy2ifmdx1fak81cx0kns85n8hvp0339jk6242fhshibljx";
sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn";
};
enableParallelBuilding = true;

2
pkgs/applications/kde/default.nix
View File

@ -121,6 +121,7 @@ let
kio-extras = callPackage ./kio-extras.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};
kmahjongg = callPackage ./kmahjongg.nix {};
kmail = callPackage ./kmail.nix {};
kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
kmailtransport = callPackage ./kmailtransport.nix {};
@ -160,6 +161,7 @@ let
libkgapi = callPackage ./libkgapi.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkmahjongg = callPackage ./libkmahjongg.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
libksane = callPackage ./libksane.nix {};
libksieve = callPackage ./libksieve.nix {};

19
pkgs/applications/kde/kmahjongg.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdeclarative
, knewstuff
, libkdegames
, libkmahjongg
}:
mkDerivation {
name = "kmahjongg";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ genesis ];
};
}

18
pkgs/applications/kde/libkmahjongg.nix Normal file
View File

@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n,
kwidgetsaddons
}:
mkDerivation {
name = "libkmahjongg";
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ genesis ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n
kwidgetsaddons ];
outputs = [ "out" "dev" ];
}

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

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, curl, python, bind, iproute, bc, gitMinimal }:
let
version = "1.17.3";
version = "1.23.0";
deps = lib.makeBinPath [
curl
python
@ -19,7 +19,7 @@ stdenv.mkDerivation {
owner = "alexanderepstein";
repo = "Bash-Snippets";
rev = "v${version}";
sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r";
sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
};
buildInputs = [ makeWrapper ];

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "girara";
version = "0.3.3";
version = "0.3.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "13vr62kkkqs2xsrmsn114n6c6084ix1qyjksczqsc3s2y3bdsmj4";
sha256 = "08zdsr4zwi49facsl5596l0g1xqqv2jk3sqk841gkxwawcggim44";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ];

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

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
version = "7.18";
version = "7.19";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "1z3knfqfv0rwsq66adk0qngw1r500yvy4z259bygqkzbn2l5fcjk";
sha256 = "0mfmj0g6q6p2i6bd64ik1hq2l1ddqxnc6i9m30dnfl4v1zyvlc38";
};
nativeBuildInputs = [ qmake ];

4
pkgs/applications/misc/keepassx/community.nix
View File

@ -33,13 +33,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "0dkya9smx81c5cgcwk2gi2m1pabfff1v9gd3ngl42sdvyb63wgdq";
sha256 = "0z5bd17qaq7zpv96gw6qwv6rb4xx7xjq86ss6wm5zskcrraf7r7n";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

35
pkgs/applications/misc/marktext/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ appimageTools, fetchurl, lib }:
let
pname = "marktext";
version = "v0.16.0-rc.2";
in
appimageTools.wrapType2 rec {
name = "${pname}-${version}-binary";
src = fetchurl {
url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";
sha256 = "1w1mxa1j94zr36xhvlhzq8d77pi359vdxqb2j8mnz2bib9khxk9k";
};
profile = ''
export LC_ALL=C.UTF-8
'';
multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret
p.xlibs.libxkbfile
];
# Strip version from binary name.
extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}";
meta = with lib; {
description = "A simple and elegant markdown editor, available for Linux, macOS and Windows.";
homepage = "https://marktext.app";
license = licenses.mit;
maintainers = with maintainers; [ nh2 ];
platforms = [ "x86_64-linux" ];
};
}

12
pkgs/applications/misc/nnn/default.nix
View File

@ -4,17 +4,17 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "nnn";
version = "2.8.1";
version = "2.9";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
sha256 = "0h7j0wcpwwd2fibggr1nwkqpvhv2i1qnk54c4x6hixx31yidy2l0";
sha256 = "1pifrcrc8fh85b8h8x01hih9wfclb95sf38s443bs3gip1zdrlk3";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
preBuild = optionalString (conf != null) "cp ${configFile} nnn.h";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ readline ncurses ];
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Small ncurses-based file browser forked from noice";
homepage = https://github.com/jarun/nnn;
homepage = "https://github.com/jarun/nnn";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau ];
maintainers = with maintainers; [ jfrankenau filalex77 ];
};
}

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

@ -20,14 +20,14 @@
}:
mkDerivation rec {
version = "0.10.4";
version = "0.10.5";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "068v63bb1bq6vz7byhnd28l6dmr4jmivailxmjv86wakbsqvlhbi";
sha256 = "177ywk1dfdfwz7kvlxx3an1q4vv2c27d7qivy0463a3hvkacybxn";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]

19
pkgs/applications/misc/tmatrix/default.nix
View File

@ -1,22 +1,27 @@
{ stdenv, lib, fetchFromGitHub, cmake, ncurses }:
{ stdenv
, lib
, fetchFromGitHub
, cmake
, installShellFiles
, ncurses
}:
stdenv.mkDerivation rec {
pname = "tmatrix";
version = "1.1";
version = "1.3";
src = fetchFromGitHub {
owner = "M4444";
repo = "TMatrix";
rev = "v${version}";
sha256 = "1x9drk3wdsd6vzcypk3x068sqcbgis488s9fhcpsv8xgb496rd6y";
sha256 = "1cvgxmdpdzpl8w4z3sh4g5pbd15rd8s1kcspi9v95yf9rydyy69s";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake installShellFiles ];
buildInputs = [ ncurses ];
postInstall = ''
mkdir -p $out/share/man/man6
install -m 0644 ../tmatrix.6 $out/share/man/man6
installManPage ../tmatrix.6
'';
meta = with lib; {
@ -30,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/M4444/TMatrix";
license = licenses.gpl2;
platforms = platforms.all;
maintainers = with maintainers; [ infinisil ];
maintainers = with maintainers; [ infinisil filalex77 ];
};
}

2
pkgs/applications/misc/vit/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, python3Packages
, glibcLocales
, taskwarrior }:
with python3Packages;
@ -20,6 +21,7 @@ buildPythonApplication rec {
tzlocal
urwid
];
checkInputs = [ glibcLocales ];
makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :
{ stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :
stdenv.mkDerivation rec {
version = "1.2.6.1";
@ -11,13 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia";
};
nativeBuildInputs = [ cmake qttools ];
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ];
postInstall = ''
mkdir $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/XyGrib
wrapQtApp $out/XyGrib/XyGrib
mkdir -p $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
'';
meta = with stdenv.lib; {

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.16.0";
version = "1.17.1";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "1yk78w9cwssk5y69iapfzqf7mnrkam3w64x4zsx3zjpdmvp9dq7l";
sha256 = "0kp4xk1b8vxajl3cl6any9gmf3412gsahm5fvkyaclnj20yvq807";
};
modSha256 = "17rh8yilxqv0dwljwm5ay43diwcy5pa1g2jff9wyhsh8q7sy9wln";
modSha256 = "0fnlnavw4l3425c9nwjkd98xihrgxi9n5yc9yv15j5xzg47qnqav";
subPackages = [ "cmd/fluxctl" ];

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

@ -46,7 +46,7 @@ stdenv.mkDerivation {
--prefix PATH : ${xdg_utils}/bin
'';
inherit (rambox-bare.meta // {
meta = rambox-bare.meta // {
platforms = [ "i686-linux" "x86_64-linux" ];
});
};
}

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

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

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

@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.55.0.123";
version = "8.55.0.141";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@ -63,7 +63,7 @@ let
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "08dvgqwj7f8k3xv5kv96k6v6ga1v2chif9m7amncg6ppp81hy7nx";
sha256 = "0yfbxrnf2mjihrsvp0r81kbxh3rfh53y7sbfp3bwqky951a93qis";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

35
pkgs/applications/networking/irc/tiny/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv
, lib
, rustPlatform
, fetchpatch
, fetchFromGitHub
, pkg-config
, dbus
, openssl
}:
rustPlatform.buildRustPackage rec {
pname = "tiny";
version = "0.5.1";
src = fetchFromGitHub {
owner = "osa1";
repo = pname;
rev = "v${version}";
sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa";
};
cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv";
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ];
meta = with lib; {
description = "A console IRC client";
homepage = "https://github.com/osa1/tiny";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
};
}

34
pkgs/applications/networking/protonvpn-cli-ng/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, python3Packages, openvpn, dialog }:
python3Packages.buildPythonApplication rec {
name = "protonvpn-cli-ng";
version = "2.2.0";
src = fetchFromGitHub {
owner = "protonvpn";
repo = "protonvpn-cli-ng";
rev = "v${version}";
sha256 = "11fvnnr5p3qdc4y10815jnydcjvxlxwkkq9kvaajg0yszq84rwkz";
};
propagatedBuildInputs = (with python3Packages; [
requests
docopt
setuptools
pythondialog
]) ++ [
dialog
openvpn
];
# No tests
doCheck = false;
meta = with stdenv.lib; {
description = "Linux command-line client for ProtonVPN";
homepage = "https://github.com/protonvpn/protonvpn-cli-ng";
maintainers = [ maintainers.jtcoolen ];
license = licenses.gpl3;
platforms = platforms.unix;
};
}

22
pkgs/applications/networking/seafile-client/default.nix
View File

@ -1,33 +1,31 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, jansson, libsearpc
, withShibboleth ? true, qtwebengine }:
with stdenv.lib;
mkDerivation rec {
version = "6.2.11";
stdenv.mkDerivation rec {
pname = "seafile-client";
version = "7.0.5";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj";
sha256 = "08ysmhvdpyzq2s16i3fvii252fzjrxly3da74x8y6wbyy8yywmjy";
};
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qttools seafile-shared ]
++ optional withShibboleth qtwebengine;
buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ]
++ lib.optional withShibboleth qtwebengine;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
qtWrapperArgs = [
"--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
];
meta = with stdenv.lib; {
homepage = https://github.com/haiwen/seafile-client;
meta = with lib; {
homepage = "https://github.com/haiwen/seafile-client";
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
license = licenses.asl20;
platforms = platforms.linux;

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
version = "3.2.0";
version = "3.2.1";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0v5nn7i2nbqr59jsw8cs2052hr7xd96x1sa3480g8ks5kahk7zac";
sha256 = "0nz84zyhs4177ljxmv34vgc9kgg7ssxhxa4mssxqwh6nb00697sq";
};
cmakeFlags = [

28
pkgs/applications/office/csv2odf/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, python3, fetchurl }:
python3.pkgs.buildPythonApplication rec {
pname = "csv2odf";
version = "2.09";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "09l0yfay89grjdzap2h11f0hcyn49np5zizg2yyp2aqgjs8ki57p";
};
meta = with lib; {
homepage = "https://sourceforge.net/p/csv2odf/wiki/Main_Page/";
description = "Convert csv files to OpenDocument Format";
longDescription = ''
csv2odf is a command line tool that can convert a comma separated value
(csv) file to an odf, ods, html, xlsx, or docx document that can be viewed in
LibreOffice and other office productivity programs. csv2odf is useful for
creating reports from databases and other data sources that produce csv files.
csv2odf can be combined with cron and shell scripts to automatically generate
business reports.
The output format (fonts, number formatting, etc.) is controlled by a
template file that you can design in your office application of choice.
'';
license = licenses.gpl3;
maintainers = with maintainers; [ leenaars ];
};
}

4
pkgs/applications/radio/urh/default.nix
View File

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "urh";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "jopohl";
repo = pname;
rev = "v${version}";
sha256 = "0vwc1jw1fjirdpavrnvc95bql8023ayrz9srbwn0p6n0ia038948";
sha256 = "0cypm602zl3s4qggmafj4c246h65qgzsj3bsimvc5zz7jspk6m77";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];

22
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif
, cfitsio , getopt , perl , groff , which, darwin
{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif
, cfitsio , getopt , perl , groff , which, darwin, ncurses
}:
let
python27Env = python27.withPackages(ps: with ps; [ numpy ]);
python3Env = python3.withPackages(ps: with ps; [ numpy ]);
in
stdenv.mkDerivation rec {
srcVersion = "dec19a";
version = "20191201_a";
srcVersion = "jan20a";
version = "20200101_a";
pname = "gildas";
src = fetchurl {
@ -16,17 +16,19 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
sha256 = "0kwq5gzgzx5hkbabwvbrw2958pqz4m2s501k5cbllgxh4sqp86b1";
sha256 = "12n08pax7gwg2z121ix3ah5prq3yswqnf2yc8jgs4i9rgkpbsfzz";
};
enableParallelBuilding = true;
# Python scripts are not converted to Python 3 syntax when parallel
# building is turned on. Disable it until this is fixed upstream.
enableParallelBuilding = false;
nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./imager-py3.patch ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}
substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env}
substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl
source admin/gildas-env.sh -c gfortran -o openmp
echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl

12
pkgs/applications/science/astronomy/gildas/imager-py3.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN gildas-src-jan20a.orig/contrib/imager/pro/define.ima gildas-src-jan20a/contrib/imager/pro/define.ima
--- gildas-src-jan20a.orig/contrib/imager/pro/define.ima 2020-01-01 02:15:16.000000000 +0100
+++ gildas-src-jan20a/contrib/imager/pro/define.ima 2020-01-14 11:18:46.000000000 +0100
@@ -9,7 +9,7 @@
!
! Patch for a Bug on Mac-OS/X where Python blocks if activated first
! from a script launched by a widget.
-python print "Starting Python"
+python print("Starting Python")
!
! INPUT, GO and UVT_CONVERT always defined by GreG
define command GO "@ p_go.ima" gag_pro:go_greg.hlp

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

@ -46,7 +46,7 @@ let
gitFull = gitBase.override {
svnSupport = true;
guiSupport = true;
sendEmailSupport = !stdenv.isDarwin;
sendEmailSupport = true;
withLibsecret = !stdenv.isDarwin;
};

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-subrepo";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "ingydotnet";
repo = "git-subrepo";
rev = version;
sha256 = "05m2dm9gq2nggwnxxdyq2kjj584sn2lxk66pr1qhjxnk81awj9l7";
sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp";
};
nativeBuildInputs = [

1
pkgs/applications/version-management/gitlab/default.nix
View File

@ -51,6 +51,7 @@ let
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.
GITLAB_LOG_PATH = "log";
FOSS_ONLY = !gitlabEnterprise;
configurePhase = ''
runHook preConfigure

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "41.0.0";
version = "42.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "0p9mwhc6smchwikxbslgk7a2f3hfccaih09xfhricb80d97jz218";
sha256 = "0bjb1cx1sj61yhpraqryhxma4wiz0yl3asnbsv9hvq730v07hg0b";
};
nativeBuildInputs = [

4
pkgs/applications/virtualization/docker-compose/default.nix
View File

@ -7,12 +7,12 @@
}:
buildPythonApplication rec {
version = "1.25.0";
version = "1.25.1";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "0zlprmsgmj4z627snsl0qmq8y7ggcyqrqm5vxvrvcigl7zywnprc";
sha256 = "003rb5hp8plb3yvv0x5dwzz13gdvq91nvrvx29d41h97n1lklw67";
};
# lots of networking and other fails

25
pkgs/data/fonts/jetbrains-mono/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, fetchzip }:
let
version = "1.0.0";
in
fetchzip rec {
name = "JetBrainsMono-${version}";
url = "https://download.jetbrains.com/fonts/JetBrainsMono-${version}.zip";
sha256 = "0mwqi66d56v4ml1w7wjsiidrh153jvh0czafyic47rkvmxhnrrhv";
postFetch = ''
unzip $downloadedFile
install -m444 -Dt $out/share/fonts/truetype *.ttf
'';
meta = with lib; {
description = "A typeface made for developers";
homepage = "https://jetbrains.com/mono/";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}

4
pkgs/data/fonts/sudo/default.nix
View File

@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
version = "0.40";
version = "0.41";
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "1nf025sjps4yysf6zkns5fzjgls6xdpifh7bz4ray9x8h5pz0z64";
sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53";
postFetch = ''
mkdir -p $out/share/fonts/truetype/

13
pkgs/data/icons/bibata-cursors/default.nix
View File

@ -1,25 +1,28 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
stdenvNoCC.mkDerivation rec {
let
py = python3.withPackages(ps: [ ps.pillow ]);
in stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "KaizIqbal";
repo = "Bibata_Cursor";
rev = "v${version}";
sha256 = "14gvpjp4gv0m59qr8wls7xs5yjx5llldyzack5kg5cg2mzk2nsml";
sha256 = "1f7i5jkl21fvrr45zpcj40avkc7camjb1ddrrdlaabbplgz5mcgn";
};
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "gksu " ""
substituteInPlace build.sh --replace "sudo" ""
'';
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
py
];
buildPhase = ''

4
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View File

@ -3,13 +3,13 @@
let
pname = "dconf-editor";
version = "3.34.2";
version = "3.34.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0pwxjada2vaf69ihpjgp9nky54iykvxq63lp1vl8pxjanif2mk6f";
sha256 = "12q2cjds5fbarc5zajmhbx9vrbfn28hrklrk1fbgdv1ykxm1ljcv";
};
nativeBuildInputs = [

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

@ -5,13 +5,13 @@
let
pname = "gnome-klotski";
version = "3.34.0";
version = "3.34.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0sbx0bzy32lh2c9jp8v7gz788wn9y1la8mr5a7gf7370szsl4d4f";
sha256 = "0swbyjlgrkd1hgcmp23h7p8fpjm2rpmnn87n6is0jx1x4cl8ab18";
};
nativeBuildInputs = [

4
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "elementary-code";
version = "3.1.1";
version = "3.2.0";
repoName = "code";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc";
sha256 = "0sdh22dc38qikak9iyrw402ap6zxckg9vkfppvv526jg88cckibd";
};
passthru = {

52
pkgs/development/compilers/computecpp/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv
, fetchzip
, pkg-config
, autoPatchelfHook
, installShellFiles
, ncurses5
, ocl-icd
, zlib
}:
stdenv.mkDerivation rec {
pname = "computecpp";
version = "1.2.0";
src = fetchzip {
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz";
sha256 = "191kwvzxfg1sbaq6aw6f84chi7bhsibb2a63zsyz3gz8m0c0syr5";
stripRoot = true;
};
dontStrip = true;
buildInputs = [ stdenv.cc.cc.lib ncurses5 ocl-icd zlib ];
nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ];
installPhase = ''
runHook preInstall
find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \;
find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \;
find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \;
find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \;
find ./include -type f -exec install -D -m 0644 {} -t $out/include \;
runHook postInstall
'';
passthru = {
isClang = true;
} // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
};
meta = with stdenv.lib; {
description =
"Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
homepage = https://www.codeplay.com/products/computesuite/computecpp;
license = licenses.unfree;
maintainers = with maintainers; [ davidtwco ];
platforms = [ "x86_64-linux" ];
};
}

160
pkgs/development/compilers/swift/default.nix
View File

@ -33,33 +33,40 @@
}:
let
v_base = "5.0.2";
version = "${v_base}-RELEASE";
version_friendly = v_base;
version = "5.1.1";
tag = "refs/tags/swift-${version}";
fetch = { repo, sha256, fetchSubmodules ? false }:
fetchFromGitHub {
owner = "apple";
inherit repo sha256 fetchSubmodules;
rev = tag;
rev = "swift-${version}-RELEASE";
name = "${repo}-${version}-src";
};
sources = {
# FYI: SourceKit probably would work but currently requires building everything twice
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch {
repo = "swift-clang";
sha256 = "046p7f4044ls8hhgklsz32md5jvxkaaim1d75n0fmnwap6di3n1q";
};
llvm = fetch {
repo = "swift-llvm";
sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84";
sha256 = "00ldd9dby6fl6nk3z17148fvb7g9x4jkn1afx26y51v8rwgm1i7f";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r";
sha256 = "1431f74l0n2dxn728qp65nc6hivx88fax1wzfrnrv19y77br05wj";
};
clang = fetch {
repo = "swift-clang";
sha256 = "0n7k6nvzgqp6h6bfqcmna484w90db3zv4sh5rdh89wxyhdz6rk4v";
};
clangtools = fetch {
repo = "swift-clang-tools-extra";
sha256 = "0snp2rpd60z239pr7fxpkj332rkdjhg63adqvqdkjsbrxcqqcgqa";
};
indexstore = fetch {
repo = "indexstore-db";
sha256 = "1gwkqkdmpd5hn7555dpdkys0z50yh00hjry2886h6rx7avh5p05n";
};
sourcekit = fetch {
repo = "sourcekit-lsp";
sha256 = "0k84ssr1k7grbvpk81rr21ii8csnixn9dp0cga98h6i1gshn8ml4";
};
cmark = fetch {
repo = "swift-cmark";
@ -67,32 +74,32 @@ let
};
lldb = fetch {
repo = "swift-lldb";
sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi";
sha256 = "0j787475f0nlmvxqblkhn3yrvn9qhcb2jcijwijxwq95ar2jdygs";
};
llbuild = fetch {
repo = "swift-llbuild";
sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms";
sha256 = "1n2s5isxyl6b6ya617gdzjbw68shbvd52vsfqc1256rk4g448v8b";
};
pm = fetch {
repo = "swift-package-manager";
sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh";
sha256 = "1a49jmag5mpld9zr96g8a773334mrz1c4nyw38gf4p6sckf4jp29";
};
xctest = fetch {
repo = "swift-corelibs-xctest";
sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z";
sha256 = "0rxy9sq7i0s0kxfkz0hvdp8zyb40h31f7g4m0kry36qk82gzzh89";
};
foundation = fetch {
repo = "swift-corelibs-foundation";
sha256 = "1wys4xh7f6c7yjf210x41n2krmyi2qj1wpxbv0p48d230va1azj1";
sha256 = "1iiiijsnys0r3hjcj1jlkn3yszzi7hwb2041cnm5z306nl9sybzp";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
sha256 = "0chnb0d4xjyn9wnc8bgimd5ji5igfyq891flgnqpfwr4y26496c1";
sha256 = "0laqsizsikyjhrzn0rghvxd8afg4yav7cbghvnf7ywk9wc6kpkmn";
fetchSubmodules = true;
};
swift = fetch {
repo = "swift";
sha256 = "0fsq1y8dz4ssn90akvzj36cqyblalb09bjzy4ikqn67mb5x99wpb";
sha256 = "0m4r1gzrnn0s1c7haqq9dlmvpqxbgbkbdfmq6qaph869wcmvdkvy";
};
};
@ -116,23 +123,9 @@ let
"-DGCC_INSTALL_PREFIX=${clang.cc.gcc}"
];
builder = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
$SWIFT_SOURCE_ROOT/swift/utils/build-script \
--preset=buildbot_linux \
installable_package=$INSTALLABLE_PACKAGE \
install_prefix=$out \
install_destdir=$SWIFT_INSTALL_DIR \
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
in
stdenv.mkDerivation {
name = "swift-${version_friendly}";
name = "swift-${version}";
nativeBuildInputs = [
autoconf
@ -164,32 +157,17 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; # for LLDB
configurePhase = ''
cd ..
export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz
mkdir build install
export SWIFT_BUILD_ROOT=$PWD/build
export SWIFT_INSTALL_DIR=$PWD/install
cd $SWIFT_BUILD_ROOT
unset CC
unset CXX
export NIX_ENFORCE_PURITY=
'';
unpackPhase = ''
mkdir src
cd src
export sourceRoot=$PWD
export SWIFT_SOURCE_ROOT=$PWD
cp -r ${sources.clang} clang
cp -r ${sources.llvm} llvm
cp -r ${sources.compilerrt} compiler-rt
cp -r ${sources.clang} clang
cp -r ${sources.clangtools} clang-tools-extra
cp -r ${sources.indexstore} indexstore-db
cp -r ${sources.sourcekit} sourcekit-lsp
cp -r ${sources.cmark} cmark
cp -r ${sources.lldb} lldb
cp -r ${sources.llbuild} llbuild
@ -234,33 +212,75 @@ stdenv.mkDerivation {
\
-e 's/^swift-install-components=autolink.*$/\0;editor-integration/'
# https://bugs.swift.org/browse/SR-10559
patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch}
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/lib' '"${glibc}/lib" "'
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
patch -p1 -d clang -i ${./patches/llvm-include-dirs.patch}
patch -p1 -d clang -i ${./patches/llvm-toolchain-dir.patch}
patch -p1 -d clang -i ${./purity.patch}
# Workaround hardcoded dep on "libcurses" (vs "libncurses"):
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt
# uuid.h is not part of glibc, but of libuuid
sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb
PREFIX=''${out/#\/}
substituteInPlace indexstore-db/Utilities/build-script-helper.py \
--replace usr "$PREFIX"
substituteInPlace sourcekit-lsp/Utilities/build-script-helper.py \
--replace usr "$PREFIX"
substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX"
'';
buildPhase = builder;
configurePhase = ''
cd ..
doCheck = false;
mkdir build install
export SWIFT_BUILD_ROOT=$PWD/build
export SWIFT_INSTALL_DIR=$PWD/install
export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz
export NIX_ENFORCE_PURITY=
cd $SWIFT_BUILD_ROOT
'';
buildPhase = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
export NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
# However, we want to use the wrapped compiler whenever possible.
export CC="${clang}/bin/clang"
# fix for https://bugs.llvm.org/show_bug.cgi?id=39743
# see also https://forums.swift.org/t/18138/15
export CCC_OVERRIDE_OPTIONS="#x-fmodules s/-fmodules-cache-path.*//"
$SWIFT_SOURCE_ROOT/swift/utils/build-script \
--preset=buildbot_linux \
installable_package=$INSTALLABLE_PACKAGE \
install_prefix=$out \
install_destdir=$SWIFT_INSTALL_DIR \
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"
'';
doCheck = true;
checkInputs = [ file ];
# TODO: investigate the non-working tests
checkPhase = ''
# FIXME: disable non-working tests
rm $SWIFT_SOURCE_ROOT/swift/test/Driver/static-stdlib-linux.swift # static linkage of libatomic.a complains about missing PIC
rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift # install_prefix not passed properly
# match the swift wrapper in the install phase
export LIBRARY_PATH=${icu}/lib:${libuuid.out}/lib
checkTarget=check-swift-all
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
ninjaCheckPhase
'';
@ -268,18 +288,22 @@ stdenv.mkDerivation {
mkdir -p $out
# Extract the generated tarball into the store
PREFIX=''${out/#\/}
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/}
find $out -type d -empty -delete
# fix installation weirdness, also present in Apple’s official tarballs
mv $out/local/include/indexstore $out/include
rmdir $out/local/include $out/local
rm -r $out/bin/sdk-module-lists $out/bin/swift-api-checker.py
wrapProgram $out/bin/swift \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : $icu/lib
--suffix LIBRARY_PATH : ${icu}/lib:${libuuid.out}/lib
'';
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" '';
# Hack to avoid build and install directories in RPATHs.
preFixup = ''rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR'';
meta = with stdenv.lib; {
description = "The Swift Programming Language";

16
pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
View File

@ -1,17 +1,8 @@
From 1fc49285c7a198de14005803dfde64bda17f4120 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 28 Mar 2017 15:01:16 -0500
Subject: [PATCH 1/4] build-presets: (linux) don't require using Ninja
Don't build Ninja, we use our own.
---
utils/build-presets.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -721,7 +721,7 @@ swiftpm
@@ -745,7 +745,7 @@ swiftpm
dash-dash
@ -20,6 +11,3 @@ index 7ee57ad2df..e6b0af3581 100644
install-swift
install-lldb
install-llbuild
--
2.12.2

20
pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
View File

@ -1,25 +1,13 @@
From fca6624b7a0ad670157105336a737cc95f9ce9fb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 28 Mar 2017 15:01:40 -0500
Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
allow custom install prefix
---
utils/build-presets.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644
--- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200
@@ -728,7 +728,7 @@
@@ -752,7 +752,7 @@
install-swiftpm
install-xctest
install-libicu
-install-prefix=/usr
+install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
install-libcxx
--
2.12.2
install-sourcekit-lsp
build-swift-static-stdlib

10
pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch
View File

@ -1,6 +1,8 @@
Disable targets, where we use Nix packages.
--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200
@@ -716,8 +716,6 @@
@@ -740,8 +740,6 @@
llbuild
swiftpm
xctest
@ -9,15 +11,13 @@
dash-dash
@@ -727,11 +725,9 @@
@@ -751,9 +749,7 @@
install-llbuild
install-swiftpm
install-xctest
-install-libicu
install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
-install-libcxx
install-sourcekit-lsp
build-swift-static-stdlib
build-swift-static-sdk-overlay
build-swift-stdlib-unittest-extra

16
pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
View File

@ -1,17 +1,8 @@
From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 28 Mar 2017 15:02:37 -0500
Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options
plumb extra-cmake-options
---
utils/build-presets.ini | 2 ++
1 file changed, 2 insertions(+)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s
@@ -766,6 +766,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
@ -20,6 +11,3 @@ index 1739e91dc2..0608fed9c1 100644
[preset: buildbot_linux]
mixin-preset=mixin_linux_installation
build-subdir=buildbot_linux
--
2.12.2

2
pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
View File

@ -2,7 +2,7 @@ The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
@@ -68,7 +68,7 @@
@@ -77,7 +77,7 @@
endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")

13
pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch
View File

@ -1,13 +0,0 @@
Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning.
--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200
+++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200
@@ -1053,7 +1053,7 @@
#else
#define _dispatch_client_assert_fail(fmt, ...) do { \
char *_msg = NULL; \
- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
+ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
##__VA_ARGS__); \
_dispatch_assert_crash(_msg); \
free(_msg); \

13
pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
View File

@ -1,13 +0,0 @@
Only use the Nix include dirs when no sysroot is configured.
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
@@ -641,7 +641,7 @@
// Check for configure-time C include directories.
StringRef CIncludeDirs(C_INCLUDE_DIRS);
- if (CIncludeDirs != "") {
+ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
SmallVector<StringRef, 5> dirs;
CIncludeDirs.split(dirs, ":");
for (StringRef dir : dirs) {

24
pkgs/development/compilers/swift/patches/llvm-toolchain-dir.patch Normal file
View File

@ -0,0 +1,24 @@
Use the Nix include dirs and gcc runtime dir, when no sysroot is configured.
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
@@ -665,7 +665,7 @@
// Check for configure-time C include directories.
StringRef CIncludeDirs(C_INCLUDE_DIRS);
- if (CIncludeDirs != "") {
+ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
SmallVector<StringRef, 5> dirs;
CIncludeDirs.split(dirs, ":");
for (StringRef dir : dirs) {
--- clang/lib/Driver/ToolChains/Gnu.cpp 2019-10-26 09:49:27.003752743 +0200
+++ clang/lib/Driver/ToolChains/Gnu.cpp 2019-10-26 09:50:49.067236497 +0200
@@ -1743,7 +1743,7 @@
// If we have a SysRoot, ignore GCC_INSTALL_PREFIX.
// GCC_INSTALL_PREFIX specifies the gcc installation for the default
// sysroot and is likely not valid with a different sysroot.
- if (!SysRoot.empty())
+ if (!(SysRoot.empty() || SysRoot == "/"))
return "";
return GCC_INSTALL_PREFIX;

16
pkgs/development/compilers/swift/purity.patch
View File

@ -1,17 +1,8 @@
From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 18 May 2017 11:56:12 -0500
Subject: [PATCH] "purity" patch for 5.0
"purity" patch for 5.0
---
lib/Driver/ToolChains/Gnu.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -380,13 +380,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
@@ -402,13 +402,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_static)) {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
@ -25,6 +16,3 @@ index fe3c0191bb..c6a482bece 100644
}
CmdArgs.push_back("-o");
--
2.11.0

40
pkgs/development/interpreters/wasmer/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, llvmPackages
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "0.13.0";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = version;
sha256 = "1k9zd2vhrbvxlpkh21m39alk5lfhd3xa25k0awis27plfpv8fqcq";
fetchSubmodules = true;
};
cargoSha256 = "1yp7kandh5hh8hkzlmqpj05vwgr5v4nil8blf3scbppg865qk3rq";
nativeBuildInputs = [ cmake pkg-config ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
meta = with lib; {
description = "The Universal WebAssembly Runtime";
longDescription = ''
Wasmer is a standalone WebAssembly runtime for running WebAssembly outside
of the browser, supporting WASI and Emscripten. Wasmer can be used
standalone (via the CLI) and embedded in different languages, running in
x86 and ARM devices.
'';
homepage = "https://wasmer.io/";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.all;
};
}

33
pkgs/development/libraries/blitz/blitz-gcc47.patch
View File

@ -1,33 +0,0 @@
diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h
--- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200
+++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200
@@ -117,15 +117,15 @@
}
}
- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__)
+ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__)
#define BZPRECHECK(X,Y) \
{ \
if ((assertFailMode == false) && (!(X))) \
BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \
- checkAssert(X, __FILE__, __LINE__); \
+ blitz::checkAssert(X, __FILE__, __LINE__); \
}
#define BZ_DEBUG_MESSAGE(X) \
@@ -138,7 +138,7 @@
}
#define BZ_DEBUG_PARAM(X) X
- #define BZ_PRE_FAIL checkAssert(0)
+ #define BZ_PRE_FAIL blitz::checkAssert(0)
#define BZ_ASM_DEBUG_MARKER
#elif defined(BZ_DEBUG)

13
pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch
View File

@ -1,13 +0,0 @@
diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp
index b23e979..fe6b5ed 100644
--- a/testsuite/stencil-et.cpp
+++ b/testsuite/stencil-et.cpp
@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2)
BZTEST(all(d1==d2));
}
*/
-#define test_expr(d1,d2) BZTEST(all((d1)==(d2)));
+#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7));
// Test two vector expressions for equality
template<typename T1, typename T2>

81
pkgs/development/libraries/blitz/default.nix
View File

@ -1,81 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gfortran, texinfo
# Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1
# Pad arrays to simdWidth by default?
# Note: Only useful if simdWidth > 1
, enablePadding ? false
# Activate serialization through Boost.Serialize?
, enableSerialization ? true, boost ? null
# Activate test-suite?
# WARNING: Some of the tests require up to 1700MB of memory to compile.
, doCheck ? true
}:
assert enableSerialization -> boost != null;
let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation {
name = "blitz++-0.10";
src = fetchurl {
url = mirror://sourceforge/blitz/blitz-0.10.tar.gz;
sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0";
};
patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gfortran texinfo ]
++ optional (boost != null) boost;
configureFlags =
[ "--enable-shared"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
"--enable-html-docs"
"--disable-doxygen"
"--disable-dot"
"--disable-latex-docs"
"--enable-simd-width=${toString simdWidth}"
]
++ optional enablePadding "--enable-array-length-padding"
++ optional enableSerialization "--enable-serialization"
++ optionals (boost != null) [ "--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib" ]
++ optional stdenv.is64bit "--enable-64bit"
;
enableParallelBuilding = true;
buildFlags = [ "lib" "info" "pdf" "html" ];
installTargets = [ "install" "install-info" "install-pdf" "install-html" ];
inherit doCheck;
checkTarget = "check-testsuite check-examples";
meta = {
description = "Fast multi-dimensional array library for C++";
homepage = https://sourceforge.net/projects/blitz/;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.aherrmann ];
longDescription = ''
Blitz++ is a C++ class library for scientific computing which provides
performance on par with Fortran 77/90. It uses template techniques to
achieve high performance. Blitz++ provides dense arrays and vectors,
random number generators, and small vectors (useful for representing
multicomponent or vector fields).
'';
broken = true; # failing test, ancient version, no library user in nixpkgs => if you care to fix it, go ahead
};
}

4
pkgs/development/libraries/cpp-utilities/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "5.0.1";
version = "5.1.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "11wm7z4ldsja2x2m2dkj3xhiammkwfqgbgkwq9gssnv14803fhnv";
sha256 = "0g7mn84xx7yfbvpj9wm5sn08w8bzlfizh4yd1m75fnh8hg829jnl";
};
nativeBuildInputs = [ cmake ];

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "19.12";
version = "20.01";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "0y8dc7lnhh69wcwqma9spyxcahfhbfyg92h35sqkin6qfh5mngxr";
sha256 = "0gqwma3r216xgymjnagm6ndxfvdigzl46nlny4z085sgvydx3n8m";
};
nativeBuildInputs = [cmake];

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

@ -4,7 +4,7 @@
let
pname = "grilo";
version = "0.3.10"; # if you change minor, also change ./setup-hook.sh
version = "0.3.11"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y";
sha256 = "0s7b50nbyvi75x2l507q9pnpp4ynrx9qa0hm2bkw7wd2nl61r48g";
};
setupHook = ./setup-hook.sh;

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libimobiledevice";
version = "2019-04-04";
version = "2019-11-29";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "eea4f1be9107c8ab621fd71460e47d0d38e55d71";
sha256 = "0wh6z5f5znlqs0grh7c8jj1s411azgyy45klmql5kj3p8qqybqrs";
rev = "9f79242a441ce37c28db2b84d49621d26418dc53";
sha256 = "1hs0hppsfyhjx47jk2j8n5riqjyrdqvdkc0z0kry0sw09c80zjnr";
};
outputs = [ "out" "dev" ];

14
pkgs/development/libraries/liblinear/default.nix
View File

@ -18,17 +18,19 @@ stdenv.mkDerivation rec {
libSuff = stdenv.hostPlatform.extensions.sharedLibrary;
in ''
mkdir -p $out/lib $out/bin $out/include
cp liblinear.so.3 $out/lib/liblinear.3${libSuff}
ln -s $out/lib/liblinear.3${libSuff} $out/lib/liblinear${libSuff}
${if stdenv.isDarwin then ''
cp liblinear.so.3 $out/lib/liblinear.3.dylib
ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib
install_name_tool -id liblinear.3.dylib $out/lib/liblinear.3.dylib
'' else ''
cp liblinear.so.3 $out/lib/liblinear.so.3
ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so
''}
cp train $out/bin/liblinear-train
cp predict $out/bin/liblinear-predict
cp linear.h $out/include
'';
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -id liblinear.3.dylib $out/lib/liblinear.3.dylib
'';
meta = with stdenv.lib; {
description = "A library for large linear classification";
homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/;

10
pkgs/development/libraries/libsixel/default.nix
View File

@ -1,15 +1,21 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
version = "1.8.2";
version = "1.8.4";
pname = "libsixel";
src = fetchFromGitHub {
repo = "libsixel";
rev = "v${version}";
owner = "saitoha";
sha256 = "1jn5z2ylccjkp9i12n5x53x2zzhhsgmgs6xxi7aja6qimfw90h1n";
sha256 = "1zckahfl0j7k68jf87iwdc4yx7fkfhxwa7lrf22dnz36d2iq785v";
};
configureFlags = [
"--enable-tests"
];
doCheck = true;
meta = with stdenv.lib; {
description = "The SIXEL library for console graphics, and converter programs";
homepage = http://saitoha.github.com/libsixel;

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

@ -36,7 +36,7 @@ let
outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo = stdenv.cc.isGNU;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodev;
@ -72,7 +72,11 @@ let
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng";
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
# OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options.
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
makeFlags = [
"MANDIR=$(man)/share/man"

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

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

187
pkgs/development/python-modules/fluidasserts/default.nix Normal file
View File

@ -0,0 +1,187 @@
{ buildPythonPackage
, fetchPypi
, isPy37
, lib
# pythonPackages
, aiohttp
, androguard
, azure-identity
, azure-keyvault-keys
, azure-keyvault-secrets
, azure-mgmt-compute
, azure-mgmt-keyvault
, azure-mgmt-network
, azure-mgmt-storage
, azure-mgmt-web
, azure-storage-file
, bandit
, bcrypt
, beautifulsoup4
, boto3
, cfn-flip
, cython
, dnspython
, colorama
, configobj
, defusedxml
, GitPython
, google_api_python_client
, kubernetes
, ldap3
, mixpanel
, mysql-connector
, names
, ntplib
, oyaml
, paramiko
, pillow
, psycopg2
, pycrypto
, pygments
, pyjks
, pynacl
, pyopenssl
, pypdf2
, pysmb
, python_magic
, pytz
, requirements-detector
, selenium
, tlslite-ng
, viewstate
# pythonPackages to test the derivation
, pytest
}:
buildPythonPackage rec {
pname = "fluidasserts";
version = "20.1.22554";
disabled = !isPy37;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0j7zppwingi9m58z51phy40d69jlskx1vgyz1gj9miqhbjfdymhi";
};
patchPhase = ''
# Version mismatches between current FluidAsserts and Nixpkgs
substituteInPlace ./setup.py \
--replace 'tlslite-ng==0.8.0-alpha29' 'tlslite-ng==0.7.5' \
--replace 'boto3==1.10.17' 'boto3==1.10.1' \
--replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \
--replace 'azure-mgmt-storage==7.1.0' 'azure-mgmt-storage==7.0.0' \
# Functionality that will be not present for the momment
# but that we'll work to add in the future
# Just a minimal portion of fluidasserts use this
substituteInPlace ./setup.py \
--replace "'azure-storage-file-share==12.0.0'," "" \
--replace "'pymssql==2.1.4'," "" \
--replace "'pytesseract==0.3.0'," "" \
--replace "'pywinrm==0.4.1'," "" \
'';
propagatedBuildInputs = [
# pythonPackages
aiohttp
androguard
azure-identity
azure-keyvault-keys
azure-keyvault-secrets
azure-mgmt-compute
azure-mgmt-keyvault
azure-mgmt-network
azure-mgmt-storage
azure-mgmt-web
azure-storage-file
bandit
bcrypt
beautifulsoup4
boto3
cfn-flip
cython
dnspython
colorama
configobj
defusedxml
GitPython
google_api_python_client
kubernetes
ldap3
mixpanel
mysql-connector
names
ntplib
oyaml
paramiko
pillow
psycopg2
pycrypto
pygments
pyjks
pynacl
pyopenssl
pypdf2
pysmb
python_magic
pytz
requirements-detector
selenium
tlslite-ng
viewstate
];
checkInputs = [
pytest
];
checkPhase = ''
# This file launches mock docker containers and servers
# let's remove it to create a custom test environment
rm test/conftest.py
pytest \
test/test_cloud_aws_cloudformation_cloudfront.py \
test/test_cloud_aws_cloudformation_dynamodb.py \
test/test_cloud_aws_cloudformation_ec2.py \
test/test_cloud_aws_cloudformation_elb.py \
test/test_cloud_aws_cloudformation_elb2.py \
test/test_cloud_aws_cloudformation_fsx.py \
test/test_cloud_aws_cloudformation_iam.py \
test/test_cloud_aws_cloudformation_kms.py \
test/test_cloud_aws_cloudformation_rds.py \
test/test_cloud_aws_cloudformation_s3.py \
test/test_cloud_aws_cloudformation_secretsmanager.py \
test/test_format_apk.py \
test/test_format_file.py \
test/test_format_jks.py \
test/test_format_jwt.py \
test/test_format_pdf.py \
test/test_format_pkcs12.py \
test/test_format_string.py \
test/test_helper_asynchronous.py \
test/test_helper_crypto.py \
test/test_lang_core.py \
test/test_lang_csharp.py \
test/test_lang_docker.py \
test/test_lang_dotnetconfig.py \
test/test_lang_html.py \
test/test_lang_php.py \
test/test_lang_python.py \
test/test_lang_rpgle.py \
'';
meta = with lib; {
description = "Assertion Library for Security Assumptions";
homepage = "https://gitlab.com/fluidattacks/asserts";
license = licenses.mpl20;
maintainers = with maintainers; [
kamadorueda
];
};
}

50
pkgs/development/python-modules/mixpanel/default.nix
View File

@ -1,30 +1,46 @@
{ stdenv
, buildPythonPackage
, fetchzip
, pytest
{ buildPythonPackage
, fetchFromGitHub
, isPy37
, lib
# Python Dependencies
, mock
, pytest
, six
, isPy3k
}:
buildPythonPackage rec {
version = "4.0.2";
pname = "mixpanel";
disabled = isPy3k;
version = "4.5.0";
disabled = !isPy37;
src = fetchzip {
url = "https://github.com/mixpanel/mixpanel-python/archive/${version}.zip";
sha256 = "0yq1bcsjzsz7yz4rp69izsdn47rvkld4wki2xmapp8gg2s9i8709";
src = fetchFromGitHub {
owner = "mixpanel";
repo = "mixpanel-python";
rev = version;
sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ six ];
checkPhase = "py.test tests.py";
propagatedBuildInputs = [
six
];
meta = with stdenv.lib; {
homepage = https://github.com/mixpanel/mixpanel-python;
description = ''This is the official Mixpanel Python library'';
checkInputs = [
mock
pytest
];
checkPhase = ''
py.test
'';
meta = with lib; {
homepage = "https://github.com/mixpanel/mixpanel-python";
description = "Official Mixpanel Python library";
license = licenses.asl20;
maintainers = with maintainers; [
kamadorueda
];
};
}

18
pkgs/development/python-modules/mysql-connector/default.nix
View File

@ -1,19 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub
, protobuf
, python3, protobuf3_6
}:
buildPythonPackage rec {
let
python = python3.override {
packageOverrides = self: super: {
protobuf = super.protobuf.override {
protobuf = protobuf3_6;
};
};
};
in buildPythonPackage rec {
pname = "mysql-connector";
version = "8.0.18";
version = "8.0.19";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
sha256 = "0pf91vbjigjv621dar47r741yvmdmapxh60wp20nzvlx0xchbmcm";
sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg";
};
propagatedBuildInputs = [ protobuf ];
propagatedBuildInputs = with python.pkgs; [ protobuf dnspython ];
# Tests are failing (TODO: unknown reason)
# TypeError: __init__() missing 1 required positional argument: 'string'

20
pkgs/development/python-modules/pyTelegramBotAPI/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchPypi, requests }:
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
version = "3.6.6";
src = fetchPypi {
inherit pname version;
sha256 = "00vycd7jvfnzmvmmhkjx9vf40vkcrwv7adas5i81r2jhjy7sks54";
};
propagatedBuildInputs = [ requests ];
meta = with lib; {
homepage = "https://github.com/eternnoir/pyTelegramBotAPI";
description = "A simple, but extensible Python implementation for the Telegram Bot API";
license = licenses.gpl2;
maintainers = with maintainers; [ das_j ];
};
}

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

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, pytestrunner
, numpy
, pillow
}:
buildPythonPackage rec {
version = "1.3.0";
pname = "pydicom";
src = fetchPypi {
inherit pname version;
sha256 = "1j11lsykqbnw9d6gzgj6kfn6lawvm5d9azd9palj3l1xhj0hlnsq";
};
propagatedBuildInputs = [ numpy pillow ];
checkInputs = [ pytest pytestrunner ];
meta = with stdenv.lib; {
homepage = https://pydicom.github.io;
description = "Pure-Python package for working with DICOM files";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

33
pkgs/development/python-modules/pyezminc/default.nix
View File

@ -1,33 +0,0 @@
{ buildPythonPackage, isPy3k, fetchFromGitHub, stdenv,
netcdf, hdf5, libminc, ezminc,
cython, numpy, scipy
}:
buildPythonPackage rec {
pname = "pyezminc";
version = "1.2.01";
disabled = isPy3k;
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = "pyezminc";
rev = "release-${version}";
sha256 = "13smvramacisbwj8qsl160dnvv6ynngn1jmqwhvy146nmadphyv1";
};
nativeBuildInputs = [ cython ];
buildInputs = [ netcdf hdf5 libminc ezminc ];
propagatedBuildInputs = [ numpy scipy ];
NIX_CFLAGS_COMPILE = "-fpermissive";
doCheck = false; # e.g., expects test data in /opt
meta = {
homepage = https://github.com/BIC-MNI/pyezminc;
description = "Python API for libminc using EZMINC";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
};
}

40
pkgs/development/python-modules/rxv/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, defusedxml
, requests
, pytest
, requests-mock
, mock
, pytestcov
, pytest-timeout
, testtools
}:
buildPythonPackage rec {
pname = "rxv";
version = "0.6.0";
src = fetchFromGitHub {
owner = "wuub";
repo = pname;
# Releases are not tagged
rev = "9b586203665031f93960543a272bb1a8f541ed37";
sha256 = "1dw3ayrzknai2279bhkgzcapzw06rhijlny33rymlbp7irp0gvnj";
};
propagatedBuildInputs = [ defusedxml requests ];
checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Automation Library for Yamaha RX-V473, RX-V573, RX-V673, RX-V773 receivers";
homepage = https://github.com/wuub/rxv;
license = licenses.mit;
maintainers = with maintainers; [ flyfloh ];
};
}

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

@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "coz";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "plasma-umass";
repo = "coz";
rev = version;
sha256 = "0a55q3s8ih1r9x6fp7wkg3n5h1yd9pcwg74k33d1r94y3j3m0znr";
sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc";
};
postConfigure = ''

10
pkgs/development/tools/buildah/default.nix
View File

@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "buildah";
version = "1.12.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg";
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x";
};
outputs = [ "bin" "man" "out" ];
@ -18,10 +18,6 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
GO111MODULE = "off";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
@ -31,6 +27,7 @@ buildGoPackage rec {
pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah
'';
postBuild = ''
@ -40,6 +37,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "A tool which facilitates building OCI images";
homepage = "https://github.com/containers/buildah";
changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];
};

4
pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
View File

@ -5,9 +5,9 @@ callPackage ./generic.nix (args // rec {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf";
sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
};
version = "3.8.4";
version = "3.17.0";
hasBootstrapScript = false;
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash

1846
pkgs/development/tools/geckodriver/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

29
pkgs/development/tools/geckodriver/default.nix
View File

@ -1,27 +1,30 @@
{ lib
, fetchFromGitHub
, fetchzip
, rustPlatform
, stdenv
, darwin
}:
with rustPlatform;
buildRustPackage rec {
version = "0.22.0";
rustPlatform.buildRustPackage {
version = "0.26.0";
pname = "geckodriver";
sourceRoot = "source/testing/geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
rev = "v${version}";
sha256 = "12m95lfqwdxs2m5kjh3yrpm9w2li5m8n3fw46a2nkxyfw6c94l4b";
};
# Source revisions are noted alongside the binary releases:
# https://github.com/mozilla/geckodriver/releases
src = (fetchzip {
url = "https://hg.mozilla.org/mozilla-central/archive/e9783a644016aa9b317887076618425586730d73.zip/testing";
sha256 = "0m86hqyq1jrr49jkc8mnlmx4bdq281hyxhcrrzacyv20nlqwvd8v";
}).overrideAttrs (_: {
# normally guessed by the url's file extension, force it to unpack properly
unpackCmd = "unzip $curSrc";
});
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "07w5lmvm5w6id0qikcs968n0c69bb6fav63l66bskxcjva67d6dy";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "1pwg35kgn5z2zrlj1dwcbbdmkgmnvfxpxv4klzsxxg4m9xr1pfy4";
meta = with lib; {
description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";
homepage = https://github.com/mozilla/geckodriver;

4
pkgs/development/tools/git-quick-stats/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.0.11";
version = "2.0.12";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "19chwnc936bxf0bnxsvw6nhfxnj0216jx9ajjckw3q440l932799";
sha256 = "1diisgz8xc2ghsfdz3vh6z4vn13vvb9gf0i6qml0a46a5fqf32zb";
};
PREFIX = builtins.placeholder "out";
meta = with stdenv.lib; {

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

@ -4,13 +4,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "kind";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "165nwkhsa12z043rvkdf977jndhp82x7sccqfy75pkx99mzz43r2";
sha256 = "0hvb0rbi1m0d1flk15l3wws96kmmjhsy6islkhy5h7jalc4k0nx4";
};
goDeps = ./deps.nix;

24
pkgs/development/tools/kind/deps.nix generated
View File

@ -374,8 +374,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.10";
sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r";
rev = "v0.0.11";
sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali";
};
}
{
@ -455,8 +455,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "v1.2.0";
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
rev = "v1.6.0";
sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
};
}
{
@ -464,8 +464,8 @@
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
rev = "v0.9.0";
sha256 = "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh";
};
}
{
@ -608,8 +608,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "c1f44814a5cd";
sha256 = "1a6hb4326hk8hvcbs0pqypalsxzqc8xasnglrrwd6ai0njgh18pg";
rev = "86b910548bc1";
sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44";
};
}
{
@ -671,8 +671,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.5";
sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg";
rev = "v2.2.7";
sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
};
}
{
@ -680,8 +680,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v3";
rev = "e228e37189d3";
sha256 = "06sc63lqhkqjh188md1cywvscxq40cqgmdl8ccd3q891b1xpajl4";
rev = "4206685974f2";
sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
};
}
{

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20200109T185134";
version = "20200114T225020";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "11fzyf2qzqmxhdyssm59cqkkcjh8hw1i859abc1i2zali3fd7w68";
sha256 = "1fx27nz79h1f3gmaw9k33dq9r28s7z8rx6hqpv44368v67d8jbhb";
};
dontUnpack = true;

4
pkgs/development/tools/misc/elfinfo/default.nix
View File

@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "elfinfo";
version = "0.7.6";
version = "1.0.1";
goPackagePath = "github.com/xyproto/elfinfo";
src = fetchFromGitHub {
rev = version;
owner = "xyproto";
repo = "elfinfo";
sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
sha256 = "1iahivc1jm9gv1dijykw2pryjdwb896bv42xmq9v6ax86rsnzqww";
};
meta = with stdenv.lib; {

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