diff options
-rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
-rw-r--r-- | nixos/tests/miniflux.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 5 | ||||
-rw-r--r-- | pkgs/data/themes/solarc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/coq-modules/mathcomp-analysis/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/python-modules/elementpath/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch | 36 | ||||
-rw-r--r-- | pkgs/development/python-modules/mysql-connector/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/python-modules/xmlschema/default.nix | 42 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/drone-cli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/dune/2.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ddcci/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/age/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/text/hck/default.nix | 6 |
17 files changed, 122 insertions, 46 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35ccd0b1d983..04033780a622 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1520,12 +1520,6 @@ githubId = 355401; name = "Brian Hicks"; }; - bricewge = { - email = "bricewge@gmail.com"; - github = "bricewge"; - githubId = 5525646; - name = "Brice Waegeneire"; - }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; @@ -7683,6 +7677,12 @@ githubId = 2590830; name = "Sage Raflik"; }; + neosimsim = { + email = "me@abn.sh"; + github = "neosimsim"; + githubId = 1771772; + name = "Alexander Ben Nasrallah"; + }; nequissimus = { email = "tim@nequissimus.com"; github = "nequissimus"; diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 9a25a9e77cc9..1015550fa8c7 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -11,7 +11,7 @@ in with lib; { name = "miniflux"; - meta.maintainers = with pkgs.lib.maintainers; [ bricewge ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes = { default = diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index ed60fad56c3b..87b975e80fb7 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; + postInstall = '' + substituteInPlace $out/share/applications/xine.desktop \ + --replace "MimeType=;" "MimeType=" + ''; + meta = with lib; { homepage = "http://xinehq.de/"; description = "Xlib-based frontend for Xine video player"; diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 3f6932e40a0c..a6ae8ce2e914 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Solarized version of the Arc theme"; homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; - maintainers = [ maintainers.bricewge ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index b06f057f82e4..76a5a84cc233 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -8,6 +8,7 @@ let mca = mkCoqDerivation { pname = "analysis"; owner = "math-comp"; + release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI="; release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; @@ -17,7 +18,7 @@ let mca = mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.9"; } + { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.10"; } { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index ab09f0edf360..538de4ba7de9 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.1"; pname = "elementpath"; - disabled = isPy27; # uses incompatible class syntax + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1zghj0v1s03ahynx7sczag7iaam757ypwl1lm0ym6j37dnq8vnxk"; + sha256 = "1imjilhmbw08469irlbr3am5zksbg327n7mznxfixrigq9d65qx6"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch new file mode 100644 index 000000000000..4356052d8715 --- /dev/null +++ b/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch @@ -0,0 +1,36 @@ +From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001 +From: Alexander Ben Nasrallah <me@abn.sh> +Date: Mon, 19 Jul 2021 17:24:41 +0200 +Subject: [PATCH] Revert "Fix MacOS wheels platform tag" + +This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654. +--- + cpydist/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/cpydist/__init__.py b/cpydist/__init__.py +index 0e7f341..2619d7a 100644 +--- a/cpydist/__init__.py ++++ b/cpydist/__init__.py +@@ -41,7 +41,7 @@ from distutils.command.install import install + from distutils.command.install_lib import install_lib + from distutils.core import Command + from distutils.dir_util import mkpath, remove_tree +-from distutils.sysconfig import get_config_vars, get_python_version ++from distutils.sysconfig import get_python_version + from distutils.version import LooseVersion + from subprocess import check_call, Popen, PIPE + +@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") + with open(version_py, "rb") as fp: + exec(compile(fp.read(), version_py, "exec")) + +-if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars(): +- get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0" +- + COMMON_USER_OPTIONS = [ + ("byte-code-only", None, + "remove Python .py files; leave byte code .pyc only"), +-- +2.31.1 + diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 0856b30758dc..211bdec41fe0 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -13,6 +13,15 @@ in buildPythonPackage rec { sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7"; }; + patches = [ + # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. + # This makes the installation with nixpkgs fail. I suspect, that's + # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # 10.12. The patch reverts + # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 + ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch + ]; + propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; # Tests are failing (TODO: unknown reason) @@ -31,6 +40,6 @@ in buildPythonPackage rec { homepage = "https://github.com/mysql/mysql-connector-python"; changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; license = [ lib.licenses.gpl2Only ]; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ neosimsim turion ]; }; } diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 960dd227388d..a2bd27d9f1d8 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -1,34 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , elementpath , lxml -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.7.1"; pname = "xmlschema"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "0vf0gj1sbv9f7gjm3zbyl0b8pkrn00yzx57ddff0h2kazv8jlpwi"; + sha256 = "124wq44aqzxrh92ylm44rry9dsyb68drgzbhzacrm511n1j0ziww"; }; - propagatedBuildInputs = [ elementpath ]; + propagatedBuildInputs = [ + elementpath + ]; - checkInputs = [ lxml pytest ]; + checkInputs = [ + lxml + pytestCheckHook + ]; # Ignore broken fixtures, and tests for files which don't exist. # For darwin, we need to explicity say we can't reach network - checkPhase = '' - pytest tests \ - --ignore=tests/test_factory.py \ - --ignore=tests/test_schemas.py \ - --ignore=tests/test_memory.py \ - --ignore=tests/test_validation.py \ - -k 'not element_tree_import_script and not export_remote' - ''; + disabledTests = [ + "export_remote" + "element_tree_import_script" + ]; + + disabledTestPaths = [ + "tests/test_schemas.py" + "tests/test_memory.py" + "tests/test_validation.py" + ]; + + pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { description = "XML Schema validator and data conversion library for Python"; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4ee5870e47cd..6eac6d52b799 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { }; meta = with lib; { - maintainers = with maintainers; [ bricewge ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; }; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 16f33268cf1e..f80fabedebe4 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; + sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; }; nativeBuildInputs = [ ocaml findlib ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; license = lib.licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 92c33077d684..5ee5eafb0207 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ bricewge ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = kernel.kernelOlder "5.1"; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 379a50770447..a297dd0eea95 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.2"; + version = "8.1.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-xlERuPkhPEHbfX7bVoc9CjqYe/P0Miiyu5c067LLS1M="; + sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-0fzCwkVHrBFiSKxvyTK0Xu8wHpyo58u+a9c7daaUCc0="; + sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE="; }; vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e78c208b56fe..98e599893365 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-08-27"; + version = "2021-09-07"; pname = "oh-my-zsh"; - rev = "190325049ef93731ab28295dbedf36d44ab33d7a"; + rev = "450acc0113b114352ce3b94870fe63fc461844bd"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "x+cGlYjTgs7Esb4NNSBcKhoDb1SuEQxONt/sSHeVj0M="; + sha256 = "SWUr+EJ4tfzj0bVstSexMOdN3fv37PuRUmbB1C7YRlI="; }; installPhase = '' diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 09f27a0c22cb..bf5d4601475a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "182"; + version = "183"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-atWyVMewm+I/SDdE9+z1JYLLVOFDsgps2BL9WgZLlVA="; + sha256 = "sha256-XFFrRmCpE2UvZRCELfPaotLklyjLiCDWkyFWkISOHZM="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index cff4630dd5db..fd59f9534fe7 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "age"; @@ -13,9 +13,15 @@ buildGoModule rec { }; ldflags = [ - "-X main.Version=${version}" + "-s" "-w" "-X main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + preInstall = '' + installManPage doc/*.1 + ''; + doInstallCheck = true; installCheckPhase = '' if [[ "$("$out/bin/${pname}" --version)" == "${version}" ]]; then diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index 46c786693a8e..271e4d9b7168 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "1xjp56asfn37kr0fsrjkil20nf372q70cijqb5ll2sq2zwjnyyzn"; + sha256 = "02yvpgvzdprysg0spa0abn7d3vjj5spzc3528rwbpl4cw2yx8j6w"; }; - cargoSha256 = "12n33gwxcym5z5n762wmzcck4zmmn42kh04nwpdb3az4apghdp3z"; + cargoSha256 = "0n6wywb1xyaxkbr0fs39992dfv55wzvp05i1vk9mxgnsim9s7aw8"; nativeBuildInputs = [ cmake ]; |