diff options
Diffstat (limited to '')
| -rw-r--r-- | home/newsboat-public.nix | 5 | ||||
| -rw-r--r-- | npins/sources.json | 38 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 50 |
3 files changed, 72 insertions, 21 deletions
diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix index 29e2370..bd334fb 100644 --- a/home/newsboat-public.nix +++ b/home/newsboat-public.nix @@ -219,6 +219,11 @@ with import ./newsboat-lib.nix; (btag "https://antonia.is/rss.xml" "friends") (btag "https://ancientalexandra.weebly.com/3/feed" "hist") (btag "https://github.com/bookwyrm-social/bookwyrm/releases.atom" "comp") + (btag "https://rachelbythebay.com/w/atom.xml" "comp") + (btag "https://xn--gckvb8fzb.com/index.xml" "comp") + (btag "https://blog.aada.cat/index.xml" "friends") + (btag "https://jonworth.eu/feed/" "trains") + (btag "https://vulpinecitrus.info/blog/atom.xml" "comp") # paper (btag "http://arxiv.org/rss/cs.PL" "paper") diff --git a/npins/sources.json b/npins/sources.json index 94f72f0..c713575 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -33,9 +33,9 @@ }, "branch": "rnv", "submodules": false, - "revision": "38ea5267c448f7c3d228477479a2dd66e57d4688", + "revision": "f3816a353b316287db0f4951e7007a72a456ed2d", "url": null, - "hash": "0bl87zbh4jpw25h7bk6mkh0789ppbpa13zqxlm59r4wfp1nz8yii" + "hash": "04pwk2k4my6mwp5zpdq3ysfdhd3k8wggb6018xmnv4h2wmk4hcgq" }, "blog": { "type": "Git", @@ -138,9 +138,9 @@ }, "branch": "main", "submodules": false, - "revision": "a99842e0af7cb8a1b6adb2cddbbe6a63b1e9ee4d", + "revision": "0ebb1c524ddecbf002ccf7fb530711d56ed1e9b2", "url": null, - "hash": "0vsgz2r95f4whvrmghgqsg2xy1mc4mj6jwd2zrlyr9iivcwi1pw1" + "hash": "1dalq429srs7sg7ykhwj49r2ifag634g8vppk2hhxdyv9xzm1i8i" }, "lix-nixos-module": { "type": "Git", @@ -189,9 +189,9 @@ }, "branch": "nixos-25.05", "submodules": false, - "revision": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", - "url": "https://github.com/NixOS/nixpkgs/archive/00d2457e2f608b4be6fe8b470b0a36816324b0ae.tar.gz", - "hash": "10h8yz4x1iacrp1bsih2kmpn1chaxwpmqrpy1lysrb8p9hfwacp1" + "revision": "d02bcc33948ca19b0aaa0213fe987ceec1f4ebe1", + "url": "https://github.com/NixOS/nixpkgs/archive/d02bcc33948ca19b0aaa0213fe987ceec1f4ebe1.tar.gz", + "hash": "1qzg2pvbbdbrxfhx40b0z4nm8bdssdfj7k7fmz6hy08133mhk07d" }, "nixpkgs-unstable": { "type": "Git", @@ -202,9 +202,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "a672be65651c80d3f592a89b3945466584a22069", - "url": "https://github.com/NixOS/nixpkgs/archive/a672be65651c80d3f592a89b3945466584a22069.tar.gz", - "hash": "1p2g7g9vlpv14xz6rrlb8i6w8sxki8i35m15phjiwfrqaf6x508i" + "revision": "09b8fda8959d761445f12b55f380d90375a1d6bb", + "url": "https://github.com/NixOS/nixpkgs/archive/09b8fda8959d761445f12b55f380d90375a1d6bb.tar.gz", + "hash": "0333ri3rmkwlsyvbf8916psydq5i2xq0cj6iis9d6f4ghr19vbva" }, "ntfy-matrix-bot": { "type": "Git", @@ -255,9 +255,9 @@ }, "branch": "master", "submodules": false, - "revision": "d5c12f6d5c7909e6119a82bc4aba682ac3110b2d", - "url": "https://github.com/dune-universe/opam-overlays/archive/d5c12f6d5c7909e6119a82bc4aba682ac3110b2d.tar.gz", - "hash": "199qrblnd9mblr8l815wibmc147qinyvkqqi2gjmby76g3aw1h4x" + "revision": "12731a6f86d7c452a94c72106fa9d3327988582d", + "url": "https://github.com/dune-universe/opam-overlays/archive/12731a6f86d7c452a94c72106fa9d3327988582d.tar.gz", + "hash": "0zhgcn5j5aygxqkzsfdsfafw17pr9f2fcs7175kiwyrfj2wzsdmn" }, "opam-repository": { "type": "GitRelease", @@ -312,9 +312,9 @@ }, "branch": "master", "submodules": false, - "revision": "7ed7e8c74be95906275805db68201e74e9904f07", - "url": "https://github.com/oxalica/rust-overlay/archive/7ed7e8c74be95906275805db68201e74e9904f07.tar.gz", - "hash": "1iqg073ara6z5mzzwz12zb20swq8lbjkgy0k4bc170g6bh03vmjx" + "revision": "4f53a635709d82652567f51ef7af4365fbc0c88b", + "url": "https://github.com/oxalica/rust-overlay/archive/4f53a635709d82652567f51ef7af4365fbc0c88b.tar.gz", + "hash": "1yy8cnhkpzk9vbwg83nmc67544imzw6x4qi0jgibvx5impjswrlv" }, "showrt": { "type": "Git", @@ -350,9 +350,9 @@ }, "branch": "master", "submodules": false, - "revision": "aeb517262102f13683d7a191c7e496b34df8d24c", - "url": "https://github.com/Mic92/sops-nix/archive/aeb517262102f13683d7a191c7e496b34df8d24c.tar.gz", - "hash": "1pra1yavc8xhgvl53jji8w3f9d8j5shgkfzwav69wyg429n8rlcb" + "revision": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc", + "url": "https://github.com/Mic92/sops-nix/archive/94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc.tar.gz", + "hash": "12qymxlpzq4dpv9kvq2lkz8xqz9b9r0g9b88zxr1qhr9hyqsg43w" }, "traveltext": { "type": "Git", diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index a3a58a7..e02fdef 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -165,10 +165,56 @@ in overrides = self': super': with self.haskell.lib; { fuzzyfind = unmarkBroken (doJailbreak super'.fuzzyfind); fuzzyset = unmarkBroken (doJailbreak super'.fuzzyset); + rustls = self.haskellPackages.callPackage + ({ mkDerivation, async, base, bytestring, containers + , derive-storable, directory, filepath, hedgehog, lib, mtl, network + , process, resourcet, stm, tasty, tasty-hedgehog + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "rustls"; + version = "0.2.2.0"; + sha256 = "3c610437b4fb8b6ae86e6d3bebca8c15631b0d793d925ab5eeebb88b8ac77371"; + libraryHaskellDepends = [ + base bytestring containers derive-storable mtl network resourcet + text transformers + ]; + libraryPkgconfigDepends = [ self.rustls-ffi ]; + testHaskellDepends = [ + async base bytestring containers directory filepath hedgehog + process resourcet stm tasty tasty-hedgehog tasty-hunit temporary + text transformers + ]; + homepage = "https://github.com/amesgen/hs-rustls/tree/main/rustls"; + description = "TLS bindings for Rustls"; + license = lib.licenses.cc0; + doCheck = false; + }) {}; + http-client-rustls = self'.callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-types, lib, network, port-utils, process, resourcet, rustls + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "http-client-rustls"; + version = "0.0.2.0"; + sha256 = "05505bf77e3d967b01187ffb55ea6c3f658ba446aeffeccdac16cbb6960d940d"; + libraryHaskellDepends = [ + base bytestring http-client network resourcet rustls text + ]; + testHaskellDepends = [ + base bytestring directory filepath http-client http-types network + port-utils process rustls tasty tasty-hunit temporary + ]; + homepage = "https://github.com/amesgen/hs-rustls/tree/main/http-client-rustls"; + description = "http-client TLS backend using Rustls"; + license = lib.licenses.cc0; + doCheck = false; + }) {}; }; }); pkg = { mkDerivation, base, bytestring, cassava, containers - , fuzzyfind, fuzzyset, http-client, http-client-openssl, http-types + , fuzzyfind, fuzzyset, http-client, http-client-rustls, http-types , lib, stm, text, time, vector, wai, wai-extra, warp }: mkDerivation { @@ -179,7 +225,7 @@ in isExecutable = true; executableHaskellDepends = [ base bytestring cassava containers fuzzyfind fuzzyset http-client - http-client-openssl http-types stm text time vector wai wai-extra + http-client-rustls http-types stm text time vector wai wai-extra warp ]; jailbreak = true; |