b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-07-29 06:01:59 +00:00 committed by GitHub
parent 05cc23e3bf e9afd4368a
commit dc9426f3b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 152 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/jove/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "jove";
version = "4.17.3.7";
version = "4.17.4.6";
src = fetchFromGitHub {
owner = "jonmacs";
repo = "jove";
rev = version;
sha256 = "sha256-fD87FIWZlfJE2tVX+0QaiGGqu+tJFHheXe1guJR/Hxg=";
sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/networking/cluster/k0sctl/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A50PbZTgv0EfL5aqTiTEOdfRXUgKGzTsRIiMgXItkxI=";
sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU=";
};
vendorSha256 = "sha256-2i6SoixE5RitRuJpOU4LdzN9JY/76c3mjsbsXlQp854=";
vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY=";
ldflags = [
"-s"

6
pkgs/applications/networking/nali/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nali";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "zu1k";
repo = "nali";
rev = "v${version}";
sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c=";
sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI=";
};
vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ=";
vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8=";
subPackages = [ "." ];
meta = with lib; {

22
pkgs/applications/networking/tcping-go/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule {
pname = "tcping-go";
version = "unstable-2022-05-28";
src = fetchFromGitHub {
owner = "cloverstd";
repo = "tcping";
rev = "83f644c761819f7c4386f0645cd0a337eccfc62e";
sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI=";
};
vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ=";
meta = with lib; {
description = "Ping over TCP instead of ICMP, written in Go";
homepage = "https://github.com/cloverstd/tcping";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

34
pkgs/applications/version-management/srcml/default.nix
View file

@ -1,34 +0,0 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2,
curl
}:
with lib;
stdenv.mkDerivation rec {
version = "0.9.5_beta";
pname = "srcml";
src = fetchurl {
url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam";
};
prePatch = ''
patchShebangs .
substituteInPlace CMake/install.cmake --replace /usr/local $out
'';
patches = [
./gcc6.patch
];
nativeBuildInputs = [ cmake antlr2 ];
buildInputs = [ libxml2 libxslt boost libarchive python2 curl ];
meta = {
description = "Infrastructure for exploration, analysis, and manipulation of source code";
homepage = "https://www.srcml.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ leenaars ];
};
}

26
pkgs/applications/version-management/srcml/gcc6.patch
View file

@ -1,26 +0,0 @@
diff --git i/CMake/config.cmake w/CMake/config.cmake
index 28f8047..c596cf8 100644
--- i/CMake/config.cmake
+++ w/CMake/config.cmake
@@ -95,7 +95,7 @@ else()
find_package(LibXml2 REQUIRED)
find_package(CURL REQUIRED)
set(Boost_NO_BOOST_CMAKE ON)
- set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost COMPONENTS program_options filesystem system thread regex date_time REQUIRED)
# add include directories
diff --git i/src/libsrcml/srcml_reader_handler.hpp w/src/libsrcml/srcml_reader_handler.hpp
index 0b23fed..c02dfef 100644
--- i/src/libsrcml/srcml_reader_handler.hpp
+++ w/src/libsrcml/srcml_reader_handler.hpp
@@ -456,7 +456,7 @@ public :
if(uri == SRCML_CPP_NS_URI) {
- if(archive->language != 0) {
+ if(srcml_check_language(archive->language->c_str()) != 0) {
if(*archive->language == "C++" || *archive->language == "C" || *archive->language == "Objective-C")
archive->options |= SRCML_OPTION_CPP | SRCML_OPTION_CPP_NOMACRO;

6
pkgs/applications/video/aegisub/default.nix
View file

@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "aegisub";
version = "3.3.2-20220612";
version = "3.3.3";
src = fetchFromGitHub {
owner = "wangqr";
repo = pname;
rev = "91f8b5f91eb960bad19899c10af08aca34f9b697";
sha256 = "sha256-lPkPWSsncsBKJHDnma9cUXsQJynruT9JpPkMTHdQ/e8=";
rev = "v${version}";
sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78=";
};
nativeBuildInputs = [

6
pkgs/applications/video/wf-recorder/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wf-recorder";
version = "0.2.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ammen99";
repo = pname;
rev = "v${version}";
sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
sha256 = "sha256-othFp97rUrdUoAXkup8VvpcyPHs5iYNFyRE3h3rcmqE=";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ yuka ];
platforms = platforms.linux;
};
}

4
pkgs/applications/virtualization/imgcrypt/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "imgcrypt";
version = "1.1.4";
version = "1.1.6";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA=";
sha256 = "sha256-ytoxdwmyg7IlJOhC6FPI9dnoiptEQrlAAPV57/O3M4U=";
};
ldflags = [

6
pkgs/development/compilers/gleam/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.21.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI=";
sha256 = "sha256-/mP15jPZiiavnZ7fwFehSSzJUtVVmksj1xfbDOycxmQ=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q=";
cargoSha256 = "sha256-JAQQiCnl/EMKCMqoL8WkwUcjng+MSz2Cjb3L5yyrQ+E=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

4
pkgs/development/libraries/libite/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libite";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "troglobit";
repo = "libite";
rev = "v${version}";
sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI=";
sha256 = "sha256-iviHxGXYUMjTgafkG4aqeHd9cnHA2VNhYG2eUta9R0Q=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View file

@ -3,7 +3,7 @@
}:
let
version = "2.0.6";
version = "2.0.7";
# Make sure we override python, so the correct version is chosen
boostPython = boost.override { enablePython = true; inherit python; };
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-SQ9yRuINxYJH0LIC3XK7Ssl/TO+DUxIRtdXz684bm8w=";
sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw=";
fetchSubmodules = true;
};

