Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
49270f7da7
|
|
@ -1082,6 +1082,7 @@
|
|||
./services/web-apps/nexus.nix
|
||||
./services/web-apps/nifi.nix
|
||||
./services/web-apps/node-red.nix
|
||||
./services/web-apps/phylactery.nix
|
||||
./services/web-apps/pict-rs.nix
|
||||
./services/web-apps/peertube.nix
|
||||
./services/web-apps/plantuml-server.nix
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ in {
|
|||
defaultText = "config.networking.hostName";
|
||||
};
|
||||
|
||||
verbose = mkOption {
|
||||
type = types.bool;
|
||||
description = "Enable verbose output";
|
||||
default = false;
|
||||
};
|
||||
|
||||
profile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
|
@ -54,7 +60,7 @@ in {
|
|||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
EnvironmentFile = cfg.credentialsFile;
|
||||
ExecStart = "${cfg.package}/bin/cachix deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
|
||||
ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
51
nixos/modules/services/web-apps/phylactery.nix
Normal file
51
nixos/modules/services/web-apps/phylactery.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let cfg = config.services.phylactery;
|
||||
in {
|
||||
options.services.phylactery = {
|
||||
enable = mkEnableOption "Whether to enable Phylactery server";
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
description = "Listen host for Phylactery";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
description = "Listen port for Phylactery";
|
||||
};
|
||||
|
||||
library = mkOption {
|
||||
type = types.path;
|
||||
description = "Path to CBZ library";
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.phylactery;
|
||||
defaultText = literalExpression "pkgs.phylactery";
|
||||
description = "The Phylactery package to use";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.phylactery = {
|
||||
environment = {
|
||||
PHYLACTERY_ADDRESS = "${cfg.host}:${toString cfg.port}";
|
||||
PHYLACTERY_LIBRARY = "${cfg.library}";
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ConditionPathExists = cfg.library;
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/phylactery";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ McSinyx ];
|
||||
}
|
||||
|
|
@ -426,6 +426,7 @@ in {
|
|||
php = handleTest ./php {};
|
||||
php80 = handleTest ./php { php = pkgs.php80; };
|
||||
php81 = handleTest ./php { php = pkgs.php81; };
|
||||
phylactery = handleTest ./web-apps/phylactery.nix {};
|
||||
pict-rs = handleTest ./pict-rs.nix {};
|
||||
pinnwand = handleTest ./pinnwand.nix {};
|
||||
plasma5 = handleTest ./plasma5.nix {};
|
||||
|
|
|
|||
20
nixos/tests/web-apps/phylactery.nix
Normal file
20
nixos/tests/web-apps/phylactery.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import ../make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "phylactery";
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
services.phylactery = rec {
|
||||
enable = true;
|
||||
port = 8080;
|
||||
library = "/tmp";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit('phylactery')
|
||||
machine.wait_for_open_port(8080)
|
||||
machine.wait_until_succeeds('curl localhost:8080')
|
||||
'';
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ McSinyx ];
|
||||
})
|
||||
|
|
@ -26,13 +26,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.7.0";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8=";
|
||||
sha256 = "sha256-eKKQNM02Vhy+3yL2QV+0FSEpcniEa5Aq6hkAUIgLo1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -218,8 +218,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "nord-visual-studio-code";
|
||||
publisher = "arcticicestudio";
|
||||
version = "0.18.0";
|
||||
sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE=";
|
||||
version = "0.19.0";
|
||||
sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "An arctic, north-bluish clean and elegant Visual Studio Code theme.";
|
||||
|
|
@ -247,8 +247,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "nix-env-selector";
|
||||
publisher = "arrterian";
|
||||
version = "1.0.7";
|
||||
sha256 = "0e76885c9dbb6dca4eac8a75866ec372b948cc64a3a3845327d7c3ef6ba42a57";
|
||||
version = "1.0.9";
|
||||
sha256 = "sha256-TkxqWZ8X+PAonzeXQ+sI9WI+XlqUHll7YyM7N9uErk0=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -779,8 +779,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "12.0.7";
|
||||
sha256 = "sha256-gPhiytthf35eDhtzkSK2JZjtj4877la3hB1Cswbrszw=";
|
||||
version = "12.1.1";
|
||||
sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
|
|
@ -1150,8 +1150,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-pull-request-github";
|
||||
publisher = "github";
|
||||
version = "0.37.2022030309";
|
||||
sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v";
|
||||
version = "0.45.2022062709";
|
||||
sha256 = "119dz79vl2pngf6327zbfw97qnci8xg14d23wdd4n75jmra2wrbz";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
|
|
@ -1502,8 +1502,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-clangd";
|
||||
publisher = "llvm-vs-code-extensions";
|
||||
version = "0.1.15";
|
||||
sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn";
|
||||
version = "0.1.17";
|
||||
sha256 = "1vgk4xsdbx0v6sy09wkb63qz6i64n6qcmpiy49qgh2xybskrrzvf";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -2172,8 +2172,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "code-spell-checker";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "2.1.7";
|
||||
sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY=";
|
||||
version = "2.2.5";
|
||||
sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||
|
|
|
|||
|
|
@ -1,32 +1,61 @@
|
|||
{ fetchurl, lib, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, makeWrapper
|
||||
, unzip
|
||||
, glib
|
||||
, gtk2
|
||||
, gtk3
|
||||
, jre
|
||||
, libXtst
|
||||
, zulu
|
||||
, preferGtk3 ? true
|
||||
, preferZulu ? true
|
||||
}:
|
||||
|
||||
let
|
||||
rev = 3390;
|
||||
jre' = if preferZulu then zulu else jre;
|
||||
gtk' = if preferGtk3 then gtk3 else gtk2;
|
||||
|
||||
inherit (lib) makeLibraryPath versions;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davmail";
|
||||
version = "5.5.1";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip";
|
||||
sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4=";
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
|
||||
sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/^JAVA_OPTS/d' davmail
|
||||
'';
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/davmail
|
||||
cp -vR ./* $out/share/davmail
|
||||
makeWrapper $out/share/davmail/davmail $out/bin/davmail \
|
||||
--prefix PATH : ${jre}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]}
|
||||
--set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \
|
||||
--prefix PATH : ${jre'}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://davmail.sourceforge.net/";
|
||||
description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
homepage = "http://davmail.sourceforge.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ipget";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipget";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gtDmBy7IpZCbeDG8JeKvMoaJmXpjnmKGustaNLIlTlY=";
|
||||
sha256 = "sha256-JGG3DsmFXmWFOFvJ8pKVhQMRgZ0cbkdtmBjMkLYqOwU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";
|
||||
vendorSha256 = "sha256-scrueQoqr9nUONnpitUontcX3Xe0KmmUmvxOcpxK7M8=";
|
||||
|
||||
postPatch = ''
|
||||
# main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
|
||||
|
|
|
|||
|
|
@ -1,28 +1,23 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, lwt, mirage-time, mirage-clock, mirage-net
|
||||
, lwt, mirage-net
|
||||
, cstruct, ipaddr, macaddr, mirage-profile
|
||||
, duration, logs
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-vnetif";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
||||
# due to cstruct
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "0cpqwf51v2cpz41dfqxabf3bsabwyl6a0h0v2ncrn33q58i60m5q";
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt
|
||||
mirage-net
|
||||
mirage-time
|
||||
mirage-clock
|
||||
cstruct
|
||||
ipaddr
|
||||
macaddr
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ buildPythonPackage rec {
|
|||
] ++ lib.optionals stdenv.isLinux [
|
||||
jeepney
|
||||
secretstorage
|
||||
dbus-python
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "temescal";
|
||||
version = "0.3";
|
||||
version = "0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-V1wsncIm4f6NPa6lwlO9pkDIFBG1K3VhmOQCwyrPGm4=";
|
||||
hash = "sha256-MfTftheNj8zI3iXIIJU+jy9xikvX9eO58LA0NCMJBnY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "7.9.3";
|
||||
version = "7.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tTtfrIapIaC3oidqWRntkZ1T1eKZ9/ggKbZk2cMiPSQ=";
|
||||
hash = "sha256-UoSZ4g9RVnmnfZ7XxLafsNCSj396rrHz36fMwEoNL84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.06.22-14.09.50";
|
||||
version = "2022.06.29-19.32.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QMzjoxcEbzOZKh3nN+kMwjp5NfARBFiVnZ/1B3yzVK0=";
|
||||
sha256 = "sha256-skU1p0rEO+9JMxaOepULZhG/xG56KuGNLEUiQ945Pv0=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "ff400595723af878f5d6edfed78d403eb1ce18bd439d4bb0eb8eccf3d20a2b51";
|
||||
sha256 = "97446cacf42966e6096570b9f9c48c653a81903a33e98987cba4b855b417c76f";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wesnoth";
|
||||
version = "1.16.1";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "wesnoth";
|
||||
repo = "wesnoth";
|
||||
sha256 = "sha256-eRegE+Q5dEtuT2XRKAK0sycRuK6sdSXKS6aLCsBDU8g=";
|
||||
sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -249,12 +249,12 @@ in rec {
|
|||
gruvbox = mkTmuxPlugin {
|
||||
pluginName = "gruvbox";
|
||||
rtpFilePath = "gruvbox-tpm.tmux";
|
||||
version = "unstable-2019-05-05";
|
||||
version = "unstable-2022-04-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "egel";
|
||||
repo = "tmux-gruvbox";
|
||||
rev = "6149fd8b5d6924925b4d5aa6935039780e94f3d6";
|
||||
sha256 = "1ykr4yardavd0x7yfrnshd4b0gi8p31pji7i79ib0nss134zncpb";
|
||||
rev = "3f9e38d7243179730b419b5bfafb4e22b0a969ad";
|
||||
sha256 = "1l0kq77rk3cbv0rvh7bmfn90vvqqmywn9jk6gbl9mg3qbynq5wcf";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "9.0.1";
|
||||
version = "9.0.2";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||
|
||||
|
|
@ -10,15 +10,15 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-+03bfSpUT5sb0oFf9BomglcVb5bRqAwZ1MKCPmRtAss=";
|
||||
sha256 = "sha256-5N1Buj4bzlkuVXENbZsTajhzjtJUzR1O1JmbOHQU1MQ=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "1kw9l3gip4lqfrc0asgsd1lf5sxa7zj67isyvhb14qdsf9rs3b2d";
|
||||
sha256 = "1zamibfjfr4kdixajrb8cs2w95sj2hzhw7ak1yilfgiiq4kpkpah";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eB0SswtqAb0xoLcq021KaH4CdgLbWmhODyifQDVl5XI=";
|
||||
vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
|
|
|||
27
pkgs/servers/web-apps/phylactery/default.nix
Normal file
27
pkgs/servers/web-apps/phylactery/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildGoPackage, fetchFromSourcehut, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "phylactery";
|
||||
version = "0.1.1";
|
||||
|
||||
goPackagePath = "git.sr.ht/~cnx/phylactery";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HcpdPQ1WOMFNdfsZb//GvUVBCbmS3jARbcXjchlv2oE=";
|
||||
};
|
||||
|
||||
# Upstream repo doesn't provide any test.
|
||||
doCheck = false;
|
||||
passthru.tests.phylactery = nixosTests.phylactery;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Old school comic web server";
|
||||
homepage = "https://git.sr.ht/~cnx/phylactery";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ McSinyx ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
44
pkgs/tools/bluetooth/nrfconnect/default.nix
Normal file
44
pkgs/tools/bluetooth/nrfconnect/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "nrfconnect";
|
||||
version = "3.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-Q6QAFqTCFEcZBIlH9KaO4oAYiwCExvJ3h1PBtlGbhhA=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
segger-jlink
|
||||
];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
install -m 444 -D ${appimageContents}/nrfconnect.desktop $out/share/applications/nrfconnect.desktop
|
||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \
|
||||
$out/share/icons/hicolor/512x512/apps/nrfconnect.png
|
||||
substituteInPlace $out/share/applications/nrfconnect.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nordic Semiconductor nRF Connect for Desktop";
|
||||
homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ stargate01 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "addlicense";
|
||||
version = "1.0.0";
|
||||
version = "unstable-2021-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "addlicense";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nv7Az3TDtd1P/QWjH92otSV9rIrc2l/mTbGUXhODi7Q=";
|
||||
rev = "13e73a7f8fcb5696256b6a7b7addabf1070ad4b9";
|
||||
sha256 = "sha256-UiJaTWCBup/Ub9NZIvkb67TvcUllV/AmYAKVO4egRqc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y=";
|
||||
|
|
|
|||
|
|
@ -4,25 +4,25 @@ GEM
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activemodel (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activerecord (6.1.4.4)
|
||||
activemodel (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activesupport (6.1.4.4)
|
||||
activemodel (6.1.6)
|
||||
activesupport (= 6.1.6)
|
||||
activerecord (6.1.6)
|
||||
activemodel (= 6.1.6)
|
||||
activesupport (= 6.1.6)
|
||||
activesupport (6.1.6)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
bcrypt (3.1.16)
|
||||
bcrypt (3.1.18)
|
||||
charlock_holmes (0.7.7)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
daemons (1.4.1)
|
||||
eventmachine (1.2.7)
|
||||
gpgme (2.0.20)
|
||||
mini_portile2 (~> 2.3)
|
||||
i18n (1.8.11)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
|
|
@ -30,17 +30,17 @@ GEM
|
|||
gpgme (~> 2.0, >= 2.0.2)
|
||||
mail (~> 2.5, >= 2.5.3)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.7.1)
|
||||
minitest (5.15.0)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.16.1)
|
||||
multi_json (1.15.0)
|
||||
mustermann (1.1.1)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
rack (2.2.3)
|
||||
rack-protection (2.1.0)
|
||||
rack (2.2.3.1)
|
||||
rack-protection (2.2.0)
|
||||
rack
|
||||
rake (13.0.6)
|
||||
ruby2_keywords (0.0.5)
|
||||
schleuder (4.0.2)
|
||||
schleuder (4.0.3)
|
||||
activerecord (~> 6.1.3)
|
||||
bcrypt (~> 3.1.2)
|
||||
charlock_holmes (~> 0.7.6)
|
||||
|
|
@ -53,18 +53,18 @@ GEM
|
|||
sqlite3 (~> 1.4.2)
|
||||
thin (~> 1)
|
||||
thor (~> 0)
|
||||
sinatra (2.1.0)
|
||||
sinatra (2.2.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.2)
|
||||
rack-protection (= 2.1.0)
|
||||
rack-protection (= 2.2.0)
|
||||
tilt (~> 2.0)
|
||||
sinatra-contrib (2.1.0)
|
||||
sinatra-contrib (2.2.0)
|
||||
multi_json
|
||||
mustermann (~> 1.0)
|
||||
rack-protection (= 2.1.0)
|
||||
sinatra (= 2.1.0)
|
||||
rack-protection (= 2.2.0)
|
||||
sinatra (= 2.2.0)
|
||||
tilt (~> 2.0)
|
||||
sqlite3 (1.4.2)
|
||||
sqlite3 (1.4.4)
|
||||
thin (1.8.1)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0, >= 1.0.4)
|
||||
|
|
@ -73,13 +73,14 @@ GEM
|
|||
tilt (2.0.10)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
zeitwerk (2.5.3)
|
||||
zeitwerk (2.6.0)
|
||||
|
||||
PLATFORMS
|
||||
aarch64-linux
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
schleuder!
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
2.3.9
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ GEM
|
|||
thor (0.20.3)
|
||||
|
||||
PLATFORMS
|
||||
aarch64-linux
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
schleuder-cli!
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.6
|
||||
2.3.9
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm";
|
||||
sha256 = "1f0ai51icvvx5q0jd1l89k0dlwzpsrkqlj6x43f8qc4bd1ya9glx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.6";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik";
|
||||
sha256 = "0khjnkvmiyap1g3rvw9hp16mzai4smqcg5hxhq28pll25ljzxdbp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.6";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
|
|
@ -27,20 +27,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98";
|
||||
sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.6";
|
||||
};
|
||||
bcrypt = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
|
||||
sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.16";
|
||||
version = "3.1.18";
|
||||
};
|
||||
charlock_holmes = {
|
||||
groups = ["default"];
|
||||
|
|
@ -57,10 +57,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
daemons = {
|
||||
groups = ["default"];
|
||||
|
|
@ -99,10 +99,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.11";
|
||||
version = "1.10.0";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime"];
|
||||
|
|
@ -141,20 +141,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
|
||||
sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.15.0";
|
||||
version = "5.16.1";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
|
|
@ -182,10 +182,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
|
||||
sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.3";
|
||||
version = "2.2.3.1";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -193,10 +193,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
|
||||
sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
|
|
@ -224,10 +224,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15j1rfkfvni82msamikynsg48s50hbsx1pxm3y967caq9s80ll6c";
|
||||
sha256 = "0lxmi7402v5qkajx3j5bydarxf3lbm1kzpwgy7zsmc7l28mcv8wx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
};
|
||||
sinatra = {
|
||||
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
|
||||
|
|
@ -235,10 +235,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
|
||||
sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
sinatra-contrib = {
|
||||
dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
|
||||
|
|
@ -246,20 +246,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja";
|
||||
sha256 = "0zzckl2n7r18fk3929hgcv8pby6hxwva0rbxw66yq6r96lnwzryb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
sqlite3 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
|
||||
sha256 = "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.2";
|
||||
version = "1.4.4";
|
||||
};
|
||||
thin = {
|
||||
dependencies = ["daemons" "eventmachine" "rack"];
|
||||
|
|
@ -308,9 +308,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
|
||||
sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.3";
|
||||
version = "2.6.0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1015,7 +1015,9 @@ with pkgs;
|
|||
|
||||
addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { };
|
||||
|
||||
addlicense = callPackage ../tools/misc/addlicense { };
|
||||
addlicense = callPackage ../tools/misc/addlicense {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
adenum = callPackage ../tools/security/adenum { };
|
||||
|
||||
|
|
@ -7409,7 +7411,9 @@ with pkgs;
|
|||
ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { };
|
||||
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
|
||||
|
||||
ipget = callPackage ../applications/networking/ipget { };
|
||||
ipget = callPackage ../applications/networking/ipget {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
i-pi = with python3Packages; toPythonApplication i-pi;
|
||||
|
||||
|
|
@ -16190,6 +16194,8 @@ with pkgs;
|
|||
|
||||
nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
|
||||
|
||||
nrfconnect = callPackage ../tools/bluetooth/nrfconnect { };
|
||||
|
||||
nrfutil = callPackage ../development/tools/misc/nrfutil { };
|
||||
|
||||
obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; };
|
||||
|
|
@ -29293,6 +29299,8 @@ with pkgs;
|
|||
|
||||
phrase-cli = callPackage ../tools/misc/phrase-cli { };
|
||||
|
||||
phylactery = callPackage ../servers/web-apps/phylactery { };
|
||||
|
||||
pianobar = callPackage ../applications/audio/pianobar { };
|
||||
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue