From dee2a85af89aecb4edf3cce1749e34422659cff8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 11 Feb 2021 12:07:51 +0000 Subject: [PATCH 01/22] weechatScripts.weechat-matrix: make patchable If an overlay adds patches, they wouldn't be applied because we were copying from directory out of src. --- .../irc/weechat/scripts/weechat-matrix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 20aebebf7da..c42fe55169e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -53,11 +53,11 @@ in buildPythonPackage { installPhase = '' mkdir -p $out/share $out/bin - cp $src/main.py $out/share/matrix.py + cp main.py $out/share/matrix.py - cp $src/contrib/matrix_upload.py $out/bin/matrix_upload - cp $src/contrib/matrix_decrypt.py $out/bin/matrix_decrypt - cp $src/contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper + cp contrib/matrix_upload.py $out/bin/matrix_upload + cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt + cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper substituteInPlace $out/bin/matrix_upload \ --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' substituteInPlace $out/bin/matrix_sso_helper \ @@ -66,7 +66,7 @@ in buildPythonPackage { --replace '/usr/bin/env python3' '${scriptPython}/bin/python' mkdir -p $out/${python.sitePackages} - cp -r $src/matrix $out/${python.sitePackages}/matrix + cp -r matrix $out/${python.sitePackages}/matrix ''; dontPatchShebangs = true; From 88046a1ab13f55a7730962fe0478f337a4e1befa Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 15 Mar 2021 22:44:39 +0100 Subject: [PATCH 02/22] octoprint.python.pkgs.costestimation: init at 3.2.0 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index df0409c8be4..c94e52b271c 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -52,6 +52,25 @@ in { }; }; + costestimation = buildPlugin rec { + pname = "CostEstimation"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "OllisGit"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1j476jcw7gh8zqqdc5vddwv5wpjns7cd1hhpn7m9fxq3d5bi077w"; + }; + + meta = with lib; { + description = "Plugin to display the estimated print cost for the loaded model."; + homepage = "https://github.com/malnvenshorn/OctoPrint-CostEstimation"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + }; + }; + curaenginelegacy = buildPlugin rec { pname = "CuraEngineLegacy"; version = "1.1.1"; From 93279df201f3abd39b5a68d0d4addb01bf2eb6df Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 15 Mar 2021 22:44:59 +0100 Subject: [PATCH 03/22] octoprint.python.pkgs.displayprogress: init at 0.1.3 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index c94e52b271c..332546a5056 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -90,6 +90,25 @@ in { }; }; + displayprogress = buildPlugin rec { + pname = "DisplayProgress"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4"; + }; + + meta = with lib; { + description = "Displays the job progress on the printer's display"; + homepage = "https://github.com/OctoPrint/OctoPrint-DisplayProgress"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + }; + }; + displaylayerprogress = buildPlugin rec { pname = "OctoPrint-DisplayLayerProgress"; version = "1.24.0"; From 0593d850d951a6ff9ee5854dd331d5f0be3fd994 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 15 Mar 2021 22:45:20 +0100 Subject: [PATCH 04/22] octoprint.python.pkgs.telegram: init at 1.6.4 --- pkgs/applications/misc/octoprint/plugins.nix | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 332546a5056..549e1a0ba2f 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -278,6 +278,27 @@ in { }; }; + telegram = buildPlugin rec { + pname = "Telegram"; + version = "1.6.4"; + + src = fetchFromGitHub { + owner = "fabianonline"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "14d9f9a5m1prcikd7y26qks6c2ls6qq4b97amn24q5a8k5hbgl94"; + }; + + propagatedBuildInputs = with super; [ pillow ]; + + meta = with lib; { + description = "Plugin to send status messages and receive commands via Telegram messenger."; + homepage = "https://github.com/fabianonline/OctoPrint-Telegram"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + }; + }; + themeify = buildPlugin rec { pname = "Themeify"; version = "1.2.2"; From 7e35bf23c28c2b0351e6c4b59e52d039053a2cc1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 15 Mar 2021 22:50:16 +0100 Subject: [PATCH 05/22] octoprint.python.pkgs.m86motorsoff: init at 0.1.0 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 549e1a0ba2f..ae2151383bc 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -13,6 +13,25 @@ self: super: let in { inherit buildPlugin; + m86motorsoff = buildPlugin rec { + pname = "M84MotorsOff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ntoff"; + repo = "Octoprint-M84MotOff"; + rev = "v${version}"; + sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7"; + }; + + meta = with lib; { + description = "Changes the \"Motors off\" button in octoprint's control tab to issue an M84 command to allow compatibility with Repetier firmware Resources"; + homepage = "https://github.com/ntoff/OctoPrint-M84MotOff"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + }; + }; + abl-expert = buildPlugin rec { pname = "ABL_Expert"; version = "0.6"; From 4b463787dd656721867eba16f42ee173f3ef8375 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Apr 2021 11:20:39 +0200 Subject: [PATCH 06/22] gdu: 4.10.0 -> 4.10.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index c9479dca906..348d635584f 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYxWjvXGaygoe88muQmQWlDJfM04wqxHy8+l7KO688U="; + sha256 = "sha256-zU4aSvfW1ph9PrXsAErCOedPn4oeeSh8tpnUj5LRlUw="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; From dabbf9d447340a1624b9a200e783773d9a253ac2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Apr 2021 04:20:00 +0000 Subject: [PATCH 07/22] shadowsocks-rust: 1.10.5 -> 1.10.7 https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.10.6 https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.10.7 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 5b5d8ee1545..97157071733 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0nagn7792qniczzv0912h89bn8rm8hyikdiw7cqwknx0hw8dwz1z"; + sha256 = "08k5j469750bhlq49qc5nwc2jjgmy9qsm58nf2jfwhxlpflv12sc"; }; - cargoSha256 = "0arqc0wnvfkmk8xzsdc6fvd1adazrw950ld8xyh7r588pyphjmhn"; + cargoSha256 = "1r8w5cdygd26m95q9qpqa85aixx25jr510hpjlllbpfvm7zjpbqk"; RUSTC_BOOTSTRAP = 1; From ce7d5a1211b040220d7e2bd97b81c2cbe04c5050 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 17 Apr 2021 18:20:08 +0200 Subject: [PATCH 08/22] bootil: unstable-2015-12-17 -> unstable-2019-11-18 --- pkgs/development/libraries/bootil/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 20ca175d7b8..a2045e38143 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,24 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }: +{ lib +, stdenv +, fetchFromGitHub +, premake4 +}: stdenv.mkDerivation { pname = "bootil"; - version = "unstable-2015-12-17"; + version = "unstable-2019-11-18"; src = fetchFromGitHub { owner = "garrynewman"; repo = "bootil"; - rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b"; - sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg"; + rev = "beb4cec8ad29533965491b767b177dc549e62d23"; + sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij"; }; - patches = [ - (fetchpatch { - url = "https://github.com/garrynewman/bootil/pull/22.patch"; - name = "github-pull-request-22.patch"; - sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; - }) - ]; - # Avoid guessing where files end up. Just use current directory. postPatch = '' substituteInPlace projects/premake4.lua \ @@ -28,6 +24,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ premake4 ]; + premakefile = "projects/premake4.lua"; installPhase = '' @@ -40,8 +37,7 @@ stdenv.mkDerivation { homepage = "https://github.com/garrynewman/bootil"; # License unsure - see https://github.com/garrynewman/bootil/issues/21 license = licenses.free; - maintainers = [ maintainers.abigailbuccaneer ]; - platforms = platforms.all; + maintainers = with maintainers; [ abigailbuccaneer ]; # Build uses `-msse` and `-mfpmath=sse` badPlatforms = [ "aarch64-linux" ]; }; From c7b8db43af8d900caadd721566a0be658c7c9aab Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 17 Apr 2021 18:58:46 +0200 Subject: [PATCH 09/22] inxi: 3.3.03-1 -> 3.3.04-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index d529e9cf025..bf14187e3f1 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.3.03-1"; + version = "3.3.04-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0="; + sha256 = "sha256-/EutIHQGLiRcRD/r8LJYG7oJBb7EAhR5cn6QiC7zMOc="; }; nativeBuildInputs = [ makeWrapper ]; From 590fa80026dbaa004db6ea68d0697fff2ac4711d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 17 Apr 2021 19:00:16 +0200 Subject: [PATCH 10/22] inxi: Remove myself as maintainer --- pkgs/tools/system/inxi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index bf14187e3f1..b03a7c14a7d 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } From fbb4f6bd0e88025620d10b5990b5452cbc5e5a5a Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 17 Apr 2021 18:59:49 +0200 Subject: [PATCH 11/22] font-awesome: 5.10.2 -> 5.15.3 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index bcf02f1328e..7f251232ebc 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -39,7 +39,7 @@ in { sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; }; v5 = font-awesome { - version = "5.10.2"; - sha256 = "0bg28zn2lhrcyj7mbavphkvw3hrbnjsnn84305ax93nj3qd0d4hx"; + version = "5.15.3"; + sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; }; } From 7f412547a6973878623283af7b9a38f483f70484 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 17 Apr 2021 18:26:16 +0200 Subject: [PATCH 12/22] sta: unstable-2016-01-25 -> unstable-2020-05-10 --- pkgs/tools/misc/sta/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix index aa27ddf0838..809287edcf6 100644 --- a/pkgs/tools/misc/sta/default.nix +++ b/pkgs/tools/misc/sta/default.nix @@ -1,16 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +}: + stdenv.mkDerivation { pname = "sta"; - version = "unstable-2016-01-25"; + version = "unstable-2020-05-10"; src = fetchFromGitHub { owner = "simonccarter"; repo = "sta"; - rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed"; - sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk"; + rev = "566e3a77b103aa27a5f77ada8e068edf700f26ef"; + sha256 = "1v20di90ckl405rj5pn6lxlpxh2m2b3y9h2snjvk0k9sihk7w7d5"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { description = "Simple statistics from the command line interface (CLI), fast"; From fd478d01df453e9c86b6959577ad951bf93a72dd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 17 Apr 2021 20:24:38 +0200 Subject: [PATCH 13/22] cryptomator: fix desktop integration Move the .desktop files from usr/share to share. --- pkgs/tools/security/cryptomator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 1cc0045a5b2..465e05077b2 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { --set JAVA_HOME "${jre.home}" # install desktop entry and icons - cp -r ${icons}/resources/appimage/AppDir/usr $out/ + cp -r ${icons}/resources/appimage/AppDir/usr/* $out/ ''; nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; From 187ce927bcd1e81aaf0409cc78b7343ba1bc251f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 17 Apr 2021 00:58:02 +0000 Subject: [PATCH 14/22] python3.pkgs.flufl_lock: 3.2 -> 5.0.5 --- pkgs/development/python-modules/flufl/lock.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1be5d9a7c4c..53a2da3d79b 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,13 +1,16 @@ -{ buildPythonPackage, fetchPypi, atpublic }: +{ buildPythonPackage, fetchPypi, pytestCheckHook +, atpublic, psutil, pytestcov, sybil +}: buildPythonPackage rec { pname = "flufl.lock"; - version = "3.2"; - - propagatedBuildInputs = [ atpublic ]; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8"; + sha256 = "1bnapkg99r6mixn3kh314bqcfk8q54y0cvhjpj87j7dhjpsakfpz"; }; + + propagatedBuildInputs = [ atpublic psutil ]; + checkInputs = [ pytestCheckHook pytestcov sybil ]; } From d555a13ff10677c1db1ed2605051860f63453b06 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 17 Apr 2021 00:59:46 +0000 Subject: [PATCH 15/22] python3.pkgs.flufl_lock: add meta; adopt --- pkgs/development/python-modules/flufl/lock.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 53a2da3d79b..b44a7f3cdfe 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook , atpublic, psutil, pytestcov, sybil }: @@ -13,4 +13,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic psutil ]; checkInputs = [ pytestCheckHook pytestcov sybil ]; + + meta = with lib; { + homepage = "https://flufllock.readthedocs.io/"; + description = "NFS-safe file locking with timeouts for POSIX and Windows"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.asl20; + platforms = platforms.all; + }; } From be74a6ae30620000c37b88b9a6d29c54339cdc50 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 17 Apr 2021 01:00:53 +0000 Subject: [PATCH 16/22] python3.pkgs.hyperkitty: 1.3.3 -> 1.3.4 --- pkgs/servers/mail/mailman/hyperkitty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 054d9dcf91a..ed90362a9a2 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "HyperKitty"; # Note: Mailman core must be on the latest version before upgrading HyperKitty. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.3"; + version = "1.3.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0p85r9q6mn5as5b39xp9hkkipnk0156acx540n2ygk3qb3jd4a5n"; + sha256 = "1lbh8n66fp3l5s0xvmvsbfvgs3z4knx0gwf0q117n2nfkslf13zp"; }; nativeBuildInputs = [ isort ]; From 26fb5f75ada0fcc7bec6d9dfbe16224dca1ef374 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 17 Apr 2021 18:37:17 -0700 Subject: [PATCH 17/22] looking-glass-client: B2 -> B3 --- ...ore-maybe-uninitialized-when-O3-is-i.patch | 45 +++++++++++++++++++ .../looking-glass-client/default.nix | 19 +++++--- 2 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch new file mode 100644 index 00000000000..82ce050b587 --- /dev/null +++ b/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch @@ -0,0 +1,45 @@ +From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001 +From: Geoffrey McRae +Date: Tue, 23 Feb 2021 20:25:30 +1100 +Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in + use + +Closes #475 +--- + client/renderers/EGL/egl.c | 3 ++- + client/src/main.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c +index b7a5644..72ce50d 100644 +--- a/client/renderers/EGL/egl.c ++++ b/client/renderers/EGL/egl.c +@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this) + if (!this->formatValid) + return; + +- int w, h; ++ int w = 0, h = 0; ++ + switch(this->format.rotate) + { + case LG_ROTATE_0: +diff --git a/client/src/main.c b/client/src/main.c +index f05e929..f5d6fad 100644 +--- a/client/src/main.c ++++ b/client/src/main.c +@@ -186,8 +186,9 @@ static void updatePositionInfo(void) + if (!g_state.haveSrcSize) + goto done; + +- float srcW; +- float srcH; ++ float srcW = 0.0f; ++ float srcH = 0.0f; ++ + switch(params.winRotate) + { + case LG_ROTATE_0: +-- +2.30.1 + diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 720f684f44c..345018bbe4e 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp -, libXi, libXext, wayland, libffi, libGLU, expat, libbfd +, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver +, expat, libbfd }: stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B2"; + version = "B3"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d"; + sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f"; fetchSubmodules = true; }; @@ -19,10 +20,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle - libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat - libbfd + libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols + libffi libGLU libXScrnSaver expat libbfd ]; + patches = [ + # error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized] + # Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3. + # Including our own patch here since upstream commit patch doesnt apply cleanly on B3 + ./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch + ]; + patchFlags = "-p2"; + sourceRoot = "source/client"; NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. From 6649c6d75c8a246861608d8999429279c766e7d1 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 14 Apr 2021 21:01:56 +0200 Subject: [PATCH 18/22] inotify-tools: 3.20.2.2 -> 3.20.11.0 --- .../tools/misc/inotify-tools/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index e085d3dd259..48e2139b74d 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,29 +1,22 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "inotify-tools"; - version = "3.20.2.2"; + version = "3.20.11.0"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "rvoicilas"; rev = version; - sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0"; + sha256 = "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2"; }; - patches = [ - (fetchpatch { - url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch"; - sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { homepage = "https://github.com/rvoicilas/inotify-tools/wiki"; - license = licenses.gpl2; - maintainers = with maintainers; [ marcweber pSub ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ marcweber pSub shamilton ]; platforms = platforms.linux; }; } From 499051045f1b35a55f6d80781dc09be32654eaf2 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Apr 2021 19:10:52 +0200 Subject: [PATCH 19/22] spin: update homepage to https --- pkgs/development/tools/analysis/spin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 58bb58fa2b0..b4da93a2af3 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Formal verification tool for distributed software systems"; - homepage = "http://spinroot.com/"; + homepage = "https://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; From ea3622dcc8ed05fd2dd94a0634c28b1f3f9ebc52 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 18 Apr 2021 20:19:40 -0400 Subject: [PATCH 20/22] passphrase2pgp: 1.1.0 -> 1.2.0 (#119748) Co-authored-by: Dmitry Bogatov --- pkgs/tools/security/passphrase2pgp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/tools/security/passphrase2pgp/default.nix index a53e03c3c1e..55e19b94813 100644 --- a/pkgs/tools/security/passphrase2pgp/default.nix +++ b/pkgs/tools/security/passphrase2pgp/default.nix @@ -1,14 +1,14 @@ -{ lib, pandoc, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "passphrase2pgp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = pname; rev = "v${version}"; - hash = "sha256-Nje77tn55CKRU6igEA/6IquDhXVVQAdiez6nmN49di4"; + hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg="; }; vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs"; From cd251bfd119411e014625548b85c7a52944a490a Mon Sep 17 00:00:00 2001 From: tomberek Date: Sun, 18 Apr 2021 22:33:03 -0400 Subject: [PATCH 21/22] innernet: init at 1.0.0 (#118007) Co-authored-by: Sandro --- pkgs/tools/networking/innernet/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/innernet/default.nix diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix new file mode 100644 index 00000000000..a195841ab57 --- /dev/null +++ b/pkgs/tools/networking/innernet/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, linuxHeaders, sqlite, Security }: + +rustPlatform.buildRustPackage rec { + pname = "innernet"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "tonarino"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OomCSA02ypFVzkYMcmkFREWB6x7oxgpt7x2zRANIDMw="; + }; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + nativeBuildInputs = with llvmPackages; [ llvm clang ]; + buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ]; + cargoSha256 = "sha256-GYNk3j8fjKSo3Qk6Qy0l6kNINK3FxlSYoEkJSx7kVpk="; + + meta = with lib; { + description = "A private network system that uses WireGuard under the hood"; + homepage = "https://github.com/tonarino/innernet"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek _0x4A6F ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf28b9782c..71a063a4393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5578,6 +5578,10 @@ in infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; + innernet = callPackage ../tools/networking/innernet { + inherit (darwin.apple_sdk.frameworks) Security; + }; + innoextract = callPackage ../tools/archivers/innoextract { }; input-utils = callPackage ../os-specific/linux/input-utils { }; From ef107ba439b3c03501a646c5936cda035b71d923 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 18 Apr 2021 22:56:12 -0400 Subject: [PATCH 22/22] checkbashisms: 2.0.0.2 -> 2.21.1 (#119754) Co-authored-by: Dmitry Bogatov --- .../tools/misc/checkbashisms/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 524abbfdc90..6222bb312bb 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl, installShellFiles }: stdenv.mkDerivation rec { - version = "2.0.0.2"; + version = "2.21.1"; pname = "checkbashisms"; src = fetchurl { - url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; - sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; + hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI="; }; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ perl ]; - # The link returns directly the script. No need for unpacking - dontUnpack = true; + buildPhase = '' + runHook preBuild + substituteInPlace ./scripts/checkbashisms.pl \ + --replace '###VERSION###' "$version" + + runHook postBuild + ''; installPhase = '' - install -D -m755 $src $out/bin/checkbashisms + runHook preInstall + + installManPage scripts/$pname.1 + installShellCompletion --bash --name $pname scripts/$pname.bash_completion + install -D -m755 scripts/$pname.pl $out/bin/$pname + + runHook postInstall ''; meta = { homepage = "https://sourceforge.net/projects/checkbaskisms/"; description = "Check shell scripts for non-portable syntax"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ kaction ]; platforms = lib.platforms.unix; }; }