Merge branch 'main' into nixos-21.11
This commit is contained in:
commit
5f688db132
|
@ -23,7 +23,7 @@
|
||||||
"homepage": "https://mattermost.com",
|
"homepage": "https://mattermost.com",
|
||||||
"owner": "mattermost",
|
"owner": "mattermost",
|
||||||
"repo": "mattermost-server",
|
"repo": "mattermost-server",
|
||||||
"rev": "a7c6fa13405b4d8dfd43646e53550b06e508cbd3",
|
"rev": "62d4d8166d85bbc47a2d9223e3e7b3b5bfb54d9d",
|
||||||
"sha256": "0ni10mv38qjyyrygs66ja3ayhn61rhbxxvvfr3rmkkn5mvpzyp92",
|
"sha256": "0ni10mv38qjyyrygs66ja3ayhn61rhbxxvvfr3rmkkn5mvpzyp92",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.0.tar.gz",
|
"url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.0.tar.gz",
|
||||||
|
@ -93,10 +93,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea",
|
"rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
|
||||||
"sha256": "0vk85cwrmwlid7ks4rk9grb5rrd2cq3mzkx18j7ppkr9na6y1sh3",
|
"sha256": "1qpmqj075pppa6ihmkacf491lhq7rpxlcm8cm6h18raardsr3irr",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nixos/nixpkgs/archive/29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea.tar.gz",
|
"url": "https://github.com/nixos/nixpkgs/archive/581d2d6c9cd5c289002203581d8aa0861963a933.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"workadventure": {
|
"workadventure": {
|
||||||
|
|
|
@ -4,21 +4,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "blackmagic-desktop-video";
|
pname = "blackmagic-desktop-video";
|
||||||
version = "12.0";
|
version = "12.2.2";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libcxx libcxxabi
|
libcxx libcxxabi
|
||||||
];
|
];
|
||||||
|
|
||||||
src = requireFile {
|
src = requireFile {
|
||||||
name = "Blackmagic_Desktop_Video_Linux_12.1.tar.gz";
|
name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz";
|
||||||
url = "https://www.blackmagicdesign.com/support/download/d99c3a1740b546f094ffbb30ddf1f4c1";
|
url = "https://www.blackmagicdesign.com/support/";
|
||||||
sha256 = "51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73";
|
sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35";
|
||||||
};
|
};
|
||||||
|
|
||||||
setSourceRoot = ''
|
setSourceRoot = ''
|
||||||
tar xf Blackmagic_Desktop_Video_Linux_12.1/other/x86_64/desktopvideo-12.1a9-x86_64.tar.gz
|
tar xf Blackmagic_Desktop_Video_Linux_12.2.2/other/x86_64/desktopvideo-12.2.2a6-x86_64.tar.gz
|
||||||
sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.1a9-x86_64
|
sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.2.2a6-x86_64
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "decklink";
|
pname = "decklink";
|
||||||
version = "12.0";
|
version = "12.2.2";
|
||||||
|
|
||||||
src = requireFile {
|
src = requireFile {
|
||||||
name = "Blackmagic_Desktop_Video_Linux_12.1.tar.gz";
|
name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz";
|
||||||
url = "https://www.blackmagicdesign.com/support/download/d99c3a1740b546f094ffbb30ddf1f4c1";
|
url = "https://www.blackmagicdesign.com/support/";
|
||||||
sha256 = "51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73";
|
sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35";
|
||||||
};
|
};
|
||||||
|
|
||||||
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||||
|
@ -16,15 +16,15 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
setSourceRoot = ''
|
setSourceRoot = ''
|
||||||
tar xf Blackmagic_Desktop_Video_Linux_12.1/other/x86_64/desktopvideo-12.1a9-x86_64.tar.gz
|
tar xf Blackmagic_Desktop_Video_Linux_12.2.2/other/x86_64/desktopvideo-12.2.2a6-x86_64.tar.gz
|
||||||
sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.1a9-x86_64/usr/src
|
sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.2.2a6-x86_64/usr/src
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
make -C $sourceRoot/blackmagic-12.1a9 -j$NIX_BUILD_CORES
|
make -C $sourceRoot/blackmagic-12.2.2a6 -j$NIX_BUILD_CORES
|
||||||
make -C $sourceRoot/blackmagic-io-12.1a9 -j$NIX_BUILD_CORES
|
make -C $sourceRoot/blackmagic-io-12.2.2a6 -j$NIX_BUILD_CORES
|
||||||
|
|
||||||
runHook postBuild
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
make -C $KERNELDIR M=$sourceRoot/blackmagic-12.1a9 modules_install
|
make -C $KERNELDIR M=$sourceRoot/blackmagic-12.2.2a6 modules_install
|
||||||
make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.1a9 modules_install
|
make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.2.2a6 modules_install
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -4,6 +4,7 @@ let
|
||||||
sources = import ../nix/sources.nix;
|
sources = import ../nix/sources.nix;
|
||||||
pkgs = import sources.nixpkgs args;
|
pkgs = import sources.nixpkgs args;
|
||||||
unstable = import sources.nixpkgs-unstable args;
|
unstable = import sources.nixpkgs-unstable args;
|
||||||
|
new = import sources.nixpkgs-new args;
|
||||||
|
|
||||||
callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
|
callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, pkgs, profiles, modules, evalConfig, ... }:
|
{ config, lib, pkgs, profiles, modules, evalConfig, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import (import ../nix/sources.nix).nixpkgs-unstable {};
|
new = import (import ../nix/sources.nix).nixpkgs-new {};
|
||||||
in {
|
in {
|
||||||
containers.lantifa = {
|
containers.lantifa = {
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
|
@ -37,13 +37,13 @@ in {
|
||||||
services.mediawiki = {
|
services.mediawiki = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "LANtifa";
|
name = "LANtifa";
|
||||||
package = unstable.mediawiki;
|
package = new.mediawiki;
|
||||||
database.createLocally = true;
|
database.createLocally = true;
|
||||||
passwordFile = "/var/lib/mediawiki/mediawiki-password";
|
passwordFile = "/var/lib/mediawiki/mediawiki-password";
|
||||||
extraConfig = let
|
extraConfig = let
|
||||||
wikidb = pkgs.fetchzip {
|
wikidb = pkgs.fetchzip {
|
||||||
url = "http://www.kennel17.co.uk/uploads/testwiki/archive/e/e9/20210407232657%21WikiDB.zip";
|
url = "https://www.kennel17.co.uk/uploads/testwiki/e/e9/WikiDB.zip";
|
||||||
sha256 = "0d4f2ygglz4w515a7lgw59500q3xmr92xxhsmh8p204yaa769x8v";
|
sha256 = "0pns9fk1ws54m7rgbfsrxqh6ayab16mmnvzba8m4malljgrbil8b";
|
||||||
};
|
};
|
||||||
in ''
|
in ''
|
||||||
// Configure short URLs
|
// Configure short URLs
|
||||||
|
|
|
@ -68,6 +68,7 @@
|
||||||
"stuebinm@hacc.space"
|
"stuebinm@hacc.space"
|
||||||
"zauberberg@hacc.space"
|
"zauberberg@hacc.space"
|
||||||
"lenny@hacc.space"
|
"lenny@hacc.space"
|
||||||
|
"raphael@hacc.space"
|
||||||
];
|
];
|
||||||
|
|
||||||
# -- Regional: Germany --
|
# -- Regional: Germany --
|
||||||
|
@ -85,6 +86,7 @@
|
||||||
"zauberberg@hacc.space"
|
"zauberberg@hacc.space"
|
||||||
"lenny@hacc.space"
|
"lenny@hacc.space"
|
||||||
"octycs@hacc.space"
|
"octycs@hacc.space"
|
||||||
|
"stuebinm@hacc.space"
|
||||||
];
|
];
|
||||||
|
|
||||||
# -- Regional: Munich --
|
# -- Regional: Munich --
|
||||||
|
|
Loading…
Reference in a new issue