From 3ad6a0d2dfb7b325e208b51efb24ee08b3d882d0 Mon Sep 17 00:00:00 2001 From: raphael Date: Wed, 1 Dec 2021 21:22:53 +0000 Subject: [PATCH 1/6] raphael@hacc.space added to voc@hacc.space --- services/mail.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/services/mail.nix b/services/mail.nix index 4fe190c..6813e08 100644 --- a/services/mail.nix +++ b/services/mail.nix @@ -68,6 +68,7 @@ "stuebinm@hacc.space" "zauberberg@hacc.space" "lenny@hacc.space" + "raphael@hacc.space" ]; # -- Regional: Germany -- From 928d44fb9556ac3886445ad41ec2732bab50c318 Mon Sep 17 00:00:00 2001 From: raphael Date: Wed, 1 Dec 2021 21:25:27 +0000 Subject: [PATCH 2/6] Added stuebinm@hacc.space to mitglieder@hacc.space --- services/mail.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/services/mail.nix b/services/mail.nix index 6813e08..a02ed7a 100644 --- a/services/mail.nix +++ b/services/mail.nix @@ -86,6 +86,7 @@ "zauberberg@hacc.space" "lenny@hacc.space" "octycs@hacc.space" + "stuebinm@hacc.space" ]; # -- Regional: Munich -- From bde7afa9ca95c49112c7aeb3186a97c4ab649748 Mon Sep 17 00:00:00 2001 From: schweby Date: Sat, 11 Dec 2021 12:54:02 +0100 Subject: [PATCH 3/6] sources: update --- nix/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 8b3bf44..23c7524 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -11,10 +11,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1", - "sha256": "0nznlb2xgkvdav6d4qls2w81m3p3h4hdbwbp2nwqkiszkp7j1bln", + "rev": "7329ffc6e911106494183557fc249180d5422929", + "sha256": "1liqvc6bhfypscbvq953j8izw806xn4vklh86zyqpkmsa5ac0yvp", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/7329ffc6e911106494183557fc249180d5422929.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "mattermost-server": { @@ -23,7 +23,7 @@ "homepage": "https://mattermost.com", "owner": "mattermost", "repo": "mattermost-server", - "rev": "b7a7d8e7b6f0986ffd6f1466909f31db2e39d268", + "rev": "62d4d8166d85bbc47a2d9223e3e7b3b5bfb54d9d", "sha256": "0ni10mv38qjyyrygs66ja3ayhn61rhbxxvvfr3rmkkn5mvpzyp92", "type": "tarball", "url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.0.tar.gz", @@ -81,10 +81,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", - "sha256": "1xsp0xyrf8arjkf4wi09n96kbg0r8igsmzx8bhc1nj4nr078p0pg", + "rev": "3b422991781220853035dbe353ba8b7cb279b6b3", + "sha256": "0w4dmvjbvyqmn43b5r8anlynbm8bgmb79iqxrh9r04y0kpnbz5pz", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/46251a79f752ae1d46ef733e8e9760b6d3429da4.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/3b422991781220853035dbe353ba8b7cb279b6b3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": { @@ -93,10 +93,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61", - "sha256": "0036sv1sc4ddf8mv8f8j9ifqzl3fhvsbri4z1kppn0f1zk6jv9yi", + "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", + "sha256": "1qpmqj075pppa6ihmkacf491lhq7rpxlcm8cm6h18raardsr3irr", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/581d2d6c9cd5c289002203581d8aa0861963a933.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "workadventure": { From af8b16117f3b6f76d1c52bfad8693d4238ff1d9d Mon Sep 17 00:00:00 2001 From: schweby Date: Sat, 11 Dec 2021 13:20:15 +0100 Subject: [PATCH 4/6] sources: add 21.11 as nixpkgs-new --- nix/sources.json | 12 ++++++++++++ pkgs/default.nix | 1 + 2 files changed, 13 insertions(+) diff --git a/nix/sources.json b/nix/sources.json index 23c7524..569f15b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -87,6 +87,18 @@ "url": "https://github.com/nixos/nixpkgs/archive/3b422991781220853035dbe353ba8b7cb279b6b3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "nixpkgs-new": { + "branch": "nixos-21.11", + "description": "Nix Packages collection", + "homepage": "", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "sha256": "1fx6nqz8x9biwlwsnh67z5qz0fmrdgr01yvmdw2cw9xjx8hyss3s", + "type": "tarball", + "url": "https://github.com/nixos/nixpkgs/archive/1bd4bbd49bef217a3d1adea43498270d6e779d65.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "nixpkgs-unstable": { "branch": "nixos-unstable", "description": "Nix Packages collection", diff --git a/pkgs/default.nix b/pkgs/default.nix index beb7bd8..f6ebdee 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,7 @@ let sources = import ../nix/sources.nix; pkgs = import sources.nixpkgs args; unstable = import sources.nixpkgs-unstable args; + new = import sources.nixpkgs-new args; callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); From 2a1e6925224f0eefae0300b0f99f93a02098ba42 Mon Sep 17 00:00:00 2001 From: schweby Date: Sat, 11 Dec 2021 13:20:42 +0100 Subject: [PATCH 5/6] services/lantifa: set mediawiki-version from 21.11 due to a wikiDB issue the mediawiki version in unstable (37) is not compatible. switching to 21.05 would mean a downgrade, so this is the hack until we fully upgrade to 21.11 --- services/lantifa.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/lantifa.nix b/services/lantifa.nix index 78ee25d..f1f0997 100644 --- a/services/lantifa.nix +++ b/services/lantifa.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, profiles, modules, evalConfig, ... }: let - unstable = import (import ../nix/sources.nix).nixpkgs-unstable {}; + new = import (import ../nix/sources.nix).nixpkgs-new {}; in { containers.lantifa = { autoStart = true; @@ -37,13 +37,13 @@ in { services.mediawiki = { enable = true; name = "LANtifa"; - package = unstable.mediawiki; + package = new.mediawiki; database.createLocally = true; passwordFile = "/var/lib/mediawiki/mediawiki-password"; extraConfig = let wikidb = pkgs.fetchzip { - url = "http://www.kennel17.co.uk/uploads/testwiki/archive/e/e9/20210407232657%21WikiDB.zip"; - sha256 = "0d4f2ygglz4w515a7lgw59500q3xmr92xxhsmh8p204yaa769x8v"; + url = "https://www.kennel17.co.uk/uploads/testwiki/e/e9/WikiDB.zip"; + sha256 = "0pns9fk1ws54m7rgbfsrxqh6ayab16mmnvzba8m4malljgrbil8b"; }; in '' // Configure short URLs From ba60e3cf760b0deea6ecda6900b3460c3e5c2c9c Mon Sep 17 00:00:00 2001 From: schweby Date: Sun, 19 Dec 2021 17:03:53 +0100 Subject: [PATCH 6/6] pkgs/blackmagic-desktop-video: update to 12.2.2 --- pkgs/blackmagic-desktop-video/default.nix | 12 ++++++------ pkgs/decklink/default.nix | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/blackmagic-desktop-video/default.nix b/pkgs/blackmagic-desktop-video/default.nix index 8bbf396..df9d599 100644 --- a/pkgs/blackmagic-desktop-video/default.nix +++ b/pkgs/blackmagic-desktop-video/default.nix @@ -4,21 +4,21 @@ stdenv.mkDerivation rec { pname = "blackmagic-desktop-video"; - version = "12.0"; + version = "12.2.2"; buildInputs = [ libcxx libcxxabi ]; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_12.1.tar.gz"; - url = "https://www.blackmagicdesign.com/support/download/d99c3a1740b546f094ffbb30ddf1f4c1"; - sha256 = "51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73"; + name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz"; + url = "https://www.blackmagicdesign.com/support/"; + sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35"; }; setSourceRoot = '' - tar xf Blackmagic_Desktop_Video_Linux_12.1/other/x86_64/desktopvideo-12.1a9-x86_64.tar.gz - sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.1a9-x86_64 + 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.2.2a6-x86_64 ''; installPhase = '' diff --git a/pkgs/decklink/default.nix b/pkgs/decklink/default.nix index ab0278c..4f9af5e 100644 --- a/pkgs/decklink/default.nix +++ b/pkgs/decklink/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "decklink"; - version = "12.0"; + version = "12.2.2"; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_12.1.tar.gz"; - url = "https://www.blackmagicdesign.com/support/download/d99c3a1740b546f094ffbb30ddf1f4c1"; - sha256 = "51febf247d22412beea2d637fcc34cc19b1a46df9a5bf0e157d95705bf7c7b73"; + name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz"; + url = "https://www.blackmagicdesign.com/support/"; + sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35"; }; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; setSourceRoot = '' - tar xf Blackmagic_Desktop_Video_Linux_12.1/other/x86_64/desktopvideo-12.1a9-x86_64.tar.gz - sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.1a9-x86_64/usr/src + 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.2.2a6-x86_64/usr/src ''; buildPhase = '' runHook preBuild - make -C $sourceRoot/blackmagic-12.1a9 -j$NIX_BUILD_CORES - make -C $sourceRoot/blackmagic-io-12.1a9 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-12.2.2a6 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-io-12.2.2a6 -j$NIX_BUILD_CORES runHook postBuild ''; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - make -C $KERNELDIR M=$sourceRoot/blackmagic-12.1a9 modules_install - make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.1a9 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-12.2.2a6 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.2.2a6 modules_install runHook postInstall '';