From f70e3f3738300ef1e94737c09364cd176893858f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 24 Aug 2019 05:36:02 +0000 Subject: [PATCH 001/201] nixos: zsh: move NixOS-specific variables from /etc/zshrc to /etc/zshenv We want these to be set even when /etc/zshrc loading is disabled. --- nixos/modules/programs/zsh/zsh.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 27f4166e100..073db91b2ab 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -147,6 +147,13 @@ in . ${config.system.build.setEnvironment} fi + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" + + # Tell zsh how to find installed completions + for p in ''${(z)NIX_PROFILES}; do + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + done + ${cfge.shellInit} ${cfg.shellInit} @@ -192,13 +199,6 @@ in HISTSIZE=${toString cfg.histSize} HISTFILE=${cfg.histFile} - HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" - - # Tell zsh how to find installed completions - for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) - done - ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} ${cfge.interactiveShellInit} From 2eaf57541f305ae375acf917b371f9a7bccba507 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 24 Aug 2019 05:48:57 +0000 Subject: [PATCH 002/201] nixos: zsh: reorder /etc/zshrc a little bit, add more helpful documentation --- nixos/modules/programs/zsh/zsh.nix | 56 +++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 073db91b2ab..5d6d901041e 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -15,6 +15,24 @@ let (filterAttrs (k: v: v != null) cfg.shellAliases) ); + zshStartupNotes = '' + # Note that generated /etc/zprofile and /etc/zshrc files do a lot of + # non-standard setup to make zsh usable with no configuration by default. + # + # Which means that unless you explicitly meticulously override everything + # generated, interactions between your ~/.zshrc and these files are likely + # to be rather surprising. + # + # Note however, that you can disable loading of the generated /etc/zprofile + # and /etc/zshrc (you can't disable loading of /etc/zshenv, but it is + # designed to not set anything surprising) by setting `no_global_rcs` option + # in ~/.zshenv: + # + # echo setopt no_global_rcs >> ~/.zshenv + # + # See "STARTUP/SHUTDOWN FILES" section of zsh(1) for more info. + ''; + in { @@ -69,6 +87,10 @@ in promptInit = mkOption { default = '' + # Note that to manually override this in ~/.zshrc you should run `prompt off` + # before setting your PS1 and etc. Otherwise this will likely to interact with + # your ~/.zshrc configuration in unexpected ways as the default prompt sets + # a lot of different prompt variables. autoload -U promptinit && promptinit && prompt walters && setopt prompt_sp ''; description = '' @@ -100,7 +122,8 @@ in ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; description = '' - Configure zsh options. + Configure zsh options. See + zshoptions1. ''; }; @@ -149,11 +172,12 @@ in HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" - # Tell zsh how to find installed completions + # Tell zsh how to find installed completions. for p in ''${(z)NIX_PROFILES}; do fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) done + # Setup custom shell init stuff. ${cfge.shellInit} ${cfg.shellInit} @@ -168,11 +192,14 @@ in '' # /etc/zprofile: DO NOT EDIT -- this file has been generated automatically. # This file is read for login shells. + # + ${zshStartupNotes} # Only execute this file once per shell. if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 + # Setup custom login shell init stuff. ${cfge.loginShellInit} ${cfg.loginShellInit} @@ -187,31 +214,44 @@ in '' # /etc/zshrc: DO NOT EDIT -- this file has been generated automatically. # This file is read for interactive shells. + # + ${zshStartupNotes} # Only execute this file once per shell. if [ -n "$__ETC_ZSHRC_SOURCED" -o -n "$NOSYSZSHRC" ]; then return; fi __ETC_ZSHRC_SOURCED=1 - . /etc/zinputrc + ${optionalString (cfg.setOptions != []) '' + # Set zsh options. + setopt ${concatStringsSep " " cfg.setOptions} + ''} - # Don't export these, otherwise other shells (bash) will try to use same histfile + # Setup command line history. + # Don't export these, otherwise other shells (bash) will try to use same HISTFILE. SAVEHIST=${toString cfg.histSize} HISTSIZE=${toString cfg.histSize} HISTFILE=${cfg.histFile} - ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} + # Configure sane keyboard defaults. + . /etc/zinputrc + ${optionalString cfg.enableGlobalCompInit '' + # Enable autocompletion. + autoload -U compinit && compinit + ''} + + # Setup custom interactive shell init stuff. ${cfge.interactiveShellInit} ${cfg.interactiveShellInit} - ${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"} - + # Setup aliases. ${zshAliases} + # Setup prompt. ${cfg.promptInit} - # Need to disable features to support TRAMP + # Disable some features to support TRAMP. if [ "$TERM" = dumb ]; then unsetopt zle prompt_cr prompt_subst unfunction precmd preexec From c6960f41c9f723c677eb31d46869a523038c1f11 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 6 Nov 2019 13:03:19 +0100 Subject: [PATCH 003/201] manim: init at 0.1.10 --- pkgs/applications/video/manim/default.nix | 64 +++++++++++++++++++ .../manim/remove-dependency-constraints.patch | 26 ++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 94 insertions(+) create mode 100644 pkgs/applications/video/manim/default.nix create mode 100644 pkgs/applications/video/manim/remove-dependency-constraints.patch diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix new file mode 100644 index 00000000000..0d263f402b3 --- /dev/null +++ b/pkgs/applications/video/manim/default.nix @@ -0,0 +1,64 @@ +{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch +, cairo, ffmpeg, sox, xdg_utils, texlive +, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub +, pbr, fetchPypi +}: +buildPythonApplication rec { + pname = "manim"; + version = "0.1.10"; + + src = fetchPypi { + pname = "manimlib"; + inherit version; + sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; + }; + + patches = [ ./remove-dependency-constraints.patch ]; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + colour + numpy + pillow + progressbar + scipy + tqdm + opencv + pycairo + pydub + + cairo sox ffmpeg xdg_utils + ]; + + # Test with texlive to see whether it works but don't propagate + # because it's huge and optional + # TODO: Use smaller TexLive distribution + # Doesn't need everything but it's hard to figure out what it needs + checkInputs = [ cairo sox ffmpeg xdg_utils texlive.combined.scheme-full ]; + + # Simple test and complex test with LaTeX + checkPhase = '' + for scene in SquareToCircle OpeningManimExample + do + python3 manim.py example_scenes.py $scene -l + tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs + ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ + | tee | grep -F "ISO Media, MP4 Base Media v1 [IS0 14496-12:2003]" + done + ''; + + disabled = pythonOlder "3.7"; + + meta = { + description = "Animation engine for explanatory math videos"; + longDescription = '' + Manim is an animation engine for explanatory math videos. It's used to + create precise animations programmatically, as seen in the videos of + 3Blue1Brown on YouTube. + ''; + homepage = https://github.com/3b1b/manim; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/applications/video/manim/remove-dependency-constraints.patch b/pkgs/applications/video/manim/remove-dependency-constraints.patch new file mode 100644 index 00000000000..4a7da45d0f5 --- /dev/null +++ b/pkgs/applications/video/manim/remove-dependency-constraints.patch @@ -0,0 +1,26 @@ +diff --git i/requirements.txt w/requirements.txt +index 556122ad..11fd49d5 100644 +--- i/requirements.txt ++++ w/requirements.txt +@@ -1,11 +1,10 @@ +-argparse==1.4.0 +-colour==0.1.5 +-numpy==1.15.0 +-Pillow==5.2.0 +-progressbar==2.5 +-scipy==1.1.0 +-tqdm==4.24.0 +-opencv-python==3.4.2.17 +-pycairo==1.17.1; sys_platform == 'linux' +-pycairo>=1.18.0; sys_platform == 'win32' +-pydub==0.23.0 ++colour ++numpy ++Pillow ++progressbar ++scipy ++tqdm ++pycairo ++pycairo>=1.18.1; sys_platform == 'win32' ++pydub ++pyreadline==2.1; sys_platform == 'win32' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 914c4a01365..14e4f595f18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19002,6 +19002,10 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; + manim = python37Packages.callPackage ../applications/video/manim { + opencv = python37Packages.opencv3; + }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; From 832d1f4a571bee6a8b719792ec10426205bebea1 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Fri, 18 Oct 2019 20:38:50 +0100 Subject: [PATCH 004/201] maintainers: add m1cr0man --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 180eca8fe32..a01e626c647 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4216,6 +4216,12 @@ email = "wheatdoge@gmail.com"; name = "Tim Liou"; }; + m1cr0man = { + email = "lucas+nix@m1cr0man.com"; + github = "m1cr0man"; + githubId = 3044438; + name = "Lucas Savva"; + }; m3tti = { email = "mathaeus.peter.sander@gmail.com"; name = "Mathaeus Sander"; From 1e3607d331a650e958b48e0c6a9231e68dd023f8 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 12 Jan 2020 21:05:57 +0000 Subject: [PATCH 005/201] nixos/acme: replace simp-le with lego client Lego allows users to use the DNS-01 challenge to validate their certificates. It is mostly backwards compatible, with a few caveats. - extraDomains can no longer have different webroots to the main webroot for the cert. - An email address is now mandatory for account creation The following other changes were required: - Deprecate security.acme.certs..plugins, as this was specific to simp-le - Rename security.acme.validMin to validMinDays, to avoid confusion and errors. Lego requires the TTL to be specified in days - Add options to cover DNS challenge (dnsProvider, credentialsFile, dnsPropagationCheck) - A shared state directory is now used (/var/lib/acme/.lego) to avoid account creation rate limits and share credentials between certs --- nixos/modules/security/acme.nix | 141 +++++++++++++++++++++++--------- nixos/modules/security/acme.xml | 2 +- 2 files changed, 103 insertions(+), 40 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 890c421b0ea..9375115ddcb 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: - with lib; - let cfg = config.security.acme; @@ -76,20 +74,6 @@ let ''; }; - plugins = mkOption { - type = types.listOf (types.enum [ - "cert.der" "cert.pem" "chain.pem" "external.sh" - "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json" "account_reg.json" - ]); - default = [ "fullchain.pem" "full.pem" "key.pem" "account_key.json" "account_reg.json" ]; - description = '' - Plugins to enable. With default settings simp_le will - store public certificate bundle in fullchain.pem, - private key in key.pem and those two previous - files combined in full.pem in its state directory. - ''; - }; - directory = mkOption { type = types.str; readOnly = true; @@ -111,6 +95,31 @@ let own server roots if needed. ''; }; + + dnsProvider = mkOption { + type = types.nullOr types.str; + example = "route53"; + default = null; + description = "DNS Challenge provider"; + }; + + credentialsFile = mkOption { + type = types.str; + description = '' + File containing DNS provider credentials passed as environment variables. + See https://go-acme.github.io/lego/dns/ for more information. + ''; + example = "/var/src/secrets/example.org-route53-api-token"; + }; + + dnsPropagationCheck = mkOption { + type = types.bool; + default = true; + description = '' + Toggles LEGo DNS propagation check, which is used alongside DNS-01 + challenge to ensure the DNS entries required are available + ''; + }; }; }; @@ -130,14 +139,21 @@ in (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (mkChangedOptionModule [ "security" "acme" "validMin"] [ "security" "acme" "validMinDays"] (config: config.security.acme.validMin / (24 * 3600))) ]; options = { security.acme = { - validMin = mkOption { + validMinDays = mkOption { type = types.int; - default = 30 * 24 * 3600; - description = "Minimum remaining validity before renewal in seconds."; + default = 30; + description = "Minimum remaining validity before renewal in days."; + }; + + email = mkOption { + type = types.nullOr types.str; + default = null; + description = "Contact email address for the CA to be able to reach you."; }; renewInterval = mkOption { @@ -173,6 +189,15 @@ in ''; }; + acceptTerms = mkOption { + type = types.bool; + default = true; + description = '' + Accept the current Let's Encrypt terms of service. + See https://letsencrypt.org/repository/ + ''; + }; + certs = mkOption { default = { }; type = with types; attrsOf (submodule certOpts); @@ -204,27 +229,47 @@ in config = mkMerge [ (mkIf (cfg.certs != { }) { + assertions = let + certs = (mapAttrsToList (k: v: v) cfg.certs); + in [ + { + assertion = all (certOpts: certOpts.dnsProvider == null || certOpts.webroot == null) certs; + message = '' + Options `security.acme.certs..dnsProvider` and + `security.acme.certs..webroot` are mutually exclusive. + ''; + } + { + assertion = cfg.email != null || all (certOpts: certOpts.email != null) certs; + message = '' + You must define `security.acme.certs..email` or + `security.acme.email` to register with the CA. + ''; + } + ]; + systemd.services = let services = concatLists servicesLists; servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let + # StateDirectory must be relative, and will be created under /var/lib by systemd lpath = "acme/${cert}"; + apath = "/var/lib/${lpath}"; + spath = "/var/lib/acme/.lego"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ] - ++ optionals (data.email != null) [ "--email" data.email ] - ++ concatMap (p: [ "-f" p ]) data.plugins - ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) + globalOpts = [ "-d" data.domain "--email" data.email "--path" "." ] + ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] + ++ optionals (data.dnsProvider != null && !cfg.dnsPropagationCheck) [ "--dns.disable-cp" ] + ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) + ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ]) ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]; + runOpts = escapeShellArgs (globalOpts ++ [ "run" ]); + renewOpts = escapeShellArgs (globalOpts ++ [ "renew" "--days" (toString cfg.validMinDays) ]); acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; wants = [ "network-online.target" ]; - # simp_le uses requests, which uses certifi under the hood, - # which doesn't respect the system trust store. - # At least in the acme test, we provision a fake CA, impersonating the LE endpoint. - # REQUESTS_CA_BUNDLE is a way to teach python requests to use something else - environment.REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; serviceConfig = { Type = "oneshot"; # With RemainAfterExit the service is considered active even @@ -233,18 +278,36 @@ in # the permissions of the StateDirectory get adjusted # according to the specified group RemainAfterExit = true; - SuccessExitStatus = [ "0" "1" ]; User = data.user; Group = data.group; PrivateTmp = true; - StateDirectory = lpath; + StateDirectory = "acme/.lego ${lpath}"; StateDirectoryMode = rights; - WorkingDirectory = "/var/lib/${lpath}"; - ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}"; + WorkingDirectory = spath; + # Only try loading the credentialsFile if the dns challenge is enabled + EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null; + ExecStart = pkgs.writeScript "acme-start" '' + #!${pkgs.runtimeShell} -e + ${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts} + ''; ExecStartPost = let script = pkgs.writeScript "acme-post-start" '' #!${pkgs.runtimeShell} -e + cd ${apath} + + # Test that existing cert is older than new cert + KEY=${spath}/certificates/*${data.domain}.key + if [ -e $KEY -a $KEY -nt key.pem ]; then + cp -p ${spath}/certificates/*${data.domain}.key key.pem + cp -p ${spath}/certificates/*${data.domain}.crt cert.pem + cp -p ${spath}/certificates/*${data.domain}.issuer.crt chain.pem + cat cert.pem chain.pem > fullchain.pem + cat key.pem cert.pem chain.pem > full.pem + chmod ${rights} *.pem + chown '${data.user}:${data.group}' *.pem + fi + ${data.postRun} ''; in @@ -276,17 +339,17 @@ in -out $workdir/server.crt # Copy key to destination - cp $workdir/server.key /var/lib/${lpath}/key.pem + cp $workdir/server.key ${apath}/key.pem # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) - cat $workdir/{server.crt,ca.crt} > "/var/lib/${lpath}/fullchain.pem" + cat $workdir/{server.crt,ca.crt} > "${apath}/fullchain.pem" # Create full.pem for e.g. lighttpd - cat $workdir/{server.key,server.crt,ca.crt} > "/var/lib/${lpath}/full.pem" + cat $workdir/{server.key,server.crt,ca.crt} > "${apath}/full.pem" # Give key acme permissions - chown '${data.user}:${data.group}' "/var/lib/${lpath}/"{key,fullchain,full}.pem - chmod ${rights} "/var/lib/${lpath}/"{key,fullchain,full}.pem + chown '${data.user}:${data.group}' "${apath}/"{key,fullchain,full}.pem + chmod ${rights} "${apath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; @@ -297,7 +360,7 @@ in }; unitConfig = { # Do not create self-signed key when key already exists - ConditionPathExists = "!/var/lib/${lpath}/key.pem"; + ConditionPathExists = "!${apath}/key.pem"; }; }; in ( @@ -334,7 +397,7 @@ in ]; meta = { - maintainers = with lib.maintainers; [ abbradar fpletz globin ]; + maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ]; doc = ./acme.xml; }; } diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 9d0a1995e0f..963ac7a97c3 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -7,7 +7,7 @@ NixOS supports automatic domain validation & certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and - for Let's Encrypt. The alternative ACME client simp_le is + for Let's Encrypt. The alternative ACME client LEGo is used under the hood.
From 9467f2ba2c38fd04565c7f0fd04e0e2c2673f650 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 12 Jan 2020 21:52:28 +0000 Subject: [PATCH 006/201] nixos/acme: Add logic to select right email address --- nixos/modules/security/acme.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 9375115ddcb..3d63fc25711 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -258,7 +258,8 @@ in apath = "/var/lib/${lpath}"; spath = "/var/lib/acme/.lego"; rights = if data.allowKeysForGroup then "750" else "700"; - globalOpts = [ "-d" data.domain "--email" data.email "--path" "." ] + email = if data.email == null then cfg.email else data.email; + globalOpts = [ "-d" data.domain "--email" email "--path" "." ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] ++ optionals (data.dnsProvider != null && !cfg.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) From 24c1660d287a159bf466538269bb4a619b949d54 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 13 Jan 2020 19:20:29 +0100 Subject: [PATCH 007/201] bluez-alsa: 1.4.0 -> 2.0.0 Also add myself to maintainers --- pkgs/tools/bluetooth/bluez-alsa/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 097b7ae00d7..7db28b581e2 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook -, alsaLib, bluez, glib, sbc +, alsaLib, bluez, glib, sbc, dbus # optional, but useful utils , readline, libbsd, ncurses @@ -13,32 +13,31 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "12kc2896rbir8viywd6bjwcklkwf46j4svh9viryn6kmk084nb49"; + sha256 = "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - alsaLib bluez glib sbc + alsaLib bluez glib sbc dbus readline libbsd ncurses ] ++ optional aacSupport fdk_aac; configureFlags = [ "--with-alsaplugindir=\$out/lib/alsa-lib" + "--with-dbusconfdir=\$out/etc/dbus-1" "--enable-rfcomm" "--enable-hcitop" ] ++ optional aacSupport "--enable-aac"; - doCheck = false; # fails 1 of 3 tests, needs access to ALSA - meta = { description = "Bluez 5 Bluetooth Audio ALSA Backend"; longDescription = '' @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.oxij ]; + maintainers = [ maintainers.oxij maintainers.lheckemann ]; }; } From 61665e33631f7d0b1edca27050c96137b99423db Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Wed, 15 Jan 2020 09:17:11 +0000 Subject: [PATCH 008/201] nixos/acme: ignore tmpfiles rules for null webroots --- nixos/modules/security/acme.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 3d63fc25711..11775e6aef0 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -7,7 +7,8 @@ let certOpts = { name, ... }: { options = { webroot = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "/var/lib/acme/acme-challenges"; description = '' Where the webroot of the HTTP vhost is located. @@ -98,8 +99,8 @@ let dnsProvider = mkOption { type = types.nullOr types.str; - example = "route53"; default = null; + example = "route53"; description = "DNS Challenge provider"; }; @@ -261,7 +262,7 @@ in email = if data.email == null then cfg.email else data.email; globalOpts = [ "-d" data.domain "--email" email "--path" "." ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] - ++ optionals (data.dnsProvider != null && !cfg.dnsPropagationCheck) [ "--dns.disable-cp" ] + ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ]) ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]; @@ -373,8 +374,7 @@ in servicesAttr; systemd.tmpfiles.rules = - flip mapAttrsToList cfg.certs - (cert: data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}"); + map (data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}") (filter (data: data.webroot != null) (attrValues cfg.certs)); systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") From d4718f180b98a1a469489775c0fa60c6bb94f46d Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 19 Jan 2020 14:06:27 +0100 Subject: [PATCH 009/201] minidlna: provide configuration option for announce interval Signed-off-by: Markus S. Wamser --- nixos/modules/services/networking/minidlna.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 3ddea3c9757..c580ba47dad 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -95,6 +95,22 @@ in ''; }; + services.minidlna.announceInterval = mkOption { + type = types.int; + default = 895; + description = + '' + The interval between announces (in seconds). + + By default miniDLNA will announce its presence on the network + approximately every 15 minutes. + + Many people prefer shorter announce intervals (e.g. 60 seconds) + on their home networks, especially when DLNA clients are + started on demand. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = @@ -144,6 +160,7 @@ in ${concatMapStrings (dir: '' media_dir=${dir} '') cfg.mediaDirs} + notify_interval=${toString cfg.announceInterval} ${cfg.extraConfig} ''; From 769fbf92541d86730be3f0be3f1c958c82644c92 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 19 Jan 2020 18:24:04 +0000 Subject: [PATCH 010/201] nixos/acme: fix some descriptions, default acceptTerms to false --- nixos/modules/security/acme.nix | 43 +++++++++++++++++++++++++-------- nixos/modules/security/acme.xml | 2 +- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 11775e6aef0..36cf4f7e681 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -97,18 +97,33 @@ let ''; }; + keyType = mkOption { + type = types.str; + default = "ec384"; + description = '' + Key type to use for private keys. + For an up to date list of supported values check the --key-type option + at https://go-acme.github.io/lego/usage/cli/#usage. + ''; + }; + dnsProvider = mkOption { type = types.nullOr types.str; default = null; example = "route53"; - description = "DNS Challenge provider"; + description = '' + DNS Challenge provider. For a list of supported providers, see the "code" + field of the DNS providers listed at https://go-acme.github.io/lego/dns/. + ''; }; credentialsFile = mkOption { - type = types.str; + type = types.path; description = '' - File containing DNS provider credentials passed as environment variables. - See https://go-acme.github.io/lego/dns/ for more information. + Path to an EnvironmentFile for the cert's service containing any required and + optional environment variables for your selected dnsProvider. + To find out what values you need to set, consult the documentation at + https://go-acme.github.io/lego/dns/ for the corresponding dnsProvider. ''; example = "/var/src/secrets/example.org-route53-api-token"; }; @@ -117,8 +132,8 @@ let type = types.bool; default = true; description = '' - Toggles LEGo DNS propagation check, which is used alongside DNS-01 - challenge to ensure the DNS entries required are available + Toggles lego DNS propagation check, which is used alongside DNS-01 + challenge to ensure the DNS entries required are available. ''; }; }; @@ -192,10 +207,10 @@ in acceptTerms = mkOption { type = types.bool; - default = true; + default = false; description = '' - Accept the current Let's Encrypt terms of service. - See https://letsencrypt.org/repository/ + Accept the CA's terms of service. The default provier is Let's Encrypt, + you can find their ToS at https://letsencrypt.org/repository/ ''; }; @@ -247,6 +262,14 @@ in `security.acme.email` to register with the CA. ''; } + { + assertion = cfg.acceptTerms; + message = '' + You must accept the CA's terms of service before using + the ACME module by setting `security.acme.acceptTerms` + to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/ + ''; + } ]; systemd.services = let @@ -260,7 +283,7 @@ in spath = "/var/lib/acme/.lego"; rights = if data.allowKeysForGroup then "750" else "700"; email = if data.email == null then cfg.email else data.email; - globalOpts = [ "-d" data.domain "--email" email "--path" "." ] + globalOpts = [ "-d" data.domain "--email" email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 963ac7a97c3..2b29c117484 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -7,7 +7,7 @@ NixOS supports automatic domain validation & certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and - for Let's Encrypt. The alternative ACME client LEGo is + for Let's Encrypt. The alternative ACME client lego is used under the hood.
From dcd96eebd851709717521d0ede97858138da6783 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 26 Oct 2019 23:33:32 -0400 Subject: [PATCH 011/201] sanoid: init at 2.0.3 --- pkgs/tools/backup/sanoid/default.nix | 65 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/tools/backup/sanoid/default.nix diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix new file mode 100644 index 00000000000..d67916c1e05 --- /dev/null +++ b/pkgs/tools/backup/sanoid/default.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs +, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }: + +with lib; + +stdenv.mkDerivation rec { + pname = "sanoid"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "jimsalterjrs"; + repo = pname; + rev = "v${version}"; + sha256 = "1wmymzqg503nmhw8hrblfs67is1l3ljbk2fjvrqwyb01b7mbn80x"; + }; + + patches = [ + # Make sanoid look for programs in PATH + (fetchpatch { + url = "https://github.com/jimsalterjrs/sanoid/commit/dc2371775afe08af799d3097d47b48182d1716eb.patch"; + sha256 = "16hlwcbcb8h3ar1ywd2bzr3h3whgbcfk6walmp8z6j74wbx81aav"; + }) + # Make findoid look for programs in PATH + (fetchpatch { + url = "https://github.com/jimsalterjrs/sanoid/commit/44bcd21f269e17765acd1ad0d45161902a205c7b.patch"; + sha256 = "0zqyl8q5sfscqcc07acw68ysnlnh3nb57cigjfwbccsm0zwlwham"; + }) + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ]; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/etc/sanoid" + cp sanoid.defaults.conf "$out/etc/sanoid/sanoid.defaults.conf" + # Hardcode path to default config + substitute sanoid "$out/bin/sanoid" \ + --replace "\$args{'configdir'}/sanoid.defaults.conf" "$out/etc/sanoid/sanoid.defaults.conf" + chmod +x "$out/bin/sanoid" + # Prefer ZFS userspace tools from /run/booted-system/sw/bin to avoid + # incompatibilities with the ZFS kernel module. + wrapProgram "$out/bin/sanoid" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH : "${makeBinPath [ procps "/run/booted-system/sw" zfs ]}" + + install -m755 syncoid "$out/bin/syncoid" + wrapProgram "$out/bin/syncoid" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH : "${makeBinPath [ openssh procps which pv mbuffer lzop gzip pigz "/run/booted-system/sw" zfs ]}" + + install -m755 findoid "$out/bin/findoid" + wrapProgram "$out/bin/findoid" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}" + ''; + + meta = { + description = "A policy-driven snapshot management tool for ZFS filesystems"; + homepage = "https://github.com/jimsalterjrs/sanoid"; + license = licenses.gpl3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a8d0ad91d6..d0cca92be0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25306,6 +25306,8 @@ in sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; + sanoid = callPackage ../tools/backup/sanoid { }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { From 7c9bd98e863ac924809e0b3e7714edc25db79ae2 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 31 Jan 2020 14:23:08 -0500 Subject: [PATCH 012/201] gitkraken: 6.4.1 -> 6.5.1 - use fetchzip to retrieve the tarball for GitKraken, as the deb now tries to change permissions and etc which nix will not like - add at-spi2-core dependency - remove dpkg dependency - refactor expression to properly handle the GitKraken tarball (compared to the deb archive) --- .../version-management/gitkraken/default.nix | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2272e66faf5..73d376396a6 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,8 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst -, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, libuuid +, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus +, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid , e2fsprogs, krb5 }: @@ -13,13 +13,16 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.4.1"; + version = "6.5.1"; - src = fetchurl { - url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1w8iwpbr6nwzhhf63fvr7pd66yjx3jgjy4gx5y02qxa3ip5psq5b"; + src = fetchzip { + url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; + sha256 = "0dwjwismv4rfw58801g2ay51h9qrffcxgbl910frd4i530w0y44p"; }; + dontBuild = true; + dontConfigure = true; + libPath = makeLibraryPath [ stdenv.cc.cc.lib curlWithGnuTls @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { libgnome-keyring openssl at-spi2-atk + at-spi2-core libuuid e2fsprogs krb5 @@ -69,27 +73,27 @@ stdenv.mkDerivation rec { comment = "Graphical Git client from Axosoft"; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; - unpackCmd = '' - mkdir out - dpkg -x $curSrc out - ''; - installPhase = '' runHook preInstall - mkdir $out - pushd usr - pushd share - substituteInPlace applications/gitkraken.desktop \ - --replace /usr/share/gitkraken $out/bin - popd - rm -rf bin/gitkraken share/lintian - cp -av share bin $out/ - popd + mkdir -p $out/share/gitkraken/ + cp -R $src/* $out/share/gitkraken/ + + mkdir -p $out/bin ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken + + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + + substituteInPlace $out/share/applications/gitkraken.desktop \ + --replace $out/usr/share/gitkraken $out/bin + + mkdir -p $out/share/pixmaps + cp gitkraken.png $out/share/pixmaps/gitkraken.png + runHook postInstall ''; From 6a3cf87e659fbf9ce025542fd2a2cb3ff2045c89 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 1 Feb 2020 19:18:22 +0100 Subject: [PATCH 013/201] rtptools: init at 1.22 --- pkgs/tools/networking/rtptools/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/tools/networking/rtptools/default.nix diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/tools/networking/rtptools/default.nix new file mode 100644 index 00000000000..a713331d7c2 --- /dev/null +++ b/pkgs/tools/networking/rtptools/default.nix @@ -0,0 +1,16 @@ +{ stdenv, lib, fetchurl }: +stdenv.mkDerivation rec { + pname = "rtptools"; + version = "1.22"; + src = fetchurl { + url = "http://www.cs.columbia.edu/irt/software/rtptools/download/rtptools-${version}.tar.gz"; + sha256 = "0a4c0vmhxibfc58rrxpbav2bsk546chkg50ir4h3i57v4fjb4xic"; + }; + meta = { + description = "A number of small applications that can be used for processing RTP data"; + homepage = "http://www.cs.columbia.edu/irt/software/rtptools/"; + maintainers = [ lib.maintainers.lheckemann ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6f410493a..4e650f29e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6076,6 +6076,8 @@ in rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; + rtptools = callPackages ../tools/networking/rtptools {}; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; From 2181313c542364d63674ed34cbf69d7691ddfa0d Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Mon, 3 Feb 2020 21:37:22 +0000 Subject: [PATCH 014/201] nixos/acme: simplify email resolve logic --- nixos/modules/security/acme.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 36cf4f7e681..907d909ecf1 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -37,7 +37,7 @@ let email = mkOption { type = types.nullOr types.str; - default = null; + default = cfg.email; description = "Contact email address for the CA to be able to reach you."; }; @@ -282,8 +282,7 @@ in apath = "/var/lib/${lpath}"; spath = "/var/lib/acme/.lego"; rights = if data.allowKeysForGroup then "750" else "700"; - email = if data.email == null then cfg.email else data.email; - globalOpts = [ "-d" data.domain "--email" email "--path" "." "--key-type" data.keyType ] + globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) From 71d4420e208c2db1085971990c00c34238f47298 Mon Sep 17 00:00:00 2001 From: Tomoya Tabuchi Date: Tue, 4 Feb 2020 20:50:55 +0900 Subject: [PATCH 015/201] telepresence: 0.101 -> 0.104 Bump telepresence to 0.104, which contains bug fixes. --- pkgs/tools/networking/telepresence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index e6d427b2bcb..697c33957a3 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -17,13 +17,13 @@ let }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.101"; + version = "0.104"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274"; + sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; }; buildInputs = [ makeWrapper ]; From 7b5550a3fc72cc3c41c4143732502a0787cb17a0 Mon Sep 17 00:00:00 2001 From: wedens Date: Sat, 25 Jan 2020 12:52:01 +0700 Subject: [PATCH 016/201] nixos/grub: make memtest work with EFI Memtest86+ doesn't support EFI, so unfree Memtest86 is used when EFI support is enabled (systemd-boot currently also uses Memtest86 when memtest is enabled). --- .../system/boot/loader/grub/memtest.nix | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix index 94e5a14174b..71e50dd0577 100644 --- a/nixos/modules/system/boot/loader/grub/memtest.nix +++ b/nixos/modules/system/boot/loader/grub/memtest.nix @@ -1,4 +1,4 @@ -# This module adds Memtest86+ to the GRUB boot menu. +# This module adds Memtest86+/Memtest86 to the GRUB boot menu. { config, lib, pkgs, ... }: @@ -6,6 +6,7 @@ with lib; let memtest86 = pkgs.memtest86plus; + efiSupport = config.boot.loader.grub.efiSupport; cfg = config.boot.loader.grub.memtest86; in @@ -18,8 +19,11 @@ in default = false; type = types.bool; description = '' - Make Memtest86+, a memory testing program, available from the - GRUB boot menu. + Make Memtest86+ (or MemTest86 if EFI support is enabled), + a memory testing program, available from the + GRUB boot menu. MemTest86 is an unfree program, so + this requires allowUnfree to be set to + true. ''; }; @@ -75,19 +79,38 @@ in }; }; - config = mkIf cfg.enable { + config = mkMerge [ + (mkIf (cfg.enable && efiSupport) { + assertions = [ + { + assertion = cfg.params == []; + message = "Parameters are not available for MemTest86"; + } + ]; - boot.loader.grub.extraEntries = - if config.boot.loader.grub.version == 2 then - '' - menuentry "Memtest86+" { - linux16 @bootRoot@/memtest.bin ${toString cfg.params} - } - '' - else - throw "Memtest86+ is not supported with GRUB 1."; + boot.loader.grub.extraFiles = { + "memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi"; + }; - boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin"; + boot.loader.grub.extraEntries = '' + menuentry "Memtest86" { + chainloader /memtest86.efi + } + ''; + }) - }; + (mkIf (cfg.enable && !efiSupport) { + boot.loader.grub.extraEntries = + if config.boot.loader.grub.version == 2 then + '' + menuentry "Memtest86+" { + linux16 @bootRoot@/memtest.bin ${toString cfg.params} + } + '' + else + throw "Memtest86+ is not supported with GRUB 1."; + + boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin"; + }) + ]; } From 6293f00701149c0147e695eff9b16cd9c791f262 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 27 Oct 2019 17:21:21 +0100 Subject: [PATCH 017/201] scaff: init at 0.1.1 --- pkgs/development/tools/scaff/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/scaff/default.nix diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix new file mode 100644 index 00000000000..d2f3733fbc5 --- /dev/null +++ b/pkgs/development/tools/scaff/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "scaff"; + version = "0.1.1"; + + src = fetchFromGitLab { + owner = "jD91mZM2"; + repo = pname; + rev = version; + + sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; + }; + + cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Painless and powerful scaffolding of projects"; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236e2f290ac..8746cfaacc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10124,6 +10124,8 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; + scaff = callPackage ../development/tools/scaff { }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; From c7a58a7ba7198f7120315a5cd08a1f9064599077 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 5 Feb 2020 14:29:52 -0800 Subject: [PATCH 018/201] firefox: resolve relative nativeMessagingHosts links --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4901d694f49..2b44263096b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -155,9 +155,9 @@ let install -D -t $out/share/applications $desktopItem/share/applications/* - mkdir -p $out/lib/mozilla + mkdir -p $out/lib/mozilla/native-messaging-hosts for ext in ${toString nativeMessagingHosts}; do - lndir -silent $ext/lib/mozilla $out/lib/mozilla + ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* done # For manpages, in case the program supplies them From 4071f15037951bf0888e016f965f23b49a07a5f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Feb 2020 08:47:33 +0000 Subject: [PATCH 019/201] ioping: 1.1 -> 1.2 --- pkgs/tools/system/ioping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 5cd3a707dde..6ffaf23280f 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ioping"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "koct9i"; repo = "ioping"; rev = "v${version}"; - sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq"; + sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid"; }; makeFlags = [ "PREFIX=$(out)" ]; From 95124a487751f0ca15a83f4562d60ce9f4a5b0d1 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 6 Feb 2020 14:47:25 -0500 Subject: [PATCH 020/201] handbrake: 1.3.0 -> 1.3.1 --- pkgs/applications/video/handbrake/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 59a8c2377ce..ab708020663 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -49,11 +49,11 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59"; + url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0"; }; nativeBuildInputs = [ @@ -102,8 +102,6 @@ stdenv.mkDerivation rec { # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = toString [ "-lx265" - # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 - "-ldl" ]; preBuild = '' From 3dd336cd012b594b83eb090602faddafbd0b310b Mon Sep 17 00:00:00 2001 From: ash lea Date: Fri, 7 Feb 2020 12:05:51 -0800 Subject: [PATCH 021/201] dolphinEmuMaster: 5.0-11109 -> 5.0-11608 --- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index cec88918282..e6e19e81242 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11109"; + version = "5.0-11608"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "93d7b3d15962a3393cf2971e14c4acf54d90cecd"; - sha256 = "1kkx3agdsc0qmf3yymlzq315nypm34qvq04qpjqycpfhmpx8gdnq"; + rev = "69ee15e5ef369d51681540e6714f02554e3bd8a6"; + sha256 = "1svi9mnddhjcv64xh3y9l68k3rix7wimq8b0mqf5hp7qrda07lx8"; }; enableParallelBuilding = true; From 5bf0de57adfc0cb0227cfc807e2a500569ad364e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 21:09:41 +0000 Subject: [PATCH 022/201] workcraft: 3.1.9 -> 3.2.5 --- pkgs/applications/science/logic/workcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 2f972c92b52..c0d6d541d6b 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.1.9"; + version = "3.2.5"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "0d1mi8jffwr7irp215j9rfpa3nmwxrx6mv13bh7vn0qf6i0aw0xi"; + sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3"; }; buildInputs = [ makeWrapper ]; From 3652efdb00eeaf215ba39c0845998a37a4ef5b34 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 26 Jul 2019 00:25:24 +0200 Subject: [PATCH 023/201] perlPackages.MIMELiteHTML: init at 1.24 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9de64cfb886..ea42111b4b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11310,6 +11310,21 @@ let }; }; + MIMELiteHTML = buildPerlPackage { + pname = "MIME-Lite-HTML"; + version = "1.24"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz; + sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da"; + }; + doCheck = false; + propagatedBuildInputs = [ HTMLParser LWP MIMELite URI ]; + meta = { + description = "Provide routine to transform a HTML page in a MIME-Lite mail"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MIMETools = buildPerlPackage { pname = "MIME-tools"; version = "5.509"; From 02493a6e65e89092817db558f24bb93e442026d3 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 26 Jul 2019 00:23:19 +0200 Subject: [PATCH 024/201] perlPackages.HTMLStripScriptsParser: init at 1.03 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea42111b4b6..b4233508e3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8456,6 +8456,20 @@ let buildInputs = [ TestDifferences TestMemoryCycle ]; }; + HTMLStripScriptsParser = buildPerlPackage { + pname = "HTML-StripScripts-Parser"; + version = "1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz; + sha256 = "478c1a4e46eb77fa7bce96ba288168f0b98c27f250e00dc6312365081aed3407"; + }; + propagatedBuildInputs = [ HTMLParser HTMLStripScripts ]; + meta = { + description = "XSS filter using HTML::Parser"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLTableExtract = buildPerlPackage { pname = "HTML-TableExtract"; version = "2.13"; From 80098e9a71719f7fd571270983f3ff6356927223 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 26 Jul 2019 00:22:17 +0200 Subject: [PATCH 025/201] perlPackages.HTMLStripScripts: init at 1.06 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4233508e3b..de165bcfc23 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8456,6 +8456,19 @@ let buildInputs = [ TestDifferences TestMemoryCycle ]; }; + HTMLStripScripts = buildPerlPackage { + pname = "HTML-StripScripts"; + version = "1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz; + sha256 = "222bfb7ec1fdfa465e32da3dc4abed2edc7364bbe19e8e3c513c7d585b0109ad"; + }; + meta = { + description = "Strip scripting constructs out of HTML"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLStripScriptsParser = buildPerlPackage { pname = "HTML-StripScripts-Parser"; version = "1.03"; From e39d7fab273e62fbe9b2a506641361b3f056184a Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 6 Jul 2019 20:54:16 +0200 Subject: [PATCH 026/201] sympa: init at 6.2.52 --- pkgs/servers/mail/sympa/default.nix | 116 ++++++++++++++++++++++++ pkgs/servers/mail/sympa/make-docs.patch | 11 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 129 insertions(+) create mode 100644 pkgs/servers/mail/sympa/default.nix create mode 100644 pkgs/servers/mail/sympa/make-docs.patch diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix new file mode 100644 index 00000000000..46cbcc61f94 --- /dev/null +++ b/pkgs/servers/mail/sympa/default.nix @@ -0,0 +1,116 @@ +{ stdenv, perl, fetchFromGitHub, autoreconfHook +}: + +let + dataDir = "/var/lib/sympa"; + runtimeDir = "/run/sympa"; + perlEnv = perl.withPackages (p: with p; [ + ArchiveZip + CGI + CGIFast + ClassSingleton + DateTime + DBI + DateTimeFormatMail + DateTimeTimeZone + DigestMD5 + Encode + FCGI + FileCopyRecursive + FileNFSLock + FilePath + HTMLParser + HTMLFormatter + HTMLTree + HTMLStripScriptsParser + IO + IOStringy + LWP + libintl_perl + + MHonArc + MIMEBase64 + MIMECharset + MIMETools + MIMEEncWords + MIMELiteHTML + MailTools + NetCIDR + ScalarListUtils + SysSyslog + TermProgressBar + TemplateToolkit + URI + UnicodeLineBreak + XMLLibXML + + ### Features + Clone + CryptEksblowfish + + DBDPg + DBDSQLite + DBDmysql + + DataPassword + EncodeLocale + IOSocketSSL + MailDKIM + NetDNS + NetLDAP + NetSMTP + SOAPLite + ]); +in +stdenv.mkDerivation rec { + pname = "sympa"; + version = "6.2.52"; + + src = fetchFromGitHub { + owner = "sympa-community"; + repo = pname; + rev = version; + sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh"; + }; + + configureFlags = [ + "--without-initdir" + "--without-unitsdir" + "--without-smrshdir" + + "--with-lockdir=${runtimeDir}" + "--with-piddir=${runtimeDir}" + "--with-confdir=${dataDir}/etc" + "--sysconfdir=${dataDir}/etc" + "--with-spooldir=${dataDir}/spool" + "--with-expldir=${dataDir}/list_data" + ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perlEnv ]; + patches = [ ./make-docs.patch ]; + + prePatch = '' + patchShebangs po/sympa/add-lang.pl + ''; + + preInstall = '' + mkdir "$TMP/bin" + for i in chown chgrp chmod; do + echo '#!${stdenv.shell}' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + done + PATH="$TMP/bin:$PATH" + ''; + + postInstall = '' + rm -rf "$TMP/bin" + ''; + + meta = with stdenv.lib; { + description = "Open source mailing list manager"; + homepage = "https://www.sympa.org"; + license = licenses.gpl2; + maintainers = with maintainers; [ sorki mmilata ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/sympa/make-docs.patch b/pkgs/servers/mail/sympa/make-docs.patch new file mode 100644 index 00000000000..adefeafdeef --- /dev/null +++ b/pkgs/servers/mail/sympa/make-docs.patch @@ -0,0 +1,11 @@ +diff -ur sympa-6.2.44-orig/doc/Makefile.am sympa-6.2.44/doc/Makefile.am +--- sympa-6.2.44-orig/doc/Makefile.am 2019-08-29 01:57:43.512539087 +0200 ++++ sympa-6.2.44/doc/Makefile.am 2019-08-29 01:58:24.393531358 +0200 +@@ -83,6 +83,4 @@ + --lax --release="$(VERSION)" $< $@ + + .podpl.pod: +- $(AM_V_GEN)PERL5LIB=$(top_builddir)/src/lib:$(top_srcdir)/src/lib; \ +- export PERL5LIB; \ +- $(PERL) $< --top_srcdir=$(top_srcdir) > $*.pod ++ $(AM_V_GEN)$(PERL) -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib $< --top_srcdir=$(top_srcdir) > $*.pod diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c9b909a9d0..1cda87f6f81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15449,6 +15449,8 @@ in pshs = callPackage ../servers/http/pshs { }; + sympa = callPackage ../servers/mail/sympa { }; + system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); # PulseAudio daemons From 097ab90850d968c90444f221841b2a7949cf216a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sat, 6 Jul 2019 20:56:30 +0200 Subject: [PATCH 027/201] nixos/sympa: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/sympa.nix | 596 ++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/sympa.nix | 36 ++ 4 files changed, 634 insertions(+) create mode 100644 nixos/modules/services/mail/sympa.nix create mode 100644 nixos/tests/sympa.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 878b77969af..eaa7038a28d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -401,6 +401,7 @@ ./services/mail/rspamd.nix ./services/mail/rss2email.nix ./services/mail/roundcube.nix + ./services/mail/sympa.nix ./services/mail/nullmailer.nix ./services/misc/airsonic.nix ./services/misc/apache-kafka.nix diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix new file mode 100644 index 00000000000..c3ae9d4255b --- /dev/null +++ b/nixos/modules/services/mail/sympa.nix @@ -0,0 +1,596 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.sympa; + dataDir = "/var/lib/sympa"; + user = "sympa"; + group = "sympa"; + pkg = pkgs.sympa; + fqdns = attrNames cfg.domains; + usingNginx = cfg.web.enable && cfg.web.server == "nginx"; + mysqlLocal = cfg.database.createLocally && cfg.database.type == "MySQL"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "PostgreSQL"; + + sympaSubServices = [ + "sympa-archive.service" + "sympa-bounce.service" + "sympa-bulk.service" + "sympa-task.service" + ]; + + # common for all services including wwsympa + commonServiceConfig = { + StateDirectory = "sympa"; + ProtectHome = true; + ProtectSystem = "full"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + }; + + # wwsympa has its own service config + sympaServiceConfig = srv: { + Type = "simple"; + Restart = "always"; + ExecStart = "${pkg}/bin/${srv}.pl --foreground"; + PIDFile = "/run/sympa/${srv}.pid"; + User = user; + Group = group; + + # avoid duplicating log messageges in journal + StandardError = "null"; + } // commonServiceConfig; + + configVal = value: + if isBool value then + if value then "on" else "off" + else toString value; + configGenerator = c: concatStrings (flip mapAttrsToList c (key: val: "${key}\t${configVal val}\n")); + + mainConfig = pkgs.writeText "sympa.conf" (configGenerator cfg.settings); + robotConfig = fqdn: domain: pkgs.writeText "${fqdn}-robot.conf" (configGenerator domain.settings); + + transport = pkgs.writeText "transport.sympa" (concatStringsSep "\n" (flip map fqdns (domain: '' + ${domain} error:User unknown in recipient table + sympa@${domain} sympa:sympa@${domain} + listmaster@${domain} sympa:listmaster@${domain} + bounce@${domain} sympabounce:sympa@${domain} + abuse-feedback-report@${domain} sympabounce:sympa@${domain} + ''))); + + virtual = pkgs.writeText "virtual.sympa" (concatStringsSep "\n" (flip map fqdns (domain: '' + sympa-request@${domain} postmaster@localhost + sympa-owner@${domain} postmaster@localhost + ''))); + + listAliases = pkgs.writeText "list_aliases.tt2" '' + #--- [% list.name %]@[% list.domain %]: list transport map created at [% date %] + [% list.name %]@[% list.domain %] sympa:[% list.name %]@[% list.domain %] + [% list.name %]-request@[% list.domain %] sympa:[% list.name %]-request@[% list.domain %] + [% list.name %]-editor@[% list.domain %] sympa:[% list.name %]-editor@[% list.domain %] + #[% list.name %]-subscribe@[% list.domain %] sympa:[% list.name %]-subscribe@[%list.domain %] + [% list.name %]-unsubscribe@[% list.domain %] sympa:[% list.name %]-unsubscribe@[% list.domain %] + [% list.name %][% return_path_suffix %]@[% list.domain %] sympabounce:[% list.name %]@[% list.domain %] + ''; + + enabledFiles = filterAttrs (n: v: v.enable) cfg.settingsFile; +in +{ + + ###### interface + options.services.sympa = with types; { + + enable = mkEnableOption "Sympa mailing list manager"; + + lang = mkOption { + type = str; + default = "en_US"; + example = "cs"; + description = '' + Default Sympa language. + See + for available options. + ''; + }; + + listMasters = mkOption { + type = listOf str; + example = [ "postmaster@sympa.example.org" ]; + description = '' + The list of the email addresses of the listmasters + (users authorized to perform global server commands). + ''; + }; + + mainDomain = mkOption { + type = nullOr str; + default = null; + example = "lists.example.org"; + description = '' + Main domain to be used in sympa.conf. + If null, one of the is chosen for you. + ''; + }; + + domains = mkOption { + type = attrsOf (submodule ({ name, config, ... }: { + options = { + webHost = mkOption { + type = nullOr str; + default = null; + example = "archive.example.org"; + description = '' + Domain part of the web interface URL (no web interface for this domain if null). + DNS record of type A (or AAAA or CNAME) has to exist with this value. + ''; + }; + webLocation = mkOption { + type = str; + default = "/"; + example = "/sympa"; + description = "URL path part of the web interface."; + }; + settings = mkOption { + type = attrsOf (oneOf [ str int bool ]); + default = {}; + example = { + default_max_list_members = 3; + }; + description = '' + The robot.conf configuration file as key value set. + See + for list of configuration parameters. + ''; + }; + }; + + config.settings = mkIf (cfg.web.enable && config.webHost != null) { + wwsympa_url = mkDefault "https://${config.webHost}${strings.removeSuffix "/" config.webLocation}"; + }; + })); + + description = '' + Email domains handled by this instance. There have + to be MX records for keys of this attribute set. + ''; + example = literalExample '' + { + "lists.example.org" = { + webHost = "lists.example.org"; + webLocation = "/"; + }; + "sympa.example.com" = { + webHost = "example.com"; + webLocation = "/sympa"; + }; + } + ''; + }; + + database = { + type = mkOption { + type = enum [ "SQLite" "PostgreSQL" "MySQL" ]; + default = "SQLite"; + example = "MySQL"; + description = "Database engine to use."; + }; + + host = mkOption { + type = nullOr str; + default = null; + description = '' + Database host address. + + For MySQL, use localhost to connect using Unix domain socket. + + For PostgreSQL, use path to directory (e.g. /run/postgresql) + to connect using Unix domain socket located in this directory. + + Use null to fall back on Sympa default, or when using + . + ''; + }; + + port = mkOption { + type = nullOr port; + default = null; + description = "Database port. Use null for default port."; + }; + + name = mkOption { + type = str; + default = if cfg.database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"; + defaultText = ''if database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"''; + description = '' + Database name. When using SQLite this must be an absolute + path to the database file. + ''; + }; + + user = mkOption { + type = nullOr str; + default = user; + description = "Database user. The system user name is used as a default."; + }; + + passwordFile = mkOption { + type = nullOr path; + default = null; + example = "/run/keys/sympa-dbpassword"; + description = '' + A file containing the password for . + ''; + }; + + createLocally = mkOption { + type = bool; + default = true; + description = "Whether to create a local database automatically."; + }; + }; + + web = { + enable = mkOption { + type = bool; + default = true; + description = "Whether to enable Sympa web interface."; + }; + + server = mkOption { + type = enum [ "nginx" "none" ]; + default = "nginx"; + description = '' + The webserver used for the Sympa web interface. Set it to `none` if you want to configure it yourself. + Further nginx configuration can be done by adapting + . + ''; + }; + + https = mkOption { + type = bool; + default = true; + description = '' + Whether to use HTTPS. When nginx integration is enabled, this option forces SSL and enables ACME. + Please note that Sympa web interface always uses https links even when this option is disabled. + ''; + }; + + fcgiProcs = mkOption { + type = ints.positive; + default = 2; + description = "Number of FastCGI processes to fork."; + }; + }; + + mta = { + type = mkOption { + type = enum [ "postfix" "none" ]; + default = "postfix"; + description = '' + Mail transfer agent (MTA) integration. Use none if you want to configure it yourself. + + The postfix integration sets up local Postfix instance that will pass incoming + messages from configured domains to Sympa. You still need to configure at least outgoing message + handling using e.g. . + ''; + }; + }; + + settings = mkOption { + type = attrsOf (oneOf [ str int bool ]); + default = {}; + example = literalExample '' + { + default_home = "lists"; + viewlogs_page_size = 50; + } + ''; + description = '' + The sympa.conf configuration file as key value set. + See + for list of configuration parameters. + ''; + }; + + settingsFile = mkOption { + type = attrsOf (submodule ({ name, config, ... }: { + options = { + enable = mkOption { + type = bool; + default = true; + description = "Whether this file should be generated. This option allows specific files to be disabled."; + }; + text = mkOption { + default = null; + type = nullOr lines; + description = "Text of the file."; + }; + source = mkOption { + type = path; + description = "Path of the source file."; + }; + }; + + config.source = mkIf (config.text != null) (mkDefault (pkgs.writeText "sympa-${baseNameOf name}" config.text)); + })); + default = {}; + example = literalExample '' + { + "list_data/lists.example.org/help" = { + text = "subject This list provides help to users"; + }; + } + ''; + description = "Set of files to be linked in ${dataDir}."; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + services.sympa.settings = (mapAttrs (_: v: mkDefault v) { + domain = if cfg.mainDomain != null then cfg.mainDomain else head fqdns; + listmaster = concatStringsSep "," cfg.listMasters; + lang = cfg.lang; + + home = "${dataDir}/list_data"; + arc_path = "${dataDir}/arc"; + bounce_path = "${dataDir}/bounce"; + + sendmail = "${pkgs.system-sendmail}/bin/sendmail"; + + db_type = cfg.database.type; + db_name = cfg.database.name; + } + // (optionalAttrs (cfg.database.host != null) { + db_host = cfg.database.host; + }) + // (optionalAttrs mysqlLocal { + db_host = "localhost"; # use unix domain socket + }) + // (optionalAttrs pgsqlLocal { + db_host = "/run/postgresql"; # use unix domain socket + }) + // (optionalAttrs (cfg.database.port != null) { + db_port = cfg.database.port; + }) + // (optionalAttrs (cfg.database.user != null) { + db_user = cfg.database.user; + }) + // (optionalAttrs (cfg.mta.type == "postfix") { + sendmail_aliases = "${dataDir}/sympa_transport"; + aliases_program = "${pkgs.postfix}/bin/postmap"; + aliases_db_type = "hash"; + }) + // (optionalAttrs cfg.web.enable { + static_content_path = "${dataDir}/static_content"; + css_path = "${dataDir}/static_content/css"; + pictures_path = "${dataDir}/static_content/pictures"; + mhonarc = "${pkgs.perlPackages.MHonArc}/bin/mhonarc"; + })); + + services.sympa.settingsFile = { + "virtual.sympa" = mkDefault { source = virtual; }; + "transport.sympa" = mkDefault { source = transport; }; + "etc/list_aliases.tt2" = mkDefault { source = listAliases; }; + } + // (flip mapAttrs' cfg.domains (fqdn: domain: + nameValuePair "etc/${fqdn}/robot.conf" (mkDefault { source = robotConfig fqdn domain; }))); + + environment = { + systemPackages = [ pkg ]; + }; + + users.users.${user} = { + description = "Sympa mailing list manager user"; + group = group; + home = dataDir; + createHome = false; + isSystemUser = true; + }; + + users.groups.${group} = {}; + + assertions = [ + { assertion = cfg.database.createLocally -> cfg.database.user == user; + message = "services.sympa.database.user must be set to ${user} if services.sympa.database.createLocally is set to true"; + } + { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "a password cannot be specified if services.sympa.database.createLocally is set to true"; + } + ]; + + systemd.tmpfiles.rules = [ + "d ${dataDir} 0711 ${user} ${group} - -" + "d ${dataDir}/etc 0700 ${user} ${group} - -" + "d ${dataDir}/spool 0700 ${user} ${group} - -" + "d ${dataDir}/list_data 0700 ${user} ${group} - -" + "d ${dataDir}/arc 0700 ${user} ${group} - -" + "d ${dataDir}/bounce 0700 ${user} ${group} - -" + "f ${dataDir}/sympa_transport 0600 ${user} ${group} - -" + + # force-copy static_content so it's up to date with package + # set permissions for wwsympa which needs write access (...) + "R ${dataDir}/static_content - - - - -" + "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/static_content" + "e ${dataDir}/static_content/* 0711 ${user} ${group} - -" + + "d /run/sympa 0755 ${user} ${group} - -" + ] + ++ (flip concatMap fqdns (fqdn: [ + "d ${dataDir}/etc/${fqdn} 0700 ${user} ${group} - -" + "d ${dataDir}/list_data/${fqdn} 0700 ${user} ${group} - -" + ])) + #++ (flip mapAttrsToList enabledFiles (k: v: + # "L+ ${dataDir}/${k} - - - - ${v.source}" + #)) + ++ (concatLists (flip mapAttrsToList enabledFiles (k: v: [ + # sympa doesn't handle symlinks well (e.g. fails to create locks) + # force-copy instead + "R ${dataDir}/${k} - - - - -" + "C ${dataDir}/${k} 0700 ${user} ${group} - ${v.source}" + ]))); + + systemd.services.sympa = { + description = "Sympa mailing list manager"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = sympaSubServices; + before = sympaSubServices; + serviceConfig = sympaServiceConfig "sympa_msg"; + + preStart = '' + umask 0077 + + cp -f ${mainConfig} ${dataDir}/etc/sympa.conf + ${optionalString (cfg.database.passwordFile != null) '' + chmod u+w ${dataDir}/etc/sympa.conf + echo -n "db_passwd " >> ${dataDir}/etc/sympa.conf + cat ${cfg.database.passwordFile} >> ${dataDir}/etc/sympa.conf + ''} + + ${optionalString (cfg.mta.type == "postfix") '' + ${pkgs.postfix}/bin/postmap hash:${dataDir}/virtual.sympa + ${pkgs.postfix}/bin/postmap hash:${dataDir}/transport.sympa + ''} + ${pkg}/bin/sympa_newaliases.pl + ${pkg}/bin/sympa.pl --health_check + ''; + }; + systemd.services.sympa-archive = { + description = "Sympa mailing list manager (archiving)"; + bindsTo = [ "sympa.service" ]; + serviceConfig = sympaServiceConfig "archived"; + }; + systemd.services.sympa-bounce = { + description = "Sympa mailing list manager (bounce processing)"; + bindsTo = [ "sympa.service" ]; + serviceConfig = sympaServiceConfig "bounced"; + }; + systemd.services.sympa-bulk = { + description = "Sympa mailing list manager (message distribution)"; + bindsTo = [ "sympa.service" ]; + serviceConfig = sympaServiceConfig "bulk"; + }; + systemd.services.sympa-task = { + description = "Sympa mailing list manager (task management)"; + bindsTo = [ "sympa.service" ]; + serviceConfig = sympaServiceConfig "task_manager"; + }; + + systemd.services.wwsympa = mkIf usingNginx { + wantedBy = [ "multi-user.target" ]; + after = [ "sympa.service" ]; + serviceConfig = { + Type = "forking"; + PIDFile = "/run/sympa/wwsympa.pid"; + Restart = "always"; + ExecStart = ''${pkgs.spawn_fcgi}/bin/spawn-fcgi \ + -u ${user} \ + -g ${group} \ + -U nginx \ + -M 0600 \ + -F ${toString cfg.web.fcgiProcs} \ + -P /run/sympa/wwsympa.pid \ + -s /run/sympa/wwsympa.socket \ + -- ${pkg}/bin/wwsympa.fcgi + ''; + + } // commonServiceConfig; + }; + + services.nginx.enable = mkIf usingNginx true; + services.nginx.virtualHosts = mkIf usingNginx (let + vHosts = unique (remove null (mapAttrsToList (_k: v: v.webHost) cfg.domains)); + hostLocations = host: map (v: v.webLocation) (filter (v: v.webHost == host) (attrValues cfg.domains)); + httpsOpts = optionalAttrs cfg.web.https { forceSSL = mkDefault true; enableACME = mkDefault true; }; + in + genAttrs vHosts (host: { + locations = genAttrs (hostLocations host) (loc: { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + + fastcgi_pass unix:/run/sympa/wwsympa.socket; + fastcgi_split_path_info ^(${loc})(.*)$; + + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME ${pkg}/bin/wwsympa.fcgi; + ''; + }) // { + "/static-sympa/".alias = "${dataDir}/static_content/"; + }; + } // httpsOpts)); + + services.postfix = mkIf (cfg.mta.type == "postfix") { + enable = true; + recipientDelimiter = "+"; + config = { + virtual_alias_maps = [ "hash:${dataDir}/virtual.sympa" ]; + virtual_mailbox_maps = [ + "hash:${dataDir}/transport.sympa" + "hash:${dataDir}/sympa_transport" + "hash:${dataDir}/virtual.sympa" + ]; + virtual_mailbox_domains = [ "hash:${dataDir}/transport.sympa" ]; + transport_maps = [ + "hash:${dataDir}/transport.sympa" + "hash:${dataDir}/sympa_transport" + ]; + }; + masterConfig = { + "sympa" = { + type = "unix"; + privileged = true; + chroot = false; + command = "pipe"; + args = [ + "flags=hqRu" + "user=${user}" + "argv=${pkg}/bin/queue" + "\${nexthop}" + ]; + }; + "sympabounce" = { + type = "unix"; + privileged = true; + chroot = false; + command = "pipe"; + args = [ + "flags=hqRu" + "user=${user}" + "argv=${pkg}/bin/bouncequeue" + "\${nexthop}" + ]; + }; + }; + }; + + services.mysql = optionalAttrs mysqlLocal { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.postgresql = optionalAttrs pgsqlLocal { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; + + }; + + meta.maintainers = with maintainers; [ mmilata sorki ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e1c299b8413..83366c271a2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -269,6 +269,7 @@ in strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; + sympa = handleTest ./sympa.nix {}; syncthing-init = handleTest ./syncthing-init.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; diff --git a/nixos/tests/sympa.nix b/nixos/tests/sympa.nix new file mode 100644 index 00000000000..280691f7cb4 --- /dev/null +++ b/nixos/tests/sympa.nix @@ -0,0 +1,36 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "sympa"; + meta.maintainers = with lib.maintainers; [ mmilata ]; + + machine = + { ... }: + { + virtualisation.memorySize = 1024; + + services.sympa = { + enable = true; + domains = { + "lists.example.org" = { + webHost = "localhost"; + }; + }; + listMasters = [ "joe@example.org" ]; + web.enable = true; + web.https = false; + database = { + type = "PostgreSQL"; + createLocally = true; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("sympa.service") + machine.wait_for_unit("wwsympa.service") + assert "Mailing lists service" in machine.succeed( + "curl --insecure -L http://localhost/" + ) + ''; +}) From 3d051f49babe518cef4a56708504efc941f56fde Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 Feb 2020 16:34:48 +0100 Subject: [PATCH 028/201] grocy: init at 2.6.0 --- pkgs/servers/grocy/config-locations.patch | 61 +++++++++++++++++++++++ pkgs/servers/grocy/default.nix | 32 ++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/servers/grocy/config-locations.patch create mode 100644 pkgs/servers/grocy/default.nix diff --git a/pkgs/servers/grocy/config-locations.patch b/pkgs/servers/grocy/config-locations.patch new file mode 100644 index 00000000000..475be78ec20 --- /dev/null +++ b/pkgs/servers/grocy/config-locations.patch @@ -0,0 +1,61 @@ +diff --git a/app.php b/app.php +index 5f91e4d..09c6010 100644 +--- a/app.php ++++ b/app.php +@@ -23,7 +23,7 @@ else + require_once __DIR__ . '/vendor/autoload.php'; + + // Load config files +-require_once GROCY_DATAPATH . '/config.php'; ++require_once getenv('GROCY_CONFIG_FILE'); + require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones + + // Definitions for dev/demo/prerelease mode +@@ -49,7 +49,7 @@ $appContainer = new \Slim\Container([ + ], + 'view' => function($container) + { +- return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); ++ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); + }, + 'LoginControllerInstance' => function($container) + { +diff --git a/services/DatabaseService.php b/services/DatabaseService.php +index 0bcf9b8..ec45e93 100644 +--- a/services/DatabaseService.php ++++ b/services/DatabaseService.php +@@ -13,7 +13,7 @@ class DatabaseService + return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db'; + } + +- return GROCY_DATAPATH . '/grocy.db'; ++ return getenv('GROCY_DB_FILE'); + } + + private $DbConnectionRaw; +diff --git a/services/FilesService.php b/services/FilesService.php +index 7933b73..f52657e 100644 +--- a/services/FilesService.php ++++ b/services/FilesService.php +@@ -12,7 +12,7 @@ class FilesService extends BaseService + { + parent::__construct(); + +- $this->StoragePath = GROCY_DATAPATH . '/storage'; ++ $this->StoragePath = getenv('GROCY_STORAGE_DIR'); + + if (!file_exists($this->StoragePath)) + { +diff --git a/services/StockService.php b/services/StockService.php +index d7482ef..d1399a7 100644 +--- a/services/StockService.php ++++ b/services/StockService.php +@@ -933,7 +933,7 @@ class StockService extends BaseService + throw new \Exception('No barcode lookup plugin defined'); + } + +- $path = GROCY_DATAPATH . "/plugins/$pluginName.php"; ++ $path = getenv('GROCY_PLUGIN_DIR'); + if (file_exists($path)) + { + require_once $path; diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix new file mode 100644 index 00000000000..7af59f6904c --- /dev/null +++ b/pkgs/servers/grocy/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "grocy"; + version = "2.6.0"; + + src = fetchurl { + url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; + sha256 = "1d4hy495in7p0i4fnhai1yqhjhmblv1g30siggmqpjrzdiiw3bak"; + }; + + nativeBuildInputs = [ unzip ]; + unpackPhase = '' + unzip ${src} -d . + ''; + + patches = [ ./config-locations.patch ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/ + cp -R . $out/ + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home"; + homepage = "https://grocy.info/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c9b909a9d0..99c9006098f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5272,6 +5272,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + grocy = callPackage ../servers/grocy { }; + nextcloud = callPackage ../servers/nextcloud { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From 8e39b6671d9e35824e93dbd09d7e19967db91bab Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Fri, 7 Feb 2020 16:31:55 -0600 Subject: [PATCH 029/201] unixODBCDrivers.msodbcsql17: 17.4.1.1 -> 17.5.1.1 --- pkgs/development/libraries/unixODBCDrivers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 6cfaef5ef99..da15ece559a 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -137,12 +137,12 @@ version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; - versionMinor = "4"; + versionMinor = "5"; versionAdditional = "1.1"; src = fetchurl { url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb"; - sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w"; + sha256 = "0ysrl01z5ca72qw8n8kwwcl432cgiyw4pibfwg5nifx0kd7i7z4z"; }; nativeBuildInputs = [ dpkg patchelf ]; From bf059959fa774291d308ecc2928f5997b6f5a309 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 8 Feb 2020 20:47:43 +0100 Subject: [PATCH 030/201] octave: 5.1.0 -> 5.2.0 See https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00007.html for release information. --- pkgs/development/interpreters/octave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index eb9827969e1..f0f80f75854 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3"; + sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://octave.org/; + homepage = "https://www.gnu.org/software/octave/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [raskin]; description = "Scientific Pragramming Language"; From ac983cff48b70c82c6984895c7d7558d7a1bb26a Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 9 Feb 2020 02:09:34 +0000 Subject: [PATCH 031/201] nixos/acme: add dns-01 test, fix cert locating bug --- nixos/modules/security/acme.nix | 11 +- nixos/tests/acme.nix | 118 ++++++++++++++++++---- nixos/tests/common/letsencrypt/common.nix | 3 + 3 files changed, 111 insertions(+), 21 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 907d909ecf1..66bc9d8d505 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -316,23 +316,26 @@ in ''; ExecStartPost = let + keyName = builtins.replaceStrings ["*"] ["_"] data.domain; script = pkgs.writeScript "acme-post-start" '' #!${pkgs.runtimeShell} -e cd ${apath} # Test that existing cert is older than new cert - KEY=${spath}/certificates/*${data.domain}.key + KEY=${spath}/certificates/${keyName}.key if [ -e $KEY -a $KEY -nt key.pem ]; then - cp -p ${spath}/certificates/*${data.domain}.key key.pem - cp -p ${spath}/certificates/*${data.domain}.crt cert.pem - cp -p ${spath}/certificates/*${data.domain}.issuer.crt chain.pem + cp -p ${spath}/certificates/${keyName}.key key.pem + cp -p ${spath}/certificates/${keyName}.crt cert.pem + cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem cat cert.pem chain.pem > fullchain.pem cat key.pem cert.pem chain.pem > full.pem chmod ${rights} *.pem chown '${data.user}:${data.group}' *.pem fi + echo post stuff ${data.postRun} + echo done ''; in "+${script}"; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 6bd315ff1ea..480e95e67c7 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,17 +1,51 @@ let commonConfig = ./common/letsencrypt/common.nix; + + dnsScript = {writeScript, dnsAddress, bash, curl}: writeScript "dns-hook.sh" '' + #!${bash}/bin/bash + set -euo pipefail + echo '[INFO]' "[$2]" 'dns-hook.sh' $* + if [ "$1" = "present" ]; then + ${curl}/bin/curl --data '{"host": "'"$2"'", "value": "'"$3"'"}' http://${dnsAddress}:8055/set-txt + else + ${curl}/bin/curl --data '{"host": "'"$2"'"}' http://${dnsAddress}:8055/clear-txt + fi + ''; + in import ./make-test-python.nix { name = "acme"; nodes = rec { - letsencrypt = ./common/letsencrypt; + letsencrypt = { nodes, lib, ... }: { + imports = [ ./common/letsencrypt ]; + networking.nameservers = lib.mkForce [ + nodes.dnsserver.config.networking.primaryIPAddress + ]; + }; - acmeStandalone = { config, pkgs, ... }: { + dnsserver = { nodes, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 8055 53 ]; + networking.firewall.allowedUDPPorts = [ 53 ]; + systemd.services.pebble-challtestsrv = { + enable = true; + description = "Pebble ACME challenge test server"; + requires = [ ]; + wantedBy = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.pebble}/bin/pebble-challtestsrv -dns01 ':53' -defaultIPv6 '' -defaultIPv4 '${nodes.webserver.config.networking.primaryIPAddress}'"; + # Required to bind on privileged ports. + User = "root"; + Group = "root"; + }; + }; + }; + + acmeStandalone = { nodes, lib, config, pkgs, ... }: { imports = [ commonConfig ]; + networking.nameservers = lib.mkForce [ + nodes.dnsserver.config.networking.primaryIPAddress + ]; networking.firewall.allowedTCPPorts = [ 80 ]; - networking.extraHosts = '' - ${config.networking.primaryIPAddress} standalone.com - ''; security.acme = { server = "https://acme-v02.api.letsencrypt.org/dir"; certs."standalone.com" = { @@ -29,14 +63,12 @@ in import ./make-test-python.nix { }; }; - webserver = { config, pkgs, ... }: { + webserver = { nodes, config, pkgs, lib, ... }: let parentConfig = config; in { imports = [ commonConfig ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; - - networking.extraHosts = '' - ${config.networking.primaryIPAddress} a.example.com - ${config.networking.primaryIPAddress} b.example.com - ''; + networking.nameservers = lib.mkForce [ + nodes.dnsserver.config.networking.primaryIPAddress + ]; # A target remains active. Use this to probe the fact that # a service fired eventhough it is not RemainAfterExit @@ -61,10 +93,6 @@ in import ./make-test-python.nix { nesting.clone = [ ({pkgs, ...}: { - - networking.extraHosts = '' - ${config.networking.primaryIPAddress} b.example.com - ''; systemd.targets."acme-finished-b.example.com" = {}; systemd.services."acme-b.example.com" = { wants = [ "acme-finished-b.example.com.target" ]; @@ -79,15 +107,48 @@ in import ./make-test-python.nix { ''; }; }) + ({pkgs, config, nodes, lib, ...}: { + security.acme.certs."example.com" = { + domain = "*.example.com"; + dnsProvider = "exec"; + dnsPropagationCheck = false; + credentialsFile = with pkgs; writeText "wildcard.env" '' + EXEC_PATH=${dnsScript { inherit writeScript bash curl; dnsAddress = nodes.dnsserver.config.networking.primaryIPAddress; }} + ''; + user = config.services.nginx.user; + group = config.services.nginx.group; + }; + systemd.targets."acme-finished-example.com" = {}; + systemd.services."acme-example.com" = { + wants = [ "acme-finished-example.com.target" ]; + before = [ "acme-finished-example.com.target" "nginx.service" ]; + wantedBy = [ "nginx.service" ]; + }; + services.nginx.virtualHosts."c.example.com" = { + forceSSL = true; + sslCertificate = config.security.acme.certs."example.com".directory + "/cert.pem"; + sslTrustedCertificate = config.security.acme.certs."example.com".directory + "/full.pem"; + sslCertificateKey = config.security.acme.certs."example.com".directory + "/key.pem"; + locations."/".root = pkgs.runCommand "docroot" {} '' + mkdir -p "$out" + echo hello world > "$out/index.html" + ''; + }; + }) ]; }; - client = commonConfig; + client = {nodes, lib, ...}: { + imports = [ commonConfig ]; + networking.nameservers = lib.mkForce [ + nodes.dnsserver.config.networking.primaryIPAddress + ]; + }; }; testScript = {nodes, ...}: let - newServerSystem = nodes.webserver2.config.system.build.toplevel; + newServerSystem = nodes.webserver.config.system.build.toplevel; switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; in # Note, wait_for_unit does not work for oneshot services that do not have RemainAfterExit=true, @@ -97,6 +158,17 @@ in import ./make-test-python.nix { # can use them to probe that a oneshot fired. It is a bit ugly, but it is the best we can do '' client.start() + dnsserver.start() + + letsencrypt.wait_for_unit("default.target") + dnsserver.wait_for_unit("pebble-challtestsrv.service") + client.succeed( + 'curl --data \'{"host": "acme-v02.api.letsencrypt.org", "addresses": ["${nodes.letsencrypt.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' + ) + client.succeed( + 'curl --data \'{"host": "standalone.com", "addresses": ["${nodes.acmeStandalone.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' + ) + letsencrypt.start() acmeStandalone.start() @@ -129,5 +201,17 @@ in import ./make-test-python.nix { client.succeed( "curl --cacert /tmp/ca.crt https://b.example.com/ | grep -qF 'hello world'" ) + + with subtest("Can request wildcard certificates using DNS-01 challenge"): + webserver.succeed( + "${switchToNewServer}" + ) + webserver.succeed( + "/run/current-system/fine-tune/child-2/bin/switch-to-configuration test" + ) + webserver.wait_for_unit("acme-finished-example.com.target") + client.succeed( + "curl --cacert /tmp/ca.crt https://c.example.com/ | grep -qF 'hello world'" + ) ''; } diff --git a/nixos/tests/common/letsencrypt/common.nix b/nixos/tests/common/letsencrypt/common.nix index c530de817bf..bd559c8dacc 100644 --- a/nixos/tests/common/letsencrypt/common.nix +++ b/nixos/tests/common/letsencrypt/common.nix @@ -5,5 +5,8 @@ in { nodes.letsencrypt.config.networking.primaryIPAddress ]; + security.acme.acceptTerms = true; + security.acme.email = "webmaster@example.com"; + security.pki.certificateFiles = [ letsencrypt-ca ]; } From 6fea64203d278a76211c63f672a8168147cb36bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 03:44:47 +0000 Subject: [PATCH 032/201] parallel: 20191222 -> 20200122 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d1a786b3b91..32db897ae0f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20191222"; + name = "parallel-20200122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy"; + sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi"; }; nativeBuildInputs = [ makeWrapper ]; From 9bf6c5d7da6d15024c006012daaf8f5d66f3dd2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 04:41:55 +0000 Subject: [PATCH 033/201] palemoon: 28.8.1 -> 28.8.2.1 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 76417d482b5..1065f349972 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.1"; + version = "28.8.2.1"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "055bmfgasxf7azjqry06bbgwx6ryrdc1zrcq8b217b6zb1in037x"; + sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb"; }; desktopItem = makeDesktopItem { From bef28375792fea807b7fd0ad72a58b59ab1f3865 Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Sun, 9 Feb 2020 03:39:23 +0000 Subject: [PATCH 034/201] scribusUnstable: Fix build with Poppler 0.84 see: https://github.com/NixOS/nixpkgs/pull/77186#issuecomment-583800213 it seems poppler updates (almost?) always break scribusUnstable additionally: formatted with nixpkgs-fmt; added kiwi to maintainers - the more eyes the better; add additional licenses that are listed on scribus COPYING; --- pkgs/applications/office/scribus/unstable.nix | 114 ++++++++++++++---- .../development/libraries/poppler/default.nix | 2 +- 2 files changed, 93 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 2a602b094ba..faff45c8884 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,12 +1,41 @@ -{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, -boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, -podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: +{ boost +, cairo +, cmake +, cups +, fetchpatch +, fetchurl +, fontconfig +, freetype +, harfbuzzFull +, hunspell +, lcms2 +, libjpeg +, libtiff +, libxml2 +, mkDerivation +, pixman +, pkgconfig +, podofo +, poppler +, poppler_data +, python2 +, qtbase +, qtimageformats +, qttools +, stdenv +}: let - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); + pythonEnv = python2.withPackages ( + ps: [ + ps.pillow + ps.tkinter + ] + ); in mkDerivation rec { pname = "scribus"; + version = "1.5.5"; src = fetchurl { @@ -16,31 +45,72 @@ mkDerivation rec { patches = [ # fix build with Poppler 0.82 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - }) + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + } + ) # fix build with Poppler 0.83 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - }) + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + } + ) + # fix build with Poppler 0.84 + # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version + ( + fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; + sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; + } + ) ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ - qtbase cairo pixman boost cups fontconfig - freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler - poppler_data pythonEnv qtimageformats qttools harfbuzzFull + nativeBuildInputs = [ + cmake + pkgconfig ]; - meta = { - maintainers = [ stdenv.lib.maintainers.erictapen ]; - platforms = stdenv.lib.platforms.linux; + buildInputs = [ + boost + cairo + cups + fontconfig + freetype + harfbuzzFull + hunspell + lcms2 + libjpeg + libtiff + libxml2 + pixman + podofo + poppler + poppler_data + pythonEnv + qtbase + qtimageformats + qttools + ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ + erictapen + kiwi + ]; + platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = http://www.scribus.net; - license = stdenv.lib.licenses.gpl2; + homepage = "http://www.scribus.net"; + # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + license = with licenses; [ + bsd3 + gpl2 + mit + publicDomain + ]; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index eb8ad5e1a79..d21b4705b97 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.84.0"; # beware: updates often break cups-filters build, check texlive too! + version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; From dbf7607110bf3f129df1a82bbc850315ad689998 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 06:30:44 +0000 Subject: [PATCH 035/201] pulseeffects: 4.7.0 -> 4.7.1 --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 31e19154862..00c5af4422d 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r"; + sha256 = "1r1hk5zp2cgrwyqkvp8kg2dkbihdyx3ydzhmirkwya8jag9pwadd"; }; nativeBuildInputs = [ From 6ea5cd21abaab35bac48e7508f2d9dc65abe8c42 Mon Sep 17 00:00:00 2001 From: Jannik Vierling Date: Sun, 9 Feb 2020 08:45:48 +0100 Subject: [PATCH 036/201] iprover: 2018_Jul_24_11h -> 3.1 --- pkgs/applications/science/logic/iprover/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 85fe52239ad..c4eb22a7c03 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iprover"; - version = "2018_Jul_24_11h"; + version = "3.1"; src = fetchurl { - url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover_${version}.tar.gz"; - sha256 = "1iqim11flzm56aaysasl5whajcv1gq31hkidaqfr8ww7kwl1h06p"; + url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz"; + sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8"; }; buildInputs = [ ocaml eprover zlib ]; From 4657f896999ec4d22304f67cc0aa970c45adb5e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 06:45:50 +0000 Subject: [PATCH 037/201] python27Packages.awkward: 0.12.19 -> 0.12.20 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 1d2ebdf2655..350a82d13fd 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.19"; + version = "0.12.20"; src = fetchPypi { inherit pname version; - sha256 = "1s729a8205jzg7pfw8xgmi850x03p9nw8c6a602f5bnmhha96h45"; + sha256 = "13494pnzz68qfnx17975h4c5l15idgg7wxl9r86q7jp5s1pphvb3"; }; nativeBuildInputs = [ pytestrunner ]; From a9bf0efde7b48a5c4ef494bb9d3588d943d8c7b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 08:36:48 +0000 Subject: [PATCH 038/201] python37Packages.breathe: 4.14.0 -> 4.14.1 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d2b19ae8650..c088199fda7 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.14.0"; + version = "4.14.1"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "178848e4088faf8c2c60f000379fcabfb3411b260e0fbddc08fb57e0e5caea08"; + sha256 = "1ia9iq3kk0g8cqcsf03di3cnq295gfixriqfpp9wd38zf2wgq0l1"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 27e52e8ff8b35d36171b0cf1a9545233878141d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 05:37:38 +0000 Subject: [PATCH 039/201] python27Packages.apprise: 0.8.3 -> 0.8.4 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 38157e13615..69926bec8f5 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.3"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "1j925g7x0j8fzns431360myr8844swb8mb78wacw2vlj6x1c558c"; + sha256 = "15kwnvs2ka6sg1gq65bbf9lk0jp104br813y6wvrbwipiz8kkjn1"; }; nativeBuildInputs = [ Babel ]; From b0489dc6d08b1a3b7dd8bffff661c22580ffd342 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 03:49:08 +0000 Subject: [PATCH 040/201] osl: 1.10.8 -> 1.10.9 --- pkgs/development/compilers/osl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 86a13a776ce..59c15f7d38f 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.8"; - sha256 = "1vfdbs1yprr22nx64ff89jcqabfw0md8drifpbzqn2v6ipc8gz6a"; + rev = "Release-1.10.9"; + sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; From 7977bb1cf1d3d75ec979048bb97ecd1b4872e907 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 03:13:30 +0000 Subject: [PATCH 041/201] highlight: 3.54 -> 3.55 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 51cafeb8c4a..5f4855f2956 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.54"; + version = "3.55"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1144qv3c02hd3qrnms9cxfprdmkvz06vy4zjq500wg4iz7r8654m"; + sha256 = "1cn8m2qk5vl5zcrmg0wlvj9wvpm0gdb5idh9bhh5b6pbl0hm93cr"; }; enableParallelBuilding = true; From 4006c66d085b0b3d9abce2cbd2e3eb93de22e88e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Jan 2020 09:02:36 +0000 Subject: [PATCH 042/201] rapid-photo-downloader: 0.9.17 -> 0.9.18 --- pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index ed8ef35a7e5..afdd2262e50 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "10vqbi9rcg8r0jxpx2kn8xmahwgdcal28wpix2fg6nkp5rfwxnr6"; + sha256 = "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw"; }; # Disable version check and fix install tests From 2de1474615fb61c8e836943ff9fcbb95b63ac0ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2020 17:39:35 +0000 Subject: [PATCH 043/201] pkcs11helper: 1.25.1 -> 1.26 --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index ce511544a42..85d300e2376 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.25.1"; + version = "1.26"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; + sha256 = "15n3vy1v5gian0gh5y7vq5a6n3fngfwb41sbvrlwbjw0yh23sb1b"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 392d5c28915685a828ed0bc0b4f294da22885f53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2020 17:15:43 +0000 Subject: [PATCH 044/201] plata-theme: 0.9.1 -> 0.9.2 --- pkgs/data/themes/plata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 37eb9b7e5bc..0fb061519e6 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg"; + sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja"; }; preferLocalBuild = true; From b6feea4a68875691809f9e38e9d7c668e86834e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2020 03:16:43 +0000 Subject: [PATCH 045/201] ibus-engines.m17n: 1.4.1 -> 1.4.2 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index c026a9d1a81..552d9f5e532 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "1xl7swqn46nhi43rka0zx666mpk667ykag3sz07x0zqrwi41frps"; + sha256 = "16davz397svhjb234kx7mnq2m3wdxi2fh1ryniphbczjpbwn23g6"; }; nativeBuildInputs = [ From 09c6a82f16e257d0727a907798311d4e0ae9d241 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 16:24:02 +0000 Subject: [PATCH 046/201] amtk: 5.0.1 -> 5.0.2 --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 177bf324b7a..bbb7e98f661 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let - version = "5.0.1"; + version = "5.0.2"; pname = "amtk"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"; + sha256 = "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i"; }; nativeBuildInputs = [ From 3096b3e6cc717f98192bd9d17b8514117940d563 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 16:03:35 +0000 Subject: [PATCH 047/201] aws-checksums: 0.1.3 -> 0.1.5 --- pkgs/development/libraries/aws-checksums/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 124984f0d53..99cefde8937 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp"; + sha256 = "018fnpn0jc686jxp5wf8qxmjphk3z43l8n1mgcgaa9zw94i24jgk"; }; nativeBuildInputs = [ cmake ]; From e591b57bd53c146996a1cd19a8f1043e900694ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 01:59:59 +0000 Subject: [PATCH 048/201] asn2quickder: 1.2-6 -> 1.3.0 --- pkgs/development/tools/asn2quickder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 335a2238b91..d429a926f8a 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -3,10 +3,10 @@ buildPythonApplication rec { pname = "asn2quickder"; - version = "1.2-6"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "00wifjydgmqw2i5vmr049visc3shjqccgzqynkmmhkjhs86ghzr6"; + sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr"; rev = "version-${version}"; owner = "vanrein"; repo = "quick-der"; From f91dc24a3e8d3c8a8472219c22a4b53f7b4e3624 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 17 Jan 2020 10:53:50 +0000 Subject: [PATCH 049/201] sickgear: 0.20.0 -> 0.21.5 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 1b7a57e8b50..92cee87197d 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.20.0"; + version = "0.21.5"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k"; + sha256 = "1wzfdf6300vabflsdbkizjg322in1rgksp7dk8gii38czja9y893"; }; dontBuild = true; From 8411452deaf369ab2b7d8fc0e8e8e0e0b7d6cebd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jan 2020 10:58:30 -0800 Subject: [PATCH 050/201] ibus-engines.typing-booster-unwrapped: 2.7.4 -> 2.7.5 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index f1ca4226b47..dc11acb4756 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "0wp9y6cgxsb2z1hk899q7wybl7v49vkgx6x5zl4l706jm3w9qmg8"; + sha256 = "072mi8r10v78sfs81zxdwfabf87fp872c99c5iral1ywwa4iynpl"; }; patches = [ ./hunspell-dirs.patch ]; From 9ee70815f1b8e05287bb98c91900b6b88ed25a23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jan 2020 05:23:28 -0800 Subject: [PATCH 051/201] frostwire-bin: 6.7.4 -> 6.8.3 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index d4fbb2ceb59..29961e9077f 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.7.4"; + version = "6.8.3"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0pd9akfq8cx9qkfkzravvrb8pjaxa4b0vgjdwqc1zvkng4wl8848"; + sha256 = "1fnrr96jmak2rf54cc0chbm7ls5rfav78vhw98sa7zy544l2sn88"; }; nativeBuildInputs = [ makeWrapper ]; From 2f2b6b94f6632e5cf5e40962168d1a30e14b6134 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Dec 2019 10:01:38 -0800 Subject: [PATCH 052/201] syslogng: 3.24.1 -> 3.25.1 --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index d070e1673c2..8066f07afa9 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.24.1"; + version = "3.25.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0ggsb5867mca83f5mqsi0j7hslvmj8943xynd5myjas5gcss1l6l"; + sha256 = "05v8vgs4fbzslqjca9zjk7hkiyb6yj4i2v0fi51xan6ypirrdjrl"; }; nativeBuildInputs = [ pkgconfig which ]; From 5548e33656aac9eec2dbb40901995812b8ab902a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 14:12:58 -0800 Subject: [PATCH 053/201] librealsense: 2.29.0 -> 2.31.0 --- pkgs/development/libraries/librealsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 91c093c991a..a4ae61e1264 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.29.0"; + version = "2.31.0"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443"; + sha256 = "0lw4dqywahi7wfd1dz5nkil55sh7wscsrwkapkvvgyi418pqvmpn"; }; buildInputs = [ From 2ef9818b0e0fe2149a4aeaeff8f18bee73bad9ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 06:13:56 -0800 Subject: [PATCH 054/201] haproxy: 2.0.10 -> 2.1.2 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 95457b01205..a1e87e3153b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.0.10"; + version = "2.1.2"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1sm42q9l159pdmjs5dg544z10dn6x073caljkqh0p4syshysnf0x"; + sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0"; }; buildInputs = [ openssl zlib ] From 8cabfc6aa3269a458da3be33d6bcb65dc262f5fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Dec 2019 20:14:51 -0800 Subject: [PATCH 055/201] bwidget: 1.9.13 -> 1.9.14 --- pkgs/development/libraries/bwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index e763afc4a43..0279dc8f5ef 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bwidget"; - version = "1.9.13"; + version = "1.9.14"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "109s81hzd86vwzs18v4s03asn3l395wl64kd311045p7h0ig9n3n"; + sha256 = "0knlnpmwam74v0qa1h9gg4f32vzzz7ays2wbslflf51ilg7nw6jk"; }; dontBuild = true; From 18ccb2366a2eb4547b932d8329c48ed52fda433f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Dec 2019 20:09:31 -0800 Subject: [PATCH 056/201] abcmidi: 2019.11.11 -> 2019.12.09 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 804f9f3ed24..1b1dd10dd13 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2019.11.11"; + version = "2019.12.09"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0xid13jqhbknrs31j74iwgjm0h0c64w3kqk9g9am1pkjwxh8d460"; + sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 37fe80879948911b9a6a548d7e41e3eb50cca10f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 17:04:30 +0000 Subject: [PATCH 057/201] wxSVG: 1.5.21 -> 1.5.22 --- pkgs/development/libraries/wxSVG/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index e2e227a6327..f5e34486350 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "wxSVG"; srcName = "wxsvg-${version}"; - version = "1.5.21"; + version = "1.5.22"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0v368qgqad49saklwcbq76f1xkg126g0ll1jw9x2bdds02kvg1fw"; + sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d"; }; nativeBuildInputs = [ pkgconfig ]; From c984fbb50ff996050319147a67bad57a8f619423 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 15:24:36 +0000 Subject: [PATCH 058/201] tqsl: 2.4.7 -> 2.5.1 --- pkgs/applications/radio/tqsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 343b0bf8cba..451a63c3d81 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.4.7"; + version = "2.5.1"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "1i33bk3annz4rnjc58knprfajq1pbyjqyrhygqybvl7bsp70c5ri"; + sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0"; }; nativeBuildInputs = [ makeWrapper ]; From 2b8735bd5f36d78bca8ca8e5079a5eaecb4dee89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 15:04:38 +0000 Subject: [PATCH 059/201] wcslib: 6.4 -> 7.1 --- pkgs/development/libraries/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index aa4ceb461f1..8363f774c24 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "6.4"; + version = "7.1"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k"; + sha256 ="05ji2v4la8h6azprb8x2zh6wrswxsq8cqw9zml0layc4nfg79fzh"; }; prePatch = '' From 7956397ec23d0d41dd56aa23c4d8b8633a5bce74 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Sun, 9 Feb 2020 00:58:39 -0800 Subject: [PATCH 060/201] go: remove not any more used patch files (#79597) --- .../go/remove-fhs-test-references.patch | 13 --- .../compilers/go/remove-tools-1.9.patch | 35 -------- .../compilers/go/ssl-cert-file-1.9.patch | 80 ------------------- 3 files changed, 128 deletions(-) delete mode 100644 pkgs/development/compilers/go/remove-fhs-test-references.patch delete mode 100644 pkgs/development/compilers/go/remove-tools-1.9.patch delete mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.9.patch diff --git a/pkgs/development/compilers/go/remove-fhs-test-references.patch b/pkgs/development/compilers/go/remove-fhs-test-references.patch deleted file mode 100644 index 1ea7f85d529..00000000000 --- a/pkgs/development/compilers/go/remove-fhs-test-references.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go -index d694990..87fa259 100644 ---- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go -+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go -@@ -452,7 +452,7 @@ func TestGetwd(t *testing.T) { - defer fd.Close() - // These are chosen carefully not to be symlinks on a Mac - // (unlike, say, /var, /etc) -- dirs := []string{"/", "/usr/bin"} -+ dirs := []string{"/"} - switch runtime.GOOS { - case "android": - dirs = []string{"/", "/system/bin"} diff --git a/pkgs/development/compilers/go/remove-tools-1.9.patch b/pkgs/development/compilers/go/remove-tools-1.9.patch deleted file mode 100644 index e76ed61693a..00000000000 --- a/pkgs/development/compilers/go/remove-tools-1.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index d8163d0172..dd80a70473 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1592,7 +1592,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 6e6c674d96..e9f62f96dc 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -223,6 +223,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch b/pkgs/development/compilers/go/ssl-cert-file-1.9.patch deleted file mode 100644 index 3f27bc138c1..00000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index 8e80533590..31c0c666ec 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -201,11 +201,20 @@ int FetchPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - var untrustedData C.CFDataRef = nil -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index bc35a1cf21..21e52bec51 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -81,18 +81,26 @@ func execSecurityRoots() (*CertPool, error) { - ) - } - -- cmd := exec.Command("/usr/bin/security", args...) -- data, err := cmd.Output() -- if err != nil { -- return nil, err -- } -- - var ( - mu sync.Mutex - roots = NewCertPool() - numVerified int // number of execs of 'security verify-cert', for debug stats - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ -+ cmd := exec.Command("/usr/bin/security", args...) -+ data, err := cmd.Output() -+ if err != nil { -+ return nil, err -+ } -+ - blockCh := make(chan *pem.Block) - var wg sync.WaitGroup - -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 65b5a5fdbc..c9c7ac6a74 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -37,6 +37,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { From d3302d37632032300d2524290412951e3e47b5d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 13:20:52 +0000 Subject: [PATCH 061/201] smtube: 19.6.0 -> 20.1.0 --- pkgs/applications/video/smtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 352569e5ab3..df262fa9797 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }: mkDerivation rec { - version = "19.6.0"; + version = "20.1.0"; pname = "smtube"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm"; + sha256 = "00x7gyk06d01hrr1lcqbrffbkkpj2j0j1fy9mkxc7slbzqcl27dz"; }; makeFlags = [ From 786d3002511f6fe281b4944926bb529a066ad921 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 13:14:50 +0000 Subject: [PATCH 062/201] unetbootin: 675 -> 677 --- pkgs/tools/cd-dvd/unetbootin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index a6c2885d4b4..ec8ef6c1651 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "unetbootin"; - version = "675"; + version = "677"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "0b7z2amsf6i7b56a5sfs5di1vh30h6ybcqg23d5gx5zgn3w38w4a"; + sha256 = "1mk6179r2lz2d0pvln1anvf5p4l7vfrnnnlhgyx2dlx6pfacsspy"; }; setSourceRoot = '' From 1ad0c1dcc1650b7e11b3a9e4ee57d80204c5f90b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 13:51:08 +0000 Subject: [PATCH 063/201] xdelta: 3.0.11 -> 3.1.0 --- pkgs/tools/compression/xdelta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 034cdb7d94e..8251d7a497e 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -10,10 +10,10 @@ let else "--without-${name}"; in stdenv.mkDerivation rec { pname = "xdelta"; - version = "3.0.11"; + version = "3.1.0"; src = fetchFromGitHub { - sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r"; + sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy"; rev = "v${version}"; repo = "xdelta-devel"; owner = "jmacd"; From 140f037fafcd0d15bef238c88c41522f37ba0ca6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Feb 2020 22:13:20 +0000 Subject: [PATCH 064/201] xbps: 0.57.1 -> 0.58 --- pkgs/tools/package-management/xbps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 7ff079c0116..21000bf6353 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.57.1"; + version = "0.58"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0adxhhvn5r6hwwqp42iwwfrslmps30ycndi6v39934v38rf0wx9s"; + sha256 = "03zjbqz6fcp9h45ms93hsf96yd79r6hmbk6vixl5m34bf1z2qdn5"; }; nativeBuildInputs = [ pkgconfig which ]; From 5a8a2e7085a348dce2183e35e1af9c7d04abae63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Feb 2020 20:41:01 +0000 Subject: [PATCH 065/201] wesnoth: 1.14.9 -> 1.14.10 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index e0f90d84b11..2ef85ecee53 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.9"; + version = "1.14.10"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga"; + sha256 = "0xnfbz7nin56ms929i5f8rv4mpifbvr64r4ryfhrqmba0vkk9sz7"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 7daa7310bd131a84afbaf4d223aa21c14902781c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Feb 2020 17:48:42 +0000 Subject: [PATCH 066/201] sslmate: 1.7.0 -> 1.7.1 --- pkgs/development/tools/sslmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 9fbdc2e2e87..d3875ae8a69 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.7.0"; + name = "sslmate-1.7.1"; src = fetchurl { url = "https://packages.sslmate.com/other/${name}.tar.gz"; - sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm"; + sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5"; }; makeFlags = [ "PREFIX=$(out)" ]; From 5ae4ed7f53af7681facba9db0ef9e88618b3829c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 09:05:47 +0000 Subject: [PATCH 067/201] python27Packages.feedgen: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/feedgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index d59f0a702aa..4c1eb10c6b1 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "feedgen"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0551ixbcz2gaala4gi3i8gici3haijj7dhvjsz1a61s050276m96"; + sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; propagatedBuildInputs = [ dateutil lxml ]; From 8a6415f749f47ee8916a59e27425a5aa7ba08b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:35:30 +0100 Subject: [PATCH 068/201] pythonPackages.pyface: init at 6.1.1 --- .../python-modules/pyface/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyface/default.nix diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix new file mode 100644 index 00000000000..a26d0bdc1a9 --- /dev/null +++ b/pkgs/development/python-modules/pyface/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, setuptools, six, traits, wxPython +}: + +buildPythonPackage rec { + pname = "pyface"; + version = "6.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q5rihmhcdyyp44p31f5l4a0mc9m3293rvcnma5p8w0v8j7dbrm7"; + }; + + propagatedBuildInputs = [ setuptools six traits wxPython ]; + + doCheck = false; # Needs X server + + meta = with stdenv.lib; { + description = "Traits-capable windowing framework"; + homepage = https://github.com/enthought/pyface; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0b9cc74ff9..755dbc6f057 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4861,6 +4861,8 @@ in { pyext = callPackage ../development/python-modules/pyext { }; + pyface = callPackage ../development/python-modules/pyface { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; pyfma = callPackage ../development/python-modules/pyfma { }; From 4da1a74f25a8606ea58adc814e6dd497baec8b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:13:14 +0100 Subject: [PATCH 069/201] pythonPackages.traitsui: init at 6.0.0 --- .../python-modules/traitsui/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/traitsui/default.nix diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix new file mode 100644 index 00000000000..7711b24f44e --- /dev/null +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, traits, pyface, wxPython +}: + +buildPythonPackage rec { + pname = "traitsui"; + version = "6.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "080fq9hag7hvcnsd5c5fn74zjmjl6rjq40r0zwdz2bjlk9049xpi"; + }; + + propagatedBuildInputs = [ traits pyface wxPython ]; + + doCheck = false; # Needs X server + + meta = with stdenv.lib; { + description = "Traits-capable windowing framework"; + homepage = https://github.com/enthought/traitsui; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 755dbc6f057..6e83c91fd4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6156,6 +6156,8 @@ in { tracing = callPackage ../development/python-modules/tracing { }; + traitsui = callPackage ../development/python-modules/traitsui { }; + translationstring = callPackage ../development/python-modules/translationstring { }; ttystatus = callPackage ../development/python-modules/ttystatus { }; From 7800b2f71a90b087c60c011f39d4740967ad056c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:36:33 +0100 Subject: [PATCH 070/201] pythonPackages.apptools: init at 4.4.0 --- .../python-modules/apptools/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/apptools/default.nix diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix new file mode 100644 index 00000000000..186bda86842 --- /dev/null +++ b/pkgs/development/python-modules/apptools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage +, traits, traitsui, configobj +, nose, tables, pandas +}: + +buildPythonPackage rec { + pname = "apptools"; + version = "4.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dw6vvq7lqkj7mgn3s7r5hs937kl4mj5g7jf2qgvhdld9lsc5xbk"; + }; + + propagatedBuildInputs = [ traits traitsui configobj ]; + + checkInputs = [ + nose + tables + pandas + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Set of packages that Enthought has found useful in creating a number of applications."; + homepage = https://github.com/enthought/apptools; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e83c91fd4c..9b939fc3f7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1614,6 +1614,8 @@ in { approvaltests = callPackage ../development/python-modules/approvaltests { }; + apptools = callPackage ../development/python-modules/apptools {}; + apsw = callPackage ../development/python-modules/apsw {}; astor = callPackage ../development/python-modules/astor {}; From f126f2c9e32fe65031f73dd3a4eef0aee18d9a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:17:30 +0100 Subject: [PATCH 071/201] pythonPackages.envisage: init at 4.7.2 --- .../python-modules/envisage/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/envisage/default.nix diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix new file mode 100644 index 00000000000..54dcfe9e4b5 --- /dev/null +++ b/pkgs/development/python-modules/envisage/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchPypi, buildPythonPackage +, traits, apptools +, ipykernel +}: + +buildPythonPackage rec { + pname = "envisage"; + version = "4.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9"; + }; + + propagatedBuildInputs = [ traits apptools ]; + + preCheck = '' + export HOME=$PWD/HOME + ''; + + checkInputs = [ + ipykernel + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'"; + homepage = https://github.com/enthought/envisage; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b939fc3f7a..e4148600355 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2569,6 +2569,8 @@ in { entrypoints = callPackage ../development/python-modules/entrypoints { }; + envisage = callPackage ../development/python-modules/envisage { }; + enzyme = callPackage ../development/python-modules/enzyme {}; escapism = callPackage ../development/python-modules/escapism { }; From 4fb342d6e48a13d52a280e6716383200609c0913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:18:27 +0100 Subject: [PATCH 072/201] pythonPackages.vtk: init at 7.0.0 --- pkgs/development/libraries/vtk/default.nix | 10 +++++++--- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 482d691fc7c..4acb2b38b81 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff , qtLib ? null +, enablePython ? false, python ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: @@ -27,10 +28,12 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText - IOSurface ImageIO OpenGL GLUT ]; + IOSurface ImageIO OpenGL GLUT ] + ++ optional enablePython [ + python + ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; - preBuild = '' export LD_LIBRARY_PATH="$(pwd)/lib"; ''; @@ -42,7 +45,8 @@ stdenv.mkDerivation rec { # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] - ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4148600355..3ad2c853c76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6671,6 +6671,11 @@ in { visitor = callPackage ../development/python-modules/visitor { }; + vtk = toPythonModule (pkgs.vtk.override { + inherit (self) python; + enablePython = true; + }); + whitenoise = callPackage ../development/python-modules/whitenoise { }; XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; From 1a6e93f0b2f3efa816d494ed5054bf38f3f75a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 31 Jan 2019 22:41:34 +0100 Subject: [PATCH 073/201] pythonPackages.mayavi: init at 4.7.0 --- .../python-modules/mayavi/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/mayavi/default.nix diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix new file mode 100644 index 00000000000..d7a821915f2 --- /dev/null +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchPypi, buildPythonPackage +, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools +, nose, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "mayavi"; + version = "4.7.0"; + + src = fetchPypi { + inherit pname version; + extension = "tar.bz2"; + sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44"; + }; + + # Discovery of 'vtk' in setuptools is not working properly, due to a missing + # .egg-info in the vtk package. It does however import and run just fine. + postPatch = '' + substituteInPlace mayavi/__init__.py --replace "'vtk'" "" + ''; + + propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ]; + + checkInputs = [ nose mock ]; + + disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython + + doCheck = false; # Needs X server + + meta = with stdenv.lib; { + description = "3D visualization of scientific data in Python"; + homepage = https://github.com/enthought/mayavi; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ad2c853c76..118604b7d85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4143,6 +4143,8 @@ in { maya = callPackage ../development/python-modules/maya { }; + mayavi = callPackage ../development/python-modules/mayavi { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = callPackage ../development/python-modules/mechanize { }; From bc2336898fd4a3a0d53628e7e793212c1e4b0ac1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:10:57 -0500 Subject: [PATCH 074/201] broot: 0.12.2 -> 0.13.1 (#79565) Changelog: - https://github.com/Canop/broot/releases/tag/v0.13.0 - https://github.com/Canop/broot/releases/tag/v0.13.1 --- pkgs/tools/misc/broot/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d555d031896..45b26b25055 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,21 +1,23 @@ -{ stdenv, rustPlatform, fetchFromGitHub, coreutils, installShellFiles }: +{ stdenv, rustPlatform, fetchFromGitHub, coreutils, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1y2da4xcdsvvss4plbp77pqhi8fqjlnsgpcwq8fkc0vx049ijhcm"; + sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak"; }; - cargoSha256 = "1h9jpyxvk76h06jgy3bwbr3ymhqypsyq05m99clkkrlwp8dnsgqq"; + cargoSha256 = "0vzpyymylzxjm613lf5xr6hd21ijkl3vwq4y6h1q3as41phw2sqb"; verifyCargoDeps = true; nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postPatch = '' substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/' ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feaba9296a1..62ddc0820da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1270,7 +1270,9 @@ in brook = callPackage ../tools/networking/brook { }; - broot = callPackage ../tools/misc/broot { }; + broot = callPackage ../tools/misc/broot { + inherit (darwin.apple_sdk.frameworks) Security; + }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; From f1eed441618cb7924993387578d636ca4287bb39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 18:42:41 +0000 Subject: [PATCH 075/201] metabase: 0.34.1 -> 0.34.2 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 69a92942f5c..583c6b739cd 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.34.1"; + version = "0.34.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0fcggpv9ikx481ci7jw6phhmk3mqxbsn9pfs1kqmhwy1ka4ck6dg"; + sha256 = "02hpm8h98dsxyjs736bss3pk253aayf9dr7csj6qn3y68hs67jpk"; }; nativeBuildInputs = [ makeWrapper ]; From 82e7ef2c16cc592d97c89e1ef676f46bf7e643c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 07:29:48 +0000 Subject: [PATCH 076/201] postgresql11Packages.pg_partman: 4.2.2 -> 4.3.0 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 94a71cf223a..2edc07c1d29 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.2.2"; + version = "4.3.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "04d34b5z957imm3dndzjn474rxbgx95ha7a9x3vd0rya1pjv927r"; + sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w"; }; installPhase = '' From ca44e9514cf8689915c20627ce4a085a0bc3fb4a Mon Sep 17 00:00:00 2001 From: Taito Horiuchi Date: Wed, 19 Jun 2019 13:58:46 +0300 Subject: [PATCH 077/201] pythonPackages.z3c_checkversions: init at 1.1 pythonPackages.z3c-checkversions: normalize attribute name and pname z3c_checkversions -> z3c-checkversions pythonPackages.z3c-checkversions: init at 1.1 --- .../z3c-checkversions/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/z3c-checkversions/default.nix diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix new file mode 100644 index 00000000000..41b7fb5c520 --- /dev/null +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, zc_buildout +, zope_testrunner +}: + +buildPythonPackage rec { + pname = "z3c-checkversions"; + version = "1.1"; + + src = fetchPypi { + inherit version; + pname = "z3c.checkversions"; + sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d"; + }; + + propagatedBuildInputs = [ zc_buildout ]; + checkInputs = [ zope_testrunner ]; + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src [] + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/zopefoundation/z3c.checkversions; + description = "Find newer package versions on PyPI"; + license = licenses.zpl21; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 118604b7d85..6dc9f39238f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1994,6 +1994,8 @@ in { zc_buildout221 = callPackage ../development/python-modules/buildout { }; + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; + bunch = callPackage ../development/python-modules/bunch { }; can = callPackage ../development/python-modules/can {}; From 3905d9baf6fe46cd390f4c5823bbbc1e88348f06 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:20:00 -0500 Subject: [PATCH 078/201] aws-checksums: build shared libraries --- pkgs/development/libraries/aws-checksums/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 99cefde8937..886383bf961 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ]; + meta = with lib; { description = "HW accelerated CRC32c and CRC32"; homepage = https://github.com/awslabs/aws-checksums; From 9fb19969251f1f2ac52d95ee7c53767fb748179a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:20:00 -0500 Subject: [PATCH 079/201] buildkit: 0.4.0 -> 0.6.3 --- pkgs/development/tools/buildkit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 29b07fbfd0f..dce4563052d 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,19 +2,20 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.4.0"; - rev = "v${version}"; + version = "0.6.3"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; src = fetchFromGitHub { - inherit rev; owner = "moby"; repo = "buildkit"; - sha256 = "0gkwcjqbcskn63y79jwa26hxkps452z4bgz8lrryaskzbdpvhh3d"; + rev = "v${version}"; + sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn"; }; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; + meta = with stdenv.lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = https://github.com/moby/buildkit; From 7addbecfe5d93ffdf6188078f6a0797a8d2a295e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:21:00 -0500 Subject: [PATCH 080/201] aws-c-event-stream: build shared libraries --- pkgs/development/libraries/aws-c-event-stream/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index ccc4abb85fd..cc26c29c9d1 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ aws-c-common aws-checksums ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ + "-DBUILD_SHARED_LIBS:BOOL=ON" "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; From 5fb378b5c5df67106ce9243b4f384ff60c03b4e1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:21:00 -0500 Subject: [PATCH 081/201] buildkit: add marsam to maintainers --- pkgs/development/tools/buildkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index dce4563052d..5d8d22fbfbb 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = https://github.com/moby/buildkit; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; + maintainers = with maintainers; [ vdemeester marsam ]; }; } From 4ea8f051ac2bf8edfdc5e712191fb6e34212a95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Tue, 5 Mar 2019 14:43:33 +0100 Subject: [PATCH 082/201] galario: init at 1.2.1 Co-Authored-By: Daniel Schaefer --- .../development/libraries/galario/default.nix | 78 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 5 ++ 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/galario/default.nix diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix new file mode 100644 index 00000000000..08450e56983 --- /dev/null +++ b/pkgs/development/libraries/galario/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchzip +, fetchFromGitHub +, cmake +, fftw +, fftwFloat +, enablePython ? false +, pythonPackages +, llvmPackages +}: +let + # CMake recipes are needed to build galario + # Build process would usually download them + great-cmake-cookoff = fetchzip { + url = "https://github.com/UCL/GreatCMakeCookOff/archive/v2.1.9.tar.gz"; + sha256 = "1yd53b5gx38g6f44jmjk4lc4igs3p25z6616hfb7aq79ly01q0w2"; + }; +in +stdenv.mkDerivation rec { + pname = "galario"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "mtazzari"; + repo = pname; + rev = "v${version}"; + sha256 = "1akz7md7ly16a89zr880c265habakqdg9sj8iil90klqa0i21w6g"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ fftw fftwFloat ] + ++ stdenv.lib.optional enablePython pythonPackages.python + ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp + ; + + propagatedBuildInputs = stdenv.lib.optional enablePython [ + pythonPackages.numpy + pythonPackages.cython + pythonPackages.pytest + ]; + + checkInputs = stdenv.lib.optional enablePython pythonPackages.scipy; + + preConfigure = '' + mkdir -p build/external/src + cp -r ${great-cmake-cookoff} build/external/src/GreatCMakeCookOff + chmod -R 777 build/external/src/GreatCMakeCookOff + ''; + + preCheck = '' + ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} + ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} + ''; + + doCheck = true; + + postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) '' + install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so + install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so + ''; + + meta = with stdenv.lib; { + description = "GPU Accelerated Library for Analysing Radio Interferometer Observations"; + longDescription = '' + Galario is a library that exploits the computing power of modern + graphic cards (GPUs) to accelerate the comparison of model + predictions to radio interferometer observations. Namely, it + speeds up the computation of the synthetic visibilities given a + model image (or an axisymmetric brightness profile) and their + comparison to the observations. + ''; + homepage = "https://mtazzari.github.io/galario/"; + license = licenses.lgpl3; + maintainers = [ maintainers.smaret ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62ddc0820da..98b11fb4775 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24519,6 +24519,8 @@ in fityk = callPackage ../applications/science/misc/fityk { }; + galario = callPackage ../development/libraries/galario { }; + gildas = callPackage ../applications/science/astronomy/gildas { }; gplates = callPackage ../applications/science/misc/gplates { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dc9f39238f..975df9f16b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3601,6 +3601,11 @@ in { futures = callPackage ../development/python-modules/futures { }; + galario = toPythonModule (pkgs.galario.override { + enablePython = true; + pythonPackages = self; + }); + gcovr = callPackage ../development/python-modules/gcovr { }; gdal = toPythonModule (pkgs.gdal.override { From 018d0459f8c83adf34a15d12389b0bb218f7f5ba Mon Sep 17 00:00:00 2001 From: Ivan Solyankin Date: Mon, 12 Aug 2019 16:04:38 +0300 Subject: [PATCH 083/201] pythonPackages.orderedmultidict: init at 1.0.1 --- .../orderedmultidict/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/orderedmultidict/default.nix diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix new file mode 100644 index 00000000000..f144c43da06 --- /dev/null +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, flake8, six }: + +buildPythonPackage rec { + pname = "orderedmultidict"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"; + }; + + checkInputs = [ flake8 ]; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Ordered Multivalue Dictionary."; + homepage = https://github.com/gruns/orderedmultidict; + license = licenses.publicDomain; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 975df9f16b9..319d59212a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -921,6 +921,8 @@ in { ordered-set = callPackage ../development/python-modules/ordered-set { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; pythonProtobuf = self.protobuf; From f4f450f3a5f217ec956df5b4c63a0e6bb200ea70 Mon Sep 17 00:00:00 2001 From: Ivan Solyankin Date: Mon, 12 Aug 2019 16:05:32 +0300 Subject: [PATCH 084/201] pythonPackages.furl: init at 2.0.0 --- .../python-modules/furl/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/furl/default.nix diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix new file mode 100644 index 00000000000..ecb455b51e4 --- /dev/null +++ b/pkgs/development/python-modules/furl/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict }: + +buildPythonPackage rec { + pname = "furl"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx"; + }; + + checkInputs = [ flake8 ]; + + propagatedBuildInputs = [ six orderedmultidict ]; + + meta = with stdenv.lib; { + description = "URL manipulation made simple."; + homepage = https://github.com/gruns/furl; + license = licenses.publicDomain; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 319d59212a5..6ae4b5e54e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -690,6 +690,8 @@ in { fsspec = callPackage ../development/python-modules/fsspec { }; + furl = callPackage ../development/python-modules/furl { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; From d1508cb819cea16167e613894c7cbc8202b23148 Mon Sep 17 00:00:00 2001 From: Lucio Delelis Date: Sun, 9 Feb 2020 06:25:08 -0300 Subject: [PATCH 085/201] pythonPackages.pyfcm: init at 1.4.7 (#67321) * pythonPackages.pyfcm: init at 1.4.7 * pythonPackages.pyfcm: build from github, rather than Pypi * pythonPackages.pyfcm: adds ldelelis as package maintainer --- maintainers/maintainer-list.nix | 6 ++++ .../python-modules/pyfcm/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyfcm/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4bb59d9c49e..2505cf95330 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3991,6 +3991,12 @@ githubId = 32152; name = "Luka Blaskovic"; }; + ldelelis = { + email = "ldelelis@est.frba.utn.edu.ar"; + github = "ldelelis"; + githubId = 20250323; + name = "Lucio Delelis"; + }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix new file mode 100644 index 00000000000..22afc793cde --- /dev/null +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, requests +}: + +buildPythonPackage rec { + pname = "pyfcm"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "olucurious"; + repo = "pyfcm"; + rev = "${version}"; + sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; + }; + + propagatedBuildInputs = [ requests ]; + + # pyfcm's unit testing suite requires network access + doCheck = false; + + meta = with lib; { + description = "Python client for FCM - Firebase Cloud Messaging (Android, iOS and Web)"; + homepage = "https://github.com/olucurious/pyfcm"; + license = licenses.mit; + maintainers = with maintainers; [ ldelelis ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ae4b5e54e5..988f1ec38f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1082,6 +1082,8 @@ in { pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; + pyfttt = callPackage ../development/python-modules/pyfttt { }; pyftdi = callPackage ../development/python-modules/pyftdi { }; From 7639c4adc2de51be88b4344adaedcfc663c1bb10 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Sat, 3 Aug 2019 19:47:08 +0200 Subject: [PATCH 086/201] mono: remove outdated wokaround --- pkgs/development/compilers/mono/generic.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e0cfe247b23..5f5440c2148 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -24,9 +24,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ; - # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 - dontDisableStatic = true; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" From 002fc5fa06868521e7bf134ca45d679cb21cae9a Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Sat, 3 Aug 2019 23:48:56 +0200 Subject: [PATCH 087/201] pythonPackages.pythonnet: 2.3.0 -> 2.4.0 --- .../python-modules/pythonnet/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index f916ec63b30..3b89e3245ca 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -5,6 +5,7 @@ , python , pytest , pycparser +, psutil , pkgconfig , dotnetbuildhelpers , clang @@ -20,10 +21,10 @@ let outputFiles = [ "*" ]; }; - NUnit360 = fetchNuGet { + NUnit371 = fetchNuGet { baseName = "NUnit"; - version = "3.6.0"; - sha256 = "0wz4sb0hxlajdr09r22kcy9ya79lka71w0k1jv5q2qj3d6g2frz1"; + version = "3.7.1"; + sha256 = "1yc6dwaam4w2ss1193v735nnl79id78yswmpvmjr1w4bgcbdza4l"; outputFiles = [ "*" ]; }; @@ -31,11 +32,11 @@ in buildPythonPackage rec { pname = "pythonnet"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1hxnkrfj8ark9sbamcxzd63p98vgljfvdwh79qj3ac8pqrgghq80"; + sha256 = "1ach9jic7a9rd3vmc4bphkr9fq01a0qk81f8a7gr9npwzmkqx8x3"; }; postPatch = '' @@ -55,20 +56,26 @@ buildPythonPackage rec { dotnetbuildhelpers clang - NUnit360 + mono + + NUnit371 UnmanagedExports127 ]; buildInputs = [ mono + psutil # needed for memory leak tests ]; preBuild = '' rm -rf packages mkdir packages - ln -s ${NUnit360}/lib/dotnet/NUnit/ packages/NUnit.3.6.0 + ln -s ${NUnit371}/lib/dotnet/NUnit/ packages/NUnit.3.7.1 ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7 + + # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542 + export TERM=xterm ''; checkPhase = '' From 9c8716af6892b22d1772d037275bcb4d97afd283 Mon Sep 17 00:00:00 2001 From: ivegotasthma Date: Fri, 9 Aug 2019 00:09:52 +0200 Subject: [PATCH 088/201] pythonPackages.django-anymail: init at 6.1.0 --- .../python-modules/django-anymail/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/django-anymail/default.nix diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix new file mode 100644 index 00000000000..d05b5b0b92b --- /dev/null +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, + buildPythonPackage, + fetchFromGitHub, + six, + requests, + django, + boto3, + python, + mock, +}: + +buildPythonPackage rec { + pname = "django-anymail"; + version = "6.1.0"; + + src = fetchFromGitHub { + owner = "anymail"; + repo = pname; + rev = "v6.1"; + sha256 = "04jgz3qnsnba18rlqgxyb2g9128pk3ivflnj6695kibxg724fcpv"; + }; + + propagatedBuildInputs = [ + six + requests + django + boto3 + ]; + + checkInputs = [ mock ]; + checkPhase = '' + substituteInPlace setup.py --replace "tests_require=[" "tests_require=[], #" + export CONTINUOUS_INTEGRATION=1 + export ANYMAIL_SKIP_TESTS="sparkpost" + ${python.interpreter} setup.py test + ''; + + # this package allows multiple email backends + # sparkpost is missing because it's not packaged yet + meta = with stdenv.lib; { + description = "Django email backends and webhooks for Mailgun"; + homepage = https://github.com/anymail/django-anymail; + license = licenses.bsd3; + maintainers = with maintainers; [ ivegotasthma ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 988f1ec38f7..4259c908cd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3240,6 +3240,8 @@ in { django-allauth = callPackage ../development/python-modules/django-allauth { }; + django-anymail = callPackage ../development/python-modules/django-anymail {}; + django_appconf = callPackage ../development/python-modules/django_appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; From e7d80e3e15623ec0fb3eac8fd621882ab8a5d3e5 Mon Sep 17 00:00:00 2001 From: talkara <51232929+talkara@users.noreply.github.com> Date: Sun, 9 Feb 2020 11:27:45 +0200 Subject: [PATCH 089/201] pythonPackages.robotframework-databaselibrary: init at 1.2.4 (#67339) * pythonPackages.robotframework-databaselibrary: init at 1.2.4 * maintainers: add talkara * pythonPackages.robotframework-databaselibrary: add meta.maintainers: talkara --- maintainers/maintainer-list.nix | 6 ++++ .../default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/robotframework-databaselibrary/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2505cf95330..8d5447654ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6951,6 +6951,12 @@ githubId = 870673; name = "Takuo Yonezawa"; }; + talkara = { + email = "taito.horiuchi@relexsolutions.com"; + github = "talkara"; + githubId = 51232929; + name = "Taito Horiuchi"; + }; talyz = { email = "kim.lindberger@gmail.com"; github = "talyz"; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix new file mode 100644 index 00000000000..6af58312523 --- /dev/null +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, robotframework +}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "robotframework-databaselibrary"; + + src = fetchPypi { + inherit pname version; + sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847"; + }; + + # unit tests are impure + doCheck = false; + + propagatedBuildInputs = [ robotframework ]; + + meta = with stdenv.lib; { + description = "Database Library contains utilities meant for Robot Framework"; + homepage = https://github.com/franz-see/Robotframework-Database-Library; + license = licenses.asl20; + maintainers = with maintainers; [ talkara ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4259c908cd7..91158efd018 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5301,6 +5301,8 @@ in { robotframework = callPackage ../development/python-modules/robotframework { }; + robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; + robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; From 2eeda840917cd655d89d1c14d9cdccaab3f8fdbb Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Wed, 28 Aug 2019 23:36:23 +0200 Subject: [PATCH 090/201] pythonPackages.iapws: init at 1.4 --- .../python-modules/iapws/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/iapws/default.nix diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix new file mode 100644 index 00000000000..3bffcfb914b --- /dev/null +++ b/pkgs/development/python-modules/iapws/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, scipy }: + +buildPythonPackage rec { + pname = "iapws"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "3d7a7a17343157dacd3f654b7f82d1974492209756c4de99332d4f6b375227e6"; + }; + + propagatedBuildInputs = [ scipy ]; + + meta = with lib; { + description = "Python implementation of standard from IAPWS"; + homepage = "https://github.com/jjgomera/iapws"; + license = licenses.gpl3; + maintainers = with maintainers; [ dawidsowa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91158efd018..2d22cd2a842 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3841,6 +3841,8 @@ in { httpretty = callPackage ../development/python-modules/httpretty { }; + iapws = callPackage ../development/python-modules/iapws { }; + icalendar = callPackage ../development/python-modules/icalendar { }; ics = callPackage ../development/python-modules/ics { }; From 74cb7cd5c02f2a7c25e80d6fa55183b2f541d985 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 28 Aug 2019 18:19:09 -0400 Subject: [PATCH 091/201] pythonPackages.sfepy: init at 2019.2 --- .../python-modules/sfepy/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/sfepy/default.nix diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix new file mode 100644 index 00000000000..36f4f82cb3f --- /dev/null +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchurl +, numpy +, scipy +, matplotlib +, pyparsing +, tables +, cython +, python +, sympy +}: + +buildPythonPackage rec { + name = "sfepy_${version}"; + version = "2019.2"; + + src = fetchurl { + url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; + sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj"; + }; + + propagatedBuildInputs = [ + numpy + cython + scipy + matplotlib + pyparsing + tables + sympy + ]; + + postPatch = '' + # broken test + rm tests/test_homogenization_perfusion.py + + # slow tests + rm tests/test_input_*.py + rm tests/test_elasticity_small_strain.py + rm tests/test_term_call_modes.py + rm tests/test_refine_hanging.py + rm tests/test_hyperelastic_tlul.py + rm tests/test_poly_spaces.py + rm tests/test_linear_solvers.py + rm tests/test_quadratures.py + ''; + + checkPhase = '' + export HOME=$TMPDIR + mv sfepy sfepy.hidden + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + ${python.interpreter} run_tests.py -o $TMPDIR/test_outputs --raise + ''; + + meta = with lib; { + homepage = https://sfepy.org/; + description = "Simple Finite Elements in Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ wd15 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d22cd2a842..6b7bd12b547 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4644,6 +4644,8 @@ in { fipy = callPackage ../development/python-modules/fipy { }; + sfepy = callPackage ../development/python-modules/sfepy { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; From af6336aa34cf38cfbf3e0721b69903a29a9acbac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 09:37:36 +0000 Subject: [PATCH 092/201] python27Packages.geopandas: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/geopandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 5a6313be583..b7dea183b0e 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "1wy2n204vf5bbswgma205lr1is7nnxr385m4x3v7pra05bq8ag3q"; + sha256 = "11mzb5spwa06h1zhn7z905wcwya2x5srghv82jp5zjka9zdhsycd"; }; checkInputs = [ pytest Rtree ]; From 1f775c59b7b668f9f630ae6c2e17f50f69d72295 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 9 Feb 2020 09:49:47 +0000 Subject: [PATCH 093/201] gmtp: remove pbogdan from maintainers --- pkgs/applications/misc/gmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index c8bbcf2aa7f..db2193dbd3d 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; homepage = https://gmtp.sourceforge.io; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.pbogdan ]; + maintainers = [ ]; license = stdenv.lib.licenses.bsd3; }; } From cb5f5186572edb0a93533bba022e3fa97a227ffc Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 9 Feb 2020 09:50:10 +0000 Subject: [PATCH 094/201] ant-theme: remove pbogdan from maintainers --- pkgs/data/themes/ant-theme/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/default.nix index 8ff869bc7aa..c60fb4d3355 100644 --- a/pkgs/data/themes/ant-theme/default.nix +++ b/pkgs/data/themes/ant-theme/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/EliverLara/Ant; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ - maintainers.pbogdan - ]; + maintainers = [ ]; }; } From a8eb2e4fb2a8f5fdc45a08c31ce03d9393d6a684 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 9 Feb 2020 09:50:35 +0000 Subject: [PATCH 095/201] tcptraceroute: remove pbogdan from maintainers --- pkgs/tools/networking/tcptraceroute/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index cfb627e8b3b..01c832dbcea 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A traceroute implementation using TCP packets."; homepage = https://github.com/mct/tcptraceroute; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pbogdan ]; + maintainers = [ ]; }; } From 1f97638235998e1bbe07a38b64f5ccc91198ee40 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 9 Feb 2020 09:50:54 +0000 Subject: [PATCH 096/201] libcdio-paranoia: remove pbogdan from maintainers --- pkgs/development/libraries/libcdio-paranoia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 48e632ba52d..a539586f067 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = licenses.gpl3; homepage = https://github.com/rocky/libcdio-paranoia; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.pbogdan ]; + maintainers = [ ]; }; } From 603d41f9c7f1c08ce16d424ba51851befcf67b99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 09:51:09 +0000 Subject: [PATCH 097/201] python27Packages.ijson: 2.5.1 -> 2.6.1 --- pkgs/development/python-modules/ijson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 8729de427d9..0b1601c9dc3 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.5.1"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "19ec46a2f7991004e5202ecee56c569616b8a7f95686ad7fd0a9ec81cac00269"; + sha256 = "1l034zq23315icym2n0zppa5lwpdll3mvavmyjbiryxb4c5wdsvm"; }; doCheck = false; # something about yajl From fec3dd245923e8693fba12e27f4cd4cc27e57e56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 09:57:34 +0000 Subject: [PATCH 098/201] python37Packages.jupyterlab: 1.2.5 -> 1.2.6 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ece3b4e3ed5..55ade7db9ca 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.5"; + version = "1.2.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "086zl3pdsq2jwcxv7ppp3lpwh25mgnn0y0s6scmkrz158yj55kp3"; + sha256 = "0mc3nrj7fc5q2ajr09m261j386jsp8qjljg8anghlh8czc9ln4s2"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; From 656e96e2f85222986c4c9f3e238ccb3777cc8701 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 05:00:00 -0500 Subject: [PATCH 099/201] python27Packages.ijson: update homepage --- pkgs/development/python-modules/ijson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 0b1601c9dc3..9374d8939c3 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Iterative JSON parser with a standard Python iterator interface"; - homepage = "https://github.com/isagalaev/ijson"; + homepage = "https://github.com/ICRAR/ijson"; license = licenses.bsd3; maintainers = with maintainers; [ rvl ]; }; From ba1862b69c938acb30f98e5a8ba075cf56368744 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 9 Feb 2020 11:43:20 +0100 Subject: [PATCH 100/201] atlassian-jira: 8.6.0 -> 8.7.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index e5bc253f83d..a4eed02af71 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "091vcr0hvrrm9zjqs67ai5mkx7b8ybpwqpdxy7jw5z3994rdx3xw"; + sha256 = "0k3z4j5pp0xx8qq5clr3069449w5k43gzag60jv3dzq35586yvdi"; }; buildPhase = '' From 6ec453251e7abda8c0242bee835850477eaf4ce3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 03:33:14 +0000 Subject: [PATCH 101/201] osinfo-db: 20191125 -> 20200203 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 31f7eb7efdb..96fd9ad33f1 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20191125"; + version = "20200203"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78"; + sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From f69f31a11bf25d83465ed349e1621942a7f1cf12 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 9 Feb 2020 12:14:55 +0100 Subject: [PATCH 102/201] hll2340dw brother: added driver to cups (#78560) --- pkgs/misc/cups/drivers/hll2340dw/default.nix | 68 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hll2340dw/default.nix diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix new file mode 100644 index 00000000000..653f72a0b61 --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -0,0 +1,68 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}: + +let + version = "3.2.0-1"; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101912/hll2340dlpr-${version}.i386.deb"; + sha256 = "c0ae98b49b462cd8fbef445550f2177ce9d8bf627c904e182daa8cbaf8781e50"; + }; + + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101913/hll2340dcupswrapper-${version}.i386.deb"; + sha256 = "8aa24a6a825e3a4d5b51778cb46fe63032ec5a731ace22f9ef2b0ffcc2033cc9"; + }; + +in +stdenv.mkDerivation { + name = "cups-brother-hll2340dw"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out + dpkg-deb -x ${cupsdeb} $out + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \ + --replace /opt "$out/opt" \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2340D/\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2340D\"; #" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2340D/lpd/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2340D/lpd/rawtobr3 + + for f in \ + $out/opt/brother/Printers/HLL2340D/cupswrapper/brother_lpdwrapper_HLL2340D \ + $out/opt/brother/Printers/HLL2340D/cupswrapper/paperconfigml1 \ + ; do + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused + ]} + done + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D $out/lib/cups/filter/brother_lpdwrapper_HLL2340D + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HLL2340D/cupswrapper/brother-HLL2340D-cups-en.ppd $out/share/cups/model/ + + wrapProgram $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother hl-l2340dw printer driver"; + license = licenses.unfree; + platforms = platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=es&prod=hll2340dw_us_eu_as&os=128&flang=English"; + maintainers = [ maintainers.qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98b11fb4775..1384d052643 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24712,6 +24712,8 @@ in cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; + cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; # this driver ships with pre-compiled 32-bit binary libraries From 636eb23157554af622f087f04ef0566853473d7a Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 9 Feb 2020 11:34:17 +0000 Subject: [PATCH 103/201] nixos/acme: Fix b.example.com test --- nixos/modules/security/acme.nix | 2 -- nixos/tests/acme.nix | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 66bc9d8d505..7da6666f79c 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -333,9 +333,7 @@ in chown '${data.user}:${data.group}' *.pem fi - echo post stuff ${data.postRun} - echo done ''; in "+${script}"; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 480e95e67c7..617dafee0dc 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -63,7 +63,7 @@ in import ./make-test-python.nix { }; }; - webserver = { nodes, config, pkgs, lib, ... }: let parentConfig = config; in { + webserver = { nodes, config, pkgs, lib, ... }: { imports = [ commonConfig ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.nameservers = lib.mkForce [ @@ -97,6 +97,7 @@ in import ./make-test-python.nix { systemd.services."acme-b.example.com" = { wants = [ "acme-finished-b.example.com.target" ]; before = [ "acme-finished-b.example.com.target" ]; + after = [ "nginx.service" ]; }; services.nginx.virtualHosts."b.example.com" = { enableACME = true; From 991d9d76d9804e5f91856adfe87716274fce7c59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 11:51:26 +0000 Subject: [PATCH 104/201] python27Packages.django-storages: 1.8 -> 1.9.1 --- pkgs/development/python-modules/django-storages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 5756d0ab5e6..dbf4e64db5a 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.8"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "000abaayhymh4rxmk19hwhlyibc62rs0qdfczkhf4wb3p9san8lk"; + sha256 = "148y2hyx1l4pfbqpq8hgq95fw8bhfbblwd3m5xwnhw6frcirk7m5"; }; propagatedBuildInputs = [ django ]; From 0fe3a6195bf6623b49bd40270cb904395eb057b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 09:20:50 +0000 Subject: [PATCH 105/201] python27Packages.m3u8: 0.5.2 -> 0.5.4 --- pkgs/development/python-modules/m3u8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index e558b893dfd..5763f3beb65 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "m3u8"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = version; - sha256 = "0p6wmwv1nfa5pyakq5d55w9v142z5ja3db3s3qr44kx895d9lhng"; + sha256 = "1a2c7vqcysxkaffk40zg8d60l9hpjk0dw221fy9cg72i8jxq1gmm"; }; checkInputs = [ bottle pytest pytestcov ]; From db4ec5044daff78b1fe55f71f082cc9f495fd51b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 17:33:28 +0000 Subject: [PATCH 106/201] lldpd: 1.0.4 -> 1.0.5 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 23dbb60767e..653865b0e91 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak"; + sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd"; }; configureFlags = [ From 80ef6e58b3dd21b518ec052c4207187428c57bed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 12:29:16 +0000 Subject: [PATCH 107/201] python27Packages.Nuitka: 0.6.6 -> 0.6.7 --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 0413d224bcd..edaed742538 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.6"; + version = "0.6.7"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1ia37072qdbgdvh9qxkrhi3mlqn3kcn0qm5xjz6f68sis6ni9kw2"; + sha256 = "09mrm7iz2wdrd7y2csbcidg6bkskjignx2pnifh4i8zlh0vm61bg"; }; checkInputs = [ vmprof pyqt4 ]; From eab57b9266457265a77728e0305ff6862b36d353 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 02:48:19 +0000 Subject: [PATCH 108/201] opera: 66.0.3515.36 -> 66.0.3515.72 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index b92c3d58741..f5eea57b483 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "66.0.3515.36"; + version = "66.0.3515.72"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "1kmd8dxdid593a98a13n8k22hi1whvichda6qam2bqcz99rsczdd"; + sha256 = "1mw4sfjf9ijbgghkbkg45b6kzbd0qa0mxb88ajrjnxf4g26brhra"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; From 20a73c5434906f56f34d80fff352af7835c2df5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 23:05:16 +0000 Subject: [PATCH 109/201] kdeApplications.okteta: 0.26.2 -> 0.26.3 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 5c7ddfb34d4..fa63ee90adc 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "okteta"; - version = "0.26.2"; + version = "0.26.3"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv"; + sha256 = "1454844s76skk18gpcf56y9pkmffs7p4z09ggmy37ifzf7yk1p19"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From 1519d82b95bdc394d015f614a17124aa815fbeae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 15:43:29 +0000 Subject: [PATCH 110/201] python27Packages.sphinxcontrib-tikz: 0.4.6 -> 0.4.8 --- .../development/python-modules/sphinxcontrib-tikz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 15585679a29..747fa1cb243 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.6"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3"; + sha256 = "1rvm0l40iz1z03d09irkqdwzi9gs6pn0203hylaqbix5c7gabwhy"; }; patches = [ From a38c6373288ab5b947dc3fbd12a32dcef5546fdf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 14:47:14 +0000 Subject: [PATCH 111/201] python27Packages.python-dotenv: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index f43d8d0575b..d663bfd8bc9 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.10.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "16s2x5ghrhz9ljm6h3y0pbwh97558vbs7l0yiicag4s0xyn0nzq0"; + sha256 = "1p6xk0f1yj1s4n8wjs9m8xqilc5bcwvfzsy9nv5lrmkhr78bym7j"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; From 0de71396f96f974f44d420d2c390623dff54be41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 15:05:56 +0000 Subject: [PATCH 112/201] python27Packages.phonenumbers: 8.11.2 -> 8.11.3 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index c0e86dd3751..6b219ed0dd1 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.2"; + version = "8.11.3"; src = fetchPypi { inherit pname version; - sha256 = "0j73mr3d3rf2r4nkaxbvl7323xima0l95pjagjzgk2piqwa3nbd2"; + sha256 = "1rh0860ml00kw5c4b4r31wz5s8cmd5mpxx5slypdgljk4ralyg6p"; }; meta = { From 50ebd0e71559fc9dca42dfd1df9d9cb9138f9402 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 08:15:54 +0000 Subject: [PATCH 113/201] python37Packages.cmd2: 0.9.23 -> 0.9.25 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 6cc91f4b74c..ca105692857 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.23"; + version = "0.9.25"; src = fetchPypi { inherit pname version; - sha256 = "17ic6lxzz9yrwxh3l1skcqgr59c47w5fidj5qmrk1l26rkrjxlca"; + sha256 = "0w5jh2lanqxsva9fr9p07mmbd5w4v6zmhf6lr0awksvhjx77lhdc"; }; LC_ALL="en_US.UTF-8"; From 3a1098e3e27a8405e145b8b0db3186c4f36a849d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 03:37:30 +0000 Subject: [PATCH 114/201] pcb: 4.2.1 -> 4.2.2 --- pkgs/applications/science/electronics/pcb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index ec47a37140f..636c494c340 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "pcb"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz"; - sha256 = "1i9zvcj0vgwp2g2hkmvafdq0k39klj90jsdanqx9xl7gl70345cq"; + sha256 = "0pbfyfadbia1jf9ywkf02j8mfdh8c3mj390c2jdqnl70vcdszvhw"; }; nativeBuildInputs = [ From 2bd67e1364e86c0af94f024249cadc4ded413d76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 12:26:08 +0000 Subject: [PATCH 115/201] python27Packages.geopy: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/geopy/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index 49876872724..484c049da35 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.20.0"; + version = "1.21.0"; disabled = !isPy27; # only Python 2.7 doCheck = false; # Needs network access @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2"; + sha256 = "1p1sgy2p59j0297bp7c82b45bx4d3i1p4kvbgf89c9i0llyb80nw"; }; meta = with stdenv.lib; { From aacf7bc4cbec1919013a614802960352ebe377b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 08:45:49 +0000 Subject: [PATCH 116/201] python37Packages.hstspreload: 2020.1.17 -> 2020.2.5 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 918ed268afa..545f0d00179 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.1.17"; + version = "2020.2.5"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "08qcisiscnx74pwavh3ai3lg92zfrikwzr06p700kwk1gp8xhf3v"; + sha256 = "1jz4qma04vkiczlj0fd9ahjf6c3yxvycvhp48c3n3l4aw4gfsbiz"; }; # tests require network connection From 3c3393bda260777aeefc312d14c3185d2fe3706c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 17:50:11 +0000 Subject: [PATCH 117/201] libdap: 3.20.4 -> 3.20.5 --- pkgs/development/libraries/libdap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index df2e4c367bf..baf93894420 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.4"; + version = "3.20.5"; pname = "libdap"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; + sha256 = "17j6ca2qsp69a91lm11mwbs4l8q13xqcdz60l94avl5krymrqg47"; }; meta = with stdenv.lib; { From 9d5a7719192ad30c7433012f93bd028ca6bf1a12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 17:00:38 +0000 Subject: [PATCH 118/201] libsolv: 0.7.10 -> 0.7.11 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 73b1604f2ee..b4dd8ccbfb5 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.10"; + version = "0.7.11"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1qih2j2vng32hk5c0v16gcr7nfq218hrync7xbn33aham8cxfrfa"; + sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af"; }; cmakeFlags = [ From 1809f5d3a86a883e847f3df332123c299632e910 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 15:06:49 +0000 Subject: [PATCH 119/201] kid3: 3.8.1 -> 3.8.2 --- pkgs/applications/audio/kid3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 5571b12f3ef..dcd305abdee 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "1d2lr500dx7gnxw2vrvpbhadpn313ly3zyp178864z26dnfkjv8x"; + sha256 = "051y77swpi9isx275gwzl4fn3igd2dmixbszv9m3h0h9lqhcjrvr"; }; nativeBuildInputs = [ wrapQtAppsHook ]; From 802e1917b8e5e12a854a3013c149d77816a49a30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 11:56:57 +0000 Subject: [PATCH 120/201] kcli: 1.8.2 -> 1.8.3 --- pkgs/development/tools/kcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index a3944ff4126..bbcb10a354c 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kcli"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "cswank"; repo = "kcli"; rev = version; - sha256 = "1m9967f9wk1113ap2qmqinqg7gvpmg5y2g1ji0q818qbandzlh23"; + sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; From 41356b253bbb9d4a34618f803039093e8955a801 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 20:19:49 +0000 Subject: [PATCH 121/201] tribler: 7.4.0-exp1 -> 7.4.1 --- pkgs/applications/networking/p2p/tribler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 683507f8b19..8bd53662408 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "tribler"; - version = "7.4.0-exp1"; + version = "7.4.1"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "18ziisg0v2gdxnprbhqsryz92yk270waj0la7m2h326k5qql3qkf"; + sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs"; }; nativeBuildInputs = [ From bf49dc75c7226e17327c42741f1268dc6e07f71f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Feb 2020 15:46:52 +0000 Subject: [PATCH 122/201] syncthingtray: 0.10.5 -> 0.10.6 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 907a2e046df..610409af7a7 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.5"; + version = "0.10.6"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "177ywk1dfdfwz7kvlxx3an1q4vv2c27d7qivy0463a3hvkacybxn"; + sha256 = "1lh1qsdy5081jrs27ba0mfh90ya1fj9h6j5k0cdsfap9mcxyjd9g"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] From f8e7fec814eab4609559daa4e5ba7025575768e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 02:57:08 +0000 Subject: [PATCH 123/201] babeltrace: 1.5.7 -> 1.5.8 --- pkgs/development/tools/misc/babeltrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 19ed711f1f4..d9350d5f020 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.7"; + name = "babeltrace-1.5.8"; src = fetchurl { url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "0yw05cnk5w8b5nbznycglyn4h3hq56a1n8rlb9k9rlzz4ph32lr1"; + sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; nativeBuildInputs = [ pkgconfig ]; From d4541f4699922184960b3c63b96163f7a320062c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 06:35:27 +0000 Subject: [PATCH 124/201] libgpiod: 1.4.1 -> 1.4.2 --- pkgs/development/libraries/libgpiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 782c0a8857a..772027de0fb 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "0x8ar31b0cp47dgmamxf6a54ixwrjgvs81zra8l9ws4szrzgrnbw"; + sha256 = "0r0hdindy6pi1va3mhk2lg5dis0qbi535k790w76dxfx1hyavk70"; }; buildInputs = [ kmod ]; From 29b85537c3c320c361ce93b6bea6ea6c2e7f875f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Dec 2019 12:27:12 -0800 Subject: [PATCH 125/201] libtirpc: 1.1.4 -> 1.2.5 --- pkgs/development/libraries/ti-rpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index d67d7618574..43f1e8b83fe 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.1.4"; + name = "libtirpc-1.2.5"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c"; + sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; }; outputs = [ "out" "dev" ]; From 9006edb2a90d06de5e6b1deebbf60b37fced4c6c Mon Sep 17 00:00:00 2001 From: Florian Date: Wed, 15 Jan 2020 14:08:32 +0100 Subject: [PATCH 126/201] pynamecheap: init at 0.0.3 --- .../python-modules/pynamecheap/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pynamecheap/default.nix diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix new file mode 100644 index 00000000000..571206a7167 --- /dev/null +++ b/pkgs/development/python-modules/pynamecheap/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "PyNamecheap"; + version = "0.0.3"; + + propagatedBuildInputs = [ requests ]; + + # Tests require access to api.sandbox.namecheap.com + doCheck = false; + + src = fetchFromGitHub { + owner = "Bemmu"; + repo = pname; + rev = "v${version}"; + sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97"; + }; + + meta = with lib; { + description = "Namecheap API client in Python."; + homepage = https://github.com/Bemmu/PyNamecheap; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b7bd12b547..e4b32641ce2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1000,6 +1000,8 @@ in { pymupdf = callPackage ../development/python-modules/pymupdf { }; + pynamecheap = callPackage ../development/python-modules/pynamecheap { }; + Pmw = callPackage ../development/python-modules/Pmw { }; py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; From 2228e3ad12ef2ba25d028a8cdf5fc10caa8b27c0 Mon Sep 17 00:00:00 2001 From: Florian Date: Wed, 15 Jan 2020 14:28:36 +0100 Subject: [PATCH 127/201] softlayer-python: init at 5.8.4 --- .../python-modules/softlayer/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/softlayer/default.nix diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix new file mode 100644 index 00000000000..6548c3637a8 --- /dev/null +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ptable +, click +, requests +, prompt_toolkit +, pygments +, urllib3 +, pytest +, pytestcov +, mock +, sphinx +, testtools +}: + +buildPythonPackage rec { + pname = "softlayer-python"; + version = "5.8.4"; + + propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; + + checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + + checkPhase = '' + pytest + ''; + + src = fetchFromGitHub { + owner = "softlayer"; + repo = pname; + rev = "v${version}"; + sha256 = "10kzi7kvvifr21a46q2xqsibs0bx5ys22nfym0bg605ka37vcz88"; + }; + + meta = with lib; { + description = "A set of Python libraries that assist in calling the SoftLayer API."; + homepage = https://github.com/softlayer/softlayer-python; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4b32641ce2..fbd7ed48074 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1402,6 +1402,8 @@ in { usePython = true; }); + softlayer = callPackage ../development/python-modules/softlayer { }; + sparse = callPackage ../development/python-modules/sparse { }; spglib = callPackage ../development/python-modules/spglib { }; From 1c94a83a5f308b1d096d069a64fb512bea78f0e3 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 25 Jan 2020 13:05:42 +0100 Subject: [PATCH 128/201] localzone: init at 0.9.5 --- .../python-modules/localzone/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/localzone/default.nix diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix new file mode 100644 index 00000000000..9c968fa3722 --- /dev/null +++ b/pkgs/development/python-modules/localzone/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, dnspython +, sphinx +, pytest +}: + +buildPythonPackage rec { + pname = "localzone"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "ags-slc"; + repo = pname; + rev = "v${version}"; + sha256 = "1zziqyhbg8vg901b4hjzzab0paag5cng48vk9xf1hchxk5naf58n"; + }; + + propagatedBuildInputs = [ dnspython sphinx ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "A simple DNS library for managing zone files"; + homepage = https://localzone.iomaestro.com; + license = licenses.bsd3; + maintainers = with maintainers; [ flyfloh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbd7ed48074..5fb7c86ebab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6902,6 +6902,8 @@ in { inherit python; })).python; + localzone = callPackage ../development/python-modules/localzone { }; + scour = callPackage ../development/python-modules/scour { }; pymssql = callPackage ../development/python-modules/pymssql { }; From a61470621978ebb7b33876cfd745937200c5a83e Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 25 Jan 2020 12:44:53 +0100 Subject: [PATCH 129/201] transip: init at 2.0.0 --- .../python-modules/transip/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/transip/default.nix diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix new file mode 100644 index 00000000000..977ff17ecec --- /dev/null +++ b/pkgs/development/python-modules/transip/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, requests +, cryptography +, suds-jurko +, pytest +}: + +buildPythonPackage rec { + pname = "transip-api"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "benkonrath"; + repo = pname; + rev = "v${version}"; + sha256 = "153x8ph7cp432flaqiy2zgp060ddychcqcrssxkcmjvbm86xrz17"; + }; + + checkInputs = [ pytest ]; + + # Constructor Tests require network access + checkPhase = '' + pytest --deselect=tests/service_tests/test_domain.py::TestDomainService::test_constructor \ + --deselect tests/service_tests/test_vps.py::TestVPSService::testConstructor \ + --deselect tests/service_tests/test_webhosting.py::TestWebhostingService::testConstructor + ''; + + + propagatedBuildInputs = [ requests cryptography suds-jurko ]; + + meta = with stdenv.lib; { + description = "TransIP API Connector"; + homepage = https://github.com/benkonrath/transip-api; + license = licenses.mit; + maintainers = with maintainers; [ flyfloh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fb7c86ebab..814621833e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6802,6 +6802,8 @@ in { tldextract = callPackage ../development/python-modules/tldextract { }; + transip = callPackage ../development/python-modules/transip { }; + pyemd = callPackage ../development/python-modules/pyemd { }; pulp = callPackage ../development/python-modules/pulp { }; From 50ad81d76bbc1c3de758a3e1074ff35c941062c3 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 25 Jan 2020 13:45:27 +0100 Subject: [PATCH 130/201] lexicon: init at 3.3.17 --- pkgs/tools/admin/lexicon/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/admin/lexicon/default.nix diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix new file mode 100644 index 00000000000..4f6db4169a1 --- /dev/null +++ b/pkgs/tools/admin/lexicon/default.nix @@ -0,0 +1,31 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "lexicon"; + version = "3.3.17"; + + propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; + + checkInputs = with python3Packages; [ pytest pytestcov pytest_xdist vcrpy mock ]; + + checkPhase = '' + pytest --ignore=lexicon/tests/providers/test_auto.py + ''; + + src = fetchFromGitHub { + owner = "AnalogJ"; + repo = pname; + rev = "v${version}"; + sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89"; + }; + + meta = with lib; { + description = "Manipulate DNS records on various DNS providers in a standardized way."; + homepage = https://github.com/AnalogJ/lexicon; + maintainers = with maintainers; [ flyfloh ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0d516acf1..144999e31d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1907,6 +1907,8 @@ in lepton = callPackage ../tools/graphics/lepton { }; + lexicon = callPackage ../tools/admin/lexicon { }; + lief = callPackage ../development/libraries/lief {}; libndtypes = callPackage ../development/libraries/libndtypes { }; From d8e697b4fcfd929d05221ac3e67b9c04ac69df86 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 9 Feb 2020 15:59:03 +0000 Subject: [PATCH 131/201] nixos/acme: update release notes for 20.03 --- nixos/doc/manual/release-notes/rl-2003.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 51f91268eff..37ac4ec0288 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -441,6 +441,22 @@ users.users.me = now uses the short rather than full version string. + + + The ACME module has switched from simp-le to lego + which allows us to support DNS-01 challenges and wildcard certificates. The following options have been added: + security.acme.acceptTerms, + security.acme.certs.<name>.dnsProvider, + security.acme.certs.<name>.credentialsFile, + security.acme.certs.<name>.dnsPropagationCheck. + As well as this, the options security.acme.acceptTerms and either + security.acme.email or security.acme.certs.<name>.email + must be set in order to use the ACME module. + Certificates will be regenerated from new on the next renewal date. The credentials for simp-le are + preserved and thus it is possible to roll back to previous versions without breaking certificate + generation. + +
From 8deaccc9096979ca6a39f4b42e9879d2e0322565 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 15:39:07 +0000 Subject: [PATCH 132/201] python37Packages.pylint-django: 2.0.12 -> 2.0.13 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 04010098807..ef47699053c 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.12"; + version = "2.0.13"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0ha06wpqqn5fp5dapgjhsdx3ahh3y62l7k2f3czlrdjmmivgdp9y"; + sha256 = "16xfn8zs5khdfh5pdsv3wjjhywzc1qhx7mxi5kpbcvmd6an9qi7s"; }; propagatedBuildInputs = [ From a8f3903ba5ac2899d059b7586f1f047df23b25b5 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Wed, 22 Jan 2020 09:47:54 -0500 Subject: [PATCH 133/201] pythonPackages.nbconflux: init at 0.7.0 --- .../python-modules/nbconflux/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/nbconflux/default.nix diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix new file mode 100644 index 00000000000..2ca203e65ac --- /dev/null +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }: + +buildPythonPackage rec { + pname = "nbconflux"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Valassis-Digital-Media"; + repo = "nbconflux"; + rev = version; + sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; + }; + + propagatedBuildInputs = [ nbconvert requests ]; + + checkInputs = [ pytest responses ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; + homepage = "https://github.com/Valassis-Digital-Media/nbconflux"; + license = licenses.bsd3; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 814621833e9..e55fa7dae43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4343,6 +4343,8 @@ in { names = callPackage ../development/python-modules/names { }; + nbconflux = callPackage ../development/python-modules/nbconflux { }; + nbconvert = callPackage ../development/python-modules/nbconvert { }; nbformat = if isPy3k then From 02dedfee1e1e5ca346cb8eecdf002d6eb6d70ba3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 15:17:56 +0000 Subject: [PATCH 134/201] python27Packages.pytelegrambotapi: 3.6.6 -> 3.6.7 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index cb91196fc7e..e07db8ec726 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.6.6"; + version = "3.6.7"; src = fetchPypi { inherit pname version; - sha256 = "00vycd7jvfnzmvmmhkjx9vf40vkcrwv7adas5i81r2jhjy7sks54"; + sha256 = "0spn3gjbppyl4b7kqnc8g30qss72dcb1d6ap2bizyam5wn591z8f"; }; propagatedBuildInputs = [ requests ]; From 500a8ffd96962c672a08ba39e6a783234d907591 Mon Sep 17 00:00:00 2001 From: "Farkas, Arnold" Date: Wed, 22 Jan 2020 09:14:53 -0500 Subject: [PATCH 135/201] pythonPackages.flower: init at 0.9.3 --- .../python-modules/flower/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/flower/default.nix diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix new file mode 100644 index 00000000000..74273e62945 --- /dev/null +++ b/pkgs/development/python-modules/flower/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, Babel, celery, importlib-metadata, pytz, tornado, mock }: + +buildPythonPackage rec { + pname = "flower"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "7f45acb297ab7cf3dd40140816143a2588f6938dbd70b8c46b59c7d8d1e93d55"; + }; + + propagatedBuildInputs = [ Babel celery importlib-metadata pytz tornado ]; + + checkInputs = [ mock ]; + + meta = with lib; { + description = "Celery Flower"; + homepage = "https://github.com/mher/flower"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e55fa7dae43..23780d8a612 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -678,6 +678,8 @@ in { firetv = callPackage ../development/python-modules/firetv { }; + flower = callPackage ../development/python-modules/flower { }; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; From db894cb8ce2be173250c6e423cbc2622881e4496 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 5 Feb 2020 15:29:22 +0100 Subject: [PATCH 136/201] nixos/lib/make-ext4-fs: fall back to resize2fs -M if exact resize fails See also - https://bugs.launchpad.net/ubuntu/+source/e2fsprogs/+bug/1415077/comments/4 - https://github.com/NixOS/nixpkgs/pull/62262 --- nixos/lib/make-ext4-fs.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index f46d3990c06..627ac324cf5 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -64,7 +64,7 @@ pkgs.stdenv.mkDerivation { echo "copying files to image..." cptofs -t ext4 -i $img ./files/* / - + export EXT2FS_NO_MTAB_OK=yes # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. if ! fsck.ext4 -n -f $img; then echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" @@ -72,21 +72,8 @@ pkgs.stdenv.mkDerivation { return 1 fi - ( - # Resizes **snugly** to its actual limits (or closer to) - free=$(dumpe2fs $img | grep '^Free blocks:') - blocksize=$(dumpe2fs $img | grep '^Block size:') - blocks=$(dumpe2fs $img | grep '^Block count:') - blocks=$((''${blocks##*:})) # format the number. - blocksize=$((''${blocksize##*:})) # format the number. - # System can't boot with 0 blocks free. - # Add 16MiB of free space - fudge=$(( 16 * 1024 * 1024 / blocksize )) - size=$(( blocks - ''${free##*:} + fudge )) - - echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)" - EXT2FS_NO_MTAB_OK=yes resize2fs $img -f $size - ) + echo "Resizing to minimum allowed size" + resize2fs -M $img # And a final fsck, because of the previous truncating. fsck.ext4 -n -f $img From 2414e8d51d725babb76b1b6303d7770f7a059c61 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 22 Jan 2020 22:06:40 +0300 Subject: [PATCH 137/201] openmw-tes3mp: fix build --- pkgs/games/openmw/default.nix | 4 ++-- pkgs/games/openmw/tes3mp.nix | 2 +- pkgs/top-level/all-packages.nix | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index d9c992199c4..a7e386398d2 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let @@ -10,7 +10,7 @@ let sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); -in mkDerivation rec { +in mkDerivationWith stdenv.mkDerivation rec { version = "0.45.0"; pname = "openmw"; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 4bbddfbb1df..9570acfdbaa 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -71,7 +71,7 @@ in openmw.overrideAttrs (oldAttrs: rec { description = "Multiplayer for TES3:Morrowind based on OpenMW"; homepage = https://tes3mp.com/; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ gnidorah ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144999e31d5..d462acbdfed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23205,7 +23205,13 @@ in openmw = libsForQt5.callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { + openmw = openmw.override { + stdenv = gcc8Stdenv; + openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; }; + mygui = mygui.override { stdenv = gcc8Stdenv; }; + }; + }; openraPackages = import ../games/openra pkgs; From d084221b36dd1c19fa19ff79717f8bd8de36591b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 9 Feb 2020 17:32:41 +0100 Subject: [PATCH 138/201] jwt-cli: 2.5.1 -> 2.5.2 --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 83b630a4f4f..4b9fefd18c3 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "1p0c4398kwczwvl4krvfdhg1ixp1gj9nmvzqqv2xlmvrw1qsin8w"; + sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl"; }; - cargoSha256 = "005y92acsn5j490jkp23ny7bsjd9ql1glybmbh4cyc8b15hmy618"; + cargoSha256 = "0k3fla0zz2r66y5fvmbcdhjd2jq8md2sxgcjb3x8sipzqfv8bwi2"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From fd791086e731996a0048142fc762b10a00794895 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 11:48:13 +0000 Subject: [PATCH 139/201] python27Packages.kconfiglib: 13.7.0 -> 14.1.0 --- pkgs/development/python-modules/kconfiglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index b4d647c6075..8685fb8a3fa 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "13.7.0"; + version = "14.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0dkfprrsds64d2jbqnwdzb4why84jaj968s3ccmyqg5385nr9fwd"; + sha256 = "0g690bk789hsry34y4ahvly5c8w8imca90ss4njfqf7m2qicrlmy"; }; # doesnt work out of the box but might be possible From 828e383f8401790ff5eb8f8e29aab2530bcb85b8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 9 Feb 2020 19:10:56 +0100 Subject: [PATCH 140/201] gitRepo: 1.13.9.3 -> 1.13.9.4 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index fe591c1b2f2..642afa350c6 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.9.3"; + version = "1.13.9.4"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0xrgq6v1bh9zgrgg2r9z4zndzch08p0z5y3sppffyrb19mib055k"; + sha256 = "0kkb3s472zvmz5xign25rgv7amdzhjb1wvchqxaf80g4913rw583"; }; patches = [ ./import-ssl-module.patch ]; From db8434a6945561fc94284f1e8fc5c2baac298f9b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 9 Feb 2020 17:43:32 +0000 Subject: [PATCH 141/201] libexif: add patch for CVE-2019-9278 no upstream release with this yet --- pkgs/development/libraries/libexif/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 833ccf5dca5..cd35dc4c1db 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx"; excludes = [ "NEWS" ]; }) + (fetchpatch { + name = "CVE-2019-9278.patch"; + url = "https://github.com/libexif/libexif/commit/75aa73267fdb1e0ebfbc00369e7312bac43d0566.patch"; + sha256 = "10ikg33mips5zq9as7l9xqnyzbg1wwr4sw17517nzf4hafjpasrj"; + }) ]; buildInputs = [ gettext ]; From d969e702309fabc5630108a7548876358af79b2c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 9 Feb 2020 19:21:16 +0100 Subject: [PATCH 142/201] octaveHg: drop This package is broken and unmaintained (no updates since 2017) and lags behind octave. --- pkgs/development/interpreters/octave/hg.nix | 75 --------------------- pkgs/top-level/all-packages.nix | 35 ++++------ pkgs/top-level/pure-packages.nix | 4 +- 3 files changed, 14 insertions(+), 100 deletions(-) delete mode 100644 pkgs/development/interpreters/octave/hg.nix diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix deleted file mode 100644 index a34834af48c..00000000000 --- a/pkgs/development/interpreters/octave/hg.nix +++ /dev/null @@ -1,75 +0,0 @@ -args@{ stdenv, openblas, ghostscript ? null, texinfo - - , # These are arguments that shouldn't be passed to the - # octave package. - texlive, tex ? texlive.combined.scheme-small - , epstool, pstoedit, transfig - , lib, fetchhg, callPackage - , autoconf, automake, libtool - , bison, librsvg, icoutils, gperf - - , # These are options that can be passed in addition to the ones - # octave usually takes. - # - rev is the HG revision. Use "tip" for the bleeding edge. - # - docs can be set to false to skip building documentation. - rev ? "23269", docs ? true - - , # All remaining arguments will be passed to the octave package. - ... - }: - -with stdenv.lib; -let - octaveArgs = removeAttrs args - [ "texlive" "tex" - "epstool" "pstoedit" "transfig" - "lib" "fetchhg" "callPackage" - "autoconf" "automake" "libtool" - "bison" "librsvg" "icoutils" "gperf" - "rev" "docs" - ]; - octave = callPackage ./default.nix octaveArgs; - - # List of hashes for known HG revisions. - sha256s = { - "23269" = "87f560e873ad1454fdbcdd8aca65f9f0b1e605bdc00aebbdc4f9d862ca72ff1d"; - }; - -in lib.overrideDerivation octave (attrs: rec { - version = "4.3.0pre${rev}"; - name = "octave-${version}"; - - src = fetchhg { - url = http://www.octave.org/hg/octave; - inherit rev; - - sha256 = - if builtins.hasAttr rev sha256s - then builtins.getAttr rev sha256s - else null; - - fetchSubrepos = true; - }; - - # Octave's test for including this flag seems to be broken in 4.3. - F77_INTEGER_8_FLAG = optional openblas.blas64 "-fdefault-integer-8"; - - # This enables texinfo to find the files it needs. - TEXINPUTS = ".:build-aux:${texinfo}/texmf-dist/tex/generic/epsf:"; - - disableDocs = !docs || ghostscript == null; - - nativeBuildInputs = attrs.nativeBuildInputs - ++ [ autoconf automake libtool bison librsvg icoutils gperf ] - ++ optionals (!disableDocs) [ tex epstool pstoedit transfig ]; - - # Run bootstrap before any other patches, as other patches may refer - # to files that are generated by the bootstrap. - prePatch = '' - patchShebangs bootstrap - ./bootstrap - '' + attrs.prePatch; - - configureFlags = attrs.configureFlags ++ - optional disableDocs "--disable-docs"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d462acbdfed..361b30a187f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9186,29 +9186,18 @@ in git = gitMinimal; }; - inherit ( - let - defaultOctaveOptions = { - qt = null; - qscintilla = null; - ghostscript = null; - graphicsmagick = null; - llvm = null; - hdf5 = null; - glpk = null; - suitesparse = null; - jdk = null; - openblas = if stdenv.isDarwin then openblasCompat else openblas; - }; - - hgOctaveOptions = - (removeAttrs defaultOctaveOptions ["ghostscript"]) // { - overridePlatforms = stdenv.lib.platforms.none; - }; - in { - octave = callPackage ../development/interpreters/octave defaultOctaveOptions; - octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions); - }) octave octaveHg; + octave = callPackage ../development/interpreters/octave { + qt = null; + qscintilla = null; + ghostscript = null; + graphicsmagick = null; + llvm = null; + hdf5 = null; + glpk = null; + suitesparse = null; + jdk = null; + openblas = if stdenv.isDarwin then openblasCompat else openblas; + }; octaveFull = (lowPrio (octave.override { qt = qt4; diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix index a1600888032..005e09cc003 100644 --- a/pkgs/top-level/pure-packages.nix +++ b/pkgs/top-level/pure-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, octaveHg }: +{ callPackage }: rec { audio = callPackage ../development/pure-modules/audio { }; @@ -19,7 +19,7 @@ rec { lv2 = callPackage ../development/pure-modules/lv2 { }; midi = callPackage ../development/pure-modules/midi { }; mpfr = callPackage ../development/pure-modules/mpfr { }; - octave = callPackage ../development/pure-modules/octave { octave = octaveHg; }; + octave = callPackage ../development/pure-modules/octave { }; odbc = callPackage ../development/pure-modules/odbc { }; pandoc = callPackage ../development/pure-modules/pandoc { }; rational = callPackage ../development/pure-modules/rational { }; From b6841b1fb4f610827693bef22761a054c901ed98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 17:56:33 +0000 Subject: [PATCH 143/201] python27Packages.simplekml: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/simplekml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index d97c1b0c963..be149e7edea 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "30c121368ce1d73405721730bf766721e580cae6fbb7424884c734c89ec62ad7"; + sha256 = "08l24gfql83yjcdqb51nnnvckbnfb7bl89am4q9zr0fslrbcn3vf"; }; - doCheck = false; # no tests are defined in 1.3.1 + doCheck = false; # no tests are defined in 1.3.3 meta = with lib; { description = "Generate KML with as little effort as possible"; From 788d8769f78d74b9491526c9d34849e525942c42 Mon Sep 17 00:00:00 2001 From: jrp2014 Date: Sat, 3 Aug 2019 12:34:30 +0100 Subject: [PATCH 144/201] nixos/virtualisation.hypervGuest: use elevator=noop Microsoft recommends the NOOP I/O scheduler for disk performance in HYPER-V: https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/best-practices-for-running-linux-on-hyper-v > NOOP is a first-in first-out queue that passes the schedule decision > to be made by the hypervisor. It is recommended to use NOOP as the > scheduler when running Linux virtual machine on Hyper-V. --- nixos/modules/virtualisation/hyperv-guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix index 0f1f052880c..adc2810a993 100644 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -32,7 +32,7 @@ in { ]; kernelParams = [ - "video=hyperv_fb:${cfg.videoMode}" + "video=hyperv_fb:${cfg.videoMode} elevator=noop" ]; }; From 68c783cde5a35ff5df5c10da923af72b0de28d38 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 9 Feb 2020 20:07:09 +0100 Subject: [PATCH 145/201] libphonenumber: 8.10.20 -> 8.11.3 --- pkgs/development/libraries/libphonenumber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index c864ccc70ac..918c663dfb4 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "phonenumber"; - version = "8.10.20"; + version = "8.11.3"; src = fetchFromGitHub { owner = "googlei18n"; repo = "libphonenumber"; rev = "v${version}"; - sha256 = "12xszrd4mrjabhzsp0xvy2qx2rxl36y5a00xfsh0w7bc299rq13v"; + sha256 = "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9"; }; nativeBuildInputs = [ From 513482763b05ef9cc56409885957cf57f31012ab Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Feb 2020 20:29:21 +0100 Subject: [PATCH 146/201] wdisplays: 2019-10-26 -> 2020-01-12 --- pkgs/tools/graphics/wdisplays/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 9b003868bd0..baa05be821b 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: stdenv.mkDerivation { - pname = "wdisplays"; - version = "2019-10-26-unstable"; + pname = "wdisplays-unstable"; + version = "2020-01-12"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,14 +10,14 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "22669edadb8ff3478bdb51ddc140ef6e61e3d9ef"; - sha256 = "127k5i98km6mh8yw4vf8n44b29kc3n0169xpkdh7yr0rhv6n9cdl"; + rev = "ba331cab535318888a562f5a2731d2523b310dac"; + sha256 = "0fk3l78hirxdi74iqmq6mxi9daqnxdkbb5a2wfshmr11ic9xixpm"; }; meta = let inherit (stdenv) lib; in { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; - maintainers = [ lib.maintainers.lheckemann ]; + maintainers = with lib.maintainers; [ lheckemann ma27 ]; license = lib.licenses.mit; platforms = lib.platforms.linux; }; From 1d4fd7f5f28f4edb930555b642b378f2ef77c680 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Feb 2020 20:39:41 +0000 Subject: [PATCH 147/201] verifast: 18.02 -> 19.12 --- pkgs/applications/science/logic/verifast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 3e3e2670861..c5e8078eff2 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "verifast"; - version = "18.02"; + version = "19.12"; src = fetchurl { url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; + sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6"; }; dontStrip = true; From 43be20ccd5b08342cdf63db9e5064d263465f27f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 16:31:00 +0000 Subject: [PATCH 148/201] python27Packages.spotipy: 2.6.1 -> 2.7.1 --- pkgs/development/python-modules/spotipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e728739c294..aebe38fc69a 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.6.1"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1jpj9ljc5g89jbnzwnmgz5s6jdrsgd6g9s09igvbw3pppi9070h0"; + sha256 = "1i4gpmvjk608fxz1kwfb3dnmm4dydr0bir0zw9k2nng7n8b6knvr"; }; propagatedBuildInputs = [ requests ]; From 0ea17a0e8831fa6bc0c61412b7bf9a969c8b2f80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 17:08:14 +0000 Subject: [PATCH 149/201] python27Packages.augeas: 1.0.3 -> 1.1.0 --- pkgs/development/python-modules/augeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 12a3529f864..45a05ac85e7 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: buildPythonPackage rec { pname = "augeas"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; rev = "v${version}"; - sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6"; + sha256 = "12q52ilcx059rn544x3712xq6myn99niz131l0fs3xx67456pajh"; }; # TODO: not very nice! From aea58b37e953556c02cb910d3a1105f722b9bd56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 19:48:37 +0000 Subject: [PATCH 150/201] python27Packages.uproot-methods: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/uproot-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 7bb8d4a16ea..7e799439274 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "4382983e4e6c5e1aeb3013d04334907f87f62b0d7c19a29968e5a0aac1653ae1"; + sha256 = "01x7raa2l75g96y6fsi6h2fjpjm0swlnw0j9vn8mlahridycrjss"; }; propagatedBuildInputs = [ numpy awkward ]; From 13f7b7555322f5727d4b5279102222fdbee62587 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 Feb 2020 23:30:40 +0100 Subject: [PATCH 151/201] nixos/grocy: init module Co-authored-by: elseym --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/grocy.nix | 172 ++++++++++++++++++++++ nixos/modules/services/web-apps/grocy.xml | 77 ++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/grocy.nix | 47 ++++++ 5 files changed, 298 insertions(+) create mode 100644 nixos/modules/services/web-apps/grocy.nix create mode 100644 nixos/modules/services/web-apps/grocy.xml create mode 100644 nixos/tests/grocy.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 878b77969af..402f222f4e9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -814,6 +814,7 @@ ./services/web-apps/dokuwiki.nix ./services/web-apps/frab.nix ./services/web-apps/gotify-server.nix + ./services/web-apps/grocy.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ihatemoney diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix new file mode 100644 index 00000000000..568bdfd0c42 --- /dev/null +++ b/nixos/modules/services/web-apps/grocy.nix @@ -0,0 +1,172 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.grocy; +in { + options.services.grocy = { + enable = mkEnableOption "grocy"; + + hostName = mkOption { + type = types.str; + description = '' + FQDN for the grocy instance. + ''; + }; + + nginx.enableSSL = mkOption { + type = types.bool; + default = true; + description = '' + Whether or not to enable SSL (with ACME and let's encrypt) + for the grocy vhost. + ''; + }; + + phpfpm.settings = mkOption { + type = with types; attrsOf (oneOf [ int str bool ]); + default = { + "pm" = "dynamic"; + "php_admin_value[error_log]" = "stderr"; + "php_admin_flag[log_errors]" = true; + "listen.owner" = "nginx"; + "catch_workers_output" = true; + "pm.max_children" = "32"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "2"; + "pm.max_spare_servers" = "4"; + "pm.max_requests" = "500"; + }; + + description = '' + Options for grocy's PHPFPM pool. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/grocy"; + description = '' + Home directory of the grocy user which contains + the application's state. + ''; + }; + + settings = { + currency = mkOption { + type = types.str; + default = "USD"; + example = "EUR"; + description = '' + ISO 4217 code for the currency to display. + ''; + }; + + culture = mkOption { + type = types.enum [ "de" "en" "da" "en_GB" "es" "fr" "hu" "it" "nl" "no" "pl" "pt_BR" "ru" "sk_SK" "sv_SE" "tr" ]; + default = "en"; + description = '' + Display language of the frontend. + ''; + }; + + calendar = { + showWeekNumber = mkOption { + default = true; + type = types.bool; + description = '' + Show the number of the weeks in the calendar views. + ''; + }; + firstDayOfWeek = mkOption { + default = null; + type = types.nullOr (types.enum (range 0 6)); + description = '' + Which day of the week (0=Sunday, 1=Monday etc.) should be the + first day. + ''; + }; + }; + }; + }; + + config = mkIf cfg.enable { + environment.etc."grocy/config.php".text = '' + + + Grocy + + Grocy is a web-based self-hosted groceries + & household management solution for your home. + + +
+ Basic usage + + A very basic configuration may look like this: +{ pkgs, ... }: +{ + services.grocy = { + enable = true; + hostName = "grocy.tld"; + }; +} + This configures a simple vhost using nginx + which listens to grocy.tld with fully configured ACME/LE (this can be + disabled by setting services.grocy.nginx.enableSSL + to false). After the initial setup the credentials admin:admin + can be used to login. + + + The application's state is persisted at /var/lib/grocy/grocy.db in a + sqlite3 database. The migration is applied when requesting the /-route + of the application. + +
+ +
+ Settings + + The configuration for grocy is located at /etc/grocy/config.php. + By default, the following settings can be defined in the NixOS-configuration: +{ pkgs, ... }: +{ + services.grocy.settings = { + # The default currency in the system for invoices etc. + # Please note that exchange rates aren't taken into account, this + # is just the setting for what's shown in the frontend. + currency = "EUR"; + + # The display language (and locale configuration) for grocy. + culture = "de"; + + calendar = { + # Whether or not to show the week-numbers + # in the calendar. + showWeekNumber = true; + + # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday, + # 2=Tuesday and so on). + firstDayOfWeek = 2; + }; + }; +} + + + If you want to alter the configuration file on your own, you can do this manually with + an expression like this: +{ lib, ... }: +{ + environment.etc."grocy/config.php".text = lib.mkAfter '' + // Arbitrary PHP code in grocy's configuration file + ''; +} + +
+ + diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e1c299b8413..8e938e57e67 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -96,6 +96,7 @@ in freeswitch = handleTest ./freeswitch.nix {}; fsck = handleTest ./fsck.nix {}; gotify-server = handleTest ./gotify-server.nix {}; + grocy = handleTest ./grocy.nix {}; gitea = handleTest ./gitea.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix new file mode 100644 index 00000000000..7fa479ed2c4 --- /dev/null +++ b/nixos/tests/grocy.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "grocy"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { pkgs, ... }: { + services.grocy = { + enable = true; + hostName = "localhost"; + nginx.enableSSL = false; + }; + environment.systemPackages = [ pkgs.jq ]; + }; + + testScript = '' + machine.start() + machine.wait_for_open_port(80) + machine.wait_for_unit("multi-user.target") + + machine.succeed("curl -sSf http://localhost") + + machine.succeed( + "curl -c cookies -sSf -X POST http://localhost/login -d 'username=admin&password=admin'" + ) + + cookie = machine.succeed( + "grep -v '^#' cookies | awk '{ print $7 }' | sed -e '/^$/d' | perl -pe 'chomp'" + ) + + machine.succeed( + f"curl -sSf -X POST http://localhost/api/objects/tasks -b 'grocy_session={cookie}' " + + '-d \'{"assigned_to_user_id":1,"name":"Test Task","due_date":"1970-01-01"}\''' + + " --header 'Content-Type: application/json'" + ) + + task_name = machine.succeed( + f"curl -sSf http://localhost/api/tasks -b 'grocy_session={cookie}' --header 'Accept: application/json' | jq '.[].name' | xargs echo | perl -pe 'chomp'" + ) + + assert task_name == "Test Task" + + machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") + + machine.shutdown() + ''; +}) From 6baea7fc49fff426711e3cca26033e23bfc84a88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 14:59:54 +0000 Subject: [PATCH 152/201] python37Packages.pydantic: 1.3 -> 1.4 --- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 088c6636fdc..4e0623e5cc1 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.3"; + version = "1.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "0s85nzlsyj97j54zsgv569hkzv617z0vqsifsxkkyiimgbvnx7g8"; + sha256 = "1zmnwyvvrj6nb2r1wh63yb6dzqaxw8m4njzqycjdq9911c5gwg6z"; }; propagatedBuildInputs = [ From f28e474d5c2aaf13da276d9bfbaaefd4346f012d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 16:59:21 +0000 Subject: [PATCH 153/201] python27Packages.persim: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/persim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index d5e656c7b8f..471552cdcc9 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "932bb0489d4dc158e4f007ec609c61e4700003d882d8e7bdac218b70d14ce9cf"; + sha256 = "0vz6s49ar7mhg4pj4jcbwb79s8acqj6jc70va5w79pjxb5pw8k2n"; }; propagatedBuildInputs = [ From 3e21d7cd49a842fbbed622dc56ff4bb10705897f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 14:23:07 +0000 Subject: [PATCH 154/201] python37Packages.pikepdf: 1.8.2 -> 1.10.0 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index ec99edcc0c1..64629314bfe 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.8.2"; + version = "1.10.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1n3fd7i1br1s4f90yismgfcq9ix5kcqfacr7yy0hhhrabkf2sm37"; + sha256 = "1qa4sam1kvglwqwk573mjpsy8cy89yamr4val0g80hq1ribc56ah"; }; buildInputs = [ From 0e4edcffafb329b71f3f6c55fbd9226fbefa0c88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 14:56:30 +0000 Subject: [PATCH 155/201] python27Packages.rq: 1.1.0 -> 1.2.2 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 8c91579d241..0fe7a942245 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rq"; - version = "1.1.0"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1fs03g1n1l8k03zwhkhckhsrnnsm3645sqby2nwh5gfij2kcc9sg"; + sha256 = "0dk664lzjhj0rk4ffpv29mbcr7vh41ph1sx7ngszk3744gh1nshp"; }; # test require a running redis rerver, which is something we can't do yet From bf49181373643d3e2df1a06cb6e1efde1a2dec3e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 9 Feb 2020 16:00:47 -0500 Subject: [PATCH 156/201] release-combined: readd keymap tests These are building just fine for a while now [0]. I restricted them from bulding on aarch64-linux because there's still issues there. [0]: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.keymap.dvorak.x86_64-linux/all --- nixos/release-combined.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index b46731863ca..64169981876 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -95,14 +95,12 @@ in rec { (all nixos.tests.env) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - # 2018-06-06: keymap tests temporarily removed from tested job - # since non-deterministic failure are blocking the channel (#41538) - #(all nixos.tests.keymap.azerty) - #(all nixos.tests.keymap.colemak) - #(all nixos.tests.keymap.dvorak) - #(all nixos.tests.keymap.dvp) - #(all nixos.tests.keymap.neo) - #(all nixos.tests.keymap.qwertz) + (except ["aarch64-linux"] nixos.tests.keymap.azerty) + (except ["aarch64-linux"] nixos.tests.keymap.colemak) + (except ["aarch64-linux"] nixos.tests.keymap.dvorak) + (except ["aarch64-linux"] nixos.tests.keymap.dvp) + (except ["aarch64-linux"] nixos.tests.keymap.neo) + (except ["aarch64-linux"] nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) (all nixos.tests.lightdm) (all nixos.tests.login) From 0cab0135280d2eda39cf1296e18bec72dc533b1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 18:29:57 +0000 Subject: [PATCH 157/201] python27Packages.nwdiag: 1.0.4 -> 2.0.0 --- pkgs/development/python-modules/nwdiag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 7e34f3897bc..a43a8eff368 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nwdiag"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz"; - sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa"; + sha256 = "1qkl1lq7cblr6fra2rjw3zlcccragp8384hpm4n7dkc5c3yzmmsw"; }; buildInputs = [ pep8 nose unittest2 docutils ]; From c10ecb9372de74094798d59e92844b2c0681d9a5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 9 Feb 2020 12:49:35 -0800 Subject: [PATCH 158/201] pythonPackages.nwdiag: add setuptools dependency --- pkgs/development/python-modules/nwdiag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index a43a8eff368..ff66cb9450b 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils -, blockdiag +, blockdiag, setuptools }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + propagatedBuildInputs = [ blockdiag setuptools ]; # tests fail doCheck = false; From da71501662cd2074ca8aa81a15a549c4e31df431 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 18:14:21 +0000 Subject: [PATCH 159/201] python27Packages.pycollada: 0.7 -> 0.7.1 --- pkgs/development/python-modules/pycollada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index fd3eb1b4c18..0803d658930 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycollada"; - version = "0.7"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0b2vz9fp9asw57m3p9zjlz9gddanrhpxbdfimg98ik654kp2vj7r"; + sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; propagatedBuildInputs = [ numpy dateutil ]; From c173d663fd7c12b9ca668da01a217f3cbaf6f4fe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 7 Feb 2020 00:03:09 +0100 Subject: [PATCH 160/201] firefoxPackages.*: use config.allowAliases --- pkgs/applications/networking/browsers/firefox/packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 833b97ba86f..1fdf5be9092 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: +{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: let @@ -196,7 +196,9 @@ in { meta.knownVulnerabilities = [ "Support ended in August 2018." ]; }; - +} // lib.optionalAttrs (config.allowAliases or true) { + # ALIASES + # remove after 20.03 branchoff tor-browser-7-5 = throw "firefoxPackages.tor-browser-7-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser-8-5 = throw "firefoxPackages.tor-browser-8-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser = throw "firefoxPackages.tor-browser was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; From 83fff69fca0d1f7775fbcd4f8ec8acceb1a5bebb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 17:30:54 +0100 Subject: [PATCH 161/201] firefoxPackages.firefox-esr-60: remove There's not really a reason to ship an unsupported ESR variant of firefox, and if one really needs it, it's also possible to just checkout an older version of nixpkgs. --- .../networking/browsers/firefox/packages.nix | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1fdf5be9092..dab66e065fc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -68,36 +68,6 @@ rec { gtk3Support = false; }; - firefox-esr-60 = common rec { - pname = "firefox-esr"; - ffversion = "60.9.0esr"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf"; - }; - - patches = [ - ./no-buildconfig-ffx65.patch - - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch - - missing-documentation-patch - ]; - - meta = firefox.meta // { - description = "A web browser built from Firefox Extended Support Release source tree"; - knownVulnerabilities = [ "Support ended around October 2019." ]; - }; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-60-unwrapped"; - versionSuffix = "esr"; - versionKey = "ffversion"; - }; - }; - firefox-esr-68 = common rec { pname = "firefox-esr"; ffversion = "68.4.2esr"; @@ -199,6 +169,9 @@ in { } // lib.optionalAttrs (config.allowAliases or true) { # ALIASES # remove after 20.03 branchoff + + firefox-esr-60 = throw "firefoxPackages.firefox-esr-60 was removed as it's an unsupported ESR with open security issues."; + tor-browser-7-5 = throw "firefoxPackages.tor-browser-7-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser-8-5 = throw "firefoxPackages.tor-browser-8-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser = throw "firefoxPackages.tor-browser was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; From 9704fbec86cea1673d48486f2d955ff543207810 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 17:37:56 +0100 Subject: [PATCH 162/201] firefoxPackages.icecat[-52]: remove package firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues. --- .../networking/browsers/firefox/packages.nix | 83 +------------------ 1 file changed, 4 insertions(+), 79 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dab66e065fc..c696166c95f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -89,91 +89,16 @@ rec { versionKey = "ffversion"; }; }; - -} // (let - - iccommon = args: common (args // { - pname = "icecat"; - isIceCatLike = true; - - meta = (args.meta or {}) // { - description = "The GNU version of the Firefox web browser"; - longDescription = '' - GNUzilla is the GNU version of the Mozilla suite, and GNU - IceCat is the GNU version of the Firefox web browser. - - Notable differences from mainline Firefox: - - - entirely free software, no non-free plugins, addons, - artwork, - - no telemetry, no "studies", - - sane privacy and security defaults (for instance, unlike - Firefox, IceCat does _zero_ network requests on startup by - default, which means that with IceCat you won't need to - unplug your Ethernet cable each time you want to create a - new browser profile without announcing that action to a - bunch of data-hungry corporations), - - all essential privacy and security settings can be - configured directly from the main screen, - - optional first party isolation (like TorBrowser), - - comes with HTTPS Everywhere (like TorBrowser), Tor Browser - Button (like TorBrowser Bundle), LibreJS, and SpyBlock - plugins out of the box. - - This package can be installed together with Firefox and - TorBrowser, it will use distinct binary names and profile - directories. - ''; - homepage = "https://www.gnu.org/software/gnuzilla/"; - platforms = lib.platforms.unix; - license = with lib.licenses; [ mpl20 gpl3Plus ]; - }; - }); - -in { - - icecat = iccommon rec { - ffversion = "60.3.0"; - icversion = "${ffversion}-gnu1"; - - src = fetchurl { - url = "mirror://gnu/gnuzilla/${ffversion}/icecat-${icversion}.tar.bz2"; - sha256 = "0icnl64nxcyf7dprpdpygxhabsvyhps8c3ixysj9bcdlj9q34ib1"; - }; - - patches = [ - ./no-buildconfig.patch - missing-documentation-patch - ]; - meta.knownVulnerabilities = [ "Support ended around October 2019." ]; - }; - - # Similarly to firefox-esr-52 above. - icecat-52 = iccommon rec { - ffversion = "52.6.0"; - icversion = "${ffversion}-gnu1"; - - src = fetchurl { - url = "mirror://gnu/gnuzilla/${ffversion}/icecat-${icversion}.tar.bz2"; - sha256 = "09fn54glqg1aa93hnz5zdcy07cps09dbni2b4200azh6nang630a"; - }; - - patches = [ - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch - ]; - - meta.knownVulnerabilities = [ "Support ended in August 2018." ]; - }; } // lib.optionalAttrs (config.allowAliases or true) { # ALIASES # remove after 20.03 branchoff - firefox-esr-60 = throw "firefoxPackages.firefox-esr-60 was removed as it's an unsupported ESR with open security issues."; + icecat = throw "firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues."; + icecat-52 = throw "firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues."; + tor-browser-7-5 = throw "firefoxPackages.tor-browser-7-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser-8-5 = throw "firefoxPackages.tor-browser-8-5 was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; tor-browser = throw "firefoxPackages.tor-browser was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; -}) +} From e3659c50fc356376fa68d680dd32a3379717a065 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 17:40:32 +0100 Subject: [PATCH 163/201] firefoxPackages.firefox-esr-52: remove package firefoxPackages.firefox-esr-52 was removed as it's an unsupported ESR with open security issues. If you need it because you need to run some plugins not having been ported to WebExtensions API, import it from an older nixpkgs checkout still containing it. --- .../networking/browsers/firefox/packages.nix | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c696166c95f..49a9d762047 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -40,34 +40,6 @@ rec { }; }; - # Do not remove. This is the last version of Firefox that supports - # the old plugins. While this package is unsafe to use for browsing - # the web, there are many old useful plugins targeting offline - # activities (e.g. ebook readers, syncronous translation, etc) that - # will probably never be ported to WebExtensions API. - firefox-esr-52 = (common rec { - pname = "firefox-esr"; - ffversion = "52.9.0esr"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9"; - }; - - patches = [ - # this one is actually an omnipresent bug - # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 - ./fix-pa-context-connect-retval.patch - ]; - - meta = firefox.meta // { - description = "A web browser built from Firefox Extended Support Release source tree"; - knownVulnerabilities = [ "Support ended in August 2018." ]; - }; - }).override { - stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'" - gtk3Support = false; - }; - firefox-esr-68 = common rec { pname = "firefox-esr"; ffversion = "68.4.2esr"; @@ -92,6 +64,12 @@ rec { } // lib.optionalAttrs (config.allowAliases or true) { # ALIASES # remove after 20.03 branchoff + firefox-esr-52 = throw '' + firefoxPackages.firefox-esr-52 was removed as it's an unsupported ESR with + open security issues. If you need it because you need to run some plugins + not having been ported to WebExtensions API, import it from an older + nixpkgs checkout still containing it. + ''; firefox-esr-60 = throw "firefoxPackages.firefox-esr-60 was removed as it's an unsupported ESR with open security issues."; icecat = throw "firefoxPackages.icecat was removed as even its latest upstream version is based on an unsupported ESR release with open security issues."; From 94b2596540cd2e7186f4e4fa1f43df0bfb755987 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 18:56:13 +0100 Subject: [PATCH 164/201] firefox: simplify derivation with firefox 64 being the latest version, and the removal of "tor-browser/icecat-like" variants, we can greatly simplify the common firefox derivation. --- .../networking/browsers/firefox/common.nix | 158 ++++++------------ 1 file changed, 48 insertions(+), 110 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 740d05ba046..8ba899457b3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,8 +1,6 @@ { pname, ffversion, meta, updateScript ? null , src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] -, isIceCatLike ? false, icversion ? null -, isTorBrowserLike ? false, tbversion ? null }: +, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg @@ -27,16 +25,14 @@ ## privacy-related options -, privacySupport ? isTorBrowserLike || isIceCatLike +, privacySupport ? false # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. # webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !( - lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63" - )) +, webrtcSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -79,7 +75,7 @@ let default-toolkit = if stdenv.isDarwin then "cairo-cocoa" else "cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}"; - binaryName = if isIceCatLike then "icecat" else "firefox"; + binaryName = "firefox"; binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; browserName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; @@ -87,21 +83,17 @@ let execdir = if stdenv.isDarwin then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; +in - browserVersion = if isIceCatLike then icversion - else if isTorBrowserLike then tbversion - else ffversion; +stdenv.mkDerivation ({ + name = "${pname}-unwrapped-${ffversion}"; + version = ffversion; - browserPatches = [ + inherit src unpackPhase meta; + + patches = [ ./env_var_for_system_dir.patch - ] - ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "68.3.0") - (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 - name = "write_error-parallel_make.diff"; - url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py"; - sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y"; - }) - ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ + ] ++ lib.optionals (stdenv.isAarch64) [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; @@ -117,15 +109,6 @@ let }) ++ patches; -in - -stdenv.mkDerivation (rec { - name = "${pname}-unwrapped-${version}"; - version = browserVersion; - - inherit src unpackPhase meta; - - patches = browserPatches; # Ignore trivial whitespace changes in patches, this fixes compatibility of # ./env_var_for_system_dir.patch with Firefox >=65 without having to track @@ -141,16 +124,14 @@ stdenv.mkDerivation (rec { xorg.libXext sqlite unzip makeWrapper libevent libstartup_notification libvpx /* cairo */ icu libpng jemalloc glib + nasm + # >= 66 requires nasm for the AV1 lib dav1d + # yasm can potentially be removed in future versions + # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 + # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ + nspr nss ] - ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] - ++ lib.optional (lib.versionOlder ffversion "53") libXdamage - ++ lib.optional (lib.versionOlder ffversion "61") hunspell - # >= 66 requires nasm for the AV1 lib dav1d - # yasm can potentially be removed in future versions - # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 - # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ - ++ lib.optional (lib.versionAtLeast ffversion "66") nasm ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 @@ -162,27 +143,33 @@ stdenv.mkDerivation (rec { NIX_CFLAGS_COMPILE = toString ([ "-I${glib.dev}/include/gio-unix-2.0" - ] - ++ lib.optionals (!isTorBrowserLike) [ "-I${nss.dev}/include/nss" ] - ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68" - && lib.versionOlder ffversion "69") + ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69") "-Wno-error=format-security"); - postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' + postPatch = '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' - '' + lib.optionalString (lib.versionAtLeast ffversion "68") '' rm -rf obj-x86_64-pc-linux-gnu ''; nativeBuildInputs = - [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] + [ + autoconf213 + cargo + gnused + llvmPackages.llvm # llvm-objdump + nodejs + perl + pkgconfig + python2 + python3 + rust-cbindgen + rustc + which + ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] - ++ lib.optional (lib.versionAtLeast ffversion "61.0") python3 - ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] - ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; preConfigure = '' @@ -190,14 +177,8 @@ stdenv.mkDerivation (rec { rm -f configure rm -f js/src/configure rm -f .mozconfig* - '' + (if lib.versionAtLeast ffversion "58" - # this will run autoconf213 - then '' + # this will run autoconf213 configureScript="$(realpath ./mach) configure" - '' else '' - make -f client.mk configure-files - configureScript="$(realpath ./configure)" - '') + lib.optionalString (lib.versionAtLeast ffversion "53") '' export MOZCONFIG=$(pwd)/mozconfig # Set C flags for Rust's bindgen program. Unlike ordinary C @@ -214,23 +195,16 @@ stdenv.mkDerivation (rec { $NIX_CFLAGS_COMPILE" echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG - '' + lib.optionalString googleAPISupport '' + '' + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176 - ${if (lib.versionAtLeast ffversion "60.6" && lib.versionOlder ffversion "61") || (lib.versionAtLeast ffversion "66") then '' - configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga") - configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga") - '' else '' - configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") - ''} - '' + lib.optionalString (lib.versionOlder ffversion "58") '' - cd obj-* - '' - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - + lib.optionalString (lib.versionAtLeast ffversion "64") '' + configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga") + configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga") + '') + '' + # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS ''; @@ -255,32 +229,15 @@ stdenv.mkDerivation (rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" - ] - ++ lib.optional (lib.versionOlder ffversion "64") "--disable-maintenance-service" - ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" - ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" - ++ lib.optionals (lib.versionAtLeast ffversion "56") [ "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" - ] - ++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [ - "--enable-webrender=build" - ] - - # TorBrowser patches these - ++ lib.optionals (!isTorBrowserLike) [ "--with-system-nspr" "--with-system-nss" ] - - # and wants these - ++ lib.optionals isTorBrowserLike ([ - "--with-tor-browser-version=${tbversion}" - "--with-distribution-id=org.torproject" - "--enable-signmar" - "--enable-verify-mar" - "--enable-bundled-fonts" - ]) + ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks" + ++ lib.optionals (lib.versionOlder ffversion "69") [ + "--enable-webrender=build" + ] ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -290,11 +247,6 @@ stdenv.mkDerivation (rec { ++ flag crashreporterSupport "crashreporter" ++ lib.optional drmSupport "--enable-eme=widevine" - ++ lib.optionals (lib.versionOlder ffversion "60") ([] - ++ flag geolocationSupport "mozril-geoloc" - ++ flag safeBrowsingSupport "safe-browsing" - ) - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-release" "--enable-optimize" @@ -302,29 +254,16 @@ stdenv.mkDerivation (rec { ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; - # Before 58 we have to run `make -f client.mk configure-files` at - # the top level, and then run `./configure` in the obj-* dir (see - # above), but in 58 we have to instead run `./mach configure` at the - # top level and then run `make` in obj-*. (We can also run the - # `make` at the top level in 58, but then we would have to `cd` to - # `make install` anyway. This is ugly, but simple.) - postConfigure = lib.optionalString (lib.versionAtLeast ffversion "58") '' + postConfigure = '' cd obj-* ''; - preBuild = lib.optionalString isTorBrowserLike '' - buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser") - ''; - makeFlags = lib.optionals enableOfficialBranding [ "MOZILLA_OFFICIAL=1" "BUILD_OFFICIAL=1" ] ++ extraMakeFlags; - RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/) - then null else "--cap-lints warn"; - enableParallelBuilding = true; doCheck = false; # "--disable-tests" above @@ -355,10 +294,9 @@ stdenv.mkDerivation (rec { ''; passthru = { - inherit version updateScript; + inherit updateScript; + version = ffversion; isFirefox3Like = true; - inherit isIceCatLike; - inherit isTorBrowserLike; gtk = gtk2; inherit nspr; inherit ffmpegSupport; @@ -366,12 +304,12 @@ stdenv.mkDerivation (rec { inherit execdir; inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; - } // # the build system verifies checksums of the bundled rust sources # ./third_party/rust is be patched by our libtool fixup code in stdenv # unfortunately we can't just set this to `false` when we do not want it. # See https://github.com/NixOS/nixpkgs/issues/77289 for more details + lib.optionalAttrs (lib.versionAtLeast ffversion "72") { # Ideally we would figure out how to tell the build system to not # care about changed hashes as we are already doing that when we From 84af9839e0295e313ebf2a9f3fb2989775c7a0df Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 4 Feb 2020 23:08:51 +0100 Subject: [PATCH 165/201] firefoxPackages.*, firefox-esr*, icecat: add aliases --- pkgs/applications/networking/browsers/firefox/packages.nix | 5 +++-- pkgs/top-level/aliases.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 7 ------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 49a9d762047..c61483c6772 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -62,8 +62,9 @@ rec { }; }; } // lib.optionalAttrs (config.allowAliases or true) { - # ALIASES - # remove after 20.03 branchoff + #### ALIASES + #### remove after 20.03 branchoff + firefox-esr-52 = throw '' firefoxPackages.firefox-esr-52 was removed as it's an unsupported ESR with open security issues. If you need it because you need to run some plugins diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ee74a0f58e..f5ee54de214 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -117,6 +117,13 @@ mapAliases ({ firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 + firefox-esr-52 = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff + firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff + firefox-esr-60 = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff + firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff + icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff + icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff + firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 font-awesome-ttf = font-awesome; # 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361b30a187f..817f80a7dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19123,18 +19123,11 @@ in }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; - firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; - icecat-unwrapped = firefoxPackages.icecat; - firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; - firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; - firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr = firefox-esr-68; - icecat = wrapFirefox icecat-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From d2c86759b45bf26fe443e25cda921d32aba3fe66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 19:14:25 +0000 Subject: [PATCH 166/201] python27Packages.uproot: 3.11.1 -> 3.11.2 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index f5f20ad86d3..481f7a9e7b2 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.1"; + version = "3.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1m6yjvdbffyk32gmfki7h01frlg9vhqf8g734m4gxyyf8m8g60zd"; + sha256 = "1bn8z640408s4h04ymy0y79fm5ss2mx99mkgdbw68a80x0p6982h"; }; nativeBuildInputs = [ pytestrunner ]; From dd6a291e9f1d9cd57cb98730e3aadf07bdb68388 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Feb 2020 22:34:26 +0100 Subject: [PATCH 167/201] gcc-snapshot: remove Package is marked as broken for >2 years and used a fairly old snapshot from the gcc7-branch, so I fairly doubt that this is somewhere used (and is also pretty misleading as you don't expect a random snapshot from gcc7 at `pkgs.gcc-snapshot`). --- nixos/doc/manual/release-notes/rl-2003.xml | 6 + .../compilers/gcc/snapshot/default.nix | 252 ------------------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 12 - 4 files changed, 8 insertions(+), 264 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/snapshot/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index fc301aecbb9..d7614cd3488 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -615,6 +615,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet release notes. + + + The gcc-snapshot-package has been removed. It's marked as broken for >2 years and used to point + to a fairly old snapshot from the gcc7-branch. + + diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix deleted file mode 100644 index 0441296ef17..00000000000 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ /dev/null @@ -1,252 +0,0 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.targetPlatform.isDarwin -, langObjCpp ? stdenv.targetPlatform.isDarwin -, langGo ? false -, profiledCompiler ? false -, staticCompiler ? false -, enableShared ? true -, enableLTO ? true -, texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which -, libelf # optional, for link-time optimizations (LTO) -, isl ? null # optional, for the Graphite optimization framework. -, zlib ? null -, enableMultilib ? false -, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins -, name ? "gcc" -, libcCross ? null -, threadsCross ? null # for MinGW -, crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform -, gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places -, flex ? null -, buildPackages -}: - -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - -# Make sure we get GNU sed. -assert stdenv.hostPlatform.isDarwin -> gnused != null; - -# The go frontend is written in c++ -assert langGo -> langCC; - -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - -with stdenv.lib; -with builtins; - -let majorVersion = "7"; - version = "${majorVersion}-20170409"; - - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - patches = - [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch - ++ optional noSysDirs ../no-sys-dirs.patch - ++ optional langFortran ../gfortran-driving.patch - ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { - url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; - sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay"; - }); - - /* Cross-gcc settings (build == host != target) */ - crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; - -in - -stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; - inherit version; - - builder = ../builder.sh; - - src = fetchurl { - url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2"; - sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67"; - }; - - inherit patches; - - outputs = [ "out" "lib" "man" "info" ]; - setOutputFlags = false; - NIX_NO_SELF_RPATH = true; - - libc_dev = stdenv.cc.libc_dev; - - hardeningDisable = [ "format" "pie" ]; - - postPatch = - if targetPlatform != hostPlatform || stdenv.cc.libc != null then - # On NixOS, use the right path to the dynamic linker instead of - # `/lib/ld*.so'. - let - libc = if libcCross != null then libcCross else stdenv.cc.libc; - in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." - for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h - do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue - echo " fixing \`$header'..." - sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' - done - '' - else null; - - inherit noSysDirs staticCompiler crossStageStatic - libcCross crossMingw; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl); - - # For building runtime libs - depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; - - buildInputs = [ - gmp mpfr libmpc libelf flex - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional hostPlatform.isDarwin gnused) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; - - NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = import ../common/pre-configure.nix { - inherit (stdenv) lib; - inherit version hostPlatform langGo; - }; - - dontDisableStatic = true; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - - configureFlags = import ../common/configure-flags.nix { - inherit - stdenv - targetPackages - crossStageStatic libcCross - version - - gmp mpfr libmpc libelf isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - ; - }; - - targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - - buildFlags = optional - (targetPlatform == hostPlatform && hostPlatform == buildPlatform) - (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - - dontStrip = !stripped; - NIX_STRIP_DEBUG = !stripped; - - installTargets = - if stripped - then "install-strip" - else "install"; - - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the - # library headers and binaries, regarless of the language being compiled. - # - # Likewise, the LTO code doesn't find zlib. - # - # Cross-compiling, we need gcc not to read ./specs in order to build the g++ - # compiler (after the specs for the cross-gcc are created). Having - # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - - CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] - ++ optional (zlib != null) zlib - )); - - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - - inherit - (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; - }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS - ; - - passthru = { - inherit langC langCC langObjC langObjCpp langFortran langGo version; - isGNU = true; - }; - - enableParallelBuilding = true; - inherit enableMultilib; - - inherit (stdenv) is64bit; - - meta = { - homepage = https://gcc.gnu.org/; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with stdenv.lib.maintainers; [ ]; - - platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; - - broken = true; - }; -} - -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - -// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ee74a0f58e..de6cb64bf98 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -571,4 +571,6 @@ mapAliases ({ dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 + + gcc-snapshot = throw "Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361b30a187f..3140dd17bf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8133,18 +8133,6 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); - gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { - inherit noSysDirs; - - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; - - isl = isl_0_17; - })); - gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { From 9bf7d5104710b9d6dfc967c476ded449d56b1e57 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 9 Feb 2020 22:32:43 +0100 Subject: [PATCH 168/201] conkeror: remove package Conkeror doesn't work with any secure firefox release. Please move to some of the alternatives suggested at http://conkeror.org/Alternatives. --- .../networking/browsers/conkeror/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 5 +++ pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/conkeror/default.nix diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix deleted file mode 100644 index ffc6bde79a1..00000000000 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }: - -stdenv.mkDerivation rec { - pkgname = "conkeror"; - version = "1.0.4"; - name = "${pkgname}-${version}"; - - src = fetchgit { - url = git://repo.or.cz/conkeror.git; - rev = "refs/tags/${version}"; - sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8"; - }; - - buildInputs = [ unzip makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/conkeror - cp -r * $out/libexec/conkeror - - makeWrapper ${firefox-esr-52}/bin/firefox $out/bin/conkeror \ - --add-flags "-app $out/libexec/conkeror/application.ini" - ''; - - meta = with stdenv.lib; { - description = "A keyboard-oriented, customizable, extensible web browser"; - longDescription = '' - Conkeror is a keyboard-oriented, highly-customizable, highly-extensible - web browser based on Mozilla XULRunner, written mainly in JavaScript, - and inspired by exceptional software such as Emacs and vi. Conkeror - features a sophisticated keyboard system, allowing users to run commands - and interact with content in powerful and novel ways. It is - self-documenting, featuring a powerful interactive help system. - ''; - homepage = http://conkeror.org/; - license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f5ee54de214..bd30b69bfcc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -123,6 +123,11 @@ mapAliases ({ firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff + conkeror-unwrapped = conkeror; # 2020-02, remove after 20.03 branchoff + conkeror = throw '' + Conkeror doesn't work with any secure firefox release. + Please move to some of the alternatives at http://conkeror.org/Alternatives + ''; # 2020-02, remove after 20.03 branchoff firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 817f80a7dfd..0b8eccb15c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18503,9 +18503,6 @@ in comical = callPackage ../applications/graphics/comical { }; - conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = wrapFirefox conkeror-unwrapped { }; - containerd = callPackage ../applications/virtualization/containerd { }; convchain = callPackage ../tools/graphics/convchain {}; From c8718e29b3740b9094aee842e7b157872d98942e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2020 11:25:37 +0000 Subject: [PATCH 169/201] python27Packages.jieba: 0.40 -> 0.42.1 --- pkgs/development/python-modules/jieba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index 75520384ff3..2e64360c5c2 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "jieba"; - version = "0.40"; + version = "0.42.1"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "fxsjy"; repo = pname; rev = "v${version}"; - sha256 = "1nasyxva9m3k9fb9g627ppphp3697jdplbb2bavqx71sa7mqim2m"; + sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; checkInputs = [ glibcLocales ]; From 6022db4d9d9df3bad37d5c41daa0a1db8bf6e660 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 9 Feb 2020 23:49:22 +0100 Subject: [PATCH 170/201] tests.nixos-functions: port test to python --- pkgs/test/nixos-functions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index 6dee0a27a79..6a4f3164f92 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( environment.systemPackages = [ pkgs.hello ]; }; testScript = '' - $machine->succeed("hello"); + machine.succeed("hello") ''; }); From d3efeb79b7059cf38d1baae03f2104b7a28dda36 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 9 Feb 2020 23:49:42 +0100 Subject: [PATCH 171/201] nixosTest: update to make-test-python.nix This still referred to the legacy make-test.nix (Perl) --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c9b909a9d0..e16165bb698 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25033,7 +25033,7 @@ in /* * Run a NixOS VM network test using this evaluation of Nixpkgs. * - * It is mostly equivalent to `import ./make-test.nix` from the + * It is mostly equivalent to `import ./make-test-python.nix` from the * NixOS manual[1], except that your `pkgs` will be used instead of * letting NixOS invoke Nixpkgs again. If a test machine needs to * set NixOS options under `nixpkgs`, it must set only the @@ -25059,11 +25059,11 @@ in */ nixosTest = let - /* The nixos/lib/testing.nix module, preapplied with arguments that + /* The nixos/lib/testing-python.nix module, preapplied with arguments that * make sense for this evaluation of Nixpkgs. */ nixosTesting = - (import ../../nixos/lib/testing.nix { + (import ../../nixos/lib/testing-python.nix { inherit (pkgs.stdenv.hostPlatform) system; inherit pkgs; extraConfigurations = [( From 0945178b3c6fd9e33002dd6e3c6f77dfca49565a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 6 Feb 2020 12:19:47 +0100 Subject: [PATCH 172/201] nixos/testing: add deprecation notice for Perl VM tests Most VM tests have been migrated to use the python test driver (introduced in #71684), the migration is tracked in #72828 (which also thankfully uncovered and fixed many currently broken tests) While increasing the acceptance and adoption of NixOS integration tests by using a more popular language, there was also nobody willing to do larger refactors in the currently very convoluted test infrastructure. We plan to remove the perl infrastructure between the 20.03 and 20.09 release, to be able to do these refactorings. Some people might be using Perl tests in their internal CI, so print a warning for 20.03, and give users time to move to the python testing infrastructure. --- nixos/lib/testing.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index ae8ecd6270c..c82abd1f990 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -19,7 +19,11 @@ in rec { inherit pkgs; - testDriver = stdenv.mkDerivation { + testDriver = lib.warn '' + Perl VM tests are deprecated and will be removed for 20.09. + Please update your tests to use the python test driver. + See https://github.com/NixOS/nixpkgs/pull/71684 for details. + '' stdenv.mkDerivation { name = "nixos-test-driver"; buildInputs = [ makeWrapper perl ]; From e85e257ad98a5fb3a98d5af26515501b7fefe6a2 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 9 Feb 2020 18:43:22 -0500 Subject: [PATCH 173/201] =?UTF-8?q?fzf:=20fix=20patch=20for=20vim=20plugin?= =?UTF-8?q?;=20enable=20tests;=20avoid=20direct=20$src=E2=80=A6=20(#79575)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was previously referencing `$bin`, but this package no longer produces a `bin` output, just `out` and `share`. Updated to make the comparison check a bit more robust. Also updated to avoid direct dependency on the `$src` directory out of the nix store, instead using the processed src setup in the unpackPhase. This provides a cleaner abstraction between the build/install phase and the input src phase, and avoids an unnecessary dependency on whether the source disted tarball comes from `fetchFromGitHub` (in which case it's an unpacked directory) or something like `fetchurl`. In either case, stdenv is responsible for processing the input `src` and setting up a clean build dir for us, so we should use that. This produces an equivalent directory tree, except that the vim plugin is no longer broken. --- pkgs/tools/misc/fzf/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 960373e7e5f..0694d5931ef 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -19,32 +19,34 @@ buildGoModule rec { buildInputs = [ ncurses ]; + # The vim plugin expects a relative path to the binary; patch it to abspath. patchPhase = '' - sed -i -e "s|expand(':h:h')|'$bin'|" plugin/fzf.vim + sed -i -e "s|expand(':h:h')|'$out'|" plugin/fzf.vim - # Original and output files can't be the same - if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then - echo "Vim plugin patch not applied properly. Aborting" && \ - exit 1 + if ! grep -q $out plugin/fzf.vim; then + echo "Failed to replace vim base_dir path with $out" + exit 1 fi ''; + doCheck = true; + preInstall = '' mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d} - cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish + cp shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish ''; postInstall = '' - cp $src/bin/fzf-tmux $out/bin + cp bin/fzf-tmux $out/bin mkdir -p $man/share/man - cp -r $src/man/man1 $man/share/man + cp -r man/man1 $man/share/man mkdir -p $out/share/vim-plugins/${pname} - cp -r $src/plugin $out/share/vim-plugins/${pname} + cp -r plugin $out/share/vim-plugins/${pname} - cp -R $src/shell $out/share/fzf + cp -R shell $out/share/fzf cat <