Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-01-07 06:01:27 +00:00 committed by GitHub
commit b48a41c77c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 67 additions and 155 deletions

View file

@ -2675,6 +2675,12 @@
email = "christoph.senjak@googlemail.com";
name = "Christoph-Simon Senjak";
};
datafoo = {
email = "34766150+datafoo@users.noreply.github.com";
github = "datafoo";
githubId = 34766150;
name = "datafoo";
};
davhau = {
email = "d.hauer.it@gmail.com";
name = "David Hauer";

View file

@ -14,7 +14,7 @@ in mkDerivation {
src = fetchurl {
# NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
url = "http://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
};

View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.9.3";
version = "1.9.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-0+NY21oIbRMCYnneWxw48yQ3UOXW0Ves2A4JTXyLnCE=";
sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8=";
fetchSubmodules = true;
};

View file

@ -59,7 +59,7 @@ mkDerivationWith python2Packages.buildPythonApplication rec {
'';
meta = with lib; {
homepage = "http://icanblink.com/";
homepage = "https://icanblink.com/";
description = "A state of the art, easy to use SIP client for Voice, Video and IM";
platforms = platforms.linux;
license = licenses.gpl3;

View file

@ -1,60 +0,0 @@
{ lib, stdenv
, fetchurl
, gcc-unwrapped
, dpkg
, bash
, nodePackages
, makeWrapper
, electron_6
}:
let
electron = electron_6;
in
stdenv.mkDerivation rec {
pname = "openbazaar-client";
version = "2.4.10";
src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY=";
};
dontBuild = true;
dontConfigure = true;
nativeBuildInputs = [ makeWrapper ];
unpackPhase = ''
${dpkg}/bin/dpkg-deb -x $src .
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/{${pname},applications,pixmaps}
cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname}
cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop
cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'openbazaar2client' 'openbazaar-client'
runHook postInstall
'';
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
'';
meta = with lib; {
description = "Decentralized Peer to Peer Marketplace for Bitcoin - client";
homepage = "https://www.openbazaar.org/";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -1,48 +0,0 @@
{ lib, stdenv
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "openbazaar";
version = "0.14.6";
suffix = {
i686-linux = "linux-386";
x86_64-darwin = "darwin-10.6-amd64";
x86_64-linux = "linux-amd64";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}";
sha256 = {
i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq";
x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx";
x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
dontStrip = true;
dontPatchELF = true;
preferLocalBuild = true;
installPhase = ''
install -D $src $out/bin/openbazaard
'';
postFixup = lib.optionalString (!stdenv.isDarwin) ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/openbazaard
'';
meta = with lib; {
description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon";
homepage = "https://www.openbazaar.org/";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ];
};
}

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
# actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M=";
};

View file

@ -18,7 +18,7 @@ buildKodiAddon rec {
};
meta = with lib; {
homepage = "http://python-future.org";
homepage = "https://python-future.org";
description = "The missing compatibility layer between Python 2 and Python 3";
license = licenses.mit;
maintainers = teams.kodi.members;

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tiling tabbed window manager designed with keyboard users in mind";
homepage = "http://modeemi.fi/~tuomov/ion";
homepage = "https://modeemi.fi/~tuomov/ion";
platforms = with platforms; linux;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];

View file

@ -3,7 +3,7 @@
fetchzip {
name = "ipaexfont-003.01";
url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
postFetch = ''
mkdir -p $out/share/fonts

View file

@ -14,7 +14,7 @@ in fetchzip {
meta = with lib; {
description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
homepage = "http://jmn.pl/en/kurier-i-iwona/";
homepage = "https://jmn.pl/en/kurier-i-iwona/";
# "[...] GUST Font License (GFL), which is a free license, legally
# equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
# later." - GUST website

View file

@ -5,7 +5,7 @@ let
in fetchzip rec {
name = "quattrocento-sans-${version}";
url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}

View file

@ -5,7 +5,7 @@ let
in fetchzip rec {
name = "quattrocento-${version}";
url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}

View file

@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation {
version = "1";
src = fetchurl {
url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
# Alternative mirror:
# http://www.eeo.cn/download/font/VistaFont_CHS.EXE
sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi";

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
Freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.
'';
homepage = "http://freepats.zenvoid.org/";
homepage = "https://freepats.zenvoid.org/";
license = licenses.gpl2;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];

View file

@ -60,7 +60,7 @@
libraryHaskellDepends = [
base binary bytestring containers ghc-prim ghci template-haskell
];
homepage = "http://github.com/ghcjs";
homepage = "https://github.com/ghcjs";
license = lib.licenses.mit;
}) {};
@ -71,7 +71,7 @@
version = "0.1.1.0";
src = ./.;
libraryHaskellDepends = [ base ghc-prim ];
homepage = "http://github.com/ghcjs";
homepage = "https://github.com/ghcjs";
license = lib.licenses.mit;
}) {};
}

View file

@ -91,7 +91,7 @@ in {
sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw";
};
libressl_3_4 = generic {
version = "3.4.1";
sha256 = "0766yxb599lx7qmlmsddiw9wgminz9mc311mav5q23l0rbkflz0h";
version = "3.4.2";
sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84=";
};
}

View file

