Browse Source

temporary nix build stuff

canon
Hazel Levine 8 months ago
parent
commit
17f5c18cbd
11 changed files with 253 additions and 15 deletions
  1. +1
    -0
      .envrc
  2. +1
    -0
      .gitignore
  3. +22
    -0
      default.nix
  4. +9
    -0
      nix/rust.nix
  5. +50
    -0
      nix/sources.json
  6. +134
    -0
      nix/sources.nix
  7. +11
    -0
      shell.nix
  8. +1
    -1
      src/analyzer.rs
  9. +5
    -4
      src/main.rs
  10. +6
    -3
      src/pulse.rs
  11. +13
    -7
      src/window.rs

+ 1
- 0
.envrc View File

@ -0,0 +1 @@
eval "$(lorri direnv)"

+ 1
- 0
.gitignore View File

@ -66,3 +66,4 @@ flycheck_*.el
#Added by cargo
/target
/result

+ 22
- 0
default.nix View File

@ -0,0 +1,22 @@
{ sources ? import ./nix/sources.nix
, pkgs ? import sources.nixpkgs { } }:
let
# import rust compiler
rust = import ./nix/rust.nix { inherit sources; };
# configure naersk to use pinned rust compiler
naersk = pkgs.callPackage sources.naersk {
rustc = rust;
cargo = rust;
};
# tell nix-build to ignore `target/`
src = builtins.filterSource
(path: type: type != "directory" || builtins.baseNameOf path != "target")
./.;
in naersk.buildPackage {
inherit src;
buildInputs = with pkgs; [ pulseaudio ];
nativeBuildInputs = with pkgs; [ pulseaudio ];
}

+ 9
- 0
nix/rust.nix View File

@ -0,0 +1,9 @@
{ sources ? import ./sources.nix }:
let
pkgs =
import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; };
channel = "nightly";
date = "2020-05-31";
targets = [];
chan = pkgs.rustChannelOfTargets channel date targets;
in chan

+ 50
- 0
nix/sources.json View File

