From 163d2f2931729c85b1d5bd1f086122c32bc02fff Mon Sep 17 00:00:00 2001 From: schweby Date: Wed, 22 Jun 2022 17:24:40 +0000 Subject: [PATCH] patch patch patch schweby is anoyed --- hosts/nixda/configuration.nix | 2 +- hosts/parsons/configuration.nix | 2 +- modules/default.nix | 1 - nix/sources.json | 32 +++++++++++------------ pkgs/blackmagic-desktop-video/default.nix | 10 +++---- pkgs/decklink/default.nix | 18 ++++++------- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/hosts/nixda/configuration.nix b/hosts/nixda/configuration.nix index a254458..4f6367d 100644 --- a/hosts/nixda/configuration.nix +++ b/hosts/nixda/configuration.nix @@ -25,7 +25,7 @@ networking.hostName = "nixda"; # Define your hostname. - environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender companion ]; + environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender ]; networking.wg-quick.interfaces.cornbox = { privateKeyFile = "/etc/wireguard/cornbox.key"; diff --git a/hosts/parsons/configuration.nix b/hosts/parsons/configuration.nix index e08d403..16bf957 100644 --- a/hosts/parsons/configuration.nix +++ b/hosts/parsons/configuration.nix @@ -20,7 +20,7 @@ ../../services/nginx-pages.nix ../../services/gitlab-runner.nix ../../services/lantifa.nix - ../../services/vaultwarden.nix +# ../../services/vaultwarden.nix ../../services/workadventure.nix ./lxc.nix diff --git a/modules/default.nix b/modules/default.nix index 10c2701..9e8e864 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -6,7 +6,6 @@ in { ./nftnat ./decklink.nix ./websites.nix - "${sources.nixpkgs-unstable}/nixos/modules/services/security/vaultwarden" ]; # disabled since vaultwarden defines a dummy bitwarden_rs option that diff --git a/nix/sources.json b/nix/sources.json index 8d192ec..25c84bc 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": "7329ffc6e911106494183557fc249180d5422929", - "sha256": "1liqvc6bhfypscbvq953j8izw806xn4vklh86zyqpkmsa5ac0yvp", + "rev": "454abeb5a891b2b56f10a30f2a846e8341cbfe9b", + "sha256": "18lda6l5zdvi6jyy14rcawbdbk0axb8wghip0xb4bqiz6c13hn03", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/7329ffc6e911106494183557fc249180d5422929.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/454abeb5a891b2b56f10a30f2a846e8341cbfe9b.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": "3172adfce9d98fe8f9c98ccd0a0fdbb52291ae0a", + "rev": "00016e3a4ff46d17ec2683fed1d9d8ff98dc72a0", "sha256": "1sy0kydp87pwby0whgq678jq1zpivqndip81787r9b3dqcyq47cp", "type": "tarball", "url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.2.tar.gz", @@ -43,10 +43,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c", - "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm", + "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", + "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz", + "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nix-hexchen": { @@ -75,10 +75,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61", - "sha256": "0vyjpf1jw4cvw7kfbk055faq08q4swz6v1h2mf9zw4r8frhqa73w", + "rev": "046ee4af7a9f016a364f8f78eeaa356ba524ac31", + "sha256": "0ck6g4dpnvswn32ilb561k50xl9yyzvvw5zgxgq81fgk0vn7zzdd", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/7bca80140fc7732c7357b26002db3d87b3ba4c61.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/046ee4af7a9f016a364f8f78eeaa356ba524ac31.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-new": { @@ -87,10 +87,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "8588b14a397e045692d0a87192810b6dddf53003", - "sha256": "15srsgbhgn27wa4kz4x0gfqbsdnwig0h0y8gj2h4nnw92nrxpvnm", + "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418", + "sha256": "05gc6xyv8a2dppngm1q44j85j769lr90lg20s6jv62gfg344i50r", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/8588b14a397e045692d0a87192810b6dddf53003.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/63198c9ccefdbd337cef0d85db0ea2689f4ce418.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": { @@ -99,10 +99,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac169ec6371f0d835542db654a65e0f2feb07838", - "sha256": "0bwjyz15sr5f7z0niwls9127hikp2b6fggisysk0cnk3l6fa8abh", + "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", + "sha256": "1isscmp50759g0jg09p9067l0l29i3zp61zxfc4r03mz3kspd1g5", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/ac169ec6371f0d835542db654a65e0f2feb07838.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/a72d7811be1162dd6804c4e36e5402d76fb6e921.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "workadventure": { diff --git a/pkgs/blackmagic-desktop-video/default.nix b/pkgs/blackmagic-desktop-video/default.nix index df9d599..6162848 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.2.2"; + version = "12.3"; buildInputs = [ libcxx libcxxabi ]; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz"; + name = "Blackmagic_Desktop_Video_Linux_12.3.tar.gz"; url = "https://www.blackmagicdesign.com/support/"; - sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35"; + sha256 = "cbf3f8ff384ddab1fbf481f2b1b3be3dd718f5fa4394ab0ae9736935161fd5b0"; }; setSourceRoot = '' - 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 + tar xf Blackmagic_Desktop_Video_Linux_12.3/other/x86_64/desktopvideo-12.3a10-x86_64.tar.gz + sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.3a10-x86_64 ''; installPhase = '' diff --git a/pkgs/decklink/default.nix b/pkgs/decklink/default.nix index 4f9af5e..317a370 100644 --- a/pkgs/decklink/default.nix +++ b/pkgs/decklink/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "decklink"; - version = "12.2.2"; + version = "12.3"; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_12.2.2.tar.gz"; + name = "Blackmagic_Desktop_Video_Linux_12.3.tar.gz"; url = "https://www.blackmagicdesign.com/support/"; - sha256 = "8bca946bd3f002d2d404a74210c881935351e1a0d03f750559b180fdb439ef35"; + sha256 = "1c6m3wb3asbkx45ap523zbsiimrxpsrv3wl1ykxv3njd73zziwyb"; }; 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.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 + tar xf Blackmagic_Desktop_Video_Linux_12.3/other/x86_64/desktopvideo-12.3a10-x86_64.tar.gz + sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.3a10-x86_64/usr/src ''; buildPhase = '' runHook preBuild - make -C $sourceRoot/blackmagic-12.2.2a6 -j$NIX_BUILD_CORES - make -C $sourceRoot/blackmagic-io-12.2.2a6 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-12.3a10 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-io-12.3a10 -j$NIX_BUILD_CORES runHook postBuild ''; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - make -C $KERNELDIR M=$sourceRoot/blackmagic-12.2.2a6 modules_install - make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.2.2a6 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-12.3a10 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.3a10 modules_install runHook postInstall '';