diff options
| -rw-r--r-- | npins/sources.json | 28 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 6 |
2 files changed, 19 insertions, 15 deletions
diff --git a/npins/sources.json b/npins/sources.json index dcfb6f6..b1c6a9b 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -100,9 +100,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/lix" }, "branch": "main", - "revision": "66469fc281fc4abb3284574f77a8051fee8116b9", + "revision": "5137cea99044d54337e439510a647743110b2d7d", "url": null, - "hash": "1ra5vrlxcwdbd0hq91drj0d8qyb3cj1jky5gsf0l5rp2vw639cqn" + "hash": "0vfs7m3k8bwnhd8xsydb2rp4q5jsw36iavp9j0jh0pfvwbfd0n95" }, "lix-nixos-module": { "type": "Git", @@ -123,9 +123,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.05", - "revision": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", - "url": "https://github.com/NixOS/nixpkgs/archive/a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51.tar.gz", - "hash": "0k8dbsqck7s24d5y33s0j17fhq3g3zn9d6g2cnd8q0jm8c1qj611" + "revision": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "url": "https://github.com/NixOS/nixpkgs/archive/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc.tar.gz", + "hash": "1s0cb03j3rwgpgnl4jy1bjmx4gh70iin8h1kn84gw0x5lgavscm1" }, "nixpkgs-unstable": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "81610abc161d4021b29199aa464d6a1a521e0cc9", - "url": "https://github.com/NixOS/nixpkgs/archive/81610abc161d4021b29199aa464d6a1a521e0cc9.tar.gz", - "hash": "19j550srrsmsfzz0arfva1n13kjdz5yiz3x2ss3mgpaxacny7iad" + "revision": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "url": "https://github.com/NixOS/nixpkgs/archive/154bcb95ad51bc257c2ce4043a725de6ca700ef6.tar.gz", + "hash": "0gv8wgjqldh9nr3lvpjas7sk0ffyahmvfrz5g4wd8l2r15wyk67f" }, "ntfy-matrix-bot": { "type": "Git", @@ -169,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", - "url": "https://github.com/oxalica/rust-overlay/archive/27ec296d93cb4b2d03e8cbd019b1b4cde8c34280.tar.gz", - "hash": "1yynqc7hyv4sg33ybji6lzjfahqgglncigsxwzz8c09x5fjgjq3i" + "revision": "65e3dc0fe079fe8df087cd38f1fe6836a0373aad", + "url": "https://github.com/oxalica/rust-overlay/archive/65e3dc0fe079fe8df087cd38f1fe6836a0373aad.tar.gz", + "hash": "07qxp5w15jl58n9mqrin00nzjal8j91gw22sq11fqxy22kdzf7z3" }, "showrt": { "type": "Git", @@ -204,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", - "url": "https://github.com/Mic92/sops-nix/archive/eb34eb588132d653e4c4925d862f1e5a227cc2ab.tar.gz", - "hash": "1z8lbp452wv5fzjhxfxfj15mx7f1fl4jy1f2w770ph87qlij39mk" + "revision": "ab2d1ffeb5b85da2f6537beb2fe05da54276c261", + "url": "https://github.com/Mic92/sops-nix/archive/ab2d1ffeb5b85da2f6537beb2fe05da54276c261.tar.gz", + "hash": "0wbp8r7w4kq20vs5bhmg5nmgami8h9189jiiqh0vsq836gaiy5v6" }, "traveltext": { "type": "Git", diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 3a37b8f..7eeb428 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -12,7 +12,11 @@ let radicle = import ./radicle.nix; in { - beam = super.beam_nox; + # x.org-less erlang for servers, since nobody uses wxwidgets + # (why is this not the default anways??) + # + # termporarily commented out since rebar3 is broken with erlang-nox + # beam = super.beam_nox; git-annex-remote-remarkable2 = self.callPackage ({ rustPlatform, fetchgit, ... }: |