diff --git a/hosts/common/feeds.nix b/hosts/common/feeds.nix index e06579357..6284d97e8 100644 --- a/hosts/common/feeds.nix +++ b/hosts/common/feeds.nix @@ -103,6 +103,7 @@ let (fromDb "sharkbytes.transistor.fm" // tech) # Wireshark Podcast o_0 (fromDb "sscpodcast.libsyn.com" // rat) # Astral Codex Ten (fromDb "talesfromthebridge.buzzsprout.com" // tech) # Sci-Fi? has Peter Watts; author of No Moods, Ads or Cutesy Fucking Icons (rifters.com) + (fromDb "techtalesshow.com" // tech) # Corbin Davenport (fromDb "techwontsave.us" // pol) # rec by Cory Doctorow (fromDb "wakingup.libsyn.com" // pol) # Sam Harris (fromDb "werenotwrong.fireside.fm" // pol) diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index c40b0dd0a..130275345 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -301,10 +301,6 @@ in dtc.sandbox.method = "bwrap"; dtc.sandbox.autodetectCliPaths = true; # TODO:sandbox: untested - dtrx.sandbox.method = "bwrap"; - dtrx.sandbox.whitelistPwd = true; - dtrx.sandbox.autodetectCliPaths = "existing"; #< for the archive - duplicity = {}; e2fsprogs.sandbox.method = "landlock"; diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index d75c61b2d..0294aa0ae 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -28,6 +28,7 @@ ./dialect.nix ./dino.nix ./dissent.nix + ./dtrx.nix ./element-desktop.nix ./engrampa.nix ./epiphany.nix diff --git a/hosts/common/programs/dtrx.nix b/hosts/common/programs/dtrx.nix new file mode 100644 index 000000000..26da67e2c --- /dev/null +++ b/hosts/common/programs/dtrx.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: +{ + sane.programs.dtrx = { + packageUnwrapped = pkgs.dtrx.override { + # `binutils` is the nix wrapper, which reads nix-related env vars + # before passing on to e.g. `ld`. + # dtrx probably only needs `ar` at runtime, not even `ld`. + binutils = pkgs.binutils-unwrapped; + # build without rpm support, since `rpm` package doesn't cross-compile. + rpm = null; + }; + sandbox.method = "bwrap"; + sandbox.whitelistPwd = true; + sandbox.autodetectCliPaths = "existing"; #< for the archive + }; +} diff --git a/modules/data/feeds/sources/techtalesshow.com/default.json b/modules/data/feeds/sources/techtalesshow.com/default.json new file mode 100644 index 000000000..2f771d83f --- /dev/null +++ b/modules/data/feeds/sources/techtalesshow.com/default.json @@ -0,0 +1,9 @@ +{ + "description": "Tech Tales is a podcast exploring the technology \u2026", + "is_podcast": true, + "site_name": "", + "site_url": "", + "title": "Tech Tales", + "url": "https://feeds.soundcloud.com/users/soundcloud:users:971533159/sounds.rss", + "velocity": 0.053 +} \ No newline at end of file diff --git a/overlays/cross.nix b/overlays/cross.nix index 230f91a08..2afa3109c 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -512,12 +512,12 @@ in with final; { }); # 2023/12/08: upstreaming is blocked on rpm - dtrx = prev.dtrx.override { - # `binutils` is the nix wrapper, which reads nix-related env vars - # before passing on to e.g. `ld`. - # dtrx probably only needs `ar` at runtime, not even `ld`. - binutils = binutils-unwrapped; - }; + # dtrx = prev.dtrx.override { + # # `binutils` is the nix wrapper, which reads nix-related env vars + # # before passing on to e.g. `ld`. + # # dtrx probably only needs `ar` at runtime, not even `ld`. + # binutils = binutils-unwrapped; + # }; # emacs = prev.emacs.override { # # fixes "configure: error: cannot run test program while cross compiling" @@ -1833,14 +1833,14 @@ in with final; { # }; # 2023/07/30: upstreaming requires some changes, as configure tries to invoke our `python` # implemented (broken) on servo cross-staging-2023-07-30 branch - rpm = prev.rpm.overrideAttrs (upstream: { - # fixes "python too old". might also be specifiable as a configure flag? - env = upstream.env // lib.optionalAttrs (upstream.version == "4.18.1") { - # 4.19.0 upgrade should fix cross compilation. - # see: - PYTHON = python3.interpreter; - }; - }); + # rpm = prev.rpm.overrideAttrs (upstream: { + # # fixes "python too old". might also be specifiable as a configure flag? + # env = upstream.env // lib.optionalAttrs (upstream.version == "4.18.1") { + # # 4.19.0 upgrade should fix cross compilation. + # # see: + # PYTHON = python3.interpreter; + # }; + # }); # samba = prev.samba.overrideAttrs (_upstream: { # # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv.