diff options
| -rw-r--r-- | third_party/nixpkgs/default.nix | 2 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 20 | ||||
| -rw-r--r-- | third_party/sources/sources.json | 24 |
3 files changed, 32 insertions, 14 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index dbdd068a869b..9ac3e05149bd 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -49,8 +49,6 @@ let # bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x # TODO(tazjin): upgrade cheddar to syntect 5.0 bat - # TODO(sterni): Temporarily use awscli2 from stable, since it broke in unstable - awscli2 ; }; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index b2ef0eee3e2c..59c9ecf64369 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -56,6 +56,19 @@ in }) ); + # Upgrade to match telega in emacs-overlay + # TODO(tazjin): ugrade tdlib (+ telega?!) in nixpkgs + tdlib = assert super.tdlib.version == "1.8.3"; + super.tdlib.overrideAttrs (old: { + version = "1.8.4"; + src = self.fetchFromGitHub { + owner = "tdlib"; + repo = "td"; + rev = "7eabd8ca60de025e45e99d4e5edd39f4ebd9467e"; + sha256 = "1chs0ibghjj275v9arsn3k68ppblpm7ysqk0za9kya5vdnldlld5"; + }; + }); + # dottime support for notmuch notmuch = super.notmuch.overrideAttrs (old: { passthru = old.passthru // { @@ -67,6 +80,13 @@ in # https://github.com/edolstra/nix-serve/issues/28 nix-serve = super.nix-serve.override { nix = super.nix_2_3; }; + # Workaround for srcOnly with separateDebugInfo until + # https://github.com/NixOS/nixpkgs/pull/179170 is merged. + srcOnly = args: (super.srcOnly args).overrideAttrs (_: { + outputs = [ "out" ]; + separateDebugInfo = false; + }); + # Avoid builds of mkShell derivations in CI. mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: { passthru = { diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 4d4f5e26aa83..a159f90cada9 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "843a950588e33a0ef1451f255cc1558833e3e474", - "sha256": "0md4r2wl3aw72pbh83qpldspiprbp4nv1lmmcjxv48krik4qdr65", + "rev": "057f91fc4ed58b5deeb8319c82bdb0b737e952f0", + "sha256": "0klzkxj65wx4gx6dzz4kgcpaygn47rjmbgv2lnsijwyyb5j3n98a", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/843a950588e33a0ef1451f255cc1558833e3e474.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/057f91fc4ed58b5deeb8319c82bdb0b737e952f0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "impermanence": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", - "sha256": "1lq2lirv5mkx74aly30xfhdwz7jq9hv4nrs49j693pv96z0p63gf", + "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68", + "sha256": "1h5g6hvnsi17y43792acy4by92fyzljs93fj46w2syhn8v74a7fj", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/0d68d7c857fe301d49cdcd56130e0beea4ecd5aa.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/6141b8932a5cf376fe18fcd368cecd9ad946cb68.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-stable": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418", - "sha256": "05gc6xyv8a2dppngm1q44j85j769lr90lg20s6jv62gfg344i50r", + "rev": "902d91def1efbea804f5158e5999cb113cedf04b", + "sha256": "1ya19ix77k2yn1c2gyzz644576c2qn11llrqhyy0c7a3y4dlwnn9", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/63198c9ccefdbd337cef0d85db0ea2689f4ce418.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/902d91def1efbea804f5158e5999cb113cedf04b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "rustsec-advisory-db": { @@ -77,10 +77,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "49fb6c0b9418350332fa1e944ec83a5556ec5d91", - "sha256": "0d11rir2m22jf1k0fjakx4b0n3w69i2hl7jhwnhq5dd8qfg2s31j", + "rev": "7381319981f22240860294bdecabca3c58a27ad1", + "sha256": "190q8bys4b8arzkyqkavwsnl2wg8d7wmp9sqshdp4yn4s5n0lv80", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/49fb6c0b9418350332fa1e944ec83a5556ec5d91.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/7381319981f22240860294bdecabca3c58a27ad1.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } |