mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d10b7b45fb
30 changed files with 1641 additions and 958 deletions
|
|
@ -191,6 +191,16 @@ in
|
|||
Whether to open ports in the firewall for the videobridge.
|
||||
'';
|
||||
};
|
||||
|
||||
apis = mkOption {
|
||||
type = with types; listOf str;
|
||||
description = ''
|
||||
What is passed as --apis= parameter. If this is empty, "none" is passed.
|
||||
Needed for monitoring jitsi.
|
||||
'';
|
||||
default = [];
|
||||
example = literalExample "[ \"colibri\" \"rest\" ]";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -221,7 +231,7 @@ in
|
|||
"export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n"
|
||||
) cfg.xmppConfigs))
|
||||
+ ''
|
||||
${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=none
|
||||
${pkgs.jitsi-videobridge}/bin/jitsi-videobridge --apis=${if (cfg.apis == []) then "none" else concatStringsSep "," cfg.apis}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ in import ../make-test-python.nix {
|
|||
server.succeed('prosodyctl status | grep "Prosody is running"')
|
||||
|
||||
server.succeed("create-prosody-users")
|
||||
client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"')
|
||||
client.succeed("send-message")
|
||||
server.succeed("delete-prosody-users")
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,26 @@ class CthonTest(ClientXMPP):
|
|||
def __init__(self, jid, password):
|
||||
ClientXMPP.__init__(self, jid, password)
|
||||
self.add_event_handler("session_start", self.session_start)
|
||||
self.test_succeeded = False
|
||||
|
||||
async def session_start(self, event):
|
||||
try:
|
||||
# Exceptions in event handlers are printed to stderr but not
|
||||
# propagated, they do not make the script terminate with a non-zero
|
||||
# exit code. We use the `test_succeeded` flag as a workaround and
|
||||
# check it later at the end of the script to exit with a proper
|
||||
# exit code.
|
||||
# Additionally, this flag ensures that this event handler has been
|
||||
# actually run by ClientXMPP, which may well not be the case.
|
||||
await self.test_xmpp_server()
|
||||
self.test_succeeded = True
|
||||
finally:
|
||||
# Even if an exception happens in `test_xmpp_server()`, we still
|
||||
# need to disconnect explicitly, otherwise the process will hang
|
||||
# forever.
|
||||
self.disconnect(wait=True)
|
||||
|
||||
async def test_xmpp_server(self):
|
||||
log = logging.getLogger(__name__)
|
||||
self.send_presence()
|
||||
self.get_roster()
|
||||
|
|
@ -42,11 +60,12 @@ class CthonTest(ClientXMPP):
|
|||
log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")
|
||||
sys.exit(1)
|
||||
log.info('Upload success!')
|
||||
|
||||
# Test MUC
|
||||
self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True)
|
||||
# TODO: use join_muc_wait() after slixmpp 1.8.0 is released.
|
||||
self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98')
|
||||
log.info('MUC join success!')
|
||||
log.info('XMPP SCRIPT TEST SUCCESS')
|
||||
self.disconnect(wait=True)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
@ -62,4 +81,7 @@ if __name__ == '__main__':
|
|||
ct.register_plugin('xep_0045')
|
||||
ct.connect(("server", 5222))
|
||||
ct.process(forever=False)
|
||||
|
||||
if not ct.test_succeeded:
|
||||
sys.exit(1)
|
||||
''
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw=";
|
||||
sha256 = "sha256-NDkGHJDr6TCHEhgSKK7jLYk5RjGEj8+lDYZ4ywvG20g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkYarnPackage rec {
|
||||
pname = "vieb";
|
||||
version = "3.1.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10l36q75nmqv0azxhmwms6hjicbgyvpk8k6ljrh9d7zxryd3xwz0";
|
||||
sha256 = "0h5yzmvs9zhhpg9l7rrgwd4rqd9n00n2ifwqf05kpymzliy6xsnk";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
{
|
||||
"name": "vieb",
|
||||
"productName": "Vieb",
|
||||
"version": "3.1.0",
|
||||
"version": "3.4.0",
|
||||
"description": "Vim Inspired Electron Browser",
|
||||
"main": "app/index.js",
|
||||
"babel": {
|
||||
"plugins": [
|
||||
"@babel/plugin-proposal-optional-chaining"
|
||||
]
|
||||
},
|
||||
"scripts": {
|
||||
"test": "jest -u && eslint .",
|
||||
"start": "electron app",
|
||||
|
|
@ -29,16 +24,15 @@
|
|||
"email": "Jelmerro@users.noreply.github.com",
|
||||
"license": "GPL-3.0+",
|
||||
"devDependencies": {
|
||||
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
|
||||
"archiver": "^5.0.2",
|
||||
"electron": "^11.0.3",
|
||||
"electron-builder": "^22.9.1",
|
||||
"eslint": "^7.15.0",
|
||||
"archiver": "^5.2.0",
|
||||
"electron": "^11.2.1",
|
||||
"electron-builder": "^22.10.4",
|
||||
"eslint": "^7.19.0",
|
||||
"jest": "^26.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cliqz/adblocker-electron": "^1.18.8",
|
||||
"darkreader": "^4.9.26",
|
||||
"@cliqz/adblocker-electron": "^1.20.0",
|
||||
"darkreader": "^4.9.27",
|
||||
"is-svg": "^4.2.1",
|
||||
"rimraf": "^3.0.2"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -22,9 +22,13 @@ buildGoModule rec {
|
|||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1";
|
||||
sha256 = "1dsriw2vjzjaddxdhl3wbj2ppnsyi29f4bjwc8lzyz20wfwx4ay4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-unconfigured-runtime-warn.patch
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
|
||||
|
||||
It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
|
||||
---
|
||||
vendor/github.com/containers/common/pkg/config/config.go | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
|
||||
index 4a98c7e92..4a95a2a49 100644
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config.go
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config.go
|
||||
@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string {
|
||||
return name
|
||||
}
|
||||
}
|
||||
- if path, err := exec.LookPath(name); err == nil {
|
||||
- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path)
|
||||
+ if _, err := exec.LookPath(name); err == nil {
|
||||
return name
|
||||
}
|
||||
}
|
||||
--
|
||||
2.30.0
|
||||
|
|
@ -31,6 +31,8 @@ in runCommand podman.name {
|
|||
name = "${podman.pname}-wrapper-${podman.version}";
|
||||
inherit (podman) pname version passthru;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ];
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
29
pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix
Executable file
29
pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix
Executable file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitLab, gnome3, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-fuzzy-app-search";
|
||||
version = "4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Czarlie";
|
||||
repo = "gnome-fuzzy-app-search";
|
||||
rev = "da9c15d39958d9c3b38df3b616fd40b85aed24e5";
|
||||
sha256 = "1r3qha530s97x818znn1wi76f4x9bhlgi7jlxfwjnrwys62cv5fn";
|
||||
};
|
||||
|
||||
uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
||||
patches = [ ./fix-desktop-file-paths.patch ];
|
||||
|
||||
makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fuzzy application search results for Gnome Search";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ rhoriguchi ];
|
||||
homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search";
|
||||
broken = versionOlder gnome3.gnome-shell.version "3.18";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
diff --git a/applicationsUtils.js b/applicationsUtils.js
|
||||
index 728223b..aa9f291 100644
|
||||
--- a/applicationsUtils.js
|
||||
+++ b/applicationsUtils.js
|
||||
@@ -44,27 +44,24 @@ var Search = new Lang.Class({
|
||||
* @return {Void}
|
||||
*/
|
||||
_init: function () {
|
||||
- let dir = [
|
||||
- "/usr/share/applications",
|
||||
- GLib.get_home_dir() + "/.local/share/applications",
|
||||
- ];
|
||||
-
|
||||
- // listen object - file/monitor list
|
||||
- this._listen = dir.map((path) => {
|
||||
- let file = Gio.File.new_for_path(path);
|
||||
- let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
|
||||
-
|
||||
- // refresh on each directory change
|
||||
- monitor.connect(
|
||||
- "changed",
|
||||
- Lang.bind(this, this._handleMonitorChanged)
|
||||
- );
|
||||
-
|
||||
- return {
|
||||
- file: file,
|
||||
- monitor: monitor,
|
||||
- };
|
||||
- });
|
||||
+ this._listen = [...new Set(GLib.get_system_data_dirs())]
|
||||
+ .filter((path) => path.endsWith("/share"))
|
||||
+ .map((path) => Gio.File.new_for_path(path + "/applications"))
|
||||
+ .filter((file) => file.query_exists(null))
|
||||
+ .map((file) => {
|
||||
+ let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
|
||||
+
|
||||
+ // refresh on each directory change
|
||||
+ monitor.connect(
|
||||
+ "changed",
|
||||
+ Lang.bind(this, this._handleMonitorChanged)
|
||||
+ );
|
||||
+
|
||||
+ return {
|
||||
+ file: file,
|
||||
+ monitor: monitor,
|
||||
+ };
|
||||
+ });
|
||||
this._interval = null;
|
||||
this._data = {};
|
||||
|
||||
|
|
@ -218,9 +218,9 @@ in {
|
|||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
patch = "2";
|
||||
};
|
||||
sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs";
|
||||
sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1";
|
||||
pythonVersion = "2.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
|
|
@ -234,9 +234,9 @@ in {
|
|||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
patch = "2";
|
||||
};
|
||||
sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c";
|
||||
sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx";
|
||||
pythonVersion = "3.6";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
|
|
@ -251,9 +251,9 @@ in {
|
|||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
patch = "2";
|
||||
};
|
||||
sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64
|
||||
sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64
|
||||
pythonVersion = "2.7";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
@ -264,9 +264,9 @@ in {
|
|||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
patch = "2";
|
||||
};
|
||||
sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64
|
||||
sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64
|
||||
pythonVersion = "3.6";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2";
|
||||
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ in with passthru; stdenv.mkDerivation {
|
|||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
|
||||
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100
|
||||
+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000
|
||||
@@ -17,18 +17,14 @@
|
||||
--- a/lib_pypy/_tkinter/tklib_build.py
|
||||
+++ b/lib_pypy/_tkinter/tklib_build.py
|
||||
@@ -17,19 +17,14 @@ elif sys.platform == 'win32':
|
||||
incdirs = []
|
||||
linklibs = ['tcl85', 'tk85']
|
||||
libdirs = []
|
||||
-elif sys.platform == 'darwin':
|
||||
- incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
|
||||
- linklibs = ['tcl', 'tk']
|
||||
- libdirs = []
|
||||
- # homebrew
|
||||
- incdirs = ['/usr/local/opt/tcl-tk/include']
|
||||
- linklibs = ['tcl8.6', 'tk8.6']
|
||||
- libdirs = ['/usr/local/opt/tcl-tk/lib']
|
||||
else:
|
||||
# On some Linux distributions, the tcl and tk libraries are
|
||||
# stored in /usr/include, so we must check this case also
|
||||
|
|
|
|||
|
|
@ -1,8 +1,40 @@
|
|||
{ lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }:
|
||||
|
||||
with lib;
|
||||
assert let majorIs = lib.versions.major cudatoolkit.version;
|
||||
in majorIs == "9" || majorIs == "10" || majorIs == "11";
|
||||
|
||||
let version = "2.5.4";
|
||||
let
|
||||
version = "2.5.4";
|
||||
|
||||
# We define a specific set of CUDA compute capabilities here,
|
||||
# because CUDA 11 does not support compute capability 3.0. Also,
|
||||
# we use it to enable newer capabilities that are not enabled
|
||||
# by magma by default. The list of supported architectures
|
||||
# can be found in magma's top-level CMakeLists.txt.
|
||||
cudaCapabilities = rec {
|
||||
cuda9 = [
|
||||
"Kepler" # 3.0, 3.5
|
||||
"Maxwell" # 5.0
|
||||
"Pascal" # 6.0
|
||||
"Volta" # 7.0
|
||||
];
|
||||
|
||||
cuda10 = [
|
||||
"Turing" # 7.5
|
||||
] ++ cuda9;
|
||||
|
||||
cuda11 = [
|
||||
"sm_35" # sm_30 is not supported by CUDA 11
|
||||
"Maxwell" # 5.0
|
||||
"Pascal" # 6.0
|
||||
"Volta" # 7.0
|
||||
"Turing" # 7.5
|
||||
"Ampere" # 8.0
|
||||
];
|
||||
};
|
||||
|
||||
capabilityString = lib.strings.concatStringsSep ","
|
||||
cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "magma";
|
||||
|
|
@ -17,6 +49,8 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ cudatoolkit libpthreadstubs lapack blas ];
|
||||
|
||||
cmakeFlags = [ "-DGPU_TARGET=${capabilityString}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ buildPecl, lib, pkgs }:
|
||||
buildPecl {
|
||||
pname = "smbclient";
|
||||
version = "1.0.4";
|
||||
sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8";
|
||||
version = "1.0.5";
|
||||
sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0=";
|
||||
|
||||
# TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66
|
||||
LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0";
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017";
|
||||
sha256 = "9a205be275739c141873fa9fbd7c3f9ec6170972c85d5c75e9b4c53b5db839a3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "immutables";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0y0aqw29g525frdnmv9paljzacpp4s21sadfbca5b137iciwr8d0";
|
||||
sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ pkgs, lib, stdenv, fetchurl, dpkg, jre_headless, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, dpkg, jre_headless, nixosTests }:
|
||||
|
||||
let
|
||||
pname = "jicofo";
|
||||
version = "1.0-612";
|
||||
version = "1.0-690";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "0xv3p2h8g1jwcmxljdpz08d6dsz543mznp0nwgb6vr93faz8kc81";
|
||||
sha256 = "1w5nz2p6scd7w0ac93vhxlk5i8in5160c0icwl27m4x4km9xf6al";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -16,6 +16,7 @@ stdenv.mkDerivation {
|
|||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
substituteInPlace usr/share/jicofo/jicofo.sh \
|
||||
--replace "exec java" "exec ${jre_headless}/bin/java"
|
||||
|
||||
|
|
@ -24,6 +25,7 @@ stdenv.mkDerivation {
|
|||
mv etc $out/
|
||||
cp ${./logging.properties-journal} $out/etc/jitsi/jicofo/logging.properties-journal
|
||||
ln -s $out/share/jicofo/jicofo.sh $out/bin/jicofo
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.1-273-g072dd44b";
|
||||
version = "2.1-416-g2f43d1b4";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "12l84wjn5iqnsg0816icgbx8jfcgyfnqclgyx303w4ncbvymlkv9";
|
||||
sha256 = "0s9wmbba1nlpxaawzmaqg92882y5sfs2ws64w5sqvpi7n77hy54m";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -18,6 +18,7 @@ stdenv.mkDerivation {
|
|||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
substituteInPlace usr/share/jitsi-videobridge/jvb.sh \
|
||||
--replace "exec java" "exec ${jre_headless}/bin/java"
|
||||
|
||||
|
|
@ -30,6 +31,7 @@ stdenv.mkDerivation {
|
|||
# work around https://github.com/jitsi/jitsi-videobridge/issues/1547
|
||||
wrapProgram $out/bin/jitsi-videobridge \
|
||||
--set VIDEOBRIDGE_GC_TYPE G1GC
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.21.3.4014-58bd20c02";
|
||||
version = "1.21.3.4021-5a0a3e4b2";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw";
|
||||
sha256 = "1342xxbxqq3g0khw3cyib0djy8slsc2b4xxl18lli7wrfcg6kgxb";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z";
|
||||
sha256 = "05rixrk5nlmnywb7xdkmrk0zpd1ik05dyzz0b09kd212rahw0iig";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "1.15.2";
|
||||
version = "1.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mYFItrFC0BeRwLfZA1SAV+4rvrNrx75lTWS7w2ZDHag=";
|
||||
sha256 = "sha256-TbQanXNdomEjp11izowy4763NsQWUe5rLxoEmuHKFn0=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
{ pkgs, lib, stdenv, fetchurl, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.4289";
|
||||
version = "1.0.4628";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "0hs6hjcb0cxmakx2na3xkz9bld0xcil5slp4wjl5xql3s00mk10v";
|
||||
sha256 = "1kw4byy6mvqk3qd5nk5raka1bl9jp0kniszq6j5kc8nz3jql4qdz";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir $out
|
||||
mv * $out/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchsrc version {
|
||||
x86_64-linux = "sha256-A8dfmFjvOHDwotCyRq9QQ9uHJIkq1JkIwtHsqDqTSNo=";
|
||||
aarch64-linux = "sha256-i2qc4bmoSzUwNCQmnXLFQ+W4VZjVwXzEBSF3NeTju3M=";
|
||||
x86_64-darwin = "sha256-lKGTpS2TmgxFdjUsBXKg8Mu6oJA0VidHc/noWWEuUVo=";
|
||||
x86_64-linux = "sha256-6Pwl8smp6ZX57hzPc7e8gVSqnPHse+RvhU2xprG/2dg=";
|
||||
aarch64-linux = "sha256-/ZhLZ/Sj0h4HvOJthe83Y5Hqpz1UYiaQZxuyR8loI44=";
|
||||
x86_64-darwin = "sha256-s+XoEmup/jvIf+jGI3OPIGFDwsWbgE1yuySLWsC3jJE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = with lib; [ boost zlib openssl ]
|
||||
++ optional upnpSupport miniupnpc;
|
||||
|
||||
makeFlags =
|
||||
let ynf = a: b: a + "=" + (if b then "yes" else "no"); in
|
||||
[ (ynf "USE_AESNI" aesniSupport)
|
||||
|
|
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
|
|||
(ynf "USE_UPNP" upnpSupport)
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D i2pd $out/bin/i2pd
|
||||
'';
|
||||
|
|
@ -36,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Minimal I2P router written in C++";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
pkgs/tools/networking/wakeonlan/default.nix
Normal file
29
pkgs/tools/networking/wakeonlan/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, perlPackages, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "wakeonlan";
|
||||
version = "0.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpoliv";
|
||||
repo = pname;
|
||||
rev = "wakeonlan-${version}";
|
||||
sha256 = "0m48b39lz0yc5ckx2jx8y2p4c8npjngxl9wy86k43xgsd8mq1g3c";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin wakeonlan
|
||||
installManPage blib/man1/wakeonlan.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Perl script for waking up computers via Wake-On-LAN magic packets";
|
||||
homepage = "https://github.com/jpoliv/wakeonlan";
|
||||
license = licenses.artistic1;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3839,6 +3839,8 @@ in
|
|||
|
||||
utahfs = callPackage ../applications/networking/utahfs { };
|
||||
|
||||
wakeonlan = callPackage ../tools/networking/wakeonlan { };
|
||||
|
||||
wallutils = callPackage ../tools/graphics/wallutils { };
|
||||
|
||||
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
|
||||
|
|
@ -27444,6 +27446,7 @@ in
|
|||
easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { };
|
||||
emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { };
|
||||
freon = callPackage ../desktops/gnome-3/extensions/freon { };
|
||||
fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { };
|
||||
gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
|
||||
icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
|
||||
impatience = callPackage ../desktops/gnome-3/extensions/impatience { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue