From e6de7744d4d9425ce35dff96f966ea6c8a1b3860 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 2 Aug 2023 11:21:47 -0600 Subject: [PATCH 1/3] pkgs/sliding-sync: bump to 0.99.5 --- pkgs/sliding-sync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/sliding-sync.nix b/pkgs/sliding-sync.nix index 801bc4f..8f6574d 100644 --- a/pkgs/sliding-sync.nix +++ b/pkgs/sliding-sync.nix @@ -7,13 +7,13 @@ with lib; buildGoModule rec { pname = "sliding-sync"; - version = "0.99.4"; + version = "0.99.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "v${version}"; - hash = "sha256-s7hQ4qCOhkNS8Mc2HZjFqedtj0KqXMAxVMZRIjPyvOA="; + hash = "sha256-L2cWKPVclurOCpyQezHPB+5zYD91EREBXjRYBzjxkII="; }; vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4="; From 7be31bac9db6bc5ea481f3df56dea2d2dfa6923c Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 2 Aug 2023 11:24:25 -0600 Subject: [PATCH 2/3] europa: cleanup --- hosts/europa/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index f7f31c0..ebf9811 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -100,14 +100,13 @@ in { }; }; - boot.binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"]; - nixpkgs.config = { allowUnfree = true; allowUnsupportedSystem = true; }; boot = { + binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"]; initrd.systemd.enable = true; loader = { systemd-boot.enable = true; @@ -118,7 +117,6 @@ in { }; kernelParams = ["boot.shell_on_fail" "mem_sleep_default=deep"]; kernelPackages = pkgs.linuxPackages_latest; - #kernelPackages = pkgs.linuxPackages; }; sshFidoAgent.enable = lib.mkDefault true; From 7edd89867360f7b8b5cd7867bd65404a6bcdf713 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 3 Aug 2023 05:34:43 -0600 Subject: [PATCH 3/3] pkgs/mvoice: init at 8e0a9fb350f8308d7ee7e07e3cc48e7c33a7be64 --- flake.nix | 4 +++- pkgs/mvoice.nix | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/mvoice.nix diff --git a/flake.nix b/flake.nix index 4412f0e..9024e14 100644 --- a/flake.nix +++ b/flake.nix @@ -313,7 +313,9 @@ spkgs.callPackage ./pkgs/gotosocial.nix {inherit spkgs;}; zutty = upkgs.callPackage ./pkgs/zutty.nix { inherit upkgs; - isUnstable = true; + }; + mvoice = upkgs.callPackage ./pkgs/mvoice.nix { + inherit upkgs; }; inherit (xintray.packages.${system}) xintray; inherit (tsvnstat.packages.${system}) tsvnstat; diff --git a/pkgs/mvoice.nix b/pkgs/mvoice.nix new file mode 100644 index 0000000..7176a45 --- /dev/null +++ b/pkgs/mvoice.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkgs, + ... +}: +stdenv.mkDerivation { + pname = "mvoice"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "n7tae"; + repo = "mvoice"; + rev = "8e0a9fb350f8308d7ee7e07e3cc48e7c33a7be64"; + sha256 = "sha256-DNCF/m56owu8DYcv2lLxUZ+mVpmivXbPjBFE2V/23pE="; + }; + + nativeBuildInputs = with pkgs; [ + alsa-lib + curl + fltk + gcc + gettext + gnutls + msgpack + opendht + paprefs + pavucontrol + pulseaudio + ]; + + prePatch = '' + substituteInPlace Makefile \ + --replace "/bin/cp" "cp" + substituteInPlace Makefile \ + --replace "/bin/rm" "rm" + ''; + + preBuild = '' + export HOME=$out + ''; + + meta = with lib; { + description = "A prototype M17 voice application for ham radio"; + homepage = "https://github.com/n7tae/mvoice"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [qbit]; + }; +}