diff options
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/haskell/brockman.nix | 23 | ||||
| -rw-r--r-- | krebs/5pkgs/haskell/email-header.nix | 5 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/realwallpaper/default.nix | 5 |
4 files changed, 33 insertions, 1 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index ab25934c8..d18c3e4c8 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -13,6 +13,7 @@ foldl' mergeAttrs {} // { + brockman = self.haskellPackages.brockman; reaktor2 = self.haskellPackages.reaktor2; ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; diff --git a/krebs/5pkgs/haskell/brockman.nix b/krebs/5pkgs/haskell/brockman.nix new file mode 100644 index 000000000..cc08ca5d8 --- /dev/null +++ b/krebs/5pkgs/haskell/brockman.nix @@ -0,0 +1,23 @@ +{ mkDerivation, aeson, async, base, bloomfilter, bytestring +, conduit, containers, feed, hslogger, irc-conduit, microlens +, network, optparse-applicative, stdenv, stm, text, wreq +, fetchFromGitHub +}: +mkDerivation rec { + pname = "brockman"; + version = "1.4.3"; + src = fetchFromGitHub { + owner = "kmein"; + repo = "brockman"; + rev = version; + sha256 = "1721lvdvj47fsif15jvf9x9lsjx0c68fd6i2yjhmhv65cgpivx9q"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bloomfilter bytestring conduit containers feed + hslogger irc-conduit microlens network optparse-applicative stm + text wreq + ]; + license = stdenv.lib.licenses.mit; +} diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index b1e8e1153..94b33e28b 100644 --- a/krebs/5pkgs/haskell/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix @@ -10,6 +10,11 @@ with import <stockholm/lib>; rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8"; sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59"; }; + "20.03" = { + version = "0.4.1-tv1"; + rev = "refs/tags/v${cfg.version}"; + sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x"; + }; }.${versions.majorMinor version} or { version = "0.4.1-tv2"; rev = "refs/tags/v${cfg.version}"; diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix index 72a314ba9..56a7dfb98 100644 --- a/krebs/5pkgs/simple/realwallpaper/default.nix +++ b/krebs/5pkgs/simple/realwallpaper/default.nix @@ -108,7 +108,10 @@ pkgs.writers.writeDashBin "generate-wallpaper" '' 'https://neo.sci.gsfc.nasa.gov/view.php?datasetId=MOD14A1_E_FIRE') & # regular fetches - fetch marker.json "$marker_url" & + fetch marker.json.tmp "$marker_url" + if [ -s marker.json.tmp ]; then + mv marker.json.tmp marker.json + fi fetch sun-raw.jpg 'https://sdo.gsfc.nasa.gov/assets/img/latest/latest_512_0171.jpg' & wait |