26
pkgs/development/tools/cbfmt/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }:
rustPlatform.buildRustPackage rec {
pname = "cbfmt";
version = "0.1.1";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cTX7eBcEZiTJm3b1d2Mwu7NdbtHjeF+dkc3YMede0cQ=";
};
cargoSha256 = "sha256-vEInZplfgrM4gD5wPATl7j5iTo9pSstElfd0Lq9giJw=";
passthru.tests.version = testers.testVersion {
package = cbfmt;
};
meta = with lib; {
description = "A tool to format codeblocks inside markdown and org documents";
homepage = "https://github.com/lukas-reineke/cbfmt";
license = licenses.mit;
maintainers = [ maintainers.stehessel ];
};
}

4
pkgs/development/tools/lazygit/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.34";
version = "0.35";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AXbbgNP10r3BVRXg9R8Ssd8yORCcQwaGRuHV6yXz5i0=";
sha256 = "sha256-TYtjwEQTXjkp1o95cXJw0VDVv5us07K+6NrJF9bsJfg=";
};
vendorSha256 = null;

6
pkgs/development/tools/rust/rust-script/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-script";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "fornwall";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WcvRkp57VyBB5gQgamFoR6wK1cRJ+3hQqixOBgeapJU=";
sha256 = "sha256-5T5DivfT7/MkBJo5YgLAVnfct84nBhw/OXWQ/4TMm2A=";
};
cargoSha256 = "sha256-qJIftByppOrT4g3sxmKRSLhxtpAW4eXWX0FhmMDJNu0=";
cargoSha256 = "sha256-mDH3R9gn64DXVoe3Vkl2Kwhr7OTOUWKBLW5Y+Uo4aXM=";
# tests require network access
doCheck = false;

15
pkgs/servers/mautrix-telegram/default.nix
View file

@ -5,6 +5,21 @@
let
python = python3.override {
packageOverrides = self: super: {
asyncpg = super.asyncpg.overridePythonAttrs (oldAttrs: rec {
version = "0.25.0";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA=";
};
});
mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
version = "0.16.3";
src = oldAttrs.src.override {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU=";
};
});
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
version = "1.25.0a7";
pname = "tulir-telethon";

4
pkgs/servers/monitoring/mimir/default.nix
View file

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "mimir";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
sha256 = "sha256-n7Vzp/GQIC+Mryu9SycMZ3ScPo5O+5tA4TdigpKzmLU=";
sha256 = "sha256-c2WOE7lm62uZ+oVSWd2Gyo0UZJaf9yFzEQZvcwpvshA=";
};
vendorSha256 = null;

4
pkgs/tools/misc/bsp-layout/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "phenax";
repo = pname;
rev = "181d38443778e81df2d4bc3639063c3ae608f9c7";
sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo=";
rev = "9d60fc271454ea1bfca598575207a06d8d172d3e";
sha256 = "sha256-7bBVWJdgAnXLWzjQGZxVqhku2rsxX2kMxU4xkI9/DHE=";
};
nativeBuildInputs = [ makeWrapper git bc ];

