Merge master into staging-next
commitb48a41c77cbffd5a7e08fbc9643f2eca10417bbb
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
dateFri 7 Jan 2022, 06:01 (5 years ago)
parent4da57fc06c274d
maintainers/maintainer-list.nix+6
@@ -2675,6 +2675,12 @@
26752675 email = "christoph.senjak@googlemail.com";
26762676 name = "Christoph-Simon Senjak";
26772677 };
2678+ datafoo = {
2679+ email = "34766150+datafoo@users.noreply.github.com";
2680+ github = "datafoo";
2681+ githubId = 34766150;
2682+ name = "datafoo";
2683+ };
26782684 davhau = {
26792685 email = "d.hauer.it@gmail.com";
26802686 name = "David Hauer";
pkgs/applications/graphics/odafileconverter/default.nix+1−1
@@ -14,7 +14,7 @@ in mkDerivation {
1414
1515 src = fetchurl {
1616 # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
17− url = "http://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
17+ url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
1818 sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
1919 };
2020
pkgs/applications/networking/browsers/lagrange/default.nix+2−2
@@ -19,13 +19,13 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "lagrange";
22− version = "1.9.3";
22+ version = "1.9.5";
2323
2424 src = fetchFromGitHub {
2525 owner = "skyjake";
2626 repo = "lagrange";
2727 rev = "v${version}";
28− sha256 = "sha256-0+NY21oIbRMCYnneWxw48yQ3UOXW0Ves2A4JTXyLnCE=";
28+ sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8=";
2929 fetchSubmodules = true;
3030 };
3131
pkgs/applications/networking/instant-messengers/blink/default.nix+1−1
@@ -59,7 +59,7 @@ mkDerivationWith python2Packages.buildPythonApplication rec {
5959 '';
6060
6161 meta = with lib; {
62− homepage = "http://icanblink.com/";
62+ homepage = "https://icanblink.com/";
6363 description = "A state of the art, easy to use SIP client for Voice, Video and IM";
6464 platforms = platforms.linux;
6565 license = licenses.gpl3;
pkgs/applications/networking/openbazaar/client.nixdeleted−60
@@ -1,60 +0,0 @@
1−{ lib, stdenv
2−, fetchurl
3−, gcc-unwrapped
4−, dpkg
5−, bash
6−, nodePackages
7−, makeWrapper
8−, electron_6
9−}:
10−
11−let
12− electron = electron_6;
13−in
14−stdenv.mkDerivation rec {
15− pname = "openbazaar-client";
16− version = "2.4.10";
17−
18− src = fetchurl {
19− url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
20− sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY=";
21− };
22−
23− dontBuild = true;
24− dontConfigure = true;
25−
26− nativeBuildInputs = [ makeWrapper ];
27−
28− unpackPhase = ''
29− ${dpkg}/bin/dpkg-deb -x $src .
30− '';
31−
32− installPhase = ''
33− runHook preInstall
34−
35− mkdir -p $out/bin $out/share/{${pname},applications,pixmaps}
36−
37− cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname}
38− cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop
39− cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png
40−
41− substituteInPlace $out/share/applications/${pname}.desktop \
42− --replace 'openbazaar2client' 'openbazaar-client'
43−
44− runHook postInstall
45− '';
46−
47− postFixup = ''
48− makeWrapper ${electron}/bin/electron $out/bin/${pname} \
49− --add-flags $out/share/${pname}/resources/app \
50− --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
51− '';
52−
53− meta = with lib; {
54− description = "Decentralized Peer to Peer Marketplace for Bitcoin - client";
55− homepage = "https://www.openbazaar.org/";
56− license = licenses.mit;
57− maintainers = with maintainers; [ prusnak ];
58− platforms = [ "x86_64-linux" ];
59− };
60−}
pkgs/applications/networking/openbazaar/default.nixdeleted−48
@@ -1,48 +0,0 @@
1−{ lib, stdenv
2−, fetchurl
3−}:
4−
5−stdenv.mkDerivation rec {
6− pname = "openbazaar";
7− version = "0.14.6";
8−
9− suffix = {
10− i686-linux = "linux-386";
11− x86_64-darwin = "darwin-10.6-amd64";
12− x86_64-linux = "linux-amd64";
13− }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
14−
15− src = fetchurl {
16− url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}";
17− sha256 = {
18− i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq";
19− x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx";
20− x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i";
21− }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
22− };
23−
24− dontUnpack = true;
25− dontConfigure = true;
26− dontBuild = true;
27− dontStrip = true;
28− dontPatchELF = true;
29− preferLocalBuild = true;
30−
31− installPhase = ''
32− install -D $src $out/bin/openbazaard
33− '';
34−
35− postFixup = lib.optionalString (!stdenv.isDarwin) ''
36− patchelf \
37− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
38− $out/bin/openbazaard
39− '';
40−
41− meta = with lib; {
42− description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon";
43− homepage = "https://www.openbazaar.org/";
44− license = licenses.mit;
45− maintainers = with maintainers; [ prusnak ];
46− platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ];
47− };
48−}
pkgs/applications/version-management/p4/default.nix+1−1
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66
77 src = fetchurl {
88 # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
9− url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
9+ url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
1010 sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M=";
1111 };
1212
pkgs/applications/video/kodi/addons/future/default.nix+1−1
@@ -18,7 +18,7 @@ buildKodiAddon rec {
1818 };
1919
2020 meta = with lib; {
21− homepage = "http://python-future.org";
21+ homepage = "https://python-future.org";
2222 description = "The missing compatibility layer between Python 2 and Python 3";
2323 license = licenses.mit;
2424 maintainers = teams.kodi.members;
pkgs/applications/window-managers/ion-3/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 meta = with lib; {
2424 description = "Tiling tabbed window manager designed with keyboard users in mind";
25− homepage = "http://modeemi.fi/~tuomov/ion";
25+ homepage = "https://modeemi.fi/~tuomov/ion";
2626 platforms = with platforms; linux;
2727 license = licenses.lgpl21;
2828 maintainers = with maintainers; [ ];
pkgs/data/fonts/ipaexfont/default.nix+1−1
@@ -3,7 +3,7 @@
33fetchzip {
44 name = "ipaexfont-003.01";
55
6− url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
6+ url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
77
88 postFetch = ''
99 mkdir -p $out/share/fonts
pkgs/data/fonts/iwona/default.nix+1−1
@@ -14,7 +14,7 @@ in fetchzip {
1414
1515 meta = with lib; {
1616 description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
17− homepage = "http://jmn.pl/en/kurier-i-iwona/";
17+ homepage = "https://jmn.pl/en/kurier-i-iwona/";
1818 # "[...] GUST Font License (GFL), which is a free license, legally
1919 # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
2020 # later." - GUST website
pkgs/data/fonts/quattrocento-sans/default.nix+1−1
@@ -5,7 +5,7 @@ let
55in fetchzip rec {
66 name = "quattrocento-sans-${version}";
77
8− url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
8+ url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/{fonts,doc}
pkgs/data/fonts/quattrocento/default.nix+1−1
@@ -5,7 +5,7 @@ let
55in fetchzip rec {
66 name = "quattrocento-${version}";
77
8− url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
8+ url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
99
1010 postFetch = ''
1111 mkdir -p $out/share/{fonts,doc}
pkgs/data/fonts/vista-fonts-chs/default.nix+1−1
@@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation {
55 version = "1";
66
77 src = fetchurl {
8− url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
8+ url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
99 # Alternative mirror:
1010 # http://www.eeo.cn/download/font/VistaFont_CHS.EXE
1111 sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi";
pkgs/data/misc/freepats/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 Freepats is a project to create a free and open set of instrument
1717 patches, in any format, that can be used with softsynths.
1818 '';
19− homepage = "http://freepats.zenvoid.org/";
19+ homepage = "https://freepats.zenvoid.org/";
2020 license = licenses.gpl2;
2121 platforms = platforms.all;
2222 maintainers = [ maintainers.bjornfor ];
pkgs/development/compilers/ghcjs/8.10/stage0.nix+2−2
@@ -60,7 +60,7 @@
6060 libraryHaskellDepends = [
6161 base binary bytestring containers ghc-prim ghci template-haskell
6262 ];
63− homepage = "http://github.com/ghcjs";
63+ homepage = "https://github.com/ghcjs";
6464 license = lib.licenses.mit;
6565 }) {};
6666
@@ -71,7 +71,7 @@
7171 version = "0.1.1.0";
7272 src = ./.;
7373 libraryHaskellDepends = [ base ghc-prim ];
74− homepage = "http://github.com/ghcjs";
74+ homepage = "https://github.com/ghcjs";
7575 license = lib.licenses.mit;
7676 }) {};
7777}
pkgs/development/libraries/libressl/default.nix+2−2
@@ -91,7 +91,7 @@ in {
9191 sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw";
9292 };
9393 libressl_3_4 = generic {
94− version = "3.4.1";
95− sha256 = "0766yxb599lx7qmlmsddiw9wgminz9mc311mav5q23l0rbkflz0h";
94+ version = "3.4.2";
95+ sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84=";
9696 };
9797}
pkgs/development/misc/haskell/hasura/pool.nix+1−1
@@ -17,7 +17,7 @@ mkDerivation {
1717 vector
1818 ];
1919 testHaskellDepends = [ base hspec ];
20− homepage = "http://github.com/bos/pool";
20+ homepage = "https://github.com/bos/pool";
2121 description = "A high-performance striped resource pooling implementation";
2222 license = lib.licenses.bsd3;
2323 maintainers = with lib.maintainers; [ lassulus ];
pkgs/development/python-modules/goodwe/default.nix+2−2
@@ -7,7 +7,7 @@
77
88buildPythonPackage rec {
99 pname = "goodwe";
10− version = "0.2.10";
10+ version = "0.2.11";
1111 format = "pyproject";
1212
1313 disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616 owner = "marcelblijleven";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "1c4wks67vm2dwzmm3xqkidyss04vkx4mpkkr8l1c7c5myfk1n157";
19+ sha256 = "14m2r3x1dgh3npnbspkp2214976669nnpqhbc26ib88qmn75kzad";
2020 };
2121
2222 checkInputs = [
pkgs/development/python-modules/plaid-python/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "plaid-python";
11− version = "8.8.0";
11+ version = "8.9.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "8689b5c4d69e93026aea252314fb3133359fa70df5819ad6995c4e44a2f84858";
15+ sha256 = "ba2021812835bfeb19ad6d32a1afeb41cb01e45f4fd2b8145ae162800e4bc87f";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/pytest-console-scripts/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pytest-console-scripts";
12− version = "1.2.1";
12+ version = "1.2.2";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3";
16+ sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394";
1717 };
1818 postPatch = ''
1919 # setuptools-scm is pinned to <6 because it dropped Python 3.5
pkgs/development/python-modules/qcs-api-client/default.nix+2−2
@@ -18,14 +18,14 @@
1818
1919buildPythonPackage rec {
2020 pname = "qcs-api-client";
21− version = "0.20.7";
21+ version = "0.20.9";
2222 format = "setuptools";
2323
2424 disabled = pythonOlder "3.7";
2525
2626 src = fetchPypi {
2727 inherit pname version;
28− sha256 = "64f3ee91cb9424ac1f27a2e13a4d03090a57d2e0e5edf6981a0b4e5295844c81";
28+ sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574";
2929 };
3030
3131 propagatedBuildInputs = [
pkgs/development/python-modules/sunpy/default.nix+2−2
@@ -31,12 +31,12 @@
3131
3232buildPythonPackage rec {
3333 pname = "sunpy";
34− version = "3.1.2";
34+ version = "3.1.3";
3535 disabled = pythonOlder "3.6";
3636
3737 src = fetchPypi {
3838 inherit pname version;
39− sha256 = "5eeb479c3f2424bf46355165249a1caa849872f8bee525349c4dca4d15b271fd";
39+ sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2";
4040 };
4141
4242 nativeBuildInputs = [
pkgs/development/python-modules/trimesh/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "trimesh";
9− version = "3.9.40";
9+ version = "3.9.41";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "321005b498361548ce2e048f8499a347d8f38c75ff9f74cee7b118c84b0c41d4";
13+ sha256 = "7cacd454f4cfde741698aa8bca4fdbc775dc42f66a3135dd0c8308fe7ba733be";
1414 };
1515
1616 propagatedBuildInputs = [ numpy ];
pkgs/development/web/deno/default.nix+3−3
@@ -17,15 +17,15 @@
1717
1818rustPlatform.buildRustPackage rec {
1919 pname = "deno";
20− version = "1.17.1";
20+ version = "1.17.2";
2121
2222 src = fetchFromGitHub {
2323 owner = "denoland";
2424 repo = pname;
2525 rev = "v${version}";
26− sha256 = "sha256-XzpOJTLTiF4GrECC7ObFzoPusFM8mvhUGH9F52o88MY=";
26+ sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg=";
2727 };
28− cargoSha256 = "sha256-7uTxDkAyViNidSDH6bdUrtP96vQgyz+p2OlK+/FUJvc=";
28+ cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8=";
2929
3030 # Install completions post-install
3131 nativeBuildInputs = [ installShellFiles ];
pkgs/games/ue4demos/default.nix+1−1
@@ -5,7 +5,7 @@ let
55 [
66 # Untrusted mirrors - do not update hashes
77 "https://ludios.org/mirror/ue4demos/${file}"
8− "http://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
8+ "https://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
99 ];
1010
1111 buildDemo = { name, src }:
pkgs/misc/emulators/uae/default.nix+2−2
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
55 version = "0.8.29";
66
77 src = fetchurl {
8− url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
8+ url = "https://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
99 sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
1010 };
1111
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "Ultimate/Unix/Unusable Amiga Emulator";
2222 license = lib.licenses.gpl2Plus;
23− homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
23+ homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
2424 maintainers = [ lib.maintainers.sander ];
2525 platforms = lib.platforms.linux;
2626 };
pkgs/misc/vscode-extensions/default.nix+17
@@ -144,6 +144,23 @@ let
144144 };
145145 };
146146
147+ apollographql.vscode-apollo = buildVscodeMarketplaceExtension {
148+ mktplcRef = {
149+ name = "vscode-apollo";
150+ publisher = "apollographql";
151+ version = "1.19.9";
152+ sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o=";
153+ };
154+ meta = with lib; {
155+ changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
156+ description = "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform";
157+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo";
158+ homepage = "https://github.com/apollographql/vscode-graphql";
159+ license = licenses.mit;
160+ maintainers = with maintainers; [ datafoo ];
161+ };
162+ };
163+
147164 arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension {
148165 mktplcRef = {
149166 name = "nord-visual-studio-code";
pkgs/servers/etcd/3.4.nix−1
@@ -30,6 +30,5 @@ buildGoModule rec {
3030 license = licenses.asl20;
3131 homepage = "https://etcd.io/";
3232 maintainers = with maintainers; [ offline zowoq ];
33− platforms = platforms.unix;
3433 };
3534}
pkgs/servers/etcd/default.nix−1
@@ -31,6 +31,5 @@ buildGoPackage rec {
3131 license = licenses.asl20;
3232 homepage = "https://etcd.io/";
3333 maintainers = with maintainers; [ offline zowoq ];
34− platforms = platforms.unix;
3534 };
3635}
pkgs/servers/gobetween/default.nix+1−1
@@ -32,7 +32,7 @@ buildGoModule rec {
3232
3333 meta = with lib; {
3434 description = "Modern & minimalistic load balancer for the Сloud era";
35− homepage = "http://gobetween.io";
35+ homepage = "https://gobetween.io";
3636 license = licenses.mit;
3737 maintainers = with maintainers; [ tomberek ];
3838 };
pkgs/servers/monitoring/grafana-image-renderer/package.json+1−1
@@ -5,7 +5,7 @@
55 "license": "Apache-2.0",
66 "repository": {
77 "type": "git",
8− "url": "http://github.com/grafana/grafana-image-renderer.git"
8+ "url": "https://github.com/grafana/grafana-image-renderer.git"
99 },
1010 "scripts": {
1111 "eslint": "eslint . --ext .ts",
pkgs/tools/archivers/unzoo/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 '';
3636
3737 meta = with lib; {
38− homepage = "http://github.com/museoa/unzoo/";
38+ homepage = "https://github.com/museoa/unzoo/";
3939 description = "Manipulate archives of files in Zoo compressed form";
4040 license = licenses.publicDomain;
4141 maintainers = with maintainers; [ AndersonTorres ];
pkgs/tools/text/qprint/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 '';
2020
2121 meta = {
22− homepage = "http://www.fourmilab.ch/webtools/qprint/";
22+ homepage = "https://www.fourmilab.ch/webtools/qprint/";
2323 license = lib.licenses.publicDomain;
2424 description = "Encode and decode Quoted-Printable files";
2525 maintainers = [ lib.maintainers.tv ];
pkgs/tools/text/xml/rxp/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 meta = {
1313 license = lib.licenses.gpl2Plus;
1414 description = "A validating XML parser written in C";
15− homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html";
15+ homepage = "https://www.cogsci.ed.ac.uk/~richard/rxp.html";
1616 platforms = lib.platforms.unix;
1717 };
1818}
pkgs/top-level/aliases.nix+2
@@ -634,6 +634,8 @@ mapAliases ({
634634 octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
635635 ofp = throw "ofp is not compatible with odp-dpdk";
636636 olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
637+ openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
638+ openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
637639 opencl-icd = ocl-icd; # added 2017-01-20
638640 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
639641 openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10
pkgs/top-level/all-packages.nix−3
@@ -8354,9 +8354,6 @@ with pkgs;
83548354 openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
83558355 openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
83568356
8357− openbazaar = callPackage ../applications/networking/openbazaar { };
8358− openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { };
8359−
83608357 openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
83618358
83628359 opencc = callPackage ../tools/text/opencc { };
pkgs/top-level/perl-packages.nix+1−1
@@ -793,7 +793,7 @@ let
793793 rm $out/bin/wxchordpro # Wx not supported on darwin
794794 '';
795795 meta = {
796− homepage = "http://www.chordpro.org";
796+ homepage = "https://www.chordpro.org";
797797 description = "A lyrics and chords formatting program";
798798 license = with lib.licenses; [ artistic1 gpl1Plus ];
799799 };