@ -0,0 +1,50 @@
{
"naersk": {
"branch": "master",
"description": "Build rust crates in Nix. No configuration, no code generation, no IFD. Sandbox friendly.",
"homepage": "",
"owner": "nmattia",
"repo": "naersk",
"rev": "a82fd7dc31a58c462b6dfa9d9d886fa2cc75dfd4",
"sha256": "00bjwir52y6jbf0b22qy9qxramw35k5fc7kp9hymr1zgpmw9kbwg",
"type": "tarball",
"url": "https://github.com/nmattia/naersk/archive/a82fd7dc31a58c462b6dfa9d9d886fa2cc75dfd4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
"branch": "master",
"description": "Easy dependency management for Nix projects",
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
"rev": "f73bf8d584148677b01859677a63191c31911eae",
"sha256": "0jlmrx633jvqrqlyhlzpvdrnim128gc81q5psz2lpp2af8p8q9qs",
"type": "tarball",
"url": "https://github.com/nmattia/niv/archive/f73bf8d584148677b01859677a63191c31911eae.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-19.09",
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs-channels",
"rev": "35eda4aede5c9c90c6dfc5c4f83cdac7cae59028",
"sha256": "047gkqd304vc07r8kgf13443waaxmhy4skkgj3i2x19cjw7qvl78",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs-channels/archive/35eda4aede5c9c90c6dfc5c4f83cdac7cae59028.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-mozilla": {
"branch": "master",
"description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
"homepage": null,
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "e912ed483e980dfb4666ae0ed17845c4220e5e7c",
"sha256": "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3",
"type": "tarball",
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed483e980dfb4666ae0ed17845c4220e5e7c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

+ 134
- 0
nix/sources.nix View File

@ -0,0 +1,134 @@
# This file has been generated by Niv.
let
#
# The fetchers. fetch_<type> fetches specs of type <type>.
#
fetch_file = pkgs: spec:
if spec.builtin or true then
builtins_fetchurl { inherit (spec) url sha256; }
else
pkgs.fetchurl { inherit (spec) url sha256; };
fetch_tarball = pkgs: spec:
if spec.builtin or true then
builtins_fetchTarball { inherit (spec) url sha256; }
else
pkgs.fetchzip { inherit (spec) url sha256; };
fetch_git = spec:
builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
fetch_builtin-tarball = spec:
builtins.trace
''
WARNING:
The niv type "builtin-tarball" will soon be deprecated. You should
instead use `builtin = true`.
$ niv modify <package> -a type=tarball -a builtin=true
''
builtins_fetchTarball { inherit (spec) url sha256; };
fetch_builtin-url = spec:
builtins.trace
''
WARNING:
The niv type "builtin-url" will soon be deprecated. You should
instead use `builtin = true`.
$ niv modify <package> -a type=file -a builtin=true
''
(builtins_fetchurl { inherit (spec) url sha256; });
#
# Various helpers
#
# The set of packages used when specs are fetched using non-builtins.
mkPkgs = sources:
let
sourcesNixpkgs =
import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
hasThisAsNixpkgsPath = <nixpkgs> == ./.;
in
if builtins.hasAttr "nixpkgs" sources
then sourcesNixpkgs
else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
import <nixpkgs> {}
else
abort
''
Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
add a package called "nixpkgs" to your sources.json.
'';
# The actual fetching function.
fetch = pkgs: name: spec:
if ! builtins.hasAttr "type" spec then
abort "ERROR: niv spec ${name} does not have a 'type' attribute"
else if spec.type == "file" then fetch_file pkgs spec
else if spec.type == "tarball" then fetch_tarball pkgs spec
else if spec.type == "git" then fetch_git spec
else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
else if spec.type == "builtin-url" then fetch_builtin-url spec
else
abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
# Ports of functions for older nix versions
# a Nix version of mapAttrs if the built-in doesn't exist
mapAttrs = builtins.mapAttrs or (
f: set: with builtins;
listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
);
# fetchTarball version that is compatible between all the versions of Nix
builtins_fetchTarball = { url, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchTarball;
in
if lessThan nixVersion "1.12" then
fetchTarball { inherit url; }
else
fetchTarball attrs;
# fetchurl version that is compatible between all the versions of Nix
builtins_fetchurl = { url, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchurl;
in
if lessThan nixVersion "1.12" then
fetchurl { inherit url; }
else
fetchurl attrs;
# Create the final "sources" from the config
mkSources = config:
mapAttrs (
name: spec:
if builtins.hasAttr "outPath" spec
then abort
"The values in sources.json should not have an 'outPath' attribute"
else
spec // { outPath = fetch config.pkgs name spec; }
) config.sources;
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? ./sources.json
, sources ? builtins.fromJSON (builtins.readFile sourcesFile)
, pkgs ? mkPkgs sources
}: rec {
# The sources, i.e. the attribute set of spec name to spec
inherit sources;
# The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
inherit pkgs;
};
in
mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

+ 11
- 0
shell.nix View File

@ -0,0 +1,11 @@
let
sources = import ./nix/sources.nix;
rust = import ./nix/rust.nix { inherit sources; };
pkgs = import <nixpkgs> {};
in
pkgs.mkShell {
buildInputs = [
rust
pkgs.libpulseaudio
];
}

+ 1
- 1
src/analyzer.rs View File

@ -14,7 +14,7 @@ impl From<Fourier> for FourierAnalyzer {
// fail silently if no audio's playing
// TODO: make this Option, probably
if bin_width == 0.0 {
if ext.freq_max == ext.freq_min {
return FourierAnalyzer {
data: vec![0; fft.n_bins],
};


+ 5
- 4
src/main.rs View File

@ -27,20 +27,21 @@ fn main() -> Result<()> {
let events = Events::new();
let mut win = Window::new(25);
let mut rec = PARecorder::new(1024)?;
let mut rec = PARecorder::new(2048)?;
loop {
let width = win.bar_width(&terminal.size()?);
terminal.draw(|mut f| {
let chunks = Layout::default()
.direction(Direction::Vertical)
.margin(2)
.constraints([Constraint::Percentage(100), Constraint::Percentage(100)].as_ref())
.split(f.size());
let barchart = BarChart::default()
.block(Block::default().title("wizja 0.1.0").borders(Borders::ALL))
.data(&win.spectrum)
.bar_width(4)
.max(20)
.bar_width(width)
.max(10)
.style(Style::default().fg(Color::Blue))
.value_style(Style::default().fg(Color::Black).bg(Color::Blue));
f.render_widget(barchart, chunks[0]);


+ 6
- 3
src/pulse.rs View File

@ -87,10 +87,13 @@ impl PARecorder {
})
}
pub fn get(&self) -> Result<Vec<u8>> {
pub fn get(&self) -> Option<Result<Vec<u8>>> {
match self.rx.try_recv() {
Ok(val) => val,
Err(_) => Ok(vec![0; self.buf_size]), // fail silently if we can't read
Ok(val) => Some(val),
Err(e) => match e {
mpsc::TryRecvError::Empty => None,
mpsc::TryRecvError::Disconnected => panic!("Failed to connect to PA thread!"),
},
}
}
}

+ 13
- 7
src/window.rs View File

@ -1,4 +1,5 @@
use anyhow::Result;
use tui::layout::Rect;
use crate::{analyzer::FourierAnalyzer, fourier::Fourier, pulse::PARecorder};
@ -15,15 +16,20 @@ impl<'a> Window<'a> {
}
pub fn update(&mut self, rec: &mut PARecorder) -> Result<()> {
let audio = rec.get()?;
if let Some(audio) = rec.get() {
let audio = audio?;
let fft = Fourier::new(&audio, self.spectrum.len())
.normalize()
.cutoff_filter();
let fft = Fourier::new(&audio, self.spectrum.len())
.normalize()
.cutoff_filter();
let analyzer = FourierAnalyzer::from(fft).transform();
self.spectrum = analyzer.into();
let analyzer = FourierAnalyzer::from(fft).transform();
self.spectrum = analyzer.into();
}
Ok(())
}
pub fn bar_width(&self, size: &Rect) -> u16 {
(size.width as usize / self.spectrum.len() - 1) as u16
}
}

Loading…
Cancel
Save