6
pkgs/tools/misc/fend/default.nix
View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eYCFX3JVsTnmVzHQd9JU6BT80kS0LTjVwVcfNJink1M=";
sha256 = "sha256-6zYz6DMnYSGyDXqP5K8bKauy23YA2tzBmGk72f5+bgY=";
};
cargoSha256 = "sha256-+N8/ZKj1Ht2lkTYSEm/lrLtopBQqc82gIFiLzJ6NogU=";
cargoSha256 = "sha256-ydt2YGx5WWk42Vq4RXhiRf6kIne7Q/6XwIu+HEnhDVw=";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

6
pkgs/tools/misc/pipe-rename/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "pipe-rename";
version = "1.4.1";
version = "1.5.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-3Jl/G1QqcChwkI5n1zQLBgGxT2CYdh3XdMHkF+V5SG4=";
sha256 = "sha256-NTAZy2ERxznRVld1WzYBchJakOIfs5uJr3yRNt81rMg=";
};
cargoSha256 = "sha256-y5BsdkHrjJHNO66MQTbvA6kKx6tLP7jNk5UmAmslz14=";
cargoSha256 = "sha256-6Rv3rVQEvxdrEp5plhf9NAxpXOD4szwFGU5M6tvakzk=";
checkInputs = [ python3 ];

4
pkgs/tools/security/mokutil/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "mokutil";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "lcp";
repo = pname;
rev = version;
sha256 = "sha256-dt41TCr6RkmE9H+NN8LWv3ogGsK38JtLjVN/b2mbGJs=";
sha256 = "sha256-qwSEv14mMpaKmm6RM882JzEnBQG3loqsoglg4qTFWUg=";
};
nativeBuildInputs = [

40
pkgs/tools/security/openpgp-card-tools/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, pkg-config
, pcsclite
, nettle
, PCSC
, testers
, openpgp-card-tools
}:
rustPlatform.buildRustPackage rec {
pname = "openpgp-card-tools";
version = "0.0.12";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-3OKOMe7Uj+8qpzfu0DzqwIGa/QJ0YoKczPN9W8HXJZU=";
};
cargoHash = "sha256-gq17BXorXrlJx4zlvLuOT8XGUCqZXFDSxgs/Fv9dChk=";
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
passthru = {
tests.version = testers.testVersion {
package = openpgp-card-tools;
};
};
meta = with lib; {
description = "CLI tools for OpenPGP cards";
homepage = "https://gitlab.com/openpgp-card/openpgp-card";
license = licenses.asl20;
maintainers = with maintainers; [ nickcao ];
mainProgram = "opgpcard";
};
}

16
pkgs/tools/system/plan9port/default.nix
View file

@ -17,24 +17,8 @@ stdenv.mkDerivation rec {
};
postPatch = ''
#hardcoded path
substituteInPlace src/cmd/acme/acme.c \
--replace /lib/font/bit $out/plan9/font
#deprecated flags
find . -type f \
-exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
-exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
substituteInPlace bin/9c \
--replace 'which uniq' '${which}/bin/which uniq'
'' + lib.optionalString (!stdenv.isDarwin) ''
#add missing ctrl+c\z\x\v keybind for non-Darwin
substituteInPlace src/cmd/acme/text.c \
--replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \
--replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \
--replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
'';
buildInputs = [ perl ] ++ (if !stdenv.isDarwin then [

1
pkgs/top-level/aliases.nix
View file

@ -1338,6 +1338,7 @@ mapAliases ({
sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22
sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22
squid4 = squid; # added 2019-08-22
srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21
sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22
ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14

10
pkgs/top-level/all-packages.nix
View file

@ -292,6 +292,8 @@ with pkgs;
buf = callPackage ../development/tools/buf { };
cbfmt = callPackage ../development/tools/cbfmt { };
cfn-nag = callPackage ../development/tools/cfn-nag { };
cxx-rs = callPackage ../development/libraries/cxx-rs { };
@ -10846,8 +10848,6 @@ with pkgs;
squashfuse = callPackage ../tools/filesystems/squashfuse { };
srcml = callPackage ../applications/version-management/srcml { };
srt-live-server = callPackage ../applications/video/srt-live-server { };
srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { };
@ -20435,6 +20435,10 @@ with pkgs;
openpa = callPackage ../development/libraries/openpa { };
openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools {
inherit (darwin.apple_sdk.frameworks) PCSC;
};
opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
openscenegraph = callPackage ../development/libraries/openscenegraph {
@ -29268,6 +29272,8 @@ with pkgs;
taxi-cli = with python3Packages; toPythonApplication taxi;
tcping-go = callPackage ../applications/networking/tcping-go { };
librep = callPackage ../development/libraries/librep { };
rep-gtk = callPackage ../development/libraries/rep-gtk { };