@ -17,7 +17,7 @@ mkDerivation {
vector
];
testHaskellDepends = [ base hspec ];
homepage = "http://github.com/bos/pool";
homepage = "https://github.com/bos/pool";
description = "A high-performance striped resource pooling implementation";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lassulus ];

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.10";
version = "0.2.11";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
sha256 = "1c4wks67vm2dwzmm3xqkidyss04vkx4mpkkr8l1c7c5myfk1n157";
sha256 = "14m2r3x1dgh3npnbspkp2214976669nnpqhbc26ib88qmn75kzad";
};
checkInputs = [

View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "8.8.0";
version = "8.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "8689b5c4d69e93026aea252314fb3133359fa70df5819ad6995c4e44a2f84858";
sha256 = "ba2021812835bfeb19ad6d32a1afeb41cb01e45f4fd2b8145ae162800e4bc87f";
};
propagatedBuildInputs = [

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pytest-console-scripts";
version = "1.2.1";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3";
sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394";
};
postPatch = ''
# setuptools-scm is pinned to <6 because it dropped Python 3.5

View file

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.20.7";
version = "0.20.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "64f3ee91cb9424ac1f27a2e13a4d03090a57d2e0e5edf6981a0b4e5295844c81";
sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574";
};
propagatedBuildInputs = [

View file

@ -31,12 +31,12 @@
buildPythonPackage rec {
pname = "sunpy";
version = "3.1.2";
version = "3.1.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "5eeb479c3f2424bf46355165249a1caa849872f8bee525349c4dca4d15b271fd";
sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2";
};
nativeBuildInputs = [

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.9.40";
version = "3.9.41";
src = fetchPypi {
inherit pname version;
sha256 = "321005b498361548ce2e048f8499a347d8f38c75ff9f74cee7b118c84b0c41d4";
sha256 = "7cacd454f4cfde741698aa8bca4fdbc775dc42f66a3135dd0c8308fe7ba733be";
};
propagatedBuildInputs = [ numpy ];

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.17.1";
version = "1.17.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XzpOJTLTiF4GrECC7ObFzoPusFM8mvhUGH9F52o88MY=";
sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg=";
};
cargoSha256 = "sha256-7uTxDkAyViNidSDH6bdUrtP96vQgyz+p2OlK+/FUJvc=";
cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

View file

@ -5,7 +5,7 @@ let
[
# Untrusted mirrors - do not update hashes
"https://ludios.org/mirror/ue4demos/${file}"
"http://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
"https://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
];
buildDemo = { name, src }:

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.8.29";
src = fetchurl {
url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
url = "https://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
};
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Ultimate/Unix/Unusable Amiga Emulator";
license = lib.licenses.gpl2Plus;
homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};

View file

@ -144,6 +144,23 @@ let
};
};
apollographql.vscode-apollo = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-apollo";
publisher = "apollographql";
version = "1.19.9";
sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
description = "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo";
homepage = "https://github.com/apollographql/vscode-graphql";
license = licenses.mit;
maintainers = with maintainers; [ datafoo ];
};
};
arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "nord-visual-studio-code";

View file

@ -30,6 +30,5 @@ buildGoModule rec {
license = licenses.asl20;
homepage = "https://etcd.io/";
maintainers = with maintainers; [ offline zowoq ];
platforms = platforms.unix;
};
}

View file

@ -31,6 +31,5 @@ buildGoPackage rec {
license = licenses.asl20;
homepage = "https://etcd.io/";
maintainers = with maintainers; [ offline zowoq ];
platforms = platforms.unix;
};
}

View file

@ -32,7 +32,7 @@ buildGoModule rec {
meta = with lib; {
description = "Modern & minimalistic load balancer for the Сloud era";
homepage = "http://gobetween.io";
homepage = "https://gobetween.io";
license = licenses.mit;
maintainers = with maintainers; [ tomberek ];
};

View file

@ -5,7 +5,7 @@
"license": "Apache-2.0",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana-image-renderer.git"
"url": "https://github.com/grafana/grafana-image-renderer.git"
},
"scripts": {
"eslint": "eslint . --ext .ts",

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://github.com/museoa/unzoo/";
homepage = "https://github.com/museoa/unzoo/";
description = "Manipulate archives of files in Zoo compressed form";
license = licenses.publicDomain;
maintainers = with maintainers; [ AndersonTorres ];

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://www.fourmilab.ch/webtools/qprint/";
homepage = "https://www.fourmilab.ch/webtools/qprint/";
license = lib.licenses.publicDomain;
description = "Encode and decode Quoted-Printable files";
maintainers = [ lib.maintainers.tv ];

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = {
license = lib.licenses.gpl2Plus;
description = "A validating XML parser written in C";
homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html";
homepage = "https://www.cogsci.ed.ac.uk/~richard/rxp.html";
platforms = lib.platforms.unix;
};
}

View file

@ -634,6 +634,8 @@ mapAliases ({
octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
ofp = throw "ofp is not compatible with odp-dpdk";
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
opencl-icd = ocl-icd; # added 2017-01-20
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10

View file

@ -8354,9 +8354,6 @@ with pkgs;
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
openbazaar = callPackage ../applications/networking/openbazaar { };
openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };
openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
opencc = callPackage ../tools/text/opencc { };

View file

@ -793,7 +793,7 @@ let
rm $out/bin/wxchordpro # Wx not supported on darwin
'';
meta = {
homepage = "http://www.chordpro.org";
homepage = "https://www.chordpro.org";
description = "A lyrics and chords formatting program";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};