From a476b9bf545fa5f7175987da184e84ad1047b44e Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 17 Jun 2019 23:12:06 +0000 Subject: [PATCH 01/11] nixos/cassandra: use cassandra's default cluster name "Test Cluster" The change to "NixOS Test Cluster" in #59179 broke startup of existing clusters that used the previously-default cluster name "Test Cluster": ERROR 23:00:47 Fatal exception during initialization org.apache.cassandra.exceptions.ConfigurationException: Saved cluster name Test Cluster != configured name NixOS Test Cluster Fixes #63388. --- nixos/modules/services/databases/cassandra.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index e2ea9fcda6b0..a9da3a3c5620 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -71,7 +71,7 @@ in { ''; clusterName = mkOption { type = types.str; - default = "NixOS Test Cluster"; + default = "Test Cluster"; description = '' The name of the cluster. This setting prevents nodes in one logical cluster from joining From 73847dfd30931ff8f8f5e18ef07f8423b871c17a Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 25 Jun 2019 00:20:26 +0200 Subject: [PATCH 02/11] acpilight: 1.1 -> 1.2 --- pkgs/misc/acpilight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index 50f4fe87ed83..4076a8c3a3af 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "acpilight"; - version = "1.1"; + version = "1.2"; src = fetchgit { url = "https://gitlab.com/wavexx/acpilight.git"; rev = "v${version}"; - sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; + sha256 = "1r0r3nx6x6vkpal6vci0zaa1n9dfacypldf6k8fxg7919vzxdn1w"; }; pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ From 7eb22cd46ac3ec9fa363c5c752e6acf597ace45f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 24 Jun 2019 22:14:44 -0500 Subject: [PATCH 03/11] vale: 1.4.2 -> 1.4.3 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 3d911271ba91..3e436b80be8a 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.4.2"; + version = "1.4.3"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "180532jp6m2ryppkjszs8b8gmvx9h54c8423par3907bgdxyzqj8"; + sha256 = "1dgh2frf577048cacwnrl0xx5hha055z42sqq38lf07ybwyxdxms"; }; meta = with stdenv.lib; { From 31c33e34200b9704ceaaa26d82b73f54a175aae8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 25 Jun 2019 12:55:12 +0800 Subject: [PATCH 04/11] freeciv_qt: init at 2.6.0 --- pkgs/games/freeciv/default.nix | 45 +++++++++++++++++++++------------ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 5d7883c18949..9fc260e74062 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext, libiconv +{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python +, zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? false, gtk2 +, gtkClient ? false, gtk3 +, qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite }: @@ -8,31 +10,42 @@ let inherit (stdenv.lib) optional optionals; - name = "freeciv"; +in stdenv.mkDerivation rec { + pname = "freeciv"; version = "2.6.0"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; - inherit version; - src = fetchurl { - url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "16f9wsnn7073s6chzbm3819swd0iw019p9nrzr3diiynk28kj83w"; + src = fetchFromGitHub { + owner = "freeciv"; + repo = "freeciv"; + rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "1b3q5k9wpv7z24svz01ybw8d8wlzkkdr6ia5hgp6cxk6vq67n67s"; }; - nativeBuildInputs = [ pkgconfig ]; + postPatch = '' + for f in {common,utility}/*.py; do + substituteInPlace $f \ + --replace '/usr/bin/env python' ${python.interpreter} + done + ''; - buildInputs = [ zlib bzip2 curl lzma gettext libiconv ] + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] - ++ optionals gtkClient [ gtk2 ] + ++ optionals gtkClient [ gtk3 ] + ++ optionals qtClient [ qt5.qtbase ] ++ optional server readline ++ optional enableSqlite sqlite; configureFlags = [ "--enable-shared" ] ++ optional sdlClient "--enable-client=sdl" + ++ optionals qtClient [ + "--enable-client=qt" + "--with-qt5-includes=${qt5.qtbase.dev}/include" + ] ++ optional enableSqlite "--enable-fcdb=sqlite3" ++ optional (!gtkClient) "--enable-fcmp=cli" - ++ optional (!server) "--disable-server"; + ++ optional (!server) "--disable-server"; enableParallelBuilding = true; @@ -46,11 +59,11 @@ stdenv.mkDerivation { to the space age... ''; - homepage = http://freeciv.wikia.com/; + homepage = http://www.freeciv.org; # http only license = licenses.gpl2; maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + hydraPlatforms = platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a2f6c391db..d903226ed8f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21500,6 +21500,11 @@ in sdlClient = false; }; + freeciv_qt = freeciv.override { + qtClient = true; + sdlClient = false; + }; + freedink = callPackage ../games/freedink { }; freeorion = callPackage ../games/freeorion { }; From 53ac12b25be037ef59e0fba34ac671bac01d7421 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 25 Jun 2019 13:24:31 +0200 Subject: [PATCH 05/11] couchpotato: remove the /usr/bin/env dependency leave the fixupPhase intact so it can patch script interpreter paths --- pkgs/servers/couchpotato/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index a996cec0d5b5..8b2895392bec 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -29,9 +29,8 @@ buildPythonApplication rec { chmod +x $out/bin/* ''; - fixupPhase = '' - wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ - --set PATH ${python}/bin + postFixup = '' + wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" ''; meta = { From e8916cc6af7daf2de5008f3063441c8b3f00e9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 25 Jun 2019 14:28:03 +0200 Subject: [PATCH 06/11] duplicati: allow changing the user --- nixos/modules/services/backup/duplicati.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index a3af3d9b5c9f..d2fe4698e885 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -26,6 +26,15 @@ in Set it to "any" to listen on all available interfaces ''; }; + + user = mkOption { + default = "duplicati"; + type = types.str; + description = '' + Duplicati runs as it's own user. It will only be able to backup world-readable files. + Run as root with special care. + ''; + }; }; }; @@ -37,14 +46,19 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = "duplicati"; + User = cfg.user; + PermissionsStartOnly = true; Group = "duplicati"; ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati"; Restart = "on-failure"; }; + preStart = '' + mkdir -p /var/lib/duplicati + chown -R ${cfg.user}:duplicati /var/lib/duplicati + ''; }; - users.users.duplicati = { + users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") { uid = config.ids.uids.duplicati; home = "/var/lib/duplicati"; createHome = true; From aef7f1b31ad9b7db7eef590519f5026efb9d0d85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2019 14:46:04 +0200 Subject: [PATCH 07/11] Typo --- nixos/modules/virtualisation/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 2235eec9d95a..c10e2b162ccc 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -445,7 +445,7 @@ in type = types.bool; default = !config.boot.isContainer; description = '' - Whether to enable support for nixos containers. + Whether to enable support for NixOS containers. ''; }; From b95c4ce302ba7bb2cddcd3b33862e418ddc57ed8 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 25 Jun 2019 15:31:55 +0200 Subject: [PATCH 08/11] cargo-license: add meta.homepage --- pkgs/tools/package-management/cargo-license/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index 1230b90c270c..619fbb115976 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand to see license of dependencies"; + homepage = "https://github.com/onur/cargo-license"; license = with licenses; [ mit ]; maintainers = with maintainers; [ basvandijk ]; platforms = platforms.all; From e37eddc8c0cf7aa15b9623af0393384b16397fb1 Mon Sep 17 00:00:00 2001 From: Daniel Vianna Date: Tue, 25 Jun 2019 18:43:21 +1000 Subject: [PATCH 09/11] pythonPackages.pycategories: init at 1.2.0 --- .../python-modules/pycategories/default.nix | 35 +++++++++++++++++++ .../python-modules/pycategories/infix.nix | 23 ++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/pycategories/default.nix create mode 100644 pkgs/development/python-modules/pycategories/infix.nix diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix new file mode 100644 index 000000000000..55f30f9e55a9 --- /dev/null +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, callPackage +, pytestcov +, fetchPypi +, lib +, pytest +, pythonOlder +, pytestrunner +}: + +buildPythonPackage rec { + pname = "pycategories"; + version = "1.2.0"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + # Is private because the author states it's unmaintained + # and shouldn't be used in production code + propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; + + checkInputs = [ pytest pytestcov ]; + + meta = with lib; { + homepage = "https://gitlab.com/danielhones/pycategories"; + description = "Implementation of some concepts from category theory"; + license = licenses.mit; + maintainers = with maintainers; [ dmvianna ]; + }; +} diff --git a/pkgs/development/python-modules/pycategories/infix.nix b/pkgs/development/python-modules/pycategories/infix.nix new file mode 100644 index 000000000000..f3b4d2548181 --- /dev/null +++ b/pkgs/development/python-modules/pycategories/infix.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "infix"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a1bfdcf875bc072f41e426d0673f2e3017750743bb90cc725fffb292eb09648c"; + }; + + # No tests + doCheck = false; + + meta = { + homepage = "https://github.com/borntyping/python-infix"; + description = "A decorator that allows functions to be used as infix functions"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c38f1a740442..f331128f0fb0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -682,6 +682,8 @@ in { inherit (pkgs) pkgconfig; }; + pycategories = callPackage ../development/python-modules/pycategories { }; + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); From 26335f358ed7c6e5aa5b00af6a67e2b3a3269614 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 25 Jun 2019 16:13:08 +0200 Subject: [PATCH 10/11] elm: don't import , fixes tarball job Don't import , because that is not allowed. Broken by https://github.com/NixOS/nixpkgs/pull/63477 cc @turboMaCk --- pkgs/development/compilers/elm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 9b1252e4284d..a819361f4d45 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenv, pkgs , haskell, nodejs , fetchurl, fetchpatch, makeWrapper, writeScriptBin }: let @@ -8,7 +8,7 @@ let elmNodePackages = import ./packages/node-composition.nix { - inherit nodejs; + inherit nodejs pkgs; inherit (stdenv.hostPlatform) system; }; From 32a7e35d17b27eda2feab3e521ff82f6b45fa2f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 25 Jun 2019 16:22:51 +0200 Subject: [PATCH 11/11] wxwidgets: fix passthru, fixes tarball job cc @romildo --- pkgs/development/libraries/wxwidgets/3.1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 76d9939f73ae..60d026e9bebd 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "; passthru = { - inherit compat24 compat26 unicode; + inherit compat28 compat30 unicode; gtk = if withGtk2 then gtk2 else gtk3; };